From a07b70d86c5ed11150098d1bfb03ec3c1bdbea19 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 3 Apr 2024 18:39:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=8B=A6=E6=88=AA=20?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashierservice/auth/LoginFilter.java | 74 +++++------ .../config/AppApiMethodAspect.java | 122 +++++++++--------- 2 files changed, 98 insertions(+), 98 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java b/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java index 8960af6..083bda5 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java @@ -67,43 +67,43 @@ public class LoginFilter implements Filter { chain.doFilter(req, resp); return; } - String environment = request.getHeader("environment"); - //token校验目前只对app生效 - if (StringUtils.isNotBlank(environment) || !environment.equals("app")) { - chain.doFilter(req, resp); - return; - } - // 判断用户TOKEN是否存在 - String token = request.getHeader("token"); - if (StringUtils.isBlank(token)) { - Result result = new Result(CodeEnum.TOKEN_EXEIST); - String jsonString = JSONObject.toJSONString(result); - JSONObject jsonObject = JSONObject.parseObject(jsonString, JSONObject.class); - response.getWriter().print(jsonObject); - response.getWriter().flush();//流里边的缓存刷出 - return; - } - //获取当前登录人的用户id - String loginName = TokenUtil.parseParamFromToken(token, "userId").toString(); - //获取redis中的token - String message = redisUtil.getMessage(RedisCst.ONLINE_APP_USER.concat(loginName)); - if (StringUtils.isBlank(message)) { - Result result = new Result(CodeEnum.TOKEN_EXPIRED); - String jsonString = JSONObject.toJSONString(result); - JSONObject jsonObject = JSONObject.parseObject(jsonString, JSONObject.class); - response.getWriter().print(jsonObject); - response.getWriter().flush();//流里边的缓存刷出 - return; - } - String redisToken = JSON.parseObject(message).getString("token"); - if (!token.equals(redisToken)) { - Result result = new Result(CodeEnum.TOKEN_EXPIRED); - String jsonString = JSONObject.toJSONString(result); - JSONObject jsonObject = JSONObject.parseObject(jsonString, JSONObject.class); - response.getWriter().print(jsonObject); - response.getWriter().flush();//流里边的缓存刷出 - return; - } +// String environment = request.getHeader("environment"); +// //token校验目前只对app生效 +// if (StringUtils.isNotBlank(environment) || !environment.equals("app")) { +// chain.doFilter(req, resp); +// return; +// } +// // 判断用户TOKEN是否存在 +// String token = request.getHeader("token"); +// if (StringUtils.isBlank(token)) { +// Result result = new Result(CodeEnum.TOKEN_EXEIST); +// String jsonString = JSONObject.toJSONString(result); +// JSONObject jsonObject = JSONObject.parseObject(jsonString, JSONObject.class); +// response.getWriter().print(jsonObject); +// response.getWriter().flush();//流里边的缓存刷出 +// return; +// } +// //获取当前登录人的用户id +// String loginName = TokenUtil.parseParamFromToken(token, "userId").toString(); +// //获取redis中的token +// String message = redisUtil.getMessage(RedisCst.ONLINE_APP_USER.concat(loginName)); +// if (StringUtils.isBlank(message)) { +// Result result = new Result(CodeEnum.TOKEN_EXPIRED); +// String jsonString = JSONObject.toJSONString(result); +// JSONObject jsonObject = JSONObject.parseObject(jsonString, JSONObject.class); +// response.getWriter().print(jsonObject); +// response.getWriter().flush();//流里边的缓存刷出 +// return; +// } +// String redisToken = JSON.parseObject(message).getString("token"); +// if (!token.equals(redisToken)) { +// Result result = new Result(CodeEnum.TOKEN_EXPIRED); +// String jsonString = JSONObject.toJSONString(result); +// JSONObject jsonObject = JSONObject.parseObject(jsonString, JSONObject.class); +// response.getWriter().print(jsonObject); +// response.getWriter().flush();//流里边的缓存刷出 +// return; +// } chain.doFilter(req, resp); } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/config/AppApiMethodAspect.java b/src/main/java/com/chaozhanggui/system/cashierservice/config/AppApiMethodAspect.java index 5a08f2f..32afb42 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/config/AppApiMethodAspect.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/config/AppApiMethodAspect.java @@ -1,61 +1,61 @@ -package com.chaozhanggui.system.cashierservice.config; - -import com.chaozhanggui.system.cashierservice.redis.RedisCst; -import com.chaozhanggui.system.cashierservice.redis.RedisUtil; -import com.chaozhanggui.system.cashierservice.sign.CodeEnum; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Pointcut; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import com.chaozhanggui.system.cashierservice.sign.Result; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import javax.servlet.http.HttpServletRequest; -import java.util.Objects; - -/** - * 方法调用统一切面处理 - */ -@Aspect -@Component -@Slf4j -public class AppApiMethodAspect { - - @Autowired - RedisUtil redisUtil; - - @Pointcut("execution(public * (" + - "com.chaozhanggui.system.cashierservice.controller.* " + - ").*(..))") - public void pkg() { - } - - @Around("pkg()") - public Object around(ProceedingJoinPoint pjp) throws Throwable { - HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); - HttpServletRequest req = request; - //version：版本号 - //type: ios; android; - //environment:app;wx - String environment = req.getHeader("environment"); - if (StringUtils.isNotBlank(environment) && environment.equals("app")) { - String type = req.getHeader("type"); - String version = req.getHeader("version"); - //LDBL_APP_VERSION:ios:version 存在即需要强制更新 - String message = redisUtil.getMessage(RedisCst.LDBL_APP_VERSION + type + ":" + version); - if (StringUtils.isNotBlank(message)) { - return Result.success(CodeEnum.UPGRADE_REQUIRED, message); - } - } - - // 执行被拦截的方法 - Object result = pjp.proceed(); - return result; - - } -} +//package com.chaozhanggui.system.cashierservice.config; +// +//import com.chaozhanggui.system.cashierservice.redis.RedisCst; +//import com.chaozhanggui.system.cashierservice.redis.RedisUtil; +//import com.chaozhanggui.system.cashierservice.sign.CodeEnum; +//import lombok.extern.slf4j.Slf4j; +//import org.apache.commons.lang3.StringUtils; +//import org.aspectj.lang.ProceedingJoinPoint; +//import org.aspectj.lang.annotation.Around; +//import org.aspectj.lang.annotation.Aspect; +//import org.aspectj.lang.annotation.Pointcut; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Component; +//import com.chaozhanggui.system.cashierservice.sign.Result; +//import org.springframework.web.context.request.RequestContextHolder; +//import org.springframework.web.context.request.ServletRequestAttributes; +// +//import javax.servlet.http.HttpServletRequest; +//import java.util.Objects; +// +///** +// * 方法调用统一切面处理 +// */ +//@Aspect +//@Component +//@Slf4j +//public class AppApiMethodAspect { +// +// @Autowired +// RedisUtil redisUtil; +// +// @Pointcut("execution(public * (" + +// "com.chaozhanggui.system.cashierservice.controller.* " + +// ").*(..))") +// public void pkg() { +// } +// +// @Around("pkg()") +// public Object around(ProceedingJoinPoint pjp) throws Throwable { +// HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); +// HttpServletRequest req = request; +// //version：版本号 +// //type: ios; android; +// //environment:app;wx +//// String environment = req.getHeader("environment"); +//// if (StringUtils.isNotBlank(environment) && environment.equals("app")) { +//// String type = req.getHeader("type"); +//// String version = req.getHeader("version"); +//// //LDBL_APP_VERSION:ios:version 存在即需要强制更新 +//// String message = redisUtil.getMessage(RedisCst.LDBL_APP_VERSION + type + ":" + version); +//// if (StringUtils.isNotBlank(message)) { +//// return Result.success(CodeEnum.UPGRADE_REQUIRED, message); +//// } +//// } +// +// // 执行被拦截的方法 +// Object result = pjp.proceed(); +// return result; +// +// } +//}