Merge pull request #593 from midoks/dev

mysql同步提示优化
midoks · Jun 8, 2024 · ef34b4b · ef34b4b
2 parents cc770cd + dc22fc8
commit ef34b4b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 21 deletions.
diff --git 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 = ''
@@ -2400,22 +2400,22 @@ def getMasterRepSlaveUserCmd(version):
                 clist[0]['username'] + "', MASTER_PASSWORD='" + \
                 clist[0]['password'] + "'"
 
-        sql += base_sql +';'
-        sql += "<br/><hr/>"
+        sql += base_sql;
+        sql += "<br/><hr/>";
         # sql += base_sql + ", MASTER_AUTO_POSITION=1" + channel_name
         sql += base_sql + channel_name
-        sql += "<br/><hr/>"
+        sql += "<br/><hr/>";
 
         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 += "<br/><hr/>"
+        sql += base_sql;
+        sql += "<br/><hr/>";
         # sql += base_sql + ", MASTER_AUTO_POSITION=1" + channel_name
         sql += base_sql + channel_name
-        sql += "<br/><hr/>"
+        sql += "<br/><hr/>";
         sql += base_sql + "', SOURCE_LOG_FILE='" + mstatus[0]["File"] + "',SOURCE_LOG_POS=" + str(mstatus[0]["Position"]) + channel_name
 
 

diff --git a/plugins/mysql/js/mysql.js b/plugins/mysql/js/mysql.js
@@ -1762,17 +1762,11 @@ function getMasterRepSlaveUserCmd(username, db=''){
             area: '500px',
             content:"<form class='bt-form pd20 pb70' id='add_master'>\
             <div class='line'>"+cmd+"</div>\
-            <div class='bt-form-submit-btn'>\
-                <button type='button' class='btn btn-success btn-sm btn-title class-copy-cmd'>复制</button>\
+            <div class='bt-form-submit-btn' style='text-align:center;'>\
+                <button type='button' class='btn btn-success btn-sm btn-title'>选择其中一个复制</button>\
             </div>\
           </form>",
         });
-
-
-        copyPass(cmd);
-        $('.class-copy-cmd').click(function(){
-            copyPass(cmd);
-        });
     });
 }
 

diff --git 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"

diff --git 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"

diff --git 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("<span class='Pcount-item'>每页<select style='margin-left: 3px;margin-right: 3px;border:#ddd 1px solid' class='showRow'>"+rowOption+"</select>条</span>");
+	$("#filePage div").append("<span class='Pcount-item'>每页<select name='file_page' style='margin-left: 3px;margin-right: 3px;border:#ddd 1px solid;' class='showRow'>"+rowOption+"</select>条</span>");
 	$("#filePage .Pcount").css("left","16px"); 
 }
 

diff --git a/route/templates/default/files.html b/route/templates/default/files.html
@@ -16,11 +16,11 @@
                         <div class="pull-left mlr15" style="line-height:26px"><span id='dir_info'></span></div>
                         <div class="search pull-right" style="position: absolute; top: 6px; right: 5px;">
                             <form target="hid">
-                                <input type="text" id="search_file" class="ser-text pull-left" placeholder="搜索文件/目录" />
+                                <input type="text" id="search_file" class="ser-text pull-left" placeholder="搜索文件/目录" autocomplete="false" />
                                 <button type="button" class="ser-sub pull-left" onclick='searchFile(1)'></button>
                                 <div class="file_search" draggable="false">
+                                    <label for="search_file">包含子目录</label>
                                     <div id="search_all" class="file_search_checked"></div>
-                                    <label for="search_all">包含子目录</label>
                                 </div>
                             </form>
                             <iframe name='hid' id="hid" style="display:none"></iframe>