From 1512c54b1a1510a12746e7ee63e7a009d3860eeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E6=9C=9D?= <13694051+wangxizhao123@user.noreply.gitee.com> Date: Thu, 13 Jun 2024 21:57:40 +0800 Subject: [PATCH] =?UTF-8?q?fast()=E6=89=93=E5=8C=85=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/remote/RemoteUserService.java | 16 ++++++++ .../factory/RemoteUserFallbackFactory.java | 15 +++++++ .../config/runner/BusinessConfigRunner.java | 6 +-- .../muyu-business-server/pom.xml | 1 + .../service/impl/BusinessServiceImpl.java | 9 +--- .../muyu-goods-enterprise-client/pom.xml | 5 ++- .../client/config/EnterpriseConfig.java | 13 ++---- .../config/runner/EnterpriseConfigRunner.java | 9 +--- .../muyu-goods-enterprise-common/pom.xml | 2 +- .../muyu-goods-enterprise-remote/pom.xml | 34 --------------- .../remote/EnterpriseDataService.java | 24 ----------- .../factory/EnterpriseDataServiceFactory.java | 20 --------- ...ot.autoconfigure.AutoConfiguration.imports | 1 - .../com/muyu/goods/manage/SysUserRemote.java | 5 +-- .../service/impl/EnterpriseServiceImpl.java | 16 +++++--- muyu-modules/muyu-goods-enterprise/pom.xml | 1 - .../muyu-moudels-many-datasource/pom.xml | 6 --- .../remote/RemoteSystemManageService.java | 41 ------------------- .../remote/factory/DataMangSystemFactory.java | 34 --------------- ...ot.autoconfigure.AutoConfiguration.imports | 1 - pom.xml | 1 - 21 files changed, 59 insertions(+), 201 deletions(-) delete mode 100644 muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-remote/pom.xml delete mode 100644 muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-remote/src/main/java/muyu/goods/enterprise/remote/EnterpriseDataService.java delete mode 100644 muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-remote/src/main/java/muyu/goods/enterprise/remote/factory/EnterpriseDataServiceFactory.java delete mode 100644 muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSystemManageService.java delete mode 100644 muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/factory/DataMangSystemFactory.java diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java index 177b18f..8b02f31 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java +++ b/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> getUserList(); + + //查看用户 + @PostMapping("/user/lists") + public Result> lists(); + + //添加用户 + @PostMapping("/user") + public Result add (@Validated @RequestBody SysUser user); + + /** + * 查看详情 + * @return + */ + @PostMapping("/user/getSysUserById") + public Result getSysUserById(); } diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java index 7e0e797..4482f97 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java +++ b/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> getUserList() { return Result.error("获取用户失败：{}"+throwable.getMessage()); } + + @Override + public Result> lists() { + return Result.error(throwable.getMessage()); + } + + @Override + public Result add(SysUser user) { + return Result.error(throwable.getMessage()); + } + + @Override + public Result getSysUserById() { + return Result.error(throwable.getMessage()); + } }; } } diff --git a/muyu-modules/muyu-business/muyu-business-client/src/main/java/muyu/business/client/config/runner/BusinessConfigRunner.java b/muyu-modules/muyu-business/muyu-business-client/src/main/java/muyu/business/client/config/runner/BusinessConfigRunner.java index 5e84e4f..451aeb6 100644 --- a/muyu-modules/muyu-business/muyu-business-client/src/main/java/muyu/business/client/config/runner/BusinessConfigRunner.java +++ b/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> lists = remoteSystemManageService.lists(); + Result> lists = remoteUserService.lists(); log.info("获取:{}",lists); List data = lists.getData(); for (SysUser datum : data) { diff --git a/muyu-modules/muyu-business/muyu-business-server/pom.xml b/muyu-modules/muyu-business/muyu-business-server/pom.xml index e87e3af..dcda4fe 100644 --- a/muyu-modules/muyu-business/muyu-business-server/pom.xml +++ b/muyu-modules/muyu-business/muyu-business-server/pom.xml @@ -90,6 +90,7 @@ 3.6.3 compile + com.muyu muyu-common-system diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/BusinessServiceImpl.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/BusinessServiceImpl.java index c1bbf0b..1d71e26 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/BusinessServiceImpl.java +++ b/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> lists = remoteSystemManageService.lists(); + Result> lists = remoteUserService.lists(); List data = lists.getData(); SysUser sysUser = data.stream().filter(da -> da.getUserId().equals(loginUser.getUserId())).collect(Collectors.toList()).get(0); List collect = lists().stream().filter(re -> re.getId().equals(sysUser.getFirm())).collect(Collectors.toList()); diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-client/pom.xml b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-client/pom.xml index 9f5fd49..9d73865 100644 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-client/pom.xml +++ b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-client/pom.xml @@ -31,11 +31,14 @@ 3.6.3 + com.muyu - muyu-modules-system + muyu-common-system 3.6.3 + compile + diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-client/src/main/java/muyu/goods/enterprise/client/config/EnterpriseConfig.java b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-client/src/main/java/muyu/goods/enterprise/client/config/EnterpriseConfig.java index c4a82f6..f0c91d9 100644 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-client/src/main/java/muyu/goods/enterprise/client/config/EnterpriseConfig.java +++ b/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 sysUsers() { - Result> lists = remoteSystemManageService.lists(); + Result> lists = remoteUserService.lists(); List sysUserList = lists.getData(); List collect = sysUserList.stream().filter(user -> user.getFirm()!=null).collect(Collectors.toList()); return collect; diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-client/src/main/java/muyu/goods/enterprise/client/config/runner/EnterpriseConfigRunner.java b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-client/src/main/java/muyu/goods/enterprise/client/config/runner/EnterpriseConfigRunner.java index 4279748..1e1cb2c 100644 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-client/src/main/java/muyu/goods/enterprise/client/config/runner/EnterpriseConfigRunner.java +++ b/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 diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-common/pom.xml b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-common/pom.xml index 0ae8172..ec83606 100644 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-common/pom.xml +++ b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-common/pom.xml @@ -26,7 +26,7 @@ com.muyu - muyu-modules-system + muyu-common-system 3.6.3 diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-remote/pom.xml b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-remote/pom.xml deleted file mode 100644 index 8e35209..0000000 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-remote/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - 4.0.0 - - com.muyu - muyu - 3.6.3 - ../../../pom.xml - - - muyu-goods-enterprise-remote - - - 17 - 17 - UTF-8 - - - - - com.muyu - muyu-goods-enterprise-common - 3.6.3 - - - - com.muyu - muyu-common-core - - - - diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-remote/src/main/java/muyu/goods/enterprise/remote/EnterpriseDataService.java b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-remote/src/main/java/muyu/goods/enterprise/remote/EnterpriseDataService.java deleted file mode 100644 index c950880..0000000 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-remote/src/main/java/muyu/goods/enterprise/remote/EnterpriseDataService.java +++ /dev/null @@ -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> listSources(); -} diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-remote/src/main/java/muyu/goods/enterprise/remote/factory/EnterpriseDataServiceFactory.java b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-remote/src/main/java/muyu/goods/enterprise/remote/factory/EnterpriseDataServiceFactory.java deleted file mode 100644 index ae5a930..0000000 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-remote/src/main/java/muyu/goods/enterprise/remote/factory/EnterpriseDataServiceFactory.java +++ /dev/null @@ -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 { - @Override - public EnterpriseDataService create(Throwable cause) { - return new EnterpriseDataService() { - @Override - public Result> listSources() { - return Result.error(cause.getMessage()); - } - }; - } -} diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 53fb2e1..0000000 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -muyu.goods.enterprise.remote.factory.EnterpriseDataServiceFactory diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/manage/SysUserRemote.java b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/manage/SysUserRemote.java index ba73beb..b24ff58 100644 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/manage/SysUserRemote.java +++ b/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; diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/impl/EnterpriseServiceImpl.java b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/impl/EnterpriseServiceImpl.java index 5a60c4c..197af60 100644 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/impl/EnterpriseServiceImpl.java +++ b/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 redisTemplate; /** * 查询企业 @@ -196,7 +196,13 @@ public class EnterpriseServiceImpl implements IEnterpriseService */ @Override public List lists() { - return selectEnterpriseList(null); + List enterprises = selectEnterpriseList(null); + for (Enterprise enterpris : enterprises) { + redisTemplate.opsForList().leftPush("enterprises",JSONObject.toJSONString(enterpris)); + } + List range = redisTemplate.opsForList().range("enterprises", 0, -1); + System.out.println(range); + return enterprises; } /** diff --git a/muyu-modules/muyu-goods-enterprise/pom.xml b/muyu-modules/muyu-goods-enterprise/pom.xml index f275df6..f3e2641 100644 --- a/muyu-modules/muyu-goods-enterprise/pom.xml +++ b/muyu-modules/muyu-goods-enterprise/pom.xml @@ -15,7 +15,6 @@ muyu-goods-enterprise-common muyu-goods-enterprise-server - muyu-goods-enterprise-remote muyu-goods-enterprise-client diff --git a/muyu-modules/muyu-moudels-many-datasource/pom.xml b/muyu-modules/muyu-moudels-many-datasource/pom.xml index 94f63c8..1b24eee 100644 --- a/muyu-modules/muyu-moudels-many-datasource/pom.xml +++ b/muyu-modules/muyu-moudels-many-datasource/pom.xml @@ -88,12 +88,6 @@ com.muyu muyu-common-swagger - - com.muyu - muyu-goods-enterprise-remote - 3.6.3 - compile - diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSystemManageService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSystemManageService.java deleted file mode 100644 index 3f13a0a..0000000 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSystemManageService.java +++ /dev/null @@ -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> lists(); - - //添加用户 - @PostMapping - public Result add (@Validated @RequestBody SysUser user); - - /** - * 查看详情 - * @return - */ - @PostMapping("getSysUserById") - public Result getSysUserById(); -} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/factory/DataMangSystemFactory.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/factory/DataMangSystemFactory.java deleted file mode 100644 index afe5807..0000000 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/factory/DataMangSystemFactory.java +++ /dev/null @@ -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 { - @Override - public RemoteSystemManageService create(Throwable cause) { - return new RemoteSystemManageService() { - @Override - public Result> lists() { - return Result.error(cause.getMessage()); - } - - @Override - public Result add(SysUser user) { - return Result.error(cause.getMessage()); - } - - @Override - public Result getSysUserById() { - return Result.error(cause.getMessage()); - } - }; - } -} diff --git a/muyu-modules/muyu-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 6157c45..e69de29 100644 --- a/muyu-modules/muyu-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/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 diff --git a/pom.xml b/pom.xml index 53fabcc..13e7880 100644 --- a/pom.xml +++ b/pom.xml @@ -218,7 +218,6 @@ muyu-modules/muyu-goods-enterprise muyu-modules/muyu-business muyu-modules/muyu-moudels-many-datasource - muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-remote pom