From ba2d8fdc04d32bd18552c124338520afad4db508 Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Wed, 18 Nov 2020 23:41:50 +0800
Subject: [PATCH] Merge branch 'dev'
---
kidgrow-config/src/main/resources/application.properties | 16 ++++----
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/OrganizationFilter.java | 57 ++++++++++++++++++----------
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java | 19 +++++++++
kidgrow-config/src/main/resources/application-dev.properties | 3 +
4 files changed, 64 insertions(+), 31 deletions(-)
diff --git a/kidgrow-config/src/main/resources/application-dev.properties b/kidgrow-config/src/main/resources/application-dev.properties
index ce3236e..3cc4fbb 100644
--- a/kidgrow-config/src/main/resources/application-dev.properties
+++ b/kidgrow-config/src/main/resources/application-dev.properties
@@ -88,4 +88,5 @@
## C\u7AEF\u4EA7\u54C1\u53EF\u7231\u9AD8\u7B5B\u67E5\u5C0F\u7A0B\u5E8F\u914D\u7F6E\u4FE1\u606F
wechat.screening.applets.appid=wx5a9bc7ebd13eb6cc
-wechat.screening.applets.secret=c16d8e42e42137bd7ba6e6999f226803
\ No newline at end of file
+wechat.screening.applets.secret=c16d8e42e42137bd7ba6e6999f226803
+health_url_net=http://192.168.2.22/
\ No newline at end of file
diff --git a/kidgrow-config/src/main/resources/application.properties b/kidgrow-config/src/main/resources/application.properties
index 76fdd97..7a8c71b 100644
--- a/kidgrow-config/src/main/resources/application.properties
+++ b/kidgrow-config/src/main/resources/application.properties
@@ -3,9 +3,9 @@
## \u4ECE\u6CE8\u518C\u4E2D\u5FC3\u5237\u65B0servelist\u7684\u65F6\u95F4 \u9ED8\u8BA430\u79D2\uFF0C\u5355\u4F4Dms
ribbon.ServerListRefreshInterval=15000
## \u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 \u9ED8\u8BA41\u79D2\uFF0C\u5355\u4F4Dms
-ribbon.ConnectTimeout=300000
+ribbon.ConnectTimeout=30000
## \u8BF7\u6C42\u5904\u7406\u7684\u8D85\u65F6\u65F6\u95F4 \u9ED8\u8BA41\u79D2\uFF0C\u5355\u4F4Dms
-ribbon.ReadTimeout=300000
+ribbon.ReadTimeout=30000
## \u5BF9\u6240\u6709\u64CD\u4F5C\u8BF7\u6C42\u90FD\u8FDB\u884C\u91CD\u8BD5,\u4E0D\u914D\u7F6E\u8FD9\u4E2AMaxAutoRetries\u4E0D\u8D77\u4F5C\u7528 \u9ED8\u8BA4false
#ribbon.OkToRetryOnAllOperations=true
## \u5BF9\u5F53\u524D\u5B9E\u4F8B\u7684\u91CD\u8BD5\u6B21\u6570 \u9ED8\u8BA40
@@ -24,10 +24,10 @@
feign.httpclient.enabled=false
feign.httpclient.max-connections=1000
feign.httpclient.max-connections-per-route=100
-feign.client.config.feignName.connectTimeout=300000
-feign.client.config.feignName.readTimeout=300000
-feign.client.config.default.connect-timeout=300000
-feign.client.config.default.read-timeout=300000
+feign.client.config.feignName.connectTimeout=30000
+feign.client.config.feignName.readTimeout=30000
+feign.client.config.default.connect-timeout=20000
+feign.client.config.default.read-timeout=20000
## \u5F00\u542FFeign\u8BF7\u6C42\u54CD\u5E94\u538B\u7F29
feign.compression.request.enabled=true
feign.compression.response.enabled=true
@@ -36,9 +36,9 @@
feign.compression.request.min-request-size=2048
# hystrix.command.default.execution.timeout.enabled: false
#\u8D85\u65F6\u65F6\u957F
-hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 300000
+hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000
#\u9694\u79BB\u7EA7\u522B
-hystrix.command.default.execution.isolation.strategy: SEMAPHORE
+hystrix.command.default.execution.isolation.strategy=SEMAPHORE
##### Redis\u914D\u7F6E
# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
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 8a1904b..f39bc9e 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
@@ -18,9 +18,11 @@
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;
+import javax.servlet.http.HttpServletRequest;
import java.util.*;
import static org.springframework.cloud.netflix.zuul.filters.support.FilterConstants.PRE_DECORATION_FILTER_ORDER;
@@ -64,7 +66,15 @@
@Override
public Object run() {
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) {
@@ -72,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());
@@ -91,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.isEmpty()){
+ 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;
@@ -128,6 +137,12 @@
public List<SysUserOrg> getSysUserOrg(Long str) {
//获取组织 Redis中获取
List<SysUserOrg> sysUserOrgs = JSON.parseArray(JSON.toJSONString(redisUtils.hget(RedisConstant.USER_ORGANIZATION, str.toString())), SysUserOrg.class);
+ System.out.println("3333333333333333333333");
+ System.out.println(sysUserOrgs.size());
+ for (SysUserOrg sysUserOrg : sysUserOrgs) {
+ System.out.println(sysUserOrg.getFromLevel());
+ }
+ System.out.println("444444444444444444");
if (sysUserOrgs == null || sysUserOrgs.size() <= 0) {
//在数据库查询
Map<String, Object> map = new HashMap<>();
diff --git a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java
index 124f17f..a84ccaf 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java
+++ b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java
@@ -19,6 +19,7 @@
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,7 +65,15 @@
@Override
public Object run() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
if (authentication != null && !(authentication instanceof AnonymousAuthenticationToken)) {
+ RequestContext currentContext = RequestContext.getCurrentContext();
+ //获取request对象
+ HttpServletRequest request = currentContext.getRequest();
+ SecurityContextImpl securityContextImpl = (SecurityContextImpl) request
+ .getSession().getAttribute("SPRING_SECURITY_CONTEXT");
+
+ authentication = securityContextImpl.getAuthentication();
Object principal = authentication.getPrincipal();
RequestContext ctx = RequestContext.getCurrentContext();
HttpServletRequest req = ctx.getRequest();
@@ -104,7 +113,15 @@
List<SysOrganization> organizations = (List<SysOrganization>) user.getOrganizations();
//将组织数据 存到header 里面
if (organizations != null&&organizations.size()>0) {
- organizations.sort((e1,e2)->e1.getOrgLevel().compareTo(e2.getOrgLevel()));
+ System.out.println(organizations.size());
+ System.out.println("111111111111111111111");
+ for (SysOrganization organization : organizations) {
+ if(organization!=null){
+ System.out.println(organization.getOrgLevel());
+ }
+ }
+ System.out.println("22222222222222");
+// organizations.sort((e1,e2)->e1.getOrgLevel().compareTo(e2.getOrgLevel()));
ctx.addZuulRequestHeader(SecurityConstants.USER_ORG_ID_HEADER,String.valueOf(organizations.get(0).getId()));
ctx.addZuulRequestHeader(SecurityConstants.USER_ORGS_HEADER,JSON.toJSONString(organizations));
}
--
Gitblit v1.8.0