chore: 调整部分类的所在包

continew-org · Jan 18, 2024 · 8dc42c7 · 8dc42c7
1 parent 5db1f66
commit 8dc42c7
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 27 deletions.
diff --git a/...in-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/LogDaoLocalImpl.java b/...in-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/LogDaoLocalImpl.java
@@ -16,38 +16,35 @@
 
 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;
 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;
 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/...new-admin-webapi/src/main/java/top/charles7c/continew/admin/ContiNewAdminApplication.java b/...new-admin-webapi/src/main/java/top/charles7c/continew/admin/ContiNewAdminApplication.java
@@ -31,9 +31,9 @@
 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/...w-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/AuthController.java b/...w-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/AuthController.java
@@ -42,7 +42,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.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/...n-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/SocialAuthController.java b/...n-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/SocialAuthController.java
@@ -34,7 +34,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.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/...in-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java b/...in-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java
@@ -52,7 +52,7 @@
 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/...min-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CommonController.java b/...min-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CommonController.java
@@ -44,7 +44,7 @@
 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/...-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/DashboardController.java b/...-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/DashboardController.java
@@ -38,7 +38,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.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/...admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/monitor/LogController.java b/...admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/monitor/LogController.java
@@ -39,7 +39,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.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/...ebapi/src/main/java/top/charles7c/continew/admin/webapi/monitor/OnlineUserController.java b/...ebapi/src/main/java/top/charles7c/continew/admin/webapi/monitor/OnlineUserController.java
@@ -35,7 +35,7 @@
 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/...bapi/src/main/java/top/charles7c/continew/admin/webapi/system/AnnouncementController.java b/...bapi/src/main/java/top/charles7c/continew/admin/webapi/system/AnnouncementController.java
@@ -34,7 +34,7 @@
 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/...admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MenuController.java b/...admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MenuController.java
@@ -36,7 +36,7 @@
 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/...in-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MessageController.java b/...in-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MessageController.java
@@ -31,7 +31,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.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/...min-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/OptionController.java b/...min-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/OptionController.java
@@ -33,7 +33,7 @@
 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/...webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserCenterController.java b/...webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserCenterController.java
@@ -48,7 +48,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.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/...admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserController.java b/...admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserController.java
@@ -39,7 +39,7 @@
 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/...in-webapi/src/main/java/top/charles7c/continew/admin/webapi/tool/GeneratorController.java b/...in-webapi/src/main/java/top/charles7c/continew/admin/webapi/tool/GeneratorController.java
@@ -42,7 +42,7 @@
 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