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

deploy/docker-compose.yml

@@ -104,6 +104,13 @@ services:
       CARRIER_SCHEDULE_BATCH_SIZE: ${CARRIER_SCHEDULE_BATCH_SIZE:-20}
       CARRIER_SCHEDULE_MAX_TASKS_PER_TRIGGER: ${CARRIER_SCHEDULE_MAX_TASKS_PER_TRIGGER:-2000}
       CARRIER_SCHEDULE_LEASE_DURATION: ${CARRIER_SCHEDULE_LEASE_DURATION:-PT5M}
+      TERMINAL_DRAYAGE_MAIL_ENABLED: ${TERMINAL_DRAYAGE_MAIL_ENABLED:-false}
+      TERMINAL_DRAYAGE_MAIL_HOST: ${TERMINAL_DRAYAGE_MAIL_HOST:-}
+      TERMINAL_DRAYAGE_MAIL_PORT: ${TERMINAL_DRAYAGE_MAIL_PORT:-587}
+      TERMINAL_DRAYAGE_MAIL_USERNAME: ${TERMINAL_DRAYAGE_MAIL_USERNAME:-}
+      TERMINAL_DRAYAGE_MAIL_PASSWORD: ${TERMINAL_DRAYAGE_MAIL_PASSWORD:-}
+      TERMINAL_DRAYAGE_MAIL_SSL: ${TERMINAL_DRAYAGE_MAIL_SSL:-false}
+      TERMINAL_DRAYAGE_MAIL_SCAN_DELAY: ${TERMINAL_DRAYAGE_MAIL_SCAN_DELAY:-10000}
 
   finance:
     <<: *common

deploy/scripts/deploy-built-service.sh

@@ -130,6 +130,14 @@ if [ "$SERVICE" = "firstleg" ]; then
     echo "部署 firstleg 时，环境文件必须包含非空 LASTLEG_EVENT_BRIDGE_URL" >&2
     exit 2
   fi
+  if [ "$(env_file_value TERMINAL_DRAYAGE_MAIL_ENABLED)" = "true" ]; then
+    for key in TERMINAL_DRAYAGE_MAIL_HOST TERMINAL_DRAYAGE_MAIL_PORT TERMINAL_DRAYAGE_MAIL_USERNAME TERMINAL_DRAYAGE_MAIL_PASSWORD; do
+      if ! env_file_has_key "$key" || [ -z "$(env_file_value "$key")" ]; then
+        echo "启用码头车队邮件时，环境文件必须包含非空 $key" >&2
+        exit 2
+      fi
+    done
+  fi
 fi
 
 if [ "$SERVICE" = "lastleg-service" ]; then

deploy/sql/头程数据库统一增量-MySQL8.sql

@@ -18569,7 +18569,7 @@ CREATE TABLE IF NOT EXISTS fl_terminal_drayage_history (
   KEY idx_terminal_drayage_history(container_booking_id,created_at,id),
   CONSTRAINT fk_terminal_drayage_history FOREIGN KEY(drayage_id) REFERENCES fl_terminal_drayage(id),
   CONSTRAINT chk_terminal_drayage_history_action CHECK(action IN
-    ('SELECT_FLEET','SCHEDULE_PICKUP','RECORD_PICKUP','RECORD_EMPTY_RETURN'))
+    ('SELECT_FLEET','SEND_PICKUP_EMAIL','SCHEDULE_PICKUP','RECORD_PICKUP','RECORD_EMPTY_RETURN'))
 ) ENGINE=InnoDB COMMENT='目的港码头拖车不可变操作历史';
 CREATE TABLE IF NOT EXISTS fl_terminal_drayage_operation (
   id BIGINT UNSIGNED NOT NULL COMMENT '幂等操作ID', container_booking_id BIGINT UNSIGNED NOT NULL COMMENT '货柜ID',
@@ -18604,6 +18604,9 @@ ALTER TABLE fl_terminal_drayage
   MODIFY COLUMN updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间';
 
 ALTER TABLE fl_terminal_drayage_history
+  DROP CHECK chk_terminal_drayage_history_action,
+  ADD CONSTRAINT chk_terminal_drayage_history_action CHECK(action IN
+    ('SELECT_FLEET','SEND_PICKUP_EMAIL','SCHEDULE_PICKUP','RECORD_PICKUP','RECORD_EMPTY_RETURN')),
   MODIFY COLUMN id BIGINT UNSIGNED NOT NULL COMMENT '历史ID',
   MODIFY COLUMN drayage_id BIGINT UNSIGNED NOT NULL COMMENT '码头拖车聚合ID',
   MODIFY COLUMN container_booking_id BIGINT UNSIGNED NOT NULL COMMENT '货柜ID快照',