From f4c0919eda587b8b9d49ed7c74afd926cdd53a81 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Tue, 21 Nov 2023 22:22:07 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BD=BF=E7=94=A8=E7=B1=BB=E7=9A=84=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cnadmin/common/base/BaseController.java | 2 +- .../cnadmin/common/base/BaseServiceImpl.java | 2 +- .../common/config/WebMvcConfiguration.java | 4 +- .../easyexcel/ExcelBaseEnumConverter.java | 2 +- .../config/jackson/JacksonConfiguration.java | 16 -- .../mybatis/DataPermissionHandlerImpl.java | 2 +- .../config/properties/ProjectProperties.java | 5 - .../cnadmin/common/constant/StringConsts.java | 62 ------- .../cnadmin/common/constant/SysConsts.java | 2 + .../CrudRequestMappingHandlerMapping.java | 2 +- .../handler/GlobalExceptionHandler.java | 2 +- .../cnadmin/common/model/query/SortQuery.java | 2 +- .../cnadmin/common/util/ExceptionUtils.java | 161 ------------------ .../cnadmin/common/util/MailUtils.java | 2 +- .../cnadmin/common/util/StreamUtils.java | 2 +- .../common/util/helper/LoginHelper.java | 2 +- .../common/util/validate/CheckUtils.java | 2 +- .../monitor/interceptor/LogInterceptor.java | 4 +- .../monitor/service/impl/LogServiceImpl.java | 2 +- .../service/impl/OnlineUserServiceImpl.java | 2 +- .../system/service/impl/DeptServiceImpl.java | 2 +- .../service/impl/MessageServiceImpl.java | 2 +- .../system/service/impl/UserServiceImpl.java | 4 +- .../tool/model/entity/FieldConfigDO.java | 2 +- .../service/impl/GeneratorServiceImpl.java | 2 +- .../controller/auth/AuthController.java | 2 +- .../system/UserCenterController.java | 2 +- 27 files changed, 26 insertions(+), 270 deletions(-) delete mode 100644 continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/StringConsts.java delete mode 100644 continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExceptionUtils.java 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 5bf81a64..a1024e7f 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 @@ -38,11 +38,11 @@ import cn.hutool.core.util.StrUtil; import top.charles7c.cnadmin.common.annotation.CrudRequestMapping; import top.charles7c.cnadmin.common.annotation.NoResponseAdvice; -import top.charles7c.cnadmin.common.constant.StringConsts; import top.charles7c.cnadmin.common.model.query.PageQuery; import top.charles7c.cnadmin.common.model.query.SortQuery; import top.charles7c.cnadmin.common.model.resp.PageDataResp; import top.charles7c.cnadmin.common.model.resp.R; +import top.charles7c.continew.starter.core.constant.StringConsts; /** * 控制器基类 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 7c4ea5c3..4c97252d 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 @@ -47,11 +47,11 @@ import top.charles7c.cnadmin.common.model.query.SortQuery; import top.charles7c.cnadmin.common.model.resp.PageDataResp; import top.charles7c.cnadmin.common.service.CommonUserService; import top.charles7c.cnadmin.common.util.ExcelUtils; -import top.charles7c.cnadmin.common.util.ExceptionUtils; import top.charles7c.cnadmin.common.util.ReflectUtils; import top.charles7c.cnadmin.common.util.TreeUtils; import top.charles7c.cnadmin.common.util.helper.QueryHelper; import top.charles7c.cnadmin.common.util.validate.CheckUtils; +import top.charles7c.continew.starter.core.util.ExceptionUtils; /** * 业务实现基类 diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/WebMvcConfiguration.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/WebMvcConfiguration.java index 86a16fbb..77079ff9 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/WebMvcConfiguration.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/WebMvcConfiguration.java @@ -18,12 +18,10 @@ package top.charles7c.cnadmin.common.config; import java.util.List; import java.util.Objects; -import java.util.concurrent.TimeUnit; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Configuration; -import org.springframework.http.CacheControl; import org.springframework.http.converter.ByteArrayHttpMessageConverter; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; @@ -32,7 +30,7 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import top.charles7c.cnadmin.common.config.properties.LocalStorageProperties; -import top.charles7c.cnadmin.common.constant.StringConsts; +import top.charles7c.continew.starter.core.constant.StringConsts; /** * Web MVC 配置 diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/easyexcel/ExcelBaseEnumConverter.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/easyexcel/ExcelBaseEnumConverter.java index 3f111785..b394d027 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/easyexcel/ExcelBaseEnumConverter.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/easyexcel/ExcelBaseEnumConverter.java @@ -27,7 +27,7 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ClassUtil; import top.charles7c.cnadmin.common.base.IBaseEnum; -import top.charles7c.cnadmin.common.constant.StringConsts; +import top.charles7c.continew.starter.core.constant.StringConsts; /** * Easy Excel 枚举基类转换器 diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/JacksonConfiguration.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/JacksonConfiguration.java index 1fb019d6..162acada 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/JacksonConfiguration.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/JacksonConfiguration.java @@ -16,30 +16,14 @@ package top.charles7c.cnadmin.common.config.jackson; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.format.DateTimeFormatter; -import java.util.TimeZone; - import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.module.SimpleModule; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; -import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; -import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer; - -import cn.hutool.core.date.DatePattern; import top.charles7c.cnadmin.common.base.IBaseEnum; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java index e58798f7..10bef43a 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java @@ -25,11 +25,11 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler; import top.charles7c.cnadmin.common.annotation.DataPermission; -import top.charles7c.cnadmin.common.constant.StringConsts; import top.charles7c.cnadmin.common.enums.DataScopeEnum; import top.charles7c.cnadmin.common.model.dto.LoginUser; import top.charles7c.cnadmin.common.model.dto.RoleDTO; import top.charles7c.cnadmin.common.util.helper.LoginHelper; +import top.charles7c.continew.starter.core.constant.StringConsts; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.Function; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/ProjectProperties.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/ProjectProperties.java index 6b559917..49073baf 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/ProjectProperties.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/ProjectProperties.java @@ -18,11 +18,6 @@ package top.charles7c.cnadmin.common.config.properties; import lombok.Data; -import io.swagger.v3.oas.models.info.Contact; -import io.swagger.v3.oas.models.info.License; - -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.springframework.stereotype.Component; import cn.hutool.core.convert.Convert; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/StringConsts.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/StringConsts.java deleted file mode 100644 index 045706f3..00000000 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/StringConsts.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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. - */ - -package top.charles7c.cnadmin.common.constant; - -import lombok.AccessLevel; -import lombok.NoArgsConstructor; - -import cn.hutool.core.text.StrPool; - -/** - * 字符串相关常量 - * - * @author Charles7c - * @since 2023/2/10 20:14 - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class StringConsts implements StrPool { - - /** - * 空字符串 - */ - public static final String EMPTY = ""; - - /** - * 空格 - */ - public static final String SPACE = " "; - - /** - * 分号 - */ - public static final String SEMICOLON = ";"; - - /** - * 星号 - */ - public static final String ASTERISK = "*"; - - /** - * 问号 - */ - public static final String QUESTION_MARK = "?"; - - /** - * 中文逗号 - */ - public static final String CHINESE_COMMA = "，"; -} diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConsts.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConsts.java index b9ab7305..3da12479 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConsts.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConsts.java @@ -19,6 +19,8 @@ package top.charles7c.cnadmin.common.constant; import lombok.AccessLevel; import lombok.NoArgsConstructor; +import top.charles7c.continew.starter.core.constant.StringConsts; + /** * 系统相关常量 * 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 b472c7af..9d3a84bf 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 @@ -29,7 +29,7 @@ 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 top.charles7c.continew.starter.core.util.ExceptionUtils; /** * CRUD 请求映射器处理器映射器 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 d7a86ae1..f1303562 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 @@ -43,9 +43,9 @@ import cn.hutool.core.util.StrUtil; import top.charles7c.cnadmin.common.exception.BadRequestException; import top.charles7c.cnadmin.common.exception.ServiceException; import top.charles7c.cnadmin.common.model.resp.R; -import top.charles7c.cnadmin.common.util.ExceptionUtils; import top.charles7c.cnadmin.common.util.StreamUtils; import top.charles7c.cnadmin.common.util.holder.LogContextHolder; +import top.charles7c.continew.starter.core.util.ExceptionUtils; /** * 全局异常处理器 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 5f96fbad..42eae398 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 @@ -30,7 +30,7 @@ import org.springframework.data.domain.Sort; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; -import top.charles7c.cnadmin.common.constant.StringConsts; +import top.charles7c.continew.starter.core.constant.StringConsts; /** * 排序查询条件 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 deleted file mode 100644 index 22f6d54e..00000000 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExceptionUtils.java +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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. - */ - -package top.charles7c.cnadmin.common.util; - -import java.util.concurrent.CancellationException; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.function.Consumer; - -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import lombok.extern.slf4j.Slf4j; - -import top.charles7c.cnadmin.common.constant.StringConsts; - -/** - * 异常工具类 - * - * @author Charles7c - * @since 2022/12/21 20:56 - */ -@Slf4j -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class ExceptionUtils { - - /** - * 打印线程异常信息 - * - * @param runnable - * 线程执行内容 - * @param throwable - * 异常 - */ - public static void printException(Runnable runnable, Throwable throwable) { - if (null == throwable && runnable instanceof Future future) { - try { - if (future.isDone()) { - future.get(); - } - } catch (CancellationException e) { - throwable = e; - } catch (ExecutionException e) { - throwable = e.getCause(); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } - } - if (null != throwable) { - log.error(throwable.getMessage(), throwable); - } - } - - /** - * 如果有异常，返回 null - * - * @param exSupplier - * 可能会出现异常的方法执行 - * @param - * / - * @return / - */ - public static T exToNull(ExSupplier exSupplier) { - return exToDefault(exSupplier, null); - } - - /** - * 如果有异常，执行异常处理 - * - * @param supplier - * 可能会出现异常的方法执行 - * @param exConsumer - * 异常处理 - * @param - * / - * @return / - */ - public static T exToNull(ExSupplier supplier, Consumer exConsumer) { - return exToDefault(supplier, null, exConsumer); - } - - /** - * 如果有异常，返回空字符串 - * - * @param exSupplier - * 可能会出现异常的方法执行 - * @return / - */ - public static String exToBlank(ExSupplier exSupplier) { - return exToDefault(exSupplier, StringConsts.EMPTY); - } - - /** - * 如果有异常，返回默认值 - * - * @param exSupplier - * 可能会出现异常的方法执行 - * @param defaultValue - * 默认值 - * @param - * / - * @return / - */ - public static T exToDefault(ExSupplier exSupplier, T defaultValue) { - return exToDefault(exSupplier, defaultValue, null); - } - - /** - * 如果有异常，执行异常处理，返回默认值 - * - * @param exSupplier - * 可能会出现异常的方法执行 - * @param defaultValue - * 默认值 - * @param exConsumer - * 异常处理 - * @param - * / - * @return / - */ - public static T exToDefault(ExSupplier exSupplier, T defaultValue, Consumer exConsumer) { - try { - return exSupplier.get(); - } catch (Exception e) { - if (null != exConsumer) { - exConsumer.accept(e); - } - return defaultValue; - } - } - - /** - * 异常提供者 - * - * @param - * / - */ - public interface ExSupplier { - /** - * 获取返回值 - * - * @return / - * @throws Exception - * / - */ - T get() throws Exception; - } -} 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 a6389084..86347b67 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 @@ -37,8 +37,8 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; -import top.charles7c.cnadmin.common.constant.StringConsts; import top.charles7c.cnadmin.common.util.validate.CheckUtils; +import top.charles7c.continew.starter.core.constant.StringConsts; /** * 邮件工具类 diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/StreamUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/StreamUtils.java index 7ef76e67..ddd05bdd 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/StreamUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/StreamUtils.java @@ -26,7 +26,7 @@ import lombok.NoArgsConstructor; import cn.hutool.core.collection.CollUtil; -import top.charles7c.cnadmin.common.constant.StringConsts; +import top.charles7c.continew.starter.core.constant.StringConsts; /** * Stream 工具类 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 18c1af7d..db85c7a9 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 @@ -33,10 +33,10 @@ import top.charles7c.cnadmin.common.constant.CacheConsts; import top.charles7c.cnadmin.common.model.dto.LogContext; import top.charles7c.cnadmin.common.model.dto.LoginUser; import top.charles7c.cnadmin.common.service.CommonUserService; -import top.charles7c.cnadmin.common.util.ExceptionUtils; import top.charles7c.cnadmin.common.util.IpUtils; import top.charles7c.cnadmin.common.util.ServletUtils; import top.charles7c.cnadmin.common.util.holder.LogContextHolder; +import top.charles7c.continew.starter.core.util.ExceptionUtils; /** * 登录助手 diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/validate/CheckUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/validate/CheckUtils.java index 756a05fd..d8d1f4e6 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/validate/CheckUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/validate/CheckUtils.java @@ -24,8 +24,8 @@ import lombok.extern.slf4j.Slf4j; import cn.hutool.core.util.StrUtil; -import top.charles7c.cnadmin.common.constant.StringConsts; import top.charles7c.cnadmin.common.exception.ServiceException; +import top.charles7c.continew.starter.core.constant.StringConsts; /** * 业务参数校验工具类（抛出 500 ServiceException） 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 2dd49398..a6e75f4a 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 @@ -51,11 +51,9 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import top.charles7c.cnadmin.auth.model.req.AccountLoginReq; -import top.charles7c.cnadmin.common.constant.StringConsts; import top.charles7c.cnadmin.common.constant.SysConsts; import top.charles7c.cnadmin.common.model.dto.LogContext; import top.charles7c.cnadmin.common.model.resp.R; -import top.charles7c.cnadmin.common.util.ExceptionUtils; import top.charles7c.cnadmin.common.util.IpUtils; import top.charles7c.cnadmin.common.util.ServletUtils; import top.charles7c.cnadmin.common.util.helper.LoginHelper; @@ -65,6 +63,8 @@ import top.charles7c.cnadmin.monitor.config.properties.LogProperties; import top.charles7c.cnadmin.monitor.enums.LogStatusEnum; import top.charles7c.cnadmin.monitor.model.entity.LogDO; import top.charles7c.cnadmin.system.service.UserService; +import top.charles7c.continew.starter.core.constant.StringConsts; +import top.charles7c.continew.starter.core.util.ExceptionUtils; /** * 系统日志拦截器 diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java index d94e9696..de6881f4 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java @@ -37,7 +37,6 @@ import top.charles7c.cnadmin.common.constant.SysConsts; import top.charles7c.cnadmin.common.model.query.PageQuery; import top.charles7c.cnadmin.common.model.resp.PageDataResp; import top.charles7c.cnadmin.common.service.CommonUserService; -import top.charles7c.cnadmin.common.util.ExceptionUtils; import top.charles7c.cnadmin.common.util.ReflectUtils; import top.charles7c.cnadmin.common.util.helper.QueryHelper; import top.charles7c.cnadmin.common.util.validate.CheckUtils; @@ -48,6 +47,7 @@ import top.charles7c.cnadmin.monitor.model.query.OperationLogQuery; import top.charles7c.cnadmin.monitor.model.query.SystemLogQuery; import top.charles7c.cnadmin.monitor.model.resp.*; import top.charles7c.cnadmin.monitor.service.LogService; +import top.charles7c.continew.starter.core.util.ExceptionUtils; /** * 系统日志业务实现 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/OnlineUserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/OnlineUserServiceImpl.java index cfcaba8a..ab27f3d2 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/OnlineUserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/OnlineUserServiceImpl.java @@ -34,11 +34,11 @@ import cn.hutool.core.util.StrUtil; import top.charles7c.cnadmin.auth.model.query.OnlineUserQuery; import top.charles7c.cnadmin.auth.model.resp.OnlineUserResp; import top.charles7c.cnadmin.auth.service.OnlineUserService; -import top.charles7c.cnadmin.common.constant.StringConsts; import top.charles7c.cnadmin.common.model.dto.LoginUser; import top.charles7c.cnadmin.common.model.query.PageQuery; import top.charles7c.cnadmin.common.model.resp.PageDataResp; import top.charles7c.cnadmin.common.util.helper.LoginHelper; +import top.charles7c.continew.starter.core.constant.StringConsts; /** * 在线用户业务实现 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 8f27ba10..0da530e0 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 @@ -34,7 +34,6 @@ import cn.hutool.core.util.ObjectUtil; import top.charles7c.cnadmin.common.base.BaseServiceImpl; import top.charles7c.cnadmin.common.constant.SysConsts; import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; -import top.charles7c.cnadmin.common.util.ExceptionUtils; import top.charles7c.cnadmin.common.util.validate.CheckUtils; import top.charles7c.cnadmin.system.mapper.DeptMapper; import top.charles7c.cnadmin.system.model.entity.DeptDO; @@ -45,6 +44,7 @@ import top.charles7c.cnadmin.system.model.resp.DeptResp; import top.charles7c.cnadmin.system.service.DeptService; import top.charles7c.cnadmin.system.service.RoleDeptService; import top.charles7c.cnadmin.system.service.UserService; +import top.charles7c.continew.starter.core.util.ExceptionUtils; /** * 部门业务实现 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MessageServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MessageServiceImpl.java index 8b057087..37b82d17 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MessageServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MessageServiceImpl.java @@ -33,7 +33,6 @@ import cn.hutool.extra.spring.SpringUtil; import top.charles7c.cnadmin.common.model.query.PageQuery; import top.charles7c.cnadmin.common.model.resp.PageDataResp; import top.charles7c.cnadmin.common.service.CommonUserService; -import top.charles7c.cnadmin.common.util.ExceptionUtils; import top.charles7c.cnadmin.common.util.helper.QueryHelper; import top.charles7c.cnadmin.common.util.validate.CheckUtils; import top.charles7c.cnadmin.system.mapper.MessageMapper; @@ -43,6 +42,7 @@ import top.charles7c.cnadmin.system.model.req.MessageReq; import top.charles7c.cnadmin.system.model.resp.MessageResp; import top.charles7c.cnadmin.system.service.MessageService; import top.charles7c.cnadmin.system.service.MessageUserService; +import top.charles7c.continew.starter.core.util.ExceptionUtils; /** * 消息业务实现 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 1530106b..d5edd44f 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 @@ -40,11 +40,9 @@ import top.charles7c.cnadmin.common.base.BaseServiceImpl; import top.charles7c.cnadmin.common.config.properties.LocalStorageProperties; import top.charles7c.cnadmin.common.constant.CacheConsts; import top.charles7c.cnadmin.common.constant.FileConsts; -import top.charles7c.cnadmin.common.constant.StringConsts; import top.charles7c.cnadmin.common.constant.SysConsts; import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; import top.charles7c.cnadmin.common.service.CommonUserService; -import top.charles7c.cnadmin.common.util.ExceptionUtils; import top.charles7c.cnadmin.common.util.FileUtils; import top.charles7c.cnadmin.common.util.SecureUtils; import top.charles7c.cnadmin.common.util.helper.LoginHelper; @@ -61,6 +59,8 @@ import top.charles7c.cnadmin.system.service.DeptService; import top.charles7c.cnadmin.system.service.RoleService; import top.charles7c.cnadmin.system.service.UserRoleService; import top.charles7c.cnadmin.system.service.UserService; +import top.charles7c.continew.starter.core.constant.StringConsts; +import top.charles7c.continew.starter.core.util.ExceptionUtils; /** * 用户业务实现 diff --git a/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/entity/FieldConfigDO.java b/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/entity/FieldConfigDO.java index 5ad6f016..223f313f 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/entity/FieldConfigDO.java +++ b/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/entity/FieldConfigDO.java @@ -37,9 +37,9 @@ import cn.hutool.db.meta.Column; import cn.hutool.setting.dialect.Props; import cn.hutool.setting.dialect.PropsUtil; -import top.charles7c.cnadmin.common.constant.StringConsts; import top.charles7c.cnadmin.common.enums.QueryTypeEnum; import top.charles7c.cnadmin.tool.enums.FormTypeEnum; +import top.charles7c.continew.starter.core.constant.StringConsts; /** * 字段配置实体 diff --git a/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/service/impl/GeneratorServiceImpl.java b/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/service/impl/GeneratorServiceImpl.java index 4517969f..3d2d4f00 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/service/impl/GeneratorServiceImpl.java +++ b/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/service/impl/GeneratorServiceImpl.java @@ -42,7 +42,6 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.db.meta.Column; import cn.hutool.system.SystemUtil; -import top.charles7c.cnadmin.common.constant.StringConsts; import top.charles7c.cnadmin.common.enums.QueryTypeEnum; import top.charles7c.cnadmin.common.exception.ServiceException; import top.charles7c.cnadmin.common.model.query.PageQuery; @@ -61,6 +60,7 @@ import top.charles7c.cnadmin.tool.model.resp.TableResp; import top.charles7c.cnadmin.tool.service.GeneratorService; import top.charles7c.cnadmin.tool.util.MetaUtils; import top.charles7c.cnadmin.tool.util.Table; +import top.charles7c.continew.starter.core.constant.StringConsts; /** * 代码生成业务实现 diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/AuthController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/AuthController.java index 7426bd7b..614db894 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/AuthController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/AuthController.java @@ -41,7 +41,6 @@ import top.charles7c.cnadmin.auth.model.resp.UserInfoResp; import top.charles7c.cnadmin.auth.service.LoginService; import top.charles7c.cnadmin.common.constant.CacheConsts; import top.charles7c.cnadmin.common.model.dto.LoginUser; -import top.charles7c.cnadmin.common.util.ExceptionUtils; import top.charles7c.cnadmin.common.util.RedisUtils; import top.charles7c.cnadmin.common.util.SecureUtils; import top.charles7c.cnadmin.common.util.helper.LoginHelper; @@ -49,6 +48,7 @@ import top.charles7c.cnadmin.common.util.validate.ValidationUtils; import top.charles7c.cnadmin.monitor.annotation.Log; import top.charles7c.cnadmin.system.model.resp.UserDetailResp; import top.charles7c.cnadmin.system.service.UserService; +import top.charles7c.continew.starter.core.util.ExceptionUtils; /** * 认证 API 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 5b65da19..b7fc4d11 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 @@ -40,7 +40,6 @@ import top.charles7c.cnadmin.common.constant.CacheConsts; import top.charles7c.cnadmin.common.constant.RegexConsts; import top.charles7c.cnadmin.common.enums.SocialSourceEnum; import top.charles7c.cnadmin.common.model.resp.R; -import top.charles7c.cnadmin.common.util.ExceptionUtils; import top.charles7c.cnadmin.common.util.RedisUtils; import top.charles7c.cnadmin.common.util.SecureUtils; import top.charles7c.cnadmin.common.util.helper.LoginHelper; @@ -54,6 +53,7 @@ import top.charles7c.cnadmin.system.model.resp.AvatarResp; import top.charles7c.cnadmin.system.model.resp.UserSocialBindResp; import top.charles7c.cnadmin.system.service.UserService; import top.charles7c.cnadmin.system.service.UserSocialService; +import top.charles7c.continew.starter.core.util.ExceptionUtils; import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthResponse;