diff --git a/class/core/public.py b/class/core/public.py index 8deedc728..89d7e01a1 100755 --- a/class/core/public.py +++ b/class/core/public.py @@ -63,8 +63,7 @@ def getLogsDir(): def getOs(): - os = execShell('uname') - return os[0].lower().strip() + return sys.platform def isAppleSystem(): diff --git a/route/__init__.py b/route/__init__.py index 592277c95..16d3ce650 100755 --- a/route/__init__.py +++ b/route/__init__.py @@ -95,8 +95,6 @@ def test(): print session os = public.getOs() print os - - print(sys.platform) return public.getLocalIp() @@ -121,11 +119,18 @@ def code(): @app.route("/check_login", methods=['POST']) def checkLogin(): - return "true" + if isLogined(): + return "true" + return "false" @app.route("/login") def login(): + + dologin = request.args.get('dologin', '') + if dologin == 'True': + session.clear() + if isLogined(): return redirect('/') return render_template('login.html') @@ -136,6 +141,7 @@ 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, '验证码错误,请重新输入!') diff --git a/route/static/app/public.js b/route/static/app/public.js index 111f4bbcd..92cb372aa 100755 --- a/route/static/app/public.js +++ b/route/static/app/public.js @@ -671,10 +671,9 @@ $(function() { $(this).addClass("fb-selected").siblings().removeClass("fb-selected") }) }); + $("#dologin").click(function() { - layer.confirm(lan.bt.loginout, {icon:3, - closeBtn: 2 - }, function() { + layer.confirm('您真的要退出面板吗?', {icon:3,closeBtn: 2}, function() { window.location.href = "/login?dologin=True" }); return false diff --git a/route/templates/default/layout.html b/route/templates/default/layout.html index 41b364bf8..15c5ae88f 100755 --- a/route/templates/default/layout.html +++ b/route/templates/default/layout.html @@ -58,15 +58,4 @@ - - \ No newline at end of file