From dae5a9e3510ade4ceed77bab037af086091c1fab Mon Sep 17 00:00:00 2001 From: zhangshengli <1810377322@163.com> Date: Thu, 11 Jul 2024 08:56:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yaml | 35 ++++++++++++------- .../src/main/resources/application-local.yaml | 4 +-- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/ruoyi-vue-pro-master/yudao-server/src/main/resources/application-dev.yaml b/ruoyi-vue-pro-master/yudao-server/src/main/resources/application-dev.yaml index 53567cf..e1cfb12 100644 --- a/ruoyi-vue-pro-master/yudao-server/src/main/resources/application-dev.yaml +++ b/ruoyi-vue-pro-master/yudao-server/src/main/resources/application-dev.yaml @@ -43,22 +43,21 @@ spring: primary: master datasource: master: - name: ruoyi-vue-pro - url: jdbc:mysql://192.168.10.14:23306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true + url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 username: root - password: hmkj@2023 + password: 123456 slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改 - name: ruoyi-vue-pro - url: jdbc:mysql://192.168.10.14:23306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true + lazy: true # 开启懒加载，保证启动速度 + url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 username: root - password: hmkj@2023 + password: 123456 # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 redis: - host: 192.168.10.14# 地址 - port: 26379 # 端口 + host: 400-infra.server.iocoder.cn # 地址 + port: 6379 # 端口 database: 1 # 数据库索引 - password: hmkj@2023 # 密码，建议生产环境开启 +# password: 123456 # 密码，建议生产环境开启 --- #################### 定时任务相关配置 #################### @@ -154,8 +153,8 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta key-prefix: wx # Redis Key 的前缀 http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 miniapp: # 小程序配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md 文档 - appid: wx53b5ac263b9cdb5b - secret: baa127ca662344cf9b0b8e52b26bac9d + appid: wx63c280fe3248a3e7 + secret: 6f270509224a7ae1296bbf1c8cb97aed config-storage: type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取 key-prefix: wa # Redis Key 的前缀 @@ -171,8 +170,8 @@ yudao: - ${spring.boot.admin.context-path}/** # 不处理 Spring Boot Admin 的请求 - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求 pay: - order-notify-url: https://yanghaodong.51vip.biz/admin-api/pay/notify/order # 支付渠道的【支付】回调地址 - refund-notify-url: https://yanghaodong.51vip.biz/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址 + order-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/order # 支付渠道的【支付】回调地址 + refund-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址 demo: true # 开启演示模式 tencent-lbs-key: TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E # QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc @@ -188,6 +187,16 @@ justauth: client-secret: 1wTb7hYxnpT2TUbIeHGXGo7T0odav1ic10mLdyyATOw agent-id: 1000004 ignore-check-redirect-uri: true + # noinspection SpringBootApplicationYaml + WECHAT_MINI_APP: # 微信小程序 + 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 cache: type: REDIS prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE:: diff --git a/ruoyi-vue-pro-master/yudao-server/src/main/resources/application-local.yaml b/ruoyi-vue-pro-master/yudao-server/src/main/resources/application-local.yaml index fecdac8..cbc6ef6 100644 --- a/ruoyi-vue-pro-master/yudao-server/src/main/resources/application-local.yaml +++ b/ruoyi-vue-pro-master/yudao-server/src/main/resources/application-local.yaml @@ -47,7 +47,7 @@ spring: primary: master datasource: master: - name: ruoyi-vue-pro + name: zdsc url: jdbc:mysql://192.168.10.14:23306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.master.name} # PostgreSQL 连接的示例 @@ -61,7 +61,7 @@ spring: # username: SYSDBA # DM 连接的示例 # password: SYSDBA # DM 连接的示例 slave: # 模拟从库，可根据自己需要修改 - name: ruoyi-vue-pro + name: zdsc lazy: true # 开启懒加载，保证启动速度 url: jdbc:mysql://192.168.10.14:23306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例