pull/617/head
Mr Chen 10 months ago
parent ffab97d4c8
commit ac0fab2f2b
  1. 15
      plugins/mariadb/index.py
  2. 26
      plugins/mariadb/js/mariadb.js

@ -2995,6 +2995,19 @@ def fullSync(version=''):
return json.dumps({'code': 0, 'msg': '点击开始,开始同步!', 'progress': 0}) return json.dumps({'code': 0, 'msg': '点击开始,开始同步!', 'progress': 0})
def fullSyncCmd():
time_all_s = time.time()
args = getArgs()
data = checkArgs(args, ['db', 'sign'])
if not data[0]:
return data[1]
db = args['db']
sign = args['sign']
cmd = 'cd '+mw.getServerDir()+'/mdserver-web && source bin/activate && python3 plugins/mariadb/index.py do_full_sync {"db":"'+db+'","sign":"'+sign+'"}'
return mw.returnJson(True,'ok',cmd)
# python3 plugins/mariadb/index.py do_full_sync {"db":"demo1","sign":"","beigin":"1"} # python3 plugins/mariadb/index.py do_full_sync {"db":"demo1","sign":"","beigin":"1"}
def doFullSync(version=''): def doFullSync(version=''):
mode_file = getSyncModeFile() mode_file = getSyncModeFile()
@ -3441,6 +3454,8 @@ if __name__ == "__main__":
print(fullSync(version)) print(fullSync(version))
elif func == 'do_full_sync': elif func == 'do_full_sync':
print(doFullSync(version)) print(doFullSync(version))
elif func == 'full_sync_cmd':
print(fullSyncCmd())
elif func == 'dump_mysql_data': elif func == 'dump_mysql_data':
print(dumpMysqlData(version)) print(dumpMysqlData(version))
elif func == 'sync_database_repair': elif func == 'sync_database_repair':

@ -1962,6 +1962,7 @@ function getFullSyncStatus(db){
</div>\ </div>\
<div class='table_toolbar' style='left:0px;'>\ <div class='table_toolbar' style='left:0px;'>\
<span data-status='init' class='sync btn btn-default btn-sm' id='begin_full_sync'>开始</span>\ <span data-status='init' class='sync btn btn-default btn-sm' id='begin_full_sync'>开始</span>\
<span data-status='init' class='btn btn-default btn-sm' id='full_sync_cmd'>手动命令</span>\
</div>\ </div>\
</div>", </div>",
cancel: function(){ cancel: function(){
@ -1984,6 +1985,31 @@ function getFullSyncStatus(db){
layer.msg("正在同步中..",{icon:0}); layer.msg("正在同步中..",{icon:0});
} }
}); });
$('#full_sync_cmd').click(function(){
myPostN('full_sync_cmd', {'db':db,'sign':''}, function(rdata){
var rdata = $.parseJSON(rdata.data);
layer.open({
title: "手动执行命令CMD",
area: ['600px', '180px'],
type:1,
closeBtn: 1,
shadeClose: false,
btn:["复制","取消"],
content: '<div class="pd15">\
<div class="divtable">\
<pre class="layui-code">'+rdata.data+'</pre>\
</div>\
</div>',
success:function(){
copyText(rdata.data);
},
yes:function(){
copyText(rdata.data);
}
});
});
});
} }
}); });
}); });

Loading…
Cancel
Save