diff --git a/class/core/task_api.py b/class/core/task_api.py index e956bee57..43d1d81d6 100755 --- a/class/core/task_api.py +++ b/class/core/task_api.py @@ -19,7 +19,7 @@ class task_api: c = public.M('tasks').where("status!=?", ('1',)).count() return str(c) - def list(self): + def listApi(self): _list = public.M('tasks').where('', ()).field('id,name,type,status,addtime,start,end').limit( '0,5').order('id desc').select() _ret = {} @@ -33,12 +33,12 @@ class task_api: _ret['page'] = public.getPage(_page) return public.getJson(_ret) - def getExecLog(self): + def getExecLogApi(self): file = os.getcwd() + "/tmp/panelExec.log" v = public.getLastLine(file, 100) return v - def getTaskSpeed(self): + def getTaskSpeedApi(self): tempFile = os.getcwd() + '/tmp/panelExec.log' freshFile = os.getcwd() + '/tmp/panelFresh' diff --git a/route/__init__.py b/route/__init__.py index c92a22275..3f1a5fcdd 100755 --- a/route/__init__.py +++ b/route/__init__.py @@ -10,6 +10,10 @@ from datetime import timedelta from flask import Flask from flask import render_template +from flask import make_response +from flask import Response +from flask import session +from flask import request sys.path.append(os.getcwd() + "/class/core") import public @@ -38,11 +42,69 @@ def publicObject(toObject, func, action=None, get=None): return public.retFail('访问异常!') -@app.route("/check_login", methods=['POST', 'GET']) +@app.route("/test") +def test(): + print session + os = public.getOs() + print os + + print(sys.platform) + return public.getLocalIp() + + +@app.route("/code") +def code(): + import vilidate + vie = vilidate.vieCode() + codeImage = vie.GetCodeImage(80, 4) + try: + from cStringIO import StringIO + except: + from StringIO import StringIO + + out = StringIO() + codeImage[0].save(out, "png") + + session['code'] = public.md5("".join(codeImage[1]).lower()) + + img = Response(out.getvalue(), headers={'Content-Type': 'image/png'}) + return make_response(img) + + +@app.route("/check_login", methods=['POST']) def checkLogin(): return "true" +@app.route("/login") +def login(): + return render_template('login.html') + + +@app.route("/do_login", methods=['POST']) +def doLogin(): + username = request.form.get('username', '').strip() + password = request.form.get('password', '').strip() + code = request.form.get('code', '').strip() + print session + if session.has_key('code'): + if session['code'] != public.md5(code): + return public.returnJson(False, '验证码错误,请重新输入!') + + userInfo = public.M('users').where( + "id=?", (1,)).field('id,username,password').find() + + password = public.md5(password) + if userInfo['username'] != username or userInfo['password'] != password: + public.writeLog('TYPE_LOGIN', public.getInfo( + "< a style='color: red'>密码错误,帐号:{1},密码:{2},登录IP:{3}", (('****', '******', request.remote_addr)))) + return public.returnJson(False, public.getInfo("用户名或密码错误,您还可以尝试[{1}]次!", ('1'))) + + session['login'] = True + session['username'] = userInfo['username'] + return public.returnJson(True, '登录成功,正在跳转...') + + @app.route('//', methods=['POST', 'GET']) @app.route('//', methods=['POST', 'GET']) @app.route('/', methods=['POST', 'GET']) diff --git a/route/dashboard.py b/route/dashboard.py deleted file mode 100644 index d73be649d..000000000 --- a/route/dashboard.py +++ /dev/null @@ -1,103 +0,0 @@ -# coding:utf-8 - -import psutil -import time -import os -import sys - - -from flask import Flask, session -from flask import Blueprint, render_template -from flask import jsonify -from flask import request -from flask import make_response -from flask import Response - -sys.path.append(os.getcwd() + "/class/core/") -import public - -dashboard = Blueprint('dashboard', __name__, template_folder='templates') - - -from functools import wraps - - -def login_required(func): - - @wraps(func) - def wrapper(*args, **kwargs): - print 'test!!!' - return 'test!!!' + func(*args, **kwargs) - return wrapper - - -@dashboard.route("/test") -@login_required -def test(): - print session - os = public.getOs() - print os - - print(sys.platform) - return public.getLocalIp() - - -@dashboard.route("/") -def index(): - # if session.has_key('code'): - # print session['code'] - return render_template('default/index.html') - - -@dashboard.route("/code") -def code(): - import vilidate - vie = vilidate.vieCode() - codeImage = vie.GetCodeImage(80, 4) - try: - from cStringIO import StringIO - except: - from StringIO import StringIO - - out = StringIO() - codeImage[0].save(out, "png") - - session['code'] = public.md5("".join(codeImage[1]).lower()) - - img = Response(out.getvalue(), headers={'Content-Type': 'image/png'}) - ret = make_response(img) - return ret - - -@dashboard.route("/check_login", methods=['POST']) -def checkLogin(): - return "true" - - -@dashboard.route("/login") -def login(): - return render_template('default/login.html') - - -@dashboard.route("/do_login", methods=['POST']) -def doLogin(): - username = request.form.get('username', '').strip() - password = request.form.get('password', '').strip() - code = request.form.get('code', '').strip() - print session - if session.has_key('code'): - if session['code'] != public.md5(code): - return public.returnJson(False, '验证码错误,请重新输入!') - - userInfo = public.M('users').where( - "id=?", (1,)).field('id,username,password').find() - - password = public.md5(password) - if userInfo['username'] != username or userInfo['password'] != password: - public.writeLog('TYPE_LOGIN', public.getInfo( - "< a style='color: red'>密码错误,帐号:{1},密码:{2},登录IP:{3}", (('****', '******', request.remote_addr)))) - return public.returnJson(False, public.getInfo("用户名或密码错误,您还可以尝试[{1}]次!", ('1'))) - - session['login'] = True - session['username'] = userInfo['username'] - return public.returnJson(True, '登录成功,正在跳转...')