From c50cd84af042a56c63f491430eea1a478a6bc454 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Thu, 29 May 2025 12:37:31 +0800 Subject: [PATCH] =?UTF-8?q?jvm21=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 27 +++++++++++-------- .../aspectj/RequestParameterAspectj.java | 4 +-- .../extern/LyCompatibleController.java | 2 +- .../controller/mobile/AppWxPayController.java | 2 +- .../controller/proxy/ProxyController.java | 4 +-- .../basic/controller/viid/ViidController.java | 2 +- .../exception/CustomExceptionHandle.java | 2 +- .../basic/interceptor/AuthInterceptor.java | 15 +++++------ .../ycwl/basic/pay/adapter/IPayAdapter.java | 2 +- .../basic/pay/adapter/WxMpPayAdapter.java | 4 +-- .../basic/service/mobile/WxPayService.java | 2 +- .../service/mobile/impl/WxPayServiceImpl.java | 2 +- .../stats/controller/TraceController.java | 4 +-- .../stats/interceptor/StatsInterceptor.java | 4 +-- .../java/com/ycwl/basic/utils/IpUtils.java | 2 +- .../com/ycwl/basic/utils/JwtTokenUtil.java | 4 +-- src/main/resources/application-dev.yml | 12 ++++----- src/main/resources/application-prod.yml | 14 +++++----- 18 files changed, 56 insertions(+), 52 deletions(-) diff --git a/pom.xml b/pom.xml index 79815d8..b47b5c5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,33 +5,38 @@ org.springframework.boot spring-boot-starter-parent - 2.7.18 + 3.1.4 com.ycwl - basic + basic21 0.0.1-SNAPSHOT liuying 流影 - 8 - 8 - 8 - 3.4.0 + 21 + 21 + 21 5.8.24 8.0.33 1.2.83 2.0.7 5.3.1 - 9.0.102 true + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + provided + com.github.wechatpay-apiv3 @@ -85,7 +90,7 @@ com.baomidou mybatis-plus-boot-starter - ${mybatisplus.boot.starter.version} + 3.5.5 @@ -167,19 +172,19 @@ com.amazonaws aws-java-sdk-core - 1.11.24 + 1.12.773 com.amazonaws aws-java-sdk-s3 - 1.11.24 + 1.12.773 com.aliyun aliyun-java-sdk-core - 4.6.1 + 4.6.4 com.aliyun diff --git a/src/main/java/com/ycwl/basic/aspectj/RequestParameterAspectj.java b/src/main/java/com/ycwl/basic/aspectj/RequestParameterAspectj.java index 92b8fc1..1da21f2 100644 --- a/src/main/java/com/ycwl/basic/aspectj/RequestParameterAspectj.java +++ b/src/main/java/com/ycwl/basic/aspectj/RequestParameterAspectj.java @@ -13,8 +13,8 @@ import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.lang.reflect.Method; import java.util.Enumeration; import java.util.HashMap; diff --git a/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java b/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java index 471ab8c..82fdaba 100644 --- a/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java +++ b/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java @@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Collections; import java.util.Date; import java.util.Enumeration; diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppWxPayController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppWxPayController.java index 1d21f4a..b3f1573 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppWxPayController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppWxPayController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.security.GeneralSecurityException; diff --git a/src/main/java/com/ycwl/basic/controller/proxy/ProxyController.java b/src/main/java/com/ycwl/basic/controller/proxy/ProxyController.java index 64e18bd..87a0c95 100644 --- a/src/main/java/com/ycwl/basic/controller/proxy/ProxyController.java +++ b/src/main/java/com/ycwl/basic/controller/proxy/ProxyController.java @@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; diff --git a/src/main/java/com/ycwl/basic/controller/viid/ViidController.java b/src/main/java/com/ycwl/basic/controller/viid/ViidController.java index 72356e1..13538f4 100644 --- a/src/main/java/com/ycwl/basic/controller/viid/ViidController.java +++ b/src/main/java/com/ycwl/basic/controller/viid/ViidController.java @@ -52,7 +52,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/src/main/java/com/ycwl/basic/exception/CustomExceptionHandle.java b/src/main/java/com/ycwl/basic/exception/CustomExceptionHandle.java index 9da3191..04f3b5d 100644 --- a/src/main/java/com/ycwl/basic/exception/CustomExceptionHandle.java +++ b/src/main/java/com/ycwl/basic/exception/CustomExceptionHandle.java @@ -10,7 +10,7 @@ import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/src/main/java/com/ycwl/basic/interceptor/AuthInterceptor.java b/src/main/java/com/ycwl/basic/interceptor/AuthInterceptor.java index d10bbec..7460cc8 100644 --- a/src/main/java/com/ycwl/basic/interceptor/AuthInterceptor.java +++ b/src/main/java/com/ycwl/basic/interceptor/AuthInterceptor.java @@ -15,18 +15,18 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; +import org.springframework.web.servlet.HandlerInterceptor; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.util.List; @Slf4j @Component -public class AuthInterceptor extends HandlerInterceptorAdapter { +public class AuthInterceptor implements HandlerInterceptor { @Autowired RedisTemplate redisTemplate; @@ -34,7 +34,7 @@ public class AuthInterceptor extends HandlerInterceptorAdapter { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { if (!(handler instanceof HandlerMethod)) { - return super.preHandle(request, response, handler); + return true; } String requestURI = request.getRequestURI(); @@ -45,7 +45,7 @@ public class AuthInterceptor extends HandlerInterceptorAdapter { IgnoreToken ignoreMethodToken = handlerMethod.getMethodAnnotation(IgnoreToken.class); if (ignoreClassToken != null || ignoreMethodToken != null) { // 放行 - return super.preHandle(request, response, handler); + return true; } // 放行白名单 @@ -113,7 +113,6 @@ public class AuthInterceptor extends HandlerInterceptorAdapter { @Override public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { BaseContextHandler.remove(); - super.afterCompletion(request, response, handler, ex); } public String getToken(HttpServletRequest request) { diff --git a/src/main/java/com/ycwl/basic/pay/adapter/IPayAdapter.java b/src/main/java/com/ycwl/basic/pay/adapter/IPayAdapter.java index ce6758c..d4b536a 100644 --- a/src/main/java/com/ycwl/basic/pay/adapter/IPayAdapter.java +++ b/src/main/java/com/ycwl/basic/pay/adapter/IPayAdapter.java @@ -9,7 +9,7 @@ import com.ycwl.basic.pay.entity.RefundResponse; import com.ycwl.basic.pay.entity.RefundOrderRequest; import com.ycwl.basic.pay.entity.RefundOrderResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.Map; diff --git a/src/main/java/com/ycwl/basic/pay/adapter/WxMpPayAdapter.java b/src/main/java/com/ycwl/basic/pay/adapter/WxMpPayAdapter.java index 0e35f4e..a84beb7 100644 --- a/src/main/java/com/ycwl/basic/pay/adapter/WxMpPayAdapter.java +++ b/src/main/java/com/ycwl/basic/pay/adapter/WxMpPayAdapter.java @@ -34,8 +34,8 @@ import com.ycwl.basic.pay.exceptions.PayWrongConfigException; import org.apache.commons.lang3.StringUtils; import org.springframework.util.Base64Utils; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.HttpServletRequest; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; diff --git a/src/main/java/com/ycwl/basic/service/mobile/WxPayService.java b/src/main/java/com/ycwl/basic/service/mobile/WxPayService.java index d70fb6d..ffab9e0 100644 --- a/src/main/java/com/ycwl/basic/service/mobile/WxPayService.java +++ b/src/main/java/com/ycwl/basic/service/mobile/WxPayService.java @@ -3,7 +3,7 @@ package com.ycwl.basic.service.mobile; import com.ycwl.basic.model.wx.WXPayOrderReqVO; import com.ycwl.basic.model.wx.WxchatCallbackSuccessData; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.security.GeneralSecurityException; import java.util.Map; diff --git a/src/main/java/com/ycwl/basic/service/mobile/impl/WxPayServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/WxPayServiceImpl.java index 0c09070..3dd91da 100644 --- a/src/main/java/com/ycwl/basic/service/mobile/impl/WxPayServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/mobile/impl/WxPayServiceImpl.java @@ -32,7 +32,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/main/java/com/ycwl/basic/stats/controller/TraceController.java b/src/main/java/com/ycwl/basic/stats/controller/TraceController.java index a61395c..311c506 100644 --- a/src/main/java/com/ycwl/basic/stats/controller/TraceController.java +++ b/src/main/java/com/ycwl/basic/stats/controller/TraceController.java @@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @RestController @RequestMapping("/trace/v1") diff --git a/src/main/java/com/ycwl/basic/stats/interceptor/StatsInterceptor.java b/src/main/java/com/ycwl/basic/stats/interceptor/StatsInterceptor.java index 6976f8a..51e3f0c 100644 --- a/src/main/java/com/ycwl/basic/stats/interceptor/StatsInterceptor.java +++ b/src/main/java/com/ycwl/basic/stats/interceptor/StatsInterceptor.java @@ -11,8 +11,8 @@ import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Date; import java.util.HashSet; diff --git a/src/main/java/com/ycwl/basic/utils/IpUtils.java b/src/main/java/com/ycwl/basic/utils/IpUtils.java index b4dc6a7..6be8a4a 100644 --- a/src/main/java/com/ycwl/basic/utils/IpUtils.java +++ b/src/main/java/com/ycwl/basic/utils/IpUtils.java @@ -2,7 +2,7 @@ package com.ycwl.basic.utils; import org.apache.commons.lang3.StringUtils; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/src/main/java/com/ycwl/basic/utils/JwtTokenUtil.java b/src/main/java/com/ycwl/basic/utils/JwtTokenUtil.java index 01fb8c8..4a829d6 100644 --- a/src/main/java/com/ycwl/basic/utils/JwtTokenUtil.java +++ b/src/main/java/com/ycwl/basic/utils/JwtTokenUtil.java @@ -10,8 +10,8 @@ import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; import java.time.LocalDateTime; import java.util.Map; import java.util.Objects; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index ca36fb6..ea66caf 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -25,12 +25,6 @@ spring: jackson: date-format: "yyyy-MM-dd HH:mm:ss" time-zone: GMT+8 - redis: - host: 10.59.3.218 - port: 6379 - # 密码过于复杂需要使用''引起来，要不可能导致项目无法启动，因为无法识别特殊字符 - password: ZhEnTuAi - timeout: 40000 # 配置用户头像存放静态资源文件夹 # 配置请求文件大小 servlet: @@ -40,6 +34,12 @@ spring: web: resources: static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/ + data: + redis: + host: 10.59.3.218 + port: 6379 + password: ZhEnTuAi + timeout: 40000 # MyBatis mybatis-plus: diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index e91b6fc..cbd8ca3 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,5 +1,5 @@ server: - port: 8030 + port: 8031 spring: application: @@ -29,12 +29,6 @@ spring: jackson: date-format: "yyyy-MM-dd HH:mm:ss" time-zone: GMT+8 - redis: - host: 127.0.0.1 - port: 6379 - # 密码过于复杂需要使用''引起来，要不可能导致项目无法启动，因为无法识别特殊字符 - password: '' - timeout: 2000 # 配置用户头像存放静态资源文件夹 # 配置请求文件大小 servlet: @@ -44,6 +38,12 @@ spring: web: resources: static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/ + data: + redis: + host: 127.0.0.1 + port: 6379 + password: '' + timeout: 5000 # MyBatis mybatis-plus: