From f4dfe502cb3433e3e5ec2ae3de70ebef770bf353 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Wed, 5 Dec 2018 17:34:32 +0800 Subject: [PATCH] u --- class/core/config.py | 17 +++++++++++++++++ data/default.bak.db | Bin 17408 -> 0 bytes plugins/openresty/init.d/index.html | 1 + route/site.py | 20 +++++++++++++++++++- static/app/site.js | 11 ++++++----- templates/default/database.html | 20 +++++++++----------- templates/default/site.html | 10 ++++------ 7 files changed, 56 insertions(+), 23 deletions(-) delete mode 100755 data/default.bak.db create mode 100755 plugins/openresty/init.d/index.html diff --git a/class/core/config.py b/class/core/config.py index 2e581175f..36097e952 100644 --- a/class/core/config.py +++ b/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 diff --git a/data/default.bak.db b/data/default.bak.db deleted file mode 100755 index d673496b5ab1f0d03cbd881004af0f67b1d05baf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17408 zcmeHN-A~(A6t{B|l291q0a>VGu~Z>}%7^Vh2uPDkyR<_sltNI)q>UKI0gJ>Av9r*< z1*EFlG;Mp^r1pWWlO`c`f50^LvG04>+g>KMY5#!jWiLCvHwm^WrEW9|=w8{^*T?tc zoZmU;+BqkSw{B>b%IAzyLALlf6J%JHxy17f!*s#f4QHctKqJ_=fh+51AJ*(*hW{E2 z!P5Zx$L`aG{w0mW22eUhfFf`V2t*^WNF>y0FXi;=V_2FlK@p$`oD2kP|3~Og2K|j{ zaG`}FKoK}A2t*L#qGeMpnH>St$L6$>T9NblP?SZzQN_@6+8TZTpA}_OIVb}D5wQKA zMSn1G&_WTQ2%HH72G}seUFeT+`kJP1jaDj^(N$U5C>L=PZcBz?$=QOY)A#?GP&gHW zBJf5CQ2&1;*ytdNz?ne6_Wuxbk74eyH`(35ZPfR6#HxP4hPmEec3ZLJ)x1i+R!AMV zvXGiir}*^rrEpq=M4S~kPa%%xM;QVab2!p!XS!ZLq7waia1rEkv6!NA$n zTzbgvY27KR&AynT%LSmMQy-BIMaNwDc}~l#o<64bxn~kNo3*sYJne(?fi~{qMRpkr zVQ%Ijx4L4gn`Kp3RL?DPiRF1XU@trbBL}N-6z0yKXSd%cz-W3_)7MtXCFq(XQ>XgI z=78u~qabU#6CBxEcitK$%MGRnhw7CeQKyW#Cb1?`hul09qHmTf>MF#wK2u8$u83u< z6y3axPewmC)gXzHE6cR8`gu#{?cl+5V5%Ck*=}@DL^5j_=b| zTSlPzaa)*+#n>H$Ej4SqoouRRvk`V%Ym@HVUJvXQ9s{<+%^p%wHqDArf~~q~*RrCh z#k!wi`z?Yq?mu;Js@1M=nCt6ftD9K3Mi{$sZFh^-Ap4gLZ)!~@Udhq5NSN#CVYllX zSw%Ak=Q$52K=RLp_ce4hnBEPqzPG)WB)0zt(Gr7xM|$iA_kU}urlTnW zrx^k2|EF1dly{0iYY0&PZw)^>nj&zT5upBmnzcuHrwFu$fbIVwro;r^3;cvWWtX7& zKbLBzGt6-uyA#9FTuU}LOk8!lqo zS_C!{?F7&37*Cwh!&Rr75lr*V$$iSWL$k_wU5fi6pu>O+Wya?T?P(XC;}9LlZL=2Y=q%v`{P~1`2V_+D8;3mG&v!U z!y!+M#gmg`vY?L1NkPmhadA=_5fjM~VMG)pK}-yb(y%D-;`o#(O^qi6DLFBjkj4{< XOPiY`icz57|0hl1lpl(~@geXZ>^V8& diff --git a/plugins/openresty/init.d/index.html b/plugins/openresty/init.d/index.html new file mode 100755 index 000000000..30d74d258 --- /dev/null +++ b/plugins/openresty/init.d/index.html @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/route/site.py b/route/site.py index 4a28918a3..5f907cb55 100644 --- a/route/site.py +++ b/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) diff --git a/static/app/site.js b/static/app/site.js index c24b3bc0a..7d8e5512a 100755 --- a/static/app/site.js +++ b/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(""); $(".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(){ ' }); } + 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); } \ No newline at end of file diff --git a/templates/default/database.html b/templates/default/database.html index 5df634c65..1340cf5c5 100755 --- a/templates/default/database.html +++ b/templates/default/database.html @@ -59,24 +59,22 @@ + + + - - - - + {% endblock %} diff --git a/templates/default/site.html b/templates/default/site.html index 314c9caaa..08f627b32 100755 --- a/templates/default/site.html +++ b/templates/default/site.html @@ -21,8 +21,8 @@

使用mdserver-web|linux面板创建站点时会自动创建权限配置，统一使用www用户。

  - - + + @@ -54,8 +54,8 @@ - - + + {% endblock %} \ No newline at end of file