From f5dd3518168a3960cae11b34460c0cd4fbd63e26 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 20 Nov 2020 09:12:33 +0800
Subject: [PATCH] Merge branch 'dev'
---
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/OrganizationFilter.java | 59 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/OrganizationFilter.java b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/OrganizationFilter.java
index f2c5917..e4a084b 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/OrganizationFilter.java
+++ b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/OrganizationFilter.java
@@ -17,6 +17,7 @@
import org.springframework.cloud.netflix.zuul.filters.support.FilterConstants;
import org.springframework.security.authentication.AnonymousAuthenticationToken;
import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.context.SecurityContextImpl;
import org.springframework.security.oauth2.provider.OAuth2Authentication;
import org.springframework.stereotype.Component;
@@ -64,15 +65,16 @@
@SneakyThrows
@Override
public Object run() {
- //Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
- RequestContext currentContext = RequestContext.getCurrentContext();
- //获取request对象
- HttpServletRequest request = currentContext.getRequest();
- //security会把一个SecurityContextImpl对象存储到session中，此对象中有当前用户的各种资料
- SecurityContextImpl securityContextImpl = (SecurityContextImpl) request
- .getSession().getAttribute("SPRING_SECURITY_CONTEXT");
- Authentication authentication = securityContextImpl.getAuthentication();
+ Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
if (authentication != null && !(authentication instanceof AnonymousAuthenticationToken)) {
+ RequestContext currentContext = RequestContext.getCurrentContext();
+// 获取request对象
+ HttpServletRequest request = currentContext.getRequest();
+ //security会把一个SecurityContextImpl对象存储到session中，此对象中有当前用户的各种资料
+ SecurityContextImpl securityContextImpl = (SecurityContextImpl) request
+ .getSession().getAttribute("SPRING_SECURITY_CONTEXT");
+ authentication = securityContextImpl.getAuthentication();
Object principal = authentication.getPrincipal();
RequestContext ctx = RequestContext.getCurrentContext();
if (principal instanceof SysUser) {
@@ -80,18 +82,17 @@
OAuth2Authentication oauth2Authentication = (OAuth2Authentication) authentication;
String clientId = oauth2Authentication.getOAuth2Request().getClientId();
// if (CLIENTID.equals(clientId)) {
- SysUser user = (SysUser) authentication.getPrincipal();
- /**
- * 将组织中为空的拦截
- */
- List<SysUserOrg> sysUserOrgs = getSysUserOrg(user.getId());
- if (sysUserOrgs == null || sysUserOrgs.isEmpty()) {
- ctx.setSendZuulResponse(false);
- ctx.addZuulResponseHeader("Content-Type","application/json;charset=UTF-8");
+ SysUser user = (SysUser) authentication.getPrincipal();
+ /**
+ * 将组织中为空的拦截
+ */
+ List<SysUserOrg> sysUserOrgs = this.getSysUserOrg(user.getId());
+ if (sysUserOrgs == null || sysUserOrgs.isEmpty()) {
+ ctx.setSendZuulResponse(false);
+ ctx.addZuulResponseHeader("Content-Type", "application/json;charset=UTF-8");
// String str = new String("您的组织已经被禁用，请联系管理员".getBytes("utf-8"), "utf-8");
- ctx.setResponseBody(JSON.toJSONString(ResultBody.fail(1000, "您的组织已经被禁用，请联系管理员")));
- }
- else {
+ ctx.setResponseBody(JSON.toJSONString(ResultBody.fail(1000, "您的组织已经被禁用，请联系管理员")));
+ } else {
// List<Long> collect = sysUserOrgs.stream().map(e -> e.getOrgId()).collect(Collectors.toList());
// List<SysOrganization> sysOrganizations = getSysOrganization();
// List<Long> orgIds = sysOrganizations.stream().filter(e -> e.getEnabled() == true && collect.contains(e.getId())).map(e -> e.getId()).collect(Collectors.toList());
@@ -99,29 +100,29 @@
// ctx.setSendZuulResponse(false);
// ctx.setResponseBody(JSON.toJSONString(ResultBody.fail(1000, "您的组织已经被禁用，请联系管理员")));
// }
+ if (!request.getRequestURI().contains("ReportRecord/getImg")) {
//根据fegin客户端查询状态
- Map<String,Object> map;
+ Map<String, Object> map;
for (SysUserOrg sysUserOrg : sysUserOrgs) {
- map=new HashMap<>();
- map.put("id",sysUserOrg.getOrgId());
+ map = new HashMap<>();
+ map.put("id", sysUserOrg.getOrgId());
List<SysOrganization> sysOrganizations = JSON.parseArray(JSON.toJSONString(sysOrganizationService.getListByMap(map).getData()), SysOrganization.class);
- if(sysOrganizations==null||sysOrganizations.size()<=0){
+ if (sysOrganizations == null || sysOrganizations.size() <= 0) {
ctx.setSendZuulResponse(false);
- ctx.addZuulResponseHeader("Content-Type","application/json;charset=UTF-8");
+ ctx.addZuulResponseHeader("Content-Type", "application/json;charset=UTF-8");
ctx.setResponseBody(JSON.toJSONString(ResultBody.fail(1000, "您的组织已经被禁用，请联系管理员")));
- }else {
+ } else {
for (SysOrganization sysOrganization : sysOrganizations) {
- if(!sysOrganization.getEnabled()||sysOrganization.getIsDel()){
+ if (!sysOrganization.getEnabled() || sysOrganization.getIsDel()) {
ctx.setSendZuulResponse(false);
- ctx.addZuulResponseHeader("Content-Type","application/json;charset=UTF-8");
+ ctx.addZuulResponseHeader("Content-Type", "application/json;charset=UTF-8");
ctx.setResponseBody(JSON.toJSONString(ResultBody.fail(1000, "您的组织已经被禁用，请联系管理员")));
}
}
}
}
-
}
-// }
+ }
}
}
return null;
--
Gitblit v1.8.0