diff --git a/cloud-modules/cloud-modules-car/pom.xml b/cloud-modules/cloud-modules-car/pom.xml index 5b8a4e1..ddf9945 100644 --- a/cloud-modules/cloud-modules-car/pom.xml +++ b/cloud-modules/cloud-modules-car/pom.xml @@ -70,23 +70,6 @@ com.muyu cloud-common-api-doc - - - - com.muyu - cloud-common-xxl - - - - com.muyu - cloud-common-rabbit - - - - - com.muyu - cloud-common-saas - diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/CloudCarApplication.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/CloudCarApplication.java index 8708bdc..6242a48 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/CloudCarApplication.java +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/CloudCarApplication.java @@ -14,13 +14,8 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; * @author muyu */ @EnableCustomConfig -//@EnableCustomSwagger2 @EnableMyFeignClients -@SpringBootApplication(exclude = { - DataSourceAutoConfiguration.class, - DruidDataSourceAutoConfigure.class, - DynamicDataSourceAutoConfiguration.class -}) +@SpringBootApplication public class CloudCarApplication { public static void main (String[] args) { SpringApplication.run(CloudCarApplication.class, args); diff --git a/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml index f95ea7d..4fd253a 100644 --- a/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml @@ -7,16 +7,9 @@ nacos: addr: 106.15.136.7:8848 user-name: nacos password: nacos - namespace: zmw -# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all -# Spring + namespace: xzr + spring: - amqp: - deserialization: - trust: - all: true - main: - allow-bean-definition-overriding: true application: # 应用名称 name: cloud-car @@ -50,11 +43,4 @@ spring: # 系统共享配置 - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} # 系统环境Config共享配置 - - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # xxl-job 配置文件 - - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # rabbit 配置文件 - - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -logging: - level: - com.muyu.system.mapper: DEBUG + - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/cloud-modules/cloud-modules-fault/pom.xml b/cloud-modules/cloud-modules-fault/pom.xml index 9008855..c068b4b 100644 --- a/cloud-modules/cloud-modules-fault/pom.xml +++ b/cloud-modules/cloud-modules-fault/pom.xml @@ -72,12 +72,6 @@ com.muyu cloud-common-api-doc - - - - com.muyu - cloud-common-saas - diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/CloudFaultApplication.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/CloudFaultApplication.java index 2a0eb58..ec7cc00 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/CloudFaultApplication.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/CloudFaultApplication.java @@ -11,11 +11,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @EnableCustomConfig @EnableMyFeignClients -@SpringBootApplication(exclude = { - DataSourceAutoConfiguration.class, - DruidDataSourceAutoConfigure.class, - DynamicDataSourceAutoConfiguration.class -}) +@SpringBootApplication public class CloudFaultApplication { public static void main(String[] args) { SpringApplication.run(CloudFaultApplication.class,args); diff --git a/cloud-modules/cloud-modules-fault/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-fault/src/main/resources/bootstrap.yml index 9c0ad5e..90541fb 100644 --- a/cloud-modules/cloud-modules-fault/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-fault/src/main/resources/bootstrap.yml @@ -43,8 +43,4 @@ spring: # 系统共享配置 - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} # 系统环境Config共享配置 - - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - -logging: - level: - com.muyu.system.mapper: DEBUG + - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/cloud-modules/cloud-modules-many-datasource/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-many-datasource/src/main/resources/bootstrap.yml index 364850c..087d143 100644 --- a/cloud-modules/cloud-modules-many-datasource/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-many-datasource/src/main/resources/bootstrap.yml @@ -43,7 +43,4 @@ spring: # 系统共享配置 - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} # 系统环境Config共享配置 - - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -logging: - level: - com.muyu.system.mapper: DEBUG + - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml index 7ad5ee3..a9089e2 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml @@ -54,6 +54,3 @@ spring: - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} # rabbit 配置文件 - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -logging: - level: - com.muyu.system.mapper: DEBUG diff --git a/cloud-modules/cloud-modules-warm/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-warm/src/main/resources/bootstrap.yml index 5d9d2a1..3eff458 100644 --- a/cloud-modules/cloud-modules-warm/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-warm/src/main/resources/bootstrap.yml @@ -43,7 +43,4 @@ spring: # 系统共享配置 - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} # 系统环境Config共享配置 - - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -logging: - level: - com.muyu.system.mapper: DEBUG + - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file