From 8dc42c7a21e7422399b49690b28899df299e20c7 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Thu, 18 Jan 2024 23:35:07 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E7=9A=84=E6=89=80=E5=9C=A8=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/monitor/config/LogDaoLocalImpl.java | 21 ++++++++----------- .../admin/ContiNewAdminApplication.java | 2 +- .../admin/webapi/auth/AuthController.java | 2 +- .../webapi/auth/SocialAuthController.java | 2 +- .../webapi/common/CaptchaController.java | 2 +- .../admin/webapi/common/CommonController.java | 2 +- .../webapi/common/DashboardController.java | 2 +- .../admin/webapi/monitor/LogController.java | 2 +- .../webapi/monitor/OnlineUserController.java | 2 +- .../webapi/system/AnnouncementController.java | 2 +- .../admin/webapi/system/MenuController.java | 2 +- .../webapi/system/MessageController.java | 2 +- .../admin/webapi/system/OptionController.java | 2 +- .../webapi/system/UserCenterController.java | 2 +- .../admin/webapi/system/UserController.java | 2 +- .../webapi/tool/GeneratorController.java | 2 +- 16 files changed, 24 insertions(+), 27 deletions(-) diff --git a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/LogDaoLocalImpl.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/LogDaoLocalImpl.java index 79592392..39f0bd8f 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/LogDaoLocalImpl.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/LogDaoLocalImpl.java @@ -16,16 +16,6 @@ package top.charles7c.continew.admin.monitor.config; -import java.net.URI; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.util.Map; - -import lombok.RequiredArgsConstructor; - -import org.springframework.http.HttpHeaders; -import org.springframework.scheduling.annotation.Async; - import cn.dev33.satoken.SaManager; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.convert.Convert; @@ -33,7 +23,9 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpStatus; import cn.hutool.json.JSONUtil; - +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.scheduling.annotation.Async; import top.charles7c.continew.admin.auth.model.req.AccountLoginReq; import top.charles7c.continew.admin.common.constant.SysConstants; import top.charles7c.continew.admin.monitor.enums.LogStatusEnum; @@ -41,13 +33,18 @@ import top.charles7c.continew.admin.monitor.mapper.LogMapper; import top.charles7c.continew.admin.monitor.model.entity.LogDO; import top.charles7c.continew.admin.system.service.UserService; import top.charles7c.continew.starter.core.constant.StringConstants; +import top.charles7c.continew.starter.core.model.R; import top.charles7c.continew.starter.core.util.ExceptionUtils; -import top.charles7c.continew.starter.extension.crud.model.resp.R; import top.charles7c.continew.starter.log.common.dao.LogDao; import top.charles7c.continew.starter.log.common.model.LogRecord; import top.charles7c.continew.starter.log.common.model.LogRequest; import top.charles7c.continew.starter.log.common.model.LogResponse; +import java.net.URI; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.Map; + /** * 日志持久层接口本地实现类 * diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/ContiNewAdminApplication.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/ContiNewAdminApplication.java index 2b87cb5c..807814b4 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/ContiNewAdminApplication.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/ContiNewAdminApplication.java @@ -31,9 +31,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.web.ServerProperties; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import top.charles7c.continew.starter.core.annotation.EnableGlobalExceptionHandler; import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties; import top.charles7c.continew.starter.extension.crud.annotation.EnableCrudRestController; -import top.charles7c.continew.starter.extension.crud.annotation.EnableGlobalExceptionHandler; import java.net.InetAddress; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/AuthController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/AuthController.java index 93006dfb..c2f857f8 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/AuthController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/AuthController.java @@ -42,7 +42,7 @@ import top.charles7c.continew.admin.system.service.UserService; import top.charles7c.continew.starter.cache.redisson.util.RedisUtils; import top.charles7c.continew.starter.core.util.ExceptionUtils; import top.charles7c.continew.starter.core.util.validate.ValidationUtils; -import top.charles7c.continew.starter.extension.crud.model.resp.R; +import top.charles7c.continew.starter.core.model.R; import top.charles7c.continew.starter.log.common.annotation.Log; import java.util.List; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/SocialAuthController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/SocialAuthController.java index 841564e6..59aa5848 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/SocialAuthController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/SocialAuthController.java @@ -34,7 +34,7 @@ import top.charles7c.continew.admin.auth.model.resp.LoginResp; import top.charles7c.continew.admin.auth.service.LoginService; import top.charles7c.continew.starter.core.exception.BadRequestException; import top.charles7c.continew.starter.core.util.validate.ValidationUtils; -import top.charles7c.continew.starter.extension.crud.model.resp.R; +import top.charles7c.continew.starter.core.model.R; import top.charles7c.continew.starter.log.common.annotation.Log; import me.zhyd.oauth.model.AuthCallback; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java index 843e1cdd..a0fca290 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java @@ -52,7 +52,7 @@ import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperti import top.charles7c.continew.starter.core.util.TemplateUtils; import top.charles7c.continew.starter.core.util.validate.CheckUtils; import top.charles7c.continew.starter.core.util.validate.ValidationUtils; -import top.charles7c.continew.starter.extension.crud.model.resp.R; +import top.charles7c.continew.starter.core.model.R; import top.charles7c.continew.starter.log.common.annotation.Log; import top.charles7c.continew.starter.messaging.mail.util.MailUtils; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CommonController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CommonController.java index abf06bfe..02fb6048 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CommonController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CommonController.java @@ -44,7 +44,7 @@ import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperti import top.charles7c.continew.starter.core.util.validate.ValidationUtils; import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; import top.charles7c.continew.starter.extension.crud.model.query.SortQuery; -import top.charles7c.continew.starter.extension.crud.model.resp.R; +import top.charles7c.continew.starter.core.model.R; import top.charles7c.continew.starter.log.common.annotation.Log; import java.util.Arrays; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/DashboardController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/DashboardController.java index 209ebcb1..4ec4f086 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/DashboardController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/DashboardController.java @@ -38,7 +38,7 @@ import top.charles7c.continew.admin.monitor.model.resp.DashboardTotalResp; import top.charles7c.continew.admin.monitor.service.DashboardService; import top.charles7c.continew.admin.system.model.resp.DashboardAnnouncementResp; import top.charles7c.continew.starter.core.util.validate.ValidationUtils; -import top.charles7c.continew.starter.extension.crud.model.resp.R; +import top.charles7c.continew.starter.core.model.R; import top.charles7c.continew.starter.log.common.annotation.Log; import java.util.List; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/monitor/LogController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/monitor/LogController.java index d5ef4f24..56ee2504 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/monitor/LogController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/monitor/LogController.java @@ -39,7 +39,7 @@ import top.charles7c.continew.admin.monitor.model.resp.SystemLogResp; import top.charles7c.continew.admin.monitor.service.LogService; import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; -import top.charles7c.continew.starter.extension.crud.model.resp.R; +import top.charles7c.continew.starter.core.model.R; import top.charles7c.continew.starter.log.common.annotation.Log; /** diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/monitor/OnlineUserController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/monitor/OnlineUserController.java index 5223c338..12deb285 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/monitor/OnlineUserController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/monitor/OnlineUserController.java @@ -35,7 +35,7 @@ import top.charles7c.continew.admin.auth.service.OnlineUserService; import top.charles7c.continew.starter.core.util.validate.CheckUtils; import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; -import top.charles7c.continew.starter.extension.crud.model.resp.R; +import top.charles7c.continew.starter.core.model.R; /** * 在线用户 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/AnnouncementController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/AnnouncementController.java index 5042fa3b..e545446b 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/AnnouncementController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/AnnouncementController.java @@ -34,7 +34,7 @@ import top.charles7c.continew.starter.core.util.validate.ValidationUtils; import top.charles7c.continew.starter.extension.crud.annotation.CrudRequestMapping; import top.charles7c.continew.starter.extension.crud.base.BaseController; import top.charles7c.continew.starter.extension.crud.base.ValidateGroup; -import top.charles7c.continew.starter.extension.crud.model.resp.R; +import top.charles7c.continew.starter.core.model.R; /** * 公告管理 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MenuController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MenuController.java index 595d2049..a6f56e22 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MenuController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MenuController.java @@ -36,7 +36,7 @@ import top.charles7c.continew.starter.extension.crud.annotation.CrudRequestMappi import top.charles7c.continew.starter.extension.crud.base.BaseController; import top.charles7c.continew.starter.extension.crud.base.ValidateGroup; import top.charles7c.continew.starter.extension.crud.enums.Api; -import top.charles7c.continew.starter.extension.crud.model.resp.R; +import top.charles7c.continew.starter.core.model.R; /** * 菜单管理 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MessageController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MessageController.java index e99cd5db..efff7d89 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MessageController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MessageController.java @@ -31,7 +31,7 @@ import top.charles7c.continew.admin.system.service.MessageService; import top.charles7c.continew.admin.system.service.MessageUserService; import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; -import top.charles7c.continew.starter.extension.crud.model.resp.R; +import top.charles7c.continew.starter.core.model.R; import top.charles7c.continew.starter.log.common.annotation.Log; import java.util.List; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/OptionController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/OptionController.java index 368b4624..2c9d2b70 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/OptionController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/OptionController.java @@ -33,7 +33,7 @@ import top.charles7c.continew.admin.system.model.req.OptionReq; import top.charles7c.continew.admin.system.model.req.OptionResetValueReq; import top.charles7c.continew.admin.system.model.resp.OptionResp; import top.charles7c.continew.admin.system.service.OptionService; -import top.charles7c.continew.starter.extension.crud.model.resp.R; +import top.charles7c.continew.starter.core.model.R; /** * 参数管理 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserCenterController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserCenterController.java index d0fbc92c..ca5929fd 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserCenterController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserCenterController.java @@ -48,7 +48,7 @@ import top.charles7c.continew.admin.system.service.UserSocialService; import top.charles7c.continew.starter.cache.redisson.util.RedisUtils; import top.charles7c.continew.starter.core.util.ExceptionUtils; import top.charles7c.continew.starter.core.util.validate.ValidationUtils; -import top.charles7c.continew.starter.extension.crud.model.resp.R; +import top.charles7c.continew.starter.core.model.R; import java.util.List; import java.util.stream.Collectors; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserController.java index 2db25966..0b11a648 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserController.java @@ -39,7 +39,7 @@ import top.charles7c.continew.admin.system.service.UserService; import top.charles7c.continew.starter.extension.crud.annotation.CrudRequestMapping; import top.charles7c.continew.starter.extension.crud.base.BaseController; import top.charles7c.continew.starter.extension.crud.base.ValidateGroup; -import top.charles7c.continew.starter.extension.crud.model.resp.R; +import top.charles7c.continew.starter.core.model.R; /** * 用户管理 API diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/tool/GeneratorController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/tool/GeneratorController.java index 89d4dc23..97cd8d24 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/tool/GeneratorController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/tool/GeneratorController.java @@ -42,7 +42,7 @@ import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperti import top.charles7c.continew.starter.core.util.validate.ValidationUtils; import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; -import top.charles7c.continew.starter.extension.crud.model.resp.R; +import top.charles7c.continew.starter.core.model.R; /** * 代码生成 API