admin/gr_report_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并董潘祥冲突

Browse Source
This commit is contained in:
chy
2026-02-09 23:44:07 +08:00
parent c8b73763bb
commit da95ddf810
3 changed files with 287 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lidee-admin/src/main/resources/application-local.yaml
View File

@@ -8,42 +8,29 @@ spring:
primary: master
datasource:
master:
<<<<<<< HEAD
# MYSQL数据库 主库，业务库
url: jdbc:mysql://127.0.0.1:3306/demo?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
=======
# MYSQL数据库 主库，业务库
url: jdbc:mysql://127.0.0.1:3306/gr_repoort001?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
>>>>>>> 20260204
url: jdbc:mysql://127.0.0.1:3306/demo?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
username: root
password: root
password: qihua
lideeyunji: # 从库，框架库
<<<<<<< HEAD
url: jdbc:mysql://127.0.0.1:3306/demo?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
=======
url: jdbc:mysql://127.0.0.1:3306/gr_repoort001?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
>>>>>>> 20260204
url: jdbc:mysql://10.9.0.16:3307/gr_repoort?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&lowerCaseTableNames=1 # MySQL Connector/J 8.X 连接的示例
username: root
password: root
password: qihua
slave: # 日志库单独
lazy: true # 开启懒加载，保证启动速度
<<<<<<< HEAD
url: jdbc:mysql://127.0.0.1:3306/demo?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
url: jdbc:mysql://10.9.0.16:3307/gr_repoort?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&lowerCaseTableNames=1 # MySQL Connector/J 8.X 连接的示例
username: root
password: root
password: qihua
bidb: # 日志库单独
lazy: true # 开启懒加载，保证启动速度
url: jdbc:mysql://127.0.0.1:3306/erp_bi_data?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
=======
url: jdbc:mysql://127.0.0.1:3306/gr_repoort001?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
>>>>>>> 20260204
username: root
password: root
password: qihua
redis:
host: 127.0.0.1 # 地址
host: 10.9.0.116 # 地址
port: 6379 # 端口
database: 2 # 数据库索引
password: lidee@123 # 密码，建议生产环境开启
password: 123456 # 密码，建议生产环境开启
--- #################### 地代码平台相关配置 ####################