Merge pull request '功能优化' (#110) from wanjia9506/gitlink-notification-system:master into master

README.md

@@ -33,6 +33,9 @@ cp middleware/.env.example middleware/.env
 cp reader/src/main/resources/application.yml.example reader/src/main/resources/application.yml    
 cp writer/src/main/resources/application.yml.example writer/src/main/resources/application.yml   
 cp executor/src/main/resources/application.yml.example executor/src/main/resources/application.yml  
+cp reader/src/main/resources/mail.properties.example reader/src/main/resources/mail.properties  
+cp writer/src/main/resources/mail.properties.example writer/src/main/resources/mail.properties
+cp executor/src/main/resources/mail.properties.example executor/src/main/resources/mail.properties
 ``` 
 
 5. 修改 `{repo}/middleware/.env` 文件里 `SQL_SCRIPT_PATH` 和 `DOCKER_DATA_PATH` 绝对路径到本地磁盘  

db/gns-email.sql

@@ -24,3 +24,8 @@ CREATE TABLE `gitlink_email_send_records` (
   KEY `index_on_email_and_status` (`email`,`status`),
   KEY `index_on_status` (`status`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
+
+
+-- 2023-01-05 更新字符集编码
+ALTER TABLE gitlink_email_jobs CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE gitlink_email_send_records CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

db/gns-notification.sql

@@ -36,3 +36,6 @@ ALTER TABLE gitlink_sys_notification ADD COLUMN (`type` TINYINT(4) NOT NULL DEFA
 -- 2021-09-09 新增 source 字段区分消息来源、新增 extra 字段保存额外信息
 ALTER TABLE gitlink_sys_notification ADD source varchar(250) NULL COMMENT '消息来源';
 ALTER TABLE gitlink_sys_notification ADD extra TEXT NULL COMMENT '额外信息（备用字段）';
+
+-- 2023-01-05 更新字符集编码
+ALTER TABLE gitlink_sys_notification CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

db/hehui-gns-notification.sql

@@ -25,3 +25,6 @@ ALTER TABLE hehui_sys_notification ADD COLUMN (`type` TINYINT(4) NOT NULL DEFAUL
 -- 2021-09-10 新增 source 字段区分消息来源、新增 extra 字段保存额外信息
 ALTER TABLE hehui_sys_notification ADD source varchar(250) NULL COMMENT '消息来源';
 ALTER TABLE hehui_sys_notification ADD extra TEXT NULL COMMENT '额外信息（备用字段）';
+
+-- 2023-01-05 更新字符集编码
+ALTER TABLE hehui_sys_notification CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

db/osredm-gns-notification.sql

@@ -25,3 +25,6 @@ ALTER TABLE osredm_sys_notification ADD COLUMN (`type` TINYINT(4) NOT NULL DEFAU
 -- 2021-09-10 新增 source 字段区分消息来源、新增 extra 字段保存额外信息
 ALTER TABLE osredm_sys_notification ADD source varchar(250) NULL COMMENT '消息来源';
 ALTER TABLE osredm_sys_notification ADD extra TEXT NULL COMMENT '额外信息（备用字段）';
+
+-- 2023-01-05 更新字符集编码
+ALTER TABLE osredm_sys_notification CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

middleware/services.yml

@@ -22,6 +22,7 @@ services:
       - ${MYSQL_LOCAL_PORT}:3306
     networks:
       - gitlink_network
+    restart: always
 
   redis:
     image: redis:${REDIS_VERSION}
@@ -36,6 +37,7 @@ services:
       - ${REDIS_LOCAL_PORT}:6379
     networks:
       - gitlink_network
+    restart: always
 
   # See Also: https://hub.docker.com/r/confluentinc/cp-zookeeper
   zookeeper:
@@ -51,6 +53,7 @@ services:
 #      - ${DOCKER_DATA_PATH}/zookeeper:/var/lib/zookeeper
     networks:
       - gitlink_network
+    restart: always
 
   # See Also: https://hub.docker.com/r/confluentinc/cp-kafka
   kafka1:
@@ -74,6 +77,7 @@ services:
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
     networks:
       - gitlink_network
+    restart: always
 
   # See Also: https://hub.docker.com/r/confluentinc/cp-kafka
   kafka2:
@@ -97,6 +101,7 @@ services:
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
     networks:
       - gitlink_network
+    restart: always
 
   gitlink-reader:
     container_name: ${GNS_READER_CONTAINER_NAME}
@@ -118,6 +123,7 @@ services:
       - mysql
     ports:
       - ${GNS_READER_LOCAL_PORT}:8081
+    restart: always
 
   gitlink-writer:
     container_name: ${GNS_WRITER_CONTAINER_NAME}
@@ -139,6 +145,7 @@ services:
       - mysql
     ports:
       - ${GNS_WRITER_LOCAL_PORT}:8082
+    restart: always
 
   gitlink-executor:
     container_name: ${GNS_EXECUTOR_CONTAINER_NAME}
@@ -160,6 +167,7 @@ services:
       - mysql
     ports:
       - ${GNS_EXECUTOR_LOCAL_PORT}:8083
+    restart: always
 
 networks:
   gitlink_network: