From 2eb5b049180eae1f60e2b3d15ac4dc19eda8ebd3 Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 14 Jun 2022 12:19:20 +0800 Subject: [PATCH 1/6] Update debian.sh --- scripts/install/debian.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install/debian.sh b/scripts/install/debian.sh index 3a78f9fae..cb3222c0f 100644 --- a/scripts/install/debian.sh +++ b/scripts/install/debian.sh @@ -96,7 +96,7 @@ pip3 install gevent==21.1.2 pip3 install gevent-websocket==0.10.1 pip3 install requests==2.20.0 pip3 install flask-caching>=1.10.1 -pip3 install python-socketio==4.2.0 +pip3 install python-socketio==5.2.0 pip3 install psutil==5.9.1 pip3 install pymongo From e0681f7b1dc63f06f12e0c99d25fc4ff69d12afd Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 14 Jun 2022 12:21:15 +0800 Subject: [PATCH 2/6] up --- scripts/install/debian.sh | 10 ++++++---- scripts/update/debian.sh | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/scripts/install/debian.sh b/scripts/install/debian.sh index cb3222c0f..6d9cf5539 100644 --- a/scripts/install/debian.sh +++ b/scripts/install/debian.sh @@ -104,13 +104,15 @@ pip3 install pymongo cd /www/server/mdserver-web && ./cli.sh start sleep 5 -cd /www/server/mdserver-web && ./cli.sh stop -cd /www/server/mdserver-web && ./cli.sh start - echo -e "stop mw" isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'` -port=$(cat /www/server/mdserver-web/data/port.pl) + +port=7200 +if [ -f /www/server/mdserver-web/data/port.pl ];then + port=$(cat /www/server/mdserver-web/data/port.pl) +fi + n=0 while [[ "$isStart" != "" ]]; do diff --git a/scripts/update/debian.sh b/scripts/update/debian.sh index 857c88641..d1ccdb058 100644 --- a/scripts/update/debian.sh +++ b/scripts/update/debian.sh @@ -51,11 +51,12 @@ fi echo -e "stop mw" isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'` -port=7200 +port=7200 if [ -f /www/server/mdserver-web/data/port.pl ];then port=$(cat /www/server/mdserver-web/data/port.pl) fi + n=0 while [[ "$isStart" != "" ]]; do From db1d5747bcc86c74af9f0ef4c359bb8f483fd6e2 Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 14 Jun 2022 12:21:42 +0800 Subject: [PATCH 3/6] Update debian.sh --- scripts/update/debian.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update/debian.sh b/scripts/update/debian.sh index d1ccdb058..b5bb33a1b 100644 --- a/scripts/update/debian.sh +++ b/scripts/update/debian.sh @@ -38,7 +38,7 @@ pip3 install gevent==21.1.2 pip3 install gevent-websocket==0.10.1 pip3 install requests==2.20.0 pip3 install flask-caching>=1.10.1 -pip3 install python-socketio==4.2.0 +pip3 install python-socketio==5.2.0 pip3 install psutil==5.9.1 pip3 install pymongo From 1569cd6c1832fc96ccbff91adf6cf8d15fead516 Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 14 Jun 2022 12:34:11 +0800 Subject: [PATCH 4/6] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e9f518912..f12b72b76 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ werkzeug>=2.0.3 wheel==0.33.6 gunicorn==20.1.0 requests==2.20.0 -flask==2.0.3 +flask==1.1.4 flask-session==0.3.2 flask-helper==0.19 cache==1.0.3 From c7724b6d075310f9066f553d70405bf121e4ad5a Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 14 Jun 2022 12:36:21 +0800 Subject: [PATCH 5/6] Update requirements.txt --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index f12b72b76..86861eeb7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ setuptools>=33.1.1 -werkzeug>=2.0.3 +Werkzeug>=1.0.1 wheel==0.33.6 gunicorn==20.1.0 requests==2.20.0 @@ -21,7 +21,7 @@ Flask-SocketIO==3.0.2 zmq==0.0.0 pymongo pillow -Jinja2>=2.11.3 +Jinja2>=2.11.2 mysqlclient>=2.0.3 flask-caching>=1.10.1 mysql-connector-python From bf47d6554ed7955a7d5680344661c231431ec66a Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 14 Jun 2022 12:51:53 +0800 Subject: [PATCH 6/6] up --- requirements.txt | 2 +- scripts/update/debian.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 86861eeb7..9f607da48 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ Werkzeug>=1.0.1 wheel==0.33.6 gunicorn==20.1.0 requests==2.20.0 -flask==1.1.4 +flask==2.0.3 flask-session==0.3.2 flask-helper==0.19 cache==1.0.3 diff --git a/scripts/update/debian.sh b/scripts/update/debian.sh index b5bb33a1b..96c1d985c 100644 --- a/scripts/update/debian.sh +++ b/scripts/update/debian.sh @@ -38,7 +38,7 @@ pip3 install gevent==21.1.2 pip3 install gevent-websocket==0.10.1 pip3 install requests==2.20.0 pip3 install flask-caching>=1.10.1 -pip3 install python-socketio==5.2.0 +pip3 install flask-socketio==5.2.0 pip3 install psutil==5.9.1 pip3 install pymongo