diff --git a/.gitignore b/.gitignore index 96c487fd1..1a850c124 100644 --- a/.gitignore +++ b/.gitignore @@ -116,9 +116,9 @@ data/iplist.txt data/json/index.json data/json/config.json data/site.pl -data/admin_path.pl -data/close.pl +data/admin_path.pl +data/close.pl ssl/input.pl -data/datadir.pl +data/datadir.pl data/502Task.pl -plugins/mw-qbittorrent/ +plugins/qbittorrent/ diff --git a/class/core/plugins_api.py b/class/core/plugins_api.py index 3d07f9331..38d3f9eb7 100755 --- a/class/core/plugins_api.py +++ b/class/core/plugins_api.py @@ -101,7 +101,7 @@ class plugins_api: # print infoJsonPos if not os.path.exists(infoJsonPos): - return public.retJson(False, '配置文件不存在!', ()) + return public.returnJson(False, '配置文件不存在!', ()) pluginInfo = json.loads(public.readFile(infoJsonPos)) @@ -128,7 +128,7 @@ class plugins_api: infoJsonPos = self.__plugin_dir + '/' + name + '/' + 'info.json' if not os.path.exists(infoJsonPos): - return public.retJson(False, "配置文件不存在!", ()) + return public.returnJson(False, "配置文件不存在!", ()) pluginInfo = json.loads(public.readFile(infoJsonPos)) @@ -156,7 +156,7 @@ class plugins_api: infoJsonPos = self.__plugin_dir + '/' + name + '/' + 'info.json' if not os.path.exists(infoJsonPos): - return public.retJson(False, "配置文件不存在!", ()) + return public.returnJson(False, "配置文件不存在!", ()) pluginInfo = json.loads(public.readFile(infoJsonPos)) @@ -167,7 +167,7 @@ class plugins_api: data = public.execShell(execstr) if public.isAppleSystem(): print execstr - print data[0],data[1] + print data[0], data[1] return public.returnJson(True, '卸载执行成功!') # if data[1] == '': # return public.returnJson(True, '已将卸载成功!')