Merge remote-tracking branch 'origin/dev' into dev

distributed-print-business/src/main/resources/db/init-data.sql

@@ -3,4 +3,5 @@ truncate table `sys_config`;
 INSERT INTO `sys_config` VALUES (1, 'sys.user.initPassword', '初始密码', '123456', NULL, 1, NULL, NULL, NULL);
 INSERT INTO `sys_config` VALUES (2, 'sys.warning.days', '预警天数', '3',NULL, 1, NULL, NULL, NULL);
 INSERT INTO `sys_config` VALUES (3, 'sys.code.enable', '是否启用短信验证码', 'true', 'true-启用，false-禁用', 1, NULL, NULL, NULL);
+INSERT INTO `sys_config` VALUES (4, 'sys.message.enable', '是否启用短信消息提示', 'true', 'true-启用，false-禁用', 1, NULL, NULL, NULL);
 

distributed-print-business/src/main/resources/db/init-table.sql

@@ -98,6 +98,32 @@ CREATE TABLE `basic_exam_rule`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '考务规则' ROW_FORMAT = Dynamic;
 
+-- ----------------------------
+-- Table structure for basic_message
+-- ----------------------------
+DROP TABLE IF EXISTS `basic_message`;
+CREATE TABLE `basic_message`  (
+    `id` bigint(20) NOT NULL,
+    `user_id` bigint(20) NOT NULL COMMENT '消息接收人用户',
+    `mobile_number` varchar(11) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '电话号码',
+    `business_id` bigint(20) NOT NULL COMMENT '业务id',
+    `business_operate` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '业务操作',
+    `template_code` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '消息模板代码',
+    `variable_params` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '变量参数内容',
+    `template_content` mediumtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '模板内容',
+    `message_type` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '消息类型',
+    `send_status` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '消息发送状态',
+    `send_result` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '消息发送结果',
+    `create_id` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+    `create_time` bigint(20) NULL DEFAULT NULL COMMENT '创建时间',
+    `update_id` bigint(20) NULL DEFAULT NULL COMMENT '更新人',
+    `update_time` bigint(20) NULL DEFAULT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of basic_message
+-- ----------------------------
 -- ----------------------------
 -- Table structure for basic_school
 -- ----------------------------