소스 검색

修改字符集配置。

yucheng 3 년 전
부모
커밋
6b0e080009

+ 1 - 1
dmp-business/dmp-dic/src/main/resources/db/init/schema.sql

@@ -108,4 +108,4 @@ CREATE TABLE IF NOT EXISTS `dt_code_data`  (
   `valid` tinyint(0) DEFAULT NULL COMMENT '合法标识',
   `ts` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '乐观锁',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COMMENT = '码表数据' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB COMMENT = '码表数据' ROW_FORMAT = Dynamic;

+ 2 - 2
dmp-business/dmp-rwd-version/src/main/resources/db/init/schema.sql

@@ -17,7 +17,7 @@ CREATE TABLE IF NOT EXISTS `dt_define_version` (
   `valid` tinyint(4) DEFAULT NULL COMMENT '合法标识,0-无效,1-有效',
   `ts` timestamp NULL DEFAULT NULL COMMENT '乐观锁',
   PRIMARY KEY (`id`)
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COMMENT = '版本定义表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB COMMENT = '版本定义表' ROW_FORMAT = Dynamic;
 
 CREATE TABLE IF NOT EXISTS `dt_demand`  (
   `id` varchar(40) NOT NULL COMMENT '主键',
@@ -41,5 +41,5 @@ CREATE TABLE IF NOT EXISTS `dt_demand`  (
   `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '乐观锁',
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `idx_state`(`bill_state`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COMMENT = '字典需求' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB COMMENT = '字典需求' ROW_FORMAT = Dynamic;
 

+ 21 - 21
dmp-business/dmp-rwd/src/main/resources/db/init/schema.sql

@@ -24,7 +24,7 @@ CREATE TABLE IF NOT EXISTS `dt_define_type` (
   KEY `idx_parent_code` (`parent_code`) USING BTREE,
   KEY `idx_major_code` (`major_code`) USING BTREE,
   KEY `idx_code_1` (`group_code`,`project_id`,`code`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='对象类型定义';
+) ENGINE=InnoDB ROW_FORMAT=DYNAMIC COMMENT='对象类型定义';
 
 CREATE TABLE IF NOT EXISTS `dt_define_info` (
   `id` varchar(40) NOT NULL,
@@ -59,7 +59,7 @@ CREATE TABLE IF NOT EXISTS `dt_define_info` (
   `ts` timestamp default current_timestamp on update current_timestamp NOT NULL COMMENT '乐观锁',
   PRIMARY KEY (`id`) USING BTREE,
   KEY `idx_class_1` (`class_code`,`code`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='信息点定义表';
+) ENGINE=InnoDB ROW_FORMAT=DYNAMIC COMMENT='信息点定义表';
 
 CREATE TABLE IF NOT EXISTS `dt_define_graph` (
   `id` varchar(40) NOT NULL,
@@ -78,7 +78,7 @@ CREATE TABLE IF NOT EXISTS `dt_define_graph` (
   `ts` timestamp default current_timestamp on update current_timestamp NOT NULL COMMENT '乐观锁',
   PRIMARY KEY (`id`) USING BTREE,
   KEY `idx_code` (`code`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='图类型表';
+) ENGINE=InnoDB ROW_FORMAT=DYNAMIC COMMENT='图类型表';
 
 CREATE TABLE IF NOT EXISTS `dt_define_rel` (
   `id` varchar(40) NOT NULL,
@@ -92,8 +92,8 @@ CREATE TABLE IF NOT EXISTS `dt_define_rel` (
   `remark` varchar(45) DEFAULT NULL,
   `before_cal_rel` json NULL COMMENT '计算关系之前需要计算的关系',
   `cal_rule` json NULL COMMENT '计算器,就是计算规则',
-  `from_obj_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '边关系左侧的对象分类',
-  `to_obj_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '关系右侧的对象分类',
+  `from_obj_type` varchar(50) NULL DEFAULT NULL COMMENT '边关系左侧的对象分类',
+  `to_obj_type` varchar(50) NULL DEFAULT NULL COMMENT '关系右侧的对象分类',
   `automatic_flag` tinyint(0) NULL DEFAULT NULL COMMENT '自动计算类型,0-手动计算,1-自动计算',
   `source_flag` tinyint(0) NULL DEFAULT NULL COMMENT '是否需要配置源末端',
   `manual` int(0) NULL DEFAULT NULL COMMENT '手动计算类型 1 禁用  2提示引导 3手动维护',
@@ -110,7 +110,7 @@ CREATE TABLE IF NOT EXISTS `dt_define_rel` (
   PRIMARY KEY (`id`) USING BTREE,
   KEY `idx_code` (`code`) USING BTREE,
   KEY `idx_graph_code` (`graph_code`,`code`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='边类型表';
+) ENGINE=InnoDB ROW_FORMAT=DYNAMIC COMMENT='边类型表';
 
 CREATE TABLE IF NOT EXISTS `dt_object` (
   `id` varchar(100) NOT NULL,
@@ -138,7 +138,7 @@ CREATE TABLE IF NOT EXISTS `dt_object` (
   KEY `idx_project_3` (`project_id`,`modified_time`) USING BTREE,
   KEY `idx_project_4` (`obj_type`) USING BTREE,
   KEY `idx_project_5` (`project_id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='对象实例表';
+) ENGINE=InnoDB ROW_FORMAT=DYNAMIC COMMENT='对象实例表';
 
 CREATE TABLE IF NOT EXISTS `dt_relation` (
   `id` varchar(40) NOT NULL,
@@ -166,7 +166,7 @@ CREATE TABLE IF NOT EXISTS `dt_relation` (
   KEY `idx_4` (`graph_id`,`rel_code`,`obj_to`,`project_id`) USING BTREE,
   KEY `idx_5` (`obj_from`) USING BTREE,
   KEY `idx_6` (`obj_to`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='关系实例表';
+) ENGINE=InnoDB ROW_FORMAT=DYNAMIC COMMENT='关系实例表';
 
 -- ----------------------------
 -- Table structure for relation_project_cal
@@ -195,7 +195,7 @@ CREATE TABLE  IF NOT EXISTS `dt_relation_project_cal`  (
 `valid` tinyint(0) NULL DEFAULT NULL COMMENT '合法标识',
 `ts` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP  ON UPDATE CURRENT_TIMESTAMP NOT NULL COMMENT '乐观锁',
 PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT = Dynamic COMMENT='项目关系记录表';
+) ENGINE = InnoDB ROW_FORMAT = Dynamic COMMENT='项目关系记录表';
 
 CREATE TABLE IF NOT EXISTS `dt_equip_class_rel`  (
  `id` varchar(40) NOT NULL COMMENT '主键,32位UUID',
@@ -212,23 +212,23 @@ CREATE TABLE IF NOT EXISTS `dt_equip_class_rel`  (
  `valid` tinyint(0) NULL DEFAULT 1 COMMENT '合法标识',
  `ts` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '乐观锁',
  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COMMENT = '项目设备类边关系表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB COMMENT = '项目设备类边关系表' ROW_FORMAT = Dynamic;
 
 
 CREATE TABLE IF NOT EXISTS `dt_define_info_collect`  (
-`id` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-`define_info_id` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-`project_id` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-`group_code` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '集团编码',
+`id` varchar(40) NOT NULL,
+`define_info_id` varchar(40) NULL DEFAULT NULL,
+`project_id` varchar(40) NULL DEFAULT NULL,
+`group_code` varchar(40) NULL DEFAULT NULL COMMENT '集团编码',
 `visiable` int NULL DEFAULT NULL COMMENT '是否可见 1- 可见 0-不可见',
-`code` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '信息点',
-`class_code` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型编码',
-`creator` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
-`creation_time` char(14) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建时间',
-`modifier` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '最后修改人',
-`modified_time` char(14) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '最后修改时间',
+`code` varchar(40) NULL DEFAULT NULL COMMENT '信息点',
+`class_code` varchar(40) NULL DEFAULT NULL COMMENT '类型编码',
+`creator` varchar(32) NULL DEFAULT NULL COMMENT '创建人',
+`creation_time` char(14) NULL DEFAULT NULL COMMENT '创建时间',
+`modifier` varchar(32) NULL DEFAULT NULL COMMENT '最后修改人',
+`modified_time` char(14) NULL DEFAULT NULL COMMENT '最后修改时间',
 `valid` tinyint NULL DEFAULT NULL COMMENT '合法标识',
 `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '乐观锁',
 `key_word` int(1) DEFAULT NULL COMMENT '是否为关键信息点',
 PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB ROW_FORMAT = Dynamic COMMENT = '采集信息点配置表' ;

+ 2 - 2
dmp-business/dmp-rwd/src/main/resources/docs/根据现有mysql数据快速生成DML语句的sql记录.md

@@ -128,8 +128,8 @@ WHERE
 ```sql
 ALTER TABLE dt_define_rel ADD COLUMN  `before_cal_rel` json NULL COMMENT '计算关系之前需要计算的关系';
 ALTER TABLE dt_define_rel ADD COLUMN  `cal_rule` json NULL COMMENT '计算器,就是计算规则';
-ALTER TABLE dt_define_rel ADD COLUMN  `from_obj_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '边关系左侧的对象分类';
-ALTER TABLE dt_define_rel ADD COLUMN  `to_obj_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '关系右侧的对象分类';
+ALTER TABLE dt_define_rel ADD COLUMN  `from_obj_type` varchar(50) NULL DEFAULT NULL COMMENT '边关系左侧的对象分类';
+ALTER TABLE dt_define_rel ADD COLUMN  `to_obj_type` varchar(50) NULL DEFAULT NULL COMMENT '关系右侧的对象分类';
 ALTER TABLE dt_define_rel ADD COLUMN  `automatic_flag` tinyint(0) NULL DEFAULT NULL COMMENT '自动计算类型,0-手动计算,1-自动计算';
 ALTER TABLE dt_define_rel ADD COLUMN  `source_flag` tinyint(0) NULL DEFAULT NULL COMMENT '是否需要配置源末端';
 ALTER TABLE dt_define_rel ADD COLUMN  `manual` int(0) NULL DEFAULT NULL COMMENT '手动计算类型 1 禁用  2提示引导 3手动维护';

+ 22 - 22
dmp-cloud/dmp-message/src/main/resources/db/init/schema.sql

@@ -2,49 +2,49 @@
 --  Data for `dt_message_send_register`
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS "dt_message_send_register" (
-"id" varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键id',
-"code" varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '发送渠道编码',
-"name" varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '发送渠道名称',
-"access_key" varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT 'accessKey',
-"access_secret" text CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT 'accessSecret',
-"extra" text CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '扩展参数',
-"clazz" varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '发送消息实现类',
-"creator" varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建人',
-"creation_time" char(14) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建时间',
-"modifier" varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '最后修改人',
-"modified_time" char(14) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '最后修改时间',
+"id" varchar(40) NOT NULL COMMENT '主键id',
+"code" varchar(40) NOT NULL COMMENT '发送渠道编码',
+"name" varchar(40) NOT NULL COMMENT '发送渠道名称',
+"access_key" varchar(255) DEFAULT NULL COMMENT 'accessKey',
+"access_secret" text COMMENT 'accessSecret',
+"extra" text COMMENT '扩展参数',
+"clazz" varchar(255) NOT NULL COMMENT '发送消息实现类',
+"creator" varchar(32) DEFAULT NULL COMMENT '创建人',
+"creation_time" char(14) DEFAULT NULL COMMENT '创建时间',
+"modifier" varchar(32) DEFAULT NULL COMMENT '最后修改人',
+"modified_time" char(14) DEFAULT NULL COMMENT '最后修改时间',
 "valid" tinyint(1) DEFAULT NULL COMMENT '合法标识',
 "ts" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '乐观锁',
 PRIMARY KEY ("id") USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
+) ENGINE=InnoDB;
 
 
 -- ----------------------------
 --  Data for `dt_message_type`
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS "dt_message_type" (
-"id" varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键id',
+"id" varchar(40) NOT NULL COMMENT '主键id',
 "type_code" varchar(40) NOT NULL COMMENT '消息类型编码',
 "type_name" varchar(40) NOT NULL COMMENT '消息类型名称',
 "send_channel" varchar(255) NOT NULL,
 "remark" text COMMENT '备注',
-"creator" varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建人',
-"creation_time" char(14) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建时间',
-"modifier" varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '最后修改人',
-"modified_time" char(14) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '最后修改时间',
+"creator" varchar(32) DEFAULT NULL COMMENT '创建人',
+"creation_time" char(14) DEFAULT NULL COMMENT '创建时间',
+"modifier" varchar(32) DEFAULT NULL COMMENT '最后修改人',
+"modified_time" char(14) DEFAULT NULL COMMENT '最后修改时间',
 "valid" tinyint(1) DEFAULT NULL COMMENT '合法标识',
 "ts" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '乐观锁',
 PRIMARY KEY ("id") USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
+) ENGINE=InnoDB;
 
 
 -- ----------------------------
 --  Data for `dt_message`
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS "dt_message" (
-"id" varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键id',
-"type_id" varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '消息类型',
-"user_id" varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '接收用户',
+"id" varchar(40) NOT NULL COMMENT '主键id',
+"type_id" varchar(40) NOT NULL COMMENT '消息类型',
+"user_id" varchar(40) NOT NULL COMMENT '接收用户',
 "copy_to_user_id" text COMMENT '抄送用户,多个抄送者可以用逗号分隔,最多100个地址(主要用于邮箱发送)',
 "title" varchar(255) NOT NULL,
 "content" text NOT NULL,
@@ -61,4 +61,4 @@ CREATE TABLE IF NOT EXISTS "dt_message" (
 "valid" tinyint(1) DEFAULT NULL,
 "ts" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
 PRIMARY KEY ("id") USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB

+ 6 - 0
dmp-comp/dmp-mybatis/README.md

@@ -168,6 +168,12 @@ spring:
 自定义DB数据格式转换器
 * 放入此目录中即可: com.persagy.**.typehandler
 * json类型自动转换,需要配置@TableName(value = "tableName", autoResultMap = true)和字段@TableField(typeHandler = JacksonTypeHandler.class)
+
 最新变化
 ---------------
 
+注意事项
+---------------
+字符集配置:DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci
+* 在建库语句中标记字符集,代码中的建表语句不出现字符集相关的语句(导出时如果有则手动清除)。
+* 字符集不一致修复sql:ALTER DATABASE `${schema}` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci

+ 1 - 1
dmp-comp/dmp-mybatis/src/main/resources/mapper/DbDao.xml

@@ -5,7 +5,7 @@
 
 <mapper namespace="com.persagy.dmp.mybatis.dao.DbDao">
 	<select id="createDataBase">
-		create schema if not exists `${schema}` default character set utf8 collate utf8_general_ci
+		create schema if not exists `${schema}` default character set utf8mb4 collate utf8mb4_general_ci
 	</select>
 
 </mapper>