From 093d39a108f4689c807df97c90a7e33a3fca7206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E6=96=87=E8=B1=AA?= <980287353@qq.com> Date: Wed, 26 Jun 2024 10:13:42 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9Aweb=E6=A8=A1=E5=9D=97=E5=8C=85?= =?UTF-8?q?=E5=90=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tiesheng/demo/DemoApplication.java | 2 +- .../demo/config/DemoWebConfigurer.java | 6 ++--- .../tiesheng/demo/config/TestJobConfig.java | 2 +- .../demo/controller/TestController.java | 6 ++--- .../com/tiesheng/core/CoreAutoConfigurer.java | 15 ----------- .../com/tiesheng/core/RoleAutoConfigurer.java | 12 --------- .../{core => web}/EnableTieshengWeb.java | 7 +++-- .../com/tiesheng/web/WebAutoConfigurer.java | 16 ++++++++++++ .../exception/SpringExceptionHandler.java | 4 +-- .../config/json/FastJsonMessageConverter.java | 2 +- .../config/mybatis/MybatisPlusCustomizer.java | 2 +- .../mybatis/MybatisTimeMetaHandler.java | 2 +- .../config/operation/OperationAspect.java | 4 +-- .../template/TieshengTemplateHandler.java | 4 +-- .../config/template/ToolTemplateHandler.java | 4 +-- .../controller/ConfigController.java | 14 +++++----- .../controller/LogController.java | 14 +++++----- .../controller/ToolController.java | 15 +++++------ .../mapper/CoreConfigEnumMapper.java | 6 ++--- .../mapper/CoreConfigSystemMapper.java | 6 ++--- .../mapper/CoreLogLoginMapper.java | 4 +-- .../mapper/CoreLogMessageMapper.java | 6 ++--- .../mapper/CoreLogOperationMapper.java | 4 +-- .../mapper/CoreLogProcessMapper.java | 6 ++--- .../mapper/CorePlatformUniqueMapper.java | 6 ++--- .../{core => web}/pojos/RequestUserInfo.java | 2 +- .../pojos/dao/CoreConfigEnum.java | 2 +- .../pojos/dao/CoreConfigSystem.java | 2 +- .../{core => web}/pojos/dao/CoreLogLogin.java | 2 +- .../pojos/dao/CoreLogMessage.java | 2 +- .../pojos/dao/CoreLogOperation.java | 2 +- .../pojos/dao/CoreLogProcess.java | 2 +- .../pojos/dao/CorePlatformUnique.java | 2 +- .../pojos/dto/ChunkCheckDTO.java | 2 +- .../pojos/dto/ChunkMergeDTO.java | 2 +- .../pojos/dto/ChunkStartDTO.java | 2 +- .../{core => web}/pojos/dto/ImageCodeDTO.java | 2 +- .../pojos/dto/TemplateDealDTO.java | 2 +- .../pojos/dto/TemplateInfoDTO.java | 2 +- .../pojos/dto/config/ConfigSystemDTO.java | 2 +- .../pojos/dto/config/EnumTypeDTO.java | 2 +- .../{core => web}/pojos/vo/PicVerifyVo.java | 2 +- .../pojos/vo/ProcessDetailVo.java | 2 +- .../pojos/vo/TemplateInfoVO.java | 2 +- .../service/CoreConfigService.java | 8 +++--- .../{core => web}/service/CoreLogService.java | 26 +++++++++---------- .../service/CoreMessageService.java | 6 ++--- .../service/CorePlatformUniqueService.java | 6 ++--- .../service/FileUploadService.java | 2 +- .../service/TieshengWebConfigurer.java | 8 +++--- .../service/TimedCacheService.java | 2 +- .../util/ProcessImportConsumer.java | 2 +- .../util/ProcessSyncConsumer.java | 2 +- .../resources/mapper/CoreConfigEnumMapper.xml | 6 ++--- .../mapper/CoreConfigSystemMapper.xml | 8 +++--- .../resources/mapper/CoreLogLoginMapper.xml | 4 +-- .../resources/mapper/CoreLogMessageMapper.xml | 6 ++--- .../mapper/CoreLogOperationMapper.xml | 4 +-- .../resources/mapper/CoreLogProcessMapper.xml | 8 +++--- .../mapper/CorePlatformUniqueMapper.xml | 6 ++--- 60 files changed, 149 insertions(+), 162 deletions(-) delete mode 100644 springboot-web/src/main/java/com/tiesheng/core/CoreAutoConfigurer.java delete mode 100644 springboot-web/src/main/java/com/tiesheng/core/RoleAutoConfigurer.java rename springboot-web/src/main/java/com/tiesheng/{core => web}/EnableTieshengWeb.java (82%) create mode 100644 springboot-web/src/main/java/com/tiesheng/web/WebAutoConfigurer.java rename springboot-web/src/main/java/com/tiesheng/{core => web}/config/exception/SpringExceptionHandler.java (96%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/config/json/FastJsonMessageConverter.java (96%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/config/mybatis/MybatisPlusCustomizer.java (97%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/config/mybatis/MybatisTimeMetaHandler.java (97%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/config/operation/OperationAspect.java (97%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/config/template/TieshengTemplateHandler.java (84%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/config/template/ToolTemplateHandler.java (89%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/controller/ConfigController.java (88%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/controller/LogController.java (91%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/controller/ToolController.java (92%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/mapper/CoreConfigEnumMapper.java (60%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/mapper/CoreConfigSystemMapper.java (60%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/mapper/CoreLogLoginMapper.java (61%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/mapper/CoreLogMessageMapper.java (60%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/mapper/CoreLogOperationMapper.java (87%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/mapper/CoreLogProcessMapper.java (60%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/mapper/CorePlatformUniqueMapper.java (61%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/pojos/RequestUserInfo.java (95%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/pojos/dao/CoreConfigEnum.java (97%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/pojos/dao/CoreConfigSystem.java (98%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/pojos/dao/CoreLogLogin.java (98%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/pojos/dao/CoreLogMessage.java (98%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/pojos/dao/CoreLogOperation.java (98%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/pojos/dao/CoreLogProcess.java (99%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/pojos/dao/CorePlatformUnique.java (98%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/pojos/dto/ChunkCheckDTO.java (93%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/pojos/dto/ChunkMergeDTO.java (94%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/pojos/dto/ChunkStartDTO.java (91%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/pojos/dto/ImageCodeDTO.java (97%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/pojos/dto/TemplateDealDTO.java (95%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/pojos/dto/TemplateInfoDTO.java (93%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/pojos/dto/config/ConfigSystemDTO.java (95%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/pojos/dto/config/EnumTypeDTO.java (80%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/pojos/vo/PicVerifyVo.java (93%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/pojos/vo/ProcessDetailVo.java (97%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/pojos/vo/TemplateInfoVO.java (95%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/service/CoreConfigService.java (85%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/service/CoreLogService.java (91%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/service/CoreMessageService.java (95%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/service/CorePlatformUniqueService.java (93%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/service/FileUploadService.java (99%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/service/TieshengWebConfigurer.java (91%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/service/TimedCacheService.java (98%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/util/ProcessImportConsumer.java (90%) rename springboot-web/src/main/java/com/tiesheng/{core => web}/util/ProcessSyncConsumer.java (87%) diff --git a/springboot-ademo/src/main/java/com/tiesheng/demo/DemoApplication.java b/springboot-ademo/src/main/java/com/tiesheng/demo/DemoApplication.java index bc3cea1..373dfbe 100644 --- a/springboot-ademo/src/main/java/com/tiesheng/demo/DemoApplication.java +++ b/springboot-ademo/src/main/java/com/tiesheng/demo/DemoApplication.java @@ -1,7 +1,7 @@ package com.tiesheng.demo; -import com.tiesheng.core.EnableTieshengWeb; +import com.tiesheng.web.EnableTieshengWeb; import com.tiesheng.demo.config.DemoWebConfigurer; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/springboot-ademo/src/main/java/com/tiesheng/demo/config/DemoWebConfigurer.java b/springboot-ademo/src/main/java/com/tiesheng/demo/config/DemoWebConfigurer.java index 1de8742..37ed621 100644 --- a/springboot-ademo/src/main/java/com/tiesheng/demo/config/DemoWebConfigurer.java +++ b/springboot-ademo/src/main/java/com/tiesheng/demo/config/DemoWebConfigurer.java @@ -1,9 +1,9 @@ package com.tiesheng.demo.config; import cn.hutool.core.util.StrUtil; -import com.tiesheng.core.pojos.RequestUserInfo; -import com.tiesheng.core.pojos.dao.CorePlatformUnique; -import com.tiesheng.core.service.TieshengWebConfigurer; +import com.tiesheng.web.pojos.RequestUserInfo; +import com.tiesheng.web.pojos.dao.CorePlatformUnique; +import com.tiesheng.web.service.TieshengWebConfigurer; import com.tiesheng.util.pojos.TokenBean; import com.tiesheng.util.config.GlobalConfig; import org.springframework.beans.factory.annotation.Autowired; diff --git a/springboot-ademo/src/main/java/com/tiesheng/demo/config/TestJobConfig.java b/springboot-ademo/src/main/java/com/tiesheng/demo/config/TestJobConfig.java index 7c4fab4..0973138 100644 --- a/springboot-ademo/src/main/java/com/tiesheng/demo/config/TestJobConfig.java +++ b/springboot-ademo/src/main/java/com/tiesheng/demo/config/TestJobConfig.java @@ -1,7 +1,7 @@ package com.tiesheng.demo.config; -import com.tiesheng.core.service.CoreConfigService; +import com.tiesheng.web.service.CoreConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java b/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java index 82bacc1..8ead4ed 100644 --- a/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java +++ b/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java @@ -9,9 +9,9 @@ import com.alibaba.excel.EasyExcel; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.read.listener.ReadListener; import com.tiesheng.annotation.token.TokenIgnore; -import com.tiesheng.core.service.CoreLogService; -import com.tiesheng.core.service.CoreMessageService; -import com.tiesheng.core.util.ProcessImportConsumer; +import com.tiesheng.web.service.CoreLogService; +import com.tiesheng.web.service.CoreMessageService; +import com.tiesheng.web.util.ProcessImportConsumer; import com.tiesheng.database.config.DbBackupConfig; import com.tiesheng.demo.pojos.PoiBean; import com.tiesheng.demo.pojos.TestFile; diff --git a/springboot-web/src/main/java/com/tiesheng/core/CoreAutoConfigurer.java b/springboot-web/src/main/java/com/tiesheng/core/CoreAutoConfigurer.java deleted file mode 100644 index e2701e1..0000000 --- a/springboot-web/src/main/java/com/tiesheng/core/CoreAutoConfigurer.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.tiesheng.core; - -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.context.annotation.ComponentScan; - -/** - * @author hao - */ - -@ComponentScan({ - "com.tiesheng.core.**.*", -}) -@MapperScan("com.tiesheng.core.mapper") -public class CoreAutoConfigurer { -} diff --git a/springboot-web/src/main/java/com/tiesheng/core/RoleAutoConfigurer.java b/springboot-web/src/main/java/com/tiesheng/core/RoleAutoConfigurer.java deleted file mode 100644 index 6f47472..0000000 --- a/springboot-web/src/main/java/com/tiesheng/core/RoleAutoConfigurer.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tiesheng.core; - - -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.context.annotation.ComponentScan; - -@ComponentScan({ - "com.tiesheng.role.**.*", -}) -@MapperScan("com.tiesheng.role.mapper") -public class RoleAutoConfigurer { -} diff --git a/springboot-web/src/main/java/com/tiesheng/core/EnableTieshengWeb.java b/springboot-web/src/main/java/com/tiesheng/web/EnableTieshengWeb.java similarity index 82% rename from springboot-web/src/main/java/com/tiesheng/core/EnableTieshengWeb.java rename to springboot-web/src/main/java/com/tiesheng/web/EnableTieshengWeb.java index 6da1eb9..7d89aa6 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/EnableTieshengWeb.java +++ b/springboot-web/src/main/java/com/tiesheng/web/EnableTieshengWeb.java @@ -1,11 +1,11 @@ -package com.tiesheng.core; +package com.tiesheng.web; -import com.tiesheng.core.service.TieshengWebConfigurer; import com.tiesheng.database.DatabaseAutoConfigurer; import com.tiesheng.encrypt.EncryptAutoConfigurer; import com.tiesheng.login.LoginAutoConfigurer; import com.tiesheng.message.MessageAutoConfigurer; import com.tiesheng.util.UtilAutoConfigurer; +import com.tiesheng.web.service.TieshengWebConfigurer; import org.springframework.context.annotation.Import; import java.lang.annotation.*; @@ -19,11 +19,10 @@ import java.lang.annotation.*; @Import({ UtilAutoConfigurer.class, MessageAutoConfigurer.class, - CoreAutoConfigurer.class, + WebAutoConfigurer.class, LoginAutoConfigurer.class, DatabaseAutoConfigurer.class, EncryptAutoConfigurer.class, - RoleAutoConfigurer.class, }) public @interface EnableTieshengWeb { diff --git a/springboot-web/src/main/java/com/tiesheng/web/WebAutoConfigurer.java b/springboot-web/src/main/java/com/tiesheng/web/WebAutoConfigurer.java new file mode 100644 index 0000000..c79fb24 --- /dev/null +++ b/springboot-web/src/main/java/com/tiesheng/web/WebAutoConfigurer.java @@ -0,0 +1,16 @@ +package com.tiesheng.web; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.context.annotation.ComponentScan; + +/** + * @author hao + */ + +@ComponentScan({ + "com.tiesheng.web.**.*", + "com.tiesheng.role.**.*", +}) +@MapperScan(value = {"com.tiesheng.web.mapper", "com.tiesheng.role.mapper"}) +public class WebAutoConfigurer { +} diff --git a/springboot-web/src/main/java/com/tiesheng/core/config/exception/SpringExceptionHandler.java b/springboot-web/src/main/java/com/tiesheng/web/config/exception/SpringExceptionHandler.java similarity index 96% rename from springboot-web/src/main/java/com/tiesheng/core/config/exception/SpringExceptionHandler.java rename to springboot-web/src/main/java/com/tiesheng/web/config/exception/SpringExceptionHandler.java index 16ff998..a39067a 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/config/exception/SpringExceptionHandler.java +++ b/springboot-web/src/main/java/com/tiesheng/web/config/exception/SpringExceptionHandler.java @@ -1,8 +1,8 @@ -package com.tiesheng.core.config.exception; +package com.tiesheng.web.config.exception; import cn.hutool.core.exceptions.ValidateException; import cn.hutool.extra.spring.SpringUtil; -import com.tiesheng.core.service.TieshengWebConfigurer; +import com.tiesheng.web.service.TieshengWebConfigurer; import com.tiesheng.util.exception.ApiException; import com.tiesheng.util.exception.ApiRespEnum; import com.tiesheng.util.pojos.ApiResp; diff --git a/springboot-web/src/main/java/com/tiesheng/core/config/json/FastJsonMessageConverter.java b/springboot-web/src/main/java/com/tiesheng/web/config/json/FastJsonMessageConverter.java similarity index 96% rename from springboot-web/src/main/java/com/tiesheng/core/config/json/FastJsonMessageConverter.java rename to springboot-web/src/main/java/com/tiesheng/web/config/json/FastJsonMessageConverter.java index 23e99c1..5cf8f31 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/config/json/FastJsonMessageConverter.java +++ b/springboot-web/src/main/java/com/tiesheng/web/config/json/FastJsonMessageConverter.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.config.json; +package com.tiesheng.web.config.json; import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; import com.tiesheng.util.CommonUtil; diff --git a/springboot-web/src/main/java/com/tiesheng/core/config/mybatis/MybatisPlusCustomizer.java b/springboot-web/src/main/java/com/tiesheng/web/config/mybatis/MybatisPlusCustomizer.java similarity index 97% rename from springboot-web/src/main/java/com/tiesheng/core/config/mybatis/MybatisPlusCustomizer.java rename to springboot-web/src/main/java/com/tiesheng/web/config/mybatis/MybatisPlusCustomizer.java index 89834aa..428bb33 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/config/mybatis/MybatisPlusCustomizer.java +++ b/springboot-web/src/main/java/com/tiesheng/web/config/mybatis/MybatisPlusCustomizer.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.config.mybatis; +package com.tiesheng.web.config.mybatis; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer; diff --git a/springboot-web/src/main/java/com/tiesheng/core/config/mybatis/MybatisTimeMetaHandler.java b/springboot-web/src/main/java/com/tiesheng/web/config/mybatis/MybatisTimeMetaHandler.java similarity index 97% rename from springboot-web/src/main/java/com/tiesheng/core/config/mybatis/MybatisTimeMetaHandler.java rename to springboot-web/src/main/java/com/tiesheng/web/config/mybatis/MybatisTimeMetaHandler.java index 91ee194..2d07108 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/config/mybatis/MybatisTimeMetaHandler.java +++ b/springboot-web/src/main/java/com/tiesheng/web/config/mybatis/MybatisTimeMetaHandler.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.config.mybatis; +package com.tiesheng.web.config.mybatis; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; diff --git a/springboot-web/src/main/java/com/tiesheng/core/config/operation/OperationAspect.java b/springboot-web/src/main/java/com/tiesheng/web/config/operation/OperationAspect.java similarity index 97% rename from springboot-web/src/main/java/com/tiesheng/core/config/operation/OperationAspect.java rename to springboot-web/src/main/java/com/tiesheng/web/config/operation/OperationAspect.java index dc2f184..a7b995f 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/config/operation/OperationAspect.java +++ b/springboot-web/src/main/java/com/tiesheng/web/config/operation/OperationAspect.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.config.operation; +package com.tiesheng.web.config.operation; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.map.MapUtil; @@ -6,7 +6,7 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import com.tiesheng.annotation.operation.OperationIgnore; import com.tiesheng.annotation.operation.OperationLog; -import com.tiesheng.core.service.CoreLogService; +import com.tiesheng.web.service.CoreLogService; import com.tiesheng.util.ServletKit; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; diff --git a/springboot-web/src/main/java/com/tiesheng/core/config/template/TieshengTemplateHandler.java b/springboot-web/src/main/java/com/tiesheng/web/config/template/TieshengTemplateHandler.java similarity index 84% rename from springboot-web/src/main/java/com/tiesheng/core/config/template/TieshengTemplateHandler.java rename to springboot-web/src/main/java/com/tiesheng/web/config/template/TieshengTemplateHandler.java index cffbf89..685cf3e 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/config/template/TieshengTemplateHandler.java +++ b/springboot-web/src/main/java/com/tiesheng/web/config/template/TieshengTemplateHandler.java @@ -1,6 +1,6 @@ -package com.tiesheng.core.config.template; +package com.tiesheng.web.config.template; -import com.tiesheng.core.pojos.dto.TemplateDealDTO; +import com.tiesheng.web.pojos.dto.TemplateDealDTO; import org.springframework.stereotype.Service; @Service diff --git a/springboot-web/src/main/java/com/tiesheng/core/config/template/ToolTemplateHandler.java b/springboot-web/src/main/java/com/tiesheng/web/config/template/ToolTemplateHandler.java similarity index 89% rename from springboot-web/src/main/java/com/tiesheng/core/config/template/ToolTemplateHandler.java rename to springboot-web/src/main/java/com/tiesheng/web/config/template/ToolTemplateHandler.java index a71f239..e712269 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/config/template/ToolTemplateHandler.java +++ b/springboot-web/src/main/java/com/tiesheng/web/config/template/ToolTemplateHandler.java @@ -1,7 +1,7 @@ -package com.tiesheng.core.config.template; +package com.tiesheng.web.config.template; import cn.hutool.core.util.StrUtil; -import com.tiesheng.core.pojos.dto.TemplateDealDTO; +import com.tiesheng.web.pojos.dto.TemplateDealDTO; import org.springframework.stereotype.Service; @Service diff --git a/springboot-web/src/main/java/com/tiesheng/core/controller/ConfigController.java b/springboot-web/src/main/java/com/tiesheng/web/controller/ConfigController.java similarity index 88% rename from springboot-web/src/main/java/com/tiesheng/core/controller/ConfigController.java rename to springboot-web/src/main/java/com/tiesheng/web/controller/ConfigController.java index d1829c6..648d85a 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/controller/ConfigController.java +++ b/springboot-web/src/main/java/com/tiesheng/web/controller/ConfigController.java @@ -1,16 +1,16 @@ -package com.tiesheng.core.controller; +package com.tiesheng.web.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.tiesheng.annotation.token.TokenIgnore; -import com.tiesheng.core.pojos.dao.CoreConfigEnum; -import com.tiesheng.core.pojos.dao.CoreConfigSystem; -import com.tiesheng.core.pojos.dto.config.ConfigSystemDTO; -import com.tiesheng.core.pojos.dto.config.EnumTypeDTO; -import com.tiesheng.core.service.CoreConfigService; -import com.tiesheng.core.service.TieshengWebConfigurer; +import com.tiesheng.web.pojos.dao.CoreConfigEnum; +import com.tiesheng.web.pojos.dao.CoreConfigSystem; +import com.tiesheng.web.pojos.dto.config.ConfigSystemDTO; +import com.tiesheng.web.pojos.dto.config.EnumTypeDTO; +import com.tiesheng.web.service.CoreConfigService; +import com.tiesheng.web.service.TieshengWebConfigurer; import com.tiesheng.util.exception.ApiException; import com.tiesheng.util.pojos.ApiResp; import com.tiesheng.util.pojos.PageDTO; diff --git a/springboot-web/src/main/java/com/tiesheng/core/controller/LogController.java b/springboot-web/src/main/java/com/tiesheng/web/controller/LogController.java similarity index 91% rename from springboot-web/src/main/java/com/tiesheng/core/controller/LogController.java rename to springboot-web/src/main/java/com/tiesheng/web/controller/LogController.java index 17c5fec..e2d84b9 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/controller/LogController.java +++ b/springboot-web/src/main/java/com/tiesheng/web/controller/LogController.java @@ -1,15 +1,15 @@ -package com.tiesheng.core.controller; +package com.tiesheng.web.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.tiesheng.core.pojos.dao.CoreLogLogin; -import com.tiesheng.core.pojos.dao.CoreLogMessage; -import com.tiesheng.core.pojos.dao.CoreLogOperation; -import com.tiesheng.core.pojos.dao.CoreLogProcess; +import com.tiesheng.web.pojos.dao.CoreLogLogin; +import com.tiesheng.web.pojos.dao.CoreLogMessage; +import com.tiesheng.web.pojos.dao.CoreLogOperation; +import com.tiesheng.web.pojos.dao.CoreLogProcess; import com.tiesheng.util.pojos.PageDTO; -import com.tiesheng.core.pojos.vo.ProcessDetailVo; -import com.tiesheng.core.service.CoreLogService; +import com.tiesheng.web.pojos.vo.ProcessDetailVo; +import com.tiesheng.web.service.CoreLogService; import com.tiesheng.util.pojos.ApiResp; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/springboot-web/src/main/java/com/tiesheng/core/controller/ToolController.java b/springboot-web/src/main/java/com/tiesheng/web/controller/ToolController.java similarity index 92% rename from springboot-web/src/main/java/com/tiesheng/core/controller/ToolController.java rename to springboot-web/src/main/java/com/tiesheng/web/controller/ToolController.java index bbf5332..e1b2447 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/controller/ToolController.java +++ b/springboot-web/src/main/java/com/tiesheng/web/controller/ToolController.java @@ -1,17 +1,16 @@ -package com.tiesheng.core.controller; +package com.tiesheng.web.controller; import cn.hutool.captcha.LineCaptcha; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; import com.tiesheng.annotation.token.TokenIgnore; -import com.tiesheng.core.config.template.ToolTemplateHandler; -import com.tiesheng.core.pojos.dto.*; -import com.tiesheng.core.pojos.vo.TemplateInfoVO; -import com.tiesheng.core.pojos.vo.PicVerifyVo; -import com.tiesheng.core.service.FileUploadService; -import com.tiesheng.core.service.TimedCacheService; +import com.tiesheng.web.config.template.ToolTemplateHandler; +import com.tiesheng.web.pojos.dto.*; +import com.tiesheng.web.pojos.vo.TemplateInfoVO; +import com.tiesheng.web.pojos.vo.PicVerifyVo; +import com.tiesheng.web.service.FileUploadService; +import com.tiesheng.web.service.TimedCacheService; import com.tiesheng.util.exception.ApiException; import com.tiesheng.util.pojos.ApiResp; import org.springframework.beans.factory.annotation.Autowired; diff --git a/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreConfigEnumMapper.java b/springboot-web/src/main/java/com/tiesheng/web/mapper/CoreConfigEnumMapper.java similarity index 60% rename from springboot-web/src/main/java/com/tiesheng/core/mapper/CoreConfigEnumMapper.java rename to springboot-web/src/main/java/com/tiesheng/web/mapper/CoreConfigEnumMapper.java index 654ae7e..f09b971 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreConfigEnumMapper.java +++ b/springboot-web/src/main/java/com/tiesheng/web/mapper/CoreConfigEnumMapper.java @@ -1,7 +1,7 @@ -package com.tiesheng.core.mapper; +package com.tiesheng.web.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.tiesheng.core.pojos.dao.CoreConfigEnum; +import com.tiesheng.web.pojos.dao.CoreConfigEnum; public interface CoreConfigEnumMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreConfigSystemMapper.java b/springboot-web/src/main/java/com/tiesheng/web/mapper/CoreConfigSystemMapper.java similarity index 60% rename from springboot-web/src/main/java/com/tiesheng/core/mapper/CoreConfigSystemMapper.java rename to springboot-web/src/main/java/com/tiesheng/web/mapper/CoreConfigSystemMapper.java index 7f87d3e..4056c6b 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreConfigSystemMapper.java +++ b/springboot-web/src/main/java/com/tiesheng/web/mapper/CoreConfigSystemMapper.java @@ -1,7 +1,7 @@ -package com.tiesheng.core.mapper; +package com.tiesheng.web.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.tiesheng.core.pojos.dao.CoreConfigSystem; +import com.tiesheng.web.pojos.dao.CoreConfigSystem; public interface CoreConfigSystemMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreLogLoginMapper.java b/springboot-web/src/main/java/com/tiesheng/web/mapper/CoreLogLoginMapper.java similarity index 61% rename from springboot-web/src/main/java/com/tiesheng/core/mapper/CoreLogLoginMapper.java rename to springboot-web/src/main/java/com/tiesheng/web/mapper/CoreLogLoginMapper.java index 81f3c88..0660f08 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreLogLoginMapper.java +++ b/springboot-web/src/main/java/com/tiesheng/web/mapper/CoreLogLoginMapper.java @@ -1,7 +1,7 @@ -package com.tiesheng.core.mapper; +package com.tiesheng.web.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.tiesheng.core.pojos.dao.CoreLogLogin; +import com.tiesheng.web.pojos.dao.CoreLogLogin; public interface CoreLogLoginMapper extends BaseMapper { } diff --git a/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreLogMessageMapper.java b/springboot-web/src/main/java/com/tiesheng/web/mapper/CoreLogMessageMapper.java similarity index 60% rename from springboot-web/src/main/java/com/tiesheng/core/mapper/CoreLogMessageMapper.java rename to springboot-web/src/main/java/com/tiesheng/web/mapper/CoreLogMessageMapper.java index 1ed0c94..67af4b2 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreLogMessageMapper.java +++ b/springboot-web/src/main/java/com/tiesheng/web/mapper/CoreLogMessageMapper.java @@ -1,7 +1,7 @@ -package com.tiesheng.core.mapper; +package com.tiesheng.web.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.tiesheng.core.pojos.dao.CoreLogMessage; +import com.tiesheng.web.pojos.dao.CoreLogMessage; public interface CoreLogMessageMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreLogOperationMapper.java b/springboot-web/src/main/java/com/tiesheng/web/mapper/CoreLogOperationMapper.java similarity index 87% rename from springboot-web/src/main/java/com/tiesheng/core/mapper/CoreLogOperationMapper.java rename to springboot-web/src/main/java/com/tiesheng/web/mapper/CoreLogOperationMapper.java index c74d270..a3ca1f1 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreLogOperationMapper.java +++ b/springboot-web/src/main/java/com/tiesheng/web/mapper/CoreLogOperationMapper.java @@ -1,10 +1,10 @@ -package com.tiesheng.core.mapper; +package com.tiesheng.web.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.tiesheng.core.pojos.dao.CoreLogOperation; +import com.tiesheng.web.pojos.dao.CoreLogOperation; import org.apache.ibatis.annotations.Param; public interface CoreLogOperationMapper extends BaseMapper { diff --git a/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreLogProcessMapper.java b/springboot-web/src/main/java/com/tiesheng/web/mapper/CoreLogProcessMapper.java similarity index 60% rename from springboot-web/src/main/java/com/tiesheng/core/mapper/CoreLogProcessMapper.java rename to springboot-web/src/main/java/com/tiesheng/web/mapper/CoreLogProcessMapper.java index 1f7d482..fb6eedd 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreLogProcessMapper.java +++ b/springboot-web/src/main/java/com/tiesheng/web/mapper/CoreLogProcessMapper.java @@ -1,7 +1,7 @@ -package com.tiesheng.core.mapper; +package com.tiesheng.web.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.tiesheng.core.pojos.dao.CoreLogProcess; +import com.tiesheng.web.pojos.dao.CoreLogProcess; public interface CoreLogProcessMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/springboot-web/src/main/java/com/tiesheng/core/mapper/CorePlatformUniqueMapper.java b/springboot-web/src/main/java/com/tiesheng/web/mapper/CorePlatformUniqueMapper.java similarity index 61% rename from springboot-web/src/main/java/com/tiesheng/core/mapper/CorePlatformUniqueMapper.java rename to springboot-web/src/main/java/com/tiesheng/web/mapper/CorePlatformUniqueMapper.java index e96f83a..e0f36d8 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/mapper/CorePlatformUniqueMapper.java +++ b/springboot-web/src/main/java/com/tiesheng/web/mapper/CorePlatformUniqueMapper.java @@ -1,7 +1,7 @@ -package com.tiesheng.core.mapper; +package com.tiesheng.web.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.tiesheng.core.pojos.dao.CorePlatformUnique; +import com.tiesheng.web.pojos.dao.CorePlatformUnique; public interface CorePlatformUniqueMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/RequestUserInfo.java b/springboot-web/src/main/java/com/tiesheng/web/pojos/RequestUserInfo.java similarity index 95% rename from springboot-web/src/main/java/com/tiesheng/core/pojos/RequestUserInfo.java rename to springboot-web/src/main/java/com/tiesheng/web/pojos/RequestUserInfo.java index bf64f2b..ed3ea9d 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/pojos/RequestUserInfo.java +++ b/springboot-web/src/main/java/com/tiesheng/web/pojos/RequestUserInfo.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.pojos; +package com.tiesheng.web.pojos; /** * 当前token的数据 diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreConfigEnum.java b/springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CoreConfigEnum.java similarity index 97% rename from springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreConfigEnum.java rename to springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CoreConfigEnum.java index 9923945..10d8823 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreConfigEnum.java +++ b/springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CoreConfigEnum.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.pojos.dao; +package com.tiesheng.web.pojos.dao; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreConfigSystem.java b/springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CoreConfigSystem.java similarity index 98% rename from springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreConfigSystem.java rename to springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CoreConfigSystem.java index 993aa72..6b5ad57 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreConfigSystem.java +++ b/springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CoreConfigSystem.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.pojos.dao; +package com.tiesheng.web.pojos.dao; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreLogLogin.java b/springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CoreLogLogin.java similarity index 98% rename from springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreLogLogin.java rename to springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CoreLogLogin.java index 7e1dd06..0468132 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreLogLogin.java +++ b/springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CoreLogLogin.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.pojos.dao; +package com.tiesheng.web.pojos.dao; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreLogMessage.java b/springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CoreLogMessage.java similarity index 98% rename from springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreLogMessage.java rename to springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CoreLogMessage.java index c378bab..b3783af 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreLogMessage.java +++ b/springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CoreLogMessage.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.pojos.dao; +package com.tiesheng.web.pojos.dao; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreLogOperation.java b/springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CoreLogOperation.java similarity index 98% rename from springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreLogOperation.java rename to springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CoreLogOperation.java index 1ac7f03..eda349c 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreLogOperation.java +++ b/springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CoreLogOperation.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.pojos.dao; +package com.tiesheng.web.pojos.dao; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreLogProcess.java b/springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CoreLogProcess.java similarity index 99% rename from springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreLogProcess.java rename to springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CoreLogProcess.java index 17f75d3..285638c 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreLogProcess.java +++ b/springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CoreLogProcess.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.pojos.dao; +package com.tiesheng.web.pojos.dao; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CorePlatformUnique.java b/springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CorePlatformUnique.java similarity index 98% rename from springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CorePlatformUnique.java rename to springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CorePlatformUnique.java index 3cdf95e..4d81540 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CorePlatformUnique.java +++ b/springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CorePlatformUnique.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.pojos.dao; +package com.tiesheng.web.pojos.dao; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/dto/ChunkCheckDTO.java b/springboot-web/src/main/java/com/tiesheng/web/pojos/dto/ChunkCheckDTO.java similarity index 93% rename from springboot-web/src/main/java/com/tiesheng/core/pojos/dto/ChunkCheckDTO.java rename to springboot-web/src/main/java/com/tiesheng/web/pojos/dto/ChunkCheckDTO.java index 993b412..7b121be 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/pojos/dto/ChunkCheckDTO.java +++ b/springboot-web/src/main/java/com/tiesheng/web/pojos/dto/ChunkCheckDTO.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.pojos.dto; +package com.tiesheng.web.pojos.dto; /** * @author hao diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/dto/ChunkMergeDTO.java b/springboot-web/src/main/java/com/tiesheng/web/pojos/dto/ChunkMergeDTO.java similarity index 94% rename from springboot-web/src/main/java/com/tiesheng/core/pojos/dto/ChunkMergeDTO.java rename to springboot-web/src/main/java/com/tiesheng/web/pojos/dto/ChunkMergeDTO.java index 49cb32d..51981ee 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/pojos/dto/ChunkMergeDTO.java +++ b/springboot-web/src/main/java/com/tiesheng/web/pojos/dto/ChunkMergeDTO.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.pojos.dto; +package com.tiesheng.web.pojos.dto; /** * @author hao diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/dto/ChunkStartDTO.java b/springboot-web/src/main/java/com/tiesheng/web/pojos/dto/ChunkStartDTO.java similarity index 91% rename from springboot-web/src/main/java/com/tiesheng/core/pojos/dto/ChunkStartDTO.java rename to springboot-web/src/main/java/com/tiesheng/web/pojos/dto/ChunkStartDTO.java index d99501f..8193a9b 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/pojos/dto/ChunkStartDTO.java +++ b/springboot-web/src/main/java/com/tiesheng/web/pojos/dto/ChunkStartDTO.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.pojos.dto; +package com.tiesheng.web.pojos.dto; /** * @author hao diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/dto/ImageCodeDTO.java b/springboot-web/src/main/java/com/tiesheng/web/pojos/dto/ImageCodeDTO.java similarity index 97% rename from springboot-web/src/main/java/com/tiesheng/core/pojos/dto/ImageCodeDTO.java rename to springboot-web/src/main/java/com/tiesheng/web/pojos/dto/ImageCodeDTO.java index 268b0fe..eb6558e 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/pojos/dto/ImageCodeDTO.java +++ b/springboot-web/src/main/java/com/tiesheng/web/pojos/dto/ImageCodeDTO.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.pojos.dto; +package com.tiesheng.web.pojos.dto; import cn.hutool.captcha.CaptchaUtil; import cn.hutool.captcha.LineCaptcha; diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/dto/TemplateDealDTO.java b/springboot-web/src/main/java/com/tiesheng/web/pojos/dto/TemplateDealDTO.java similarity index 95% rename from springboot-web/src/main/java/com/tiesheng/core/pojos/dto/TemplateDealDTO.java rename to springboot-web/src/main/java/com/tiesheng/web/pojos/dto/TemplateDealDTO.java index 402f02a..4db6a04 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/pojos/dto/TemplateDealDTO.java +++ b/springboot-web/src/main/java/com/tiesheng/web/pojos/dto/TemplateDealDTO.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.pojos.dto; +package com.tiesheng.web.pojos.dto; import javax.validation.constraints.NotEmpty; diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/dto/TemplateInfoDTO.java b/springboot-web/src/main/java/com/tiesheng/web/pojos/dto/TemplateInfoDTO.java similarity index 93% rename from springboot-web/src/main/java/com/tiesheng/core/pojos/dto/TemplateInfoDTO.java rename to springboot-web/src/main/java/com/tiesheng/web/pojos/dto/TemplateInfoDTO.java index 228bb5e..b5786f4 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/pojos/dto/TemplateInfoDTO.java +++ b/springboot-web/src/main/java/com/tiesheng/web/pojos/dto/TemplateInfoDTO.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.pojos.dto; +package com.tiesheng.web.pojos.dto; public class TemplateInfoDTO { diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/dto/config/ConfigSystemDTO.java b/springboot-web/src/main/java/com/tiesheng/web/pojos/dto/config/ConfigSystemDTO.java similarity index 95% rename from springboot-web/src/main/java/com/tiesheng/core/pojos/dto/config/ConfigSystemDTO.java rename to springboot-web/src/main/java/com/tiesheng/web/pojos/dto/config/ConfigSystemDTO.java index 3abcc0d..95e6793 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/pojos/dto/config/ConfigSystemDTO.java +++ b/springboot-web/src/main/java/com/tiesheng/web/pojos/dto/config/ConfigSystemDTO.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.pojos.dto.config; +package com.tiesheng.web.pojos.dto.config; import javax.validation.constraints.NotEmpty; diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/dto/config/EnumTypeDTO.java b/springboot-web/src/main/java/com/tiesheng/web/pojos/dto/config/EnumTypeDTO.java similarity index 80% rename from springboot-web/src/main/java/com/tiesheng/core/pojos/dto/config/EnumTypeDTO.java rename to springboot-web/src/main/java/com/tiesheng/web/pojos/dto/config/EnumTypeDTO.java index 9b51d3d..8f2cf53 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/pojos/dto/config/EnumTypeDTO.java +++ b/springboot-web/src/main/java/com/tiesheng/web/pojos/dto/config/EnumTypeDTO.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.pojos.dto.config; +package com.tiesheng.web.pojos.dto.config; public class EnumTypeDTO { diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/vo/PicVerifyVo.java b/springboot-web/src/main/java/com/tiesheng/web/pojos/vo/PicVerifyVo.java similarity index 93% rename from springboot-web/src/main/java/com/tiesheng/core/pojos/vo/PicVerifyVo.java rename to springboot-web/src/main/java/com/tiesheng/web/pojos/vo/PicVerifyVo.java index 54208ad..19ec602 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/pojos/vo/PicVerifyVo.java +++ b/springboot-web/src/main/java/com/tiesheng/web/pojos/vo/PicVerifyVo.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.pojos.vo; +package com.tiesheng.web.pojos.vo; public class PicVerifyVo { diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/vo/ProcessDetailVo.java b/springboot-web/src/main/java/com/tiesheng/web/pojos/vo/ProcessDetailVo.java similarity index 97% rename from springboot-web/src/main/java/com/tiesheng/core/pojos/vo/ProcessDetailVo.java rename to springboot-web/src/main/java/com/tiesheng/web/pojos/vo/ProcessDetailVo.java index dad34bf..6936b16 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/pojos/vo/ProcessDetailVo.java +++ b/springboot-web/src/main/java/com/tiesheng/web/pojos/vo/ProcessDetailVo.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.pojos.vo; +package com.tiesheng.web.pojos.vo; /** * @author lgc diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/vo/TemplateInfoVO.java b/springboot-web/src/main/java/com/tiesheng/web/pojos/vo/TemplateInfoVO.java similarity index 95% rename from springboot-web/src/main/java/com/tiesheng/core/pojos/vo/TemplateInfoVO.java rename to springboot-web/src/main/java/com/tiesheng/web/pojos/vo/TemplateInfoVO.java index 7e2e090..1e8ae89 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/pojos/vo/TemplateInfoVO.java +++ b/springboot-web/src/main/java/com/tiesheng/web/pojos/vo/TemplateInfoVO.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.pojos.vo; +package com.tiesheng.web.pojos.vo; public class TemplateInfoVO { diff --git a/springboot-web/src/main/java/com/tiesheng/core/service/CoreConfigService.java b/springboot-web/src/main/java/com/tiesheng/web/service/CoreConfigService.java similarity index 85% rename from springboot-web/src/main/java/com/tiesheng/core/service/CoreConfigService.java rename to springboot-web/src/main/java/com/tiesheng/web/service/CoreConfigService.java index 3875ecc..97f3b93 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/service/CoreConfigService.java +++ b/springboot-web/src/main/java/com/tiesheng/web/service/CoreConfigService.java @@ -1,8 +1,8 @@ -package com.tiesheng.core.service; +package com.tiesheng.web.service; -import com.tiesheng.core.mapper.CoreConfigEnumMapper; -import com.tiesheng.core.mapper.CoreConfigSystemMapper; -import com.tiesheng.core.pojos.dao.CoreConfigSystem; +import com.tiesheng.web.mapper.CoreConfigEnumMapper; +import com.tiesheng.web.mapper.CoreConfigSystemMapper; +import com.tiesheng.web.pojos.dao.CoreConfigSystem; import com.tiesheng.util.service.TsServiceBase; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/springboot-web/src/main/java/com/tiesheng/core/service/CoreLogService.java b/springboot-web/src/main/java/com/tiesheng/web/service/CoreLogService.java similarity index 91% rename from springboot-web/src/main/java/com/tiesheng/core/service/CoreLogService.java rename to springboot-web/src/main/java/com/tiesheng/web/service/CoreLogService.java index 62f5abc..3ec9c7b 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/service/CoreLogService.java +++ b/springboot-web/src/main/java/com/tiesheng/web/service/CoreLogService.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.service; +package com.tiesheng.web.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -7,18 +7,18 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.ServletUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.tiesheng.core.mapper.CoreLogLoginMapper; -import com.tiesheng.core.mapper.CoreLogMessageMapper; -import com.tiesheng.core.mapper.CoreLogOperationMapper; -import com.tiesheng.core.mapper.CoreLogProcessMapper; -import com.tiesheng.core.pojos.RequestUserInfo; -import com.tiesheng.core.pojos.dao.CoreLogLogin; -import com.tiesheng.core.pojos.dao.CoreLogOperation; -import com.tiesheng.core.pojos.dao.CoreLogProcess; -import com.tiesheng.core.pojos.dao.CorePlatformUnique; -import com.tiesheng.core.pojos.vo.ProcessDetailVo; -import com.tiesheng.core.util.ProcessImportConsumer; -import com.tiesheng.core.util.ProcessSyncConsumer; +import com.tiesheng.web.mapper.CoreLogLoginMapper; +import com.tiesheng.web.mapper.CoreLogMessageMapper; +import com.tiesheng.web.mapper.CoreLogOperationMapper; +import com.tiesheng.web.mapper.CoreLogProcessMapper; +import com.tiesheng.web.pojos.RequestUserInfo; +import com.tiesheng.web.pojos.dao.CoreLogLogin; +import com.tiesheng.web.pojos.dao.CoreLogOperation; +import com.tiesheng.web.pojos.dao.CoreLogProcess; +import com.tiesheng.web.pojos.dao.CorePlatformUnique; +import com.tiesheng.web.pojos.vo.ProcessDetailVo; +import com.tiesheng.web.util.ProcessImportConsumer; +import com.tiesheng.web.util.ProcessSyncConsumer; import com.tiesheng.util.config.TsTokenConfig; import com.tiesheng.util.pojos.TokenBean; import com.tiesheng.util.ServletKit; diff --git a/springboot-web/src/main/java/com/tiesheng/core/service/CoreMessageService.java b/springboot-web/src/main/java/com/tiesheng/web/service/CoreMessageService.java similarity index 95% rename from springboot-web/src/main/java/com/tiesheng/core/service/CoreMessageService.java rename to springboot-web/src/main/java/com/tiesheng/web/service/CoreMessageService.java index 7fe3f39..78eabe9 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/service/CoreMessageService.java +++ b/springboot-web/src/main/java/com/tiesheng/web/service/CoreMessageService.java @@ -1,12 +1,12 @@ -package com.tiesheng.core.service; +package com.tiesheng.web.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; -import com.tiesheng.core.mapper.CoreLogMessageMapper; -import com.tiesheng.core.pojos.dao.CoreLogMessage; +import com.tiesheng.web.mapper.CoreLogMessageMapper; +import com.tiesheng.web.pojos.dao.CoreLogMessage; import com.tiesheng.message.pojos.MessageReqResp; import com.tiesheng.message.pojos.UserChannel; import com.tiesheng.message.service.TieshengMessageSender; diff --git a/springboot-web/src/main/java/com/tiesheng/core/service/CorePlatformUniqueService.java b/springboot-web/src/main/java/com/tiesheng/web/service/CorePlatformUniqueService.java similarity index 93% rename from springboot-web/src/main/java/com/tiesheng/core/service/CorePlatformUniqueService.java rename to springboot-web/src/main/java/com/tiesheng/web/service/CorePlatformUniqueService.java index f79cc9e..fcb77aa 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/service/CorePlatformUniqueService.java +++ b/springboot-web/src/main/java/com/tiesheng/web/service/CorePlatformUniqueService.java @@ -1,8 +1,8 @@ -package com.tiesheng.core.service; +package com.tiesheng.web.service; import cn.hutool.core.util.StrUtil; -import com.tiesheng.core.mapper.CorePlatformUniqueMapper; -import com.tiesheng.core.pojos.dao.CorePlatformUnique; +import com.tiesheng.web.mapper.CorePlatformUniqueMapper; +import com.tiesheng.web.pojos.dao.CorePlatformUnique; import com.tiesheng.util.pojos.TokenBean; import com.tiesheng.login.pojos.DoLoginInfo; import com.tiesheng.login.service.TieshengLoginConfigurer; diff --git a/springboot-web/src/main/java/com/tiesheng/core/service/FileUploadService.java b/springboot-web/src/main/java/com/tiesheng/web/service/FileUploadService.java similarity index 99% rename from springboot-web/src/main/java/com/tiesheng/core/service/FileUploadService.java rename to springboot-web/src/main/java/com/tiesheng/web/service/FileUploadService.java index 8c4cdf3..16a9dab 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/service/FileUploadService.java +++ b/springboot-web/src/main/java/com/tiesheng/web/service/FileUploadService.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.service; +package com.tiesheng.web.service; import cn.hutool.core.io.FileTypeUtil; import cn.hutool.core.io.FileUtil; diff --git a/springboot-web/src/main/java/com/tiesheng/core/service/TieshengWebConfigurer.java b/springboot-web/src/main/java/com/tiesheng/web/service/TieshengWebConfigurer.java similarity index 91% rename from springboot-web/src/main/java/com/tiesheng/core/service/TieshengWebConfigurer.java rename to springboot-web/src/main/java/com/tiesheng/web/service/TieshengWebConfigurer.java index df30688..7e8b82f 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/service/TieshengWebConfigurer.java +++ b/springboot-web/src/main/java/com/tiesheng/web/service/TieshengWebConfigurer.java @@ -1,9 +1,9 @@ -package com.tiesheng.core.service; +package com.tiesheng.web.service; import cn.hutool.log.LogFactory; -import com.tiesheng.core.pojos.RequestUserInfo; -import com.tiesheng.core.pojos.dao.CoreConfigSystem; -import com.tiesheng.core.pojos.dao.CorePlatformUnique; +import com.tiesheng.web.pojos.RequestUserInfo; +import com.tiesheng.web.pojos.dao.CoreConfigSystem; +import com.tiesheng.web.pojos.dao.CorePlatformUnique; import com.tiesheng.util.pojos.TokenBean; import com.tiesheng.util.ServletKit; import com.tiesheng.util.exception.ApiRespEnum; diff --git a/springboot-web/src/main/java/com/tiesheng/core/service/TimedCacheService.java b/springboot-web/src/main/java/com/tiesheng/web/service/TimedCacheService.java similarity index 98% rename from springboot-web/src/main/java/com/tiesheng/core/service/TimedCacheService.java rename to springboot-web/src/main/java/com/tiesheng/web/service/TimedCacheService.java index f2ba9b3..0457e2e 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/service/TimedCacheService.java +++ b/springboot-web/src/main/java/com/tiesheng/web/service/TimedCacheService.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.service; +package com.tiesheng.web.service; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.ServletUtil; diff --git a/springboot-web/src/main/java/com/tiesheng/core/util/ProcessImportConsumer.java b/springboot-web/src/main/java/com/tiesheng/web/util/ProcessImportConsumer.java similarity index 90% rename from springboot-web/src/main/java/com/tiesheng/core/util/ProcessImportConsumer.java rename to springboot-web/src/main/java/com/tiesheng/web/util/ProcessImportConsumer.java index 6b75630..d6eb914 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/util/ProcessImportConsumer.java +++ b/springboot-web/src/main/java/com/tiesheng/web/util/ProcessImportConsumer.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.util; +package com.tiesheng.web.util; import java.util.List; diff --git a/springboot-web/src/main/java/com/tiesheng/core/util/ProcessSyncConsumer.java b/springboot-web/src/main/java/com/tiesheng/web/util/ProcessSyncConsumer.java similarity index 87% rename from springboot-web/src/main/java/com/tiesheng/core/util/ProcessSyncConsumer.java rename to springboot-web/src/main/java/com/tiesheng/web/util/ProcessSyncConsumer.java index 787c9d7..39b6a94 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/util/ProcessSyncConsumer.java +++ b/springboot-web/src/main/java/com/tiesheng/web/util/ProcessSyncConsumer.java @@ -1,4 +1,4 @@ -package com.tiesheng.core.util; +package com.tiesheng.web.util; public interface ProcessSyncConsumer { diff --git a/springboot-web/src/main/resources/mapper/CoreConfigEnumMapper.xml b/springboot-web/src/main/resources/mapper/CoreConfigEnumMapper.xml index 20a9292..c186cb0 100644 --- a/springboot-web/src/main/resources/mapper/CoreConfigEnumMapper.xml +++ b/springboot-web/src/main/resources/mapper/CoreConfigEnumMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -17,4 +17,4 @@ id, create_time, update_time, is_deleted, `type`, `name`, remark, ext - \ No newline at end of file + diff --git a/springboot-web/src/main/resources/mapper/CoreConfigSystemMapper.xml b/springboot-web/src/main/resources/mapper/CoreConfigSystemMapper.xml index 4856b8e..81d99c6 100644 --- a/springboot-web/src/main/resources/mapper/CoreConfigSystemMapper.xml +++ b/springboot-web/src/main/resources/mapper/CoreConfigSystemMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -17,7 +17,7 @@ - id, create_time, update_time, is_deleted, config_key, config_val, config_type, remark, + id, create_time, update_time, is_deleted, config_key, config_val, config_type, remark, extra, read_only - \ No newline at end of file + diff --git a/springboot-web/src/main/resources/mapper/CoreLogLoginMapper.xml b/springboot-web/src/main/resources/mapper/CoreLogLoginMapper.xml index 700fbd3..42d2359 100644 --- a/springboot-web/src/main/resources/mapper/CoreLogLoginMapper.xml +++ b/springboot-web/src/main/resources/mapper/CoreLogLoginMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/springboot-web/src/main/resources/mapper/CoreLogMessageMapper.xml b/springboot-web/src/main/resources/mapper/CoreLogMessageMapper.xml index a1a8f8e..5c0dcfe 100644 --- a/springboot-web/src/main/resources/mapper/CoreLogMessageMapper.xml +++ b/springboot-web/src/main/resources/mapper/CoreLogMessageMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -18,4 +18,4 @@ id, create_time, update_time, is_deleted, `type`, target, content, resp_body, `result` - \ No newline at end of file + diff --git a/springboot-web/src/main/resources/mapper/CoreLogOperationMapper.xml b/springboot-web/src/main/resources/mapper/CoreLogOperationMapper.xml index e422af4..4ab642c 100644 --- a/springboot-web/src/main/resources/mapper/CoreLogOperationMapper.xml +++ b/springboot-web/src/main/resources/mapper/CoreLogOperationMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/springboot-web/src/main/resources/mapper/CoreLogProcessMapper.xml b/springboot-web/src/main/resources/mapper/CoreLogProcessMapper.xml index 7da2ca5..afe007e 100644 --- a/springboot-web/src/main/resources/mapper/CoreLogProcessMapper.xml +++ b/springboot-web/src/main/resources/mapper/CoreLogProcessMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -20,7 +20,7 @@ - id, create_time, update_time, is_deleted, title, total, success_num, fail_num, `type`, + id, create_time, update_time, is_deleted, title, total, success_num, fail_num, `type`, `status`, fail_file, error, `process` - \ No newline at end of file + diff --git a/springboot-web/src/main/resources/mapper/CorePlatformUniqueMapper.xml b/springboot-web/src/main/resources/mapper/CorePlatformUniqueMapper.xml index 8cf45eb..6c5d205 100644 --- a/springboot-web/src/main/resources/mapper/CorePlatformUniqueMapper.xml +++ b/springboot-web/src/main/resources/mapper/CorePlatformUniqueMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -18,4 +18,4 @@ id, create_time, update_time, is_deleted, user_id, app_id, unique_id, platform, info - \ No newline at end of file +