fast()打包部署

muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java

@@ -7,6 +7,7 @@ import com.muyu.common.system.domain.SysUser;
 import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory;
 import com.muyu.common.system.domain.LoginUser;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -46,4 +47,19 @@ public interface RemoteUserService {
 
     @GetMapping("/user/userList")
     public Result<List<SysUser>> getUserList();
+
+    //查看用户
+    @PostMapping("/user/lists")
+    public Result<List<SysUser>> lists();
+
+    //添加用户
+    @PostMapping("/user")
+    public Result add (@Validated @RequestBody SysUser user);
+
+    /**
+     * 查看详情
+     * @return
+     */
+    @PostMapping("/user/getSysUserById")
+    public Result<SysUser> getSysUserById();
 }

muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java

@@ -38,6 +38,21 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
             public Result<List<SysUser>> getUserList() {
                 return Result.error("获取用户失败：{}"+throwable.getMessage());
             }
+
+            @Override
+            public Result<List<SysUser>> lists() {
+                return Result.error(throwable.getMessage());
+            }
+
+            @Override
+            public Result add(SysUser user) {
+                return Result.error(throwable.getMessage());
+            }
+
+            @Override
+            public Result<SysUser> getSysUserById() {
+                return Result.error(throwable.getMessage());
+            }
         };
     }
 }

muyu-modules/muyu-business/muyu-business-client/src/main/java/muyu/business/client/config/runner/BusinessConfigRunner.java

@@ -3,7 +3,7 @@ package muyu.business.client.config.runner;
 import com.business.common.config.SystemUserConfig;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.system.domain.SysUser;
-import com.muyu.system.remote.RemoteSystemManageService;
+import com.muyu.common.system.remote.RemoteUserService;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
@@ -19,12 +19,12 @@ import java.util.List;
 @Configuration
 public class BusinessConfigRunner implements ApplicationRunner {
     @Autowired
-    private RemoteSystemManageService remoteSystemManageService;
+    private RemoteUserService remoteUserService;
 
     @Override
     public void run(ApplicationArguments args) throws Exception {
         //初始化
-        Result<List<SysUser>> lists = remoteSystemManageService.lists();
+        Result<List<SysUser>> lists = remoteUserService.lists();
         log.info("获取:{}",lists);
         List<SysUser> data = lists.getData();
         for (SysUser datum : data) {

muyu-modules/muyu-business/muyu-business-server/pom.xml

@@ -90,6 +90,7 @@
             <version>3.6.3</version>
             <scope>compile</scope>
         </dependency>
+
         <dependency>
             <groupId>com.muyu</groupId>
             <artifactId>muyu-common-system</artifactId>

muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/BusinessServiceImpl.java

@@ -1,6 +1,5 @@
 package com.muyu.goods.service.impl;
 
-import com.business.common.config.SystemUserConfig;
 import com.business.common.domain.Enterprise;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.security.utils.SecurityUtils;
@@ -9,15 +8,12 @@ import com.muyu.common.system.domain.SysUser;
 import com.muyu.common.system.remote.RemoteUserService;
 import com.muyu.goods.mapper.BusinessMapper;
 import com.muyu.goods.service.IBusinessService;
-import com.muyu.system.remote.RemoteSystemManageService;
 import lombok.extern.log4j.Log4j2;
-import muyu.goods.enterprise.client.config.EnterpriseConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * 企业Service业务层处理
@@ -31,9 +27,6 @@ public class BusinessServiceImpl implements IBusinessService
 {
     @Autowired
     private BusinessMapper enterpriseMapper;
-    @Autowired
-    private RemoteSystemManageService remoteSystemManageService;
-
     @Autowired
     private RemoteUserService remoteUserService;
 
@@ -53,7 +46,7 @@ public class BusinessServiceImpl implements IBusinessService
     @Override
     public Enterprise listEnterprise() {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        Result<List<SysUser>> lists = remoteSystemManageService.lists();
+        Result<List<SysUser>> lists = remoteUserService.lists();
         List<SysUser> data = lists.getData();
         SysUser sysUser = data.stream().filter(da -> da.getUserId().equals(loginUser.getUserId())).collect(Collectors.toList()).get(0);
         List<Enterprise> collect = lists().stream().filter(re -> re.getId().equals(sysUser.getFirm())).collect(Collectors.toList());

muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-client/pom.xml

@@ -31,11 +31,14 @@
             <version>3.6.3</version>
         </dependency>
 
+
         <dependency>
             <groupId>com.muyu</groupId>
-            <artifactId>muyu-modules-system</artifactId>
+            <artifactId>muyu-common-system</artifactId>
             <version>3.6.3</version>
+            <scope>compile</scope>
         </dependency>
+
     </dependencies>
 
 </project>

muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-client/src/main/java/muyu/goods/enterprise/client/config/EnterpriseConfig.java

@@ -1,20 +1,15 @@
 package muyu.goods.enterprise.client.config;
 
 import com.muyu.common.core.domain.Result;
-import com.muyu.common.security.utils.SecurityUtils;
-import com.muyu.common.system.domain.LoginUser;
 import com.muyu.common.system.domain.SysUser;
+import com.muyu.common.system.remote.RemoteUserService;
 import com.muyu.goods.domain.Enterprise;
-import com.muyu.system.remote.RemoteSystemManageService;
 import lombok.extern.log4j.Log4j2;
 import muyu.goods.enterprise.client.config.runner.EnterpriseConfigRunner;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Import;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -23,7 +18,7 @@ import java.util.stream.Collectors;
 @Import(value = EnterpriseConfigRunner.class)
 public class EnterpriseConfig {
     @Autowired
-    private RemoteSystemManageService remoteSystemManageService;
+    private RemoteUserService remoteUserService;
 
     /**
      * 添加新用户
@@ -55,7 +50,7 @@ public class EnterpriseConfig {
         sysUser.setRemark("");
         //绑定外键
         sysUser.setFirm(enterprise.getId());
-        remoteSystemManageService.add(sysUser);
+        remoteUserService.add(sysUser);
     }
 
     /**
@@ -63,7 +58,7 @@ public class EnterpriseConfig {
      * @return
      */
     public List<SysUser> sysUsers() {
-        Result<List<SysUser>> lists = remoteSystemManageService.lists();
+        Result<List<SysUser>> lists = remoteUserService.lists();
         List<SysUser> sysUserList = lists.getData();
         List<SysUser> collect = sysUserList.stream().filter(user -> user.getFirm()!=null).collect(Collectors.toList());
         return collect;

muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-client/src/main/java/muyu/goods/enterprise/client/config/runner/EnterpriseConfigRunner.java

@@ -4,10 +4,6 @@ import com.muyu.common.core.constant.SecurityConstants;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.goods.domain.Sources;
 import com.muyu.common.goods.remote.RemoteSourcesService;
-import com.muyu.common.system.domain.LoginUser;
-import com.muyu.common.system.domain.SysUser;
-import com.muyu.common.system.remote.RemoteUserService;
-import com.muyu.system.remote.RemoteSystemManageService;
 import lombok.extern.log4j.Log4j2;
 //import muyu.goods.enterprise.remote.EnterpriseDataService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,11 +11,8 @@ import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestHeader;
 
-import javax.annotation.processing.SupportedAnnotationTypes;
+
 import java.util.List;
 
 @Log4j2

muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-common/pom.xml

@@ -26,7 +26,7 @@
 
         <dependency>
             <groupId>com.muyu</groupId>
-            <artifactId>muyu-modules-system</artifactId>
+            <artifactId>muyu-common-system</artifactId>
             <version>3.6.3</version>
         </dependency>
 

muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-remote/pom.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.muyu</groupId>
-        <artifactId>muyu</artifactId>
-        <version>3.6.3</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>muyu-goods-enterprise-remote</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>muyu-goods-enterprise-common</artifactId>
-            <version>3.6.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>muyu-common-core</artifactId>
-        </dependency>
-
-    </dependencies>
-</project>

muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-remote/src/main/java/muyu/goods/enterprise/remote/EnterpriseDataService.java

@@ -1,24 +0,0 @@
-package muyu.goods.enterprise.remote;
-
-import com.muyu.common.core.constant.ServiceNameConstants;
-import com.muyu.common.core.domain.Result;
-import com.muyu.goods.domain.Sources;
-import muyu.goods.enterprise.remote.factory.EnterpriseDataServiceFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-
-@FeignClient(
-        contextId = "enterpriseSources",
-        value = ServiceNameConstants.GOODS_SERVICE,
-        fallbackFactory = EnterpriseDataServiceFactory.class
-)
-public interface EnterpriseDataService {
-    /**
-     * 获取多数据源信息
-     * @return
-     */
-    @PostMapping("/enterprise/listSources")
-    public Result<List<Sources>> listSources();
-}

muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-remote/src/main/java/muyu/goods/enterprise/remote/factory/EnterpriseDataServiceFactory.java

@@ -1,20 +0,0 @@
-package muyu.goods.enterprise.remote.factory;
-
-import com.muyu.common.core.domain.Result;
-import com.muyu.goods.domain.Sources;
-import muyu.goods.enterprise.remote.EnterpriseDataService;
-import org.springframework.cloud.openfeign.FallbackFactory;
-
-import java.util.List;
-
-public class EnterpriseDataServiceFactory implements FallbackFactory<EnterpriseDataService> {
-    @Override
-    public EnterpriseDataService create(Throwable cause) {
-        return new EnterpriseDataService() {
-            @Override
-            public Result<List<Sources>> listSources() {
-                return Result.error(cause.getMessage());
-            }
-        };
-    }
-}

muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +0,0 @@
-muyu.goods.enterprise.remote.factory.EnterpriseDataServiceFactory

muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/manage/SysUserRemote.java

@@ -2,10 +2,9 @@ package com.muyu.goods.manage;
 
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.system.domain.SysUser;
-import com.muyu.goods.controller.EnterpriseController;
+import com.muyu.common.system.remote.RemoteUserService;
 import com.muyu.goods.domain.Enterprise;
 import com.muyu.goods.service.impl.EnterpriseServiceImpl;
-import com.muyu.system.remote.RemoteSystemManageService;
 import lombok.Data;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +19,7 @@ import java.util.List;
 @Log4j2
 public class SysUserRemote {
     @Autowired
-    private static RemoteSystemManageService remoteSystemManageService;
+    private static RemoteUserService remoteSystemManageService;
     @Autowired
     private static EnterpriseServiceImpl enterpriseService;
 

muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/impl/EnterpriseServiceImpl.java

@@ -10,14 +10,14 @@ import com.muyu.common.core.utils.DateUtils;
 import com.muyu.common.security.utils.SecurityUtils;
 import com.muyu.common.system.domain.LoginUser;
 import com.muyu.common.system.domain.SysUser;
+import com.muyu.common.system.remote.RemoteUserService;
 import com.muyu.goods.domain.Custom;
 import com.muyu.goods.domain.Sources;
 import com.muyu.goods.mq.Producer;
 import com.muyu.goods.pojo.HttpClient;
-import com.muyu.system.remote.RemoteSystemManageService;
 import muyu.goods.enterprise.client.config.EnterpriseConfig;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import com.muyu.goods.mapper.EnterpriseMapper;
 import com.muyu.goods.domain.Enterprise;
@@ -35,11 +35,11 @@ public class EnterpriseServiceImpl implements IEnterpriseService
     @Autowired
     private EnterpriseMapper enterpriseMapper;
     @Autowired
-    private RemoteSystemManageService remoteSystemManageService;
-    @Autowired
     private EnterpriseConfig enterpriseConfig;
     @Autowired
     private Producer producer;
+    @Autowired
+    private RedisTemplate<String,String> redisTemplate;
 
     /**
      * 查询企业
@@ -196,7 +196,13 @@ public class EnterpriseServiceImpl implements IEnterpriseService
      */
     @Override
     public List<Enterprise> lists() {
-        return selectEnterpriseList(null);
+        List<Enterprise> enterprises = selectEnterpriseList(null);
+        for (Enterprise enterpris : enterprises) {
+            redisTemplate.opsForList().leftPush("enterprises",JSONObject.toJSONString(enterpris));
+        }
+        List<String> range = redisTemplate.opsForList().range("enterprises", 0, -1);
+        System.out.println(range);
+        return enterprises;
     }
 
     /**

muyu-modules/muyu-goods-enterprise/pom.xml

@@ -15,7 +15,6 @@
     <modules>
         <module>muyu-goods-enterprise-common</module>
         <module>muyu-goods-enterprise-server</module>
-        <module>muyu-goods-enterprise-remote</module>
         <module>muyu-goods-enterprise-client</module>
     </modules>
 

muyu-modules/muyu-moudels-many-datasource/pom.xml

@@ -88,12 +88,6 @@
             <groupId>com.muyu</groupId>
             <artifactId>muyu-common-swagger</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>muyu-goods-enterprise-remote</artifactId>
-            <version>3.6.3</version>
-            <scope>compile</scope>
-        </dependency>
 
         <!-- rabbitmq-->
         <dependency>

muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSystemManageService.java

@@ -1,41 +0,0 @@
-package com.muyu.system.remote;
-
-import com.muyu.common.core.constant.ServiceNameConstants;
-import com.muyu.common.core.domain.Result;
-import com.muyu.common.core.web.page.TableDataInfo;
-import com.muyu.common.system.domain.SysUser;
-import com.muyu.system.remote.factory.DataMangSystemFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * 远程调用
- */
-@FeignClient(
-        contextId = "RemoteSys",
-        value = ServiceNameConstants.SYSTEM_SERVICE,
-        fallbackFactory = DataMangSystemFactory.class,
-        path = "/user"
-)
-public interface RemoteSystemManageService {
-
-    //查看用户
-    @PostMapping("lists")
-    public Result<List<SysUser>> lists();
-
-    //添加用户
-    @PostMapping
-    public Result add (@Validated @RequestBody SysUser user);
-
-    /**
-     * 查看详情
-     * @return
-     */
-    @PostMapping("getSysUserById")
-    public Result<SysUser> getSysUserById();
-}

muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/factory/DataMangSystemFactory.java

@@ -1,34 +0,0 @@
-package com.muyu.system.remote.factory;
-
-import com.muyu.common.core.domain.Result;
-import com.muyu.common.core.web.page.TableDataInfo;
-import com.muyu.common.system.domain.SysUser;
-import com.muyu.system.remote.RemoteSystemManageService;
-import org.springframework.cloud.openfeign.FallbackFactory;
-
-import java.util.List;
-
-/**
- * 熔断
- */
-public class DataMangSystemFactory implements FallbackFactory<RemoteSystemManageService> {
-    @Override
-    public RemoteSystemManageService create(Throwable cause) {
-        return new RemoteSystemManageService() {
-            @Override
-            public Result<List<SysUser>> lists() {
-                return Result.error(cause.getMessage());
-            }
-
-            @Override
-            public Result add(SysUser user) {
-                return Result.error(cause.getMessage());
-            }
-
-            @Override
-            public Result<SysUser> getSysUserById() {
-                return Result.error(cause.getMessage());
-            }
-        };
-    }
-}

muyu-modules/muyu-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +0,0 @@
-com.muyu.system.remote.factory.DataMangSystemFactory

pom.xml

@@ -218,7 +218,6 @@
         <module>muyu-modules/muyu-goods-enterprise</module>
         <module>muyu-modules/muyu-business</module>
         <module>muyu-modules/muyu-moudels-many-datasource</module>
-        <module>muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-remote</module>
     </modules>
     <packaging>pom</packaging>