From bb3cdb5d854f36f9006848cbbc9a1d4a94ebda06 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Thu, 26 Dec 2024 17:56:43 +0800 Subject: [PATCH 1/8] Update update.sh --- scripts/old/update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/old/update.sh b/scripts/old/update.sh index 079aa59249..396064ef73 100644 --- a/scripts/old/update.sh +++ b/scripts/old/update.sh @@ -77,14 +77,14 @@ fi if [ "$LOCAL_ADDR" != "common" ];then # curl --insecure -sSLo /tmp/master.zip https://code.midoks.icu/midoks/mdserver-web/archive/master.zip - wget --no-check-certificate -O /tmp/master.zip github.com/midoks/mdserver-web/archive/refs/tags/${VERSION}.zip + wget --no-check-certificate -O /tmp/master.zip https://github.com/midoks/mdserver-web/archive/refs/tags/${VERSION}.zip cd /tmp && unzip /tmp/master.zip $CP_CMD -rf /tmp/mdserver-web/* /www/server/mdserver-web rm -rf /tmp/master.zip rm -rf /tmp/mdserver-web else - curl --insecure -sSLo /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master + curl --insecure -sSLo /tmp/master.zip https://github.com/midoks/mdserver-web/archive/refs/tags/${VERSION}.zip cd /tmp && unzip /tmp/master.zip $CP_CMD -rf /tmp/mdserver-web-master/* /www/server/mdserver-web From 4ac797406a4a9ee8418f3ef358c65244b113dfe1 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Thu, 26 Dec 2024 18:00:42 +0800 Subject: [PATCH 2/8] Update update.sh --- scripts/old/update.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/old/update.sh b/scripts/old/update.sh index 396064ef73..251426d4f1 100644 --- a/scripts/old/update.sh +++ b/scripts/old/update.sh @@ -80,16 +80,17 @@ if [ "$LOCAL_ADDR" != "common" ];then wget --no-check-certificate -O /tmp/master.zip https://github.com/midoks/mdserver-web/archive/refs/tags/${VERSION}.zip cd /tmp && unzip /tmp/master.zip - $CP_CMD -rf /tmp/mdserver-web/* /www/server/mdserver-web + $CP_CMD -rf /tmp/mdserver-web-${VERSION}/* /www/server/mdserver-web rm -rf /tmp/master.zip - rm -rf /tmp/mdserver-web + rm -rf /tmp/mdserver-web-${VERSION} else + # curl --insecure -sSLo /tmp/master.zip https://github.com/midoks/mdserver-web/archive/refs/tags/0.17.3.zip curl --insecure -sSLo /tmp/master.zip https://github.com/midoks/mdserver-web/archive/refs/tags/${VERSION}.zip cd /tmp && unzip /tmp/master.zip - $CP_CMD -rf /tmp/mdserver-web-master/* /www/server/mdserver-web + $CP_CMD -rf /tmp/mdserver-web-${VERSION}/* /www/server/mdserver-web rm -rf /tmp/master.zip - rm -rf /tmp/mdserver-web-master + rm -rf /tmp/mdserver-web-${VERSION} fi From 34d9682cc131f58b15655abe966ae5bd4dd38eea Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Thu, 26 Dec 2024 18:02:38 +0800 Subject: [PATCH 3/8] Update update.sh --- scripts/old/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/old/update.sh b/scripts/old/update.sh index 251426d4f1..ece21f6b47 100644 --- a/scripts/old/update.sh +++ b/scripts/old/update.sh @@ -6,7 +6,7 @@ is64bit=`getconf LONG_BIT` startTime=`date +%s` -VERSION=0.17.3 +VERSION=0.17.1 _os=`uname` echo "use system: ${_os}" From 20a6ced7b51eee0e3fdbb92b2e631258415b67b1 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Thu, 26 Dec 2024 18:04:28 +0800 Subject: [PATCH 4/8] Update update.sh --- scripts/old/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/old/update.sh b/scripts/old/update.sh index ece21f6b47..251426d4f1 100644 --- a/scripts/old/update.sh +++ b/scripts/old/update.sh @@ -6,7 +6,7 @@ is64bit=`getconf LONG_BIT` startTime=`date +%s` -VERSION=0.17.1 +VERSION=0.17.3 _os=`uname` echo "use system: ${_os}" From 9e6cc873cb4da88d306f7e2dc7dad6f9f71aeb97 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Thu, 26 Dec 2024 18:06:46 +0800 Subject: [PATCH 5/8] Update update.sh --- scripts/old/update.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/old/update.sh b/scripts/old/update.sh index 251426d4f1..fb9527f913 100644 --- a/scripts/old/update.sh +++ b/scripts/old/update.sh @@ -83,6 +83,8 @@ if [ "$LOCAL_ADDR" != "common" ];then $CP_CMD -rf /tmp/mdserver-web-${VERSION}/* /www/server/mdserver-web rm -rf /tmp/master.zip rm -rf /tmp/mdserver-web-${VERSION} + + pip install -r /www/server/mdserver-web/requirements.txt else # curl --insecure -sSLo /tmp/master.zip https://github.com/midoks/mdserver-web/archive/refs/tags/0.17.3.zip curl --insecure -sSLo /tmp/master.zip https://github.com/midoks/mdserver-web/archive/refs/tags/${VERSION}.zip @@ -91,6 +93,8 @@ else $CP_CMD -rf /tmp/mdserver-web-${VERSION}/* /www/server/mdserver-web rm -rf /tmp/master.zip rm -rf /tmp/mdserver-web-${VERSION} + + pip install -r /www/server/mdserver-web/requirements.txt fi From 041f36ba00748b5503098837225681af176846e5 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Thu, 26 Dec 2024 19:04:48 +0800 Subject: [PATCH 6/8] Update requirements.txt --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d04fe1935e..e6e49eb67a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -40,4 +40,5 @@ pyotp pytz pyTelegramBotAPI telebot -pyyaml \ No newline at end of file +pyyaml +supervisor \ No newline at end of file From 90fbb0e9acbfa90f4843328b79b857249e826ddd Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Thu, 26 Dec 2024 19:07:19 +0800 Subject: [PATCH 7/8] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e6e49eb67a..bfe497e602 100644 --- a/requirements.txt +++ b/requirements.txt @@ -38,7 +38,7 @@ PyMySQL>=1.0.2 whitenoise==5.3.0 pyotp pytz +supervisor pyTelegramBotAPI telebot pyyaml -supervisor \ No newline at end of file From 8de4e6a0eee5ff263ab08b06b10859c02244af9b Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Thu, 26 Dec 2024 19:54:37 +0800 Subject: [PATCH 8/8] Update user.py --- web/thisdb/user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/thisdb/user.py b/web/thisdb/user.py index 56bd243283..4229721900 100644 --- a/web/thisdb/user.py +++ b/web/thisdb/user.py @@ -102,7 +102,7 @@ def setUserByRoot(name = None,password = None) -> bool: ''' data = {} if name is not None: - mw.M('users').where('id=?', (1,)).setField('username', name) + mw.M('users').where('id=?', (1,)).setField('name', name) if password is not None: pwd = mw.md5(password)