suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
zhangchenbiao
2023-06-08 20:38:10 +08:00
parent 9e749062d0
commit 027860db2f
4 changed files with 1 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java
View File

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.response.ResponseResult;
import com.cool.store.context.UserContext;
import com.cool.store.utils.DataSourceHelper;
import com.cool.store.utils.RedisUtilPool;
import com.cool.store.context.CurrentUser;
import com.google.common.collect.Lists;
@@ -97,7 +96,7 @@ public class TokenValidateFilter implements Filter {
ResponseResult.fail(ErrorCodeEnum.ACCESS_TOKEN_INVALID)));
return;
}
log.info("url:{}, access_token:{}, userId:{}, username:{}, enterpriseId:{}", uri, accessToken, currentUser.getUserId(), currentUser.getName(), currentUser.getEnterpriseId());
log.info("url:{}, access_token:{}, userId:{}, username:{}", uri, accessToken, currentUser.getUserId(), currentUser.getName());
}
if(StringUtils.isBlank(userStr) && !isInWhiteList){
response.setStatus(HttpStatus.OK.value());
@@ -107,7 +106,6 @@ public class TokenValidateFilter implements Filter {
}
try {
UserContext.setUser(userStr);
DataSourceHelper.changeToMy();
filterChain.doFilter(servletRequest, servletResponse);
} finally {
UserContext.removeUser();

8
coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java
View File

@@ -1,18 +1,10 @@
package com.cool.store.controller;
import com.cool.store.dto.enterprise.EnterpriseUserDTO;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.EnterpriseUserService;
import com.cool.store.utils.DataSourceHelper;
import com.cool.store.vo.buser.EnterpriseUserPageVO;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* @author zhangchenbiao