diff --git a/src/main/java/com/iflytop/gd/app/controller/CmdController.java b/src/main/java/com/iflytop/gd/app/controller/CmdController.java index 8729c72..113fbc0 100644 --- a/src/main/java/com/iflytop/gd/app/controller/CmdController.java +++ b/src/main/java/com/iflytop/gd/app/controller/CmdController.java @@ -1,9 +1,9 @@ package com.iflytop.gd.app.controller; -import com.iflytop.gd.system.core.cmd.CommandHandler; -import com.iflytop.gd.system.core.cmd.CommandHandlerRegistry; +import com.iflytop.gd.app.service.cmd.CommandHandler; +import com.iflytop.gd.app.service.cmd.CommandHandlerRegistry; import com.iflytop.gd.app.model.dto.CmdDTO; -import com.iflytop.gd.system.common.result.Result; +import com.iflytop.gd.common.result.Result; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/iflytop/gd/app/controller/CmdDebugController.java b/src/main/java/com/iflytop/gd/app/controller/CmdDebugController.java index fe6afb2..02cdc81 100644 --- a/src/main/java/com/iflytop/gd/app/controller/CmdDebugController.java +++ b/src/main/java/com/iflytop/gd/app/controller/CmdDebugController.java @@ -1,9 +1,9 @@ package com.iflytop.gd.app.controller; import com.iflytop.gd.app.model.dto.CmdDTO; -import com.iflytop.gd.system.common.result.Result; -import com.iflytop.gd.system.core.cmd.CommandHandler; -import com.iflytop.gd.system.core.cmd.CommandHandlerRegistry; +import com.iflytop.gd.common.result.Result; +import com.iflytop.gd.app.service.cmd.CommandHandler; +import com.iflytop.gd.app.service.cmd.CommandHandlerRegistry; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/iflytop/gd/app/controller/CraftsController.java b/src/main/java/com/iflytop/gd/app/controller/CraftsController.java index fde8823..951883a 100644 --- a/src/main/java/com/iflytop/gd/app/controller/CraftsController.java +++ b/src/main/java/com/iflytop/gd/app/controller/CraftsController.java @@ -5,8 +5,8 @@ import com.iflytop.gd.app.model.dto.ResumeCraftsDto; import com.iflytop.gd.app.model.dto.StartCraftsDTO; import com.iflytop.gd.app.model.dto.StopCraftsDto; import com.iflytop.gd.app.service.CraftsStepService; -import com.iflytop.gd.system.common.result.Result; -import com.iflytop.gd.system.common.result.ResultCode; +import com.iflytop.gd.common.result.Result; +import com.iflytop.gd.common.result.ResultCode; import com.iflytop.gd.app.model.entity.Crafts; import com.iflytop.gd.app.service.CraftsService; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/iflytop/gd/app/controller/OresController.java b/src/main/java/com/iflytop/gd/app/controller/OresController.java index db92a7e..cee2019 100644 --- a/src/main/java/com/iflytop/gd/app/controller/OresController.java +++ b/src/main/java/com/iflytop/gd/app/controller/OresController.java @@ -3,11 +3,11 @@ package com.iflytop.gd.app.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.iflytop.gd.app.model.entity.Ores; import com.iflytop.gd.app.model.vo.OresCraftsListVO; -import com.iflytop.gd.system.common.base.BasePageQuery; -import com.iflytop.gd.system.common.result.PageResult; +import com.iflytop.gd.infrastructure.repository.base.BasePageQuery; +import com.iflytop.gd.common.result.PageResult; import com.iflytop.gd.app.service.OresService; -import com.iflytop.gd.system.common.result.Result; -import com.iflytop.gd.system.common.result.ResultCode; +import com.iflytop.gd.common.result.Result; +import com.iflytop.gd.common.result.ResultCode; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/iflytop/gd/system/controller/UserController.java b/src/main/java/com/iflytop/gd/app/controller/UserController.java similarity index 88% rename from src/main/java/com/iflytop/gd/system/controller/UserController.java rename to src/main/java/com/iflytop/gd/app/controller/UserController.java index 5e56094..c1ce3d6 100644 --- a/src/main/java/com/iflytop/gd/system/controller/UserController.java +++ b/src/main/java/com/iflytop/gd/app/controller/UserController.java @@ -1,13 +1,13 @@ -package com.iflytop.gd.system.controller; +package com.iflytop.gd.app.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.iflytop.gd.system.common.base.BasePageQuery; -import com.iflytop.gd.system.common.result.PageResult; -import com.iflytop.gd.system.common.result.Result; -import com.iflytop.gd.system.common.result.ResultCode; -import com.iflytop.gd.system.model.entity.User; +import com.iflytop.gd.infrastructure.repository.base.BasePageQuery; +import com.iflytop.gd.common.result.PageResult; +import com.iflytop.gd.common.result.Result; +import com.iflytop.gd.common.result.ResultCode; +import com.iflytop.gd.infrastructure.repository.entity.User; import com.iflytop.gd.system.service.UserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/src/main/java/com/iflytop/gd/app/core/CraftsContext.java b/src/main/java/com/iflytop/gd/app/core/CraftsContext.java index 36ab562..d4fa82d 100644 --- a/src/main/java/com/iflytop/gd/app/core/CraftsContext.java +++ b/src/main/java/com/iflytop/gd/app/core/CraftsContext.java @@ -1,13 +1,13 @@ package com.iflytop.gd.app.core; import cn.hutool.json.JSONUtil; -import com.iflytop.gd.system.common.constant.WebSocketMessageType; +import com.iflytop.gd.common.constant.WebSocketMessageType; import com.iflytop.gd.app.common.enums.CraftEvents; import com.iflytop.gd.app.common.enums.CraftStates; import com.iflytop.gd.app.model.bo.CraftsStep; import com.iflytop.gd.app.service.CraftsStepService; import com.iflytop.gd.app.model.entity.Crafts; -import com.iflytop.gd.system.service.WebSocketService; +import com.iflytop.gd.app.service.WebSocketService; import lombok.Getter; import org.springframework.messaging.Message; import org.springframework.messaging.support.MessageBuilder; diff --git a/src/main/java/com/iflytop/gd/system/model/dto/WebsocketResult.java b/src/main/java/com/iflytop/gd/app/model/dto/WebsocketResult.java similarity index 90% rename from src/main/java/com/iflytop/gd/system/model/dto/WebsocketResult.java rename to src/main/java/com/iflytop/gd/app/model/dto/WebsocketResult.java index 020abd5..de53826 100644 --- a/src/main/java/com/iflytop/gd/system/model/dto/WebsocketResult.java +++ b/src/main/java/com/iflytop/gd/app/model/dto/WebsocketResult.java @@ -1,4 +1,4 @@ -package com.iflytop.gd.system.model.dto; +package com.iflytop.gd.app.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/iflytop/gd/app/model/entity/Crafts.java b/src/main/java/com/iflytop/gd/app/model/entity/Crafts.java index a954a64..0bc7419 100644 --- a/src/main/java/com/iflytop/gd/app/model/entity/Crafts.java +++ b/src/main/java/com/iflytop/gd/app/model/entity/Crafts.java @@ -1,7 +1,7 @@ package com.iflytop.gd.app.model.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.iflytop.gd.system.common.base.BaseEntity; +import com.iflytop.gd.infrastructure.repository.base.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/src/main/java/com/iflytop/gd/app/model/entity/Ores.java b/src/main/java/com/iflytop/gd/app/model/entity/Ores.java index dec3b30..718e57e 100644 --- a/src/main/java/com/iflytop/gd/app/model/entity/Ores.java +++ b/src/main/java/com/iflytop/gd/app/model/entity/Ores.java @@ -1,7 +1,7 @@ package com.iflytop.gd.app.model.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.iflytop.gd.system.common.base.BaseEntity; +import com.iflytop.gd.infrastructure.repository.base.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/src/main/java/com/iflytop/gd/app/service/CraftsStepService.java b/src/main/java/com/iflytop/gd/app/service/CraftsStepService.java index 78cbc71..5dae5ca 100644 --- a/src/main/java/com/iflytop/gd/app/service/CraftsStepService.java +++ b/src/main/java/com/iflytop/gd/app/service/CraftsStepService.java @@ -4,7 +4,6 @@ import com.iflytop.gd.app.common.enums.CraftEvents; import com.iflytop.gd.app.common.enums.CraftStates; import com.iflytop.gd.app.core.CraftsContext; import com.iflytop.gd.app.model.entity.Crafts; -import com.iflytop.gd.system.service.WebSocketService; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/iflytop/gd/app/service/OresService.java b/src/main/java/com/iflytop/gd/app/service/OresService.java index f8952ec..9aa5c9b 100644 --- a/src/main/java/com/iflytop/gd/app/service/OresService.java +++ b/src/main/java/com/iflytop/gd/app/service/OresService.java @@ -6,12 +6,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.iflytop.gd.app.model.vo.OresCraftsListVO; -import com.iflytop.gd.system.common.base.BasePageQuery; +import com.iflytop.gd.infrastructure.repository.base.BasePageQuery; import com.iflytop.gd.app.mapper.CraftsMapper; import com.iflytop.gd.app.mapper.OresMapper; import com.iflytop.gd.app.model.entity.Crafts; import com.iflytop.gd.app.model.entity.Ores; -import com.iflytop.gd.system.model.entity.User; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/iflytop/gd/system/service/WebSocketService.java b/src/main/java/com/iflytop/gd/app/service/WebSocketService.java similarity index 67% rename from src/main/java/com/iflytop/gd/system/service/WebSocketService.java rename to src/main/java/com/iflytop/gd/app/service/WebSocketService.java index 0b6cfb0..5a13e4c 100644 --- a/src/main/java/com/iflytop/gd/system/service/WebSocketService.java +++ b/src/main/java/com/iflytop/gd/app/service/WebSocketService.java @@ -1,9 +1,8 @@ -package com.iflytop.gd.system.service; +package com.iflytop.gd.app.service; import cn.hutool.json.JSONUtil; -import com.iflytop.gd.app.common.enums.CraftStates; -import com.iflytop.gd.system.config.WebSocketServer; -import com.iflytop.gd.system.model.dto.WebsocketResult; +import com.iflytop.gd.infrastructure.config.WebSocketServer; +import com.iflytop.gd.app.model.dto.WebsocketResult; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/com/iflytop/gd/system/core/cmd/BaseCommandHandler.java b/src/main/java/com/iflytop/gd/app/service/cmd/BaseCommandHandler.java similarity index 63% rename from src/main/java/com/iflytop/gd/system/core/cmd/BaseCommandHandler.java rename to src/main/java/com/iflytop/gd/app/service/cmd/BaseCommandHandler.java index 052e314..a392896 100644 --- a/src/main/java/com/iflytop/gd/system/core/cmd/BaseCommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/service/cmd/BaseCommandHandler.java @@ -1,9 +1,9 @@ -package com.iflytop.gd.system.core.cmd; +package com.iflytop.gd.app.service.cmd; -import com.iflytop.gd.system.common.annotation.CheckedRunnable; -import com.iflytop.gd.system.common.utils.LambdaUtil; +import com.iflytop.gd.common.annotation.CheckedRunnable; +import com.iflytop.gd.common.utils.LambdaUtil; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/com/iflytop/gd/system/core/cmd/CommandHandler.java b/src/main/java/com/iflytop/gd/app/service/cmd/CommandHandler.java similarity index 81% rename from src/main/java/com/iflytop/gd/system/core/cmd/CommandHandler.java rename to src/main/java/com/iflytop/gd/app/service/cmd/CommandHandler.java index cae8795..812ad2e 100644 --- a/src/main/java/com/iflytop/gd/system/core/cmd/CommandHandler.java +++ b/src/main/java/com/iflytop/gd/app/service/cmd/CommandHandler.java @@ -1,4 +1,4 @@ -package com.iflytop.gd.system.core.cmd; +package com.iflytop.gd.app.service.cmd; import com.iflytop.gd.app.model.dto.CmdDTO; diff --git a/src/main/java/com/iflytop/gd/system/core/cmd/CommandHandlerRegistry.java b/src/main/java/com/iflytop/gd/app/service/cmd/CommandHandlerRegistry.java similarity index 93% rename from src/main/java/com/iflytop/gd/system/core/cmd/CommandHandlerRegistry.java rename to src/main/java/com/iflytop/gd/app/service/cmd/CommandHandlerRegistry.java index d3d91e7..ca68ba8 100644 --- a/src/main/java/com/iflytop/gd/system/core/cmd/CommandHandlerRegistry.java +++ b/src/main/java/com/iflytop/gd/app/service/cmd/CommandHandlerRegistry.java @@ -1,6 +1,6 @@ -package com.iflytop.gd.system.core.cmd; +package com.iflytop.gd.app.service.cmd; -import com.iflytop.gd.system.common.annotation.CommandMapping; +import com.iflytop.gd.common.annotation.CommandMapping; import io.micrometer.common.lang.NonNull; import jakarta.annotation.PostConstruct; import org.springframework.aop.support.AopUtils; diff --git a/src/main/java/com/iflytop/gd/app/service/cmd/DemoCommand.java b/src/main/java/com/iflytop/gd/app/service/cmd/DemoCommand.java index 6e9d24e..1defd30 100644 --- a/src/main/java/com/iflytop/gd/app/service/cmd/DemoCommand.java +++ b/src/main/java/com/iflytop/gd/app/service/cmd/DemoCommand.java @@ -1,8 +1,7 @@ package com.iflytop.gd.app.service.cmd; import com.iflytop.gd.app.model.dto.CmdDTO; -import com.iflytop.gd.system.common.annotation.CommandMapping; -import com.iflytop.gd.system.core.cmd.BaseCommandHandler; +import com.iflytop.gd.common.annotation.CommandMapping; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/iflytop/gd/system/common/annotation/CheckedRunnable.java b/src/main/java/com/iflytop/gd/common/annotation/CheckedRunnable.java similarity index 65% rename from src/main/java/com/iflytop/gd/system/common/annotation/CheckedRunnable.java rename to src/main/java/com/iflytop/gd/common/annotation/CheckedRunnable.java index 42d4f16..d652552 100644 --- a/src/main/java/com/iflytop/gd/system/common/annotation/CheckedRunnable.java +++ b/src/main/java/com/iflytop/gd/common/annotation/CheckedRunnable.java @@ -1,4 +1,4 @@ -package com.iflytop.gd.system.common.annotation; +package com.iflytop.gd.common.annotation; @FunctionalInterface public interface CheckedRunnable { diff --git a/src/main/java/com/iflytop/gd/system/common/annotation/CommandMapping.java b/src/main/java/com/iflytop/gd/common/annotation/CommandMapping.java similarity index 84% rename from src/main/java/com/iflytop/gd/system/common/annotation/CommandMapping.java rename to src/main/java/com/iflytop/gd/common/annotation/CommandMapping.java index e82ef59..5b4e657 100644 --- a/src/main/java/com/iflytop/gd/system/common/annotation/CommandMapping.java +++ b/src/main/java/com/iflytop/gd/common/annotation/CommandMapping.java @@ -1,4 +1,4 @@ -package com.iflytop.gd.system.common.annotation; +package com.iflytop.gd.common.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/com/iflytop/gd/system/common/constant/WebSocketMessageType.java b/src/main/java/com/iflytop/gd/common/constant/WebSocketMessageType.java similarity index 91% rename from src/main/java/com/iflytop/gd/system/common/constant/WebSocketMessageType.java rename to src/main/java/com/iflytop/gd/common/constant/WebSocketMessageType.java index cdff747..08a1dd3 100644 --- a/src/main/java/com/iflytop/gd/system/common/constant/WebSocketMessageType.java +++ b/src/main/java/com/iflytop/gd/common/constant/WebSocketMessageType.java @@ -1,4 +1,4 @@ -package com.iflytop.gd.system.common.constant; +package com.iflytop.gd.common.constant; public class WebSocketMessageType { /** diff --git a/src/main/java/com/iflytop/gd/system/common/enums/Deleted.java b/src/main/java/com/iflytop/gd/common/enums/Deleted.java similarity index 71% rename from src/main/java/com/iflytop/gd/system/common/enums/Deleted.java rename to src/main/java/com/iflytop/gd/common/enums/Deleted.java index 13ffb89..86e69a7 100644 --- a/src/main/java/com/iflytop/gd/system/common/enums/Deleted.java +++ b/src/main/java/com/iflytop/gd/common/enums/Deleted.java @@ -1,4 +1,4 @@ -package com.iflytop.gd.system.common.enums; +package com.iflytop.gd.common.enums; import lombok.Getter; diff --git a/src/main/java/com/iflytop/gd/system/common/enums/FixedUser.java b/src/main/java/com/iflytop/gd/common/enums/FixedUser.java similarity index 71% rename from src/main/java/com/iflytop/gd/system/common/enums/FixedUser.java rename to src/main/java/com/iflytop/gd/common/enums/FixedUser.java index 8e8d208..355e7bc 100644 --- a/src/main/java/com/iflytop/gd/system/common/enums/FixedUser.java +++ b/src/main/java/com/iflytop/gd/common/enums/FixedUser.java @@ -1,4 +1,4 @@ -package com.iflytop.gd.system.common.enums; +package com.iflytop.gd.common.enums; import lombok.Getter; diff --git a/src/main/java/com/iflytop/gd/system/common/enums/UsrRole.java b/src/main/java/com/iflytop/gd/common/enums/UsrRole.java similarity index 56% rename from src/main/java/com/iflytop/gd/system/common/enums/UsrRole.java rename to src/main/java/com/iflytop/gd/common/enums/UsrRole.java index e8d676b..ee6b1ac 100644 --- a/src/main/java/com/iflytop/gd/system/common/enums/UsrRole.java +++ b/src/main/java/com/iflytop/gd/common/enums/UsrRole.java @@ -1,4 +1,4 @@ -package com.iflytop.gd.system.common.enums; +package com.iflytop.gd.common.enums; public enum UsrRole { ADMIN, diff --git a/src/main/java/com/iflytop/gd/system/common/exception/AppException.java b/src/main/java/com/iflytop/gd/common/exception/AppException.java similarity index 82% rename from src/main/java/com/iflytop/gd/system/common/exception/AppException.java rename to src/main/java/com/iflytop/gd/common/exception/AppException.java index 28e634e..980627a 100644 --- a/src/main/java/com/iflytop/gd/system/common/exception/AppException.java +++ b/src/main/java/com/iflytop/gd/common/exception/AppException.java @@ -1,6 +1,6 @@ -package com.iflytop.gd.system.common.exception; +package com.iflytop.gd.common.exception; -import com.iflytop.gd.system.common.result.IResultCode; +import com.iflytop.gd.common.result.IResultCode; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/iflytop/gd/system/handler/GlobalExceptionHandler.java b/src/main/java/com/iflytop/gd/common/handler/GlobalExceptionHandler.java similarity index 74% rename from src/main/java/com/iflytop/gd/system/handler/GlobalExceptionHandler.java rename to src/main/java/com/iflytop/gd/common/handler/GlobalExceptionHandler.java index 0a6ae18..8148129 100644 --- a/src/main/java/com/iflytop/gd/system/handler/GlobalExceptionHandler.java +++ b/src/main/java/com/iflytop/gd/common/handler/GlobalExceptionHandler.java @@ -1,8 +1,8 @@ -package com.iflytop.gd.system.handler; +package com.iflytop.gd.common.handler; -import com.iflytop.gd.system.common.exception.AppException; -import com.iflytop.gd.system.common.result.Result; -import com.iflytop.gd.system.common.result.ResultCode; +import com.iflytop.gd.common.exception.AppException; +import com.iflytop.gd.common.result.Result; +import com.iflytop.gd.common.result.ResultCode; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; diff --git a/src/main/java/com/iflytop/gd/system/handler/MyMetaObjectHandler.java b/src/main/java/com/iflytop/gd/common/handler/MyMetaObjectHandler.java similarity index 96% rename from src/main/java/com/iflytop/gd/system/handler/MyMetaObjectHandler.java rename to src/main/java/com/iflytop/gd/common/handler/MyMetaObjectHandler.java index a838157..7d5a0b4 100644 --- a/src/main/java/com/iflytop/gd/system/handler/MyMetaObjectHandler.java +++ b/src/main/java/com/iflytop/gd/common/handler/MyMetaObjectHandler.java @@ -1,4 +1,4 @@ -package com.iflytop.gd.system.handler; +package com.iflytop.gd.common.handler; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.apache.ibatis.reflection.MetaObject; diff --git a/src/main/java/com/iflytop/gd/system/common/result/IResultCode.java b/src/main/java/com/iflytop/gd/common/result/IResultCode.java similarity index 70% rename from src/main/java/com/iflytop/gd/system/common/result/IResultCode.java rename to src/main/java/com/iflytop/gd/common/result/IResultCode.java index a4d80f3..25b91df 100644 --- a/src/main/java/com/iflytop/gd/system/common/result/IResultCode.java +++ b/src/main/java/com/iflytop/gd/common/result/IResultCode.java @@ -1,4 +1,4 @@ -package com.iflytop.gd.system.common.result; +package com.iflytop.gd.common.result; /** * 响应码接口 diff --git a/src/main/java/com/iflytop/gd/system/common/result/PageResult.java b/src/main/java/com/iflytop/gd/common/result/PageResult.java similarity index 94% rename from src/main/java/com/iflytop/gd/system/common/result/PageResult.java rename to src/main/java/com/iflytop/gd/common/result/PageResult.java index 8deb6b6..bab2ce6 100644 --- a/src/main/java/com/iflytop/gd/system/common/result/PageResult.java +++ b/src/main/java/com/iflytop/gd/common/result/PageResult.java @@ -1,4 +1,4 @@ -package com.iflytop.gd.system.common.result; +package com.iflytop.gd.common.result; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.Data; diff --git a/src/main/java/com/iflytop/gd/system/common/result/Result.java b/src/main/java/com/iflytop/gd/common/result/Result.java similarity index 97% rename from src/main/java/com/iflytop/gd/system/common/result/Result.java rename to src/main/java/com/iflytop/gd/common/result/Result.java index b44497d..b06af4c 100644 --- a/src/main/java/com/iflytop/gd/system/common/result/Result.java +++ b/src/main/java/com/iflytop/gd/common/result/Result.java @@ -1,4 +1,4 @@ -package com.iflytop.gd.system.common.result; +package com.iflytop.gd.common.result; import cn.hutool.core.util.StrUtil; import lombok.Data; diff --git a/src/main/java/com/iflytop/gd/system/common/result/ResultCode.java b/src/main/java/com/iflytop/gd/common/result/ResultCode.java similarity index 98% rename from src/main/java/com/iflytop/gd/system/common/result/ResultCode.java rename to src/main/java/com/iflytop/gd/common/result/ResultCode.java index 5def4f8..5895172 100644 --- a/src/main/java/com/iflytop/gd/system/common/result/ResultCode.java +++ b/src/main/java/com/iflytop/gd/common/result/ResultCode.java @@ -1,4 +1,4 @@ -package com.iflytop.gd.system.common.result; +package com.iflytop.gd.common.result; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/iflytop/gd/system/common/utils/LambdaUtil.java b/src/main/java/com/iflytop/gd/common/utils/LambdaUtil.java similarity index 71% rename from src/main/java/com/iflytop/gd/system/common/utils/LambdaUtil.java rename to src/main/java/com/iflytop/gd/common/utils/LambdaUtil.java index f2f69f7..8257cdf 100644 --- a/src/main/java/com/iflytop/gd/system/common/utils/LambdaUtil.java +++ b/src/main/java/com/iflytop/gd/common/utils/LambdaUtil.java @@ -1,6 +1,6 @@ -package com.iflytop.gd.system.common.utils; +package com.iflytop.gd.common.utils; -import com.iflytop.gd.system.common.annotation.CheckedRunnable; +import com.iflytop.gd.common.annotation.CheckedRunnable; public class LambdaUtil { public static Runnable unchecked(CheckedRunnable runnable) { diff --git a/src/main/java/com/iflytop/gd/hardware/comm/rs485/driver/d.txt b/src/main/java/com/iflytop/gd/infrastructure/comm/can/driver/d.txt similarity index 100% rename from src/main/java/com/iflytop/gd/hardware/comm/rs485/driver/d.txt rename to src/main/java/com/iflytop/gd/infrastructure/comm/can/driver/d.txt diff --git a/src/main/java/com/iflytop/gd/hardware/comm/rs485/listener/d.txt b/src/main/java/com/iflytop/gd/infrastructure/comm/can/listener/d.txt similarity index 100% rename from src/main/java/com/iflytop/gd/hardware/comm/rs485/listener/d.txt rename to src/main/java/com/iflytop/gd/infrastructure/comm/can/listener/d.txt diff --git a/src/main/java/com/iflytop/gd/hardware/comm/rs485/protocol/d.txt b/src/main/java/com/iflytop/gd/infrastructure/comm/can/protocol/d.txt similarity index 100% rename from src/main/java/com/iflytop/gd/hardware/comm/rs485/protocol/d.txt rename to src/main/java/com/iflytop/gd/infrastructure/comm/can/protocol/d.txt diff --git a/src/main/java/com/iflytop/gd/hardware/comm/can/driver/d.txt b/src/main/java/com/iflytop/gd/infrastructure/comm/rs485/driver/d.txt similarity index 100% rename from src/main/java/com/iflytop/gd/hardware/comm/can/driver/d.txt rename to src/main/java/com/iflytop/gd/infrastructure/comm/rs485/driver/d.txt diff --git a/src/main/java/com/iflytop/gd/hardware/comm/can/listener/d.txt b/src/main/java/com/iflytop/gd/infrastructure/comm/rs485/listener/d.txt similarity index 100% rename from src/main/java/com/iflytop/gd/hardware/comm/can/listener/d.txt rename to src/main/java/com/iflytop/gd/infrastructure/comm/rs485/listener/d.txt diff --git a/src/main/java/com/iflytop/gd/hardware/comm/can/protocol/d.txt b/src/main/java/com/iflytop/gd/infrastructure/comm/rs485/protocol/d.txt similarity index 100% rename from src/main/java/com/iflytop/gd/hardware/comm/can/protocol/d.txt rename to src/main/java/com/iflytop/gd/infrastructure/comm/rs485/protocol/d.txt diff --git a/src/main/java/com/iflytop/gd/system/config/MybatisPlusConfig.java b/src/main/java/com/iflytop/gd/infrastructure/config/MybatisPlusConfig.java similarity index 95% rename from src/main/java/com/iflytop/gd/system/config/MybatisPlusConfig.java rename to src/main/java/com/iflytop/gd/infrastructure/config/MybatisPlusConfig.java index 0c0a462..53e188c 100644 --- a/src/main/java/com/iflytop/gd/system/config/MybatisPlusConfig.java +++ b/src/main/java/com/iflytop/gd/infrastructure/config/MybatisPlusConfig.java @@ -1,11 +1,11 @@ -package com.iflytop.gd.system.config; +package com.iflytop.gd.infrastructure.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.core.config.GlobalConfig; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import com.iflytop.gd.system.handler.MyMetaObjectHandler; +import com.iflytop.gd.common.handler.MyMetaObjectHandler; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.annotation.EnableTransactionManagement; diff --git a/src/main/java/com/iflytop/gd/system/config/SwaggerConfig.java b/src/main/java/com/iflytop/gd/infrastructure/config/SwaggerConfig.java similarity index 96% rename from src/main/java/com/iflytop/gd/system/config/SwaggerConfig.java rename to src/main/java/com/iflytop/gd/infrastructure/config/SwaggerConfig.java index 5bc5f07..25de415 100644 --- a/src/main/java/com/iflytop/gd/system/config/SwaggerConfig.java +++ b/src/main/java/com/iflytop/gd/infrastructure/config/SwaggerConfig.java @@ -1,10 +1,9 @@ -package com.iflytop.gd.system.config; +package com.iflytop.gd.infrastructure.config; import cn.hutool.core.util.ArrayUtil; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; -import io.swagger.v3.oas.models.security.SecurityRequirement; import io.swagger.v3.oas.models.security.SecurityScheme; import org.springdoc.core.customizers.GlobalOpenApiCustomizer; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/iflytop/gd/system/config/WebConfig.java b/src/main/java/com/iflytop/gd/infrastructure/config/WebConfig.java similarity index 91% rename from src/main/java/com/iflytop/gd/system/config/WebConfig.java rename to src/main/java/com/iflytop/gd/infrastructure/config/WebConfig.java index 633d918..05999c1 100644 --- a/src/main/java/com/iflytop/gd/system/config/WebConfig.java +++ b/src/main/java/com/iflytop/gd/infrastructure/config/WebConfig.java @@ -1,4 +1,4 @@ -package com.iflytop.gd.system.config; +package com.iflytop.gd.infrastructure.config; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.CorsRegistry; diff --git a/src/main/java/com/iflytop/gd/system/config/WebSocketConfig.java b/src/main/java/com/iflytop/gd/infrastructure/config/WebSocketConfig.java similarity index 88% rename from src/main/java/com/iflytop/gd/system/config/WebSocketConfig.java rename to src/main/java/com/iflytop/gd/infrastructure/config/WebSocketConfig.java index 24f1bad..a3a8006 100644 --- a/src/main/java/com/iflytop/gd/system/config/WebSocketConfig.java +++ b/src/main/java/com/iflytop/gd/infrastructure/config/WebSocketConfig.java @@ -1,4 +1,4 @@ -package com.iflytop.gd.system.config; +package com.iflytop.gd.infrastructure.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/iflytop/gd/system/config/WebSocketServer.java b/src/main/java/com/iflytop/gd/infrastructure/config/WebSocketServer.java similarity index 96% rename from src/main/java/com/iflytop/gd/system/config/WebSocketServer.java rename to src/main/java/com/iflytop/gd/infrastructure/config/WebSocketServer.java index ddf7634..d8484ab 100644 --- a/src/main/java/com/iflytop/gd/system/config/WebSocketServer.java +++ b/src/main/java/com/iflytop/gd/infrastructure/config/WebSocketServer.java @@ -1,4 +1,4 @@ -package com.iflytop.gd.system.config; +package com.iflytop.gd.infrastructure.config; import jakarta.websocket.*; diff --git a/src/main/java/com/iflytop/gd/system/common/base/BaseEntity.java b/src/main/java/com/iflytop/gd/infrastructure/repository/base/BaseEntity.java similarity index 95% rename from src/main/java/com/iflytop/gd/system/common/base/BaseEntity.java rename to src/main/java/com/iflytop/gd/infrastructure/repository/base/BaseEntity.java index 0af2428..1e73461 100644 --- a/src/main/java/com/iflytop/gd/system/common/base/BaseEntity.java +++ b/src/main/java/com/iflytop/gd/infrastructure/repository/base/BaseEntity.java @@ -1,4 +1,4 @@ -package com.iflytop.gd.system.common.base; +package com.iflytop.gd.infrastructure.repository.base; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/src/main/java/com/iflytop/gd/system/common/base/BasePageQuery.java b/src/main/java/com/iflytop/gd/infrastructure/repository/base/BasePageQuery.java similarity index 91% rename from src/main/java/com/iflytop/gd/system/common/base/BasePageQuery.java rename to src/main/java/com/iflytop/gd/infrastructure/repository/base/BasePageQuery.java index f53725c..0661b0e 100644 --- a/src/main/java/com/iflytop/gd/system/common/base/BasePageQuery.java +++ b/src/main/java/com/iflytop/gd/infrastructure/repository/base/BasePageQuery.java @@ -1,4 +1,4 @@ -package com.iflytop.gd.system.common.base; +package com.iflytop.gd.infrastructure.repository.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/iflytop/gd/system/common/base/IBaseEnum.java b/src/main/java/com/iflytop/gd/infrastructure/repository/base/IBaseEnum.java similarity index 97% rename from src/main/java/com/iflytop/gd/system/common/base/IBaseEnum.java rename to src/main/java/com/iflytop/gd/infrastructure/repository/base/IBaseEnum.java index 72ff589..3da4bad 100644 --- a/src/main/java/com/iflytop/gd/system/common/base/IBaseEnum.java +++ b/src/main/java/com/iflytop/gd/infrastructure/repository/base/IBaseEnum.java @@ -1,4 +1,4 @@ -package com.iflytop.gd.system.common.base; +package com.iflytop.gd.infrastructure.repository.base; import cn.hutool.core.util.ObjectUtil; diff --git a/src/main/java/com/iflytop/gd/system/model/entity/User.java b/src/main/java/com/iflytop/gd/infrastructure/repository/entity/User.java similarity index 76% rename from src/main/java/com/iflytop/gd/system/model/entity/User.java rename to src/main/java/com/iflytop/gd/infrastructure/repository/entity/User.java index 37d8a0f..726ea14 100644 --- a/src/main/java/com/iflytop/gd/system/model/entity/User.java +++ b/src/main/java/com/iflytop/gd/infrastructure/repository/entity/User.java @@ -1,10 +1,10 @@ -package com.iflytop.gd.system.model.entity; +package com.iflytop.gd.infrastructure.repository.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.iflytop.gd.system.common.base.BaseEntity; -import com.iflytop.gd.system.common.enums.Deleted; -import com.iflytop.gd.system.common.enums.FixedUser; -import com.iflytop.gd.system.common.enums.UsrRole; +import com.iflytop.gd.infrastructure.repository.base.BaseEntity; +import com.iflytop.gd.common.enums.Deleted; +import com.iflytop.gd.common.enums.FixedUser; +import com.iflytop.gd.common.enums.UsrRole; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/src/main/java/com/iflytop/gd/system/mapper/UserMapper.java b/src/main/java/com/iflytop/gd/infrastructure/repository/mapper/UserMapper.java similarity index 63% rename from src/main/java/com/iflytop/gd/system/mapper/UserMapper.java rename to src/main/java/com/iflytop/gd/infrastructure/repository/mapper/UserMapper.java index 6c3c7d4..718a3e4 100644 --- a/src/main/java/com/iflytop/gd/system/mapper/UserMapper.java +++ b/src/main/java/com/iflytop/gd/infrastructure/repository/mapper/UserMapper.java @@ -1,7 +1,7 @@ -package com.iflytop.gd.system.mapper; +package com.iflytop.gd.infrastructure.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.iflytop.gd.system.model.entity.User; +import com.iflytop.gd.infrastructure.repository.entity.User; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/iflytop/gd/system/service/UserService.java b/src/main/java/com/iflytop/gd/system/service/UserService.java index 0f271e9..23f45c7 100644 --- a/src/main/java/com/iflytop/gd/system/service/UserService.java +++ b/src/main/java/com/iflytop/gd/system/service/UserService.java @@ -1,8 +1,8 @@ package com.iflytop.gd.system.service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.iflytop.gd.system.mapper.UserMapper; -import com.iflytop.gd.system.model.entity.User; +import com.iflytop.gd.infrastructure.repository.mapper.UserMapper; +import com.iflytop.gd.infrastructure.repository.entity.User; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter;