update

.gitignore

@@ -112,3 +112,4 @@ data/json/index.json
 *.zip
 data/*.db
 data/control.conf
+scripts/init.d/mw

class/core/config.py

@@ -31,6 +31,8 @@ class config:
         __app = app
 
         self.initDB()
+
+        self.initInitD()
         return app
 
     def initDB(self):
@@ -43,6 +45,19 @@ class config:
         except Exception, ex:
             print str(ex)
 
+    def initUser(self):
+        pass
+
+    def initInitD(self):
+        script = public.getRunDir() + '/scripts/init.d/mw.tpl'
+        script_bin = public.getRunDir() + '/scripts/init.d/mw'
+
+        content = public.readFile(script)
+        content = content.replace("{$SERVER_PATH}", public.getRunDir())
+
+        public.writeFile(script_bin, content)
+        public.execShell('chmod +x ' + script_bin)
+
     def getVersion(self):
         return self.__version
 

data/port.pl

@@ -0,0 +1 @@
+7200

plugins/csvn/js/csvn.js

@@ -325,6 +325,10 @@ function csvnAclDel(pname, uname){
     });
 }
 
+function csvnAclSet(pname){
+
+}
+
 function csvnAclProject(pname){
     csvnPost('project_acl_list', {'name':pname}, function(data){
     
@@ -335,6 +339,7 @@ function csvnAclProject(pname){
 
         var list = '';
         for (i in rdata) {
+            var user = rdata[i]['user'];
             var acl = '';
             if (rdata[i]['acl'] == 'r'){
                 acl += '<input type="checkbox" id="owner_r" checked="true"> 只读  |  <input type="checkbox" id="owner_r"> 读写';
@@ -342,8 +347,8 @@ function csvnAclProject(pname){
                 acl += '<input type="checkbox" id="owner_r"> 只读  |  <input type="checkbox" id="owner_r" checked="true"> 读写';
             }
 
-            list += '<tr><td>'+rdata[i]['user']+'</td><td>' + acl +'</td>'+
-                '<td><a class="btlink" onclick="csvnAclDel(\''+pname+'\',\''+rdata[i]['user']+'\')">删除</a></td>'+'</tr>';
+            list += '<tr><td>'+user+'</td><td>' + acl +'</td>'+
+                '<td><a class="btlink" onclick="csvnAclDel(\''+pname+'\',\''+user+'\')">删除</a></td>'+'</tr>';
         }
 
         var loadOpen = layer.open({

route/dashboard.py

@@ -79,8 +79,21 @@ def login():
 
 @dashboard.route("/do_login", methods=['POST'])
 def doLogin():
-    print request.args
-
-    # return "123"
-    # return public.returnJson(False, 'LOGIN_USER_EMPTY')
-    return public.returnJson(True, 'LOGIN_SUCCESS')
+    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'>密码错误</a>,帐号:{1},密码:{2},登录IP:{3}", (('****', '******', request.remote_addr))))
+        return public.returnJson(False, public.getInfo("用户名或密码错误,您还可以尝试[{1}]次!", ('1')))
+
+    return public.returnJson(True, '登录成功,正在跳转...')

scripts/init.d/mw.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
-
-curPath=`pwd`
-rootPath=$(dirname "$curPath")

scripts/init.d/mw.tpl

@@ -0,0 +1,35 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+
+mw_path={$SERVER_PATH}
+
+mw_start(){
+	isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`
+	if [ "$isStart" == '' ];then
+            echo -e "Starting mw... \c"
+            cd $mw_path && gunicorn -c setting.py app:app &
+            sleep 0.1
+            port=$(cat ${mw_path}/data/port.pl)
+            isStart=$(lsof -i :$port|grep LISTEN)
+            if [ "$isStart" == '' ];then
+                    echo -e "\033[31mfailed\033[0m"
+                    echo '------------------------------------------------------'
+                    tail -n 20 $panel_path/logs/error.log
+                    echo '------------------------------------------------------'
+                    echo -e "\033[31mError: mw service startup failed.\033[0m"
+                    return;
+            fi
+            echo -e "\033[32mdone\033[0m"
+    else
+            echo "Starting mw... mw(pid $(echo $isStart)) already running"
+    fi
+}
+
+
+
+
+case "$1" in
+    'start')
+        mw_start
+        ;;
+esac

setting.py

@@ -0,0 +1,27 @@
+import os
+import time
+import sys
+sys.path.append(os.getcwd() + '/class/core')
+import public
+
+
+bt_port = public.readFile('data/port.pl')
+bind = ['0.0.0.0:%s' % bt_port]
+workers = 1
+threads = 1
+backlog = 512
+reload = False
+daemon = False
+timeout = 7200
+keepalive = 1
+# worker_class = 'geventwebsocket.gunicorn.workers.GeventWebSocketWorker'
+chdir = os.getcwd()
+# capture_output = True
+# access_log_format = '%(t)s %(p)s %(h)s "%(r)s" %(s)s %(L)s %(b)s %(f)s" "%(a)s"'
+# loglevel = 'info'
+# errorlog = chdir + '/logs/error.log'
+# accesslog = chdir + '/logs/access.log'
+# pidfile = chdir + '/logs/panel.pid'
+# if os.path.exists(chdir + '/data/ssl.pl'):
+#     certfile = 'ssl/certificate.pem'
+#     keyfile = 'ssl/privateKey.pem'

start.sh

@@ -1,7 +1,4 @@
 #!/bin/sh
 
-gunicorn -b :7200 app:app &
-
+gunicorn -c setting.py app:app &
 python task.py &
-
-#open "http://127.0.0.1:7200"

task.py

@@ -7,7 +7,7 @@ import sys
 import os
 import json
 import time
-print sys.path
+# print sys.path
 
 sys.path.append("/usr/local/lib/python2.7/site-packages")
 import psutil

templates/default/login.html

@@ -10,10 +10,6 @@
 <title>mdserver-web</title>
 <link rel="stylesheet" type="text/css" href="/static/css/site.css?v={{config.version}}">
 <link rel="stylesheet" type="text/css" href="/static/css/login.css?v={{config.version}}">
-
-</head>
-
-<body>
 <style type="text/css">
 @media screen and (max-width: 640px) {
     .scanCode{
@@ -135,6 +131,8 @@
 	margin-bottom: 25px;
 }
 </style>
+</head>
+<body>
 <div class="main">
 	<div class="login">
 		<div class="account">
@@ -179,8 +177,7 @@
 window.onresize=function(){
 	Wreset();
 }
-	</script>
-	<script type="text/javascript">
+
 $(function(){
 	$(".loginform").Validform({
 		tiptype:function(msg,o,cssctl){
@@ -205,10 +202,9 @@
 	var data = 'username='+username+'&password='+password+'&code='+code;
 	var loadT = layer.msg("正在登录中",{icon:16,time:0,shade: [0.3, '#000']});
 	$.post('/do_login',data,function(rdata){
-			console.log(rdata);
 		layer.close(loadT);
 		if(!rdata.status){
-				if(username == 'admin' && rdata.msg.indexOf('用户名') != -1) rdata.msg += ', <br>获取默认用户和密码命令： bt default';
+			if(username == 'admin' && rdata.msg.indexOf('用户名') != -1) rdata.msg += ', <br>获取默认用户和密码命令： mw default';
 			$("#errorStr").html(rdata.msg);
 			$("input[name='password']").val('');
 			num = rdata.msg.substring(rdata.msg.indexOf('[')+1,rdata.msg.indexOf(']'))