fix(): 修复项目冲突、异常、Bug

cloud-modules/cloud-modules-car/pom.xml

@@ -70,23 +70,6 @@
             <groupId>com.muyu</groupId>
             <artifactId>cloud-common-api-doc</artifactId>
         </dependency>
-
-        <!-- XllJob定时任务 -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-xxl</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-rabbit</artifactId>
-        </dependency>
-
-        <!-- SaaS模块 -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-saas</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

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 = {
+@SpringBootApplication
-        DataSourceAutoConfiguration.class,
-        DruidDataSourceAutoConfigure.class,
-        DynamicDataSourceAutoConfiguration.class
-})
 public class CloudCarApplication {
     public static void main (String[] args) {
         SpringApplication.run(CloudCarApplication.class, args);

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
+  namespace: xzr
-# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
+
-# Spring
 spring:
-  amqp:
-    deserialization:
-      trust:
-        all: true
-  main:
-    allow-bean-definition-overriding: true
   application:
     # 应用名称
     name: cloud-car
@@ -51,10 +44,3 @@ 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

cloud-modules/cloud-modules-fault/pom.xml

@@ -72,12 +72,6 @@
             <groupId>com.muyu</groupId>
             <artifactId>cloud-common-api-doc</artifactId>
         </dependency>
-
-        <!-- SaaS-->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-saas</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

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 = {
+@SpringBootApplication
-        DataSourceAutoConfiguration.class,
-        DruidDataSourceAutoConfigure.class,
-        DynamicDataSourceAutoConfiguration.class
-})
 public class CloudFaultApplication {
     public static void main(String[] args) {
         SpringApplication.run(CloudFaultApplication.class,args);

cloud-modules/cloud-modules-fault/src/main/resources/bootstrap.yml

@@ -44,7 +44,3 @@ 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

cloud-modules/cloud-modules-many-datasource/src/main/resources/bootstrap.yml

@@ -44,6 +44,3 @@ 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

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

cloud-modules/cloud-modules-warm/src/main/resources/bootstrap.yml

@@ -44,6 +44,3 @@ 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