From e2fb4c7a50353a2960adf50bdb244266c2bfea55 Mon Sep 17 00:00:00 2001 From: dongzeliang <2746733890@qq.com> Date: Tue, 4 Jun 2024 20:35:13 +0800 Subject: [PATCH] =?UTF-8?q?feat():=20=E5=8D=87=E7=BA=A7SpringBoot3.2.5?= =?UTF-8?q?=E7=89=88=E6=9C=AC=EF=BC=8C=E4=BE=9D=E8=B5=96=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/auth/controller/TokenController.java | 2 +- cloud-common/cloud-common-core/pom.xml | 34 ++++++++++++-- .../muyu/common/core/feign/FeginConfig.java | 19 ++++++++ .../muyu/common/core/utils/ServletUtils.java | 20 ++++---- .../common/core/utils/file/FileUtils.java | 4 +- .../muyu/common/core/utils/ip/IpUtils.java | 2 +- .../muyu/common/core/utils/poi/ExcelUtil.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../com/muyu/common/log/aspect/LogAspect.java | 4 +- .../feign/FeignRequestInterceptor.java | 2 +- .../handler/GlobalExceptionHandler.java | 2 +- .../interceptor/HeaderInterceptor.java | 5 +- .../common/security/service/TokenService.java | 2 +- .../common/security/utils/SecurityUtils.java | 2 +- .../muyu/gen/controller/GenController.java | 2 +- .../main/resources/vm/java/controller.java.vm | 2 +- .../muyu/job/controller/SysJobController.java | 2 +- .../job/controller/SysJobLogController.java | 2 +- .../controller/SysConfigController.java | 2 +- .../controller/SysDictDataController.java | 2 +- .../controller/SysDictTypeController.java | 2 +- .../controller/SysLogininforController.java | 2 +- .../controller/SysOperlogController.java | 2 +- .../system/controller/SysPostController.java | 2 +- .../system/controller/SysRoleController.java | 2 +- .../system/controller/SysUserController.java | 2 +- .../monitor/config/WebSecurityConfigurer.java | 17 ++----- pom.xml | 47 ++++++++++++++----- skywalking/agent/config/agent.config | 2 +- 29 files changed, 123 insertions(+), 68 deletions(-) create mode 100644 cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/feign/FeginConfig.java diff --git a/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java b/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java index 960a13f..d870762 100644 --- a/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java +++ b/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * token 控制 diff --git a/cloud-common/cloud-common-core/pom.xml b/cloud-common/cloud-common-core/pom.xml index 8e132a4..d545fe5 100644 --- a/cloud-common/cloud-common-core/pom.xml +++ b/cloud-common/cloud-common-core/pom.xml @@ -76,6 +76,12 @@ spring-boot-starter-validation + + + javax.validation + validation-api + + com.fasterxml.jackson.core @@ -95,10 +101,10 @@ - + @@ -118,10 +124,28 @@ poi-ooxml - + + - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api + + + + + org.springframework.boot + spring-boot-starter-aop + + + + + + + + + + javax.annotation + javax.annotation-api diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/feign/FeginConfig.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/feign/FeginConfig.java new file mode 100644 index 0000000..77a12fe --- /dev/null +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/feign/FeginConfig.java @@ -0,0 +1,19 @@ +package com.muyu.common.core.feign; + +import feign.Contract; +import org.springframework.cloud.openfeign.support.SpringMvcContract; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class FeginConfig { +// @Bean +// public Contract feignConfiguration() { +// return new feign.Contract.Default(); +// } + + @Bean + public Contract feignConfiguration() { + return new SpringMvcContract(); + } +} diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java index ad91f23..9a50531 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java @@ -4,6 +4,10 @@ import com.alibaba.fastjson2.JSON; import com.muyu.common.core.constant.Constants; import com.muyu.common.core.domain.Result; import com.muyu.common.core.text.Convert; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; @@ -15,19 +19,13 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import reactor.core.publisher.Mono; -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; + import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Map; +import java.util.*; /** * 客户端工具类 @@ -109,7 +107,7 @@ public class ServletUtils { */ public static HttpServletRequest getRequest () { try { - return getRequestAttributes().getRequest(); + return Objects.requireNonNull(getRequestAttributes()).getRequest(); } catch (Exception e) { return null; } @@ -120,7 +118,7 @@ public class ServletUtils { */ public static HttpServletResponse getResponse () { try { - return getRequestAttributes().getResponse(); + return Objects.requireNonNull(getRequestAttributes()).getResponse(); } catch (Exception e) { return null; } @@ -130,7 +128,7 @@ public class ServletUtils { * 获取session */ public static HttpSession getSession () { - return getRequest().getSession(); + return Objects.requireNonNull(getRequest()).getSession(); } public static ServletRequestAttributes getRequestAttributes () { diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/file/FileUtils.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/file/FileUtils.java index 30f01b8..5766365 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/file/FileUtils.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/file/FileUtils.java @@ -3,8 +3,8 @@ package com.muyu.common.core.utils.file; import com.muyu.common.core.utils.StringUtils; import org.apache.commons.lang3.ArrayUtils; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.*; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java index f7ad9bf..e750583 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java @@ -3,7 +3,7 @@ package com.muyu.common.core.utils.ip; import com.muyu.common.core.utils.ServletUtils; import com.muyu.common.core.utils.StringUtils; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelUtil.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelUtil.java index 69795db..16f2c39 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelUtil.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelUtil.java @@ -24,7 +24,7 @@ import org.apache.poi.xssf.usermodel.XSSFDataValidation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Field; diff --git a/cloud-common/cloud-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-common/cloud-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 526ea23..17f73ec 100644 --- a/cloud-common/cloud-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/cloud-common/cloud-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1,2 @@ com.muyu.common.core.utils.SpringUtils +com.muyu.common.core.feign.FeginConfig diff --git a/cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java b/cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java index 4ecefc5..f82ffab 100644 --- a/cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java +++ b/cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java @@ -25,8 +25,8 @@ import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Collection; import java.util.Map; diff --git a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/feign/FeignRequestInterceptor.java b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/feign/FeignRequestInterceptor.java index 196765f..8ae21da 100644 --- a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/feign/FeignRequestInterceptor.java +++ b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/feign/FeignRequestInterceptor.java @@ -8,7 +8,7 @@ import feign.RequestInterceptor; import feign.RequestTemplate; import org.springframework.stereotype.Component; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Map; /** diff --git a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/handler/GlobalExceptionHandler.java b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/handler/GlobalExceptionHandler.java index 52b43af..170211c 100644 --- a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/handler/GlobalExceptionHandler.java +++ b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/handler/GlobalExceptionHandler.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 全局异常处理器 diff --git a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/interceptor/HeaderInterceptor.java b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/interceptor/HeaderInterceptor.java index fe1774c..0b1938d 100644 --- a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/interceptor/HeaderInterceptor.java +++ b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/interceptor/HeaderInterceptor.java @@ -10,8 +10,8 @@ import com.muyu.common.system.domain.LoginUser; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.AsyncHandlerInterceptor; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 自定义请求头拦截器，将Header数据封装到线程变量中方便获取 @@ -20,6 +20,7 @@ import javax.servlet.http.HttpServletResponse; * @author muyu */ public class HeaderInterceptor implements AsyncHandlerInterceptor { + @Override public boolean preHandle (HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { if (!(handler instanceof HandlerMethod)) { diff --git a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/service/TokenService.java b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/service/TokenService.java index b19697e..3955ddc 100644 --- a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/service/TokenService.java +++ b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/service/TokenService.java @@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; diff --git a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/utils/SecurityUtils.java b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/utils/SecurityUtils.java index e7f2a2c..6e3f92b 100644 --- a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/utils/SecurityUtils.java +++ b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/utils/SecurityUtils.java @@ -8,7 +8,7 @@ import com.muyu.common.core.utils.StringUtils; import com.muyu.common.system.domain.LoginUser; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 权限获取工具类 diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java index 7fe822a..92a2117 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java +++ b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java @@ -16,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.HashMap; import java.util.List; diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/controller.java.vm b/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/controller.java.vm index ed7a33a..8a487d0 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/controller.java.vm +++ b/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/controller.java.vm @@ -2,7 +2,7 @@ package ${packageName}.controller; import java.util.List; import java.io.IOException; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/controller/SysJobController.java b/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/controller/SysJobController.java index 692dee7..d01c4b8 100644 --- a/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/controller/SysJobController.java +++ b/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/controller/SysJobController.java @@ -19,7 +19,7 @@ import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/controller/SysJobLogController.java b/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/controller/SysJobLogController.java index a15bdfd..f26098b 100644 --- a/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/controller/SysJobLogController.java +++ b/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/controller/SysJobLogController.java @@ -12,7 +12,7 @@ import com.muyu.job.service.ISysJobLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java index fdabe7a..2e6e905 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java @@ -14,7 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.List; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java index 418ce2a..40f77c7 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java @@ -16,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java index 4d1325c..24038ef 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java @@ -14,7 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java index 7a4e5ac..8de2fbc 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java @@ -15,7 +15,7 @@ import com.muyu.system.service.SysLogininforService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java index add3ba5..35b1506 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java @@ -13,7 +13,7 @@ import com.muyu.system.service.SysOperLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java index f9da917..230ee8d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java @@ -14,7 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java index 63df7a9..b96268c 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java @@ -20,7 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java index 9811a0e..5417a01 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java @@ -24,7 +24,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; import java.util.Set; diff --git a/cloud-visual/cloud-visual-monitor/src/main/java/com/muyu/modules/monitor/config/WebSecurityConfigurer.java b/cloud-visual/cloud-visual-monitor/src/main/java/com/muyu/modules/monitor/config/WebSecurityConfigurer.java index 0b70196..d1bc9f4 100644 --- a/cloud-visual/cloud-visual-monitor/src/main/java/com/muyu/modules/monitor/config/WebSecurityConfigurer.java +++ b/cloud-visual/cloud-visual-monitor/src/main/java/com/muyu/modules/monitor/config/WebSecurityConfigurer.java @@ -27,22 +27,11 @@ public class WebSecurityConfigurer { successHandler.setDefaultTargetUrl(adminContextPath + "/"); return httpSecurity - .headers().frameOptions().disable() - .and().authorizeRequests() - .antMatchers(adminContextPath + "/assets/**" + .authorizeHttpRequests((authorize) -> authorize .anyRequest().authenticated()) + .securityMatcher(adminContextPath + "/assets/**" , adminContextPath + "/login" , adminContextPath + "/actuator/**" , adminContextPath + "/instances/**" - ).permitAll() - .anyRequest().authenticated() - .and() - .formLogin().loginPage(adminContextPath + "/login") - .successHandler(successHandler).and() - .logout().logoutUrl(adminContextPath + "/logout") - .and() - .httpBasic().and() - .csrf() - .disable() - .build(); + ).build(); } } diff --git a/pom.xml b/pom.xml index 73d04fd..0471904 100644 --- a/pom.xml +++ b/pom.xml @@ -17,9 +17,9 @@ UTF-8 UTF-8 17 - 2.7.13 - 2021.0.8 - 2021.0.5.0 + 3.2.5 + 2023.0.2 + 2022.0.0.0 2.7.10 3.0.0 1.6.2 @@ -37,11 +37,22 @@ 2.14.3 9.2.0 9.2.0 + 2.0.1.Final + 6.1.0-M2 + 1.3.2 + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + @@ -61,15 +72,6 @@ import - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - org.apache.skywalking @@ -84,6 +86,27 @@ ${apm-logback.version} + + + javax.validation + validation-api + ${validation.version} + + + + + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet.version} + + + + + javax.annotation + javax.annotation-api + ${javax.annotation.version} + + com.github.tobato diff --git a/skywalking/agent/config/agent.config b/skywalking/agent/config/agent.config index ef6cd2a..61db0af 100644 --- a/skywalking/agent/config/agent.config +++ b/skywalking/agent/config/agent.config @@ -199,7 +199,7 @@ plugin.httpclient.collect_http_params=${SW_PLUGIN_HTTPCLIENT_COLLECT_HTTP_PARAMS plugin.http.http_params_length_threshold=${SW_PLUGIN_HTTP_HTTP_PARAMS_LENGTH_THRESHOLD:1024} # When `include_http_headers` declares header names, this threshold controls the length limitation of all header values. use negative values to keep and send the complete headers. Note. this config item is added for the sake of performance. plugin.http.http_headers_length_threshold=${SW_PLUGIN_HTTP_HTTP_HEADERS_LENGTH_THRESHOLD:2048} -# Set the header names, which should be collected by the plugin. Header name must follow `javax.servlet.http` definition. Multiple names should be split by comma. +# Set the header names, which should be collected by the plugin. Header name must follow `jakarta.servlet.http` definition. Multiple names should be split by comma. plugin.http.include_http_headers=${SW_PLUGIN_HTTP_INCLUDE_HTTP_HEADERS:} # This config item controls that whether the Feign plugin should collect the http body of the request. plugin.feign.collect_request_body=${SW_PLUGIN_FEIGN_COLLECT_REQUEST_BODY:false}