midoks
/
mdserver-web
mirror of https://github.com/midoks/mdserver-web
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
pull/632/head
Mr Chen 5 months ago
parent 6ebc7a1514
commit 50a96b198a
11 changed files with 26 additions and 26 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      plugins/acme_pandominassl_apply/index.py
  2. 2
      plugins/acme_pandominassl_apply/tool_cron.py
  3. 6
      plugins/backup_ftp/index.py
  4. 4
      plugins/gdrive/index.py
  5. 4
      plugins/mariadb/index.py
  6. 2
      plugins/migration_api/index.py
  7. 4
      plugins/msonedrive/index.py
  8. 6
      plugins/mysql-apt/index.py
  9. 6
      plugins/mysql-yum/index.py
  10. 6
      plugins/mysql/index.py
  11. 2
      plugins/op_waf/tool_task.py

10
plugins/acme_pandominassl_apply/index.py
Unescape View File

@ -563,7 +563,7 @@ def runHookPy(domain,path):
# print(domain,path) # print(domain,path)
run_log = runLog() run_log = runLog()
hook_file = getConf() hook_file = getConf()
cmd = 'cd '+mw.getRunDir() cmd = 'cd '+mw.getPanelDir()
cmd += ' && python3 '+hook_file + ' ' + domain + ' ' + path cmd += ' && python3 '+hook_file + ' ' + domain + ' ' + path
cmd += ' >> '+ run_log cmd += ' >> '+ run_log
print(cmd) print(cmd)
@ -644,7 +644,7 @@ def getHookIdCmd():
if not data[0]: if not data[0]:
return data[1] return data[1]
cmd = "cd "+mw.getRunDir()+" " cmd = "cd "+mw.getPanelDir()+" "
cmd += '&& python3 plugins/acme_pandominassl_apply/index.py run_hook_id 1.0 {"id":"'+args['id']+'"}' cmd += '&& python3 plugins/acme_pandominassl_apply/index.py run_hook_id 1.0 {"id":"'+args['id']+'"}'
return mw.returnJson(True, 'ok',cmd) return mw.returnJson(True, 'ok',cmd)
@ -661,7 +661,7 @@ def runHookId():
return 'run hook '+args['id']+' end' return 'run hook '+args['id']+' end'
def runHookCmd(): def runHookCmd():
cmd = "cd "+mw.getRunDir()+" " cmd = "cd "+mw.getPanelDir()+" "
cmd += '&& python3 plugins/acme_pandominassl_apply/index.py run_hook' cmd += '&& python3 plugins/acme_pandominassl_apply/index.py run_hook'
return mw.returnJson(True, 'ok',cmd) return mw.returnJson(True, 'ok',cmd)
@ -738,7 +738,7 @@ def runSyncCfData():
return '' return ''
def runSyncCfCmd(): def runSyncCfCmd():
cmd = "cd "+mw.getRunDir()+" " cmd = "cd "+mw.getPanelDir()+" "
cmd += '&& python3 plugins/acme_pandominassl_apply/index.py run_sync_cf_data' cmd += '&& python3 plugins/acme_pandominassl_apply/index.py run_sync_cf_data'
return mw.returnJson(True, 'ok',cmd) return mw.returnJson(True, 'ok',cmd)
@ -791,7 +791,7 @@ def runSyncDnsPodData():
return '' return ''
def runSyncDnsPodCmd(): def runSyncDnsPodCmd():
cmd = "cd "+mw.getRunDir()+" " cmd = "cd "+mw.getPanelDir()+" "
cmd += '&& python3 plugins/acme_pandominassl_apply/index.py run_sync_dnspod_data' cmd += '&& python3 plugins/acme_pandominassl_apply/index.py run_sync_dnspod_data'
return mw.returnJson(True, 'ok',cmd) return mw.returnJson(True, 'ok',cmd)

2
plugins/acme_pandominassl_apply/tool_cron.py
Unescape View File

@ -72,7 +72,7 @@ def createBgTaskByName(name):
import crontab_api import crontab_api
api = crontab_api.crontab_api() api = crontab_api.crontab_api()
mw_dir = mw.getRunDir() mw_dir = mw.getPanelDir()
cmd = ''' cmd = '''
mw_dir=%s mw_dir=%s
rname=%s rname=%s

6
plugins/backup_ftp/index.py
Unescape View File

@ -188,7 +188,7 @@ def findPathName(path, filename):
return l return l
def backupAllFunc(stype): def backupAllFunc(stype):
os.chdir(mw.getRunDir()) os.chdir(mw.getPanelDir())
name = sys.argv[2] name = sys.argv[2]
num = sys.argv[3] num = sys.argv[3]
@ -230,11 +230,11 @@ def backupAllFunc(stype):
'type=? and pid=?', ('1', pid)).field('id,filename').select() 'type=? and pid=?', ('1', pid)).field('id,filename').select()
args = stype + " " + name + " " + num args = stype + " " + name + " " + num
cmd = 'python3 ' + mw.getRunDir() + '/scripts/backup.py ' + args cmd = 'python3 ' + mw.getPanelDir() + '/scripts/backup.py ' + args
if stype.find('database_') > -1: if stype.find('database_') > -1:
plugin_name = stype.replace('database_', '') plugin_name = stype.replace('database_', '')
args = "database " + name + " " + num args = "database " + name + " " + num
cmd = 'python3 ' + mw.getRunDir() + '/plugins/' + plugin_name + \ cmd = 'python3 ' + mw.getPanelDir() + '/plugins/' + plugin_name + \
'/scripts/backup.py ' + args '/scripts/backup.py ' + args
os.system(cmd) os.system(cmd)

4
plugins/gdrive/index.py
Unescape View File

@ -203,9 +203,9 @@ def backupAllFunc(stype):
mw.echoInfo("未授权API,无法使用!!!") mw.echoInfo("未授权API,无法使用!!!")
return '' return ''
os.chdir(mw.getRunDir()) os.chdir(mw.getPanelDir())
backup_dir = mw.getBackupDir() backup_dir = mw.getBackupDir()
run_dir = mw.getRunDir() run_dir = mw.getPanelDir()
stype = sys.argv[1] stype = sys.argv[1]
name = sys.argv[2] name = sys.argv[2]

4
plugins/mariadb/index.py
Unescape View File

@ -2478,7 +2478,7 @@ def trySlaveSyncBugfix(version=''):
return mw.returnJson(True, '修复成功!') return mw.returnJson(True, '修复成功!')
def getSlaveSyncCmd(version=''): def getSlaveSyncCmd(version=''):
root = mw.getRunDir() root = mw.getPanelDir()
cmd = 'cd ' + root + ' && python3 ' + root + \ cmd = 'cd ' + root + ' && python3 ' + root + \
'/plugins/mariadb/index.py do_full_sync {"db":"all","sign":""}' '/plugins/mariadb/index.py do_full_sync {"db":"all","sign":""}'
return mw.returnJson(True, 'ok', cmd) return mw.returnJson(True, 'ok', cmd)
@ -3027,7 +3027,7 @@ def fullSync(version=''):
status_file = asyncTmpfile() status_file = asyncTmpfile()
if args['begin'] == '1': if args['begin'] == '1':
cmd = 'cd ' + mw.getRunDir() + ' && python3 ' + \ cmd = 'cd ' + mw.getPanelDir() + ' && python3 ' + \
getPluginDir() + \ getPluginDir() + \
'/index.py do_full_sync {"db":"' + args['db'] + '","sign":"' + sign + '"} &' '/index.py do_full_sync {"db":"' + args['db'] + '","sign":"' + sign + '"} &'
# print(cmd) # print(cmd)

2
plugins/migration_api/index.py
Unescape View File

@ -384,7 +384,7 @@ class classApi:
zip_file = backup_path + \ zip_file = backup_path + \
"/psync_tmp_{}.tar.gz".format(os.path.basename(spath)) "/psync_tmp_{}.tar.gz".format(os.path.basename(spath))
zip_dst = mw.getRunDir() + '/tmp/psync_tmp_{}.tar.gz'.format( zip_dst = mw.getPanelDir() + '/tmp/psync_tmp_{}.tar.gz'.format(
os.path.basename(dpath)) os.path.basename(dpath))
write_log("|-正在压缩目录[{}]...".format(spath)) write_log("|-正在压缩目录[{}]...".format(spath))
self.write_speed('done', '正在压缩') self.write_speed('done', '正在压缩')

4
plugins/msonedrive/index.py
Unescape View File

@ -217,9 +217,9 @@ def backupAllFunc(stype):
mw.echoInfo("未授权API,无法使用!!!") mw.echoInfo("未授权API,无法使用!!!")
return '' return ''
os.chdir(mw.getRunDir()) os.chdir(mw.getPanelDir())
backup_dir = mw.getBackupDir() backup_dir = mw.getBackupDir()
run_dir = mw.getRunDir() run_dir = mw.getPanelDir()
stype = sys.argv[1] stype = sys.argv[1]
name = sys.argv[2] name = sys.argv[2]

6
plugins/mysql-apt/index.py
Unescape View File

@ -831,7 +831,7 @@ def setDbBackup():
if not data[0]: if not data[0]:
return data[1] return data[1]
scDir = getPluginDir() + '/scripts/backup.py' scDir = getPanelDir() + '/scripts/backup.py'
cmd = 'python3 ' + scDir + ' database ' + args['name'] + ' 3' cmd = 'python3 ' + scDir + ' database ' + args['name'] + ' 3'
os.system(cmd) os.system(cmd)
return mw.returnJson(True, 'ok') return mw.returnJson(True, 'ok')
@ -2569,7 +2569,7 @@ def trySlaveSyncBugfix(version=''):
def getSlaveSyncCmd(version=''): def getSlaveSyncCmd(version=''):
root = mw.getRunDir() root = mw.getPanelDir()
cmd = 'cd ' + root + ' && python3 ' + root + \ cmd = 'cd ' + root + ' && python3 ' + root + \
'/plugins/mysql/index.py do_full_sync {"db":"all","sign":""}' '/plugins/mysql/index.py do_full_sync {"db":"all","sign":""}'
return mw.returnJson(True, 'ok', cmd) return mw.returnJson(True, 'ok', cmd)
@ -3450,7 +3450,7 @@ def fullSync(version=''):
status_file = asyncTmpfile() status_file = asyncTmpfile()
if args['begin'] == '1': if args['begin'] == '1':
cmd = 'cd ' + mw.getRunDir() + ' && python3 ' + getPluginDir() + \ cmd = 'cd ' + mw.getPanelDir() + ' && python3 ' + getPluginDir() + \
'/index.py do_full_sync {"db":"' + \ '/index.py do_full_sync {"db":"' + \
args['db'] + '","sign":"' + sign + '"} &' args['db'] + '","sign":"' + sign + '"} &'
# print(cmd) # print(cmd)

6
plugins/mysql-yum/index.py
Unescape View File

@ -830,7 +830,7 @@ def setDbBackup():
if not data[0]: if not data[0]:
return data[1] return data[1]
scDir = getPluginDir() + '/scripts/backup.py' scDir = getPanelDir() + '/scripts/backup.py'
cmd = 'python3 ' + scDir + ' database ' + args['name'] + ' 3' cmd = 'python3 ' + scDir + ' database ' + args['name'] + ' 3'
os.system(cmd) os.system(cmd)
return mw.returnJson(True, 'ok') return mw.returnJson(True, 'ok')
@ -2551,7 +2551,7 @@ def trySlaveSyncBugfix(version=''):
def getSlaveSyncCmd(version=''): def getSlaveSyncCmd(version=''):
root = mw.getRunDir() root = mw.getPanelDir()
cmd = 'cd ' + root + ' && python3 ' + root + \ cmd = 'cd ' + root + ' && python3 ' + root + \
'/plugins/mysql/index.py do_full_sync {"db":"all"}' '/plugins/mysql/index.py do_full_sync {"db":"all"}'
return mw.returnJson(True, 'ok', cmd) return mw.returnJson(True, 'ok', cmd)
@ -3433,7 +3433,7 @@ def fullSync(version=''):
status_file = asyncTmpfile() status_file = asyncTmpfile()
if args['begin'] == '1': if args['begin'] == '1':
cmd = 'cd ' + mw.getRunDir() + ' && python3 ' + getPluginDir() + \ cmd = 'cd ' + mw.getPanelDir() + ' && python3 ' + getPluginDir() + \
'/index.py do_full_sync {"db":"' + \ '/index.py do_full_sync {"db":"' + \
args['db'] + '","sign":"' + sign + '"} &' args['db'] + '","sign":"' + sign + '"} &'
# print(cmd) # print(cmd)

6
plugins/mysql/index.py
Unescape View File

@ -973,7 +973,7 @@ def setDbBackup():
if not data[0]: if not data[0]:
return data[1] return data[1]
scDir = mw.getRunDir() + '/scripts/backup.py' scDir = mw.getPanelDir() + '/scripts/backup.py'
cmd = 'python3 ' + scDir + ' database ' + args['name'] + ' 3' cmd = 'python3 ' + scDir + ' database ' + args['name'] + ' 3'
os.system(cmd) os.system(cmd)
return mw.returnJson(True, 'ok') return mw.returnJson(True, 'ok')
@ -2780,7 +2780,7 @@ def trySlaveSyncBugfix(version=''):
def getSlaveSyncCmd(version=''): def getSlaveSyncCmd(version=''):
root = mw.getRunDir() root = mw.getPanelDir()
cmd = 'cd ' + root + ' && python3 ' + root + \ cmd = 'cd ' + root + ' && python3 ' + root + \
'/plugins/mysql/index.py do_full_sync {"db":"all","sign",""}' '/plugins/mysql/index.py do_full_sync {"db":"all","sign",""}'
return mw.returnJson(True, 'ok', cmd) return mw.returnJson(True, 'ok', cmd)
@ -3728,7 +3728,7 @@ def fullSync(version=''):
status_file = asyncTmpfile() status_file = asyncTmpfile()
if args['begin'] == '1': if args['begin'] == '1':
cmd = 'cd ' + mw.getRunDir() + ' && python3 ' + getPluginDir() + \ cmd = 'cd ' + mw.getPanelDir() + ' && python3 ' + getPluginDir() + \
'/index.py do_full_sync {"db":"' + \ '/index.py do_full_sync {"db":"' + \
args['db'] + '","sign":"' + sign + '"} &' args['db'] + '","sign":"' + sign + '"} &'
# print(cmd) # print(cmd)

2
plugins/op_waf/tool_task.py
Unescape View File

@ -93,7 +93,7 @@ def createBgTaskByName(name, args):
_where1 = args['minute-n'] _where1 = args['minute-n']
_minute = '' _minute = ''
mw_dir = mw.getRunDir() mw_dir = mw.getPanelDir()
cmd = ''' cmd = '''
mw_dir=%s mw_dir=%s
rname=%s rname=%s

Write Preview
Loading…
Cancel
Save