Commit 32645fc6c11ee4127cbde8448ed4a8f4a98307e2

Authored by wangqian
2 parents 2c423d0d 54c39b7b

Merge remote-tracking branch 'origin/dev_fangshan' into dev_fangshan

urbanops-server/src/main/resources/application-dev.yaml
@@ -47,24 +47,24 @@ spring: @@ -47,24 +47,24 @@ spring:
47 primary: master 47 primary: master
48 datasource: 48 datasource:
49 master: 49 master:
50 - url: jdbc:mysql://172.17.16.15:3306/urban_ops_agent?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例  
51 - username: root 50 + url: jdbc:mysql://rm-2ze3mfn2lp7r1y783.mysql.rds.aliyuncs.com:3306/urban_ops_agent?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
  51 + username: urban_ops_agent
52 password: mysql2025! 52 password: mysql2025!
53 slave: # 模拟从库,可根据自己需要修改 # 模拟从库,可根据自己需要修改 53 slave: # 模拟从库,可根据自己需要修改 # 模拟从库,可根据自己需要修改
54 lazy: true # 开启懒加载,保证启动速度 54 lazy: true # 开启懒加载,保证启动速度
55 - url: jdbc:mysql://172.17.16.15:3306/urban_ops_agent?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例  
56 - username: root 55 + url: jdbc:mysql://rm-2ze3mfn2lp7r1y783.mysql.rds.aliyuncs.com:3306/urban_ops_agent?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
  56 + username: urban_ops_agent
57 password: mysql2025! 57 password: mysql2025!
58 58
59 # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优 59 # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优
60 data: 60 data:
61 redis: 61 redis:
62 # 哨兵模式配置 62 # 哨兵模式配置
63 - sentinel:  
64 - master: mymaster # 主节点名称(需与哨兵配置一致)  
65 - nodes: 172.17.16.22:26379,172.17.16.23:26379,172.17.16.24:26379 # 哨兵节点列表 63 + #sentinel:
  64 + # master: mymaster # 主节点名称(需与哨兵配置一致)
  65 + # nodes: 172.17.16.22:26379,172.17.16.23:26379,172.17.16.24:26379 # 哨兵节点列表
66 database: 10 # 数据库索引 66 database: 10 # 数据库索引
67 - password: redis2025! # 密码(主从节点的密码,需与哨兵配置一致) 67 + password: fs123456 # 密码(主从节点的密码,需与哨兵配置一致)
68 # 无需单独指定 port(哨兵会自动发现主节点端口) 68 # 无需单独指定 port(哨兵会自动发现主节点端口)
69 69
70 # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优 70 # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优