From 913527915d6197bdfb5c757d652fb2aaab115306 Mon Sep 17 00:00:00 2001 From: dongzeliang <2746733890@qq.com> Date: Mon, 3 Mar 2025 17:20:41 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=8C=85?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/auth/controller/TokenController.java | 3 +-- .../java/com/muyu/auth/service/SysLoginService.java | 4 ++-- .../com/muyu/auth/service/SysRecordLogService.java | 2 +- .../muyu/common/core/exception/GlobalException.java | 1 - .../core/exception/auth/NotPermissionException.java | 2 +- .../core/exception/auth/NotRoleException.java | 2 +- .../java/com/muyu/common/core/text/Convert.java | 2 +- .../com/muyu/common/core/utils/ServletUtils.java | 3 +-- .../com/muyu/common/core/utils/file/FileUtils.java | 7 ++++--- .../java/com/muyu/common/core/utils/ip/IpUtils.java | 5 +++-- .../com/muyu/common/core/utils/poi/ExcelUtil.java | 3 +-- .../java/com/muyu/common/core/utils/uuid/UUID.java | 2 +- .../java/com/muyu/common/core/web/SuperBasic.java | 1 - .../common/core/web/controller/BaseController.java | 2 +- .../com/muyu/common/core/web/domain/TreeEntity.java | 5 ++++- .../java/com/muyu/common/core/web/page/PageReq.java | 2 +- .../common/datascope/aspect/DataScopeAspect.java | 2 +- .../java/com/muyu/common/log/aspect/LogAspect.java | 6 +++--- .../muyu/common/log/service/AsyncLogService.java | 2 +- .../com/muyu/common/redis/service/RedisService.java | 5 ++++- .../com/muyu/common/security/auth/AuthLogic.java | 2 +- .../security/feign/FeignRequestInterceptor.java | 2 +- .../security/handler/GlobalExceptionHandler.java | 5 ++--- .../security/interceptor/HeaderInterceptor.java | 5 ++--- .../muyu/common/security/service/TokenService.java | 2 +- .../muyu/common/security/utils/SecurityUtils.java | 3 +-- .../com/muyu/common/system/domain/LoginUser.java | 5 ++++- .../java/com/muyu/common/system/domain/SysDept.java | 13 ++++++++----- .../com/muyu/common/system/domain/SysDictData.java | 9 +++++---- .../com/muyu/common/system/domain/SysDictType.java | 8 +++++--- .../com/muyu/common/system/domain/SysOperLog.java | 5 ++++- .../java/com/muyu/common/system/domain/SysRole.java | 9 ++++++--- .../common/system/remote/RemoteUserService.java | 2 +- .../remote/factory/RemoteFileFallbackFactory.java | 2 -- .../remote/factory/RemoteLogFallbackFactory.java | 2 +- .../remote/factory/RemoteUserFallbackFactory.java | 4 ++-- .../com/muyu/gateway/filter/ValidateCodeFilter.java | 1 - .../muyu/gateway/handler/ValidateCodeHandler.java | 4 +--- .../muyu/gateway/service/ValidateCodeService.java | 4 +--- .../service/impl/ValidateCodeServiceImpl.java | 4 ++-- .../com/muyu/file/controller/SysFileController.java | 2 +- .../java/com/muyu/gen/controller/GenController.java | 4 ++-- .../src/main/java/com/muyu/gen/domain/GenTable.java | 4 ++-- .../java/com/muyu/gen/domain/GenTableColumn.java | 4 +--- .../muyu/gen/service/GenTableColumnServiceImpl.java | 1 - .../muyu/system/controller/SysDeptController.java | 2 +- .../system/controller/SysDictTypeController.java | 1 - .../system/controller/SysLogininforController.java | 1 - .../muyu/system/controller/SysNoticeController.java | 1 - .../system/controller/SysOperlogController.java | 1 - .../muyu/system/controller/SysPostController.java | 5 ++++- .../main/java/com/muyu/system/domain/SysNotice.java | 1 - .../main/java/com/muyu/system/domain/SysPost.java | 5 +++-- .../system/domain/model/SysDictTypeAddModel.java | 3 --- .../system/domain/model/SysDictTypeListModel.java | 1 - .../system/domain/model/SysDictTypeUpdModel.java | 3 --- .../muyu/system/domain/model/SysMenuAddModel.java | 2 -- .../muyu/system/domain/model/SysMenuListModel.java | 1 - .../system/domain/model/SysMenuPageQueryModel.java | 1 - .../muyu/system/domain/model/SysMenuUpdModel.java | 1 - .../muyu/system/domain/model/SysNoticeAddModel.java | 5 ++++- .../system/domain/model/SysNoticeListModel.java | 5 ++++- .../muyu/system/domain/model/SysPostEditModel.java | 5 +++-- .../muyu/system/domain/model/SysPostListModel.java | 10 +++++++--- .../muyu/system/domain/model/SysPostSaveModel.java | 5 +++-- .../muyu/system/domain/rep/SysDictDataAddReq.java | 6 ++++-- .../muyu/system/domain/rep/SysDictTypeAddReq.java | 1 - .../muyu/system/domain/rep/SysLogininforAddReq.java | 1 - .../com/muyu/system/domain/rep/SysNoticeAddReq.java | 6 ++++-- .../com/muyu/system/domain/rep/SysPostEditReq.java | 5 +++-- .../com/muyu/system/domain/rep/SysPostSaveReq.java | 8 +++----- .../system/domain/resp/SysDictTypeListResp.java | 1 - .../muyu/system/domain/resp/SysNoticeListResp.java | 7 ++++--- .../muyu/system/domain/resp/SysOperlogListResp.java | 5 ++++- .../muyu/system/domain/resp/SysPostListResp.java | 5 ++--- .../com/muyu/system/mapper/SysOperLogMapper.java | 1 - .../com/muyu/system/mapper/SysUserRoleMapper.java | 1 - .../com/muyu/system/service/SysDictDataService.java | 1 - .../com/muyu/system/service/SysNoticeService.java | 1 - .../com/muyu/system/service/SysPostService.java | 2 -- .../system/service/impl/SysDictDataServiceImpl.java | 1 - .../system/service/impl/SysMenuServiceImpl.java | 2 +- .../system/service/impl/SysNoticeServiceImpl.java | 2 -- .../system/service/impl/SysPostServiceImpl.java | 3 --- .../system/service/impl/SysRoleServiceImpl.java | 2 +- .../system/service/impl/SysUserServiceImpl.java | 3 +-- 86 files changed, 142 insertions(+), 148 deletions(-) diff --git a/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java b/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java index d870762..1b9f862 100644 --- a/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java +++ b/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java @@ -10,14 +10,13 @@ import com.muyu.common.security.auth.AuthUtil; import com.muyu.common.security.service.TokenService; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.LoginUser; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import jakarta.servlet.http.HttpServletRequest; - /** * token 控制 * diff --git a/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java b/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java index ed4945f..7a74550 100644 --- a/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java +++ b/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java @@ -12,9 +12,9 @@ import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.ip.IpUtils; import com.muyu.common.redis.service.RedisService; import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.remote.RemoteUserService; -import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.domain.LoginUser; +import com.muyu.common.system.domain.SysUser; +import com.muyu.common.system.remote.RemoteUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/cloud-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java b/cloud-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java index 25239ed..fbe0002 100644 --- a/cloud-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java +++ b/cloud-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java @@ -4,8 +4,8 @@ import com.muyu.common.core.constant.Constants; import com.muyu.common.core.constant.SecurityConstants; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.ip.IpUtils; -import com.muyu.common.system.remote.RemoteLogService; import com.muyu.common.system.domain.SysLogininfor; +import com.muyu.common.system.remote.RemoteLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/GlobalException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/GlobalException.java index 0dbaf72..6c9f06d 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/GlobalException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/GlobalException.java @@ -1,7 +1,6 @@ package com.muyu.common.core.exception; import com.muyu.common.core.domain.Result; -import lombok.Data; /** * 全局异常 diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/auth/NotPermissionException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/auth/NotPermissionException.java index ff0fb65..91f121d 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/auth/NotPermissionException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/auth/NotPermissionException.java @@ -2,7 +2,7 @@ package com.muyu.common.core.exception.auth; import org.apache.commons.lang3.StringUtils; -import static com.muyu.common.core.constant.SplitConstants.*; +import static com.muyu.common.core.constant.SplitConstants.COMMA_STR; /** * 未能通过的权限认证异常 diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/auth/NotRoleException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/auth/NotRoleException.java index bb62d8b..c4693eb 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/auth/NotRoleException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/auth/NotRoleException.java @@ -2,7 +2,7 @@ package com.muyu.common.core.exception.auth; import org.apache.commons.lang3.StringUtils; -import static com.muyu.common.core.constant.SplitConstants.*; +import static com.muyu.common.core.constant.SplitConstants.COMMA_STR; /** * 未能通过的角色认证异常 diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/text/Convert.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/text/Convert.java index d88d918..0d6d5e9 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/text/Convert.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/text/Convert.java @@ -11,7 +11,7 @@ import java.text.NumberFormat; import java.util.List; import java.util.Set; -import static com.muyu.common.core.constant.SplitConstants.*; +import static com.muyu.common.core.constant.SplitConstants.COMMA_STR; /** * 类型转换器 diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java index 32c354c..aa5d848 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java @@ -18,7 +18,6 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import reactor.core.publisher.Mono; - import java.io.IOException; import java.net.URLDecoder; import java.net.URLEncoder; @@ -26,7 +25,7 @@ import java.nio.charset.StandardCharsets; import java.util.*; import static com.muyu.common.core.constant.HttpConstants.*; -import static com.muyu.common.core.constant.SplitConstants.*; +import static com.muyu.common.core.constant.SplitConstants.COMMA_STR; import static org.springframework.http.HttpHeaders.ACCEPT; /** diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/file/FileUtils.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/file/FileUtils.java index 73c7466..9fff799 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/file/FileUtils.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/file/FileUtils.java @@ -1,16 +1,17 @@ package com.muyu.common.core.utils.file; import com.muyu.common.core.utils.StringUtils; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.extern.log4j.Log4j2; import org.apache.commons.lang3.ArrayUtils; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import java.io.*; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import static com.muyu.common.core.constant.SplitConstants.*; +import static com.muyu.common.core.constant.SplitConstants.ADDITION_STR; +import static com.muyu.common.core.constant.SplitConstants.EMPTY_STR; /** * 文件处理工具类 diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java index 021c91a..35f70b9 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java @@ -2,12 +2,13 @@ package com.muyu.common.core.utils.ip; import com.muyu.common.core.utils.ServletUtils; import com.muyu.common.core.utils.StringUtils; - import jakarta.servlet.http.HttpServletRequest; + import java.net.InetAddress; import java.net.UnknownHostException; -import static com.muyu.common.core.constant.SplitConstants.*; +import static com.muyu.common.core.constant.SplitConstants.COMMA_STR; +import static com.muyu.common.core.constant.SplitConstants.SUBTRACTION_STR; /** * 获取IP方法 diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelUtil.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelUtil.java index 107c53c..8a7da11 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelUtil.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelUtil.java @@ -11,6 +11,7 @@ import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.file.FileTypeUtils; import com.muyu.common.core.utils.file.ImageUtils; import com.muyu.common.core.utils.reflect.ReflectUtils; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.RegExUtils; import org.apache.commons.lang3.reflect.FieldUtils; @@ -24,7 +25,6 @@ import org.apache.poi.xssf.usermodel.XSSFDataValidation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Field; @@ -38,7 +38,6 @@ import java.util.*; import java.util.stream.Collectors; import static com.muyu.common.core.constant.SplitConstants.*; -import static com.muyu.common.core.constant.SplitConstants.UNDERLINE_STR; /** * Excel相关处理 diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/uuid/UUID.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/uuid/UUID.java index 02e764b..a8f2248 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/uuid/UUID.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/uuid/UUID.java @@ -8,7 +8,7 @@ import java.security.SecureRandom; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; -import static com.muyu.common.core.constant.SplitConstants.*; +import static com.muyu.common.core.constant.SplitConstants.SUBTRACTION_STR; /** * 提供通用唯一识别码（universally unique identifier）（UUID）实现 diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/SuperBasic.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/SuperBasic.java index cf7411b..4404eda 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/SuperBasic.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/SuperBasic.java @@ -1,6 +1,5 @@ package com.muyu.common.core.web; -import com.muyu.common.core.utils.reflect.ReflectUtils; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java index 17267b7..2e12afd 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java @@ -1,7 +1,7 @@ package com.muyu.common.core.web.controller; -import com.muyu.common.core.utils.DateUtils; import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.DateUtils; import com.muyu.common.core.web.page.DataPageResp; import com.muyu.common.core.web.page.PageQueryModel; import org.slf4j.Logger; diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/domain/TreeEntity.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/domain/TreeEntity.java index 85ea8df..b4bd1b6 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/domain/TreeEntity.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/domain/TreeEntity.java @@ -1,6 +1,9 @@ package com.muyu.common.core.web.domain; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import java.util.ArrayList; diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/PageReq.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/PageReq.java index f0d4cba..ac14125 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/PageReq.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/PageReq.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import static com.muyu.common.core.constant.SplitConstants.*; +import static com.muyu.common.core.constant.SplitConstants.EMPTY_STR; /** * 分页数据 diff --git a/cloud-common/cloud-common-datascope/src/main/java/com/muyu/common/datascope/aspect/DataScopeAspect.java b/cloud-common/cloud-common-datascope/src/main/java/com/muyu/common/datascope/aspect/DataScopeAspect.java index 3dc12b2..254ea69 100644 --- a/cloud-common/cloud-common-datascope/src/main/java/com/muyu/common/datascope/aspect/DataScopeAspect.java +++ b/cloud-common/cloud-common-datascope/src/main/java/com/muyu/common/datascope/aspect/DataScopeAspect.java @@ -6,9 +6,9 @@ import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.common.datascope.annotation.DataScope; import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.common.system.domain.LoginUser; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; -import com.muyu.common.system.domain.LoginUser; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; diff --git a/cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java b/cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java index 241897c..c18e163 100644 --- a/cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java +++ b/cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java @@ -10,6 +10,8 @@ import com.muyu.common.log.filter.PropertyPreExcludeFilter; import com.muyu.common.log.service.AsyncLogService; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysOperLog; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.ArrayUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; @@ -25,12 +27,10 @@ import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import java.util.Collection; import java.util.Map; -import static com.muyu.common.core.constant.SplitConstants.*; +import static com.muyu.common.core.constant.SplitConstants.EMPTY_STR; /** * 操作日志记录处理 diff --git a/cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/service/AsyncLogService.java b/cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/service/AsyncLogService.java index 46e1cdf..05e312e 100644 --- a/cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/service/AsyncLogService.java +++ b/cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/service/AsyncLogService.java @@ -1,8 +1,8 @@ package com.muyu.common.log.service; import com.muyu.common.core.constant.SecurityConstants; -import com.muyu.common.system.remote.RemoteLogService; import com.muyu.common.system.domain.SysOperLog; +import com.muyu.common.system.remote.RemoteLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/cloud-common/cloud-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java b/cloud-common/cloud-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java index 91260e8..d7276f3 100644 --- a/cloud-common/cloud-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java +++ b/cloud-common/cloud-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java @@ -7,7 +7,10 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ValueOperations; import org.springframework.stereotype.Component; -import java.util.*; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.TimeUnit; /** diff --git a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/auth/AuthLogic.java b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/auth/AuthLogic.java index 2cb531c..17bdbb7 100644 --- a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/auth/AuthLogic.java +++ b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/auth/AuthLogic.java @@ -19,7 +19,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -import static com.muyu.common.core.constant.SplitConstants.*; +import static com.muyu.common.core.constant.SplitConstants.COMMA_STR; /** * Token 权限验证，逻辑实现类 diff --git a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/feign/FeignRequestInterceptor.java b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/feign/FeignRequestInterceptor.java index 8ae21da..d7c046f 100644 --- a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/feign/FeignRequestInterceptor.java +++ b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/feign/FeignRequestInterceptor.java @@ -6,9 +6,9 @@ import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.ip.IpUtils; import feign.RequestInterceptor; import feign.RequestTemplate; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.stereotype.Component; -import jakarta.servlet.http.HttpServletRequest; import java.util.Map; /** diff --git a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/handler/GlobalExceptionHandler.java b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/handler/GlobalExceptionHandler.java index 2430461..d2ec363 100644 --- a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/handler/GlobalExceptionHandler.java +++ b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/handler/GlobalExceptionHandler.java @@ -1,13 +1,14 @@ package com.muyu.common.security.handler; import com.muyu.common.core.constant.HttpStatus; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.exception.DemoModeException; import com.muyu.common.core.exception.InnerAuthException; import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.exception.auth.NotPermissionException; import com.muyu.common.core.exception.auth.NotRoleException; import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.domain.Result; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.validation.BindException; @@ -18,8 +19,6 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; -import jakarta.servlet.http.HttpServletRequest; - import java.util.Objects; /** diff --git a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/interceptor/HeaderInterceptor.java b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/interceptor/HeaderInterceptor.java index 0cf8a94..263aee4 100644 --- a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/interceptor/HeaderInterceptor.java +++ b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/interceptor/HeaderInterceptor.java @@ -7,11 +7,10 @@ import com.muyu.common.core.utils.StringUtils; import com.muyu.common.security.auth.AuthUtil; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.LoginUser; -import org.springframework.web.method.HandlerMethod; -import org.springframework.web.servlet.AsyncHandlerInterceptor; - import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.web.method.HandlerMethod; +import org.springframework.web.servlet.AsyncHandlerInterceptor; /** * 自定义请求头拦截器，将Header数据封装到线程变量中方便获取 diff --git a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/service/TokenService.java b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/service/TokenService.java index aa70d02..cfbc933 100644 --- a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/service/TokenService.java +++ b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/service/TokenService.java @@ -10,12 +10,12 @@ import com.muyu.common.core.utils.uuid.IdUtils; import com.muyu.common.redis.service.RedisService; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.LoginUser; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import jakarta.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; diff --git a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/utils/SecurityUtils.java b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/utils/SecurityUtils.java index 6e3f92b..d1f567e 100644 --- a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/utils/SecurityUtils.java +++ b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/utils/SecurityUtils.java @@ -6,9 +6,8 @@ import com.muyu.common.core.context.SecurityContextHolder; import com.muyu.common.core.utils.ServletUtils; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.system.domain.LoginUser; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; - import jakarta.servlet.http.HttpServletRequest; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; /** * 权限获取工具类 diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java index a18af37..7fc3814 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java @@ -1,7 +1,10 @@ package com.muyu.common.system.domain; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.Set; diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java index a7d67e3..862af6f 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java @@ -5,13 +5,16 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import lombok.*; -import lombok.experimental.SuperBuilder; - import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + import java.util.ArrayList; import java.util.List; diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java index f0ad1b6..5f52749 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java @@ -2,14 +2,15 @@ package com.muyu.common.system.domain; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.annotation.Excel.ColumnType; -import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.enums.SysWhetherEnum; import com.muyu.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.SuperBuilder; - import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * 字典数据表 sys_dict_data diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java index d623333..4933abd 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java @@ -3,12 +3,14 @@ package com.muyu.common.system.domain; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.annotation.Excel.ColumnType; import com.muyu.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.SuperBuilder; - import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * 字典类型表 sys_dict_type diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysOperLog.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysOperLog.java index 804cff8..30bc6f2 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysOperLog.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysOperLog.java @@ -3,7 +3,10 @@ package com.muyu.common.system.domain; import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.annotation.Excel.ColumnType; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; import java.util.Date; diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java index 9526346..95e6241 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java @@ -5,12 +5,15 @@ import com.baomidou.mybatisplus.annotation.TableLogic; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.annotation.Excel.ColumnType; import com.muyu.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.SuperBuilder; - import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + import java.util.Set; /** diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java index cb968e0..87ca4d6 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java @@ -3,9 +3,9 @@ package com.muyu.common.system.remote; import com.muyu.common.core.constant.SecurityConstants; import com.muyu.common.core.constant.ServiceNameConstants; import com.muyu.common.core.domain.Result; +import com.muyu.common.system.domain.LoginUser; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory; -import com.muyu.common.system.domain.LoginUser; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteFileFallbackFactory.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteFileFallbackFactory.java index 766e60c..bed62f3 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteFileFallbackFactory.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteFileFallbackFactory.java @@ -2,12 +2,10 @@ package com.muyu.common.system.remote.factory; import com.muyu.common.core.domain.Result; import com.muyu.common.system.remote.RemoteFileService; -import com.muyu.common.system.domain.SysFile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; -import org.springframework.web.multipart.MultipartFile; /** * 文件服务降级处理 diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteLogFallbackFactory.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteLogFallbackFactory.java index 1decb18..f5f038e 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteLogFallbackFactory.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteLogFallbackFactory.java @@ -2,8 +2,8 @@ package com.muyu.common.system.remote.factory; import com.muyu.common.core.domain.Result; import com.muyu.common.system.domain.SysLogininfor; -import com.muyu.common.system.remote.RemoteLogService; import com.muyu.common.system.domain.SysOperLog; +import com.muyu.common.system.remote.RemoteLogService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java index b7f4d60..a76621d 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java @@ -1,9 +1,9 @@ package com.muyu.common.system.remote.factory; import com.muyu.common.core.domain.Result; -import com.muyu.common.system.remote.RemoteUserService; -import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.domain.LoginUser; +import com.muyu.common.system.domain.SysUser; +import com.muyu.common.system.remote.RemoteUserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; diff --git a/cloud-gateway/src/main/java/com/muyu/gateway/filter/ValidateCodeFilter.java b/cloud-gateway/src/main/java/com/muyu/gateway/filter/ValidateCodeFilter.java index 630f3a5..a453a35 100644 --- a/cloud-gateway/src/main/java/com/muyu/gateway/filter/ValidateCodeFilter.java +++ b/cloud-gateway/src/main/java/com/muyu/gateway/filter/ValidateCodeFilter.java @@ -10,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.gateway.filter.GatewayFilter; import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory; import org.springframework.core.io.buffer.DataBuffer; -import org.springframework.core.io.buffer.DataBufferUtils; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.stereotype.Component; import reactor.core.publisher.Flux; diff --git a/cloud-gateway/src/main/java/com/muyu/gateway/handler/ValidateCodeHandler.java b/cloud-gateway/src/main/java/com/muyu/gateway/handler/ValidateCodeHandler.java index 0110afd..93b5f86 100644 --- a/cloud-gateway/src/main/java/com/muyu/gateway/handler/ValidateCodeHandler.java +++ b/cloud-gateway/src/main/java/com/muyu/gateway/handler/ValidateCodeHandler.java @@ -1,7 +1,7 @@ package com.muyu.gateway.handler; -import com.muyu.common.core.exception.CaptchaException; import com.muyu.common.core.domain.Result; +import com.muyu.common.core.exception.CaptchaException; import com.muyu.gateway.model.resp.CaptchaCodeResp; import com.muyu.gateway.service.ValidateCodeService; import org.springframework.beans.factory.annotation.Autowired; @@ -13,8 +13,6 @@ import org.springframework.web.reactive.function.server.ServerRequest; import org.springframework.web.reactive.function.server.ServerResponse; import reactor.core.publisher.Mono; -import java.io.IOException; - /** * 验证码获取 * diff --git a/cloud-gateway/src/main/java/com/muyu/gateway/service/ValidateCodeService.java b/cloud-gateway/src/main/java/com/muyu/gateway/service/ValidateCodeService.java index 532c385..756d9b9 100644 --- a/cloud-gateway/src/main/java/com/muyu/gateway/service/ValidateCodeService.java +++ b/cloud-gateway/src/main/java/com/muyu/gateway/service/ValidateCodeService.java @@ -1,11 +1,9 @@ package com.muyu.gateway.service; -import com.muyu.common.core.exception.CaptchaException; import com.muyu.common.core.domain.Result; +import com.muyu.common.core.exception.CaptchaException; import com.muyu.gateway.model.resp.CaptchaCodeResp; -import java.io.IOException; - /** * 验证码处理 * diff --git a/cloud-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java b/cloud-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java index ba8c1b8..607c978 100644 --- a/cloud-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java +++ b/cloud-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java @@ -3,11 +3,11 @@ package com.muyu.gateway.service.impl; import com.google.code.kaptcha.Producer; import com.muyu.common.core.constant.CacheConstants; import com.muyu.common.core.constant.Constants; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.exception.CaptchaException; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.sign.Base64; import com.muyu.common.core.utils.uuid.IdUtils; -import com.muyu.common.core.domain.Result; import com.muyu.common.redis.service.RedisService; import com.muyu.gateway.config.properties.CaptchaProperties; import com.muyu.gateway.model.resp.CaptchaCodeResp; @@ -22,7 +22,7 @@ import java.awt.image.BufferedImage; import java.io.IOException; import java.util.concurrent.TimeUnit; -import static com.muyu.common.core.constant.SplitConstants.*; +import static com.muyu.common.core.constant.SplitConstants.ANTE_STR; /** * 验证码实现处理 diff --git a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/controller/SysFileController.java b/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/controller/SysFileController.java index ed04d11..1b7322a 100644 --- a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/controller/SysFileController.java +++ b/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/controller/SysFileController.java @@ -2,8 +2,8 @@ package com.muyu.file.controller; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.file.FileUtils; -import com.muyu.file.service.ISysFileService; import com.muyu.common.system.domain.SysFile; +import com.muyu.file.service.ISysFileService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java index 422092b..f66dedd 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java +++ b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java @@ -1,8 +1,8 @@ package com.muyu.gen.controller; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.text.Convert; import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.DataPageResp; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; @@ -11,12 +11,12 @@ import com.muyu.gen.domain.GenTable; import com.muyu.gen.domain.GenTableColumn; import com.muyu.gen.service.IGenTableColumnService; import com.muyu.gen.service.IGenTableService; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.HashMap; import java.util.List; diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTable.java b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTable.java index edb6510..00507c2 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTable.java +++ b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTable.java @@ -3,6 +3,8 @@ package com.muyu.gen.domain; import com.muyu.common.core.constant.GenConstants; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.domain.BaseEntity; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,8 +12,6 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.ArrayUtils; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotBlank; import java.util.List; diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java index 5f9c47f..58a19be 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java +++ b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java @@ -2,15 +2,13 @@ package com.muyu.gen.domain; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.domain.BaseEntity; +import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import jakarta.validation.constraints.NotBlank; - -import static com.muyu.common.core.constant.SplitConstants.*; import static com.muyu.common.core.constant.SplitConstants.*; /** diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java index 9a9ac0a..7b3a5cb 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java +++ b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java @@ -1,6 +1,5 @@ package com.muyu.gen.service; -import com.muyu.common.core.text.Convert; import com.muyu.gen.domain.GenTableColumn; import com.muyu.gen.mapper.GenTableColumnMapper; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java index d501a6c..eb94b8c 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -import static com.muyu.common.core.constant.SplitConstants.*; +import static com.muyu.common.core.constant.SplitConstants.COMMA_STR; /** * 部门信息 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java index e005bd6..b2422bc 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java @@ -10,7 +10,6 @@ import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDictType; import com.muyu.system.domain.model.SysDictTypeAddModel; -import com.muyu.system.domain.model.SysDictTypeListModel; import com.muyu.system.domain.model.SysDictTypePageQueryModel; import com.muyu.system.domain.model.SysDictTypeUpdModel; import com.muyu.system.domain.rep.SysDictTypeAddReq; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java index 44a951a..0153213 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java @@ -9,7 +9,6 @@ import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.redis.service.RedisService; -import com.muyu.common.security.annotation.InnerAuth; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.system.domain.SysLogininfor; import com.muyu.system.domain.model.SysLogininforAddModel; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java index 485ee89..3f1a741 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java @@ -8,7 +8,6 @@ import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.system.domain.SysNotice; import com.muyu.system.domain.model.*; import com.muyu.system.domain.rep.SysNoticeAddReq; import com.muyu.system.domain.rep.SysNoticeListReq; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java index f0ea12d..cfdc195 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java @@ -15,7 +15,6 @@ import com.muyu.system.domain.rep.SysOperLogAddReq; import com.muyu.system.domain.rep.SysOperlogListReq; import com.muyu.system.domain.resp.SysOperlogListResp; import com.muyu.system.service.SysOperLogService; -import io.jsonwebtoken.lang.Arrays; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java index 7bb9577..441f40f 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java @@ -10,7 +10,10 @@ import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.system.domain.SysPost; -import com.muyu.system.domain.model.*; +import com.muyu.system.domain.model.SysPostEditModel; +import com.muyu.system.domain.model.SysPostListModel; +import com.muyu.system.domain.model.SysPostPageQueryModel; +import com.muyu.system.domain.model.SysPostSaveModel; import com.muyu.system.domain.rep.SysPostEditReq; import com.muyu.system.domain.rep.SysPostListReq; import com.muyu.system.domain.rep.SysPostSaveReq; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java index 3fa0206..6340f21 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.system.domain.model.SysNoticeAddModel; -import com.muyu.system.domain.model.SysNoticeDetailModel; import com.muyu.system.domain.model.SysNoticeUpdModel; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java index 763c550..e63db1e 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java @@ -8,12 +8,13 @@ import com.muyu.common.core.annotation.Excel.ColumnType; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.system.domain.model.SysPostEditModel; import com.muyu.system.domain.model.SysPostSaveModel; -import com.muyu.system.domain.rep.SysPostSaveReq; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.*; -import lombok.experimental.SuperBuilder;import java.util.Date; +import lombok.experimental.SuperBuilder; + +import java.util.Date; /** * 岗位表 sys_post diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypeAddModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypeAddModel.java index 952b664..3180ace 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypeAddModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypeAddModel.java @@ -2,9 +2,6 @@ package com.muyu.system.domain.model; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.system.domain.rep.SysDictTypeAddReq; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Pattern; -import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypeListModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypeListModel.java index 9763df9..7c1c900 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypeListModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypeListModel.java @@ -4,7 +4,6 @@ import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.annotation.Excel.ColumnType; import com.muyu.common.core.web.domain.BaseEntity; import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypeUpdModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypeUpdModel.java index 4b4f26b..b7fe385 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypeUpdModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypeUpdModel.java @@ -2,9 +2,6 @@ package com.muyu.system.domain.model; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.system.domain.rep.SysDictTypeUpdReq; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Pattern; -import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuAddModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuAddModel.java index dd3ef3d..79aad8d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuAddModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuAddModel.java @@ -3,8 +3,6 @@ package com.muyu.system.domain.model; import com.muyu.system.domain.SysMenu; import com.muyu.system.domain.rep.SysMenuAddReq; import com.muyu.system.domain.rep.SysMenuUpdReq; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuListModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuListModel.java index f663316..57d3be4 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuListModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuListModel.java @@ -1,7 +1,6 @@ package com.muyu.system.domain.model; import com.muyu.system.domain.SysMenu; -import com.muyu.system.domain.rep.SysMenuAddReq; import com.muyu.system.domain.rep.SysMenuListReq; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuPageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuPageQueryModel.java index 4f49885..cbc9860 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuPageQueryModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuPageQueryModel.java @@ -1,7 +1,6 @@ package com.muyu.system.domain.model; import com.muyu.common.core.web.model.QueryModel; -import com.muyu.system.domain.rep.SysMenuAddReq; import com.muyu.system.domain.rep.SysMenuListReq; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuUpdModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuUpdModel.java index 8cf8af2..355d465 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuUpdModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuUpdModel.java @@ -1,7 +1,6 @@ package com.muyu.system.domain.model; import com.muyu.system.domain.SysMenu; -import com.muyu.system.domain.rep.SysMenuAddReq; import com.muyu.system.domain.rep.SysMenuUpdReq; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysNoticeAddModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysNoticeAddModel.java index 173b9a2..4811550 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysNoticeAddModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysNoticeAddModel.java @@ -5,7 +5,10 @@ import com.muyu.common.core.xss.Xss; import com.muyu.system.domain.rep.SysNoticeAddReq; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import java.util.Date; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysNoticeListModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysNoticeListModel.java index ce5b59e..91b0edd 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysNoticeListModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysNoticeListModel.java @@ -2,7 +2,10 @@ package com.muyu.system.domain.model; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.system.domain.SysNotice; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostEditModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostEditModel.java index 60f114d..0fd6438 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostEditModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostEditModel.java @@ -2,11 +2,12 @@ package com.muyu.system.domain.model; import com.muyu.common.core.annotation.Excel; import com.muyu.system.domain.rep.SysPostEditReq; -import com.muyu.system.domain.rep.SysPostSaveReq; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.NoArgsConstructor; /** +import lombok.NoArgsConstructor; + +/** * 岗位信息列表模型 * @author: AoCi Tian * @create: 2025-02-23 19:31 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostListModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostListModel.java index 50b91f3..55a7dd8 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostListModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostListModel.java @@ -3,10 +3,14 @@ package com.muyu.system.domain.model; import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.common.core.annotation.Excel; import com.muyu.system.domain.SysPost; -import lombok.*; -import lombok.experimental.SuperBuilder; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; -import java.util.Date; /** +import java.util.Date; + +/** * 岗位信息列表模型 * @author: AoCi Tian * @create: 2025-02-23 19:31 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostSaveModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostSaveModel.java index 1d727b4..81b4ed4 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostSaveModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostSaveModel.java @@ -1,12 +1,13 @@ package com.muyu.system.domain.model; import com.muyu.common.core.annotation.Excel; -import com.muyu.system.domain.SysPost; import com.muyu.system.domain.rep.SysPostSaveReq; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.NoArgsConstructor; /** +import lombok.NoArgsConstructor; + +/** * 岗位信息列表模型 * @author: AoCi Tian * @create: 2025-02-23 19:31 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictDataAddReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictDataAddReq.java index 9242e2b..2fe0119 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictDataAddReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictDataAddReq.java @@ -1,11 +1,13 @@ package com.muyu.system.domain.rep; -import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.enums.SysWhetherEnum; import com.muyu.common.core.web.domain.BaseEntity; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictTypeAddReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictTypeAddReq.java index 00f86b3..343f7d4 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictTypeAddReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictTypeAddReq.java @@ -1,6 +1,5 @@ package com.muyu.system.domain.rep; -import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.domain.BaseEntity; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysLogininforAddReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysLogininforAddReq.java index 8de33b5..e0ce547 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysLogininforAddReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysLogininforAddReq.java @@ -1,7 +1,6 @@ package com.muyu.system.domain.rep; import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.common.core.annotation.Excel; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysNoticeAddReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysNoticeAddReq.java index a2dce8b..3916c6a 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysNoticeAddReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysNoticeAddReq.java @@ -4,8 +4,10 @@ import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.common.core.xss.Xss; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; -import lombok.*; -import lombok.experimental.SuperBuilder; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; /** * 通知公告新增请求对象 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostEditReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostEditReq.java index e09a8dc..8f171d8 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostEditReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostEditReq.java @@ -1,11 +1,12 @@ package com.muyu.system.domain.rep; import com.muyu.common.core.annotation.Excel; -import com.muyu.system.domain.SysPost; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.NoArgsConstructor; /** +import lombok.NoArgsConstructor; + +/** * 岗位信息列表模型 * @author: AoCi Tian * @create: 2025-02-23 19:31 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostSaveReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostSaveReq.java index 7f6adab..81b1cd0 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostSaveReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostSaveReq.java @@ -1,14 +1,12 @@ package com.muyu.system.domain.rep; import com.muyu.common.core.annotation.Excel; -import com.muyu.system.domain.SysPost; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.NoArgsConstructor; /** +import lombok.NoArgsConstructor; + +/** * 岗位信息列表模型 * @author: AoCi Tian * @create: 2025-02-23 19:31 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/SysDictTypeListResp.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/SysDictTypeListResp.java index 02ba1c5..dee6a24 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/SysDictTypeListResp.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/SysDictTypeListResp.java @@ -5,7 +5,6 @@ import com.muyu.common.core.annotation.Excel.ColumnType; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.system.domain.model.SysDictTypeListModel; import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/SysNoticeListResp.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/SysNoticeListResp.java index 471c264..e59a13c 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/SysNoticeListResp.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/SysNoticeListResp.java @@ -1,9 +1,10 @@ package com.muyu.system.domain.resp; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.muyu.common.core.web.domain.BaseEntity; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/SysOperlogListResp.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/SysOperlogListResp.java index a5bcaa3..445e747 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/SysOperlogListResp.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/SysOperlogListResp.java @@ -2,7 +2,10 @@ package com.muyu.system.domain.resp; import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.common.system.domain.SysOperLog; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; import java.util.Date; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/SysPostListResp.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/SysPostListResp.java index c70abdc..82102fb 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/SysPostListResp.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/SysPostListResp.java @@ -2,8 +2,6 @@ package com.muyu.system.domain.resp; import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.web.page.PageQueryModel; -import com.muyu.system.domain.SysPost; import com.muyu.system.domain.model.SysPostListModel; import lombok.AllArgsConstructor; import lombok.Builder; @@ -11,7 +9,8 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.Date; -import java.util.List; /** + +/** * 岗位信息响应列表 * @author: AoCi Tian diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java index dcf60e2..7b7b188 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java @@ -3,7 +3,6 @@ package com.muyu.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysOperLog; import org.apache.ibatis.annotations.Mapper; -import org.springframework.beans.factory.annotation.Autowired; /** * 操作日志 数据层 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java index b907332..df85b97 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java @@ -3,7 +3,6 @@ package com.muyu.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.system.domain.SysUserRole; import org.apache.ibatis.annotations.Mapper; -import org.springframework.beans.factory.annotation.Autowired; /** * 用户与角色关联表 数据层 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictDataService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictDataService.java index d009ac3..40fdfd5 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictDataService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictDataService.java @@ -6,7 +6,6 @@ import com.muyu.common.system.domain.SysDictData; import com.muyu.system.domain.model.SysDictDataAddModel; import com.muyu.system.domain.model.SysDictDataPageQueryModel; import com.muyu.system.domain.model.SysDictDataUpdModel; -import com.muyu.system.domain.rep.SysDictDataUpdReq; import java.util.List; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysNoticeService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysNoticeService.java index b2272f6..f35cbf2 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysNoticeService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysNoticeService.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.system.domain.SysNotice; import com.muyu.system.domain.model.*; -import com.muyu.system.domain.rep.SysNoticeUpdReq; import java.util.List; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysPostService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysPostService.java index 48fcbd3..9cd27df 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysPostService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysPostService.java @@ -1,11 +1,9 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.common.core.web.page.DataPageResp; import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.system.domain.SysPost; import com.muyu.system.domain.model.*; -import com.muyu.system.domain.resp.SysPostListResp; import java.util.List; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java index ca088b7..ad93c32 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java @@ -14,7 +14,6 @@ import com.muyu.system.domain.model.SysDictDataPageQueryModel; import com.muyu.system.domain.model.SysDictDataUpdModel; import com.muyu.system.mapper.SysDictDataMapper; import com.muyu.system.service.SysDictDataService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.Assert; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java index 3a8f982..f955319 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Service; import java.util.*; import java.util.stream.Collectors; -import static com.muyu.common.core.constant.SplitConstants.*; +import static com.muyu.common.core.constant.SplitConstants.COMMA_STR; /** * 菜单 业务层处理 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java index 8b78c29..6790f7b 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java @@ -7,10 +7,8 @@ import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.system.domain.SysNotice; import com.muyu.system.domain.model.*; -import com.muyu.system.domain.rep.SysNoticeUpdReq; import com.muyu.system.mapper.SysNoticeMapper; import com.muyu.system.service.SysNoticeService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java index cb81b78..3ac482a 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java @@ -6,13 +6,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.web.page.DataPageResp; import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.system.domain.SysPost; import com.muyu.system.domain.model.*; -import com.muyu.system.domain.resp.SysPostListResp; import com.muyu.system.mapper.SysPostMapper; -import com.muyu.system.mapper.SysUserPostMapper; import com.muyu.system.service.SysPostService; import com.muyu.system.service.SysUserPostService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java index daefced..75c2f33 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java @@ -29,7 +29,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.*; -import static com.muyu.common.core.constant.SplitConstants.*; +import static com.muyu.common.core.constant.SplitConstants.COMMA_STR; /** * 角色 业务层处理 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java index 3d53bba..4079226 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java @@ -20,7 +20,6 @@ import com.muyu.system.domain.SysUserRole; import com.muyu.system.mapper.SysPostMapper; import com.muyu.system.mapper.SysRoleMapper; import com.muyu.system.mapper.SysUserMapper; -import com.muyu.system.mapper.SysUserRoleMapper; import com.muyu.system.service.SysConfigService; import com.muyu.system.service.SysUserPostService; import com.muyu.system.service.SysUserRoleService; @@ -37,7 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import static com.muyu.common.core.constant.SplitConstants.*; +import static com.muyu.common.core.constant.SplitConstants.COMMA_STR; /** * 用户 业务层处理