fix(): 代码合并

cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java

@@ -13,8 +13,10 @@ import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.ip.IpUtils;
 import com.muyu.common.redis.service.RedisService;
 import com.muyu.common.security.utils.SecurityUtils;
-import com.muyu.common.system.domain.Business;
+
+
 import com.muyu.common.system.remote.RemoteUserService;
+import com.muyu.common.system.domain.Business;
 import com.muyu.common.system.domain.SysUser;
 import com.muyu.common.system.domain.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -7,7 +7,7 @@ nacos:
   addr: 47.101.53.251:8848
   user-name: nacos
   password: nacos
-  namespace: yzl
+  namespace: four
 
 # Spring
 spring:

cloud-modules/cloud-event/src/main/java/com/muyu/event/consumer/MqConsumer.java

@@ -56,7 +56,6 @@ public class MqConsumer {
              * -----------------------------------以下为异步业务操作----------------------------
              */
             List<SysCarVo> carList = sysCarCacheService.get("carList");
-            ElectronicFenceGroup fenceGroupList = electronicFenceGroupCacheService.get("electronicFenceGroupList");
 
 
             /**

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

@@ -7,7 +7,7 @@ nacos:
   addr: 47.101.53.251:8848
   user-name: nacos
   password: nacos
-  namespace: yzl
+  namespace: four
 # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
 # Spring
 spring:

cloud-modules/saas/pom.xml

@@ -51,6 +51,9 @@
         <groupId>org.apache.kafka</groupId>
         <artifactId>kafka-clients</artifactId>
     </dependency>
+
+
+
 </dependencies>
 
     <properties>

cloud-modules/saas/saas-server/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ nacos:
   addr: 47.101.53.251:8848
   user-name: nacos
   password: nacos
-  namespace: yzl
+  namespace: four
 # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
 # Spring
 spring: