From 3405868c7f042beafb77a7407a388a40b9a75466 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Mon, 19 Feb 2024 21:28:40 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=80=82=E9=85=8D=20ContiNew=20Sta?= =?UTF-8?q?rter=20=E6=97=A5=E5=BF=97=E5=8F=8A=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=9A=84=E5=8C=85=E7=BB=93=E6=9E=84=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../continew/admin/monitor/config/LogConfiguration.java | 2 +- .../continew/admin/monitor/config/LogDaoLocalImpl.java | 8 ++++---- .../admin/tool/service/impl/GeneratorServiceImpl.java | 4 ++-- .../continew/admin/webapi/auth/AuthController.java | 2 +- .../continew/admin/webapi/auth/SocialAuthController.java | 2 +- .../continew/admin/webapi/common/CaptchaController.java | 2 +- .../continew/admin/webapi/common/CommonController.java | 2 +- .../continew/admin/webapi/common/DashboardController.java | 2 +- .../continew/admin/webapi/monitor/LogController.java | 2 +- .../continew/admin/webapi/system/MessageController.java | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/LogConfiguration.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/LogConfiguration.java index d2729a8c..933d3c8f 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/LogConfiguration.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/LogConfiguration.java @@ -21,7 +21,7 @@ import org.springframework.context.annotation.Configuration; import top.charles7c.continew.admin.monitor.mapper.LogMapper; import top.charles7c.continew.admin.system.service.UserService; -import top.charles7c.continew.starter.log.common.dao.LogDao; +import top.charles7c.continew.starter.log.core.dao.LogDao; import top.charles7c.continew.starter.log.httptracepro.autoconfigure.ConditionalOnEnabledLog; import top.charles7c.continew.starter.web.autoconfigure.trace.TraceProperties; 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 1338f78b..1ce6bdaf 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 @@ -34,10 +34,10 @@ 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.util.ExceptionUtils; -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 top.charles7c.continew.starter.log.core.dao.LogDao; +import top.charles7c.continew.starter.log.core.model.LogRecord; +import top.charles7c.continew.starter.log.core.model.LogRequest; +import top.charles7c.continew.starter.log.core.model.LogResponse; import top.charles7c.continew.starter.web.autoconfigure.trace.TraceProperties; import top.charles7c.continew.starter.web.model.R; diff --git a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/service/impl/GeneratorServiceImpl.java b/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/service/impl/GeneratorServiceImpl.java index ea997a0b..e2121c80 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/service/impl/GeneratorServiceImpl.java +++ b/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/service/impl/GeneratorServiceImpl.java @@ -45,8 +45,8 @@ import top.charles7c.continew.admin.tool.service.GeneratorService; import top.charles7c.continew.starter.core.constant.StringConstants; import top.charles7c.continew.starter.core.exception.BusinessException; import top.charles7c.continew.starter.core.util.TemplateUtils; -import top.charles7c.continew.starter.core.util.db.MetaUtils; -import top.charles7c.continew.starter.core.util.db.Table; +import top.charles7c.continew.starter.data.core.util.MetaUtils; +import top.charles7c.continew.starter.data.core.util.Table; 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; 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 d6614c88..0a59c0e0 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 @@ -43,7 +43,7 @@ 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.web.model.R; -import top.charles7c.continew.starter.log.common.annotation.Log; +import top.charles7c.continew.starter.log.core.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 0a7322d8..d676b635 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 @@ -35,7 +35,7 @@ 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.web.model.R; -import top.charles7c.continew.starter.log.common.annotation.Log; +import top.charles7c.continew.starter.log.core.annotation.Log; import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthResponse; 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 b44dc0d5..032ffa02 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.log.common.annotation.Log; +import top.charles7c.continew.starter.log.core.annotation.Log; import top.charles7c.continew.starter.messaging.mail.util.MailUtils; import top.charles7c.continew.starter.web.model.R; 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 8b22d431..d3c4b601 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.log.common.annotation.Log; +import top.charles7c.continew.starter.log.core.annotation.Log; import top.charles7c.continew.starter.web.model.R; import java.io.Serializable; 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 0d818858..62f11386 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 @@ -39,7 +39,7 @@ 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.web.model.R; -import top.charles7c.continew.starter.log.common.annotation.Log; +import top.charles7c.continew.starter.log.core.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 ea3f9a04..d4b4bd68 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 @@ -40,7 +40,7 @@ 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.web.model.R; -import top.charles7c.continew.starter.log.common.annotation.Log; +import top.charles7c.continew.starter.log.core.annotation.Log; /** * 日志管理 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 91106e93..7eb2e032 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 @@ -32,7 +32,7 @@ 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.web.model.R; -import top.charles7c.continew.starter.log.common.annotation.Log; +import top.charles7c.continew.starter.log.core.annotation.Log; import java.util.List;