Merge branch 'dev.parse' into dev

# Conflicts:
#	cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml
#	cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml
#	cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml
#	cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml
#	pom.xml

cloud-gateway/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ nacos:
   addr: 123.57.152.124:8848
   user-name: nacos
   password: nacos
-  namespace: wx
+  namespace: xyr
 
 # Spring
 spring:

cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml

@@ -22,7 +22,6 @@
         <dependency>
             <groupId>com.muyu</groupId>
             <artifactId>enterpise-common</artifactId>
-            <version>${muyu.version}</version>
         </dependency>
 
         <!-- 缓存公共模块  -->
@@ -31,6 +30,8 @@
             <artifactId>cloud-common-cache</artifactId>
         </dependency>
 
+
+
     </dependencies>
 
 </project>

cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml

@@ -41,10 +41,9 @@
             <artifactId>swagger-annotations-jakarta</artifactId>
         </dependency>
 
-        <dependency>
+
-            <groupId>com.muyu</groupId>
+
-            <artifactId>cloud-common-system</artifactId>
+
-        </dependency>
 
     </dependencies>
 </project>

cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml

@@ -90,18 +90,7 @@
             <groupId>com.muyu</groupId>
             <artifactId>cloud-common-api-doc</artifactId>
         </dependency>
-
+        <!--    cache缓存框架    -->
-        <!-- XllJob定时任务 -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-xxl</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-saas</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.muyu</groupId>
             <artifactId>enterpise-cache</artifactId>

cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml

@@ -49,8 +49,6 @@ spring:
         shared-configs:
           # 系统共享配置
           - 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}
 

cloud-modules/cloud-modules-parse/pom.xml

@@ -74,11 +74,6 @@
             <artifactId>cloud-common-api-doc</artifactId>
         </dependency>
 
-<!--        &lt;!&ndash; XllJob定时任务 &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.muyu</groupId>-->
-<!--            <artifactId>cloud-common-xxl</artifactId>-->
-<!--        </dependency>-->
 
         <!--   mqtt监控者     -->
         <dependency>
@@ -91,11 +86,7 @@
             <artifactId>lombok</artifactId>
         </dependency>
 
-            <!-- 远调 -->
+
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>enterpise-remote</artifactId>
-        </dependency>
             <!--  实体类      -->
         <dependency>
             <groupId>com.muyu</groupId>

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

@@ -51,10 +51,7 @@ 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 配置文件
+          #kafka共享配置 application-kafka-config-dev.yml
-#          - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-          #kafka共享配置
-          #application-kafka-config-dev.yml
           - application-kafka-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
 logging:
   level:

cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml

@@ -1,13 +1,13 @@
 # Tomcat
-server:
+#server:
-  port: 9902
+#  port: 9703
 
 # nacos线上地址
 nacos:
   addr: 123.57.152.124:8848
   user-name: nacos
   password: nacos
-  namespace: xyr
+  namespace: lhd
 # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
 # Spring
 spring:
@@ -51,8 +51,6 @@ spring:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
           # 系统环境Config共享配置
           - application-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

pom.xml

@@ -283,12 +283,6 @@
                 <version>${muyu.version}</version>
             </dependency>
 
-<!--            <dependency>-->
-<!--                <groupId>com.muyu</groupId>-->
-<!--                <artifactId>enterpise-c</artifactId>-->
-<!--                <version>${muyu.version}</version>-->
-<!--            </dependency>-->
-
             <!--   mqtt     -->
             <dependency>
                 <groupId>org.eclipse.paho</groupId>