Compare commits

..

No commits in common. "dev-feature/v1.1" and "v1.0" have entirely different histories.

4 changed files with 16 additions and 21 deletions

View File

@ -56,11 +56,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-client</artifactId>
<version>1.4.1</version>
</dependency>
</dependencies>
</dependencyManagement>

View File

@ -3,9 +3,9 @@
spring:
cloud:
nacos:
server-addr: 192.168.0.152:9060 # Nacos 服务器地址
server-addr: 192.168.1.101:8848 # Nacos 服务器地址
username: nacos # Nacos 账号
password: T7@pL9vQ # Nacos 密码
password: nacos # Nacos 密码
discovery: # 【配置中心】配置项
namespace: dev # 命名空间。这里使用 dev 开发环境
group: DEFAULT_GROUP # 使用的 Nacos 配置分组,默认为 DEFAULT_GROUP

View File

@ -3,7 +3,7 @@
spring:
cloud:
nacos:
server-addr: 192.168.0.152:9060 # Nacos 服务器地址
server-addr: 1.95.80.190:9080 # Nacos 服务器地址
username: nacos # Nacos 账号
password: T7@pL9vQ # Nacos 密码
discovery: # 【配置中心】配置项
@ -56,14 +56,14 @@ spring:
primary: master
datasource:
master:
url: jdbc:mysql://192.168.0.173:9081/yd-yunxing?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
username: root
password: s8K@d3M1
url: jdbc:mysql://192.168.0.152:9081/yd-yunxing?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
username: xmuser
password: tpimcCf1
slave: # 模拟从库,可根据自己需要修改 # 模拟从库,可根据自己需要修改
lazy: true # 开启懒加载,保证启动速度
url: jdbc:mysql://192.168.0.173:9081/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
username: root
password: s8K@d3M1
url: jdbc:mysql://192.168.1.101:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
username: xmuser
password: chinasoft@123
# Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优
redis:

View File

@ -3,7 +3,7 @@
spring:
cloud:
nacos:
server-addr: 192.168.0.152:9060 # Nacos 服务器地址
server-addr: 1.95.80.190:9080 # Nacos 服务器地址
username: nacos # Nacos 账号
password: T7@pL9vQ # Nacos 密码
discovery: # 【配置中心】配置项
@ -56,14 +56,14 @@ spring:
primary: master
datasource:
master:
url: jdbc:mysql://192.168.0.173:9081/yd-yunxing?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
username: root
password: s8K@d3M1
url: jdbc:mysql://192.168.0.152:9081/yd-yunxing?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
username: xmuser
password: tpimcCf1
slave: # 模拟从库,可根据自己需要修改 # 模拟从库,可根据自己需要修改
lazy: true # 开启懒加载,保证启动速度
url: jdbc:mysql://192.168.0.173:9081/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
username: root
password: s8K@d3M1
url: jdbc:mysql://192.168.1.101:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
username: xmuser
password: chinasoft@123
# Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优
redis: