From dbdea53fc3705284ed67b6282004b071d831d247 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Fri, 7 Jun 2024 21:08:29 +0800 Subject: [PATCH 1/5] update --- route/static/app/files.js | 2 +- route/templates/default/files.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/route/static/app/files.js b/route/static/app/files.js index 542bb38046..34bc293fa3 100755 --- a/route/static/app/files.js +++ b/route/static/app/files.js @@ -366,7 +366,7 @@ function makeFilePage(showRow, page = ''){ //分页 $("#filePage").html(page); - $("#filePage div").append("每页条"); + $("#filePage div").append("每页条"); $("#filePage .Pcount").css("left","16px"); } diff --git a/route/templates/default/files.html b/route/templates/default/files.html index 14f4e04231..e074d30049 100755 --- a/route/templates/default/files.html +++ b/route/templates/default/files.html @@ -16,11 +16,11 @@
- +
+
-
From ee1d3dec38132e995893ea2aaca38adbfae51437 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Sat, 8 Jun 2024 21:45:26 +0800 Subject: [PATCH 2/5] Update all_test.sh --- plugins/php/versions/all_test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/php/versions/all_test.sh b/plugins/php/versions/all_test.sh index 2dd50670a8..98623465a2 100644 --- a/plugins/php/versions/all_test.sh +++ b/plugins/php/versions/all_test.sh @@ -8,7 +8,7 @@ ROOT_DIR=$(cd "$(dirname "$0")"; pwd) # cd /www/server/mdserver-web/scripts/quick && bash debug.sh # cd /www/server/mdserver-web/plugins/php/versions && /bin/bash all_test.sh -# cd /www/server/mdserver-web/plugins/php && bash install.sh install 55 +# cd /www/server/mdserver-web/plugins/php && bash install.sh install 82 # cd /www/server/mdserver-web/plugins/php/versions/common && bash gd.sh install 73 # cd /www/server/mdserver-web/plugins/php/versions/common && bash swoole.sh install 54 @@ -28,7 +28,7 @@ ROOT_DIR=$(cd "$(dirname "$0")"; pwd) # echo "php${PHP_VER} -- end" -PHP_VER_LIST=(53 54 55 56 70 71 72 73 74 80 81 82) +PHP_VER_LIST=(53 54 55 56 70 71 72 73 74 80 81 82 83) # PHP_VER_LIST=(81) for PHP_VER in ${PHP_VER_LIST[@]}; do echo "php${PHP_VER} -- start" From a8b37fb5baade78bbdcf897f21794acc16ac335d Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Sat, 8 Jun 2024 21:45:34 +0800 Subject: [PATCH 3/5] Update all_mac.sh --- plugins/php/versions/all_mac.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/php/versions/all_mac.sh b/plugins/php/versions/all_mac.sh index b2ef623318..a771bd087e 100644 --- a/plugins/php/versions/all_mac.sh +++ b/plugins/php/versions/all_mac.sh @@ -30,7 +30,7 @@ ROOT_DIR=$(cd "$(dirname "$0")"; pwd) # echo "php${PHP_VER} -- end" -PHP_VER_LIST=(54 55 56 70 71 72 73 74 80 81 82) +PHP_VER_LIST=(54 55 56 70 71 72 73 74 80 81 82 83) # PHP_VER_LIST=(81) for PHP_VER in ${PHP_VER_LIST[@]}; do echo "php${PHP_VER} -- start" From 2ce73aefad3b4c31ec30c6d3ebc4bba037bf0793 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Sun, 9 Jun 2024 00:07:25 +0800 Subject: [PATCH 4/5] Update index.py --- plugins/mysql/index.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py index a5ebf154c0..ae92960d39 100755 --- a/plugins/mysql/index.py +++ b/plugins/mysql/index.py @@ -2400,22 +2400,22 @@ def getMasterRepSlaveUserCmd(version): clist[0]['username'] + "', MASTER_PASSWORD='" + \ clist[0]['password'] + "'" - sql += base_sql +';' - sql += "
" + sql += base_sql; + sql += "
"; # sql += base_sql + ", MASTER_AUTO_POSITION=1" + channel_name sql += base_sql + channel_name - sql += "
" + sql += "
"; sql += base_sql + "', MASTER_LOG_FILE='" + mstatus[0]["File"] + "',MASTER_LOG_POS=" + str(mstatus[0]["Position"]) + channel_name else: base_sql = "CHANGE REPLICATION SOURCE TO SOURCE_HOST='" + ip + "', SOURCE_PORT=" + port + ", SOURCE_USER='" + \ clist[0]['username'] + "', SOURCE_PASSWORD='" + \ clist[0]['password']+"'" - sql += base_sql +';' - sql += "
" + sql += base_sql; + sql += "
"; # sql += base_sql + ", MASTER_AUTO_POSITION=1" + channel_name sql += base_sql + channel_name - sql += "
" + sql += "
"; sql += base_sql + "', SOURCE_LOG_FILE='" + mstatus[0]["File"] + "',SOURCE_LOG_POS=" + str(mstatus[0]["Position"]) + channel_name From dc22fc81e7133bdc9f97d8f752ead9b48684e382 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Sun, 9 Jun 2024 00:13:17 +0800 Subject: [PATCH 5/5] update --- plugins/mysql/index.py | 2 +- plugins/mysql/js/mysql.js | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py index ae92960d39..07a921bc23 100755 --- a/plugins/mysql/index.py +++ b/plugins/mysql/index.py @@ -2391,7 +2391,7 @@ def getMasterRepSlaveUserCmd(version): sid = getDbServerId() channel_name = "" if sid != '': - channel_name = " for channel 'r{}';".format(sid) + channel_name = " for channel 'r{}'".format(sid) mdb8 = ['8.0','8.1','8.2','8.3','8.4'] sql = '' diff --git a/plugins/mysql/js/mysql.js b/plugins/mysql/js/mysql.js index bafe7cfc4b..a9e446e17e 100755 --- a/plugins/mysql/js/mysql.js +++ b/plugins/mysql/js/mysql.js @@ -1762,17 +1762,11 @@ function getMasterRepSlaveUserCmd(username, db=''){ area: '500px', content:"
\
"+cmd+"
\ -
\ - \ +
\ + \
\ ", }); - - - copyPass(cmd); - $('.class-copy-cmd').click(function(){ - copyPass(cmd); - }); }); }