From e094b18b33bde8fa171b83ea23315e8b65ea47e5 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 12 Feb 2026 15:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2-10' into 2-10
---
src/main/java/com/nq/common/interceptor/ApiUserAuthorityInterceptor.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/nq/common/interceptor/ApiUserAuthorityInterceptor.java b/src/main/java/com/nq/common/interceptor/ApiUserAuthorityInterceptor.java
index a1bc556..8a333ba 100644
--- a/src/main/java/com/nq/common/interceptor/ApiUserAuthorityInterceptor.java
+++ b/src/main/java/com/nq/common/interceptor/ApiUserAuthorityInterceptor.java
@@ -11,6 +11,7 @@
import com.nq.utils.PropertiesUtil;
import com.nq.utils.redis.JsonUtil;
import com.nq.utils.redis.RedisShardedPoolUtils;
+import com.nq.utils.translate.GoogleTranslateUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.redis.core.RedisTemplate;
@@ -53,7 +54,6 @@
}
String url = httpServletRequest.getRequestURI();
- log.info("拦截的url是{}",url);
if ("/user/upload.do".equals(url)) {
return true;
}
@@ -72,12 +72,29 @@
if ("/user/pay/flyPay.do".equals(url)) {
return true;
}
+ if ("/user/rechargeCallback.do".equals(url)) {//支付回调
+ return true;
+ }
+ if ("/user/rechargeCallbackTwo.do".equals(url)) {//支付回调
+ return true;
+ }
+ if ("/user/rechargeCallbackZero.do".equals(url)) {//支付回调
+ return true;
+ }
+ if ("/user/rechargeCallbackThree.do".equals(url)) {//支付回调
+ return true;
+ }
+ if ("/user/payoutCallback.do".equals(url)) {//代付回调
+ return true;
+ }
User currentUser = getCurrentUser(httpServletRequest);
+ GoogleTranslateUtil googleTranslateUtil = new GoogleTranslateUtil();
+ String lang = httpServletRequest.getHeader("lang");
if (null == currentUser) {
httpServletResponse.setCharacterEncoding("UTF-8");
httpServletResponse.setContentType("application/json;charset=UTF-8");
PrintWriter writer = httpServletResponse.getWriter();
- writer.print( new Gson().toJson(ServerResponse.createByErrorCodeMsg(401,"请登录")));
+ writer.print( new Gson().toJson(ServerResponse.createByErrorCodeMsg(401,googleTranslateUtil.translate("请登录",lang ))));
writer.flush();
writer.close();
return false;
@@ -182,20 +199,15 @@
public User getCurrentUser(HttpServletRequest request) {
String property = PropertiesUtil.getProperty("user.cookie.name");
- System.out.println(property);
String loginToken = request.getHeader(property);
if (loginToken == null) {
- System.out.println("loginToken is null");
return null;
}
- System.out.println(loginToken);
String userJson = RedisShardedPoolUtils.get(loginToken);
if (userJson == null||"".equals(userJson)){
- System.out.println("userJson is null");
return null;
}
-// System.out.println(userJson);
return (User) JsonUtil.string2Obj(userJson, User.class);
}
}
--
Gitblit v1.9.3