Merge branch '2.4dev' into 2.3opt

eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/PictureServiceImpl.java → eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java

-package me.zhengjie.modules.tools.service.impl;
+package me.zhengjie.service.impl;
 
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.modules.tools.domain.Picture;
-import me.zhengjie.modules.tools.repository.PictureRepository;
-import me.zhengjie.modules.tools.service.PictureService;
-import me.zhengjie.modules.tools.service.dto.PictureQueryCriteria;
+import me.zhengjie.domain.Picture;
+import me.zhengjie.repository.PictureRepository;
+import me.zhengjie.service.PictureService;
+import me.zhengjie.service.dto.PictureQueryCriteria;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.utils.*;
 import org.springframework.cache.annotation.CacheConfig;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/QiNiuServiceImpl.java → eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java

-package me.zhengjie.modules.tools.service.impl;
+package me.zhengjie.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.qiniu.common.QiniuException;
@@ -9,14 +9,14 @@ import com.qiniu.storage.UploadManager;
 import com.qiniu.storage.model.DefaultPutRet;
 import com.qiniu.storage.model.FileInfo;
 import com.qiniu.util.Auth;
-import me.zhengjie.modules.tools.domain.QiniuConfig;
-import me.zhengjie.modules.tools.domain.QiniuContent;
-import me.zhengjie.modules.tools.repository.QiniuContentRepository;
-import me.zhengjie.modules.tools.service.dto.QiniuQueryCriteria;
-import me.zhengjie.modules.tools.utils.QiNiuUtil;
+import me.zhengjie.domain.QiniuConfig;
+import me.zhengjie.domain.QiniuContent;
+import me.zhengjie.repository.QiniuContentRepository;
+import me.zhengjie.service.dto.QiniuQueryCriteria;
+import me.zhengjie.utils.QiNiuUtil;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.tools.repository.QiNiuConfigRepository;
-import me.zhengjie.modules.tools.service.QiNiuService;
+import me.zhengjie.repository.QiNiuConfigRepository;
+import me.zhengjie.service.QiNiuService;
 import me.zhengjie.utils.FileUtil;
 import me.zhengjie.utils.PageUtil;
 import me.zhengjie.utils.QueryHelp;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/VerificationCodeServiceImpl.java → eladmin-tools/src/main/java/me/zhengjie/service/impl/VerificationCodeServiceImpl.java

-package me.zhengjie.modules.tools.service.impl;
+package me.zhengjie.service.impl;
 
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.RandomUtil;
@@ -6,11 +6,11 @@ import cn.hutool.extra.template.Template;
 import cn.hutool.extra.template.TemplateConfig;
 import cn.hutool.extra.template.TemplateEngine;
 import cn.hutool.extra.template.TemplateUtil;
-import me.zhengjie.modules.tools.domain.VerificationCode;
-import me.zhengjie.modules.tools.domain.vo.EmailVo;
+import me.zhengjie.domain.vo.EmailVo;
+import me.zhengjie.domain.VerificationCode;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.tools.repository.VerificationCodeRepository;
-import me.zhengjie.modules.tools.service.VerificationCodeService;
+import me.zhengjie.repository.VerificationCodeRepository;
+import me.zhengjie.service.VerificationCodeService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/mapper/LocalStorageMapper.java → eladmin-tools/src/main/java/me/zhengjie/service/mapper/LocalStorageMapper.java

-package me.zhengjie.modules.tools.service.mapper;
+package me.zhengjie.service.mapper;
 
 import me.zhengjie.base.BaseMapper;
-import me.zhengjie.modules.tools.service.dto.LocalStorageDTO;
-import me.zhengjie.modules.tools.domain.LocalStorage;
+import me.zhengjie.service.dto.LocalStorageDTO;
+import me.zhengjie.domain.LocalStorage;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 

eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/AliPayStatusEnum.java → eladmin-tools/src/main/java/me/zhengjie/utils/AliPayStatusEnum.java

-package me.zhengjie.modules.tools.utils;
+package me.zhengjie.utils;
 
 /**
  * 支付状态

eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/AlipayUtils.java → eladmin-tools/src/main/java/me/zhengjie/utils/AlipayUtils.java

-package me.zhengjie.modules.tools.utils;
+package me.zhengjie.utils;
 
 import com.alipay.api.AlipayApiException;
 import com.alipay.api.internal.util.AlipaySignature;
-import me.zhengjie.modules.tools.domain.AlipayConfig;
+import me.zhengjie.domain.AlipayConfig;
 import org.springframework.stereotype.Component;
 import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/QiNiuUtil.java → eladmin-tools/src/main/java/me/zhengjie/utils/QiNiuUtil.java

-package me.zhengjie.modules.tools.utils;
+package me.zhengjie.utils;
 
 import com.qiniu.storage.Region;
 import me.zhengjie.utils.FileUtil;

pom.xml

@@ -15,7 +15,8 @@
         <module>eladmin-system</module>
         <module>eladmin-tools</module>
 		<module>eladmin-monitor</module>
-	</modules>
+        <module>eladmin-generator</module>
+    </modules>
 
     <name>EL-ADMIN后台管理系统</name>
     <url>http://auauz.net</url>

sql/eladmin.sql

@@ -11,7 +11,7 @@
  Target Server Version : 50562
  File Encoding         : 65001
 
- Date: 31/10/2019 12:24:38
+ Date: 08/11/2019 21:19:49
 */
 
 SET NAMES utf8mb4;
@@ -52,7 +52,7 @@ CREATE TABLE `dept`  (
   `enabled` bit(1) NOT NULL,
   `create_time` datetime NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 14 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 12 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Records of dept
@@ -75,7 +75,7 @@ CREATE TABLE `dict`  (
   `remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '描述',
   `create_time` datetime NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Records of dict
@@ -98,7 +98,7 @@ CREATE TABLE `dict_detail`  (
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `FK5tpkputc6d9nboxojdbgnpmyb`(`dict_id`) USING BTREE,
   CONSTRAINT `FK5tpkputc6d9nboxojdbgnpmyb` FOREIGN KEY (`dict_id`) REFERENCES `dict` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT
-) ENGINE = InnoDB AUTO_INCREMENT = 17 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 15 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Records of dict_detail
@@ -124,6 +124,11 @@ CREATE TABLE `email_config`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
 
+-- ----------------------------
+-- Records of email_config
+-- ----------------------------
+INSERT INTO `email_config` VALUES (1, '**', '**', '**', '465', 'eladmin');
+
 -- ----------------------------
 -- Table structure for gen_config
 -- ----------------------------
@@ -143,7 +148,7 @@ CREATE TABLE `gen_config`  (
 -- ----------------------------
 -- Records of gen_config
 -- ----------------------------
-INSERT INTO `gen_config` VALUES (1, 'Zheng Jie', b'0', 'eladmin-system', 'me.zhengjie.test', 'E:\\workspace\\me\\front\\eladmin-qt\\src\\views\\test1111', 'E:\\workspace\\me\\front\\eladmin-qt\\src\\api', NULL);
+INSERT INTO `gen_config` VALUES (1, 'Zheng Jie', b'0', 'eladmin-system', 'me.zhengjie.test', 'E:\\workspace\\me\\front\\eladmin-web\\src\\views\\test', 'E:\\workspace\\me\\front\\eladmin-web\\src\\api', NULL);
 
 -- ----------------------------
 -- Table structure for job
@@ -159,7 +164,7 @@ CREATE TABLE `job`  (
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `FKmvhj0rogastlctflsxf1d6k3i`(`dept_id`) USING BTREE,
   CONSTRAINT `FKmvhj0rogastlctflsxf1d6k3i` FOREIGN KEY (`dept_id`) REFERENCES `dept` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT
-) ENGINE = InnoDB AUTO_INCREMENT = 14 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Records of job
@@ -185,7 +190,7 @@ CREATE TABLE `local_storage`  (
   `operate` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '操作人',
   `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Table structure for log
@@ -205,7 +210,7 @@ CREATE TABLE `log`  (
   `address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `browser` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 17040 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 17373 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Table structure for menu
@@ -239,8 +244,8 @@ INSERT INTO `menu` VALUES (3, b'0', '角色管理', 'system/role/index', 1, 3, '
 INSERT INTO `menu` VALUES (5, b'0', '菜单管理', 'system/menu/index', 1, 5, 'menu', 'menu', b'0', b'0', 'Menu', '2018-12-18 15:17:28', 'menu:list', 1);
 INSERT INTO `menu` VALUES (6, b'0', '系统监控', NULL, 0, 10, 'monitor', 'monitor', b'0', b'0', NULL, '2018-12-18 15:17:48', NULL, 0);
 INSERT INTO `menu` VALUES (7, b'0', '操作日志', 'monitor/log/index', 6, 11, 'log', 'logs', b'0', b'0', 'Log', '2018-12-18 15:18:26', NULL, 1);
-INSERT INTO `menu` VALUES (8, b'0', '系统缓存', 'monitor/redis/index', 6, 13, 'redis', 'redis', b'0', b'0', 'Redis', '2018-12-18 15:19:01', 'redis:list', 1);
-INSERT INTO `menu` VALUES (9, b'0', 'SQL监控', 'monitor/sql/index', 6, 14, 'sqlMonitor', 'druid', b'0', b'0', 'Sql', '2018-12-18 15:19:34', NULL, 1);
+INSERT INTO `menu` VALUES (8, b'0', '系统缓存', 'monitor/redis/index', 6, 15, 'redis', 'redis', b'0', b'0', 'Redis', '2018-12-18 15:19:01', 'redis:list', 1);
+INSERT INTO `menu` VALUES (9, b'0', 'SQL监控', 'monitor/sql/index', 6, 18, 'sqlMonitor', 'druid', b'0', b'0', 'Sql', '2018-12-18 15:19:34', NULL, 1);
 INSERT INTO `menu` VALUES (10, b'0', '组件管理', NULL, 0, 50, 'zujian', 'components', b'0', b'0', NULL, '2018-12-19 13:38:16', NULL, 0);
 INSERT INTO `menu` VALUES (11, b'0', '图标库', 'components/IconSelect', 10, 51, 'icon', 'icon', b'0', b'0', 'Icons', '2018-12-19 13:38:49', NULL, 1);
 INSERT INTO `menu` VALUES (14, b'0', '邮件工具', 'tools/email/index', 36, 24, 'email', 'email', b'0', b'0', 'Email', '2018-12-27 10:13:09', NULL, 1);
@@ -291,7 +296,35 @@ INSERT INTO `menu` VALUES (75, b'0', '任务删除', '', 28, 4, '', '', b'0', b'
 INSERT INTO `menu` VALUES (77, b'0', '上传文件', '', 18, 2, '', '', b'0', b'0', '', '2019-10-29 13:09:09', 'storage:add', 2);
 INSERT INTO `menu` VALUES (78, b'0', '文件编辑', '', 18, 3, '', '', b'0', b'0', '', '2019-10-29 13:09:22', 'storage:edit', 2);
 INSERT INTO `menu` VALUES (79, b'0', '文件删除', '', 18, 4, '', '', b'0', b'0', '', '2019-10-29 13:09:34', 'storage:del', 2);
-INSERT INTO `menu` VALUES (81, b'0', '服务器监控', 'monitor/server/index', 6, 15, 'system', 'server', b'0', b'0', 'Server', '2019-11-01 16:37:41', 'server:list', 1);
+INSERT INTO `menu` VALUES (80, b'0', '服务监控', 'monitor/server/index', 6, 14, 'codeConsole', 'server', b'0', b'0', 'ServerMonitor', '2019-11-07 13:06:39', 'server:list', 1);
+
+-- ----------------------------
+-- Table structure for monitor_server
+-- ----------------------------
+DROP TABLE IF EXISTS `monitor_server`;
+CREATE TABLE `monitor_server`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `cpu_core` int(11) NULL DEFAULT NULL,
+  `cpu_rate` double NULL DEFAULT NULL,
+  `disk_total` double NULL DEFAULT NULL,
+  `disk_used` double NULL DEFAULT NULL,
+  `ip` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+  `mem_total` double NULL DEFAULT NULL,
+  `mem_used` double NULL DEFAULT NULL,
+  `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `port` int(11) NULL DEFAULT NULL,
+  `sort` int(11) NULL DEFAULT NULL,
+  `state` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `swap_total` double NULL DEFAULT NULL,
+  `swap_used` double NULL DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
+
+-- ----------------------------
+-- Records of monitor_server
+-- ----------------------------
+INSERT INTO `monitor_server` VALUES (1, NULL, NULL, NULL, NULL, 'localhost', NULL, NULL, '本地', 8777, 1, '0', NULL, NULL);
+
 -- ----------------------------
 -- Table structure for picture
 -- ----------------------------
@@ -308,7 +341,7 @@ CREATE TABLE `picture`  (
   `width` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图片宽度',
   `md5code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Table structure for qiniu_config
@@ -339,7 +372,7 @@ CREATE TABLE `qiniu_content`  (
   `url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件url',
   `suffix` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Table structure for quartz_job
@@ -381,7 +414,7 @@ CREATE TABLE `quartz_log`  (
   `params` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `time` bigint(20) NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 269 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Table structure for role
@@ -396,7 +429,7 @@ CREATE TABLE `role`  (
   `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
   `permission` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Records of role
@@ -497,7 +530,7 @@ INSERT INTO `roles_menus` VALUES (75, 1);
 INSERT INTO `roles_menus` VALUES (77, 1);
 INSERT INTO `roles_menus` VALUES (78, 1);
 INSERT INTO `roles_menus` VALUES (79, 1);
-INSERT INTO `roles_menus` VALUES (81, 1);
+INSERT INTO `roles_menus` VALUES (80, 1);
 INSERT INTO `roles_menus` VALUES (1, 2);
 INSERT INTO `roles_menus` VALUES (2, 2);
 INSERT INTO `roles_menus` VALUES (3, 2);
@@ -556,7 +589,7 @@ CREATE TABLE `user`  (
   CONSTRAINT `FK5rwmryny6jthaaxkogownknqp` FOREIGN KEY (`dept_id`) REFERENCES `dept` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `FKfftoc2abhot8f2wu6cl9a5iky` FOREIGN KEY (`job_id`) REFERENCES `job` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `FKpq2dhypk2qgt68nauh2by22jb` FOREIGN KEY (`avatar_id`) REFERENCES `user_avatar` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT
-) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Records of user
@@ -624,33 +657,6 @@ CREATE TABLE `visits`  (
   `week_day` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE INDEX `UK_11aksgq87euk9bcyeesfs4vtp`(`date`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 111 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
-
--- ----------------------------
--- Records of visits
--- ----------------------------
-INSERT INTO `visits` VALUES (108, '2019-10-29 21:45:49', '2019-10-29', 1, 1, 'Tue');
-INSERT INTO `visits` VALUES (109, '2019-10-30 08:58:54', '2019-10-30', 2, 11, 'Wed');
-INSERT INTO `visits` VALUES (110, '2019-10-31 09:04:18', '2019-10-31', 2, 8, 'Thu');
-
-
-DROP TABLE IF EXISTS `monitor_server`;
-CREATE TABLE `monitor_server`  (
-  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '编号',
-  `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '名称',
-  `ip` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'IP地址',
-  `port` int(11) NULL DEFAULT NULL COMMENT '访问端口',
-  `state` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '状态',
-  `cpu_rate` float NULL DEFAULT NULL COMMENT 'CPU使用率',
-  `cpu_core` int(11) NULL DEFAULT NULL COMMENT 'CPU内核数',
-  `mem_total` float NULL DEFAULT NULL COMMENT '内存总数',
-  `mem_used` float NULL DEFAULT NULL COMMENT '内存使用量',
-  `disk_total` float NULL DEFAULT NULL COMMENT '磁盘总量',
-  `disk_used` float NULL DEFAULT NULL COMMENT '磁盘使用量',
-  `swap_total` float NULL DEFAULT NULL COMMENT '交换区总量',
-  `swap_used` float NULL DEFAULT NULL COMMENT '交换区使用量',
-  `sort` int(11) NULL DEFAULT NULL COMMENT '排序',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '服务器监控' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 118 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
 
 SET FOREIGN_KEY_CHECKS = 1;