diff --git a/docker/.env.prod b/docker/.env.prod index 09f1fc2..6ddd6af 100644 --- a/docker/.env.prod +++ b/docker/.env.prod @@ -34,6 +34,6 @@ REDIS_DB=0 # ==================== SMS Configuration ==================== SMS_ACCESS_KEY_ID=LTAI5t6QcdJHpYbCPxM8SXYE SMS_ACCESS_KEY_SECRET=ybvjSEb7wilMt3qT5nOppYPoNVayCD -SMS_SIGN_NAME=TopFans +SMS_SIGN_NAME=上海顶粉数字科技 SMS_TEMPLATE_CODE=SMS_314621237 SMS_REGION=cn-hangzhou diff --git a/docker/docker-compose.prod.yml b/docker/docker-compose.prod.yml index f5df07d..c171c86 100644 --- a/docker/docker-compose.prod.yml +++ b/docker/docker-compose.prod.yml @@ -111,6 +111,8 @@ services: target: userservice container_name: topfans-userservice restart: always + env_file: + - .env.prod environment: <<: *common-env PORT: 20000 @@ -123,11 +125,6 @@ services: REDIS_PORT: 6379 REDIS_PASSWORD: ${REDIS_PASSWORD:-123456} REDIS_DB: 0 - SMS_ACCESS_KEY_ID: ${SMS_ACCESS_KEY_ID:-} - SMS_ACCESS_KEY_SECRET: ${SMS_ACCESS_KEY_SECRET:-} - SMS_SIGN_NAME: ${SMS_SIGN_NAME:-} - SMS_TEMPLATE_CODE: ${SMS_TEMPLATE_CODE:-} - SMS_REGION: ${SMS_REGION:-cn-hangzhou} depends_on: postgres: condition: service_healthy @@ -157,6 +154,8 @@ services: target: assetservice container_name: topfans-assetservice restart: always + env_file: + - .env.prod environment: <<: *common-env PORT: 20003 @@ -166,14 +165,6 @@ services: DB_PASSWORD: ${DB_PASSWORD:-postgres123} DB_NAME: topfans USER_SERVICE_URL: tri://userservice:20000 - OSS_REGION: ${OSS_REGION:-cn-shanghai} - OSS_BUCKET_NAME: ${OSS_BUCKET_NAME:-top-fans-test} - OSS_STS_ROLE_ARN: ${OSS_STS_ROLE_ARN:-acs:ram::1387642798143585:role/top-fans-oss-user} - OSS_ACCESS_KEY_ID: ${OSS_ACCESS_KEY_ID:-} - OSS_ACCESS_KEY_SECRET: ${OSS_ACCESS_KEY_SECRET:-} - OSS_AVATAR_DIR: ${OSS_AVATAR_DIR:-avatar/} - OSS_ASSET_DIR: ${OSS_ASSET_DIR:-asset/} - OSS_TOKEN_EXPIRE_TIME: ${OSS_TOKEN_EXPIRE_TIME:-3600} depends_on: userservice: condition: service_started @@ -398,6 +389,8 @@ services: target: aichatservice container_name: topfans-aichatservice restart: always + env_file: + - .env.prod environment: <<: *common-env PORT: 20008 @@ -410,12 +403,6 @@ services: REDIS_PORT: 6379 REDIS_PASSWORD: ${REDIS_PASSWORD:-123456} REDIS_DB: 0 - MINIMAX_API_KEY: ${MINIMAX_API_KEY:-} - MINIMAX_API_URL: ${MINIMAX_API_URL:-https://api.minimaxi.com/v1} - MINIMAX_MODEL: ${MINIMAX_MODEL:-M2-her} - QWEN_API_KEY: ${QWEN_API_KEY:-} - QWEN_API_URL: ${QWEN_API_URL:-https://dashscope.aliyuncs.com/compatible-mode/v1} - QWEN_MODEL: ${QWEN_MODEL:-qwen-plus} depends_on: userservice: condition: service_started diff --git a/frontend/manifest.json b/frontend/manifest.json index 1d3d05c..00344d2 100644 --- a/frontend/manifest.json +++ b/frontend/manifest.json @@ -3,7 +3,7 @@ "appid" : "__UNI__F199FF4", "description" : "", "versionName" : "1.0.5", - "versionCode" : 105, + "versionCode" : 106, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : {