u

class/core/config.py

@@ -8,6 +8,11 @@ import time
 from flask import Flask
 from datetime import timedelta
 
+sys.path.append(os.getcwd() + "/class/core")
+sys.setdefaultencoding('utf-8')
+import db
+import public
+
 
 class config:
     __version = '0.0.1'
@@ -24,8 +29,20 @@ class config:
         app.config['SECRET_KEY'] = os.urandom(24)
         app.config['PERMANENT_SESSION_LIFETIME'] = timedelta(days=7)
         __app = app
+
+        self.initDB()
         return app
 
+    def initDB(self):
+        try:
+            sql = db.Sql().dbfile('default')
+            csql = public.readFile('data/sql/default.sql')
+            csql_list = csql.split(';')
+            for index in range(len(csql_list)):
+                sql.execute(csql_list[index], ())
+        except Exception, ex:
+            print str(ex)
+
     def getVersion(self):
         return self.__version
 

plugins/openresty/init.d/index.html

@@ -0,0 +1 @@
+test

route/site.py

@@ -1,9 +1,16 @@
 # coding:utf-8
 
+import time
+import sys
+import os
+import json
+
 from flask import Flask
 from flask import Blueprint, render_template
 
 
+sys.path.append("class/core")
+import public
 site = Blueprint('site', __name__, template_folder='templates')
 
 
@@ -14,4 +21,15 @@ def index():
 
 @site.route('/list', methods=['POST'])
 def list():
-    return ''
+    _list = public.M('sites').where('', ()).field(
+        'id,name,path,status,ps,addtime').limit('0,5').order('id desc').select()
+    _ret = {}
+    _ret['data'] = _list
+
+    count = public.M('sites').where('', ()).count()
+    _page = {}
+    _page['count'] = count
+    _page['tojs'] = 'getWeb'
+
+    _ret['page'] = public.getPage(_page)
+    return public.getJson(_ret)

static/app/site.js

@@ -12,7 +12,7 @@ function getWeb(page, search) {
 	}else{
 		order = '';
 	}
-	var sUrl = '/site/list'
+	var sUrl = '/site/list';
 	var pdata = 'tojs=getWeb&table=sites&limit=15&p=' + page + '&search=' + search + order;
 	var loadT = layer.load();
 	//取回数据
@@ -117,7 +117,7 @@ function getWeb(page, search) {
 			$(this).hide().after("<input class='baktext' type='text' data-id='"+dataid+"' name='bak' value='" + databak + "' placeholder='"+lan.site.site_bak+"' onblur='GetBakPost(\"sites\")' />");
 			$(".baktext").focus();
 		});
-	});
+	},'json');
 }
 
 
@@ -1005,7 +1005,7 @@ function goSet(num) {
 
 
 //设置默认文档
-function SetIndex(id){
+function setIndex(id){
 	var quanju = (id==undefined)?lan.site.public_set:lan.site.local_site;
 	var data=id==undefined?"":"id="+id;
 	$.post('/site?action=GetIndex',data,function(rdata){
@@ -2444,7 +2444,7 @@ function SetRewriteTel(act){
 	});
 }
 //修改默认页
-function SiteDefaultPage(){
+function siteDefaultPage(){
 	stype = getCookie('serverType');
 	layer.open({
 		type: 1,
@@ -2460,6 +2460,7 @@ function SiteDefaultPage(){
 				</div>'
 	});
 }
+
 function changeDefault(type){
 	var vhref='';
 	switch(type){
@@ -2479,5 +2480,5 @@ function changeDefault(type){
 			vhref = '/www/server/stop/index.html';
 			break;
 	}
-	OnlineEditFile(0,vhref);
+	onlineEditFile(0,vhref);
 }

templates/default/database.html

@@ -59,24 +59,22 @@
 		</div>
 	</div>
 </div>
+
+<script type="text/javascript" src="/static/app/data.js?v={{config.version}}"></script>
+<script type="text/javascript" src="/static/app/files.js?v={{config.version}}></script>
 <script type="text/javascript">
-	setCookie('backup_path',"$web.ctx.session.config['backup_path']");
-</script>
-<script type="text/javascript" src="/static/js/data.js?date=20180725"></script>
-<script type="text/javascript" src="/static/js/files.js?date=20180124"></script>
-<script type="text/javascript">
-	$if not tData['isSetup']:
-		layer.msg('$tData["lan"]["JS1"]<a href="/soft#i" style="color:#20a53a;float: right;">$tData["lan"]["JS2"]</a>',{icon:7,shade: [0.3, '#000'],time:0});
-		$$(".layui-layer-shade").css("margin-left","180px");
+	// $if not tData['isSetup']:
+		// layer.msg('$tData["lan"]["JS1"]<a href="/soft#i" style="color:#20a53a;float: right;">$tData["lan"]["JS2"]</a>',{icon:7,shade: [0.3, '#000'],time:0});
+		// $(".layui-layer-shade").css("margin-left","180px");
 	setTimeout(function(){
 		getData(1);
 	},300);
 	
-	$$("#dataRecycle").click(function(){
+	$("#dataRecycle").click(function(){
 		setTimeout(function(){
 			Recycle_bin(6);
 		},1000);
-	});
+	// });
 </script>
-<script src="/static/js/upload.js?date=20180124"></script>
+<script src="/static/app/upload.js?v={{config.version}}"></script>
 {% endblock %}

templates/default/site.html

@@ -21,8 +21,8 @@
 						<p><span class="glyphicon glyphicon-alert" style="color:#f39c12; margin-right:10px;"></span>使用mdserver-web|linux面板创建站点时会自动创建权限配置，统一使用www用户。</p>
 					</div>
 					<button onclick="webAdd(0)" class="btn btn-success btn-sm btn-title" type="button">添加站点</button>&nbsp;
-					<button onclick="SiteDefaultPage()" class="btn btn-default btn-sm btn-title" type="button">修改默认页</button>
-					<button onclick="GetDefaultSite()" class="btn btn-default btn-sm btn-title" type="button">默认站点</button>
+					<button onclick="siteDefaultPage()" class="btn btn-default btn-sm btn-title" type="button">修改默认页</button>
+					<button onclick="getDefaultSite()" class="btn btn-default btn-sm btn-title" type="button">默认站点</button>
 					<span id="allDelete" style="float: right;display: none;">
 						<button onclick="allDeleteSite();" class="btn btn-default btn-sm">网站搜索</button>
 					</span>
@@ -54,8 +54,8 @@
 		</div>
 	</div>
 		<script type="text/javascript" src="/static/laydate/laydate.js?v={{config.version}}"></script>
-		<script type="text/javascript" src="/static/js/ftp.js?v={{config.version}}"></script>
-		<script type="text/javascript" src="/static/js/site.js?v={{config.version}}"></script>
+		<script type="text/javascript" src="/static/app/ftp.js?v={{config.version}}"></script>
+		<script type="text/javascript" src="/static/app/site.js?v={{config.version}}"></script>
 		<script type="text/javascript">
 		// $if not tData['isSetup']:
 		// layer.msg('$tData["lan"]["JS1"]<a href="/soft" style="color:#20a53a; float: right;">$tData["lan"]["JS2"]</a>',{icon:7,shade: [0.3, '#000'],time:0});
@@ -64,7 +64,5 @@
 		setTimeout(function(){
 			getWeb(1);
 		},500);
-		
-		setCookie('serverType','$web.ctx.session.webserver');
 	</script>
 {% endblock %}