feat:优化系统项目结构

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;

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;

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;

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;

src/main/java/com/iflytop/gd/system/controller/UserController.java → 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;

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;

src/main/java/com/iflytop/gd/system/model/dto/WebsocketResult.java → 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;

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;

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;

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;

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;
 

src/main/java/com/iflytop/gd/system/service/WebSocketService.java → 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

src/main/java/com/iflytop/gd/system/core/cmd/BaseCommandHandler.java → 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;
 

src/main/java/com/iflytop/gd/system/core/cmd/CommandHandler.java → 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;
 

src/main/java/com/iflytop/gd/system/core/cmd/CommandHandlerRegistry.java → 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;

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;

src/main/java/com/iflytop/gd/system/common/annotation/CheckedRunnable.java → 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 {

src/main/java/com/iflytop/gd/system/common/annotation/CommandMapping.java → 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;

src/main/java/com/iflytop/gd/system/common/constant/WebSocketMessageType.java → 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 {
     /**

src/main/java/com/iflytop/gd/system/common/enums/Deleted.java → 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;
 

src/main/java/com/iflytop/gd/system/common/enums/FixedUser.java → 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;
 

src/main/java/com/iflytop/gd/system/common/enums/UsrRole.java → 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,

src/main/java/com/iflytop/gd/system/common/exception/AppException.java → 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;
 

src/main/java/com/iflytop/gd/system/handler/GlobalExceptionHandler.java → 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;

src/main/java/com/iflytop/gd/system/handler/MyMetaObjectHandler.java → 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;

src/main/java/com/iflytop/gd/system/common/result/IResultCode.java → 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;
 
 /**
  * 响应码接口

src/main/java/com/iflytop/gd/system/common/result/PageResult.java → 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;

src/main/java/com/iflytop/gd/system/common/result/Result.java → 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;

src/main/java/com/iflytop/gd/system/common/result/ResultCode.java → 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;

src/main/java/com/iflytop/gd/system/common/utils/LambdaUtil.java → 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) {

src/main/java/com/iflytop/gd/system/config/MybatisPlusConfig.java → 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;

src/main/java/com/iflytop/gd/system/config/SwaggerConfig.java → 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;

src/main/java/com/iflytop/gd/system/config/WebConfig.java → 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;

src/main/java/com/iflytop/gd/system/config/WebSocketConfig.java → 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;

src/main/java/com/iflytop/gd/system/config/WebSocketServer.java → 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.*;

src/main/java/com/iflytop/gd/system/common/base/BaseEntity.java → 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;

src/main/java/com/iflytop/gd/system/common/base/BasePageQuery.java → 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;

src/main/java/com/iflytop/gd/system/common/base/IBaseEnum.java → 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;

src/main/java/com/iflytop/gd/system/model/entity/User.java → 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;

src/main/java/com/iflytop/gd/system/mapper/UserMapper.java → 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;
 
 /**

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;