优化

firstleg/src/main/resources/application-dev.yml

@@ -1,11 +0,0 @@
-spring:
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: ${FIRSTLEG_DB_URL:jdbc:mysql://127.0.0.1:3306/baiyue_firstleg?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true}
-    username: ${FIRSTLEG_DB_USERNAME:root}
-    password: ${FIRSTLEG_DB_PASSWORD:123456}
-
-# 仅本地开发环境输出 MyBatis 执行 SQL、参数与结果摘要到 IDEA 控制台。
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

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

@@ -1,6 +0,0 @@
-spring:
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: ${FIRSTLEG_TEST_DB_URL:jdbc:mysql://${TEST_DB_HOST:8.163.30.128}:${TEST_DB_PORT:3306}/baiyue_firstleg?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true}
-    username: ${FIRSTLEG_TEST_DB_USERNAME:${TEST_DB_USERNAME:root}}
-    password: ${FIRSTLEG_TEST_DB_PASSWORD:${TEST_DB_PASSWORD}}

firstleg/src/main/resources/application.yml

@@ -2,24 +2,24 @@ server:
   port: ${FIRSTLEG_PORT:9202}
 spring:
   profiles:
-    active: ${SPRING_PROFILES_ACTIVE:dev}
+    active: ${SPRING_PROFILES_ACTIVE:test}
   application:
     name: firstleg-service
   config:
     import:
-      - optional:nacos:baiyue-common.yml?group=BAIYUE&refreshEnabled=true
-      - optional:nacos:${spring.application.name}.yml?group=BAIYUE&refreshEnabled=true
+      - nacos:baiyue-common.yml?group=${NACOS_GROUP:BAIYUE}&refreshEnabled=true
+      - nacos:${spring.application.name}.yml?group=${NACOS_GROUP:BAIYUE}&refreshEnabled=true
   cloud:
     nacos:
-      server-addr: ${NACOS_SERVER_ADDR:127.0.0.1:8848}
-      username: ${NACOS_USERNAME:nacos}
-      password: ${NACOS_PASSWORD:nacos}
+      server-addr: ${NACOS_SERVER_ADDR}
+      username: ${NACOS_USERNAME}
+      password: ${NACOS_PASSWORD}
       discovery:
         enabled: ${NACOS_DISCOVERY_ENABLED:true}
         register-enabled: ${NACOS_REGISTER_ENABLED:true}
         group: ${NACOS_GROUP:BAIYUE}
-        namespace: ${NACOS_NAMESPACE:public}
-      config.namespace: ${NACOS_NAMESPACE:public}
+        namespace: ${NACOS_NAMESPACE}
+      config.namespace: ${NACOS_NAMESPACE}
   servlet:
     multipart:
       max-file-size: ${FIRSTLEG_MULTIPART_MAX_FILE_SIZE:50MB}
@@ -56,10 +56,8 @@ baiyue:
       max-tasks-per-trigger: ${CARRIER_SCHEDULE_MAX_TASKS_PER_TRIGGER:2000}
       lease-duration: ${CARRIER_SCHEDULE_LEASE_DURATION:PT5M}
   security:
-    jwt-secret: ${JWT_SECRET:change-me-to-at-least-32-bytes-long-before-start}
-    internal-service-token: ${INTERNAL_SERVICE_TOKEN:change-me-to-an-internal-token-at-least-32-bytes-long}
+    internal-service-token: ${INTERNAL_SERVICE_TOKEN}
   lastleg:
-    event-bridge-url: ${LASTLEG_EVENT_BRIDGE_URL:}
   clients:
     order:
       url: ${ORDER_SERVICE_URL:}

firstleg/src/main/resources/db/phase2-inbound-schema.sql

@@ -1079,3 +1079,38 @@ CREATE TABLE IF NOT EXISTS fl_dropship_pallet_carton_sku (
   KEY idx_dropship_carton_sku_code (sku_code,carton_id),
   CONSTRAINT fk_dropship_carton_sku_carton FOREIGN KEY (carton_id) REFERENCES fl_dropship_pallet_carton(id)
 ) ENGINE=InnoDB COMMENT='一件代发物理箱内逐SKU清点事实';
+
+CREATE TABLE IF NOT EXISTS event_delivery_retry_audit (
+  request_id VARCHAR(36) NOT NULL COMMENT '人工重试请求UUID和幂等键',
+  producer_table VARCHAR(64) NOT NULL COMMENT '本服务发件箱表名',
+  entry_id VARCHAR(64) NOT NULL COMMENT '发件箱记录主键',
+  event_id VARCHAR(128) NOT NULL COMMENT '原事件全局标识',
+  event_type VARCHAR(64) NOT NULL COMMENT '原事件类型',
+  payload_hash VARCHAR(71) NOT NULL COMMENT '原事件不可变负载摘要',
+  operator_name VARCHAR(128) NOT NULL COMMENT '持有运维凭据的操作人标识',
+  reason VARCHAR(500) NOT NULL COMMENT '人工重试原因',
+  previous_failures INT NOT NULL COMMENT '重试前累计失败次数',
+  previous_error VARCHAR(1000) NULL COMMENT '重试前最后一次脱敏错误',
+  requested_at DATETIME(3) NOT NULL COMMENT '重试申请提交时间',
+  PRIMARY KEY (request_id),
+  KEY idx_event_retry_entry (producer_table,entry_id,requested_at),
+  KEY idx_event_retry_event (event_id,requested_at)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='业务事件人工重试审计，与恢复待发送状态同事务提交';
+
+CREATE TABLE IF NOT EXISTS event_delivery_attempt (
+  attempt_id VARCHAR(36) NOT NULL COMMENT '本次投递租约UUID和审计主键',
+  service_name VARCHAR(32) NOT NULL COMMENT '本库所属生产服务',
+  event_type VARCHAR(96) NOT NULL COMMENT '白名单业务事件类型',
+  entry_id VARCHAR(128) NOT NULL COMMENT '生产者发件箱主键',
+  event_id VARCHAR(128) NULL COMMENT '合法原事件UUID或ULID；格式错误时为空',
+  target_name VARCHAR(64) NOT NULL COMMENT '固定目标业务服务',
+  started_at DATETIME(3) NOT NULL COMMENT '领取及审计事务提交前的开始时间',
+  finished_at DATETIME(3) NULL COMMENT '尝试完成或租约过期恢复时间',
+  duration_ms BIGINT NULL COMMENT '尝试耗时毫秒',
+  outcome VARCHAR(24) NOT NULL COMMENT 'STARTED/APPLIED/DUPLICATE/STALE/RETRY/DEAD/LEASE_EXPIRED',
+  error_code VARCHAR(64) NULL COMMENT '有限错误类别或HTTP状态；不含载荷与令牌',
+  next_retry_at DATETIME(3) NULL COMMENT '本次失败后下次计划投递时间',
+  PRIMARY KEY (attempt_id),
+  KEY idx_delivery_attempt_entry (service_name,entry_id,started_at),
+  KEY idx_delivery_attempt_outcome (outcome,started_at)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='本服务业务事件逐次投递审计';