From 2f10692d098af93490c46aa561a353fc5870c789 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Wed, 31 Mar 2021 18:51:22 +0800
Subject: [PATCH] 优化修复扣费成功后的日志代码，预防bug出现
---
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/OrganizationFilter.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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 f39bc9e..630521a 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
@@ -9,6 +9,7 @@
import com.kidgrow.redis.util.RedisUtils;
import com.kidgrow.zuul.feign.SysOrganizationService;
import com.kidgrow.zuul.feign.SysUserOrgService;
+import com.kidgrow.zuul.service.TokenService;
import com.netflix.zuul.ZuulFilter;
import com.netflix.zuul.context.RequestContext;
import lombok.SneakyThrows;
@@ -30,7 +31,7 @@
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
*
- * @Description: 将认证用户的相关信息放入header中, 后端服务可以直接读取使用 包含了----组织的拦截---<br>
+ * @Description: 将认证用户的相关信息放入header中, 后端服务可以直接读取使用 包含了----组织的拦截--- 如果被拦截，将清除token<br>
* @Project: <br>
* @CreateDate: Created in 2020/2/21 10:12 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
@@ -59,8 +60,8 @@
private SysUserOrgService sysUserOrgService;
@Autowired
private SysOrganizationService sysOrganizationService;
-
- private final String CLIENTID = "webApp";//运营端
+ @Autowired
+ private TokenService tokenService;
@SneakyThrows
@Override
@@ -80,14 +81,14 @@
if (principal instanceof SysUser) {
//运营端进行
OAuth2Authentication oauth2Authentication = (OAuth2Authentication) authentication;
- String clientId = oauth2Authentication.getOAuth2Request().getClientId();
-// if (CLIENTID.equals(clientId)) {
SysUser user = (SysUser) authentication.getPrincipal();
/**
* 将组织中为空的拦截
*/
List<SysUserOrg> sysUserOrgs = this.getSysUserOrg(user.getId());
if (sysUserOrgs == null || sysUserOrgs.isEmpty()) {
+ //退出的操作
+ this.tokenService.logout(request);
ctx.setSendZuulResponse(false);
ctx.addZuulResponseHeader("Content-Type", "application/json;charset=UTF-8");
// String str = new String("您的组织已经被禁用，请联系管理员".getBytes("utf-8"), "utf-8");
@@ -108,12 +109,16 @@
map.put("id", sysUserOrg.getOrgId());
List<SysOrganization> sysOrganizations = JSON.parseArray(JSON.toJSONString(sysOrganizationService.getListByMap(map).getData()), SysOrganization.class);
if (sysOrganizations == null || sysOrganizations.size() <= 0) {
+ //退出的操作
+ this.tokenService.logout(request);
ctx.setSendZuulResponse(false);
ctx.addZuulResponseHeader("Content-Type", "application/json;charset=UTF-8");
ctx.setResponseBody(JSON.toJSONString(ResultBody.fail(1000, "您的组织已经被禁用，请联系管理员")));
} else {
for (SysOrganization sysOrganization : sysOrganizations) {
if (!sysOrganization.getEnabled() || sysOrganization.getIsDel()) {
+ //退出的操作
+ this.tokenService.logout(request);
ctx.setSendZuulResponse(false);
ctx.addZuulResponseHeader("Content-Type", "application/json;charset=UTF-8");
ctx.setResponseBody(JSON.toJSONString(ResultBody.fail(1000, "您的组织已经被禁用，请联系管理员")));
@@ -128,6 +133,8 @@
return null;
}
+
+
/**
* 通过userID 获取组织的关系
*
@@ -137,12 +144,6 @@
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<>();
--
Gitblit v1.8.0