From ceac667a71e83c354afdaf720169b1db9c8de6d0 Mon Sep 17 00:00:00 2001 From: pig777 Date: Wed, 4 Nov 2020 21:02:34 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.=20#1?= =?UTF-8?q?982=20=E5=8D=95=E7=82=B9=E7=99=BB=E5=BD=95sso=E4=B8=8B=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=20=E6=97=A0=E6=B3=95=E4=BC=A0=E9=80=92=E7=A7=9F?= =?UTF-8?q?=E6=88=B7=E4=B8=8A=E4=B8=8B=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/auth/endpoint/PigxTokenEndpoint.java | 10 ++++++- .../main/resources/templates/ftl/login.ftl | 13 +++++++-- .../tenant/TenantContextHolderFilter.java | 13 ++++++--- .../pigx/admin/controller/DemoController.java | 27 ------------------- .../admin/controller/SysRoleController.java | 2 +- pom.xml | 6 ++--- 6 files changed, 33 insertions(+), 38 deletions(-) delete mode 100644 pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DemoController.java diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java index 907543e1b..d118966da 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java @@ -22,8 +22,11 @@ package com.pig4cloud.pigx.auth.endpoint; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.pig4cloud.pigx.admin.api.entity.SysTenant; +import com.pig4cloud.pigx.admin.api.feign.RemoteTenantService; import com.pig4cloud.pigx.auth.service.PigxTokenDealServiceImpl; import com.pig4cloud.pigx.common.core.constant.PaginationConstants; +import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.security.annotation.Inner; import com.pig4cloud.pigx.common.security.util.SecurityUtils; @@ -39,6 +42,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import java.util.List; import java.util.Map; /** @@ -51,9 +55,11 @@ import java.util.Map; @RequestMapping("/token") public class PigxTokenEndpoint { + private final ClientDetailsService clientDetailsService; + private final PigxTokenDealServiceImpl dealService; - private final ClientDetailsService clientDetailsService; + private final RemoteTenantService tenantService; /** * 认证页面 @@ -63,8 +69,10 @@ public class PigxTokenEndpoint { */ @GetMapping("/login") public ModelAndView require(ModelAndView modelAndView, @RequestParam(required = false) String error) { + R> tenantList = tenantService.list(SecurityConstants.FROM_IN); modelAndView.setViewName("ftl/login"); modelAndView.addObject("error", error); + modelAndView.addObject("tenantList", tenantList.getData()); return modelAndView; } diff --git a/pigx-auth/src/main/resources/templates/ftl/login.ftl b/pigx-auth/src/main/resources/templates/ftl/login.ftl index 28b15ef0d..24ec34d4f 100755 --- a/pigx-auth/src/main/resources/templates/ftl/login.ftl +++ b/pigx-auth/src/main/resources/templates/ftl/login.ftl @@ -18,7 +18,16 @@
diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolderFilter.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolderFilter.java index 2313b319c..544eb8440 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolderFilter.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolderFilter.java @@ -47,11 +47,16 @@ public class TenantContextHolderFilter extends GenericFilterBean { HttpServletRequest request = (HttpServletRequest) servletRequest; HttpServletResponse response = (HttpServletResponse) servletResponse; - String tenantId = request.getHeader(CommonConstants.TENANT_ID); - log.debug("获取header中的租户ID为:{}", tenantId); + String headerTenantId = request.getHeader(CommonConstants.TENANT_ID); + String paramTenantId = request.getParameter(CommonConstants.TENANT_ID); - if (StrUtil.isNotBlank(tenantId)) { - TenantContextHolder.setTenantId(Integer.parseInt(tenantId)); + log.debug("获取header中的租户ID为:{}", headerTenantId); + + if (StrUtil.isNotBlank(headerTenantId)) { + TenantContextHolder.setTenantId(Integer.parseInt(headerTenantId)); + } + else if (StrUtil.isNotBlank(paramTenantId)) { + TenantContextHolder.setTenantId(Integer.parseInt(paramTenantId)); } else { TenantContextHolder.setTenantId(CommonConstants.TENANT_ID_1); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DemoController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DemoController.java deleted file mode 100644 index f3fd67af8..000000000 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DemoController.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.pig4cloud.pigx.admin.controller; - -import com.pig4cloud.pigx.common.security.annotation.Inner; -import org.springframework.web.bind.annotation.*; - -/** - * @author lengleng - * @date 2020/10/13 - */ -@Inner -@RequestMapping(value = "/demo", method = RequestMethod.POST) -@RestController -public class DemoController { - - @Inner(false) - @GetMapping("/test") - public String demo() { - return "ssucess"; - } - - @Inner(false) - @GetMapping("/test/{id}") - public String demo2(@PathVariable String id) { - return "ssucess"; - } - -} diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java index 7c0eb4009..878cc39cf 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java @@ -115,7 +115,7 @@ public class SysRoleController { * @return 分页对象 */ @GetMapping("/page") - public R getRolePage(Page page,SysRole role) { + public R getRolePage(Page page, SysRole role) { return R.ok(sysRoleService.page(page, Wrappers.query(role))); } diff --git a/pom.xml b/pom.xml index b184f8491..3e77baa6d 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ - 2.3.4.RELEASE + 2.3.5.RELEASE Hoxton.SR8 2.2.3.RELEASE UTF-8 @@ -43,10 +43,10 @@ 0.0.23 2.2.5 2.3.0 - 5.4.5 + 5.4.7 1.2.4 3.0.0 - 2.0.4 + 2.0.7 1.7 4.1.0 2.1.1