diff --git a/db/gns-notification.sql b/db/gns-notification.sql index 9f94f9b..1637c77 100644 --- a/db/gns-notification.sql +++ b/db/gns-notification.sql @@ -35,31 +35,4 @@ 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 '额外信息(备用字段)'; - -DROP TABLE IF EXISTS `gitlink_email_jobs`; -CREATE TABLE `gitlink_email_jobs` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `sender` int(11) NOT NULL COMMENT '发送者id', - `emails` text NOT NULL COMMENT '收件人全部邮件地址', - `subject` varchar(500) DEFAULT NULL COMMENT '邮件主题', - `content` text NOT NULL COMMENT '邮件内容', - `created_at` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `dispatched_at` datetime DEFAULT NULL COMMENT '处理时间', - `dispatched_status` int(11) DEFAULT '-1' COMMENT '发送状态:-1 未处理,1 处理成功,2 处理失败', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; - - -DROP TABLE IF EXISTS `gitlink_email_send_records`; -CREATE TABLE `gitlink_email_send_records` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `email` varchar(500) NOT NULL DEFAULT '' COMMENT '收件人邮件地址', - `job_id` int(11) NOT NULL COMMENT '邮件详情id', - `created_at` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `sent_at` datetime DEFAULT NULL COMMENT '发送时间', - `status` int(11) DEFAULT '-1' COMMENT '发送状态:-1 未发送,1 发送成功,2 发送失败', - PRIMARY KEY (`id`), - KEY `index_on_email_and_status` (`email`,`status`), - KEY `index_on_status` (`status`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; \ No newline at end of file +ALTER TABLE gitlink_sys_notification ADD extra TEXT NULL COMMENT '额外信息(备用字段)'; \ No newline at end of file diff --git a/middleware/services.yml b/middleware/services.yml index f05935d..8e59a71 100644 --- a/middleware/services.yml +++ b/middleware/services.yml @@ -61,7 +61,9 @@ services: ports: - ${KAFKA_01_LOCAL_PORT}:29092 volumes: - - ${DOCKER_DATA_PATH}/kafka/${KAFKA_CONTAINER_01_NAME}:/var/lib/kafka + - ${DOCKER_DATA_PATH}/kafka/${KAFKA_CONTAINER_01_NAME}/lib:/var/lib/kafka + - ${DOCKER_DATA_PATH}/kafka/${KAFKA_CONTAINER_01_NAME}/logs:/var/logs/kafka + - ${DOCKER_DATA_PATH}/kafka/${KAFKA_CONTAINER_01_NAME}/conf:/etc/kafka environment: KAFKA_BROKER_ID: 1 KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 @@ -82,7 +84,9 @@ services: ports: - ${KAFKA_02_LOCAL_PORT}:39092 volumes: - - ${DOCKER_DATA_PATH}/kafka/${KAFKA_CONTAINER_02_NAME}:/var/lib/kafka + - ${DOCKER_DATA_PATH}/kafka/${KAFKA_CONTAINER_02_NAME}/lib:/var/lib/kafka + - ${DOCKER_DATA_PATH}/kafka/${KAFKA_CONTAINER_02_NAME}/logs:/var/logs/kafka + - ${DOCKER_DATA_PATH}/kafka/${KAFKA_CONTAINER_02_NAME}/conf:/etc/kafka environment: KAFKA_BROKER_ID: 2 KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 @@ -105,7 +109,7 @@ services: environment: - TZ=Asia/Shanghai volumes: - - ${DOCKER_DATA_PATH}/logs/:/data/logs/ + - ${DOCKER_DATA_PATH}/gitlink/:/data/logs/ depends_on: - kafka1 - kafka2 @@ -126,7 +130,7 @@ services: environment: - TZ=Asia/Shanghai volumes: - - ${DOCKER_DATA_PATH}/logs/:/data/logs/ + - ${DOCKER_DATA_PATH}/gitlink/:/data/logs/ depends_on: - kafka1 - kafka2 @@ -145,7 +149,7 @@ services: networks: - gitlink_network volumes: - - ${DOCKER_DATA_PATH}/logs/:/data/logs/ + - ${DOCKER_DATA_PATH}/gitlink/:/data/logs/ environment: - TZ=Asia/Shanghai depends_on: