Skip to content

Commit 3ae8f02

Browse files
midoksmidoks
committed
up
1 parent c77d409 commit 3ae8f02

File tree

11 files changed

+103
-30
lines changed

11 files changed

+103
-30
lines changed

‎class/core/crontab_api.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,8 +500,7 @@ def week(self, param):
500500

501501
# 取任务构造Month
502502
def month(self, param):
503-
cuonConfig = "{0} {1} {2} * * ".format(
504-
param['minute'], param['hour'], param['where1'])
503+
cuonConfig = "{0} {1} {2} * * ".format(param['minute'], param['hour'], param['where1'])
505504
return cuonConfig
506505

507506
# 取执行脚本

‎data/sql/default.sql‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ CREATE TABLE IF NOT EXISTS `backup` (
66
`pid` INTEGER,
77
`filename` TEXT,
88
`size` INTEGER,
9-
`addtime` TEXT
9+
`add_time` TEXT
1010
);
1111

1212
CREATE TABLE IF NOT EXISTS `binding` (
@@ -15,7 +15,7 @@ CREATE TABLE IF NOT EXISTS `binding` (
1515
`domain` TEXT,
1616
`path` TEXT,
1717
`port` INTEGER,
18-
`addtime` TEXT
18+
`add_time` TEXT
1919
);
2020

2121

@@ -27,27 +27,27 @@ CREATE TABLE IF NOT EXISTS `crontab` (
2727
`where_hour` INTEGER,
2828
`where_minute` INTEGER,
2929
`echo` TEXT,
30-
`addtime` TEXT,
3130
`status` INTEGER DEFAULT '1',
3231
`save` INTEGER DEFAULT '3',
3332
`backup_to` TEXT DEFAULT 'off',
3433
`sname` TEXT,
3534
`sbody` TEXT,
3635
'stype' TEXT,
3736
`urladdress` TEXT
37+
`add_time` TEXT
3838
);
3939

4040
CREATE TABLE IF NOT EXISTS `firewall` (
4141
`id` INTEGER PRIMARY KEY AUTOINCREMENT,
4242
`port` TEXT,
4343
`protocol` TEXT DEFAULT 'tcp',
4444
`ps` TEXT,
45-
`addtime` TEXT
45+
`add_time` TEXT
4646
);
4747

4848
ALTER TABLE `firewall` ADD COLUMN `protocol` TEXT DEFAULT 'tcp';
4949

50-
INSERT INTO `firewall` (`id`, `port`, `protocol`, `ps`, `addtime`) VALUES
50+
INSERT INTO `firewall` (`id`, `port`, `protocol`, `ps`, `add_time`) VALUES
5151
(1, '80', 'tcp','网站默认端口', '0000-00-00 00:00:00'),
5252
(2, '443', 'tcp/udp', 'HTTPS', '0000-00-00 00:00:00');
5353

@@ -58,7 +58,7 @@ CREATE TABLE IF NOT EXISTS `logs` (
5858
`type` TEXT,
5959
`log` TEXT,
6060
`uid` INTEGER DEFAULT '1',
61-
`addtime` TEXT
61+
`add_time` TEXT
6262
);
6363
ALTER TABLE `logs` ADD COLUMN `uid` INTEGER DEFAULT '1';
6464

@@ -73,7 +73,7 @@ CREATE TABLE IF NOT EXISTS `sites` (
7373
`edate` TEXT,
7474
`ssl_effective_date` TEXT,
7575
`ssl_expiration_date` TEXT,
76-
`addtime` TEXT
76+
`add_time` TEXT
7777
);
7878

7979
ALTER TABLE `sites` ADD COLUMN `ssl_effective_date` TEXT DEFAULT '';
@@ -89,7 +89,7 @@ CREATE TABLE IF NOT EXISTS `domain` (
8989
`pid` INTEGER,
9090
`name` TEXT,
9191
`port` INTEGER,
92-
`addtime` TEXT
92+
`add_time` TEXT
9393
);
9494

9595
CREATE TABLE IF NOT EXISTS `users` (
@@ -110,11 +110,11 @@ CREATE TABLE IF NOT EXISTS `tasks` (
110110
`id` INTEGER PRIMARY KEY AUTOINCREMENT,
111111
`name` TEXT,
112112
`type` TEXT,
113-
`status` TEXT,
114-
`addtime` TEXT,
115113
`start` INTEGER,
116114
`end` INTEGER,
117-
`execstr` TEXT
115+
`cmd` TEXT,
116+
`status` INTEGER,
117+
`add_time` INTEGER
118118
);
119119

120120
CREATE TABLE IF NOT EXISTS `temp_login` (
@@ -126,7 +126,7 @@ CREATE TABLE IF NOT EXISTS `temp_login` (
126126
`login_addr` REAL,
127127
`logout_time` INTEGER,
128128
`expire` INTEGER,
129-
`addtime` INTEGER
129+
`add_time` INTEGER
130130
);
131131

132132
CREATE TABLE IF NOT EXISTS `panel` (
@@ -136,5 +136,12 @@ CREATE TABLE IF NOT EXISTS `panel` (
136136
`username` TEXT,
137137
`password` TEXT,
138138
`click` INTEGER,
139-
`addtime` INTEGER
139+
`add_time` INTEGER
140+
);
141+
142+
CREATE TABLE IF NOT EXISTS `option` (
143+
`id` INTEGER PRIMARY KEY AUTOINCREMENT,
144+
`name` TEXT,
145+
`type` TEXT,
146+
`value` TEXT
140147
);

‎web/admin/crontab/__init__.py‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,19 @@ def list():
3131
clist = Crontab.query.paginate(page=int(page), per_page=size)
3232
# print(clist)
3333

34-
return []
34+
return []
35+
36+
37+
@blueprint.route('/add', endpoint='add', methods=['GET','POST'])
38+
@panel_login_required
39+
def add():
40+
page = request.args.get('p', 1)
41+
size = 10
42+
count = Crontab.query.count()
43+
# print(count)
44+
clist = Crontab.query.paginate(page=int(page), per_page=size)
45+
# print(clist)
46+
47+
return []
48+
49+

‎web/admin/plugins/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from flask import Blueprint, render_template
1515
from flask import request
1616

17-
from utils.mwplugin import MwPlugin
17+
from utils.plugin import plugin as MwPlugin
1818
from admin.user_login_check import panel_login_required
1919

2020
from admin import model

‎web/admin/setting/setting.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@
1818
from admin import model
1919
from admin.user_login_check import panel_login_required
2020

21+
2122
import core.mw as mw
2223
import utils.config as utils_config
2324

25+
2426
# 默认页面
2527
blueprint = Blueprint('setting', __name__, url_prefix='/setting', template_folder='../../templates')
2628
@blueprint.route('/index', endpoint='index')
@@ -218,12 +220,12 @@ def set_port():
218220
msg = mw.getInfo('放行端口[{1}]成功', (port,))
219221
mw.writeLog("防火墙管理", msg)
220222
addtime = time.strftime('%Y-%m-%d %X', time.localtime())
221-
mw.M('firewall').add('port,ps,addtime', (port, "配置修改", addtime))
223+
mw.M('firewall').add('port,ps,add_time', (port, "配置修改", add_time))
222224

223225
# firewall_api.firewall_api().addAcceptPort(port)
224226
# firewall_api.firewall_api().firewallReload()
225227

226228
mw.restartMw()
227229

228-
return mw.returnJson(True, '端口保存成功!')
230+
return mw.returnData(True, '端口保存成功!')
229231

‎web/admin/site/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from admin.model import Sites
1717
from admin.user_login_check import panel_login_required
1818

19-
from utils.mwplugin import MwPlugin
19+
from utils.plugin import plugin as MwPlugin
2020
import utils.site as site
2121
import core.mw as mw
2222

‎web/thisdb/__init__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@
1212
from .option import *
1313
from .user import *
1414
from .sites import *
15+
from .tasks import *

‎web/thisdb/tasks.py‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# coding:utf-8
2+
3+
# ---------------------------------------------------------------------------------
4+
# MW-Linux面板
5+
# ---------------------------------------------------------------------------------
6+
# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
7+
# ---------------------------------------------------------------------------------
8+
# Author: midoks <[email protected]>
9+
# ---------------------------------------------------------------------------------
10+
11+
import core.mw as mw
12+
13+
def addTask(
14+
name: str | None = '常用任务',
15+
cmd: str | None = None,
16+
type: str | None = 'execshell',
17+
status: int | None = 0,
18+
):
19+
'''
20+
添加后台任务
21+
:name -> str 类型
22+
:cmd -> str 日志内容 (必填)
23+
:type -> str 用户ID
24+
'''
25+
if cmd is None:
26+
return False
27+
28+
add_time = mw.formatDate()
29+
insert_data = {
30+
'name':name,
31+
'type':type,
32+
'cmd':cmd,
33+
'start':0,
34+
'end':0,
35+
'status':status,
36+
'add_time':add_time,
37+
}
38+
mw.M('tasks').insert(insert_data)
39+
return True

‎web/utils/crontab.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# coding:utf-8
2+
3+
# ---------------------------------------------------------------------------------
4+
# MW-Linux面板
5+
# ---------------------------------------------------------------------------------
6+
# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
7+
# ---------------------------------------------------------------------------------
8+
# Author: midoks <[email protected]>
9+
# ---------------------------------------------------------------------------------

‎web/utils/firewall.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ def addAcceptPort(self, port, ps, stype,
230230
if model.getFirewallCountByPort(port) > 0:
231231
return mw.returnData(False, '您要放行的端口已存在，无需重复放行!')
232232

233-
model.addFirewall(port,ps=ps,protocol=protocol)
233+
model.addFirewall(port, ps=ps,protocol=protocol)
234234
self.addAcceptPortCmd(port, protocol=protocol)
235235
self.reload()
236236

0 commit comments

Comments
 (0)