update

web/admin/setup/sql/default.sql

@@ -0,0 +1,146 @@
+
+CREATE TABLE IF NOT EXISTS `backup` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `type` INTEGER,
+  `name` TEXT,
+  `pid` INTEGER,
+  `filename` TEXT,
+  `size` INTEGER,
+  `add_time` TEXT
+);
+
+CREATE TABLE IF NOT EXISTS `binding` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `pid` INTEGER,
+  `domain` TEXT,
+  `path` TEXT,
+  `port` INTEGER,
+  `add_time` TEXT
+);
+
+
+CREATE TABLE IF NOT EXISTS `crontab` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` TEXT,
+  `type` TEXT,
+  `where1` TEXT,
+  `where_hour` INTEGER,
+  `where_minute` INTEGER,
+  `echo` TEXT,
+  `status` INTEGER DEFAULT '1',
+  `save` INTEGER DEFAULT '3',
+  `backup_to` TEXT DEFAULT 'off', 
+  `sname` TEXT,
+  `sbody` TEXT,
+  'stype' TEXT,
+  `url_address` TEXT,
+  `add_time` TEXT,
+  `update_time` TEXT
+);
+
+CREATE TABLE IF NOT EXISTS `firewall` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `port` TEXT,
+  `protocol` TEXT DEFAULT 'tcp',
+  `ps` TEXT,
+  `add_time` TEXT,
+  `update_time` TEXT
+);
+
+ALTER TABLE `firewall` ADD COLUMN `protocol` TEXT DEFAULT 'tcp';
+
+INSERT INTO `firewall` (`id`, `port`, `protocol`, `ps`, `add_time`) VALUES
+(1, '80',  'tcp','网站默认端口', '0000-00-00 00:00:00','0000-00-00 00:00:00'),
+(2, '443', 'tcp/udp', 'HTTPS', '0000-00-00 00:00:00','0000-00-00 00:00:00');
+
+
+
+CREATE TABLE IF NOT EXISTS `logs` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `type` TEXT,
+  `log` TEXT,
+  `uid` INTEGER DEFAULT '1',
+  `add_time` TEXT
+);
+
+CREATE TABLE IF NOT EXISTS `sites` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` TEXT,
+  `path` TEXT,
+  `status` TEXT,
+  `index` TEXT,
+  `type_id` INTEGER,
+  `ps` TEXT,
+  `edate` TEXT,
+  `ssl_effective_date` TEXT,
+  `ssl_expiration_date` TEXT,
+  `add_time` TEXT,
+  `update_time` TEXT
+);
+
+CREATE TABLE IF NOT EXISTS `site_types` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` TEXT
+);
+
+CREATE TABLE IF NOT EXISTS `domain` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `pid` INTEGER,
+  `name` TEXT,
+  `port` INTEGER,
+  `add_time` TEXT
+);
+
+CREATE TABLE IF NOT EXISTS `users` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` TEXT,
+  `password` TEXT,
+  `login_ip` TEXT,
+  `login_time` TEXT,
+  `phone` TEXT,
+  `email` TEXT,
+  `add_time` INTEGER,
+  `update_time` INTEGER
+);
+
+CREATE TABLE IF NOT EXISTS `tasks` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` 			TEXT,
+  `type`			TEXT,
+  `start` 	  INTEGER,
+  `end` 	    INTEGER,
+  `cmd` 	    TEXT,
+  `status`    INTEGER,
+  `add_time`  INTEGER
+);
+
+CREATE TABLE IF NOT EXISTS `temp_login` (
+  `id`  INTEGER PRIMARY KEY AUTOINCREMENT,
+  `token` REAL,
+  `salt`  REAL,
+  `state` INTEGER,
+  `login_time`  INTEGER,
+  `login_addr`  REAL,
+  `logout_time` INTEGER,
+  `expire`  INTEGER,
+  `add_time` INTEGER
+);
+
+CREATE TABLE IF NOT EXISTS `panel` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `title` TEXT,
+  `url` TEXT,
+  `username` TEXT,
+  `password` TEXT,
+  `click` INTEGER,
+  `add_time` INTEGER
+);
+
+CREATE TABLE IF NOT EXISTS `option` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` TEXT,
+  `type` TEXT,
+  `value` TEXT
+);
+
+CREATE UNIQUE INDEX name_idx ON option(name);

web/admin/setup/sql/system.sql

@@ -0,0 +1,41 @@
+CREATE TABLE IF NOT EXISTS `network` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `up` TEXT,
+  `down` TEXT,
+  `total_up` INTEGER,
+  `total_down` INTEGER,
+  `down_packets` INTEGER,
+  `up_packets` INTEGER,
+  `addtime` INTEGER
+);
+CREATE INDEX addtime_idx ON network(`addtime`);
+
+CREATE TABLE IF NOT EXISTS `cpuio` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `pro` TEXT,
+  `mem` TEXT,
+  `addtime` INTEGER
+);
+CREATE INDEX addtime_idx ON cpuio(`addtime`);
+
+CREATE TABLE IF NOT EXISTS `diskio` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `read_count` INTEGER,
+  `write_count` INTEGER,
+  `read_bytes` INTEGER,
+  `write_bytes` INTEGER,
+  `read_time` INTEGER,
+  `write_time` INTEGER,
+  `addtime` INTEGER
+);
+CREATE INDEX addtime_idx ON diskio(`addtime`);
+
+CREATE TABLE IF NOT EXISTS `load_average` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `pro` REAL,
+  `one` REAL,
+  `five` REAL,
+  `fifteen` REAL,
+  `addtime` INTEGER
+);
+CREATE INDEX addtime_idx ON load_average(`addtime`);

web/thisdb/init.py

@@ -17,11 +17,10 @@ def initPanelData():
     _dbfile = mw.getPanelDataDir() + '/panel.db'
     if os.path.exists(_dbfile):
         return True
-    sql_file = mw.getPanelDataDir() + '/sql/default.sql'
+    sql_file = mw.getPanelDir() + '/web/admin/setup/sql/default.sql'
     sql = mw.M().dbPos(mw.getPanelDataDir(),'panel')
     csql = mw.readFile(sql_file)
     csql_list = csql.split(';')
     for index in range(len(csql_list)):
-        print(index)
         sql.execute(csql_list[index], ())
     return True

web/utils/system/monitor.py

@@ -53,7 +53,7 @@ class monitor:
     def initDBFile(self):
         if os.path.exists(self._dbfile):
             return True
-        sql_file = mw.getPanelDataDir() + '/sql/system.sql'
+        sql_file = mw.getPanelDir() + '/web/admin/setup/sql/system.sql'
         sql = db.Sql().dbPos(mw.getPanelDataDir(),'system')
         csql = mw.readFile(sql_file)
         csql_list = csql.split(';')