diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 8beda915..3d414581 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -60,6 +60,9 @@ jobs: printf 'JUNHONG_APPROVAL_LEGACY_OFFLINE_RECHARGE_PAY_ENABLED=true\n' printf 'JUNHONG_WORKER_ROLE=all\n' printf 'JUNHONG_WORKER_INSTANCE_NAME=test-worker-all-1\n' + # 卡流量日快照计量灰度(rebuild-card-traffic-metering-and-stop-resume):仅测试设备 10 走新算法 + printf 'JUNHONG_TRAFFIC_CALC_MODE=gray\n' + printf 'JUNHONG_TRAFFIC_CALC_CARDS=device:10\n' } > ${{ env.DEPLOY_DIR }}/.env # 强制更新 docker-compose.prod.yml(确保使用最新配置) diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index e05cb968..0851b479 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -77,6 +77,11 @@ services: - JUNHONG_WECOM_TIMEOUT=10s - JUNHONG_APPROVAL_LEGACY_REFUND_MANUAL_ENABLED=${JUNHONG_APPROVAL_LEGACY_REFUND_MANUAL_ENABLED:-true} - JUNHONG_APPROVAL_LEGACY_OFFLINE_RECHARGE_PAY_ENABLED=${JUNHONG_APPROVAL_LEGACY_OFFLINE_RECHARGE_PAY_ENABLED:-true} + # 卡流量日快照计量与停复机新规则(API 与 Worker 必须一致;默认与未配置时行为不变) + - JUNHONG_TRAFFIC_CALC_MODE=${JUNHONG_TRAFFIC_CALC_MODE:-off} + - JUNHONG_TRAFFIC_CALC_CARDS=${JUNHONG_TRAFFIC_CALC_CARDS:-} + - JUNHONG_TRAFFIC_FLOW_SNAPSHOT_ENABLED=${JUNHONG_TRAFFIC_FLOW_SNAPSHOT_ENABLED:-true} + - JUNHONG_STOP_RESUME_UNIFIED_RULE_ENABLED=${JUNHONG_STOP_RESUME_UNIFIED_RULE_ENABLED:-false} # 短信服务配置 - JUNHONG_SMS_GATEWAY_URL=https://gateway.sms.whjhft.com:8443 - JUNHONG_SMS_USERNAME=JH0001 @@ -143,6 +148,11 @@ services: # 七月迭代:单 Worker 测试环境同时承担调度和消费 - JUNHONG_WORKER_ROLE=${JUNHONG_WORKER_ROLE:-all} - JUNHONG_WORKER_INSTANCE_NAME=${JUNHONG_WORKER_INSTANCE_NAME:-test-worker-all-1} + # 卡流量日快照计量与停复机新规则(API 与 Worker 必须一致;默认与未配置时行为不变) + - JUNHONG_TRAFFIC_CALC_MODE=${JUNHONG_TRAFFIC_CALC_MODE:-off} + - JUNHONG_TRAFFIC_CALC_CARDS=${JUNHONG_TRAFFIC_CALC_CARDS:-} + - JUNHONG_TRAFFIC_FLOW_SNAPSHOT_ENABLED=${JUNHONG_TRAFFIC_FLOW_SNAPSHOT_ENABLED:-true} + - JUNHONG_STOP_RESUME_UNIFIED_RULE_ENABLED=${JUNHONG_STOP_RESUME_UNIFIED_RULE_ENABLED:-false} # Worker 执行企微审批提交、同步和恢复任务 - JUNHONG_WECOM_BASE_URL=https://qyapi.weixin.qq.com - JUNHONG_WECOM_TIMEOUT=10s