From 6765787baa5e0b771d71f865c4deb776367410c4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 13 八月 2024 13:38:19 +0800
Subject: [PATCH] 修复bug
---
server/dmvisit_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java | 58 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java b/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
index 39f139d..c827e52 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
@@ -1,14 +1,21 @@
package com.doumee.config.Jwt;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.config.annotation.ErpLoginRequired;
import com.doumee.config.annotation.LoginRequired;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.redis.RedisUtil;
+import com.doumee.dao.business.model.Member;
import io.jsonwebtoken.JwtException;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.method.HandlerMethod;
@@ -19,6 +26,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
+import java.util.Objects;
@Configuration
public class WebMvcConfig implements WebMvcConfigurer {
@@ -26,6 +34,12 @@
@Autowired
private JdbcTemplate dao;
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
+ @Autowired
+ private RedisTemplate<String,Object> redisTemplate;
/**
* 娣诲姞鎷︽埅鍣�
@@ -47,7 +61,7 @@
// Method method = handlerMethod.getMethod();
// 鏈� @LoginRequired 娉ㄨВ锛岄渶瑕佺櫥褰曡璇�
- if (beanType.isAnnotationPresent(LoginRequired.class)) {
+ if (beanType.isAnnotationPresent(LoginRequired.class) || handlerMethod.hasMethodAnnotation(LoginRequired.class)) {
//鑾峰彇token
String token = request.getHeader(JwtTokenUtil.HEADER_KEY); // 浠� http 璇锋眰澶翠腑鍙栧嚭 token
if (StringUtils.isNotBlank(token)) {
@@ -55,20 +69,24 @@
} else {
throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
}
- }else if (handlerMethod.hasMethodAnnotation(LoginRequired.class)){
- //鑾峰彇token
- String token = request.getHeader(JwtTokenUtil.HEADER_KEY); // 浠� http 璇锋眰澶翠腑鍙栧嚭 token
- if (StringUtils.isNotBlank(token)) {
- checkLogin(request,response);
- } else {
- throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
+ } else if(beanType.isAnnotationPresent(ErpLoginRequired.class) || handlerMethod.hasMethodAnnotation(ErpLoginRequired.class)){
+ try {
+ //ERP 涓氬姟娉ㄨВ
+ String token = request.getHeader(JwtTokenUtil.HEADER_KEY);
+ String redisToken = RedisUtil.getObject(redisTemplate,Constants.RedisKeys.ERP_TOKEN,String.class);
+ if(StringUtils.isBlank(redisToken)||!token.equals(redisToken)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎺堟潈宸插け鏁�");
+ }
+ request.setAttribute(JwtTokenUtil.HEADER_KEY,token);
+ } catch (IllegalArgumentException | JwtException e) {
+ throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鎺堟潈宸插け鏁�");
}
// request.setAttribute("token", token);
}
return true;
}
};
- registry.addInterceptor(TokenInterceptor).addPathPatterns("/web/**");
+ registry.addInterceptor(TokenInterceptor).addPathPatterns("/web/**","/visitbiz/**");
}
@@ -82,22 +100,20 @@
throw new BusinessException(ResponseStatus.TOKEN_EXCEED_TIME.getCode(),"闀挎椂闂存湭鎿嶄綔,璇烽噸鏂扮櫥褰�");
}
//鑾峰彇璐﹀彿ID
- Integer memberId = JwtTokenUtil.getJwtPayLoad(token).getMemberId();
- Integer isDeleted = dao.queryForObject(" select COALESCE(DELETED,1) from `system_user` where id = ?", Integer.class, memberId);
- if(isDeleted== Constants.ONE){
+ String memberId = JwtTokenUtil.getJwtPayLoad(token).getMemberId();
+ Member member = dao.queryForObject(" select * from `member` where id = ? limit 1 ", new BeanPropertyRowMapper<>(Member.class),memberId );
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(member.getIsdeleted()== Constants.ONE){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
}
- Integer isForbidden = dao.queryForObject(" select COALESCE(STATUS,1) from `system_user` where id = ?", Integer.class, memberId);
- if(isForbidden== Constants.ONE){
+ if(member.getStatus() != Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
}
- Integer count = dao.queryForObject("select count(1) from `system_user` where id = ?", Integer.class, memberId);
- if (count != null && count > 0) {
- request.setAttribute(JwtTokenUtil.UserId_Name, memberId);
- return true;
- }else{
- throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鐢ㄦ埛淇℃伅鍑洪敊");
- }
+ request.setAttribute(JwtTokenUtil.UserId_Name, memberId);
+ request.setAttribute(JwtTokenUtil.MEMBER, member);
+ return true;
} catch (IllegalArgumentException | JwtException e) {
throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
}
--
Gitblit v1.9.3