diff --git a/plugins/migration_api/index.html b/plugins/migration_api/index.html index 6cab4ee24..e8c68ba9a 100755 --- a/plugins/migration_api/index.html +++ b/plugins/migration_api/index.html @@ -228,11 +228,11 @@ label.checkbox_label span {
接收数据的面板地址 - +
接收数据的面板API - + 获取API秘钥
diff --git a/plugins/migration_api/index.py b/plugins/migration_api/index.py index 8b9ebbedc..e2414309e 100755 --- a/plugins/migration_api/index.py +++ b/plugins/migration_api/index.py @@ -5,6 +5,7 @@ import io import os import time import re +import json sys.path.append(os.getcwd() + "/class/core") import mw @@ -42,7 +43,7 @@ def getCfgData(): if not os.path.exists(path): mw.writeFile(path, '{}') - t = mw.returnJson(path) + t = mw.readFile(path) return json.loads(t) @@ -82,6 +83,11 @@ def initDreplace(): def stepOne(): + args = getArgs() + data = checkArgs(args, ['url', 'token']) + if not data[0]: + return data[1] + data = getCfgData() print(data) @@ -97,6 +103,6 @@ if __name__ == "__main__": elif func == 'stop': print(stop()) elif func == 'step_one': - print(saveConf()) + print(stepOne()) else: print('error') diff --git a/plugins/migration_api/js/app.js b/plugins/migration_api/js/app.js index 05d7399a6..c45dfa9de 100755 --- a/plugins/migration_api/js/app.js +++ b/plugins/migration_api/js/app.js @@ -59,7 +59,9 @@ function maPostCallbak(method, args, callback){ function initStep1(){ - maPost('step_one',{}, function(rdata){ + var url = $('input[name="sync_url"]').val(); + var token = $('input[name="sync_token"]').val(); + maPost('step_one',{url:url,token:token}, function(rdata){ console.log(rdata); }); }