diff --git a/class/core/public.py b/class/core/public.py index 06d2db3ee..823133754 100755 --- a/class/core/public.py +++ b/class/core/public.py @@ -164,6 +164,14 @@ def getJson(data): return json.dumps(data) +def retOK(msg, data): + return returnJson(True, msg, data) + + +def retFail(msg, data): + return returnJson(False, msg, data) + + def returnJson(status, msg, args=()): # 取通用Json返回 return getJson(returnMsg(status, msg, args)) diff --git a/class/core/system_api.py b/class/core/system_api.py index 38ba0c546..71bd73ccb 100755 --- a/class/core/system_api.py +++ b/class/core/system_api.py @@ -21,8 +21,11 @@ class system_api: def __init__(self): self.setupPath = public.getServerDir() - def network_api(self): - print "ok-network_api" + ##### ----- start ----- ### + def network(self): + return self.getNetWork() + + ##### ----- end ----- ### # 名取PID def getPid(self, pname): diff --git a/route/__init__.py b/route/__init__.py index 729c5e717..48b460280 100755 --- a/route/__init__.py +++ b/route/__init__.py @@ -6,6 +6,8 @@ import os import time import shutil +from datetime import timedelta + from flask import Flask from flask import render_template @@ -26,13 +28,26 @@ import public # from firewall import * app = Flask(__name__, template_folder='templates/default') +app.config.version = '0.0.1' +app.config['SECRET_KEY'] = os.urandom(24) +app.config['PERMANENT_SESSION_LIFETIME'] = timedelta(days=7) + + +def funConvert(fun): + block = fun.split('_') + func = block[0] + for x in range(len(block) - 1): + suf = block[x + 1].title() + func += suf + return func def publicObject(toObject, func, action=None, get=None): - name = func + '_api' + name = funConvert(func) if hasattr(toObject, name): efunc = 'toObject.' + name + '()' - return eval(efunc) + data = eval(efunc) + return public.getJson(data) return 'fail' @@ -54,7 +69,6 @@ def index(reqClass=None, reqAction=None, reqData=None): return render_template(reqClass + '.html') className = reqClass + '_api' - # print reqClass, reqAction, className eval_str = "__import__('" + className + "')." + className + '()' newInstance = eval(eval_str)