From 52017f7e23e47d4b5e6816a792dcfd1eb5a0d23b Mon Sep 17 00:00:00 2001 From: lzh Date: Wed, 14 Jan 2026 11:43:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=20Jenkins=E4=BF=AE=E5=A4=8D3-prod?= =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E9=85=8D=E7=BD=AE=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.core.yml | 6 ++ .../src/main/resources/application-prod.yaml | 1 + .../src/main/resources/application-prod.yaml | 4 ++ .../src/main/resources/application-prod.yaml | 3 + .../src/main/resources/application-prod.yaml | 56 +++++++++++++++++++ 5 files changed, 70 insertions(+) diff --git a/docker-compose.core.yml b/docker-compose.core.yml index cdcd7ee..a3cafdb 100644 --- a/docker-compose.core.yml +++ b/docker-compose.core.yml @@ -73,6 +73,12 @@ services: SPRING_DATA_REDIS_HOST: 172.17.16.14 SPRING_DATA_REDIS_PASSWORD: "9kHXcZ1ojFsD" # TODO: 填入 Redis 密码 + # 微信配置 (解决 appid 不能为 null) + WX_MP_APP_ID: "wx5b23ba7a5589ecbb" + WX_MP_SECRET: "2a7b3b20c537e52e74afd395eb85f61f" + WX_MINIAPP_APPID: "wxc4598c446f8a9cb3" + WX_MINIAPP_SECRET: "4a1a04e07f6a4a0751b39c3064a92c8b" + volumes: - app-logs:/app/logs deploy: diff --git a/viewsh-gateway/src/main/resources/application-prod.yaml b/viewsh-gateway/src/main/resources/application-prod.yaml index 3e01731..82d1fcd 100644 --- a/viewsh-gateway/src/main/resources/application-prod.yaml +++ b/viewsh-gateway/src/main/resources/application-prod.yaml @@ -61,6 +61,7 @@ logging: level: root: INFO com.viewsh: ${LOG_LEVEL:INFO} + org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR file: name: ${LOG_FILE_PATH:/app/logs}/${spring.application.name}.log diff --git a/viewsh-module-infra/viewsh-module-infra-server/src/main/resources/application-prod.yaml b/viewsh-module-infra/viewsh-module-infra-server/src/main/resources/application-prod.yaml index 31e150a..560694d 100644 --- a/viewsh-module-infra/viewsh-module-infra-server/src/main/resources/application-prod.yaml +++ b/viewsh-module-infra/viewsh-module-infra-server/src/main/resources/application-prod.yaml @@ -128,6 +128,10 @@ logging: level: root: INFO com.viewsh: ${LOG_LEVEL:INFO} + com.viewsh.module.infra.dal.mysql: debug + com.viewsh.module.infra.dal.mysql.logger.ApiErrorLogMapper: INFO + com.viewsh.module.infra.dal.mysql.file.FileConfigMapper: INFO + org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR file: name: ${LOG_FILE_PATH:/app/logs}/${spring.application.name}.log diff --git a/viewsh-module-iot/viewsh-module-iot-server/src/main/resources/application-prod.yaml b/viewsh-module-iot/viewsh-module-iot-server/src/main/resources/application-prod.yaml index 5ea356c..417240c 100644 --- a/viewsh-module-iot/viewsh-module-iot-server/src/main/resources/application-prod.yaml +++ b/viewsh-module-iot/viewsh-module-iot-server/src/main/resources/application-prod.yaml @@ -126,6 +126,9 @@ logging: level: root: INFO com.viewsh: ${LOG_LEVEL:INFO} + com.viewsh.module.iot.dal.mysql: debug + com.viewsh.module.iot.dal.mysql.sms.SmsChannelMapper: INFO + org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR file: name: ${LOG_FILE_PATH:/app/logs}/${spring.application.name}.log diff --git a/viewsh-module-system/viewsh-module-system-server/src/main/resources/application-prod.yaml b/viewsh-module-system/viewsh-module-system-server/src/main/resources/application-prod.yaml index c193e8f..ba344b0 100644 --- a/viewsh-module-system/viewsh-module-system-server/src/main/resources/application-prod.yaml +++ b/viewsh-module-system/viewsh-module-system-server/src/main/resources/application-prod.yaml @@ -138,6 +138,23 @@ logging: file: name: ${LOG_FILE_PATH:/app/logs}/${spring.application.name}.log +--- #################### 微信公众号、小程序相关配置 #################### +wx: + mp: # 公众号配置（必填） + app-id: ${WX_MP_APP_ID:wx5b23ba7a5589ecbb} # 优先环境变量，兜底默认值 + secret: ${WX_MP_SECRET:2a7b3b20c537e52e74afd395eb85f61f} + config-storage: + type: RedisTemplate + key-prefix: wx + http-client-type: HttpClient + miniapp: # 小程序配置（必填） + appid: ${WX_MINIAPP_APPID:wxc4598c446f8a9cb3} + secret: ${WX_MINIAPP_SECRET:4a1a04e07f6a4a0751b39c3064a92c8b} + config-storage: + type: RedisTemplate + key-prefix: wa + http-client-type: HttpClient + --- #################### 芋道相关配置 #################### viewsh: @@ -148,3 +165,42 @@ viewsh: enable: true # 生产环境开启验证码 security: mock-enable: false # 生产环境关闭 mock + access-log: + enable: true + wxa-code: + env-version: release + wxa-subscribe-message: + miniprogram-state: formal + +justauth: + enabled: true + type: + DINGTALK: # 钉钉 + client-id: dingvrnreaje3yqvzhxg + client-secret: i8E6iZyDvZj51JIb0tYsYfVQYOks9Cq1lgryEjFRqC79P3iJcrxEwT6Qk2QvLrLI + ignore-check-redirect-uri: true + WECHAT_ENTERPRISE: # 企业微信 + client-id: wwd411c69a39ad2e54 + client-secret: 1wTb7hYxnpT2TUbIeHGXGo7T0odav1ic10mLdyyATOw + agent-id: 1000004 + ignore-check-redirect-uri: true + # noinspection SpringBootApplicationYaml + WECHAT_MINI_PROGRAM: # 微信小程序 + client-id: ${wx.miniapp.appid} + client-secret: ${wx.miniapp.secret} + ignore-check-redirect-uri: true + ignore-check-state: true # 微信小程序，不会使用到 state，所以不进行校验 + WECHAT_MP: # 微信公众号 + client-id: ${wx.mp.app-id} + client-secret: ${wx.mp.secret} + ignore-check-redirect-uri: true + ALIPAY: # 支付宝小程序 + client-id: xx + client-secret: xx + alipay-public-key: xx + ignore-check-redirect-uri: true + ignore-check-state: true + cache: + type: REDIS + prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE:: + timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟