From dea160a7b2d69e1b46edc936c9a697048bbb507a Mon Sep 17 00:00:00 2001 From: dlj Date: Thu, 16 Mar 2023 13:01:13 +0800 Subject: [PATCH 1/8] chore: Spring Boot 2.7.8 => 3.0.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.Spring Boot 2.7.8 => 3.0.3 2.Knife4j 适配 Spring Boot 3.x 3.ServletUtil => JakartaServletUtil 4.javax.* => jakarta.* --- continew-admin-common/pom.xml | 7 +-- .../cnadmin/common/base/BaseController.java | 18 ++++---- .../cnadmin/common/base/BaseRequest.java | 2 +- .../cnadmin/common/base/BaseService.java | 2 +- .../cnadmin/common/base/BaseServiceImpl.java | 2 +- .../CrudRequestMappingHandlerMapping.java | 10 ++++- .../handler/GlobalExceptionHandler.java | 6 +-- .../cnadmin/common/model/query/PageQuery.java | 4 +- .../cnadmin/common/model/query/SortQuery.java | 2 +- .../model/request/UpdateStatusRequest.java | 2 +- .../cnadmin/common/util/ExcelUtils.java | 2 +- .../cnadmin/common/util/MailUtils.java | 4 +- .../cnadmin/common/util/ServletUtils.java | 4 +- .../common/util/helper/LoginHelper.java | 6 +-- .../common/util/helper/QueryHelper.java | 2 +- .../cnadmin/monitor/filter/LogFilter.java | 8 ++-- .../monitor/interceptor/LogInterceptor.java | 16 +++---- .../monitor/model/query/LoginLogQuery.java | 2 +- .../monitor/model/query/OnlineUserQuery.java | 2 +- .../model/query/OperationLogQuery.java | 2 +- .../monitor/model/query/SystemLogQuery.java | 2 +- .../config/satoken/SaTokenConfiguration.java | 1 + .../{ => properties}/SecurityProperties.java | 2 +- .../auth/model/request/LoginRequest.java | 2 +- .../cnadmin/system/model/query/DeptQuery.java | 2 +- .../cnadmin/system/model/query/MenuQuery.java | 2 +- .../cnadmin/system/model/query/RoleQuery.java | 2 +- .../cnadmin/system/model/query/UserQuery.java | 2 +- .../system/model/request/DeptRequest.java | 4 +- .../system/model/request/MenuRequest.java | 4 +- .../system/model/request/RoleRequest.java | 4 +- .../model/request/UpdateBasicInfoRequest.java | 4 +- .../model/request/UpdateEmailRequest.java | 4 +- .../model/request/UpdatePasswordRequest.java | 2 +- .../model/request/UpdateUserRoleRequest.java | 2 +- .../system/model/request/UserRequest.java | 2 +- .../system/service/impl/DeptServiceImpl.java | 2 +- .../system/service/impl/UserServiceImpl.java | 2 +- .../controller/common/CaptchaController.java | 6 +-- .../system/UserCenterController.java | 2 +- .../controller/system/UserController.java | 2 +- .../src/main/resources/application-dev.yml | 29 ++++++------ .../src/main/resources/application.yml | 19 ++++++++ pom.xml | 45 +++++++++++++------ 44 files changed, 146 insertions(+), 105 deletions(-) rename continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/{ => properties}/SecurityProperties.java (94%) diff --git a/continew-admin-common/pom.xml b/continew-admin-common/pom.xml index dc6ac7b5..e77f42b1 100644 --- a/continew-admin-common/pom.xml +++ b/continew-admin-common/pom.xml @@ -130,12 +130,7 @@ limitations under the License. com.github.xiaoymin - knife4j-openapi3-spring-boot-starter - - - - org.springdoc - springdoc-openapi-ui + knife4j-openapi3-jakarta-spring-boot-starter diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java index 621eeb1d..5d0b66e8 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java @@ -18,7 +18,7 @@ package top.charles7c.cnadmin.common.base; import java.util.List; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import lombok.NoArgsConstructor; @@ -75,7 +75,7 @@ public abstract class BaseController, V, D, Q, @Operation(summary = "分页查询列表") @ResponseBody @GetMapping - protected R> page(@Validated Q query, @Validated PageQuery pageQuery) { + public R> page(@Validated Q query, @Validated PageQuery pageQuery) { this.checkPermission("list"); PageDataVO pageDataVO = baseService.page(query, pageQuery); return R.ok(pageDataVO); @@ -93,7 +93,7 @@ public abstract class BaseController, V, D, Q, @Operation(summary = "查询树列表") @ResponseBody @GetMapping("/tree") - protected R>> tree(@Validated Q query, @Validated SortQuery sortQuery) { + public R>> tree(@Validated Q query, @Validated SortQuery sortQuery) { this.checkPermission("list"); List> list = baseService.tree(query, sortQuery, false); return R.ok(list); @@ -111,7 +111,7 @@ public abstract class BaseController, V, D, Q, @Operation(summary = "查询列表") @ResponseBody @GetMapping("/list") - protected R> list(@Validated Q query, @Validated SortQuery sortQuery) { + public R> list(@Validated Q query, @Validated SortQuery sortQuery) { this.checkPermission("list"); List list = baseService.list(query, sortQuery); return R.ok(list); @@ -128,7 +128,7 @@ public abstract class BaseController, V, D, Q, @Parameter(name = "id", description = "ID", in = ParameterIn.PATH) @ResponseBody @GetMapping("/{id}") - protected R get(@PathVariable Long id) { + public R get(@PathVariable Long id) { this.checkPermission("list"); D detail = baseService.get(id); return R.ok(detail); @@ -144,7 +144,7 @@ public abstract class BaseController, V, D, Q, @Operation(summary = "新增数据") @ResponseBody @PostMapping - protected R add(@Validated @RequestBody C request) { + public R add(@Validated @RequestBody C request) { this.checkPermission("add"); Long id = baseService.add(request); return R.ok("新增成功", id); @@ -162,7 +162,7 @@ public abstract class BaseController, V, D, Q, @Operation(summary = "修改数据") @ResponseBody @PutMapping("/{id}") - protected R update(@Validated @RequestBody C request, @PathVariable Long id) { + public R update(@Validated @RequestBody C request, @PathVariable Long id) { this.checkPermission("update"); baseService.update(request, id); return R.ok("修改成功"); @@ -179,7 +179,7 @@ public abstract class BaseController, V, D, Q, @Parameter(name = "ids", description = "ID 列表", in = ParameterIn.PATH) @ResponseBody @DeleteMapping("/{ids}") - protected R delete(@PathVariable List ids) { + public R delete(@PathVariable List ids) { this.checkPermission("delete"); baseService.delete(ids); return R.ok("删除成功"); @@ -197,7 +197,7 @@ public abstract class BaseController, V, D, Q, */ @Operation(summary = "导出数据") @GetMapping("/export") - protected void export(@Validated Q query, @Validated SortQuery sortQuery, HttpServletResponse response) { + public void export(@Validated Q query, @Validated SortQuery sortQuery, HttpServletResponse response) { this.checkPermission("export"); baseService.export(query, sortQuery, response); } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseRequest.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseRequest.java index 86575396..d423adc1 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseRequest.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseRequest.java @@ -18,7 +18,7 @@ package top.charles7c.cnadmin.common.base; import java.io.Serializable; -import javax.validation.groups.Default; +import jakarta.validation.groups.Default; import lombok.Data; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseService.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseService.java index 913ca36c..4703122f 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseService.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseService.java @@ -18,7 +18,7 @@ package top.charles7c.cnadmin.common.base; import java.util.List; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import cn.hutool.core.lang.tree.Tree; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java index c7d31051..bdb66148 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java @@ -20,7 +20,7 @@ import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/CrudRequestMappingHandlerMapping.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/CrudRequestMappingHandlerMapping.java index 4755cf2c..1f3dbd02 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/CrudRequestMappingHandlerMapping.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/CrudRequestMappingHandlerMapping.java @@ -23,6 +23,7 @@ import java.lang.reflect.Method; import org.springframework.lang.NonNull; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; +import org.springframework.web.util.pattern.PathPatternParser; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; @@ -55,7 +56,14 @@ public class CrudRequestMappingHandlerMapping extends RequestMappingHandlerMappi // 拼接路径前缀（合并了 @RequestMapping 的部分能力） String pathPrefix = crudRequestMapping.value(); if (StrUtil.isNotBlank(pathPrefix)) { - requestMappingInfo = RequestMappingInfo.paths(pathPrefix).build().combine(requestMappingInfo); + /** + * 问题：RequestMappingInfo.paths(pathPrefix)返回的RequestMappingInfo对象里pathPatternsCondition = null + * 导致combine()方法抛出断言异常！ + * 修复: 创建options对象, 并设置PatternParser + */ + RequestMappingInfo.BuilderConfiguration options = new RequestMappingInfo.BuilderConfiguration(); + options.setPatternParser(PathPatternParser.defaultInstance); + requestMappingInfo = RequestMappingInfo.paths(pathPrefix).options(options).build().combine(requestMappingInfo); } // 过滤 API diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalExceptionHandler.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalExceptionHandler.java index f0184927..1b6a4962 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalExceptionHandler.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalExceptionHandler.java @@ -18,9 +18,9 @@ package top.charles7c.cnadmin.common.handler; import java.util.Objects; -import javax.servlet.http.HttpServletRequest; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; import lombok.extern.slf4j.Slf4j; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/PageQuery.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/PageQuery.java index 2fc8f17d..5ec5fe7f 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/PageQuery.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/PageQuery.java @@ -16,7 +16,7 @@ package top.charles7c.cnadmin.common.model.query; -import javax.validation.constraints.Min; +import jakarta.validation.constraints.Min; import lombok.Data; import lombok.NoArgsConstructor; @@ -24,7 +24,7 @@ import lombok.NoArgsConstructor; import io.swagger.v3.oas.annotations.media.Schema; import org.hibernate.validator.constraints.Range; -import org.springdoc.api.annotations.ParameterObject; +import org.springdoc.core.annotations.ParameterObject; import org.springframework.data.domain.Sort; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java index f1e98f11..74ee8128 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java @@ -24,7 +24,7 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; +import org.springdoc.core.annotations.ParameterObject; import org.springframework.data.domain.Sort; import cn.hutool.core.util.ArrayUtil; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/request/UpdateStatusRequest.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/request/UpdateStatusRequest.java index d359507b..4a160f15 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/request/UpdateStatusRequest.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/request/UpdateStatusRequest.java @@ -18,7 +18,7 @@ package top.charles7c.cnadmin.common.model.request; import java.io.Serializable; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExcelUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExcelUtils.java index 072ed47f..40288700 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExcelUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExcelUtils.java @@ -19,7 +19,7 @@ package top.charles7c.cnadmin.common.util; import java.util.Date; import java.util.List; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java index 00a4e525..f276b290 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java @@ -22,8 +22,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import lombok.AccessLevel; import lombok.Data; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ServletUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ServletUtils.java index 6f1b8811..5ecadeb2 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ServletUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ServletUtils.java @@ -18,8 +18,8 @@ package top.charles7c.cnadmin.common.util; import java.util.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java index 049b3b8a..34d3b648 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java @@ -18,14 +18,14 @@ package top.charles7c.cnadmin.common.util.helper; import java.time.LocalDateTime; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import lombok.AccessLevel; import lombok.NoArgsConstructor; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.stp.StpUtil; -import cn.hutool.extra.servlet.ServletUtil; +import cn.hutool.extra.servlet.JakartaServletUtil; import top.charles7c.cnadmin.common.constant.CacheConsts; import top.charles7c.cnadmin.common.model.dto.LogContext; @@ -57,7 +57,7 @@ public class LoginHelper { // 记录登录信息 HttpServletRequest request = ServletUtils.getRequest(); - loginUser.setClientIp(ServletUtil.getClientIP(request)); + loginUser.setClientIp(JakartaServletUtil.getClientIP(request)); loginUser.setLocation(IpUtils.getCityInfo(loginUser.getClientIp())); loginUser.setBrowser(ServletUtils.getBrowser(request)); LogContext logContext = LogContextHolder.get(); diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java index e6e157c2..4458cc67 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java @@ -82,7 +82,7 @@ public class QueryHelper { * 查询数据类型 */ private static void buildQuery(Q query, Field field, QueryWrapper queryWrapper) { - boolean accessible = field.isAccessible(); + boolean accessible = field.canAccess(null); try { field.setAccessible(true); // 没有 @Query，直接返回 diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/filter/LogFilter.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/filter/LogFilter.java index 7517ddc1..89554997 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/filter/LogFilter.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/filter/LogFilter.java @@ -19,10 +19,10 @@ package top.charles7c.cnadmin.monitor.filter; import java.io.IOException; import java.util.Objects; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.core.Ordered; import org.springframework.lang.NonNull; diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java index 25bacc0e..4204f680 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java @@ -19,8 +19,8 @@ package top.charles7c.cnadmin.monitor.interceptor; import java.time.LocalDateTime; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -41,7 +41,7 @@ import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.extra.servlet.ServletUtil; +import cn.hutool.extra.servlet.JakartaServletUtil; import cn.hutool.extra.spring.SpringUtil; import cn.hutool.http.HttpStatus; import cn.hutool.json.JSONUtil; @@ -215,13 +215,13 @@ public class LogInterceptor implements HandlerInterceptor { logDO.setRequestUrl(StrUtil.isBlank(request.getQueryString()) ? request.getRequestURL().toString() : request.getRequestURL().append("?").append(request.getQueryString()).toString()); logDO.setRequestMethod(request.getMethod()); - logDO.setRequestHeaders(this.desensitize(ServletUtil.getHeaderMap(request))); + logDO.setRequestHeaders(this.desensitize(JakartaServletUtil.getHeaderMap(request))); String requestBody = this.getRequestBody(request); if (StrUtil.isNotBlank(requestBody)) { logDO.setRequestBody(this.desensitize( - JSONUtil.isTypeJSON(requestBody) ? JSONUtil.parseObj(requestBody) : ServletUtil.getParamMap(request))); + JSONUtil.isTypeJSON(requestBody) ? JSONUtil.parseObj(requestBody) : JakartaServletUtil.getParamMap(request))); } - logDO.setClientIp(ServletUtil.getClientIP(request)); + logDO.setClientIp(JakartaServletUtil.getClientIP(request)); logDO.setLocation(IpUtils.getCityInfo(logDO.getClientIp())); logDO.setBrowser(ServletUtils.getBrowser(request)); logDO.setCreateUser(ObjectUtil.defaultIfNull(logDO.getCreateUser(), LoginHelper.getUserId())); @@ -243,7 +243,7 @@ public class LogInterceptor implements HandlerInterceptor { private void logResponse(LogDO logDO, HttpServletResponse response) { int status = response.getStatus(); logDO.setStatusCode(status); - logDO.setResponseHeaders(this.desensitize(ServletUtil.getHeadersMap(response))); + logDO.setResponseHeaders(this.desensitize(JakartaServletUtil.getHeadersMap(response))); // 响应体（不记录非 JSON 响应数据） String responseBody = this.getResponseBody(response); if (StrUtil.isNotBlank(responseBody) && JSONUtil.isTypeJSON(responseBody)) { @@ -328,7 +328,7 @@ public class LogInterceptor implements HandlerInterceptor { } // 2、检查是否需要记录内网 IP 操作 - boolean isInnerIp = IpUtils.isInnerIp(ServletUtil.getClientIP(request)); + boolean isInnerIp = IpUtils.isInnerIp(JakartaServletUtil.getClientIP(request)); if (isInnerIp && Boolean.FALSE.equals(operationLogProperties.getIncludeInnerIp())) { return false; } diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java index 76963b05..bc94a608 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java @@ -24,7 +24,7 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; +import org.springdoc.core.annotations.ParameterObject; import org.springframework.format.annotation.DateTimeFormat; import top.charles7c.cnadmin.common.annotation.Query; diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OnlineUserQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OnlineUserQuery.java index 8fcc2998..a80ad75d 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OnlineUserQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OnlineUserQuery.java @@ -24,7 +24,7 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; +import org.springdoc.core.annotations.ParameterObject; import org.springframework.format.annotation.DateTimeFormat; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java index 76b61ffd..8c08a500 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java @@ -24,7 +24,7 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; +import org.springdoc.core.annotations.ParameterObject; import org.springframework.format.annotation.DateTimeFormat; import top.charles7c.cnadmin.common.annotation.Query; diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java index a14da704..fbe6d883 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java @@ -24,7 +24,7 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; +import org.springdoc.core.annotations.ParameterObject; import org.springframework.format.annotation.DateTimeFormat; import top.charles7c.cnadmin.common.annotation.Query; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenConfiguration.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenConfiguration.java index 37e496bb..2dbfc3bb 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenConfiguration.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenConfiguration.java @@ -30,6 +30,7 @@ import cn.dev33.satoken.jwt.StpLogicJwtForSimple; import cn.dev33.satoken.stp.StpInterface; import cn.dev33.satoken.stp.StpLogic; import cn.dev33.satoken.stp.StpUtil; +import top.charles7c.cnadmin.auth.config.satoken.properties.SecurityProperties; /** * Sa-Token 配置 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SecurityProperties.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/properties/SecurityProperties.java similarity index 94% rename from continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SecurityProperties.java rename to continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/properties/SecurityProperties.java index 5f163118..c7c4cb84 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SecurityProperties.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/properties/SecurityProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.auth.config.satoken; +package top.charles7c.cnadmin.auth.config.satoken.properties; import lombok.Data; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/request/LoginRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/request/LoginRequest.java index 4c0fc380..6816ae0f 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/request/LoginRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/request/LoginRequest.java @@ -18,7 +18,7 @@ package top.charles7c.cnadmin.auth.model.request; import java.io.Serializable; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DeptQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DeptQuery.java index 3e9d175b..01f522b2 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DeptQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DeptQuery.java @@ -22,7 +22,7 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; +import org.springdoc.core.annotations.ParameterObject; import top.charles7c.cnadmin.common.annotation.Query; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/MenuQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/MenuQuery.java index dee81cf0..e75eabe1 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/MenuQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/MenuQuery.java @@ -22,7 +22,7 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; +import org.springdoc.core.annotations.ParameterObject; import top.charles7c.cnadmin.common.annotation.Query; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java index 24aa35b9..ce21b4a4 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java @@ -22,7 +22,7 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; +import org.springdoc.core.annotations.ParameterObject; import top.charles7c.cnadmin.common.annotation.Query; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java index af428bdb..98f65b7a 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java @@ -24,7 +24,7 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; +import org.springdoc.core.annotations.ParameterObject; import org.springframework.format.annotation.DateTimeFormat; import top.charles7c.cnadmin.common.annotation.Query; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java index f69b9b4b..d49637ed 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java @@ -16,8 +16,8 @@ package top.charles7c.cnadmin.system.model.request; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/MenuRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/MenuRequest.java index 86704d72..46a29974 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/MenuRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/MenuRequest.java @@ -16,8 +16,8 @@ package top.charles7c.cnadmin.system.model.request; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/RoleRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/RoleRequest.java index 624238d4..f23ca116 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/RoleRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/RoleRequest.java @@ -18,8 +18,8 @@ package top.charles7c.cnadmin.system.model.request; import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateBasicInfoRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateBasicInfoRequest.java index 4ad6e00d..52548763 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateBasicInfoRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateBasicInfoRequest.java @@ -18,8 +18,8 @@ package top.charles7c.cnadmin.system.model.request; import java.io.Serializable; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateEmailRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateEmailRequest.java index ee0b1132..cc6feb00 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateEmailRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateEmailRequest.java @@ -18,8 +18,8 @@ package top.charles7c.cnadmin.system.model.request; import java.io.Serializable; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; import lombok.Data; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdatePasswordRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdatePasswordRequest.java index fb262ba0..532b74f6 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdatePasswordRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdatePasswordRequest.java @@ -18,7 +18,7 @@ package top.charles7c.cnadmin.system.model.request; import java.io.Serializable; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateUserRoleRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateUserRoleRequest.java index 6462b77f..f0e60860 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateUserRoleRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateUserRoleRequest.java @@ -19,7 +19,7 @@ package top.charles7c.cnadmin.system.model.request; import java.io.Serializable; import java.util.List; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import lombok.Data; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java index 0511b59b..96dbe650 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java @@ -18,7 +18,7 @@ package top.charles7c.cnadmin.system.model.request; import java.util.List; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import lombok.Data; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java index 0268ff7d..742f8d46 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java index 9df420d8..e4c92402 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java @@ -20,7 +20,7 @@ import java.io.File; import java.time.LocalDateTime; import java.util.List; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CaptchaController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CaptchaController.java index 390e3fbc..398f4ab6 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CaptchaController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CaptchaController.java @@ -18,9 +18,9 @@ package top.charles7c.cnadmin.webapi.controller.common; import java.time.Duration; -import javax.mail.MessagingException; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; +import jakarta.mail.MessagingException; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java index ee31e6e5..c3fe293d 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java @@ -16,7 +16,7 @@ package top.charles7c.cnadmin.webapi.controller.system; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserController.java index 66a27fb9..69147174 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserController.java @@ -53,7 +53,7 @@ public class UserController extends BaseController add(@Validated(BaseRequest.Add.class) @RequestBody UserRequest request) { + public R add(@Validated(BaseRequest.Add.class) @RequestBody UserRequest request) { Long id = baseService.add(request); return R.ok(String.format("新增成功，请牢记默认密码：%s", SysConsts.DEFAULT_PASSWORD), id); } diff --git a/continew-admin-webapi/src/main/resources/application-dev.yml b/continew-admin-webapi/src/main/resources/application-dev.yml index 2431302e..a9f1ff13 100644 --- a/continew-admin-webapi/src/main/resources/application-dev.yml +++ b/continew-admin-webapi/src/main/resources/application-dev.yml @@ -20,7 +20,7 @@ spring: master: url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:continew_admin}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&autoReconnect=true&maxReconnects=10&failOverReadOnly=false username: ${DB_USER:root} - password: ${DB_PWD:123456} + password: ${DB_PWD:root} driver-class-name: com.mysql.cj.jdbc.Driver # 从库配置（可配多个，构成多从） slave_1: @@ -53,19 +53,20 @@ spring.liquibase: --- ### Redis 单机配置 spring: - redis: - # 地址 - host: ${REDIS_HOST:127.0.0.1} - # 端口（默认 6379） - port: ${REDIS_PORT:6379} - # 密码（未设置密码时可为空或注释掉） - password: ${REDIS_PWD:123456} - # 数据库索引 - database: ${REDIS_DB:0} - # 连接超时时间 - timeout: 10s - # 是否开启 SSL - ssl: false + data: + redis: + # 地址 + host: ${REDIS_HOST:127.0.0.1} + # 端口（默认 6379） + port: ${REDIS_PORT:6379} + # 密码（未设置密码时可为空或注释掉） + # password: ${REDIS_PWD:123456} + # 数据库索引 + database: ${REDIS_DB:0} + # 连接超时时间 + timeout: 10s + # 是否开启 SSL + ssl: false --- ### 邮件配置 spring: diff --git a/continew-admin-webapi/src/main/resources/application.yml b/continew-admin-webapi/src/main/resources/application.yml index 39daf0c0..03aa4828 100644 --- a/continew-admin-webapi/src/main/resources/application.yml +++ b/continew-admin-webapi/src/main/resources/application.yml @@ -195,3 +195,22 @@ thread-pool: queueCapacity: 128 # 活跃时间 keepAliveSeconds: 300 + +management: + health: + mail: + # 临时关闭邮箱健康检查 + # 注: 邮箱参数没有正确配置会出现mail health异常 + enabled: false +# redis: +# # redis +# enabled: false +# mongo: +# # 关闭mongodb健康检查 +# enabled: false +# solr: +# # 关闭solr健康检查 +# enabled: false +# elasticsearch: +# # 关闭es健康检查 +# enabled: false \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7a976342..acc61b9e 100644 --- a/pom.xml +++ b/pom.xml @@ -14,8 +14,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 @@ -38,7 +38,7 @@ limitations under the License. org.springframework.boot spring-boot-starter-parent - 2.7.8 + 3.0.3 @@ -54,17 +54,21 @@ limitations under the License. 3.2.0 2.7.6 4.0.0 - 3.19.0 + 3.19.2 1.6.2 - 5.8.11 + 5.8.15 + 4.10.0 - 0.0.1-SNAPSHOT - 1.8 + 3.0.0 2.28.0 - 8 - 8 - UTF-8 + + + + + + + @@ -146,6 +150,12 @@ limitations under the License. com.alibaba easyexcel ${easyexcel.version} + + + org.apache.poi + poi-ooxml-schemas + + @@ -185,6 +195,13 @@ limitations under the License. ${hutool.version} + + + com.squareup.okhttp3 + okhttp + ${okhttp.version} + + @@ -291,8 +308,8 @@ limitations under the License. - public - aliyun maven + aliyun-public + aliyun maven public https://maven.aliyun.com/repository/public/ true @@ -302,8 +319,8 @@ limitations under the License. - public - aliyun maven + aliyun-public + aliyun maven public https://maven.aliyun.com/repository/public/ true From 65401d021965bfc4158a8c4b362809381bf1a159 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Thu, 30 Mar 2023 22:52:04 +0800 Subject: [PATCH 2/8] chore: 1.1.0-SNAPSHOT => 2.0.0-SNAPSHOT --- README.md | 2 +- continew-admin-ui/package.json | 2 +- continew-admin-ui/src/components/footer/index.vue | 2 +- continew-admin-webapi/src/main/resources/application.yml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d5d6aeca..f72961f1 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ License -Release +Release GitHub stars diff --git a/continew-admin-ui/package.json b/continew-admin-ui/package.json index 75305f8e..5ea72783 100644 --- a/continew-admin-ui/package.json +++ b/continew-admin-ui/package.json @@ -1,7 +1,7 @@ { "name": "continew-admin-ui", "description": "ContiNew Admin 中后台管理框架，Continue New Admin，持续以最新流行技术栈构建，拥抱变化，迭代优化。", - "version": "1.1.0-SNAPSHOT", + "version": "2.0.0-SNAPSHOT", "private": true, "author": "Charles7c", "license": "Apache-2.0", diff --git a/continew-admin-ui/src/components/footer/index.vue b/continew-admin-ui/src/components/footer/index.vue index 854c9eca..022198d2 100644 --- a/continew-admin-ui/src/components/footer/index.vue +++ b/continew-admin-ui/src/components/footer/index.vue @@ -4,7 +4,7 @@ Charles7c  ⋅  {{ $t('title') }}  - v1.1.0-SNAPSHOT + v2.0.0-SNAPSHOT  ⋅  津ICP备2022005864号-2 diff --git a/continew-admin-webapi/src/main/resources/application.yml b/continew-admin-webapi/src/main/resources/application.yml index e4129071..0ee7e4cc 100644 --- a/continew-admin-webapi/src/main/resources/application.yml +++ b/continew-admin-webapi/src/main/resources/application.yml @@ -5,7 +5,7 @@ continew-admin: # 应用名称 appName: continew-admin # 版本 - version: 1.1.0-SNAPSHOT + version: 2.0.0-SNAPSHOT # 描述 description: ContiNew Admin 中后台管理框架/脚手架，Continue New Admin，持续以最新流行技术栈构建，拥抱变化，迭代优化。 # URL diff --git a/pom.xml b/pom.xml index 1049e013..f4029d07 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ limitations under the License. 5.8.16 - 1.1.0-SNAPSHOT + 2.0.0-SNAPSHOT 1.8 2.28.0 8 From 40e11a7a2561b4d54beeec80c32158ae048572ca Mon Sep 17 00:00:00 2001 From: Charles7c Date: Thu, 30 Mar 2023 23:40:30 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +-- .../CrudRequestMappingHandlerMapping.java | 24 ++++++++-------- .../monitor/interceptor/LogInterceptor.java | 4 +-- .../config/satoken/SaTokenConfiguration.java | 1 - .../{properties => }/SecurityProperties.java | 2 +- .../controller/system/MenuController.java | 4 +-- .../src/main/resources/application-dev.yml | 4 +-- .../src/main/resources/application-prod.yml | 27 +++++++++--------- .../src/main/resources/application.yml | 28 ++++++------------- pom.xml | 2 +- 10 files changed, 43 insertions(+), 57 deletions(-) rename continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/{properties => }/SecurityProperties.java (94%) diff --git a/README.md b/README.md index f72961f1..ce0d20ed 100644 --- a/README.md +++ b/README.md @@ -54,8 +54,8 @@ ContiNew Admin 中后台管理框架/脚手架，Continue New Admin，持续以 **v2.0.0：** :fire: 升级并适配 Spring Boot 3.x。 -- [ ] 依赖升级：升级并适配 Spring Boot 3.x -- [ ] 依赖升级：其他依赖升级 +- [x] 依赖升级：升级并适配 Spring Boot 3.x +- [x] 依赖升级：其他依赖升级 - [ ] 计划对接 FlowLong 纯国产工作流引擎 - [ ] 其他需求汇集中... diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/CrudRequestMappingHandlerMapping.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/CrudRequestMappingHandlerMapping.java index 1f3dbd02..e930d4d1 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/CrudRequestMappingHandlerMapping.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/CrudRequestMappingHandlerMapping.java @@ -16,21 +16,19 @@ package top.charles7c.cnadmin.common.handler; -import static top.charles7c.cnadmin.common.annotation.CrudRequestMapping.Api; - -import java.lang.reflect.Method; - +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.StrUtil; import org.springframework.lang.NonNull; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; import org.springframework.web.util.pattern.PathPatternParser; - -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.StrUtil; - import top.charles7c.cnadmin.common.annotation.CrudRequestMapping; import top.charles7c.cnadmin.common.util.ExceptionUtils; +import java.lang.reflect.Method; + +import static top.charles7c.cnadmin.common.annotation.CrudRequestMapping.Api; + /** * CRUD 请求映射器处理器映射器 * @@ -56,14 +54,14 @@ public class CrudRequestMappingHandlerMapping extends RequestMappingHandlerMappi // 拼接路径前缀（合并了 @RequestMapping 的部分能力） String pathPrefix = crudRequestMapping.value(); if (StrUtil.isNotBlank(pathPrefix)) { - /** - * 问题：RequestMappingInfo.paths(pathPrefix)返回的RequestMappingInfo对象里pathPatternsCondition = null - * 导致combine()方法抛出断言异常！ - * 修复: 创建options对象, 并设置PatternParser + /* + * 问题：RequestMappingInfo.paths(pathPrefix) 返回的 RequestMappingInfo 对象里 pathPatternsCondition = null + * 导致 combine() 方法抛出断言异常！ 修复：创建 options 对象，并设置 PatternParser */ RequestMappingInfo.BuilderConfiguration options = new RequestMappingInfo.BuilderConfiguration(); options.setPatternParser(PathPatternParser.defaultInstance); - requestMappingInfo = RequestMappingInfo.paths(pathPrefix).options(options).build().combine(requestMappingInfo); + requestMappingInfo = + RequestMappingInfo.paths(pathPrefix).options(options).build().combine(requestMappingInfo); } // 过滤 API diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java index 4204f680..7510dbd4 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java @@ -218,8 +218,8 @@ public class LogInterceptor implements HandlerInterceptor { logDO.setRequestHeaders(this.desensitize(JakartaServletUtil.getHeaderMap(request))); String requestBody = this.getRequestBody(request); if (StrUtil.isNotBlank(requestBody)) { - logDO.setRequestBody(this.desensitize( - JSONUtil.isTypeJSON(requestBody) ? JSONUtil.parseObj(requestBody) : JakartaServletUtil.getParamMap(request))); + logDO.setRequestBody(this.desensitize(JSONUtil.isTypeJSON(requestBody) ? JSONUtil.parseObj(requestBody) + : JakartaServletUtil.getParamMap(request))); } logDO.setClientIp(JakartaServletUtil.getClientIP(request)); logDO.setLocation(IpUtils.getCityInfo(logDO.getClientIp())); diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenConfiguration.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenConfiguration.java index 94eb609c..f5819579 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenConfiguration.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenConfiguration.java @@ -30,7 +30,6 @@ import cn.dev33.satoken.jwt.StpLogicJwtForSimple; import cn.dev33.satoken.stp.StpInterface; import cn.dev33.satoken.stp.StpLogic; import cn.dev33.satoken.stp.StpUtil; -import top.charles7c.cnadmin.auth.config.satoken.properties.SecurityProperties; /** * Sa-Token 配置 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/properties/SecurityProperties.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SecurityProperties.java similarity index 94% rename from continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/properties/SecurityProperties.java rename to continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SecurityProperties.java index c416124b..9446445b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/properties/SecurityProperties.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SecurityProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.auth.config.satoken.properties; +package top.charles7c.cnadmin.auth.config.satoken; import lombok.Data; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/MenuController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/MenuController.java index 8a840c5a..d93fe16b 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/MenuController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/MenuController.java @@ -52,14 +52,14 @@ public class MenuController extends BaseController add(@Validated(BaseRequest.Add.class) @RequestBody MenuRequest request) { + public R add(@Validated(BaseRequest.Add.class) @RequestBody MenuRequest request) { this.checkPath(request); return super.add(request); } @Override @SaCheckPermission("system:menu:update") - protected R update(@Validated(BaseRequest.Update.class) @RequestBody MenuRequest request, @PathVariable Long id) { + public R update(@Validated(BaseRequest.Update.class) @RequestBody MenuRequest request, @PathVariable Long id) { this.checkPath(request); return super.update(request, id); } diff --git a/continew-admin-webapi/src/main/resources/application-dev.yml b/continew-admin-webapi/src/main/resources/application-dev.yml index 8ecb57cf..f9149c8e 100644 --- a/continew-admin-webapi/src/main/resources/application-dev.yml +++ b/continew-admin-webapi/src/main/resources/application-dev.yml @@ -20,7 +20,7 @@ spring: master: url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:continew_admin}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&autoReconnect=true&maxReconnects=10&failOverReadOnly=false username: ${DB_USER:root} - password: ${DB_PWD:root} + password: ${DB_PWD:123456} driver-class-name: com.mysql.cj.jdbc.Driver # 从库配置（可配多个，构成多从） slave_1: @@ -60,7 +60,7 @@ spring: # 端口（默认 6379） port: ${REDIS_PORT:6379} # 密码（未设置密码时可为空或注释掉） - # password: ${REDIS_PWD:123456} + password: ${REDIS_PWD:123456} # 数据库索引 database: ${REDIS_DB:0} # 连接超时时间 diff --git a/continew-admin-webapi/src/main/resources/application-prod.yml b/continew-admin-webapi/src/main/resources/application-prod.yml index fb81290d..ca0a8268 100644 --- a/continew-admin-webapi/src/main/resources/application-prod.yml +++ b/continew-admin-webapi/src/main/resources/application-prod.yml @@ -53,19 +53,20 @@ spring.liquibase: --- ### Redis 单机配置 spring: - redis: - # 地址 - host: ${REDIS_HOST:127.0.0.1} - # 端口（默认 6379） - port: ${REDIS_PORT:6379} - # 密码（未设置密码时可为空或注释掉） - password: ${REDIS_PWD:123456} - # 数据库索引 - database: ${REDIS_DB:0} - # 连接超时时间 - timeout: 10s - # 是否开启 SSL - ssl: false + data: + redis: + # 地址 + host: ${REDIS_HOST:127.0.0.1} + # 端口（默认 6379） + port: ${REDIS_PORT:6379} + # 密码（未设置密码时可为空或注释掉） + password: ${REDIS_PWD:123456} + # 数据库索引 + database: ${REDIS_DB:0} + # 连接超时时间 + timeout: 10s + # 是否开启 SSL + ssl: false --- ### 邮件配置 spring: diff --git a/continew-admin-webapi/src/main/resources/application.yml b/continew-admin-webapi/src/main/resources/application.yml index f36c209b..22f860b6 100644 --- a/continew-admin-webapi/src/main/resources/application.yml +++ b/continew-admin-webapi/src/main/resources/application.yml @@ -188,6 +188,13 @@ spring: # 允许反序列化不存在的属性 FAIL_ON_UNKNOWN_PROPERTIES: false +--- ### 健康检查配置 +management: + health: + mail: + # 关闭邮箱健康检查（邮箱配置错误或邮箱服务器不可用时，健康检查会报错） + enabled: false + --- ### 线程池配置 thread-pool: # 是否启用线程池 @@ -195,23 +202,4 @@ thread-pool: # 队列容量 queueCapacity: 128 # 活跃时间 - keepAliveSeconds: 300 - -management: - health: - mail: - # 临时关闭邮箱健康检查 - # 注: 邮箱参数没有正确配置会出现mail health异常 - enabled: false -# redis: -# # redis -# enabled: false -# mongo: -# # 关闭mongodb健康检查 -# enabled: false -# solr: -# # 关闭solr健康检查 -# enabled: false -# elasticsearch: -# # 关闭es健康检查 -# enabled: false \ No newline at end of file + keepAliveSeconds: 300 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0433d6c3..b15e33d0 100644 --- a/pom.xml +++ b/pom.xml @@ -251,7 +251,7 @@ limitations under the License. - java,javax,lombok,io,org,com,cn,top.charles7c, + java,jakarta,lombok,io,org,com,cn,top.charles7c, From 95c27ea323e015c915d352618158df830b4d1c05 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Fri, 31 Mar 2023 00:08:07 +0800 Subject: [PATCH 4/8] chore: Spring Boot 3.0.3 => 3.0.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.Spring Boot 3.0.3 => 3.0.5 2.Sa-Token 适配 Spring Boot 3.x --- README.md | 44 +++++++++++++++++------------------ continew-admin-common/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index ce0d20ed..c6e37271 100644 --- a/README.md +++ b/README.md @@ -254,28 +254,28 @@ continew-admin ## 技术栈 -| 名称 | 版本 | 简介 | -| :----------------------------------------------------------- | :----------- | :----------------------------------------------------------- | -| Vue | 3.2.47 | 渐进式 JavaScript 框架，易学易用，性能出色，适用场景丰富的 Web 前端框架。 | -| TypeScript | 4.9.5 | TypeScript 是微软开发的一个开源的编程语言，通过在 JavaScript 的基础上添加静态类型定义构建而成。 | -| Arco Design Vue | 2.44.5 | 字节跳动推出的前端 UI 框架，样式美观，组件丰富。 | -| Spring Boot | 2.7.10 | 简化新 Spring 应用的初始搭建以及开发过程。 | -| Undertow | 2.2.23.Final | 采用 Java 开发的灵活的高性能 Web 服务器，提供包括阻塞和基于 NIO 的非堵塞机制。 | -| Sa-Token + JWT | 1.34.0 | 轻量级 Java 权限认证框架，让鉴权变得简单、优雅。 | -| MariaDB | 10.10.2 | MySQL 的一个分支，主要由开源社区在维护，完全兼容 MySQL，包括 API 和命令行，能轻松成为 MySQL 的代替品。 | -| MyBatis Plus | 3.5.3.1 | MyBatis 的增强工具，在 MyBatis 的基础上只做增强不做改变，简化开发、提高效率。 | -| dynamic-datasource-spring-boot-starter | 3.6.1 | 基于 Spring Boot 的快速集成多数据源的启动器。 | -| Hikari | 4.0.3 | JDBC 连接池，号称 “史上最快连接池”，SpringBoot 在 2.0 之后，采用的默认数据库连接池就是 Hikari。 | -| mysql-connector-j | 8.0.32 | MySQL Java 驱动。 | -| P6Spy | 3.9.1 | SQL 性能分析组件。 | -| Liquibase | 4.9.1 | 用于管理数据库版本，跟踪、管理和应用数据库变化。 | -| Redis | 6.2.7 | 高性能的 key-value 数据库。 | -| Redisson | 3.20.0 | 不仅仅是一个 Redis Java 客户端，同其他 Redis Java 客户端有着很大的区别，相比之下其他客户端提供的功能还仅仅停留在作为数据库驱动层面上，比如仅针对 Redis 提供连接方式，发送命令和处理返回结果等。而 Redisson 充分的利用了 Redis 键值数据库提供的一系列优势，基于 Java 实用工具包中常用接口，为使用者提供了一系列具有分布式特性的常用工具类。使得原本作为协调单机多线程并发程序的工具包获得了协调分布式多机多线程并发系统的能力，大大降低了设计和研发大规模分布式系统的难度。同时结合各富特色的分布式服务，更进一步简化了分布式环境中程序相互之间的协作。 | -| Easy Excel | 3.2.1 | 一个基于 Java 的、快速、简洁、解决大文件内存溢出的 Excel 处理工具。 | -| Easy Captcha | 1.6.2 | Java 图形验证码，支持 gif、中文、算术等类型，可用于 Java Web、JavaSE 等项目。 | -| Knife4j | 4.1.0 | 前身是 swagger-bootstrap-ui，集 Swagger2 和 OpenAPI3 为一体的增强解决方案。本项目使用的是 knife4j-openapi3-spring-boot-starter 基于 OpenAPI3 规范，在 Spring Boot < 3.0.0-M1 的单体架构下可以直接引用此 starter，该模块包含了 UI 部分，底层基于 springdoc-openapi 项目。 | -| Hutool | 5.8.16 | 小而全的 Java 工具类库，通过静态方法封装，降低相关 API 的学习成本，提高工作效率，使 Java 拥有函数式语言般的优雅，让 Java 语言也可以“甜甜的”。 | -| Lombok | 1.18.26 | 在 Java 开发过程中用注解的方式，简化了 JavaBean 的编写，避免了冗余和样板式代码，让编写的类更加简洁。 | +| 名称 | 版本 | 简介 | +| :----------------------------------------------------------- | :---------- | :----------------------------------------------------------- | +| Vue | 3.2.47 | 渐进式 JavaScript 框架，易学易用，性能出色，适用场景丰富的 Web 前端框架。 | +| TypeScript | 4.9.5 | TypeScript 是微软开发的一个开源的编程语言，通过在 JavaScript 的基础上添加静态类型定义构建而成。 | +| Arco Design Vue | 2.44.5 | 字节跳动推出的前端 UI 框架，样式美观，组件丰富。 | +| Spring Boot | 3.0.5 | 简化新 Spring 应用的初始搭建以及开发过程。 | +| Undertow | 2.3.4.Final | 采用 Java 开发的灵活的高性能 Web 服务器，提供包括阻塞和基于 NIO 的非堵塞机制。 | +| Sa-Token + JWT | 1.34.0 | 轻量级 Java 权限认证框架，让鉴权变得简单、优雅。 | +| MariaDB | 10.10.2 | MySQL 的一个分支，主要由开源社区在维护，完全兼容 MySQL，包括 API 和命令行，能轻松成为 MySQL 的代替品。 | +| MyBatis Plus | 3.5.3.1 | MyBatis 的增强工具，在 MyBatis 的基础上只做增强不做改变，简化开发、提高效率。 | +| dynamic-datasource-spring-boot-starter | 3.6.1 | 基于 Spring Boot 的快速集成多数据源的启动器。 | +| Hikari | 5.0.1 | JDBC 连接池，号称 “史上最快连接池”，SpringBoot 在 2.0 之后，采用的默认数据库连接池就是 Hikari。 | +| mysql-connector-j | 8.0.32 | MySQL Java 驱动。 | +| P6Spy | 3.9.1 | SQL 性能分析组件。 | +| Liquibase | 4.17.2 | 用于管理数据库版本，跟踪、管理和应用数据库变化。 | +| Redis | 6.2.7 | 高性能的 key-value 数据库。 | +| Redisson | 3.20.0 | 不仅仅是一个 Redis Java 客户端，同其他 Redis Java 客户端有着很大的区别，相比之下其他客户端提供的功能还仅仅停留在作为数据库驱动层面上，比如仅针对 Redis 提供连接方式，发送命令和处理返回结果等。而 Redisson 充分的利用了 Redis 键值数据库提供的一系列优势，基于 Java 实用工具包中常用接口，为使用者提供了一系列具有分布式特性的常用工具类。使得原本作为协调单机多线程并发程序的工具包获得了协调分布式多机多线程并发系统的能力，大大降低了设计和研发大规模分布式系统的难度。同时结合各富特色的分布式服务，更进一步简化了分布式环境中程序相互之间的协作。 | +| Easy Excel | 3.2.1 | 一个基于 Java 的、快速、简洁、解决大文件内存溢出的 Excel 处理工具。 | +| Easy Captcha | 1.6.2 | Java 图形验证码，支持 gif、中文、算术等类型，可用于 Java Web、JavaSE 等项目。 | +| Knife4j | 4.1.0 | 前身是 swagger-bootstrap-ui，集 Swagger2 和 OpenAPI3 为一体的增强解决方案。本项目使用的是 knife4j-openapi3-jakarta-spring-boot-starter 基于 OpenAPI3 规范，在 Spring Boot >= 3.0.0-M1 的单体架构下可以直接引用此 starter，该模块包含了 Ui 部分，底层基于 springdoc-openapi 项目。 | +| Hutool | 5.8.16 | 小而全的 Java 工具类库，通过静态方法封装，降低相关 API 的学习成本，提高工作效率，使 Java 拥有函数式语言般的优雅，让 Java 语言也可以“甜甜的”。 | +| Lombok | 1.18.26 | 在 Java 开发过程中用注解的方式，简化了 JavaBean 的编写，避免了冗余和样板式代码，让编写的类更加简洁。 | ## 部分系统截图 diff --git a/continew-admin-common/pom.xml b/continew-admin-common/pom.xml index e77f42b1..a65d7025 100644 --- a/continew-admin-common/pom.xml +++ b/continew-admin-common/pom.xml @@ -80,7 +80,7 @@ limitations under the License. cn.dev33 - sa-token-spring-boot-starter + sa-token-spring-boot3-starter diff --git a/pom.xml b/pom.xml index b15e33d0..65ca2005 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ limitations under the License. org.springframework.boot spring-boot-starter-parent - 3.0.3 + 3.0.5 @@ -97,7 +97,7 @@ limitations under the License. cn.dev33 - sa-token-spring-boot-starter + sa-token-spring-boot3-starter ${sa-token.version} From 74e61a0111021b46b0c81c434ebe16760fb626ac Mon Sep 17 00:00:00 2001 From: Charles7c Date: Fri, 31 Mar 2023 22:33:03 +0800 Subject: [PATCH 5/8] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=20Redis=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=86=99=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 29 +++++++++---------- .../src/main/resources/application-prod.yml | 29 +++++++++---------- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/continew-admin-webapi/src/main/resources/application-dev.yml b/continew-admin-webapi/src/main/resources/application-dev.yml index 79467ca3..55cf35bc 100644 --- a/continew-admin-webapi/src/main/resources/application-dev.yml +++ b/continew-admin-webapi/src/main/resources/application-dev.yml @@ -51,21 +51,20 @@ spring.liquibase: change-log: classpath:/db/changelog/db.changelog-master.yaml --- ### Redis 单机配置 -spring: - data: - redis: - # 地址 - host: ${REDIS_HOST:127.0.0.1} - # 端口（默认 6379） - port: ${REDIS_PORT:6379} - # 密码（未设置密码时可为空或注释掉） - password: ${REDIS_PWD:123456} - # 数据库索引 - database: ${REDIS_DB:0} - # 连接超时时间 - timeout: 10s - # 是否开启 SSL - ssl: false +spring.data: + redis: + # 地址 + host: ${REDIS_HOST:127.0.0.1} + # 端口（默认 6379） + port: ${REDIS_PORT:6379} + # 密码（未设置密码时可为空或注释掉） + password: ${REDIS_PWD:123456} + # 数据库索引 + database: ${REDIS_DB:0} + # 连接超时时间 + timeout: 10s + # 是否开启 SSL + ssl: false --- ### 邮件配置 spring.mail: diff --git a/continew-admin-webapi/src/main/resources/application-prod.yml b/continew-admin-webapi/src/main/resources/application-prod.yml index e7a941a0..489a0ee3 100644 --- a/continew-admin-webapi/src/main/resources/application-prod.yml +++ b/continew-admin-webapi/src/main/resources/application-prod.yml @@ -51,21 +51,20 @@ spring.liquibase: change-log: classpath:/db/changelog/db.changelog-master.yaml --- ### Redis 单机配置 -spring: - data: - redis: - # 地址 - host: ${REDIS_HOST:127.0.0.1} - # 端口（默认 6379） - port: ${REDIS_PORT:6379} - # 密码（未设置密码时可为空或注释掉） - password: ${REDIS_PWD:123456} - # 数据库索引 - database: ${REDIS_DB:0} - # 连接超时时间 - timeout: 10s - # 是否开启 SSL - ssl: false +spring.data: + redis: + # 地址 + host: ${REDIS_HOST:127.0.0.1} + # 端口（默认 6379） + port: ${REDIS_PORT:6379} + # 密码（未设置密码时可为空或注释掉） + password: ${REDIS_PWD:123456} + # 数据库索引 + database: ${REDIS_DB:0} + # 连接超时时间 + timeout: 10s + # 是否开启 SSL + ssl: false --- ### 邮件配置 spring.mail: From 5a5bd1681e076ac6814d552da5415a8f154b93af Mon Sep 17 00:00:00 2001 From: Charles7c Date: Fri, 31 Mar 2023 22:46:14 +0800 Subject: [PATCH 6/8] =?UTF-8?q?style:=20=E9=80=82=E9=85=8D=20Java=2011=20?= =?UTF-8?q?=E6=96=B0=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.对 Optional 的 isPresent() 取反用法 => isEmpty() 2.集合 toArray(new String[0]) 用法 => toArray(String[]::new) --- .../top/charles7c/cnadmin/common/util/MailUtils.java | 6 +++--- .../webapi/controller/common/CommonController.java | 12 +++++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java index f276b290..a6389084 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java @@ -200,14 +200,14 @@ public class MailUtils { // 设置收信人 // 抄送人 if (CollUtil.isNotEmpty(ccs)) { - messageHelper.setCc(ccs.toArray(new String[0])); + messageHelper.setCc(ccs.toArray(String[]::new)); } // 密送人 if (CollUtil.isNotEmpty(bccs)) { - messageHelper.setBcc(bccs.toArray(new String[0])); + messageHelper.setBcc(bccs.toArray(String[]::new)); } // 收件人 - messageHelper.setTo(tos.toArray(new String[0])); + messageHelper.setTo(tos.toArray(String[]::new)); // 设置附件 if (ArrayUtil.isNotEmpty(files)) { diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java index 23ee0d26..fcc6a4ea 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java @@ -16,7 +16,10 @@ package top.charles7c.cnadmin.webapi.controller.common; -import java.util.*; +import java.util.Arrays; +import java.util.List; +import java.util.Optional; +import java.util.Set; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; @@ -25,7 +28,10 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ClassUtil; @@ -92,7 +98,7 @@ public class CommonController { Set> classSet = ClassUtil.scanPackageBySuper(properties.getBasePackage(), BaseEnum.class); Optional> first = classSet.stream().filter(c -> c.getSimpleName().equalsIgnoreCase(enumTypeName)).findFirst(); - if (!first.isPresent()) { + if (first.isEmpty()) { return R.fail("枚举字典不存在"); } // 转换枚举为字典列表 From 38f52aaafa22ebc958a22b7c38b084c655064fbc Mon Sep 17 00:00:00 2001 From: Charles7c Date: Fri, 31 Mar 2023 23:00:57 +0800 Subject: [PATCH 7/8] =?UTF-8?q?style:=20=E9=80=82=E9=85=8D=20Java=2014=20?= =?UTF-8?q?=E6=96=B0=E7=89=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.增强 switch（Java 12 预览特性 => Java 14 标准特性） 详情请参阅：https://docs.oracle.com/en/java/javase/14/language/switch-expressions.html 2.@Serial（类似于 @Override 的检查注解，用于检查序列化） --- .../charles7c/cnadmin/common/base/BaseDO.java | 2 + .../cnadmin/common/base/BaseDetailVO.java | 2 + .../cnadmin/common/base/BaseRequest.java | 2 + .../charles7c/cnadmin/common/base/BaseVO.java | 2 + .../handler/GlobalExceptionHandler.java | 17 ++---- .../cnadmin/common/model/dto/LogContext.java | 2 + .../cnadmin/common/model/dto/LoginUser.java | 2 + .../cnadmin/common/model/dto/RoleDTO.java | 2 + .../cnadmin/common/model/query/PageQuery.java | 3 + .../cnadmin/common/model/query/SortQuery.java | 2 + .../model/request/UpdateStatusRequest.java | 2 + .../cnadmin/common/model/vo/CaptchaVO.java | 2 + .../cnadmin/common/model/vo/LabelValueVO.java | 2 + .../cnadmin/common/model/vo/PageDataVO.java | 2 + .../charles7c/cnadmin/common/model/vo/R.java | 2 + .../common/util/helper/QueryHelper.java | 59 ++++++------------- .../cnadmin/monitor/model/entity/LogDO.java | 2 + .../monitor/model/query/LoginLogQuery.java | 2 + .../model/query/OperationLogQuery.java | 2 + .../monitor/model/query/SystemLogQuery.java | 2 + .../cnadmin/monitor/model/vo/LogVO.java | 2 + .../cnadmin/monitor/model/vo/LoginLogVO.java | 3 + .../monitor/model/vo/OperationLogVO.java | 3 + .../monitor/model/vo/SystemLogDetailVO.java | 3 + .../cnadmin/monitor/model/vo/SystemLogVO.java | 3 + .../auth/model/query/OnlineUserQuery.java | 2 + .../auth/model/request/LoginRequest.java | 2 + .../cnadmin/auth/model/vo/LoginVO.java | 2 + .../cnadmin/auth/model/vo/MetaVO.java | 2 + .../cnadmin/auth/model/vo/OnlineUserVO.java | 2 + .../cnadmin/auth/model/vo/RouteVO.java | 2 + .../cnadmin/auth/model/vo/UserInfoVO.java | 2 + .../cnadmin/system/model/entity/DeptDO.java | 3 + .../cnadmin/system/model/entity/MenuDO.java | 3 + .../cnadmin/system/model/entity/RoleDO.java | 3 + .../system/model/entity/RoleDeptDO.java | 2 + .../system/model/entity/RoleMenuDO.java | 2 + .../cnadmin/system/model/entity/UserDO.java | 2 + .../system/model/entity/UserRoleDO.java | 2 + .../cnadmin/system/model/query/DeptQuery.java | 2 + .../cnadmin/system/model/query/MenuQuery.java | 2 + .../cnadmin/system/model/query/RoleQuery.java | 2 + .../cnadmin/system/model/query/UserQuery.java | 2 + .../system/model/request/DeptRequest.java | 3 + .../system/model/request/MenuRequest.java | 3 + .../system/model/request/RoleRequest.java | 2 + .../model/request/UpdateBasicInfoRequest.java | 2 + .../model/request/UpdateEmailRequest.java | 2 + .../model/request/UpdatePasswordRequest.java | 2 + .../model/request/UpdateUserRoleRequest.java | 2 + .../system/model/request/UserRequest.java | 2 + .../cnadmin/system/model/vo/AvatarVO.java | 2 + .../cnadmin/system/model/vo/DeptDetailVO.java | 3 + .../cnadmin/system/model/vo/DeptVO.java | 3 + .../cnadmin/system/model/vo/MenuVO.java | 3 + .../cnadmin/system/model/vo/RoleDetailVO.java | 2 + .../cnadmin/system/model/vo/RoleVO.java | 3 + .../cnadmin/system/model/vo/UserDetailVO.java | 2 + .../cnadmin/system/model/vo/UserVO.java | 2 + 59 files changed, 151 insertions(+), 53 deletions(-) diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseDO.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseDO.java index 9412e666..4364f37c 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseDO.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseDO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.base; +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; @@ -34,6 +35,7 @@ import com.baomidou.mybatisplus.annotation.TableId; @Data public class BaseDO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseDetailVO.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseDetailVO.java index 9920904d..b53f12cd 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseDetailVO.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseDetailVO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.base; +import java.io.Serial; import java.time.LocalDateTime; import lombok.Data; @@ -34,6 +35,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; @Data public class BaseDetailVO extends BaseVO { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseRequest.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseRequest.java index d423adc1..fd84d5d5 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseRequest.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseRequest.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.base; +import java.io.Serial; import java.io.Serializable; import jakarta.validation.groups.Default; @@ -31,6 +32,7 @@ import lombok.Data; @Data public class BaseRequest implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseVO.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseVO.java index cf4df32f..98ee5165 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseVO.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseVO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.base; +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; @@ -36,6 +37,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; @Data public class BaseVO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalExceptionHandler.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalExceptionHandler.java index 6884ba26..cd0b57b8 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalExceptionHandler.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalExceptionHandler.java @@ -184,18 +184,11 @@ public class GlobalExceptionHandler { @ExceptionHandler(NotLoginException.class) public R handleNotLoginException(NotLoginException e, HttpServletRequest request) { log.error("请求地址 [{}]，认证失败，无法访问系统资源。", request.getRequestURI(), e); - String errorMsg; - switch (e.getType()) { - case NotLoginException.KICK_OUT: - errorMsg = "您已被踢下线"; - break; - case NotLoginException.BE_REPLACED_MESSAGE: - errorMsg = "您已被顶下线"; - break; - default: - errorMsg = "登录状态已过期，请重新登录"; - break; - } + String errorMsg = switch (e.getType()) { + case NotLoginException.KICK_OUT -> "您已被踢下线"; + case NotLoginException.BE_REPLACED_MESSAGE -> "您已被顶下线"; + default -> "登录状态已过期，请重新登录"; + }; LogContextHolder.setErrorMsg(errorMsg); return R.fail(HttpStatus.UNAUTHORIZED.value(), errorMsg); } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LogContext.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LogContext.java index bd591c37..a18f8861 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LogContext.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LogContext.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.model.dto; +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; @@ -30,6 +31,7 @@ import lombok.Data; @Data public class LogContext implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LoginUser.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LoginUser.java index d0cab81d..8a491089 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LoginUser.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LoginUser.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.model.dto; +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; import java.util.Set; @@ -35,6 +36,7 @@ import top.charles7c.cnadmin.common.constant.SysConsts; @Data public class LoginUser implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/RoleDTO.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/RoleDTO.java index 3a7d949a..b46bef88 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/RoleDTO.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/RoleDTO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.model.dto; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -31,6 +32,7 @@ import top.charles7c.cnadmin.common.enums.DataScopeEnum; @Data public class RoleDTO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/PageQuery.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/PageQuery.java index 5ec5fe7f..ea3b59e9 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/PageQuery.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/PageQuery.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.common.model.query; +import java.io.Serial; + import jakarta.validation.constraints.Min; import lombok.Data; @@ -46,6 +48,7 @@ import cn.hutool.core.util.StrUtil; @Schema(description = "分页查询条件") public class PageQuery extends SortQuery { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java index 74ee8128..6b01511b 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.model.query; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -43,6 +44,7 @@ import top.charles7c.cnadmin.common.constant.StringConsts; @Schema(description = "排序查询条件") public class SortQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/request/UpdateStatusRequest.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/request/UpdateStatusRequest.java index 4a160f15..e1fdc7ef 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/request/UpdateStatusRequest.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/request/UpdateStatusRequest.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.model.request; +import java.io.Serial; import java.io.Serializable; import jakarta.validation.constraints.NotNull; @@ -36,6 +37,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; @Schema(description = "修改状态信息") public class UpdateStatusRequest implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/CaptchaVO.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/CaptchaVO.java index 7b80583c..1e4202a1 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/CaptchaVO.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/CaptchaVO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.model.vo; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -34,6 +35,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "验证码信息") public class CaptchaVO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/LabelValueVO.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/LabelValueVO.java index e47ef5fb..c0d9f865 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/LabelValueVO.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/LabelValueVO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.model.vo; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -37,6 +38,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "键值对信息") public class LabelValueVO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/PageDataVO.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/PageDataVO.java index 68898c2d..4671e62e 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/PageDataVO.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/PageDataVO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.model.vo; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -43,6 +44,7 @@ import cn.hutool.core.collection.CollUtil; @Schema(description = "分页信息") public class PageDataVO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/R.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/R.java index 6c6ca3c2..5338e759 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/R.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/R.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.model.vo; +import java.io.Serial; import java.io.Serializable; import lombok.AccessLevel; @@ -37,6 +38,7 @@ import org.springframework.http.HttpStatus; @Schema(description = "响应信息") public class R implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** 是否成功 */ diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java index 55ebfc8f..ebefcb44 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java @@ -144,57 +144,34 @@ public class QueryHelper { String columnName = StrUtil.toUnderlineCase(fieldName); Query.Type queryType = queryAnnotation.type(); switch (queryType) { - case EQUAL: - queryWrapper.eq(columnName, fieldValue); - break; - case NOT_EQUAL: - queryWrapper.ne(columnName, fieldValue); - break; - case GREATER_THAN: - queryWrapper.gt(columnName, fieldValue); - break; - case LESS_THAN: - queryWrapper.lt(columnName, fieldValue); - break; - case GREATER_THAN_OR_EQUAL: - queryWrapper.ge(columnName, fieldValue); - break; - case LESS_THAN_OR_EQUAL: - queryWrapper.le(columnName, fieldValue); - break; - case BETWEEN: + case EQUAL -> queryWrapper.eq(columnName, fieldValue); + case NOT_EQUAL -> queryWrapper.ne(columnName, fieldValue); + case GREATER_THAN -> queryWrapper.gt(columnName, fieldValue); + case LESS_THAN -> queryWrapper.lt(columnName, fieldValue); + case GREATER_THAN_OR_EQUAL -> queryWrapper.ge(columnName, fieldValue); + case LESS_THAN_OR_EQUAL -> queryWrapper.le(columnName, fieldValue); + case BETWEEN -> { List between = new ArrayList<>((List)fieldValue); if (between.size() >= 2) { queryWrapper.between(columnName, between.get(0), between.get(1)); } - break; - case LEFT_LIKE: - queryWrapper.likeLeft(columnName, fieldValue); - break; - case INNER_LIKE: - queryWrapper.like(columnName, fieldValue); - break; - case RIGHT_LIKE: - queryWrapper.likeRight(columnName, fieldValue); - break; - case IN: + } + case LEFT_LIKE -> queryWrapper.likeLeft(columnName, fieldValue); + case INNER_LIKE -> queryWrapper.like(columnName, fieldValue); + case RIGHT_LIKE -> queryWrapper.likeRight(columnName, fieldValue); + case IN -> { if (CollUtil.isNotEmpty((List)fieldValue)) { queryWrapper.in(columnName, (List)fieldValue); } - break; - case NOT_IN: + } + case NOT_IN -> { if (CollUtil.isNotEmpty((List)fieldValue)) { queryWrapper.notIn(columnName, (List)fieldValue); } - break; - case IS_NULL: - queryWrapper.isNull(columnName); - break; - case IS_NOT_NULL: - queryWrapper.isNotNull(columnName); - break; - default: - throw new IllegalArgumentException(String.format("暂不支持 [%s] 查询类型", queryType)); + } + case IS_NULL -> queryWrapper.isNull(columnName); + case IS_NOT_NULL -> queryWrapper.isNotNull(columnName); + default -> throw new IllegalArgumentException(String.format("暂不支持 [%s] 查询类型", queryType)); } } } diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/entity/LogDO.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/entity/LogDO.java index 14506c5c..6210e2c8 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/entity/LogDO.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/entity/LogDO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.monitor.model.entity; +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; @@ -36,6 +37,7 @@ import top.charles7c.cnadmin.monitor.enums.LogStatusEnum; @TableName("sys_log") public class LogDO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java index bc94a608..2c851558 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.monitor.model.query; +import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -40,6 +41,7 @@ import top.charles7c.cnadmin.common.annotation.Query; @Schema(description = "登录日志查询条件") public class LoginLogQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java index 8c08a500..bb49b8de 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.monitor.model.query; +import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -40,6 +41,7 @@ import top.charles7c.cnadmin.common.annotation.Query; @Schema(description = "操作日志查询条件") public class OperationLogQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java index fbe6d883..0df09b68 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.monitor.model.query; +import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -40,6 +41,7 @@ import top.charles7c.cnadmin.common.annotation.Query; @Schema(description = "系统日志查询条件") public class SystemLogQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/LogVO.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/LogVO.java index 9301c229..4b6b0c44 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/LogVO.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/LogVO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.monitor.model.vo; +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; @@ -34,6 +35,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; @Data public class LogVO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/LoginLogVO.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/LoginLogVO.java index f388e67b..64877540 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/LoginLogVO.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/LoginLogVO.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.monitor.model.vo; +import java.io.Serial; + import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; @@ -32,6 +34,7 @@ import top.charles7c.cnadmin.monitor.enums.LogStatusEnum; @Schema(description = "登录日志信息") public class LoginLogVO extends LogVO { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/OperationLogVO.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/OperationLogVO.java index 81ce96cf..6ea66065 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/OperationLogVO.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/OperationLogVO.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.monitor.model.vo; +import java.io.Serial; + import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; @@ -32,6 +34,7 @@ import top.charles7c.cnadmin.monitor.enums.LogStatusEnum; @Schema(description = "操作日志信息") public class OperationLogVO extends LogVO { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/SystemLogDetailVO.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/SystemLogDetailVO.java index f99e893f..ef37c617 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/SystemLogDetailVO.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/SystemLogDetailVO.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.monitor.model.vo; +import java.io.Serial; + import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; @@ -30,6 +32,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "系统日志详情信息") public class SystemLogDetailVO extends LogVO { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/SystemLogVO.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/SystemLogVO.java index 3017dedd..23185f59 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/SystemLogVO.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/SystemLogVO.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.monitor.model.vo; +import java.io.Serial; + import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; @@ -30,6 +32,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "系统日志信息") public class SystemLogVO extends LogVO { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java index c078f082..16ad29a9 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.auth.model.query; +import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -38,6 +39,7 @@ import org.springframework.format.annotation.DateTimeFormat; @Schema(description = "在线用户查询条件") public class OnlineUserQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/request/LoginRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/request/LoginRequest.java index 6816ae0f..f1291e84 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/request/LoginRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/request/LoginRequest.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.auth.model.request; +import java.io.Serial; import java.io.Serializable; import jakarta.validation.constraints.NotBlank; @@ -34,6 +35,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "登录信息") public class LoginRequest implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/LoginVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/LoginVO.java index 08903d8b..452b0a83 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/LoginVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/LoginVO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.auth.model.vo; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -34,6 +35,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "令牌信息") public class LoginVO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/MetaVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/MetaVO.java index 28ff02b2..bce593fb 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/MetaVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/MetaVO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.auth.model.vo; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -34,6 +35,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "元数据信息") public class MetaVO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/OnlineUserVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/OnlineUserVO.java index 0dd92a4d..f0b652b6 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/OnlineUserVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/OnlineUserVO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.auth.model.vo; +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; @@ -33,6 +34,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "在线用户信息") public class OnlineUserVO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/RouteVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/RouteVO.java index cc7a90f0..42a7efd6 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/RouteVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/RouteVO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.auth.model.vo; +import java.io.Serial; import java.io.Serializable; import java.util.List; @@ -38,6 +39,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; @JsonInclude(JsonInclude.Include.NON_EMPTY) public class RouteVO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/UserInfoVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/UserInfoVO.java index 8b718bc1..0f90828a 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/UserInfoVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/UserInfoVO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.auth.model.vo; +import java.io.Serial; import java.io.Serializable; import java.time.LocalDate; import java.time.LocalDateTime; @@ -43,6 +44,7 @@ import top.charles7c.cnadmin.common.enums.GenderEnum; @Schema(description = "用户信息") public class UserInfoVO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DeptDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DeptDO.java index 7cbb2e5f..c8bace00 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DeptDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DeptDO.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.system.model.entity; +import java.io.Serial; + import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; @@ -34,6 +36,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; @TableName("sys_dept") public class DeptDO extends BaseDO { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/MenuDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/MenuDO.java index 2b941263..0c7e99cc 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/MenuDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/MenuDO.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.system.model.entity; +import java.io.Serial; + import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; @@ -34,6 +36,7 @@ import top.charles7c.cnadmin.common.enums.MenuTypeEnum; @TableName("sys_menu") public class MenuDO extends BaseDO { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDO.java index b08c7977..9fe71fb0 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDO.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.system.model.entity; +import java.io.Serial; + import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; @@ -35,6 +37,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; @TableName("sys_role") public class RoleDO extends BaseDO { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDeptDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDeptDO.java index b1cdc3ba..54f5bd7a 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDeptDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDeptDO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.entity; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -34,6 +35,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("sys_role_dept") public class RoleDeptDO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleMenuDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleMenuDO.java index 8e66ccb1..4db870bf 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleMenuDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleMenuDO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.entity; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -34,6 +35,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("sys_role_menu") public class RoleMenuDO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserDO.java index 086afbe8..e7e79f36 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserDO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.entity; +import java.io.Serial; import java.time.LocalDateTime; import lombok.Data; @@ -37,6 +38,7 @@ import top.charles7c.cnadmin.common.enums.GenderEnum; @TableName("sys_user") public class UserDO extends BaseDO { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserRoleDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserRoleDO.java index 1a676556..6a1091b5 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserRoleDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserRoleDO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.entity; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -34,6 +35,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("sys_user_role") public class UserRoleDO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DeptQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DeptQuery.java index 01f522b2..3ebf3c1e 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DeptQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DeptQuery.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.query; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -37,6 +38,7 @@ import top.charles7c.cnadmin.common.annotation.Query; @Schema(description = "部门查询条件") public class DeptQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/MenuQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/MenuQuery.java index e75eabe1..15e487f9 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/MenuQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/MenuQuery.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.query; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -37,6 +38,7 @@ import top.charles7c.cnadmin.common.annotation.Query; @Schema(description = "菜单查询条件") public class MenuQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java index ce21b4a4..8391c219 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.query; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -37,6 +38,7 @@ import top.charles7c.cnadmin.common.annotation.Query; @Schema(description = "角色查询条件") public class RoleQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java index 98f65b7a..8da7a1c7 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.query; +import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -40,6 +41,7 @@ import top.charles7c.cnadmin.common.annotation.Query; @Schema(description = "用户查询条件") public class UserQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java index d42562fd..e5ab6969 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.system.model.request; +import java.io.Serial; + import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; @@ -40,6 +42,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; @Schema(description = "创建或修改部门信息") public class DeptRequest extends BaseRequest { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/MenuRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/MenuRequest.java index 231808b8..0082661e 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/MenuRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/MenuRequest.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.system.model.request; +import java.io.Serial; + import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; @@ -39,6 +41,7 @@ import top.charles7c.cnadmin.common.enums.MenuTypeEnum; @Schema(description = "创建或修改菜单信息") public class MenuRequest extends BaseRequest { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/RoleRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/RoleRequest.java index 4a386cc3..904ca283 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/RoleRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/RoleRequest.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.request; +import java.io.Serial; import java.util.ArrayList; import java.util.List; @@ -44,6 +45,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; @Schema(description = "创建或修改角色信息") public class RoleRequest extends BaseRequest { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateBasicInfoRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateBasicInfoRequest.java index 2f8b5209..303cab31 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateBasicInfoRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateBasicInfoRequest.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.request; +import java.io.Serial; import java.io.Serializable; import jakarta.validation.constraints.NotBlank; @@ -39,6 +40,7 @@ import top.charles7c.cnadmin.common.enums.GenderEnum; @Schema(description = "修改基础信息") public class UpdateBasicInfoRequest implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateEmailRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateEmailRequest.java index ac8c1b8c..9109ddbf 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateEmailRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateEmailRequest.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.request; +import java.io.Serial; import java.io.Serializable; import jakarta.validation.constraints.NotBlank; @@ -39,6 +40,7 @@ import top.charles7c.cnadmin.common.constant.RegexConsts; @Schema(description = "修改邮箱信息") public class UpdateEmailRequest implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdatePasswordRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdatePasswordRequest.java index 532b74f6..7c36ead6 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdatePasswordRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdatePasswordRequest.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.request; +import java.io.Serial; import java.io.Serializable; import jakarta.validation.constraints.NotBlank; @@ -34,6 +35,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "修改密码信息") public class UpdatePasswordRequest implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateUserRoleRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateUserRoleRequest.java index f0e60860..5618e505 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateUserRoleRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateUserRoleRequest.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.request; +import java.io.Serial; import java.io.Serializable; import java.util.List; @@ -35,6 +36,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "修改用户角色信息") public class UpdateUserRoleRequest implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java index 6f71f6be..47a33591 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.request; +import java.io.Serial; import java.util.List; import jakarta.validation.constraints.NotBlank; @@ -44,6 +45,7 @@ import top.charles7c.cnadmin.common.enums.GenderEnum; @Schema(description = "创建或修改用户信息") public class UserRequest extends BaseRequest { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AvatarVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AvatarVO.java index bd3a9abc..bb77f166 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AvatarVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AvatarVO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.vo; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -34,6 +35,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "头像信息") public class AvatarVO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptDetailVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptDetailVO.java index 1698d947..2bfbed11 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptDetailVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptDetailVO.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.system.model.vo; +import java.io.Serial; + import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; @@ -40,6 +42,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; @Schema(description = "部门详情信息") public class DeptDetailVO extends BaseDetailVO { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptVO.java index c712c233..ea6b36ee 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptVO.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.system.model.vo; +import java.io.Serial; + import lombok.Data; import lombok.experimental.Accessors; @@ -38,6 +40,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; @Schema(description = "部门信息") public class DeptVO extends BaseVO { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/MenuVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/MenuVO.java index 693d94c8..96dc7ab3 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/MenuVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/MenuVO.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.system.model.vo; +import java.io.Serial; + import lombok.Data; import lombok.experimental.Accessors; @@ -43,6 +45,7 @@ import top.charles7c.cnadmin.common.enums.MenuTypeEnum; @Schema(description = "菜单信息") public class MenuVO extends BaseVO { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleDetailVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleDetailVO.java index 19ba77c8..d567e7a1 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleDetailVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleDetailVO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.vo; +import java.io.Serial; import java.util.List; import lombok.Data; @@ -42,6 +43,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; @Schema(description = "角色详情信息") public class RoleDetailVO extends BaseDetailVO { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java index b39a1a92..4bc6fab1 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.system.model.vo; +import java.io.Serial; + import lombok.Data; import lombok.experimental.Accessors; @@ -37,6 +39,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; @Schema(description = "角色信息") public class RoleVO extends BaseVO { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserDetailVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserDetailVO.java index fa31cf14..aae8b9d8 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserDetailVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserDetailVO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.vo; +import java.io.Serial; import java.time.LocalDateTime; import java.util.List; import java.util.Objects; @@ -45,6 +46,7 @@ import top.charles7c.cnadmin.common.util.helper.LoginHelper; @Schema(description = "用户详情信息") public class UserDetailVO extends BaseDetailVO { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserVO.java index faad073b..e7e687f6 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserVO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.vo; +import java.io.Serial; import java.util.Objects; import lombok.Data; @@ -42,6 +43,7 @@ import top.charles7c.cnadmin.common.util.helper.LoginHelper; @Schema(description = "用户信息") public class UserVO extends BaseVO { + @Serial private static final long serialVersionUID = 1L; /** From cf3044312c8631a8c2b306e466e3d4d663d8eb6d Mon Sep 17 00:00:00 2001 From: Charles7c Date: Fri, 31 Mar 2023 23:08:50 +0800 Subject: [PATCH 8/8] =?UTF-8?q?style:=20=E9=80=82=E9=85=8D=20Java=2016=20?= =?UTF-8?q?=E6=96=B0=E7=89=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.instanceof 模式匹配（Java 14 预览特性 => Java 16 标准特性） 详情请参阅：https://docs.oracle.com/en/java/javase/16/language/pattern-matching-instanceof-operator.html --- .../top/charles7c/cnadmin/common/base/BaseServiceImpl.java | 6 ++---- .../common/config/mybatis/MyBatisPlusMetaObjectHandler.java | 6 ++---- .../top/charles7c/cnadmin/common/util/ExceptionUtils.java | 3 +-- .../cnadmin/system/service/impl/DeptServiceImpl.java | 3 +-- .../cnadmin/system/service/impl/RoleServiceImpl.java | 3 +-- .../cnadmin/system/service/impl/UserServiceImpl.java | 3 +-- 6 files changed, 8 insertions(+), 16 deletions(-) diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java index 8eca32d4..2dc6c93a 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java @@ -217,8 +217,7 @@ public abstract class BaseServiceImpl, T extends BaseDO, * 待填充列表信息 */ protected void fill(Object baseObj) { - if (baseObj instanceof BaseVO) { - BaseVO baseVO = (BaseVO)baseObj; + if (baseObj instanceof BaseVO baseVO) { Long createUser = baseVO.getCreateUser(); if (createUser == null) { return; @@ -235,8 +234,7 @@ public abstract class BaseServiceImpl, T extends BaseDO, * 待填充详情信息 */ protected void fillDetail(Object detailObj) { - if (detailObj instanceof BaseDetailVO) { - BaseDetailVO detailVO = (BaseDetailVO)detailObj; + if (detailObj instanceof BaseDetailVO detailVO) { this.fill(detailVO); Long updateUser = detailVO.getUpdateUser(); diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java index 410bb9b8..dda88a7e 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java @@ -60,9 +60,8 @@ public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler { Long createUser = LoginHelper.getUserId(); LocalDateTime createTime = LocalDateTime.now(); - if (metaObject.getOriginalObject() instanceof BaseDO) { + if (metaObject.getOriginalObject()instanceof BaseDO baseDO) { // 继承了 BaseDO 的类，填充创建信息 - BaseDO baseDO = (BaseDO)metaObject.getOriginalObject(); baseDO.setCreateUser(ObjectUtil.defaultIfNull(baseDO.getCreateUser(), createUser)); baseDO.setCreateTime(ObjectUtil.defaultIfNull(baseDO.getCreateTime(), createTime)); baseDO.setUpdateUser(ObjectUtil.defaultIfNull(baseDO.getUpdateUser(), createUser)); @@ -94,9 +93,8 @@ public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler { Long updateUser = LoginHelper.getUserId(); LocalDateTime updateTime = LocalDateTime.now(); - if (metaObject.getOriginalObject() instanceof BaseDO) { + if (metaObject.getOriginalObject()instanceof BaseDO baseDO) { // 继承了 BaseDO 的类，填充修改信息 - BaseDO baseDO = (BaseDO)metaObject.getOriginalObject(); baseDO.setUpdateUser(updateUser); baseDO.setUpdateTime(updateTime); } else { diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExceptionUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExceptionUtils.java index 310c30ee..4c0ed35d 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExceptionUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExceptionUtils.java @@ -44,9 +44,8 @@ public class ExceptionUtils { * 异常 */ public static void printException(Runnable runnable, Throwable throwable) { - if (throwable == null && runnable instanceof Future) { + if (throwable == null && runnable instanceof Future future) { try { - Future future = (Future)runnable; if (future.isDone()) { future.get(); } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java index faad2c26..198d5276 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java @@ -131,8 +131,7 @@ public class DeptServiceImpl extends BaseServiceImpl list = menuService.list(null, null); diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java index dcb9504e..ca6c54a3 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java @@ -147,8 +147,7 @@ public class UserServiceImpl extends BaseServiceImpl deptService.get(detailVO.getDeptId()).getName())); List roleIdList = userRoleService.listRoleIdByUserId(detailVO.getId()); detailVO.setRoleIds(roleIdList);