diff --git a/muyu-auth/src/main/resources/bootstrap.yml b/muyu-auth/src/main/resources/bootstrap.yml index 02ac350..d4aab21 100644 --- a/muyu-auth/src/main/resources/bootstrap.yml +++ b/muyu-auth/src/main/resources/bootstrap.yml @@ -14,12 +14,14 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 115.159.67.205:8848 + server-addr: 122.152.211.1:8848 + namespace: networking config: # 配置中心地址 - server-addr: 115.159.67.205:8848 + server-addr: 122.152.211.1:8848 # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: networking diff --git a/muyu-common/muyu-common-system/pom.xml b/muyu-common/muyu-common-system/pom.xml index ca8f7d8..9a49091 100644 --- a/muyu-common/muyu-common-system/pom.xml +++ b/muyu-common/muyu-common-system/pom.xml @@ -23,6 +23,7 @@ com.muyu muyu-common-core + com.muyu muyu-networking-common diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoEntInfoService.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoEntInfoService.java deleted file mode 100644 index c187971..0000000 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoEntInfoService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.muyu.common.system.remote; - -/** - * @ClassDescription: - * @JdkVersion: 17 - * @Author: zhangxu - * @Created: 2024/6/10 21:14 - */ -public interface RemoEntInfoService { -} diff --git a/muyu-gateway/src/main/resources/bootstrap.yml b/muyu-gateway/src/main/resources/bootstrap.yml index 651a85b..8bc883d 100644 --- a/muyu-gateway/src/main/resources/bootstrap.yml +++ b/muyu-gateway/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 115.159.67.205:8848 + server-addr: 122.152.211.1:8848 + namespace: networking config: # 配置中心地址 - server-addr: 115.159.67.205:8848 + server-addr: 122.152.211.1:8848 + namespace: networking # 配置文件格式 file-extension: yml # 共享配置 @@ -28,7 +30,7 @@ spring: eager: true transport: # 控制台地址 - dashboard: 115.159.67.205:8718 + dashboard: 122.152.211.1:8718 # nacos配置持久化 datasource: ds1: diff --git a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml b/muyu-modules/muyu-file/src/main/resources/bootstrap.yml index 74d6346..625e8ae 100644 --- a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-file/src/main/resources/bootstrap.yml @@ -14,12 +14,15 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 115.159.67.205:8848 + server-addr: 122.152.211.1:8848 + namespace: networking config: # 配置中心地址 - server-addr: 115.159.67.205:8848 + server-addr: 122.152.211.1:8848 + namespace: networking # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + diff --git a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml b/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml index ed6e483..b23cbfd 100644 --- a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml @@ -14,12 +14,14 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 115.159.67.205:8848 + server-addr: 122.152.211.1:8848 + namespace: networking config: # 配置中心地址 - server-addr: 115.159.67.205:8848 + server-addr: 122.152.211.1:8848 # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: networking diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/MuYuJobApplication.java b/muyu-modules/muyu-job/src/main/java/com/muyu/job/MuYuJobApplication.java index f6a79c0..d8fba9b 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/MuYuJobApplication.java +++ b/muyu-modules/muyu-job/src/main/java/com/muyu/job/MuYuJobApplication.java @@ -14,7 +14,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @EnableCustomConfig @EnableCustomSwagger2 @EnableMyFeignClients -@SpringBootApplication +@SpringBootApplication() public class MuYuJobApplication { public static void main (String[] args) { SpringApplication.run(MuYuJobApplication.class, args); diff --git a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml b/muyu-modules/muyu-job/src/main/resources/bootstrap.yml index 2d493c6..8b78f17 100644 --- a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-job/src/main/resources/bootstrap.yml @@ -14,12 +14,15 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 115.159.67.205:8848 + server-addr: 122.152.211.1:8848 + namespace: networking config: # 配置中心地址 - server-addr: 115.159.67.205:8848 + server-addr: 122.152.211.1:8848 + namespace: networking # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + diff --git a/muyu-modules/muyu-networking/muyu-networking-common/pom.xml b/muyu-modules/muyu-networking/muyu-networking-common/pom.xml index a4d8e8c..23ff409 100644 --- a/muyu-modules/muyu-networking/muyu-networking-common/pom.xml +++ b/muyu-modules/muyu-networking/muyu-networking-common/pom.xml @@ -66,17 +66,9 @@ mysql-connector-j - - - com.muyu - muyu-common-datasource - - - com.muyu - muyu-common-datascope - + diff --git a/muyu-modules/muyu-networking/muyu-networking-service/src/main/resources/bootstrap.yml b/muyu-modules/muyu-networking/muyu-networking-service/src/main/resources/bootstrap.yml index ffa4a81..8a23355 100644 --- a/muyu-modules/muyu-networking/muyu-networking-service/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-networking/muyu-networking-service/src/main/resources/bootstrap.yml @@ -14,15 +14,17 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 115.159.67.205:8848 + server-addr: 122.152.211.1:8848 + namespace: networking config: # 配置中心地址 - server-addr: 115.159.67.205:8848 + server-addr: 122.152.211.1:8848 # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: networking logging: level: diff --git a/muyu-modules/muyu-networking/pom.xml b/muyu-modules/muyu-networking/pom.xml index 52123c8..4d2e267 100644 --- a/muyu-modules/muyu-networking/pom.xml +++ b/muyu-modules/muyu-networking/pom.xml @@ -68,17 +68,9 @@ mysql-connector-j - - - com.muyu - muyu-common-datasource - - - - com.muyu - muyu-common-datascope - + + diff --git a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml index ae61d7d..e6ef260 100644 --- a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml @@ -14,15 +14,17 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 115.159.67.205:8848 + server-addr: 122.152.211.1:8848 + namespace: networking config: # 配置中心地址 - server-addr: 115.159.67.205:8848 + server-addr: 122.152.211.1:8848 # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: networking logging: level: com.muyu.system.mapper: DEBUG diff --git a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/bootstrap.yml b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/bootstrap.yml index 4e9498c..005143e 100644 --- a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/bootstrap.yml @@ -25,15 +25,17 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 115.159.67.205:8848 + server-addr: 122.152.211.1:8848 + namespace: networking config: # 配置中心地址 - server-addr: 115.159.67.205:8848 + server-addr: 122.152.211.1:8848 # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: networking logging: level: diff --git a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml b/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml index dd3a139..c76fb45 100644 --- a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml +++ b/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml @@ -14,12 +14,14 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 115.159.67.205:8848 + server-addr: 122.152.211.1:8848 + namespace: networking config: # 配置中心地址 - server-addr: 115.159.67.205:8848 + server-addr: 122.152.211.1:8848 # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: networking