milestone - dmaster 和 dagent 测试环境版本

更新了数据模型和 mysql schema

dagent/bin/mqtt.json

@@ -1,5 +1,5 @@
 {
-  "broker": "tcp://localhost:1883",
-  "username": "dev",
-  "password": "Dev@123456"
+  "broker": "tcp://s75.iquizoo.com:1883",
+  "username": "test",
+  "password": "Test@123456"
 }

dagent/bin/mqtt1.json

@@ -1,5 +1,5 @@
 {
-  "broker": "tcp://192.168.0.62:1883",
-  "username": "test",
-  "password": "Test@123456"
+  "broker": "tcp://127.0.0.1:1883",
+  "username": "dev",
+  "password": "Dev@123456"
 }

dagent/src/main/java/cn/reghao/autodop/dagent/DagentApp.java

@@ -19,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 import oshi.SystemInfo;
 
 import java.io.IOException;
+import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 
 @Slf4j
@@ -66,7 +67,8 @@ public class DagentApp {
 	 */
 	static void singleInstance() throws Exception {
 		try {
-			serverSocket = new ServerSocket(54321);
+			serverSocket = new ServerSocket();
+			serverSocket.bind(new InetSocketAddress("127.0.0.1", 54321));
 		} catch (IOException e) {
 			throw new Exception("已有一个 autodop-dagent 实例在运行, 一台机器上只能运行一个 autodop-dagent 实例.");
 		}

dagent/src/main/resources/mqtt.json

@@ -1,6 +0,0 @@
-{
-  "broker": "tcp://localhost:1883",
-  "username": "dev",
-  "password": "Dev@123456",
-  "clientId": "dagent"
-}

dmaster/bin/shutdown.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
 
-pid=`jps | grep dmaster.jar | awk '{print $1}'`
+app_name='autodop-dmaster.jar'
+pid=`jps | grep ${app_name} | awk '{print $1}'`
 kill -15 ${pid}

dmaster/bin/start.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
 app_dir=`pwd`
-app_name='dmaster.jar'
-nohup java -jar ${app_dir}"/"${app_name} > console.log 2>&1 &
+app_name='autodop-dmaster.jar'
+nohup java -jar ${app_dir}"/"${app_name} > console.log 2>&1 &

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/config/build/PackerConfig.java

@@ -32,7 +32,6 @@ public class PackerConfig extends BaseEntity<Integer> {
     @NotBlank(message = "打包工具名字不能为空白字符串")
     private String name;
     // 构建生成的可执行文件及配置文件, 脚本文件等所在的目录名, 目录位于 appRootPath 下
-    @NotNull
     private String binfilesDirname;
     // 打包后的应用存放的位置，可以是一个本地目录，也可以是一个网络位置
     // 根据打包类型来确定

dmaster/src/main/resources/application-dev0.yml

@@ -1,13 +0,0 @@
-spring:
-  datasource:
-    url: jdbc:mysql://mysql.alpha.iquizoo.com:3306/devops_tdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
-    username: azy_test
-    password: Azy@123456
-  data:
-    mongodb:
-      uri: mongodb://mongodb.alpha.iquizoo.com/devops_tdb
-mosquitto:
-  broker: tcp://mosquitto.alpha.iquizoo.com:1883
-  username: test
-  password: Test@123456
-  clientId: dmaster

dmaster/src/main/resources/application-test.yml

@@ -1,13 +1,13 @@
 spring:
   datasource:
-    url: jdbc:mysql://192.168.0.50:3306/tnb_devops_tdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
-    username: test
-    password: Test@123456
+    url: jdbc:mysql://mysql.alpha.iquizoo.com:3306/iquizoo_devops_tdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
+    username: azy_test
+    password: Azy@123456
   data:
     mongodb:
-      uri: mongodb://192.168.0.50/tnb_devops_tdb
+      uri: mongodb://mongodb.alpha.iquizoo.com/iquizoo_devops_tdb
 mosquitto:
-  broker: tcp://192.168.0.62:1883
+  broker: tcp://s75.iquizoo.com:1883
   username: test
   password: Test@123456
   clientId: dmaster

dmaster/src/main/resources/application-test0.yml

@@ -1,13 +0,0 @@
-spring:
-  datasource:
-    url: jdbc:mysql://192.168.0.77:3306/iquizoo_devops_tdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
-    username: azy_test
-    password: Azy@123456
-  data:
-    mongodb:
-      uri: mongodb://192.168.0.220/devops_tdb
-mosquitto:
-  broker: tcp://s75.iquizoo.com:1883
-  username: test
-  password: Test@123456
-  clientId: dmaster

dmaster/src/main/resources/templates/monitor/notify/ding.html

@@ -12,7 +12,7 @@
         <div class="layui-row timo-card-screen put-row">
             <div class="pull-right screen-btn-group">
                 <div class="btn-group-right">
-                    <button class="layui-btn open-popup" data-title="添加钉钉账户" th:attr="data-url=@{/sys/notify/ding/add}"
+                    <button class="layui-btn open-popup" data-title="添加钉钉账户" th:attr="data-url=@{/monitor/notify/ding/add}"
                             data-size="640,480">
                         <i class="fa fa-plus"></i> 添加
                     </button>

schema/reghao_devops_rdb.sql

@@ -11,7 +11,7 @@
  Target Server Version : 50732
  File Encoding         : 65001
 
- Date: 11/11/2021 14:57:32
+ Date: 11/11/2021 20:59:35
 */
 
 SET NAMES utf8mb4;
@@ -39,6 +39,12 @@ CREATE TABLE `app_building` (
   CONSTRAINT `FK9lsa0hnvjbqfxp33wkvwrq0ln` FOREIGN KEY (`app_config_id`) REFERENCES `app_config` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+-- ----------------------------
+-- Records of app_building
+-- ----------------------------
+BEGIN;
+COMMIT;
+
 -- ----------------------------
 -- Table structure for app_config
 -- ----------------------------
@@ -68,6 +74,12 @@ CREATE TABLE `app_config` (
   UNIQUE KEY `UK_boipwfawtfve9o09lnb5le29a` (`app_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+-- ----------------------------
+-- Records of app_config
+-- ----------------------------
+BEGIN;
+COMMIT;
+
 -- ----------------------------
 -- Table structure for app_deploy_config
 -- ----------------------------
@@ -90,6 +102,12 @@ CREATE TABLE `app_deploy_config` (
   CONSTRAINT `FKhqgrewybinoowtbsbf63kf4pl` FOREIGN KEY (`app_config_id`) REFERENCES `app_config` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+-- ----------------------------
+-- Records of app_deploy_config
+-- ----------------------------
+BEGIN;
+COMMIT;
+
 -- ----------------------------
 -- Table structure for app_deploying
 -- ----------------------------
@@ -111,6 +129,12 @@ CREATE TABLE `app_deploying` (
   CONSTRAINT `FK2tkqafeq2bi3gi4ec4s113hj2` FOREIGN KEY (`app_deploy_config_id`) REFERENCES `app_deploy_config` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+-- ----------------------------
+-- Records of app_deploying
+-- ----------------------------
+BEGIN;
+COMMIT;
+
 -- ----------------------------
 -- Table structure for app_monitor
 -- ----------------------------
@@ -135,6 +159,12 @@ CREATE TABLE `app_monitor` (
   CONSTRAINT `FKqcktms0d2jc0m3iqjieuhqn4m` FOREIGN KEY (`app_config_id`) REFERENCES `app_config` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+-- ----------------------------
+-- Records of app_monitor
+-- ----------------------------
+BEGIN;
+COMMIT;
+
 -- ----------------------------
 -- Table structure for app_running
 -- ----------------------------
@@ -154,6 +184,12 @@ CREATE TABLE `app_running` (
   CONSTRAINT `FK2j1kmif6x371wgt3gbw7y825q` FOREIGN KEY (`app_deploying_id`) REFERENCES `app_deploying` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+-- ----------------------------
+-- Records of app_running
+-- ----------------------------
+BEGIN;
+COMMIT;
+
 -- ----------------------------
 -- Table structure for build_dir
 -- ----------------------------
@@ -172,7 +208,13 @@ CREATE TABLE `build_dir` (
   `used` varchar(255) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `UK_hk1kw8yctt67349i4kaougm5e` (`machine_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- ----------------------------
+-- Records of build_dir
+-- ----------------------------
+BEGIN;
+COMMIT;
 
 -- ----------------------------
 -- Table structure for compiler_config
@@ -193,6 +235,12 @@ CREATE TABLE `compiler_config` (
   UNIQUE KEY `UK_8qb44ffa5pma9xekiphefr9sp` (`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+-- ----------------------------
+-- Records of compiler_config
+-- ----------------------------
+BEGIN;
+COMMIT;
+
 -- ----------------------------
 -- Table structure for ding_account
 -- ----------------------------
@@ -208,6 +256,12 @@ CREATE TABLE `ding_account` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+-- ----------------------------
+-- Records of ding_account
+-- ----------------------------
+BEGIN;
+COMMIT;
+
 -- ----------------------------
 -- Table structure for machine_host
 -- ----------------------------
@@ -235,6 +289,12 @@ CREATE TABLE `machine_host` (
   UNIQUE KEY `UK_lo1x88vamyh2o34gdap4aw7jr` (`machine_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+-- ----------------------------
+-- Records of machine_host
+-- ----------------------------
+BEGIN;
+COMMIT;
+
 -- ----------------------------
 -- Table structure for machine_info
 -- ----------------------------
@@ -261,6 +321,12 @@ CREATE TABLE `machine_info` (
   UNIQUE KEY `UK_qtvbx85mqly0sgycqp1xt208s` (`machine_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+-- ----------------------------
+-- Records of machine_info
+-- ----------------------------
+BEGIN;
+COMMIT;
+
 -- ----------------------------
 -- Table structure for machine_info_disk_infos
 -- ----------------------------
@@ -276,6 +342,12 @@ CREATE TABLE `machine_info_disk_infos` (
   CONSTRAINT `FKjn32n1mvn6uuiqn0n6uwrqe2i` FOREIGN KEY (`machine_info_id`) REFERENCES `machine_info` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+-- ----------------------------
+-- Records of machine_info_disk_infos
+-- ----------------------------
+BEGIN;
+COMMIT;
+
 -- ----------------------------
 -- Table structure for machine_info_network_infos
 -- ----------------------------
@@ -291,24 +363,64 @@ CREATE TABLE `machine_info_network_infos` (
   CONSTRAINT `FKfs6r0haxt8dx5ak8wp91pwojn` FOREIGN KEY (`machine_info_id`) REFERENCES `machine_info` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+-- ----------------------------
+-- Records of machine_info_network_infos
+-- ----------------------------
+BEGIN;
+COMMIT;
+
 -- ----------------------------
 -- Table structure for menu
 -- ----------------------------
 DROP TABLE IF EXISTS `menu`;
 CREATE TABLE `menu` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `create_time` datetime(6) NOT NULL,
-  `is_delete` bit(1) NOT NULL,
-  `update_time` datetime(6) NOT NULL,
-  `icon` varchar(255) NOT NULL,
-  `is_enabled` bit(1) NOT NULL,
-  `name` varchar(255) DEFAULT NULL,
-  `pid` int(11) NOT NULL,
-  `pos` int(11) NOT NULL,
-  `type` varchar(255) DEFAULT NULL,
-  `url` varchar(255) DEFAULT NULL,
+  `id` int(11) NOT NULL,
+  `create_time` datetime(6) DEFAULT NULL,
+  `is_delete` bit(1) DEFAULT NULL,
+  `update_time` datetime(6) DEFAULT NULL,
+  `icon` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `pid` int(11) DEFAULT NULL,
+  `pos` int(11) DEFAULT NULL,
+  `name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `type` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `url` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `is_enabled` bit(1) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+-- ----------------------------
+-- Records of menu
+-- ----------------------------
+BEGIN;
+INSERT INTO `menu` VALUES (152, '2021-05-11 15:20:06.022212', b'0', '2021-07-21 11:46:59.271151', 'layui-icon layui-icon-home', 0, 1, '主页', 'page', '/home', b'1');
+INSERT INTO `menu` VALUES (153, '2021-05-11 15:20:06.023637', b'0', '2021-09-17 10:47:19.830466', 'fa fa-cog', 0, 6, '系统管理', 'dir', '#', b'1');
+INSERT INTO `menu` VALUES (154, '2021-05-11 15:20:06.040161', b'0', '2021-05-19 14:05:42.646522', 'layui-icon layui-icon-user\n', 9452, 3, '用户管理', 'page', '/rbac/user', b'1');
+INSERT INTO `menu` VALUES (155, '2021-05-11 15:20:06.041503', b'0', '2021-05-11 15:20:06.041529', 'layui-icon layui-icon-release\n', 9452, 2, '角色管理', 'page', '/rbac/role', b'1');
+INSERT INTO `menu` VALUES (156, '2021-05-11 15:20:06.042662', b'0', '2021-05-19 16:14:04.207084', 'layui-icon layui-icon-release\n', 9452, 1, '资源管理', 'page', '/rbac/menu', b'1');
+INSERT INTO `menu` VALUES (302, '2021-05-13 10:31:09.179446', b'0', '2021-07-21 11:46:59.273299', 'layui-icon layui-icon-app', 0, 3, '应用', 'dir', '#', b'1');
+INSERT INTO `menu` VALUES (303, '2021-05-13 10:34:32.400476', b'0', '2021-10-14 10:16:53.078797', 'layui-icon layui-icon-face-smile', 302, 3, '构建部署', 'page', '/app/bd', b'1');
+INSERT INTO `menu` VALUES (305, '2021-05-13 10:38:19.945521', b'0', '2021-10-14 10:16:53.079793', 'layui-icon layui-icon-set', 302, 2, '应用配置', 'page', 'app/config/app', b'1');
+INSERT INTO `menu` VALUES (502, '2021-05-17 18:08:58.040642', b'0', '2021-05-17 18:08:58.040717', 'layui-icon layui-icon-set', 302, 1, '构建配置', 'dir', '#', b'1');
+INSERT INTO `menu` VALUES (503, '2021-05-17 18:10:42.043424', b'0', '2021-05-17 18:10:42.043453', 'layui-icon layui-icon-set', 502, 1, '构建目录', 'page', '/app/config/build/dir', b'1');
+INSERT INTO `menu` VALUES (703, '2021-05-19 14:22:12.166310', b'0', '2021-07-12 11:14:59.899202', 'layui-icon layui-icon-release\n', 153, 1, '系统环境', 'page', '/sys/env', b'1');
+INSERT INTO `menu` VALUES (704, '2021-05-19 14:22:22.845883', b'0', '2021-09-17 10:47:19.831765', 'layui-icon layui-icon-release', 1502, 1, '通知配置', 'dir', '#', b'1');
+INSERT INTO `menu` VALUES (752, '2021-05-19 16:00:10.445920', b'0', '2021-07-12 11:14:59.900378', 'layui-icon layui-icon-release\n', 153, 2, 'JVM 状态', 'page', '/sys/jvmstatus', b'1');
+INSERT INTO `menu` VALUES (802, '2021-05-20 13:44:18.715247', b'0', '2021-05-20 13:44:18.715323', 'layui-icon layui-icon-set', 502, 2, '仓库认证', 'page', '/app/config/build/repoauth', b'1');
+INSERT INTO `menu` VALUES (803, '2021-05-20 13:44:42.119999', b'0', '2021-05-20 13:44:42.120040', 'layui-icon layui-icon-set', 502, 3, '应用编译', 'page', '/app/config/build/compiler', b'1');
+INSERT INTO `menu` VALUES (804, '2021-05-20 13:45:11.729758', b'0', '2021-05-20 13:45:11.729792', 'layui-icon layui-icon-set', 502, 4, '应用打包', 'page', '/app/config/build/packer', b'1');
+INSERT INTO `menu` VALUES (809, '2021-05-20 13:53:46.834540', b'0', '2021-10-20 18:03:24.299736', 'layui-icon layui-icon-face-smile', 302, 5, '应用状态', 'page', '/app/stat', b'1');
+INSERT INTO `menu` VALUES (810, '2021-05-20 13:54:34.299197', b'0', '2021-07-21 11:46:59.275648', 'fa fa-server', 0, 2, '机器', 'dir', '#', b'1');
+INSERT INTO `menu` VALUES (811, '2021-05-20 13:55:24.546804', b'0', '2021-05-20 13:55:24.546861', 'fa fa-server', 810, 1, '机器节点', 'page', '/machine/host', b'1');
+INSERT INTO `menu` VALUES (1502, '2021-06-04 09:22:16.495701', b'0', '2021-09-17 10:47:19.832798', 'layui-icon layui-icon-face-smile', 0, 4, '监控报警', 'dir', '#', b'1');
+INSERT INTO `menu` VALUES (1503, '2021-06-04 09:23:17.107389', b'0', '2021-06-04 09:23:17.107416', 'layui-icon layui-icon-face-smile', 1502, 2, '应用监控', 'page', '/monitor/app', b'1');
+INSERT INTO `menu` VALUES (2252, '2021-06-11 10:47:25.635127', b'0', '2021-07-12 11:16:00.527986', 'layui-icon layui-icon-face-smile', 9502, 1, '运行日志', 'page', '/sys/log/runtime', b'1');
+INSERT INTO `menu` VALUES (2253, '2021-06-11 10:48:03.515580', b'0', '2021-07-12 11:16:14.394649', 'layui-icon layui-icon-face-smile', 9502, 2, '访问日志', 'page', '/sys/log/access111', b'1');
+INSERT INTO `menu` VALUES (6102, '2021-06-23 17:01:09.479385', b'0', '2021-06-23 17:01:09.479414', 'layui-icon layui-icon-face-smile', 704, 2, '通知组', 'page', '/monitor/notify/receiver', b'1');
+INSERT INTO `menu` VALUES (6752, '2021-06-24 16:26:23.732725', b'0', '2021-10-27 13:40:24.809266', 'layui-icon layui-icon-face-smile', 704, 1, '钉钉账户', 'page', '/monitor/notify/ding', b'1');
+INSERT INTO `menu` VALUES (9452, '2021-07-12 10:42:34.160548', b'0', '2021-09-17 10:47:19.833721', 'layui-icon layui-icon-face-smile', 0, 7, '权限用户', 'dir', '#', b'1');
+INSERT INTO `menu` VALUES (9502, '2021-07-12 11:14:59.922658', b'0', '2021-07-12 11:14:59.922697', 'layui-icon layui-icon-face-smile', 153, 3, '日志', 'dir', '#', b'1');
+INSERT INTO `menu` VALUES (13352, '2021-10-20 19:49:35.376482', b'0', '2021-10-20 19:49:35.376512', 'layui-icon layui-icon-face-smile', 302, 4, '构建部署日志', 'page', '/app/bd/log', b'1');
+COMMIT;
 
 -- ----------------------------
 -- Table structure for notify_group
@@ -327,6 +439,12 @@ CREATE TABLE `notify_group` (
   UNIQUE KEY `UK_gvaf84xd3bnxxf60r4whgv4e9` (`notify_account_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+-- ----------------------------
+-- Records of notify_group
+-- ----------------------------
+BEGIN;
+COMMIT;
+
 -- ----------------------------
 -- Table structure for packer_config
 -- ----------------------------
@@ -336,7 +454,7 @@ CREATE TABLE `packer_config` (
   `create_time` datetime(6) NOT NULL,
   `is_delete` bit(1) NOT NULL,
   `update_time` datetime(6) NOT NULL,
-  `binfiles_dirname` varchar(255) NOT NULL,
+  `binfiles_dirname` varchar(255) DEFAULT NULL,
   `machine_id` varchar(255) NOT NULL,
   `machine_ipv4` varchar(255) DEFAULT NULL,
   `name` varchar(255) NOT NULL,
@@ -346,6 +464,12 @@ CREATE TABLE `packer_config` (
   UNIQUE KEY `UK_ilu7yfvuir3cvd8oqiemwrqh8` (`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+-- ----------------------------
+-- Records of packer_config
+-- ----------------------------
+BEGIN;
+COMMIT;
+
 -- ----------------------------
 -- Table structure for repo_auth_config
 -- ----------------------------
@@ -365,21 +489,37 @@ CREATE TABLE `repo_auth_config` (
   UNIQUE KEY `UK_cfu57vn4gixedymokbkcnjpd0` (`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+-- ----------------------------
+-- Records of repo_auth_config
+-- ----------------------------
+BEGIN;
+COMMIT;
+
 -- ----------------------------
 -- Table structure for role
 -- ----------------------------
 DROP TABLE IF EXISTS `role`;
 CREATE TABLE `role` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `create_time` datetime(6) NOT NULL,
-  `is_delete` bit(1) NOT NULL,
-  `update_time` datetime(6) NOT NULL,
-  `description` varchar(100) DEFAULT NULL,
-  `name` varchar(255) NOT NULL,
-  `title` varchar(255) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `UK_fmnrnqscmgmb1ht3kirjbjwl` (`title`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+  `id` int(11) NOT NULL,
+  `create_time` datetime(6) DEFAULT NULL,
+  `is_delete` bit(1) DEFAULT NULL,
+  `update_time` datetime(6) DEFAULT NULL,
+  `title` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `description` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+-- ----------------------------
+-- Records of role
+-- ----------------------------
+BEGIN;
+INSERT INTO `role` VALUES (52, '2021-05-11 15:20:05.958407', b'0', '2021-07-12 11:19:41.558512', 'ROLE_ADMIN', '管理员', '具有所有访问权限');
+INSERT INTO `role` VALUES (53, '2021-05-11 15:20:05.959707', b'0', '2021-05-11 15:20:05.959727', 'ROLE_USER', '用户', '具有最基本的访问权限');
+INSERT INTO `role` VALUES (202, '2021-05-11 19:08:52.083053', b'0', '2021-06-10 15:33:37.816616', 'ROLE_BACKEND', '后端开发', '');
+INSERT INTO `role` VALUES (252, '2021-05-11 19:13:33.632519', b'0', '2021-06-10 15:34:46.823274', 'ROLE_FRONTEND', '前端开发', '');
+INSERT INTO `role` VALUES (352, '2021-05-13 10:59:19.220410', b'0', '2021-05-13 10:59:19.220456', 'ROLE_TEST', '测试', '');
+COMMIT;
 
 -- ----------------------------
 -- Table structure for role_menu
@@ -392,7 +532,52 @@ CREATE TABLE `role_menu` (
   KEY `FKfg4e2mb2318tph615gh44ll3` (`menu_id`),
   CONSTRAINT `FKfg4e2mb2318tph615gh44ll3` FOREIGN KEY (`menu_id`) REFERENCES `menu` (`id`),
   CONSTRAINT `FKqyvxw2gg2qk0wld3bqfcb58vq` FOREIGN KEY (`role_id`) REFERENCES `role` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+-- ----------------------------
+-- Records of role_menu
+-- ----------------------------
+BEGIN;
+INSERT INTO `role_menu` VALUES (52, 152);
+INSERT INTO `role_menu` VALUES (53, 152);
+INSERT INTO `role_menu` VALUES (202, 152);
+INSERT INTO `role_menu` VALUES (252, 152);
+INSERT INTO `role_menu` VALUES (352, 152);
+INSERT INTO `role_menu` VALUES (52, 153);
+INSERT INTO `role_menu` VALUES (52, 154);
+INSERT INTO `role_menu` VALUES (52, 155);
+INSERT INTO `role_menu` VALUES (52, 156);
+INSERT INTO `role_menu` VALUES (52, 302);
+INSERT INTO `role_menu` VALUES (202, 302);
+INSERT INTO `role_menu` VALUES (252, 302);
+INSERT INTO `role_menu` VALUES (52, 303);
+INSERT INTO `role_menu` VALUES (202, 303);
+INSERT INTO `role_menu` VALUES (252, 303);
+INSERT INTO `role_menu` VALUES (52, 305);
+INSERT INTO `role_menu` VALUES (202, 305);
+INSERT INTO `role_menu` VALUES (52, 502);
+INSERT INTO `role_menu` VALUES (52, 503);
+INSERT INTO `role_menu` VALUES (52, 703);
+INSERT INTO `role_menu` VALUES (52, 704);
+INSERT INTO `role_menu` VALUES (52, 752);
+INSERT INTO `role_menu` VALUES (52, 802);
+INSERT INTO `role_menu` VALUES (52, 803);
+INSERT INTO `role_menu` VALUES (52, 804);
+INSERT INTO `role_menu` VALUES (52, 809);
+INSERT INTO `role_menu` VALUES (202, 809);
+INSERT INTO `role_menu` VALUES (52, 810);
+INSERT INTO `role_menu` VALUES (52, 811);
+INSERT INTO `role_menu` VALUES (52, 1502);
+INSERT INTO `role_menu` VALUES (52, 1503);
+INSERT INTO `role_menu` VALUES (52, 2252);
+INSERT INTO `role_menu` VALUES (52, 2253);
+INSERT INTO `role_menu` VALUES (52, 6102);
+INSERT INTO `role_menu` VALUES (52, 6752);
+INSERT INTO `role_menu` VALUES (52, 9452);
+INSERT INTO `role_menu` VALUES (52, 9502);
+INSERT INTO `role_menu` VALUES (52, 13352);
+INSERT INTO `role_menu` VALUES (202, 13352);
+COMMIT;
 
 -- ----------------------------
 -- Table structure for sys_env
@@ -410,28 +595,47 @@ CREATE TABLE `sys_env` (
   UNIQUE KEY `UK_6vnobashedni21enf9pw1ohw` (`env`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+-- ----------------------------
+-- Records of sys_env
+-- ----------------------------
+BEGIN;
+COMMIT;
+
 -- ----------------------------
 -- Table structure for user
 -- ----------------------------
 DROP TABLE IF EXISTS `user`;
 CREATE TABLE `user` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `create_time` datetime(6) NOT NULL,
-  `is_delete` bit(1) NOT NULL,
-  `update_time` datetime(6) NOT NULL,
-  `avatar_url` varchar(255) DEFAULT NULL,
-  `email` varchar(255) DEFAULT NULL,
-  `gender` int(11) DEFAULT NULL,
+  `id` int(11) NOT NULL,
+  `create_time` datetime(6) DEFAULT NULL,
+  `is_delete` bit(1) DEFAULT NULL,
+  `update_time` datetime(6) DEFAULT NULL,
+  `avatar_url` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `email` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `gender` int(11) NOT NULL,
+  `nickname` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `password` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `mobile_phone` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `salt` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `username` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
   `is_enabled` bit(1) DEFAULT NULL,
   `is_locked` bit(1) DEFAULT NULL,
-  `mobile_phone` varchar(255) DEFAULT NULL,
-  `nickname` varchar(255) DEFAULT NULL,
-  `password` varchar(255) NOT NULL,
-  `salt` varchar(255) NOT NULL,
-  `username` varchar(255) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `UK_sb8bbouer5wak8vyiiy4pf2bx` (`username`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+-- ----------------------------
+-- Records of user
+-- ----------------------------
+BEGIN;
+INSERT INTO `user` VALUES (102, '2021-05-11 15:20:05.995018', b'0', '2021-07-14 11:14:19.658896', '/imgs/avatar/default.png', '', 1, '管理员', '5b9a079ebe999bf0edbe2f665e6fc9f2', '13012345678', 'AeC0rlakx6nkIs6xJYqQYQTlvNRISLbdz7K4aKa04T39wxRTL1oOZs5rlTDos9ryXoZCniedn5a4eSZJNxk2mw==', 'admin', b'1', b'0');
+INSERT INTO `user` VALUES (402, '2021-05-13 13:56:39.105994', b'0', '2021-07-14 17:06:55.598989', '/imgs/avatar/default.png', '', 1, '黄虹钦', '61d79d1565c6f468fc9942f8adfa9a08', '', 'A9z3nYQsYtyicjqaERD0LRfKEXlcjxIFWQXXT3RZeIbsaGi9lkDEv0nm2hHFpRQV53rXRjnpLX9tX9L9iCL5Qw==', 'hhq', b'1', b'0');
+INSERT INTO `user` VALUES (403, '2021-05-13 13:57:13.312625', b'0', '2021-05-13 13:57:13.312657', '/imgs/avatar/default.png', '', 1, '杨耿', 'c25b13b638fc66f2c348d9aff62ea0db', '', 'XWfTtUMO6HXktQbavlg9Lf9Hkirbf2VdYOzzfFurFKZpdOZDGkBaPnuWHKcl3gInAR1qRgrG3BII+zPSx2Mmng==', 'yg', b'1', b'0');
+INSERT INTO `user` VALUES (404, '2021-05-13 13:57:59.326378', b'0', '2021-05-13 13:57:59.326398', '/imgs/avatar/default.png', '', 1, ' 吴敏 ', '6871c02cbea20be164ebb38586179ddb', '', 'tlqRs6HekLU2ceuEKYctyBj46AKwqnb0QPbfnflb9ZWnW7upx1VE2spNbXStenvk7nQ1QaGism8al9oIM/UBSg==', 'wm', b'1', b'0');
+INSERT INTO `user` VALUES (405, '2021-05-13 13:58:26.108142', b'0', '2021-05-13 13:58:26.108162', '/imgs/avatar/default.png', '', 1, '詹先平', '5f3f027740273c53a7eb7af1416d0701', '', 'HeIAuJbkQxpnw1E0lTrPW4QoL5NkhvwsvKN2j9D//tlnws+2t61ujLFY5796m8Wp7NV+f7dxO86w+yaAUd5WkQ==', 'zxp', b'1', b'0');
+INSERT INTO `user` VALUES (406, '2021-05-13 13:58:58.735900', b'0', '2021-07-14 11:13:42.725731', '/imgs/avatar/default.png', '', 0, '刘宏', 'd895fd40c14a098354a0248fe68f8aa5', '', 'HerF7LEu5TSJCM3mKCZdMILdJ12EgBDA89ddutrQfNtYmFP9Fx9fv4Mw67VCc2iDs5updWQzufK8RdYMSSF/fQ==', 'lh', b'1', b'0');
+INSERT INTO `user` VALUES (407, '2021-05-13 13:59:36.762631', b'0', '2021-07-14 11:13:42.746650', '/imgs/avatar/default.png', 'haohao@hao.com', 1, '官劲松', '7ce8e5cfcde85dfaedf0f4fce2dcc1e5', '13109876543', 'jHU1qLuP/6hS7XB1f6FZ/ZrM67C5/YNQT9pBss7E1Ftm9cZchqGhZrsGK2onQuJ3Qed/Pbj+c2FyXmCaUlWk6A==', 'gjs', b'1', b'0');
+COMMIT;
 
 -- ----------------------------
 -- Table structure for user_role
@@ -440,8 +644,22 @@ DROP TABLE IF EXISTS `user_role`;
 CREATE TABLE `user_role` (
   `user_id` int(11) NOT NULL,
   `role` varchar(255) DEFAULT NULL,
-  KEY `FK859n2jvi8ivhui0rl0esws6o` (`user_id`),
-  CONSTRAINT `FK859n2jvi8ivhui0rl0esws6o` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`)
+  KEY `FK55itppkw3i07do3h7qoclqd4k` (`user_id`),
+  CONSTRAINT `FK55itppkw3i07do3h7qoclqd4k` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+-- ----------------------------
+-- Records of user_role
+-- ----------------------------
+BEGIN;
+INSERT INTO `user_role` VALUES (102, 'ROLE_ADMIN');
+INSERT INTO `user_role` VALUES (406, 'ROLE_TEST');
+INSERT INTO `user_role` VALUES (405, 'ROLE_FRONTEND');
+INSERT INTO `user_role` VALUES (403, 'ROLE_FRONTEND');
+INSERT INTO `user_role` VALUES (404, 'ROLE_BACKEND');
+INSERT INTO `user_role` VALUES (407, 'ROLE_BACKEND');
+INSERT INTO `user_role` VALUES (402, 'ROLE_BACKEND');
+INSERT INTO `user_role` VALUES (402, 'ROLE_ADMIN');
+COMMIT;
+
 SET FOREIGN_KEY_CHECKS = 1;