From c72da9e3cafcd600eb853084aa2caf84ac550d79 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 17 三月 2025 17:10:17 +0800
Subject: [PATCH] 修改配置
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DatasourceModel.java | 4 +-
ruoyi-service/ruoyi-management/src/main/resources/bootstrap.yml | 4 +-
ruoyi-gateway/src/main/resources/bootstrap.yml | 4 +-
ruoyi-service/ruoyi-parent/src/main/java/com/ruoyi/parent/config/MybatisPlusConfig.java | 2
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java | 4 +-
ruoyi-auth/src/main/resources/bootstrap.yml | 4 +-
ruoyi-service/ruoyi-goods/src/main/resources/bootstrap.yml | 4 +-
ruoyi-service/ruoyi-management/pom.xml | 4 +
ruoyi-service/ruoyi-parent/src/main/java/com/ruoyi/parent/utils/EasyPoiExcelStyleUtil.java | 2
ruoyi-service/ruoyi-study/src/main/resources/bootstrap.yml | 4 +-
ruoyi-service/ruoyi-parent/src/main/java/com/ruoyi/parent/config/DataUpdateHandlerConfig.java | 2
ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml | 4 +-
ruoyi-service/ruoyi-parent/src/main/resources/bootstrap.yml | 8 ++--
ruoyi-service/ruoyi-study/pom.xml | 11 +++++
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/RedissonConfig.java | 2
15 files changed, 37 insertions(+), 26 deletions(-)
diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml
index 6f704e0..f08386d 100644
--- a/ruoyi-auth/src/main/resources/bootstrap.yml
+++ b/ruoyi-auth/src/main/resources/bootstrap.yml
@@ -21,11 +21,11 @@
server-addr: 127.0.0.1:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
- namespace: c6482de2-9508-4425-bde5-08abe35abace
+ namespace: f6f73ac0-b694-453a-bd34-ecc088491ceb
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
- namespace: c6482de2-9508-4425-bde5-08abe35abace
+ namespace: f6f73ac0-b694-453a-bd34-ecc088491ceb
group: DEFAULT_GROUP
name: ${spring.application.name}
# 配置文件格式
diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml
index 4711aef..34c16b3 100644
--- a/ruoyi-gateway/src/main/resources/bootstrap.yml
+++ b/ruoyi-gateway/src/main/resources/bootstrap.yml
@@ -20,11 +20,11 @@
server-addr: 127.0.0.1:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
- namespace: c6482de2-9508-4425-bde5-08abe35abace
+ namespace: f6f73ac0-b694-453a-bd34-ecc088491ceb
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
- namespace: c6482de2-9508-4425-bde5-08abe35abace
+ namespace: f6f73ac0-b694-453a-bd34-ecc088491ceb
group: DEFAULT_GROUP
name: ${spring.application.name}
# 配置文件格式
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
index 6f8ac7b..5eca1ee 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -20,11 +20,11 @@
server-addr: 127.0.0.1:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
- namespace: c6482de2-9508-4425-bde5-08abe35abace
+ namespace: f6f73ac0-b694-453a-bd34-ecc088491ceb
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
- namespace: c6482de2-9508-4425-bde5-08abe35abace
+ namespace: f6f73ac0-b694-453a-bd34-ecc088491ceb
group: DEFAULT_GROUP
name: ${spring.application.name}
# 配置文件格式
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DatasourceModel.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DatasourceModel.java
index 753f22c..4c2b4bd 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DatasourceModel.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DatasourceModel.java
@@ -21,9 +21,9 @@
// private Long maxWait = 60000L;
// private Integer minIdle =5;
// private Integer initialSize =2;
- private String url = "jdbc:mysql://127.0.0.1:3306/dolphin_goods?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai";
+ private String url = "jdbc:mysql://127.0.0.1:10633/dolphin_goods?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai";
private String username = "root";
- private String password = "root";
+ private String password = "Haitunyingyu@2025!";
private String driverClassName = "com.mysql.cj.jdbc.Driver";
private Integer maxActive =20;
private Long maxWait = 60000L;
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/RedissonConfig.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/RedissonConfig.java
index 08fac0a..46133a1 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/RedissonConfig.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/RedissonConfig.java
@@ -23,7 +23,7 @@
public RedissonClient redissonClient() {
Config config = new Config();
//线上redis
- config.useSingleServer().setAddress("redis://127.0.0.1:6379").setPassword("123456");
+ config.useSingleServer().setAddress("redis://127.0.0.1:6379").setPassword("Haitunyingyu@2025!");
// // 本地redis
// config.useSingleServer().setAddress("redis://127.0.0.1:6379").setPassword("123456");
return Redisson.create(config);
diff --git a/ruoyi-service/ruoyi-goods/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-goods/src/main/resources/bootstrap.yml
index 850e572..0a59a93 100644
--- a/ruoyi-service/ruoyi-goods/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-goods/src/main/resources/bootstrap.yml
@@ -21,11 +21,11 @@
server-addr: 127.0.0.1:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
- namespace: c6482de2-9508-4425-bde5-08abe35abace
+ namespace: f6f73ac0-b694-453a-bd34-ecc088491ceb
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
- namespace: c6482de2-9508-4425-bde5-08abe35abace
+ namespace: f6f73ac0-b694-453a-bd34-ecc088491ceb
group: DEFAULT_GROUP
name: ${spring.application.name}
# 配置文件格式
diff --git a/ruoyi-service/ruoyi-management/pom.xml b/ruoyi-service/ruoyi-management/pom.xml
index a287017..aa93baf 100644
--- a/ruoyi-service/ruoyi-management/pom.xml
+++ b/ruoyi-service/ruoyi-management/pom.xml
@@ -27,7 +27,9 @@
<dependency>
<groupId>com.huawei.apigateway</groupId>
<artifactId>java-sdk-core</artifactId>
- <version>3.2.4</version>
+ <version>3.2.5</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/lib/java-sdk-core-3.2.5.jar</systemPath>
</dependency>
<dependency>
<groupId>com.huaweicloud</groupId>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-management/src/main/resources/bootstrap.yml
index 2bd9232..a9dacf1 100644
--- a/ruoyi-service/ruoyi-management/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-management/src/main/resources/bootstrap.yml
@@ -21,11 +21,11 @@
server-addr: 127.0.0.1:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
- namespace: c6482de2-9508-4425-bde5-08abe35abace
+ namespace: f6f73ac0-b694-453a-bd34-ecc088491ceb
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
- namespace: c6482de2-9508-4425-bde5-08abe35abace
+ namespace: f6f73ac0-b694-453a-bd34-ecc088491ceb
group: DEFAULT_GROUP
name: ${spring.application.name}
# 配置文件格式
diff --git a/ruoyi-service/ruoyi-parent/src/main/java/com/ruoyi/parent/config/DataUpdateHandlerConfig.java b/ruoyi-service/ruoyi-parent/src/main/java/com/ruoyi/parent/config/DataUpdateHandlerConfig.java
index bf136fb..7ae0da7 100644
--- a/ruoyi-service/ruoyi-parent/src/main/java/com/ruoyi/parent/config/DataUpdateHandlerConfig.java
+++ b/ruoyi-service/ruoyi-parent/src/main/java/com/ruoyi/parent/config/DataUpdateHandlerConfig.java
@@ -1,4 +1,4 @@
-package com.ruoyi.management.config;
+package com.ruoyi.parent.config;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import com.ruoyi.common.security.service.TokenService;
diff --git a/ruoyi-service/ruoyi-parent/src/main/java/com/ruoyi/parent/config/MybatisPlusConfig.java b/ruoyi-service/ruoyi-parent/src/main/java/com/ruoyi/parent/config/MybatisPlusConfig.java
index bcf49fc..e4d7bbc 100644
--- a/ruoyi-service/ruoyi-parent/src/main/java/com/ruoyi/parent/config/MybatisPlusConfig.java
+++ b/ruoyi-service/ruoyi-parent/src/main/java/com/ruoyi/parent/config/MybatisPlusConfig.java
@@ -1,4 +1,4 @@
-package com.ruoyi.management.config;
+package com.ruoyi.parent.config;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.core.config.GlobalConfig;
diff --git a/ruoyi-service/ruoyi-parent/src/main/java/com/ruoyi/parent/utils/EasyPoiExcelStyleUtil.java b/ruoyi-service/ruoyi-parent/src/main/java/com/ruoyi/parent/utils/EasyPoiExcelStyleUtil.java
index 2ce4c29..3144618 100644
--- a/ruoyi-service/ruoyi-parent/src/main/java/com/ruoyi/parent/utils/EasyPoiExcelStyleUtil.java
+++ b/ruoyi-service/ruoyi-parent/src/main/java/com/ruoyi/parent/utils/EasyPoiExcelStyleUtil.java
@@ -1,4 +1,4 @@
-package com.ruoyi.management.utils;
+package com.ruoyi.parent.utils;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.afterturn.easypoi.excel.entity.params.ExcelForEachParams;
diff --git a/ruoyi-service/ruoyi-parent/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-parent/src/main/resources/bootstrap.yml
index 2f1847f..445d22d 100644
--- a/ruoyi-service/ruoyi-parent/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-parent/src/main/resources/bootstrap.yml
@@ -18,14 +18,14 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 192.168.110.64:8848
+ server-addr: 127.0.0.1:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
- namespace: 8ebd2324-30b4-477b-af79-b46e717c4fbe
+ namespace: f6f73ac0-b694-453a-bd34-ecc088491ceb
config:
# 配置中心地址
- server-addr: 192.168.110.64:8848
- namespace: 8ebd2324-30b4-477b-af79-b46e717c4fbe
+ server-addr: 127.0.0.1:8848
+ namespace: f6f73ac0-b694-453a-bd34-ecc088491ceb
group: DEFAULT_GROUP
name: ${spring.application.name}
# 配置文件格式
diff --git a/ruoyi-service/ruoyi-study/pom.xml b/ruoyi-service/ruoyi-study/pom.xml
index 91ac4eb..e4133c6 100644
--- a/ruoyi-service/ruoyi-study/pom.xml
+++ b/ruoyi-service/ruoyi-study/pom.xml
@@ -66,7 +66,9 @@
<dependency>
<groupId>com.huawei.apigateway</groupId>
<artifactId>java-sdk-core</artifactId>
- <version>3.2.4</version>
+ <version>3.2.5</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/lib/java-sdk-core-3.2.5.jar</systemPath>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -199,6 +201,13 @@
</plugins>
<resources>
<resource>
+ <directory>lib</directory>
+ <targetPath>/BOOT-INF/lib/</targetPath>
+ <includes>
+ <include>**/*.jar</include>
+ </includes>
+ </resource>
+ <resource>
<directory>src/main/resources</directory>
</resource>
<resource>
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java
index ed27552..6143bf9 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java
@@ -13,9 +13,9 @@
@Data
@Component
public class DatasourceModel {
- private String url = "jdbc:mysql://127.0.0.1:3306/dolphin_study?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai";
+ private String url = "jdbc:mysql://127.0.0.1:10633/dolphin_study?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai";
private String username = "root";
- private String password = "root";
+ private String password = "Haitunyingyu@2025!";
private String driverClassName = "com.mysql.cj.jdbc.Driver";
private Integer maxActive =20;
private Long maxWait = 60000L;
diff --git a/ruoyi-service/ruoyi-study/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-study/src/main/resources/bootstrap.yml
index 51d5411..d241083 100644
--- a/ruoyi-service/ruoyi-study/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-study/src/main/resources/bootstrap.yml
@@ -20,11 +20,11 @@
server-addr: 127.0.0.1:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
- namespace: c6482de2-9508-4425-bde5-08abe35abace
+ namespace: f6f73ac0-b694-453a-bd34-ecc088491ceb
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
- namespace: c6482de2-9508-4425-bde5-08abe35abace
+ namespace: f6f73ac0-b694-453a-bd34-ecc088491ceb
group: DEFAULT_GROUP
name: ${spring.application.name}
# 配置文件格式
--
Gitblit v1.7.1