From 647323786be027553fd3f1fcc145ea4ad4e21019 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 25 Dec 2018 17:37:08 +0800
Subject: [PATCH] update

---
 class/core/crontab_api.py | 21 +++++++++++++++++++++
 class/core/plugins_api.py |  4 +++-
 class/core/public.py      |  7 +++----
 class/core/task_api.py    |  2 +-
 route/__init__.py         |  4 ++--
 5 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100755 class/core/crontab_api.py

diff --git a/class/core/crontab_api.py b/class/core/crontab_api.py
new file mode 100755
index 000000000..568cff272
--- /dev/null
+++ b/class/core/crontab_api.py
@@ -0,0 +1,21 @@
+# coding: utf-8
+
+import psutil
+import time
+import os
+import sys
+import public
+import re
+import json
+import pwd
+
+from flask import request
+
+
+class crontab_api:
+
+    def __init__(self):
+        pass
+
+    ##### ----- start ----- ###
+    ##### ----- start ----- ###
diff --git a/class/core/plugins_api.py b/class/core/plugins_api.py
index 262f4fff4..b7f1d557b 100755
--- a/class/core/plugins_api.py
+++ b/class/core/plugins_api.py
@@ -38,7 +38,6 @@ class plugins_api:
 
     def __init__(self):
         self.setupPath = 'server'
-        # self.__plugin_dir = public.getRunDir() + '/plugins'
 
     ##### ----- start ----- ###
     def listApi(self):
@@ -94,6 +93,7 @@ class plugins_api:
             return public.returnJson(False, '缺少版本信息!', ())
 
         infoJsonPos = self.__plugin_dir + '/' + name + '/' + 'info.json'
+        print infoJsonPos
 
         if not os.path.exists(infoJsonPos):
             return public.retJson(False, '配置文件不存在!', ())
@@ -174,6 +174,7 @@ class plugins_api:
     def settingApi(self):
         name = request.args.get('name', '')
         html = self.__plugin_dir + '/' + name + '/index.html'
+        print html
         return public.readFile(html)
 
     def runApi(self):
@@ -651,6 +652,7 @@ class plugins_api:
         path = public.getRunDir() + '/' + self.__plugin_dir + \
             '/' + name + '/' + script + '.py'
         py = 'python ' + path
+
         if args == '':
             py_cmd = py + ' ' + func + ' ' + version
         else:
diff --git a/class/core/public.py b/class/core/public.py
index 4bab49a15..8deedc728 100755
--- a/class/core/public.py
+++ b/class/core/public.py
@@ -164,7 +164,7 @@ def getJson(data):
     return json.dumps(data)
 
 
-def returnData(status, msg, data):
+def returnData(status, msg, data=None):
     return {'status': status, 'msg': msg, 'data': data}
 
 
@@ -177,9 +177,8 @@ def retFail(msg, data=None):
     return {'status': False, 'msg': msg, 'data': data}
 
 
-def returnJson(status, msg, args=()):
-    # 取通用Json返回
-    return getJson(returnMsg(status, msg, args))
+def returnJson(status, msg, data=None):
+    return getJson({'status': status, 'msg': msg, 'data': data})
 
 
 def returnMsg(status, msg, args=()):
diff --git a/class/core/task_api.py b/class/core/task_api.py
index 57921449d..e956bee57 100755
--- a/class/core/task_api.py
+++ b/class/core/task_api.py
@@ -15,7 +15,7 @@ class task_api:
     def __init__(self):
         pass
 
-    def count(self):
+    def countApi(self):
         c = public.M('tasks').where("status!=?", ('1',)).count()
         return str(c)
 
diff --git a/route/__init__.py b/route/__init__.py
index 3ae2e8980..c92a22275 100755
--- a/route/__init__.py
+++ b/route/__init__.py
@@ -51,8 +51,8 @@ def index(reqClass=None, reqAction=None, reqData=None):
 
     if (reqClass == None):
         reqClass = 'index'
-    classFile = ('config', 'control', 'crontab',
-                 'files', 'firewall', 'index', 'plugins', 'login', 'system', 'site', 'soft')
+    classFile = ('config', 'control', 'crontab', 'files', 'firewall',
+                 'index', 'plugins', 'login', 'system', 'site', 'task', 'soft')
     if not reqClass in classFile:
         return '403 no access!'