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

# Conflicts:
#	scripts/admin-test-env-modules/phase4-overseas-pda.mjs

deploy/docker-compose.overseas.yml

@@ -26,8 +26,8 @@ x-overseas-common: &overseas-common
     SPRING_SQL_INIT_MODE: never
     TZ: Asia/Shanghai
   logging:
-    # 应用只写 stdout/stderr；local 驱动负责单份本机日志与轮转。
-    driver: local
+    # 应用只写 stdout/stderr；json-file 兼容宝塔查看，大小与数量均受控。
+    driver: ${DOCKER_LOG_DRIVER:-json-file}
     options:
       max-size: ${DOCKER_LOG_MAX_SIZE:-50m}
       max-file: "${DOCKER_LOG_MAX_FILE:-3}"

deploy/docker-compose.rocketmq.yml

@@ -1,10 +1,17 @@
 name: firstleg-${DEPLOY_ENV:-test}-rocketmq
 
+x-bounded-logging: &bounded-logging
+  driver: ${DOCKER_LOG_DRIVER:-json-file}
+  options:
+    max-size: ${DOCKER_LOG_MAX_SIZE:-50m}
+    max-file: "${DOCKER_LOG_MAX_FILE:-3}"
+
 services:
   rocketmq-namesrv:
     image: apache/rocketmq:5.3.1
     restart: unless-stopped
     command: sh mqnamesrv
+    logging: *bounded-logging
     networks: [infra-network]
 
   rocketmq-broker:
@@ -17,6 +24,7 @@ services:
       - ./rocketmq:/config:ro
       - ${ROCKETMQ_DATA_DIR:-/data/firstleg/rocketmq/store}:/home/rocketmq/store
     command: sh /config/render-broker-config.sh
+    logging: *bounded-logging
     networks: [infra-network]
 
   rocketmq-topic-init:
@@ -46,6 +54,7 @@ services:
       -t "%DLQ%$${MQ_TOPIC_PREFIX}baiyue-audit-consumer-v1" -r 1 -w 1 -p 6'
     # Broker 注册较慢或任一初始化命令失败时整组重试；所有命令均幂等。
     restart: on-failure
+    logging: *bounded-logging
     networks: [infra-network]
 
 networks:

deploy/docker-compose.yml

@@ -28,8 +28,8 @@ x-common: &common
     DATA_RESIDENCY: ${DATA_RESIDENCY:-CN}
     TZ: Asia/Shanghai
   logging:
-    # 应用只写 stdout/stderr；local 驱动负责单份本机日志与轮转。
-    driver: local
+    # 应用只写 stdout/stderr；json-file 兼容宝塔查看，大小与数量均受控。
+    driver: ${DOCKER_LOG_DRIVER:-json-file}
     options:
       max-size: ${DOCKER_LOG_MAX_SIZE:-50m}
       max-file: "${DOCKER_LOG_MAX_FILE:-3}"