From a560229583e26d2e0e65e9ca8850e25c69f7e818 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: Sun, 9 Jun 2024 21:00:48 +0800 Subject: [PATCH] =?UTF-8?q?fast()=E7=99=BB=E5=BD=95=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- muyu-auth/pom.xml | 6 ++ .../com/muyu/auth/MuYuAuthApplication.java | 1 + .../src/main/java/com/muyu/auth/form/Sys.java | 16 ----- .../com/muyu/auth/form/SysFormSources.java | 70 +++++++++++++++++++ .../muyu/auth/service/SysLoginService.java | 12 ++-- .../auth/service/SysRecordLogService.java | 2 +- .../com/muyu/common/goods/domain/Status.java | 24 +++++++ .../goods/remote/RemoteDataSourceService.java | 26 +++++++ .../RemoteDataSourceFallbackFactory.java | 26 +++++++ ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../common/security/service/TokenService.java | 2 +- .../muyu/common/system/domain/LoginUser.java | 11 ++- .../service/impl/BusinessServiceImpl.java | 2 +- .../java/com/muyu/goods/domain/Custom.java | 23 ++++++ .../controller/EnterpriseController.java | 11 +++ .../muyu/goods/mapper/EnterpriseMapper.java | 3 + .../goods/service/IEnterpriseService.java | 3 + .../service/impl/EnterpriseServiceImpl.java | 8 +++ .../mapper/goods/EnterpriseMapper.xml | 4 ++ .../cloud/controller/CloudController.java | 9 +-- .../cloud/datasource/config/DruidConfig.java | 1 + .../com/muyu/cloud/service/CloudService.java | 2 +- .../cloud/service/impl/CloudServiceImpl.java | 3 +- .../service/impl/SysUserServiceImpl.java | 2 +- 24 files changed, 227 insertions(+), 41 deletions(-) delete mode 100644 muyu-auth/src/main/java/com/muyu/auth/form/Sys.java create mode 100644 muyu-auth/src/main/java/com/muyu/auth/form/SysFormSources.java create mode 100644 muyu-common/muyu-common-goods/src/main/java/com/muyu/common/goods/domain/Status.java create mode 100644 muyu-common/muyu-common-goods/src/main/java/com/muyu/common/goods/remote/RemoteDataSourceService.java create mode 100644 muyu-common/muyu-common-goods/src/main/java/com/muyu/common/goods/remote/factory/RemoteDataSourceFallbackFactory.java create mode 100644 muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-common/src/main/java/com/muyu/goods/domain/Custom.java diff --git a/muyu-auth/pom.xml b/muyu-auth/pom.xml index a8ddedc..3e09218 100644 --- a/muyu-auth/pom.xml +++ b/muyu-auth/pom.xml @@ -51,6 +51,12 @@ com.muyu muyu-common-security + + com.muyu + muyu-common-goods + 3.6.3 + compile + diff --git a/muyu-auth/src/main/java/com/muyu/auth/MuYuAuthApplication.java b/muyu-auth/src/main/java/com/muyu/auth/MuYuAuthApplication.java index 7283b5a..482bb33 100644 --- a/muyu-auth/src/main/java/com/muyu/auth/MuYuAuthApplication.java +++ b/muyu-auth/src/main/java/com/muyu/auth/MuYuAuthApplication.java @@ -4,6 +4,7 @@ import com.muyu.common.security.annotation.EnableMyFeignClients; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.cloud.openfeign.EnableFeignClients; /** * 认证授权中心 diff --git a/muyu-auth/src/main/java/com/muyu/auth/form/Sys.java b/muyu-auth/src/main/java/com/muyu/auth/form/Sys.java deleted file mode 100644 index d878272..0000000 --- a/muyu-auth/src/main/java/com/muyu/auth/form/Sys.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.muyu.auth.form; - -import com.muyu.common.system.domain.LoginUser; -import com.muyu.common.system.remote.RemoteUserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -@Component -public class Sys { - @Autowired - private RemoteUserService remoteUserService; - - public void sys(LoginUser userInfo) { - System.out.println(userInfo); - } -} diff --git a/muyu-auth/src/main/java/com/muyu/auth/form/SysFormSources.java b/muyu-auth/src/main/java/com/muyu/auth/form/SysFormSources.java new file mode 100644 index 0000000..f185efa --- /dev/null +++ b/muyu-auth/src/main/java/com/muyu/auth/form/SysFormSources.java @@ -0,0 +1,70 @@ +package com.muyu.auth.form; + +import com.muyu.auth.service.SysLoginService; +import com.muyu.common.goods.domain.Sources; +import com.muyu.common.goods.domain.Status; +import com.muyu.common.goods.remote.RemoteDataSourceService; +import com.muyu.common.goods.remote.RemoteSourcesService; +import com.muyu.common.system.domain.SysUser; +import lombok.extern.log4j.Log4j2; +import org.apache.http.client.utils.HttpClientUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.stereotype.Component; + +import java.io.IOException; +import java.net.*; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpRequest.*; +import java.net.http.HttpResponse; +import java.util.HashMap; +import java.util.List; +import java.util.stream.Collectors; + +@Log4j2 +@Component +public class SysFormSources { + + @Autowired + private RemoteSourcesService remoteSourcesService; + @Autowired + private RemoteDataSourceService remoteDataSourceService;; + public void sysSetUser(SysUser sysUser){ + String saas = null; + HashMap hashMap = new HashMap<>(); + if (sysUser.getFirm()!=null){ + List sourcesList = remoteSourcesService.listSources().getData(); + Sources sources = sourcesList.stream().filter(sour -> sour.getEnterpriseId() == sysUser.getFirm()).collect(Collectors.toList()).get(0); + saas = sources.getIp(); + }else { + saas = "3306"; + } + System.out.println(saas); + hashMap.put("saas",saas); +// try { +// //创建HttpClient实例 +// HttpClient client = HttpClient.newBuilder().build(); +// //创建请求并添加rui +// URI uri = new URI("http://127.0.0.1:9209/cloud/list"); +// HttpRequest request = HttpRequest.newBuilder() +// .uri(uri) +// .header("saas", saas) +// .POST(BodyPublishers.noBody()) +// .build(); +// //发送请求并接收请求响应 +// HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); +// //输出响应状态和内容 +// System.out.println(response.statusCode()); +// System.out.println(response.body()); +// } catch (URISyntaxException e) { +// throw new RuntimeException(e); +// } catch (IOException e) { +// throw new RuntimeException(e); +// } catch (InterruptedException e) { +// throw new RuntimeException(e); +// } + List data = remoteDataSourceService.list(saas).getData(); + System.out.println(data); + } +} diff --git a/muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java b/muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java index 87cfef5..fd94088 100644 --- a/muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java +++ b/muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java @@ -1,6 +1,6 @@ package com.muyu.auth.service; -import com.muyu.auth.form.Sys; +import com.muyu.auth.form.SysFormSources; import com.muyu.common.core.constant.CacheConstants; import com.muyu.common.core.constant.Constants; import com.muyu.common.core.constant.SecurityConstants; @@ -13,14 +13,12 @@ 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.remote.RemoteUserService; -import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.domain.LoginUser; +import com.muyu.common.system.domain.SysUser; +import com.muyu.common.system.remote.RemoteUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.List; - /** * 登录校验方法 * @@ -41,7 +39,7 @@ public class SysLoginService { private RedisService redisService; @Autowired - private Sys sys; + private SysFormSources sysFormSources; /** * 登录 @@ -94,7 +92,7 @@ public class SysLoginService { } passwordService.validate(user, password); recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功"); - sys.sys(userInfo); + sysFormSources.sysSetUser(user); return userInfo; } diff --git a/muyu-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java b/muyu-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java index 2d4de80..3206214 100644 --- a/muyu-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java +++ b/muyu-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java @@ -4,8 +4,8 @@ import com.muyu.common.core.constant.Constants; import com.muyu.common.core.constant.SecurityConstants; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.ip.IpUtils; -import com.muyu.common.system.remote.RemoteLogService; import com.muyu.common.system.domain.SysLogininfor; +import com.muyu.common.system.remote.RemoteLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/muyu-common/muyu-common-goods/src/main/java/com/muyu/common/goods/domain/Status.java b/muyu-common/muyu-common-goods/src/main/java/com/muyu/common/goods/domain/Status.java new file mode 100644 index 0000000..b04a25b --- /dev/null +++ b/muyu-common/muyu-common-goods/src/main/java/com/muyu/common/goods/domain/Status.java @@ -0,0 +1,24 @@ +package com.muyu.common.goods.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName(value = "status") +public class Status { + /** + * + */ + @TableId(type = IdType.AUTO) + private Long id; + /** + * + */ + private String name; + /** + * + */ + private Integer age; +} diff --git a/muyu-common/muyu-common-goods/src/main/java/com/muyu/common/goods/remote/RemoteDataSourceService.java b/muyu-common/muyu-common-goods/src/main/java/com/muyu/common/goods/remote/RemoteDataSourceService.java new file mode 100644 index 0000000..0c57919 --- /dev/null +++ b/muyu-common/muyu-common-goods/src/main/java/com/muyu/common/goods/remote/RemoteDataSourceService.java @@ -0,0 +1,26 @@ +package com.muyu.common.goods.remote; + +import com.muyu.common.core.constant.ServiceNameConstants; +import com.muyu.common.core.domain.Result; +import com.muyu.common.goods.domain.Status; +import com.muyu.common.goods.remote.factory.RemoteDataSourceFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestHeader; + +import java.util.List; + +@FeignClient( + contextId = "dataSourcesService", + value = ServiceNameConstants.RANGE_SERVICE, + fallbackFactory = RemoteDataSourceFallbackFactory.class, + path = "/cloud" +) +public interface RemoteDataSourceService { +// @PostMapping("list") +// public Result> list(); + + @PostMapping("list") + public Result> list(@RequestHeader("saas") String saas); +} + diff --git a/muyu-common/muyu-common-goods/src/main/java/com/muyu/common/goods/remote/factory/RemoteDataSourceFallbackFactory.java b/muyu-common/muyu-common-goods/src/main/java/com/muyu/common/goods/remote/factory/RemoteDataSourceFallbackFactory.java new file mode 100644 index 0000000..98f6b17 --- /dev/null +++ b/muyu-common/muyu-common-goods/src/main/java/com/muyu/common/goods/remote/factory/RemoteDataSourceFallbackFactory.java @@ -0,0 +1,26 @@ +package com.muyu.common.goods.remote.factory; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.goods.domain.Status; +import com.muyu.common.goods.remote.RemoteDataSourceService; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component +public class RemoteDataSourceFallbackFactory implements FallbackFactory { + @Override + public RemoteDataSourceService create(Throwable cause) { + return new RemoteDataSourceService() { + @Override + public Result> list(String saas) { + return Result.error(cause.getMessage()); + } +// @Override +// public Result> list() { +// return Result.error(cause.getMessage()); +// } + }; + } +} diff --git a/muyu-common/muyu-common-goods/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-common/muyu-common-goods/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 6cf5ecb..35ff0f6 100644 --- a/muyu-common/muyu-common-goods/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/muyu-common/muyu-common-goods/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1,2 @@ com.muyu.common.goods.remote.factory.RemoteSourcesFallbackFactory +com.muyu.common.goods.remote.factory.RemoteDataSourceFallbackFactory diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/service/TokenService.java b/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/service/TokenService.java index b19697e..8b734f6 100644 --- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/service/TokenService.java +++ b/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/service/TokenService.java @@ -45,7 +45,7 @@ public class TokenService { Long userId = loginUser.getSysUser().getUserId(); String userName = loginUser.getSysUser().getUserName(); loginUser.setToken(token); - loginUser.setUserid(userId); + loginUser.setUserId(userId); loginUser.setUsername(userName); loginUser.setIpaddr(IpUtils.getIpAddr()); refreshToken(loginUser); diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java index 60a0579..10e53f3 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java @@ -23,7 +23,7 @@ public class LoginUser implements Serializable { /** * 用户名id */ - private Long userid; + private Long userId; /** * 用户名 @@ -70,12 +70,12 @@ public class LoginUser implements Serializable { this.token = token; } - public Long getUserid () { - return userid; + public Long getUserId () { + return userId; } - public void setUserid (Long userid) { - this.userid = userid; + public void setUserId (Long userId) { + this.userId = userId; } public String getUsername () { @@ -142,5 +142,4 @@ public class LoginUser implements Serializable { this.firm = firm; } - } 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 6662037..c1bbf0b 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 @@ -55,7 +55,7 @@ public class BusinessServiceImpl implements IBusinessService LoginUser loginUser = SecurityUtils.getLoginUser(); Result> lists = remoteSystemManageService.lists(); List data = lists.getData(); - SysUser sysUser = data.stream().filter(da -> da.getUserId().equals(loginUser.getUserid())).collect(Collectors.toList()).get(0); + 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()); if (collect.size() == 0){ return null; diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-common/src/main/java/com/muyu/goods/domain/Custom.java b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-common/src/main/java/com/muyu/goods/domain/Custom.java new file mode 100644 index 0000000..bf6b964 --- /dev/null +++ b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-common/src/main/java/com/muyu/goods/domain/Custom.java @@ -0,0 +1,23 @@ +package com.muyu.goods.domain; + +import lombok.Data; + +@Data +public class Custom { + /** + * 主键 + */ + private Long customId; + /** + * 申请企业 + */ + private Long enterpriseId; + /** + * 内容 + */ + private String customContent; + /** + * 状态 + */ + private Integer status; +} diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/controller/EnterpriseController.java b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/controller/EnterpriseController.java index ca2ff45..c648372 100644 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/controller/EnterpriseController.java +++ b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/controller/EnterpriseController.java @@ -5,6 +5,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.muyu.common.system.domain.SysUser; +import com.muyu.goods.domain.Custom; import com.muyu.goods.domain.Enterprise; import com.muyu.goods.domain.Sources; import org.springframework.beans.factory.annotation.Autowired; @@ -163,4 +164,14 @@ public class EnterpriseController extends BaseController return success(enterpriseService.listSources()); } + /** + * 申请定制服务 + * @param custom + * @return + */ + @PostMapping("/indexCustom") + public Result indexCustom(@RequestBody Custom custom) { + return success(enterpriseService.indexCustom(custom)); + } + } diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/mapper/EnterpriseMapper.java b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/mapper/EnterpriseMapper.java index 1782039..0aadee9 100644 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/mapper/EnterpriseMapper.java +++ b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/mapper/EnterpriseMapper.java @@ -3,6 +3,7 @@ package com.muyu.goods.mapper; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.muyu.goods.domain.Custom; import com.muyu.goods.domain.Enterprise; import com.muyu.goods.domain.Sources; import org.apache.ibatis.annotations.Param; @@ -75,4 +76,6 @@ public interface EnterpriseMapper void indexSources(Sources sources); List listSources(QueryWrapper objectQueryWrapper); + + int indexCustom(Custom custom); } diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/IEnterpriseService.java b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/IEnterpriseService.java index ee71962..604ff80 100644 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/IEnterpriseService.java +++ b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/IEnterpriseService.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.util.List; import com.muyu.common.system.domain.SysUser; +import com.muyu.goods.domain.Custom; import com.muyu.goods.domain.Enterprise; import com.muyu.goods.domain.Sources; @@ -82,4 +83,6 @@ public interface IEnterpriseService String bu(Long id); List listSources(); + + int indexCustom(Custom custom); } 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 c3483b3..57a45c3 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 @@ -9,6 +9,7 @@ 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.goods.domain.Custom; import com.muyu.goods.domain.Sources; import com.muyu.goods.pojo.HttpClient; import com.muyu.system.remote.RemoteSystemManageService; @@ -211,4 +212,11 @@ public class EnterpriseServiceImpl implements IEnterpriseService return enterpriseMapper.listSources(new QueryWrapper<>()); } + @Override + public int indexCustom(Custom custom) { + System.out.println(custom); +// int i = enterpriseMapper.indexCustom(custom); + return 0; + } + } diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/resources/mapper/goods/EnterpriseMapper.xml b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/resources/mapper/goods/EnterpriseMapper.xml index 4789656..15259e8 100644 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/resources/mapper/goods/EnterpriseMapper.xml +++ b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/resources/mapper/goods/EnterpriseMapper.xml @@ -113,6 +113,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{password}, + + insert into custom (enterprise_id,custom_content,status) + values (#{enterpriseId},#{customContent},0) + update enterprise diff --git a/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/controller/CloudController.java b/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/controller/CloudController.java index 686b236..4d47a32 100644 --- a/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/controller/CloudController.java +++ b/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/controller/CloudController.java @@ -8,10 +8,7 @@ import com.muyu.cloud.service.CloudService; import com.muyu.common.core.domain.Result; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -42,7 +39,7 @@ public class CloudController { } @PostMapping("list") - public Result> list() { - return Result.success(cloudService.list()); + public Result> list(@RequestHeader("saas") String saas) { + return Result.success(cloudService.list(saas)); } } diff --git a/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/datasource/config/DruidConfig.java b/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/datasource/config/DruidConfig.java index 9a9333b..2497eb3 100644 --- a/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/datasource/config/DruidConfig.java +++ b/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/datasource/config/DruidConfig.java @@ -35,6 +35,7 @@ public class DruidConfig { List listResult = remoteSourcesService.listSources().getData(); System.out.println(listResult); List databaseNameList = new ArrayList<>(); + databaseNameList.add("3306"); listResult.forEach(res -> { databaseNameList.add(res.getIp()); }); diff --git a/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/service/CloudService.java b/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/service/CloudService.java index 454fdd7..93a5f0c 100644 --- a/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/service/CloudService.java +++ b/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/service/CloudService.java @@ -7,5 +7,5 @@ import java.util.List; public interface CloudService { Object selSource(); - List list(); + List list(String saas); } diff --git a/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/service/impl/CloudServiceImpl.java b/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/service/impl/CloudServiceImpl.java index 24c27e4..cc0112d 100644 --- a/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/service/impl/CloudServiceImpl.java +++ b/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/service/impl/CloudServiceImpl.java @@ -1,6 +1,7 @@ package com.muyu.cloud.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.muyu.cloud.datasource.DynamicDataSourceHolder; import com.muyu.cloud.domain.Status; import com.muyu.cloud.mapper.CloudMapper; import com.muyu.cloud.service.CloudService; @@ -19,7 +20,7 @@ public class CloudServiceImpl implements CloudService { } @Override - public List list() { + public List list(String saas) { return cloudMapper.list(new QueryWrapper<>()); } } diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java index a9b4d8d..689a472 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java @@ -513,7 +513,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override public SysUser getSysUserById() { LoginUser loginUser = SecurityUtils.getLoginUser(); - Long userid = loginUser.getUserid(); + Long userid = loginUser.getUserId(); List collect = lists().stream().filter(list -> list.getUserId().equals(userid)).collect(Collectors.toList()); return collect.get(0); }