update

web/admin/crontab/__init__.py

@@ -10,6 +10,9 @@
 
 
 from flask import Blueprint, render_template
+from flask import request
+
+from admin.model import Crontab
 
 blueprint = Blueprint('crontab', __name__, url_prefix='/crontab', template_folder='../../templates/default')
 @blueprint.route('/index', endpoint='index')
@@ -19,4 +22,11 @@ def index():
 # 插件列表
 @blueprint.route('/list', endpoint='list', methods=['GET','POST'])
 def list():
+    page = request.args.get('p', 1)
+    size = 10
+    count = Crontab.query.count()
+    print(count)
+    clist = Crontab.query.paginate(page=int(page), per_page=size)
+    print(clist)
+
     return []

web/admin/model/__init__.py

@@ -48,10 +48,10 @@ class User(db.Model):
     """定义登录用户"""
     __tablename__ = 'user'
     id = db.Column(db.Integer(), primary_key=True,autoincrement=True, comment="ID")
-    name = db.Column(db.String(128), unique=True, nullable=False)
+    name = db.Column(db.String(128), unique=True, nullable=False, comment="用户名")
-    password = db.Column(db.String(128), unique=False, nullable=False)
+    password = db.Column(db.String(128), unique=False, nullable=False, comment="密码")
-    login_ip = db.Column(db.String(128), unique=False, nullable=True)
+    login_ip = db.Column(db.String(128), unique=False, nullable=True, comment="登录IP")
-    login_time = db.Column(db.String(128), unique=False, nullable=True)
+    login_time = db.Column(db.String(128), unique=False, nullable=True, comment="登录时间")
     phone = db.Column(db.String(20), unique=False, nullable=False,comment="手机")
     email = db.Column(db.String(320), nullable=False, comment="邮件")
 
@@ -75,6 +75,37 @@ class Crontab(db.Model):
     add_time = db.Column(db.TEXT, nullable=False, comment="添加时间")
     update_time = db.Column(db.TEXT, nullable=False, comment="添加时间")
 
+class Logs(db.Model):
+    """定义日志"""
+    __tablename__ = 'logs'
+    id = db.Column(db.Integer(), primary_key=True,autoincrement=True, comment="ID")
+    uid = db.Column(db.Integer(), unique=True, nullable=False, comment="用户ID")
+    type = db.Column(db.String(128), unique=False, nullable=False, comment="日志类型")
+    log = db.Column(db.TEXT, unique=False, nullable=True, comment="日志内容")
+    add_time = db.Column(db.TEXT, nullable=False, comment="添加时间")
+
+class Firewall(db.Model):
+    """定义防火墙"""
+    __tablename__ = 'firewall'
+    id = db.Column(db.Integer(), primary_key=True,autoincrement=True, comment="ID")
+    port = db.Column(db.Integer(), unique=True, nullable=False, comment="端口")
+    protocol = db.Column(db.Integer(), unique=True, nullable=False, comment="协议/tcp/udp")
+    ps = db.Column(db.TEXT, unique=False, nullable=False, comment="备注")
+    add_time = db.Column(db.TEXT, nullable=False, comment="添加时间")
+    update_time = db.Column(db.TEXT, nullable=False, comment="更新时间")
+
+
+class Backup(db.Model):
+    """定义备份"""
+    __tablename__ = 'backup'
+    id = db.Column(db.Integer(), primary_key=True,autoincrement=True, comment="ID")
+    pid = db.Column(db.Integer(), unique=False, nullable=False, comment="父级ID")
+    type = db.Column(db.String(128), unique=False, nullable=False, comment="备份类型")
+    name = db.Column(db.TEXT, unique=False, nullable=False, comment="名称")
+    filename = db.Column(db.TEXT, unique=False, nullable=False, comment="文件绝对位置")
+    size = db.Column(db.Integer(), unique=False, nullable=False, comment="大小")
+    add_time = db.Column(db.TEXT, nullable=False, comment="添加时间")
+
 
 
 

web/admin/plugins/__init__.py

@@ -14,6 +14,7 @@ from flask import Blueprint, render_template
 from flask import request
 
 from utils.mwplugin import MwPlugin
+from admin.user_login_check import panel_login_required
 
 import core.mw as mw
 
@@ -21,6 +22,7 @@ pg = MwPlugin.instance()
 
 blueprint = Blueprint('plugins', __name__, url_prefix='/plugins', template_folder='../../templates/default')
 @blueprint.route('/index', endpoint='index')
+@panel_login_required
 def index():
     return render_template('plugins.html', data={})
 

web/admin/submodules.py

@@ -1,3 +1,13 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
 
 from .dashboard import blueprint as DashboardModule
 from .site import blueprint as SiteModule

web/admin/user_login_check.py

@@ -0,0 +1,18 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+from functools import wraps
+
+def panel_login_required(func):
+
+    def wrapper(*args, **kwargs):
+        return func(*args, **kwargs)
+
+    return wrapper

web/static/app/crontab.js

@@ -86,7 +86,7 @@ function getCronData(page){
 		layer.close(load);
 		var cbody = "";
 		if(rdata == ""){
-			cbody="<tr><td colspan='6'>"+lan.crontab.task_empty+"</td></tr>";
+			cbody="<tr><td colspan='9' style='text-align: center;'>"+lan.crontab.task_empty+"</td></tr>";
 		} else {
 			for(var i=0;i<rdata.data.length;i++){
 				//状态

web/version.py

@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 0
+APP_SMALL_VERSION = 0.3
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布。
 APP_SUFFIX = ''