From 17a6e42c685b7aee80a953f182ab514db2643fe0 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 11 十二月 2024 18:07:11 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/shasteel
---
shasteel-biz/src/main/resources/application-dev.yaml | 101 ++++++++++++--------------------------------------
1 files changed, 24 insertions(+), 77 deletions(-)
diff --git a/shasteel-biz/src/main/resources/application-dev.yaml b/shasteel-biz/src/main/resources/application-dev.yaml
index e1e4598..5415e33 100644
--- a/shasteel-biz/src/main/resources/application-dev.yaml
+++ b/shasteel-biz/src/main/resources/application-dev.yaml
@@ -35,21 +35,7 @@
primary: master
datasource:
master:
- url: jdbc:mysql://172.16.8.100:3306/iailab_expert_tenant_shasteel?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
- # url: jdbc:mysql://127.0.0.1:3306/iailab_expert_tenant_shasteel?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # MySQL Connector/J 5.X 连接的示例
- # url: jdbc:postgresql://127.0.0.1:5432/iailab_expert_tenant_shasteel # PostgreSQL 连接的示例
- # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
- # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=iailab_expert_tenant_shasteel # SQLServer 连接的示例
- # url: jdbc:dm://10.211.55.4:5236?schema=IAILAB_FAST # DM 连接的示例
- username: root
- password: 123456
- # username: sa # SQL Server 连接的示例
- # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W # SQL Server 连接的示例
- # username: SYSDBA # DM 连接的示例
- # password: SYSDBA # DM 连接的示例
- slave: # 模拟从库，可根据自己需要修改
- lazy: true # 开启懒加载，保证启动速度
- url: jdbc:mysql://127.0.0.1:3306/iailab_expert_tenant_shasteel?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+ url: jdbc:mysql://127.0.0.1:3306/iailab_fast_tenant_shasteel?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
username: root
password: 123456
@@ -57,38 +43,25 @@
redis:
host: 127.0.0.1 # 地址
port: 6379 # 端口
- database: 8 # 数据库索引
- password: 123456 # 密码，建议生产环境开启
+ database: 0 # 数据库索引
+# password: 123456 # 密码，建议生产环境开启
---- #################### 定时任务相关配置 ####################
+--- #################### MQ 消息队列相关配置 ####################
-xxl:
- job:
- enabled: true # 是否开启调度中心，默认为 true 开启
- admin:
- addresses: http://172.16.8.100:9090/xxl-job-admin # 调度中心部署跟地址
+# rocketmq 配置项，对应 RocketMQProperties 配置类
+rocketmq:
+ name-server: 127.0.0.1:9876 # RocketMQ Namesrv
---- #################### 微信公众号、小程序相关配置 ####################
-wx:
- mp: # 公众号配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档
- # app-id: wx041349c6f39b268b
- # secret: 5abee519483bc9f8cb37ce280e814bd0
- app-id: wx5b23ba7a5589ecbb # 测试号
- secret: 2a7b3b20c537e52e74afd395eb85f61f
- # 存储配置，解决 AccessToken 的跨节点的共享
- config-storage:
- type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取
- 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: wx62056c0d5e8db250
- # secret: 333ae72f41552af1e998fe1f54e1584a
- appid: wx63c280fe3248a3e7 # wenhualian的接口测试号
- secret: 6f270509224a7ae1296bbf1c8cb97aed
- config-storage:
- type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取
- key-prefix: wa # Redis Key 的前缀
- http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台
+spring:
+ # RabbitMQ 配置项，对应 RabbitProperties 配置类
+ rabbitmq:
+ host: 127.0.0.1 # RabbitMQ 服务的地址
+ port: 5672 # RabbitMQ 服务的端口
+ username: guest # RabbitMQ 服务的账号
+ password: guest # RabbitMQ 服务的密码
+ # Kafka 配置项，对应 KafkaProperties 配置类
+ kafka:
+ bootstrap-servers: 127.0.0.1:9092 # 指定 Kafka Broker 地址，可以设置多个，以逗号分隔
--- #################### 平台相关配置 ####################
@@ -102,37 +75,11 @@
mock-enable: true
access-log: # 访问日志的配置项
enable: false
+ token:
+ base-url: http://127.0.0.1:48080/admin-api/system
+ tenant-id: 172
+ client-id: shasteel
+ client-secret: shasteel111111111111111
+ username: shasteel
+ password: 123456
- sms-code: # 短信验证码相关的配置项
- expire-times: 10m
- send-frequency: 1m
- send-maximum-quantity-per-day: 10
- begin-code: 9999 # 这里配置 9999 的原因是，测试方便。
- end-code: 9999 # 这里配置 9999 的原因是，测试方便。
-
-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_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::
- timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟
--
Gitblit v1.9.3