diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisConfiguration.java b/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisConfiguration.java index 5633e971..257ebd7d 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisConfiguration.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisConfiguration.java @@ -39,7 +39,8 @@ public class RedisConfiguration extends CachingConfigurerSupport { */ private static final String[] WHITELIST_STR = { "org.springframework", - "cn.odboy.model", + "cn.odboy.core.controller.*.dto", + "cn.odboy.core.dal.dataobject", }; /** diff --git a/cutejava/cutejava-domain/pom.xml b/cutejava/cutejava-domain/pom.xml deleted file mode 100644 index bead4cae..00000000 --- a/cutejava/cutejava-domain/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - cutejava - cn.odboy - 1.3.1 - - 4.0.0 - - 5.8.36 - - - cutejava-domain - 模型模块 - - - - cn.odboy - cutejava-common - 1.3.1 - - - \ No newline at end of file diff --git a/cutejava/cutejava-job/pom.xml b/cutejava/cutejava-job/pom.xml deleted file mode 100644 index dd56510e..00000000 --- a/cutejava/cutejava-job/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - cutejava - cn.odboy - 1.3.1 - - 4.0.0 - - cutejava-job - 定时任务模块 - - - - cn.odboy - cutejava-tools - 1.3.1 - - - - - org.springframework.boot - spring-boot-starter-quartz - - - org.quartz-scheduler - quartz-jobs - 2.3.2 - - - com.mchange - c3p0 - 0.10.1 - - - \ No newline at end of file diff --git a/cutejava/cutejava-pipline/pom.xml b/cutejava/cutejava-pipline/pom.xml deleted file mode 100644 index 1532defa..00000000 --- a/cutejava/cutejava-pipline/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - cutejava - cn.odboy - 1.3.1 - - 4.0.0 - - cutejava-pipline - 流水线模块 - - - - - cn.hutool - hutool-all - ${hutool.version} - - - - cn.odboy - cutejava-domain - 1.3.1 - - - \ No newline at end of file diff --git a/cutejava/cutejava-starter/pom.xml b/cutejava/cutejava-starter/pom.xml index ac909ea0..46ed0331 100644 --- a/cutejava/cutejava-starter/pom.xml +++ b/cutejava/cutejava-starter/pom.xml @@ -17,12 +17,6 @@ cutejava-system 1.3.1 - - - cn.odboy - cutejava-pipline - 1.3.1 - diff --git a/cutejava/cutejava-starter/src/main/java/cn/odboy/GenCode.java b/cutejava/cutejava-starter/src/main/java/cn/odboy/GenCode.java index 0f7764e4..af106cad 100644 --- a/cutejava/cutejava-starter/src/main/java/cn/odboy/GenCode.java +++ b/cutejava/cutejava-starter/src/main/java/cn/odboy/GenCode.java @@ -1,7 +1,7 @@ package cn.odboy; -import cn.odboy.mybatis.util.CmdGenHelper; +import cn.odboy.core.framework.mybatisplus.util.CmdGenHelper; import java.util.List; /** diff --git a/cutejava/cutejava-starter/src/main/java/cn/odboy/monitor/HealthCheckPointerImpl.java b/cutejava/cutejava-starter/src/main/java/cn/odboy/monitor/HealthCheckPointerImpl.java index 96b29af5..c8cefc87 100644 --- a/cutejava/cutejava-starter/src/main/java/cn/odboy/monitor/HealthCheckPointerImpl.java +++ b/cutejava/cutejava-starter/src/main/java/cn/odboy/monitor/HealthCheckPointerImpl.java @@ -1,6 +1,6 @@ package cn.odboy.monitor; -import cn.odboy.application.system.service.DictService; +import cn.odboy.core.service.system.DictService; import cn.odboy.monitor.service.HealthCheckPointService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; diff --git a/cutejava/cutejava-starter/src/main/resources/application-dev.yml b/cutejava/cutejava-starter/src/main/resources/application-dev.yml index 93e7625c..ee0dcc1f 100644 --- a/cutejava/cutejava-starter/src/main/resources/application-dev.yml +++ b/cutejava/cutejava-starter/src/main/resources/application-dev.yml @@ -154,7 +154,7 @@ mybatis-plus: id-type: auto # 表名是否使用驼峰转下划线命名,只对表名生效 table-underline: true - # 是否控制台 print mybatis-plus 的 LOGO + # 是否控制台 print mybatisplus-plus 的 LOGO banner: true app: diff --git a/cutejava/cutejava-starter/src/main/resources/application-prod.yml b/cutejava/cutejava-starter/src/main/resources/application-prod.yml index 2e25dfe2..21d016fa 100644 --- a/cutejava/cutejava-starter/src/main/resources/application-prod.yml +++ b/cutejava/cutejava-starter/src/main/resources/application-prod.yml @@ -154,7 +154,7 @@ mybatis-plus: id-type: auto # 表名是否使用驼峰转下划线命名,只对表名生效 table-underline: true - # 是否控制台 print mybatis-plus 的 LOGO + # 是否控制台 print mybatisplus-plus 的 LOGO banner: true app: diff --git a/cutejava/cutejava-starter/src/main/resources/spy.properties b/cutejava/cutejava-starter/src/main/resources/spy.properties index bd8caa18..378a932c 100644 --- a/cutejava/cutejava-starter/src/main/resources/spy.properties +++ b/cutejava/cutejava-starter/src/main/resources/spy.properties @@ -1,7 +1,7 @@ # 应用的拦截模块 modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory # 自定义日志打印 -logMessageFormat=cn.odboy.mybatis.context.CustomP6SpyLogger +logMessageFormat=cn.odboy.core.framework.mybatisplus.context.CustomP6SpyLogger # 日志输出到控制台 appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger # 日期格式 diff --git a/cutejava/cutejava-starter/src/test/java/cn/odboy/util/PipelineTests.java b/cutejava/cutejava-starter/src/test/java/cn/odboy/util/PipelineTests.java index e38033c7..16fe20a4 100644 --- a/cutejava/cutejava-starter/src/test/java/cn/odboy/util/PipelineTests.java +++ b/cutejava/cutejava-starter/src/test/java/cn/odboy/util/PipelineTests.java @@ -1,6 +1,7 @@ package cn.odboy.util; -import cn.odboy.context.PipelineManage; +import cn.odboy.core.framework.flow.context.PipelineManager; +import cn.odboy.core.framework.flow.context.PipelineProcessManager; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -8,11 +9,18 @@ import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class PipelineTests { @Autowired - private PipelineManage pipelineManage; + private PipelineManager pipelineManager; + @Autowired + private PipelineProcessManager pipelineProcessManager; @Test - public void contextLoads() { - pipelineManage.execute(); + public void testPipelineManager() { + pipelineManager.test(); + } + + @Test + public void testPipelineProcessManager() { + pipelineProcessManager.test(); } } diff --git a/cutejava/cutejava-system/pom.xml b/cutejava/cutejava-system/pom.xml index 55382d6a..a42836e1 100644 --- a/cutejava/cutejava-system/pom.xml +++ b/cutejava/cutejava-system/pom.xml @@ -15,12 +15,14 @@ 0.11.5 5.8.0 + 1.4.7 + 7.9.3 cn.odboy - cutejava-job + cutejava-common 1.3.1 @@ -59,5 +61,35 @@ oshi-core 6.6.5 + + + + javax.mail + mail + ${mail.version} + + + + + com.qiniu + qiniu-java-sdk + ${qiniu.version} + + + + + org.springframework.boot + spring-boot-starter-quartz + + + org.quartz-scheduler + quartz-jobs + 2.3.2 + + + com.mchange + c3p0 + 0.10.1 + diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/constant/CaptchaBizEnum.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/CaptchaBizEnum.java similarity index 97% rename from cutejava/cutejava-common/src/main/java/cn/odboy/constant/CaptchaBizEnum.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/CaptchaBizEnum.java index 7e9b23ba..ed45579e 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/constant/CaptchaBizEnum.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/CaptchaBizEnum.java @@ -1,4 +1,4 @@ -package cn.odboy.constant; +package cn.odboy.core.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/constant/DataScopeEnum.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/DataScopeEnum.java similarity index 95% rename from cutejava/cutejava-common/src/main/java/cn/odboy/constant/DataScopeEnum.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/DataScopeEnum.java index b661a8d1..37e0cc22 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/constant/DataScopeEnum.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/DataScopeEnum.java @@ -1,4 +1,4 @@ -package cn.odboy.constant; +package cn.odboy.core.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/constant/LoginCodeEnum.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/LoginCodeEnum.java similarity index 89% rename from cutejava/cutejava-common/src/main/java/cn/odboy/constant/LoginCodeEnum.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/LoginCodeEnum.java index 42a8e177..740e0274 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/constant/LoginCodeEnum.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/LoginCodeEnum.java @@ -1,4 +1,4 @@ -package cn.odboy.constant; +package cn.odboy.core.constant; /** * 验证码配置枚举 diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/constant/SystemRedisKey.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/SystemRedisKey.java similarity index 96% rename from cutejava/cutejava-common/src/main/java/cn/odboy/constant/SystemRedisKey.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/SystemRedisKey.java index c1e9af70..7e7eda49 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/constant/SystemRedisKey.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/SystemRedisKey.java @@ -1,4 +1,4 @@ -package cn.odboy.constant; +package cn.odboy.core.constant; /** * 关于缓存的Key集合 diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/constant/TransferProtocolConst.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/TransferProtocolConst.java similarity index 86% rename from cutejava/cutejava-common/src/main/java/cn/odboy/constant/TransferProtocolConst.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/TransferProtocolConst.java index 936facee..5edb764e 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/constant/TransferProtocolConst.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/TransferProtocolConst.java @@ -1,4 +1,4 @@ -package cn.odboy.constant; +package cn.odboy.core.constant; public interface TransferProtocolConst { String PREFIX_HTTP = "http://"; diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/rest/QuartzJobController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/job/QuartzJobController.java similarity index 94% rename from cutejava/cutejava-job/src/main/java/cn/odboy/application/job/rest/QuartzJobController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/job/QuartzJobController.java index 78156716..99913344 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/rest/QuartzJobController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/job/QuartzJobController.java @@ -1,13 +1,13 @@ -package cn.odboy.application.job.rest; +package cn.odboy.core.controller.job; -import cn.odboy.application.job.service.QuartzJobService; import cn.odboy.base.PageResult; import cn.odboy.context.SpringBeanHolder; +import cn.odboy.core.service.job.dto.QueryQuartzJobRequest; +import cn.odboy.core.service.job.dto.UpdateQuartzJobRequest; +import cn.odboy.core.dal.dataobject.job.QuartzJob; +import cn.odboy.core.dal.dataobject.job.QuartzLog; +import cn.odboy.core.service.job.QuartzJobService; import cn.odboy.exception.BadRequestException; -import cn.odboy.model.job.domain.QuartzJob; -import cn.odboy.model.job.domain.QuartzLog; -import cn.odboy.model.job.request.UpdateQuartzJobRequest; -import cn.odboy.model.job.request.QueryQuartzJobRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/AuthController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/AuthController.java similarity index 90% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/AuthController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/AuthController.java index fe5f2da7..5eff336a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/AuthController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/AuthController.java @@ -1,20 +1,20 @@ -package cn.odboy.application.core.rest; +package cn.odboy.core.controller.system; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import cn.odboy.annotation.AnonymousPostMapping; -import cn.odboy.constant.LoginCodeEnum; -import cn.odboy.application.core.context.TokenProvider; -import cn.odboy.application.core.service.impl.UserDetailsServiceImpl; -import cn.odboy.application.core.service.impl.UserOnlineServiceImpl; +import cn.odboy.core.framework.properties.AppProperties; +import cn.odboy.core.constant.LoginCodeEnum; import cn.odboy.constant.SystemConst; -import cn.odboy.constant.SystemRedisKey; -import cn.odboy.config.AppProperties; -import cn.odboy.context.SecurityHelper; +import cn.odboy.core.constant.SystemRedisKey; +import cn.odboy.core.framework.permission.util.SecurityHelper; +import cn.odboy.core.service.system.dto.UserJwtVo; +import cn.odboy.core.service.system.dto.UserLoginRequest; +import cn.odboy.core.dal.dataobject.system.UserInfoResponse; +import cn.odboy.core.framework.permission.TokenProvider; +import cn.odboy.core.service.system.impl.UserDetailsServiceImpl; +import cn.odboy.core.service.system.impl.UserOnlineServiceImpl; import cn.odboy.exception.BadRequestException; -import cn.odboy.model.system.model.UserJwtVo; -import cn.odboy.model.system.request.UserLoginRequest; -import cn.odboy.model.system.response.UserInfoResponse; import cn.odboy.redis.RedisHelper; import cn.odboy.util.RsaEncryptUtil; import cn.odboy.util.StringUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/CaptchaController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/CaptchaController.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/CaptchaController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/CaptchaController.java index 061410e0..d37f4d0c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/CaptchaController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/CaptchaController.java @@ -1,8 +1,8 @@ -package cn.odboy.application.system.rest; +package cn.odboy.core.controller.system; -import cn.odboy.application.tools.service.CaptchaService; -import cn.odboy.application.tools.service.EmailService; -import cn.odboy.constant.CaptchaBizEnum; +import cn.odboy.core.constant.CaptchaBizEnum; +import cn.odboy.core.service.tools.CaptchaService; +import cn.odboy.core.service.tools.EmailService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DeptController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/DeptController.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DeptController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/DeptController.java index 08e575be..5f12997a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DeptController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/DeptController.java @@ -1,10 +1,10 @@ -package cn.odboy.application.system.rest; +package cn.odboy.core.controller.system; -import cn.odboy.application.system.service.DeptService; import cn.odboy.base.PageResult; -import cn.odboy.model.system.domain.Dept; -import cn.odboy.model.system.request.CreateDeptRequest; -import cn.odboy.model.system.request.QueryDeptRequest; +import cn.odboy.core.service.system.dto.CreateDeptRequest; +import cn.odboy.core.service.system.dto.QueryDeptRequest; +import cn.odboy.core.dal.dataobject.system.Dept; +import cn.odboy.core.service.system.DeptService; import cn.odboy.util.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/DictController.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/DictController.java index 0c5189ea..f701bd93 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/DictController.java @@ -1,10 +1,10 @@ -package cn.odboy.application.system.rest; +package cn.odboy.core.controller.system; -import cn.odboy.application.system.service.DictService; import cn.odboy.base.PageResult; -import cn.odboy.model.system.domain.Dict; -import cn.odboy.model.system.request.CreateDictRequest; -import cn.odboy.model.system.request.QueryDictRequest; +import cn.odboy.core.service.system.dto.CreateDictRequest; +import cn.odboy.core.service.system.dto.QueryDictRequest; +import cn.odboy.core.dal.dataobject.system.Dict; +import cn.odboy.core.service.system.DictService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictDetailController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/DictDetailController.java similarity index 91% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictDetailController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/DictDetailController.java index 40636b8b..36a402fa 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictDetailController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/DictDetailController.java @@ -1,10 +1,10 @@ -package cn.odboy.application.system.rest; +package cn.odboy.core.controller.system; -import cn.odboy.application.system.service.DictDetailService; import cn.odboy.base.PageResult; -import cn.odboy.model.system.domain.DictDetail; -import cn.odboy.model.system.request.CreateDictDetailRequest; -import cn.odboy.model.system.request.QueryDictDetailRequest; +import cn.odboy.core.service.system.dto.CreateDictDetailRequest; +import cn.odboy.core.service.system.dto.QueryDictDetailRequest; +import cn.odboy.core.dal.dataobject.system.DictDetail; +import cn.odboy.core.service.system.DictDetailService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/JobController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/JobController.java similarity index 91% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/JobController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/JobController.java index 31bdfa9b..56727b50 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/JobController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/JobController.java @@ -1,10 +1,10 @@ -package cn.odboy.application.system.rest; +package cn.odboy.core.controller.system; -import cn.odboy.application.system.service.JobService; import cn.odboy.base.PageResult; -import cn.odboy.model.system.domain.Job; -import cn.odboy.model.system.request.CreateJobRequest; -import cn.odboy.model.system.request.QueryJobRequest; +import cn.odboy.core.service.system.dto.CreateJobRequest; +import cn.odboy.core.service.system.dto.QueryJobRequest; +import cn.odboy.core.dal.dataobject.system.Job; +import cn.odboy.core.service.system.JobService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/MenuController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/MenuController.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/MenuController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/MenuController.java index b98c059b..c344f4d6 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/MenuController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/MenuController.java @@ -1,13 +1,13 @@ -package cn.odboy.application.system.rest; +package cn.odboy.core.controller.system; import cn.hutool.core.collection.CollectionUtil; -import cn.odboy.application.system.service.MenuService; import cn.odboy.base.PageResult; -import cn.odboy.context.SecurityHelper; +import cn.odboy.core.framework.permission.util.SecurityHelper; +import cn.odboy.core.service.system.dto.QueryMenuRequest; +import cn.odboy.core.dal.dataobject.system.Menu; +import cn.odboy.core.dal.dataobject.system.MenuResponse; +import cn.odboy.core.service.system.MenuService; import cn.odboy.exception.BadRequestException; -import cn.odboy.model.system.domain.Menu; -import cn.odboy.model.system.request.QueryMenuRequest; -import cn.odboy.model.system.response.MenuResponse; import cn.odboy.util.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/MonitorController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/MonitorController.java similarity index 90% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/MonitorController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/MonitorController.java index 3e57c750..77f60e69 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/MonitorController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/MonitorController.java @@ -1,6 +1,6 @@ -package cn.odboy.application.system.rest; +package cn.odboy.core.controller.system; -import cn.odboy.application.system.service.MonitorService; +import cn.odboy.core.service.system.MonitorService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/OnlineController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/OnlineController.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/OnlineController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/OnlineController.java index 3ef41e4e..37f6fcd0 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/OnlineController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/OnlineController.java @@ -1,8 +1,8 @@ -package cn.odboy.application.core.rest; +package cn.odboy.core.controller.system; -import cn.odboy.application.core.service.UserOnlineService; import cn.odboy.base.PageResult; -import cn.odboy.model.system.model.UserOnlineVo; +import cn.odboy.core.service.system.dto.UserOnlineVo; +import cn.odboy.core.service.system.UserOnlineService; import cn.odboy.util.DesEncryptUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/RoleController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/RoleController.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/RoleController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/RoleController.java index 4bb1bafc..ac230402 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/RoleController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/RoleController.java @@ -1,13 +1,13 @@ -package cn.odboy.application.system.rest; +package cn.odboy.core.controller.system; import cn.hutool.core.lang.Dict; -import cn.odboy.application.system.service.RoleService; import cn.odboy.base.PageResult; -import cn.odboy.context.SecurityHelper; +import cn.odboy.core.framework.permission.util.SecurityHelper; +import cn.odboy.core.service.system.dto.CreateRoleRequest; +import cn.odboy.core.service.system.dto.QueryRoleRequest; +import cn.odboy.core.dal.dataobject.system.Role; +import cn.odboy.core.service.system.RoleService; import cn.odboy.exception.BadRequestException; -import cn.odboy.model.system.domain.Role; -import cn.odboy.model.system.request.CreateRoleRequest; -import cn.odboy.model.system.request.QueryRoleRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/UserController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/UserController.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/UserController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/UserController.java index de847878..23c72f38 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/UserController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/UserController.java @@ -1,22 +1,22 @@ -package cn.odboy.application.system.rest; +package cn.odboy.core.controller.system; import cn.hutool.core.collection.CollectionUtil; -import cn.odboy.application.system.service.DataService; -import cn.odboy.application.system.service.DeptService; -import cn.odboy.application.system.service.RoleService; -import cn.odboy.application.system.service.UserService; -import cn.odboy.application.tools.service.CaptchaService; import cn.odboy.base.MyMetaOption; import cn.odboy.base.PageResult; -import cn.odboy.config.AppProperties; -import cn.odboy.constant.CaptchaBizEnum; -import cn.odboy.context.SecurityHelper; +import cn.odboy.core.framework.properties.AppProperties; +import cn.odboy.core.constant.CaptchaBizEnum; +import cn.odboy.core.framework.permission.util.SecurityHelper; +import cn.odboy.core.service.system.dto.QueryUserRequest; +import cn.odboy.core.dal.dataobject.system.Dept; +import cn.odboy.core.dal.dataobject.system.Role; +import cn.odboy.core.dal.dataobject.system.UpdateUserPasswordResponse; +import cn.odboy.core.dal.dataobject.system.User; +import cn.odboy.core.service.system.DataService; +import cn.odboy.core.service.system.DeptService; +import cn.odboy.core.service.system.RoleService; +import cn.odboy.core.service.system.UserService; +import cn.odboy.core.service.tools.CaptchaService; import cn.odboy.exception.BadRequestException; -import cn.odboy.model.system.domain.Dept; -import cn.odboy.model.system.domain.Role; -import cn.odboy.model.system.domain.User; -import cn.odboy.model.system.request.QueryUserRequest; -import cn.odboy.model.system.response.UpdateUserPasswordResponse; import cn.odboy.util.PageUtil; import cn.odboy.util.RsaEncryptUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/EmailController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/tools/EmailController.java similarity index 88% rename from cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/EmailController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/tools/EmailController.java index a02841b8..c4cb283f 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/EmailController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/tools/EmailController.java @@ -1,8 +1,8 @@ -package cn.odboy.application.tools.rest; +package cn.odboy.core.controller.tools; -import cn.odboy.application.tools.service.EmailService; -import cn.odboy.model.tools.domain.EmailConfig; -import cn.odboy.model.tools.request.SendEmailRequest; +import cn.odboy.core.service.tools.dto.SendEmailRequest; +import cn.odboy.core.dal.dataobject.tools.EmailConfig; +import cn.odboy.core.service.tools.EmailService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/LocalStorageController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/tools/LocalStorageController.java similarity index 94% rename from cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/LocalStorageController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/tools/LocalStorageController.java index 1787fc27..7ba6efef 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/LocalStorageController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/tools/LocalStorageController.java @@ -1,11 +1,11 @@ -package cn.odboy.application.tools.rest; +package cn.odboy.core.controller.tools; -import cn.odboy.application.tools.service.LocalStorageService; import cn.odboy.base.PageResult; import cn.odboy.constant.FileTypeEnum; +import cn.odboy.core.service.tools.dto.QueryLocalStorageRequest; +import cn.odboy.core.dal.dataobject.tools.LocalStorage; +import cn.odboy.core.service.tools.LocalStorageService; import cn.odboy.exception.BadRequestException; -import cn.odboy.model.tools.domain.LocalStorage; -import cn.odboy.model.tools.request.QueryLocalStorageRequest; import cn.odboy.util.FileUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/QiniuController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/tools/QiniuController.java similarity index 92% rename from cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/QiniuController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/tools/QiniuController.java index 252007f6..0bd9f084 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/QiniuController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/tools/QiniuController.java @@ -1,11 +1,11 @@ -package cn.odboy.application.tools.rest; +package cn.odboy.core.controller.tools; -import cn.odboy.application.tools.service.QiniuConfigService; -import cn.odboy.application.tools.service.QiniuContentService; import cn.odboy.base.PageResult; -import cn.odboy.model.tools.domain.QiniuConfig; -import cn.odboy.model.tools.domain.QiniuContent; -import cn.odboy.model.tools.request.QueryQiniuRequest; +import cn.odboy.core.service.tools.dto.QueryQiniuRequest; +import cn.odboy.core.dal.dataobject.tools.QiniuConfig; +import cn.odboy.core.dal.dataobject.tools.QiniuContent; +import cn.odboy.core.service.tools.QiniuConfigService; +import cn.odboy.core.service.tools.QiniuContentService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/domain/QuartzJob.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/job/QuartzJob.java similarity index 97% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/domain/QuartzJob.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/job/QuartzJob.java index 21338f64..2c779296 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/domain/QuartzJob.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/job/QuartzJob.java @@ -1,4 +1,4 @@ -package cn.odboy.model.job.domain; +package cn.odboy.core.dal.dataobject.job; import cn.odboy.base.MyEntity; import com.baomidou.mybatisplus.annotation.FieldStrategy; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/domain/QuartzLog.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/job/QuartzLog.java similarity index 97% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/domain/QuartzLog.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/job/QuartzLog.java index 07366652..abbb8d0e 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/domain/QuartzLog.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/job/QuartzLog.java @@ -1,4 +1,4 @@ -package cn.odboy.model.job.domain; +package cn.odboy.core.dal.dataobject.job; import cn.odboy.base.MyObject; import com.baomidou.mybatisplus.annotation.FieldFill; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Dept.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/Dept.java similarity index 98% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Dept.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/Dept.java index 1e892172..0af29bd1 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Dept.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/Dept.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.domain; +package cn.odboy.core.dal.dataobject.system; import cn.odboy.base.MyEntity; import com.alibaba.fastjson2.annotation.JSONField; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Dict.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/Dict.java similarity index 95% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Dict.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/Dict.java index 1de3391d..6fbfcb4e 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Dict.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/Dict.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.domain; +package cn.odboy.core.dal.dataobject.system; import cn.odboy.base.MyEntity; import com.baomidou.mybatisplus.annotation.FieldStrategy; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/DictDetail.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/DictDetail.java similarity index 95% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/DictDetail.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/DictDetail.java index ca513572..ee59b56a 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/DictDetail.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/DictDetail.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.domain; +package cn.odboy.core.dal.dataobject.system; import cn.odboy.base.MyEntity; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Job.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/Job.java similarity index 96% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Job.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/Job.java index 33c9fe23..56fb4836 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Job.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/Job.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.domain; +package cn.odboy.core.dal.dataobject.system; import cn.odboy.base.MyEntity; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Menu.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/Menu.java similarity index 98% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Menu.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/Menu.java index 19a6b5b6..11342f2a 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Menu.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/Menu.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.domain; +package cn.odboy.core.dal.dataobject.system; import cn.odboy.base.MyEntity; import com.alibaba.fastjson2.annotation.JSONField; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuResponse.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/MenuResponse.java similarity index 90% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuResponse.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/MenuResponse.java index 8f6747c9..88fe8891 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuResponse.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/MenuResponse.java @@ -1,7 +1,7 @@ -package cn.odboy.model.system.response; +package cn.odboy.core.dal.dataobject.system; import cn.odboy.base.MyObject; -import cn.odboy.model.system.model.MenuMetaVo; +import cn.odboy.core.service.system.dto.MenuMetaVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Role.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/Role.java similarity index 95% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Role.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/Role.java index f461dd04..a54eeeb4 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Role.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/Role.java @@ -1,7 +1,7 @@ -package cn.odboy.model.system.domain; +package cn.odboy.core.dal.dataobject.system; import cn.odboy.base.MyEntity; -import cn.odboy.constant.DataScopeEnum; +import cn.odboy.core.constant.DataScopeEnum; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UpdateUserPasswordResponse.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/UpdateUserPasswordResponse.java similarity index 86% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UpdateUserPasswordResponse.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/UpdateUserPasswordResponse.java index 59e2382a..dfc36249 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UpdateUserPasswordResponse.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/UpdateUserPasswordResponse.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.response; +package cn.odboy.core.dal.dataobject.system; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/User.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/User.java similarity index 98% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/User.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/User.java index 7e371bf1..b1fa146c 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/User.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/User.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.domain; +package cn.odboy.core.dal.dataobject.system; import cn.odboy.base.MyEntity; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserInfoResponse.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/UserInfoResponse.java similarity index 77% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserInfoResponse.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/UserInfoResponse.java index 9281aa84..27881b1a 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserInfoResponse.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/UserInfoResponse.java @@ -1,8 +1,8 @@ -package cn.odboy.model.system.response; +package cn.odboy.core.dal.dataobject.system; import cn.odboy.base.MyObject; -import cn.odboy.model.system.model.RoleCodeVo; -import cn.odboy.model.system.model.SimpleUserVo; +import cn.odboy.core.service.system.dto.RoleCodeVo; +import cn.odboy.core.service.system.dto.SimpleUserVo; import lombok.Data; import lombok.EqualsAndHashCode; import java.util.List; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/EmailConfig.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/tools/EmailConfig.java similarity index 95% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/EmailConfig.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/tools/EmailConfig.java index bb945f42..479b8acd 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/EmailConfig.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/tools/EmailConfig.java @@ -1,4 +1,4 @@ -package cn.odboy.model.tools.domain; +package cn.odboy.core.dal.dataobject.tools; import cn.odboy.base.MyObject; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/LocalStorage.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/tools/LocalStorage.java similarity index 97% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/LocalStorage.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/tools/LocalStorage.java index a016da35..fa6e339e 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/LocalStorage.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/tools/LocalStorage.java @@ -1,4 +1,4 @@ -package cn.odboy.model.tools.domain; +package cn.odboy.core.dal.dataobject.tools; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/QiniuConfig.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/tools/QiniuConfig.java similarity index 96% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/QiniuConfig.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/tools/QiniuConfig.java index a5f0c46d..71983697 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/QiniuConfig.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/tools/QiniuConfig.java @@ -1,4 +1,4 @@ -package cn.odboy.model.tools.domain; +package cn.odboy.core.dal.dataobject.tools; import cn.odboy.base.MyObject; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/QiniuContent.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/tools/QiniuContent.java similarity index 96% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/QiniuContent.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/tools/QiniuContent.java index 5e995faf..4da5b7ae 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/domain/QiniuContent.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/tools/QiniuContent.java @@ -1,4 +1,4 @@ -package cn.odboy.model.tools.domain; +package cn.odboy.core.dal.dataobject.tools; import cn.odboy.base.MyObject; import com.baomidou.mybatisplus.annotation.FieldFill; diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzJobMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/job/QuartzJobMapper.java similarity index 78% rename from cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzJobMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/job/QuartzJobMapper.java index af9ba7f8..145b8f32 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzJobMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/job/QuartzJobMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.application.job.mapper; +package cn.odboy.core.dal.mysql.job; -import cn.odboy.model.job.domain.QuartzJob; -import cn.odboy.model.job.request.QueryQuartzJobRequest; +import cn.odboy.core.service.job.dto.QueryQuartzJobRequest; +import cn.odboy.core.dal.dataobject.job.QuartzJob; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzLogMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/job/QuartzLogMapper.java similarity index 75% rename from cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzLogMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/job/QuartzLogMapper.java index 3a1c55c3..1c606a4b 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzLogMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/job/QuartzLogMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.application.job.mapper; +package cn.odboy.core.dal.mysql.job; -import cn.odboy.model.job.domain.QuartzLog; -import cn.odboy.model.job.request.QueryQuartzJobRequest; +import cn.odboy.core.service.job.dto.QueryQuartzJobRequest; +import cn.odboy.core.dal.dataobject.job.QuartzLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DeptMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/DeptMapper.java similarity index 81% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DeptMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/DeptMapper.java index 2b7c4785..09453e42 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DeptMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/DeptMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.application.system.mapper; +package cn.odboy.core.dal.mysql.system; -import cn.odboy.model.system.domain.Dept; -import cn.odboy.model.system.request.QueryDeptRequest; +import cn.odboy.core.service.system.dto.QueryDeptRequest; +import cn.odboy.core.dal.dataobject.system.Dept; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictDetailMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/DictDetailMapper.java similarity index 80% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictDetailMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/DictDetailMapper.java index 438e8a57..1ea29201 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictDetailMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/DictDetailMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.application.system.mapper; +package cn.odboy.core.dal.mysql.system; -import cn.odboy.model.system.domain.DictDetail; -import cn.odboy.model.system.request.QueryDictDetailRequest; +import cn.odboy.core.service.system.dto.QueryDictDetailRequest; +import cn.odboy.core.dal.dataobject.system.DictDetail; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/DictMapper.java similarity index 74% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/DictMapper.java index 94679e07..61116eab 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/DictMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.application.system.mapper; +package cn.odboy.core.dal.mysql.system; -import cn.odboy.model.system.domain.Dict; -import cn.odboy.model.system.request.QueryDictRequest; +import cn.odboy.core.service.system.dto.QueryDictRequest; +import cn.odboy.core.dal.dataobject.system.Dict; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/JobMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/JobMapper.java similarity index 76% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/JobMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/JobMapper.java index 4f775df9..b689dc59 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/JobMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/JobMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.application.system.mapper; +package cn.odboy.core.dal.mysql.system; -import cn.odboy.model.system.domain.Job; -import cn.odboy.model.system.request.QueryJobRequest; +import cn.odboy.core.service.system.dto.QueryJobRequest; +import cn.odboy.core.dal.dataobject.system.Job; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/MenuMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/MenuMapper.java similarity index 85% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/MenuMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/MenuMapper.java index 47b8db0d..59ce63b1 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/MenuMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/MenuMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.application.system.mapper; +package cn.odboy.core.dal.mysql.system; -import cn.odboy.model.system.domain.Menu; -import cn.odboy.model.system.request.QueryMenuRequest; +import cn.odboy.core.service.system.dto.QueryMenuRequest; +import cn.odboy.core.dal.dataobject.system.Menu; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleDeptMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/RoleDeptMapper.java similarity index 80% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleDeptMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/RoleDeptMapper.java index d59588b6..c0b3fb50 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleDeptMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/RoleDeptMapper.java @@ -1,6 +1,6 @@ -package cn.odboy.application.system.mapper; +package cn.odboy.core.dal.mysql.system; -import cn.odboy.model.system.domain.Dept; +import cn.odboy.core.dal.dataobject.system.Dept; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.Set; @@ -8,6 +8,8 @@ import java.util.Set; @Mapper public interface RoleDeptMapper { void insertBatchWithRoleId(@Param("depts") Set depts, @Param("roleId") Long roleId); + void deleteByRoleId(@Param("roleId") Long roleId); + void deleteByRoleIds(@Param("roleIds") Set roleIds); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/RoleMapper.java similarity index 83% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/RoleMapper.java index 4f2e67c7..7c03955e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/RoleMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.application.system.mapper; +package cn.odboy.core.dal.mysql.system; -import cn.odboy.model.system.domain.Role; -import cn.odboy.model.system.request.QueryRoleRequest; +import cn.odboy.core.service.system.dto.QueryRoleRequest; +import cn.odboy.core.dal.dataobject.system.Role; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleMenuMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/RoleMenuMapper.java similarity index 82% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleMenuMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/RoleMenuMapper.java index 079968f1..1da86120 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleMenuMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/RoleMenuMapper.java @@ -1,6 +1,6 @@ -package cn.odboy.application.system.mapper; +package cn.odboy.core.dal.mysql.system; -import cn.odboy.model.system.domain.Menu; +import cn.odboy.core.dal.dataobject.system.Menu; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.Set; @@ -9,6 +9,7 @@ import java.util.Set; @Mapper public interface RoleMenuMapper { void insertBatchWithRoleId(@Param("menus") Set menus, @Param("roleId") Long roleId); + void deleteByRoleId(@Param("roleId") Long roleId); void deleteByRoleIds(@Param("roleIds") Set roleIds); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserJobMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/UserJobMapper.java similarity index 80% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserJobMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/UserJobMapper.java index 5f6959c1..84fbd606 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserJobMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/UserJobMapper.java @@ -1,6 +1,6 @@ -package cn.odboy.application.system.mapper; +package cn.odboy.core.dal.mysql.system; -import cn.odboy.model.system.domain.Job; +import cn.odboy.core.dal.dataobject.system.Job; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.Set; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/UserMapper.java similarity index 91% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/UserMapper.java index 6471eb18..6b3aa7c0 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/UserMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.application.system.mapper; +package cn.odboy.core.dal.mysql.system; -import cn.odboy.model.system.domain.User; -import cn.odboy.model.system.request.QueryUserRequest; +import cn.odboy.core.service.system.dto.QueryUserRequest; +import cn.odboy.core.dal.dataobject.system.User; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserRoleMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/UserRoleMapper.java similarity index 80% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserRoleMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/UserRoleMapper.java index a56c2ab2..f07dea59 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserRoleMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/UserRoleMapper.java @@ -1,6 +1,6 @@ -package cn.odboy.application.system.mapper; +package cn.odboy.core.dal.mysql.system; -import cn.odboy.model.system.domain.Role; +import cn.odboy.core.dal.dataobject.system.Role; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.Set; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/EmailConfigMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/tools/EmailConfigMapper.java similarity index 66% rename from cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/EmailConfigMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/tools/EmailConfigMapper.java index 79ca5bad..5f6e12ba 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/EmailConfigMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/tools/EmailConfigMapper.java @@ -1,6 +1,6 @@ -package cn.odboy.application.tools.mapper; +package cn.odboy.core.dal.mysql.tools; -import cn.odboy.model.tools.domain.EmailConfig; +import cn.odboy.core.dal.dataobject.tools.EmailConfig; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/LocalStorageMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/tools/LocalStorageMapper.java similarity index 74% rename from cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/LocalStorageMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/tools/LocalStorageMapper.java index c5803565..befdfec7 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/LocalStorageMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/tools/LocalStorageMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.application.tools.mapper; +package cn.odboy.core.dal.mysql.tools; -import cn.odboy.model.tools.domain.LocalStorage; -import cn.odboy.model.tools.request.QueryLocalStorageRequest; +import cn.odboy.core.service.tools.dto.QueryLocalStorageRequest; +import cn.odboy.core.dal.dataobject.tools.LocalStorage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/QiniuConfigMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/tools/QiniuConfigMapper.java similarity index 66% rename from cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/QiniuConfigMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/tools/QiniuConfigMapper.java index d6c8b935..3ab66e00 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/QiniuConfigMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/tools/QiniuConfigMapper.java @@ -1,6 +1,6 @@ -package cn.odboy.application.tools.mapper; +package cn.odboy.core.dal.mysql.tools; -import cn.odboy.model.tools.domain.QiniuConfig; +import cn.odboy.core.dal.dataobject.tools.QiniuConfig; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/QiniuContentMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/tools/QiniuContentMapper.java similarity index 77% rename from cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/QiniuContentMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/tools/QiniuContentMapper.java index af8e53de..cd605a7d 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/QiniuContentMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/tools/QiniuContentMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.application.tools.mapper; +package cn.odboy.core.dal.mysql.tools; -import cn.odboy.model.tools.domain.QiniuContent; -import cn.odboy.model.tools.request.QueryQiniuRequest; +import cn.odboy.core.service.tools.dto.QueryQiniuRequest; +import cn.odboy.core.dal.dataobject.tools.QiniuContent; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,5 +12,6 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface QiniuContentMapper extends BaseMapper { QiniuContent getQiniuContentByName(@Param("name") String name); + IPage queryQiniuContentPageByArgs(@Param("criteria") QueryQiniuRequest criteria, Page page); } \ No newline at end of file diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/server/SwaggerConfig.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/doc/SwaggerConfig.java similarity index 99% rename from cutejava/cutejava-common/src/main/java/cn/odboy/server/SwaggerConfig.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/doc/SwaggerConfig.java index 6e3b356b..8f4138ee 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/server/SwaggerConfig.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/doc/SwaggerConfig.java @@ -1,4 +1,4 @@ -package cn.odboy.server; +package cn.odboy.core.framework.doc; import cn.odboy.constant.SystemConst; import cn.odboy.util.AnonTagUtil; diff --git a/cutejava/cutejava-pipline/src/main/java/cn/odboy/context/PipelineManage.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/context/PipelineManager.java similarity index 74% rename from cutejava/cutejava-pipline/src/main/java/cn/odboy/context/PipelineManage.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/context/PipelineManager.java index 217bb484..15a54c52 100644 --- a/cutejava/cutejava-pipline/src/main/java/cn/odboy/context/PipelineManage.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/context/PipelineManager.java @@ -1,11 +1,12 @@ -package cn.odboy.context; +package cn.odboy.core.framework.flow.context; import cn.hutool.core.date.DateTime; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.IdUtil; +import cn.odboy.context.SpringBeanHolder; +import cn.odboy.core.framework.flow.dto.PipelineNodeVo; +import cn.odboy.core.framework.flow.handler.SerialPipelineNodeHandler; import cn.odboy.exception.BadRequestException; -import cn.odboy.handler.SerialPipelineNodeHandler; -import cn.odboy.model.pipeline.model.PipelineNodeVo; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -18,30 +19,42 @@ import java.util.List; */ @Slf4j @Component -public class PipelineManage { +public class PipelineManager { private static final PipelineTaskPool pipelineTaskPool = new PipelineTaskPool("DefaultPipelineTaskPool"); - public void execute() { + public void test() { String pipelineId = IdUtil.objectId(); + List pipelineNodeVos = initialize(); + execute(pipelineId, pipelineNodeVos); + + ThreadUtil.safeSleep(5000); + pipelineTaskPool.stopTaskForcibly(pipelineId); + ThreadUtil.safeSleep(1000000); + } + + public void execute(String pipelineId, List pipelineNodeVos) { pipelineTaskPool.submitTask(pipelineId, () -> { - List pipelineNodeVos = initialize(); for (PipelineNodeVo pipelineNodeVo : pipelineNodeVos) { executePipeline(pipelineId, pipelineNodeVo); - while ("running".equals(pipelineNodeVo.getExecuteStatus())) { + // 要么成功，要么失败 + boolean interrupted = Thread.currentThread().isInterrupted(); + while (!interrupted && "running".equals(pipelineNodeVo.getExecuteStatus())) { log.info("流水线执行中..."); ThreadUtil.safeSleep(2000); } + if (interrupted) { + log.info("流水线被中断..."); + return; + } } }); - ThreadUtil.safeSleep(1000000); } private void executePipeline(String pipelineId, PipelineNodeVo pipelineNodeVo) { String pipelineServiceName = String.format("pipeline:%s", pipelineNodeVo.getBizCode()); SerialPipelineNodeHandler pipelineNodeHandler = SpringBeanHolder.getBean(pipelineServiceName); try { - Object o = pipelineNodeHandler.doProcess(pipelineId, null); - int i = 1 / 0; + Object o = pipelineNodeHandler.doProcess(pipelineId, pipelineNodeVo); log.info("运行结果, {}", o); } catch (BadRequestException e) { log.error("运行流水线异常", e); @@ -70,10 +83,10 @@ public class PipelineManage { pipelineNodeVos.add(createReleaseBranchNodeVo); PipelineNodeVo createReleaseBranchNodeVo1 = new PipelineNodeVo(); - createReleaseBranchNodeVo1.setName("初始化1"); + createReleaseBranchNodeVo1.setName("代码构建"); createReleaseBranchNodeVo1.setClick(true); createReleaseBranchNodeVo1.setButtonList(null); - createReleaseBranchNodeVo1.setBizCode("create_release_branch"); + createReleaseBranchNodeVo1.setBizCode("build_code"); createReleaseBranchNodeVo1.setStartTimeMillis(DateTime.now().getTime()); createReleaseBranchNodeVo1.setDurationMillis(0L); createReleaseBranchNodeVo1.setExecuteStatus("running"); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/context/PipelineProcessManager.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/context/PipelineProcessManager.java new file mode 100644 index 00000000..01bdf370 --- /dev/null +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/context/PipelineProcessManager.java @@ -0,0 +1,211 @@ +package cn.odboy.core.framework.flow.context; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.thread.ThreadUtil; +import cn.hutool.core.util.IdUtil; +import cn.odboy.context.SpringBeanHolder; +import cn.odboy.core.framework.flow.dto.PipelineNodeVo; +import cn.odboy.core.framework.flow.handler.SerialPipelineNodeHandler; +import cn.odboy.exception.BadRequestException; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicBoolean; + +/** + * 流水线进程管理工具 + * + * @author odboy + */ +@Slf4j +@Component +public class PipelineProcessManager { + // 使用ConcurrentHashMap保证线程安全 + private final Map runningTasks = new ConcurrentHashMap<>(); + // 使用AtomicBoolean作为停止标志，保证原子性操作 + private final Map stopFlags = new ConcurrentHashMap<>(); + // 常量定义 + private static final String PIPELINE_THREAD_PREFIX = "pipeline-"; + private static final String PIPELINE_SERVICE_PREFIX = "pipeline:"; + private static final String RUNNING_STATUS = "running"; + private static final long DEFAULT_SLEEP_MS = 2000L; + + /** + * 测试方法 + */ + public void test() { + String pipelineId = IdUtil.objectId(); + List pipelineNodes = initialize(); + execute(pipelineId, pipelineNodes); + + ThreadUtil.safeSleep(5000); + stopForcibly(pipelineId); + ThreadUtil.safeSleep(1000000); + } + + /** + * 执行流水线 + * + * @param pipelineId 流水线ID + * @param pipelineNodes 流水线节点列表 + */ + public void execute(String pipelineId, List pipelineNodes) { + if (runningTasks.containsKey(pipelineId)) { + log.warn("Pipeline [{}] is already running", pipelineId); + return; + } + + stopFlags.put(pipelineId, new AtomicBoolean(false)); + + Thread pipelineThread = new Thread(() -> processPipeline(pipelineId, pipelineNodes)); + pipelineThread.setDaemon(true); + pipelineThread.setName(PIPELINE_THREAD_PREFIX + pipelineId); + + runningTasks.put(pipelineId, pipelineThread); + pipelineThread.start(); + } + + /** + * 处理流水线任务 + */ + private void processPipeline(String pipelineId, List pipelineNodes) { + try { + for (PipelineNodeVo node : pipelineNodes) { + if (shouldStop(pipelineId)) { + log.info("Pipeline [{}] was interrupted", pipelineId); + return; + } + + executePipelineNode(pipelineId, node); + + while (!shouldStop(pipelineId) && RUNNING_STATUS.equals(node.getExecuteStatus())) { + log.debug("Pipeline [{}] is running...", pipelineId); + sleepInterruptibly(DEFAULT_SLEEP_MS, pipelineId); + } + + if (shouldStop(pipelineId)) { + log.info("Pipeline [{}] was interrupted", pipelineId); + return; + } + } + } catch (Exception e) { + log.error("流水线异常", e); + } finally { + cleanup(pipelineId); + } + } + + /** + * 检查是否应该停止 + */ + private boolean shouldStop(String pipelineId) { + return Optional.ofNullable(stopFlags.get(pipelineId)) + .map(AtomicBoolean::get) + .orElse(true); + } + + /** + * 可中断的睡眠 + */ + private void sleepInterruptibly(long millis, String pipelineId) { + try { + Thread.sleep(millis); + } catch (InterruptedException e) { + log.info("Pipeline [{}] sleep interrupted", pipelineId); + Thread.currentThread().interrupt(); + } + } + + /** + * 清理资源 + */ + private void cleanup(String pipelineId) { + runningTasks.remove(pipelineId); + stopFlags.remove(pipelineId); + log.info("Pipeline [{}] resources cleaned up", pipelineId); + } + + /** + * 检查流水线是否在运行 + */ + public boolean isRunning(String pipelineId) { + return Optional.ofNullable(runningTasks.get(pipelineId)) + .map(Thread::isAlive) + .orElse(false); + } + + /** + * 执行单个流水线节点 + */ + private void executePipelineNode(String pipelineId, PipelineNodeVo node) { + String serviceName = PIPELINE_SERVICE_PREFIX + node.getBizCode(); + SerialPipelineNodeHandler handler = SpringBeanHolder.getBean(serviceName); + try { + Object result = handler.doProcess(pipelineId, node); + log.info("Pipeline [{}] node [{}] executed, result: {}", pipelineId, node.getName(), result); + } catch (BadRequestException e) { + handlePipelineError(pipelineId, "Business error in pipeline", e); + } catch (Exception e) { + handlePipelineError(pipelineId, "Unexpected error in pipeline", e); + } + } + + /** + * 处理流水线错误 + */ + private void handlePipelineError(String pipelineId, String message, Exception e) { + log.error(message, e); + if (isRunning(pipelineId)) { + stopForcibly(pipelineId); + } + } + + /** + * 强制停止流水线 + */ + public void stopForcibly(String pipelineId) { + Optional.ofNullable(stopFlags.get(pipelineId)) + .ifPresent(flag -> flag.set(true)); + + Optional.ofNullable(runningTasks.get(pipelineId)) + .ifPresent(thread -> { + try { + thread.interrupt(); + } catch (SecurityException e) { + log.error("Failed to interrupt pipeline [{}]", pipelineId, e); + } + }); + } + + /** + * 初始化测试流水线节点 + */ + public List initialize() { + List nodes = new ArrayList<>(); + + nodes.add(createNode("初始化", "create_release_branch")); + nodes.add(createNode("代码构建", "build_code")); + + return nodes; + } + + /** + * 创建流水线节点 + */ + private PipelineNodeVo createNode(String name, String bizCode) { + PipelineNodeVo node = new PipelineNodeVo(); + node.setName(name); + node.setClick(true); + node.setButtonList(null); + node.setBizCode(bizCode); + node.setStartTimeMillis(DateTime.now().getTime()); + node.setDurationMillis(0L); + node.setExecuteStatus(RUNNING_STATUS); + node.setResultDesc(null); + return node; + } +} \ No newline at end of file diff --git a/cutejava/cutejava-pipline/src/main/java/cn/odboy/context/PipelineTaskPool.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/context/PipelineTaskPool.java similarity index 88% rename from cutejava/cutejava-pipline/src/main/java/cn/odboy/context/PipelineTaskPool.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/context/PipelineTaskPool.java index 5dfab0f1..b68c22b1 100644 --- a/cutejava/cutejava-pipline/src/main/java/cn/odboy/context/PipelineTaskPool.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/context/PipelineTaskPool.java @@ -1,4 +1,4 @@ -package cn.odboy.context; +package cn.odboy.core.framework.flow.context; import java.util.Map; import java.util.concurrent.BlockingQueue; @@ -216,9 +216,22 @@ public class PipelineTaskPool { if (running.compareAndSet(true, false)) { if (currentThread != null) { -// currentThread.interrupt(); // 暴力停止线程 - currentThread.stop(); + // currentThread.stop(); + try { + /** + * Thread.interrupt只支持终止线程的阻塞状态(wait、join、sleep)， + * 在阻塞出抛出InterruptedException异常,但是并不会终止运行的线程本身； + * 所以需要注意，此处彻底销毁本线程，需要通过共享变量方式； + */ + currentThread.interrupt(); + currentThread.join(); + } catch (InterruptedException e) { + currentThread.interrupt(); + } catch (Exception e) { + // ignore + // currentThread.stop(); + } } return true; } diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/pipeline/model/PipelineNodeVo.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/dto/PipelineNodeVo.java similarity index 97% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/pipeline/model/PipelineNodeVo.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/dto/PipelineNodeVo.java index fb9e4d32..120550a6 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/pipeline/model/PipelineNodeVo.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/dto/PipelineNodeVo.java @@ -1,4 +1,4 @@ -package cn.odboy.model.pipeline.model; +package cn.odboy.core.framework.flow.dto; import cn.odboy.base.MyObject; import lombok.Data; diff --git a/cutejava/cutejava-pipline/src/main/java/cn/odboy/handler/SerialPipelineNodeHandler.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/handler/SerialPipelineNodeHandler.java similarity index 78% rename from cutejava/cutejava-pipline/src/main/java/cn/odboy/handler/SerialPipelineNodeHandler.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/handler/SerialPipelineNodeHandler.java index 6a91ba12..7ec1e536 100644 --- a/cutejava/cutejava-pipline/src/main/java/cn/odboy/handler/SerialPipelineNodeHandler.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/handler/SerialPipelineNodeHandler.java @@ -1,8 +1,8 @@ -package cn.odboy.handler; +package cn.odboy.core.framework.flow.handler; import cn.hutool.core.thread.ThreadUtil; +import cn.odboy.exception.BadRequestException; import com.alibaba.fastjson2.JSON; -import io.undertow.util.BadRequestException; import lombok.extern.slf4j.Slf4j; /** @@ -71,6 +71,14 @@ public abstract class SerialPipelineNodeHandler { */ protected abstract boolean isLocked(String pipelineId, I inputModel); + /** + * 当进程被中断时 + * + * @param pipelineId 流水线id + * @param inputModel 输入参数 + */ + protected abstract void onProcessInterrupted(String pipelineId, I inputModel); + /** * 业务处理 * @@ -80,17 +88,27 @@ public abstract class SerialPipelineNodeHandler { */ public T doProcess(String pipelineId, I inputModel) throws BadRequestException { try { + if (Thread.currentThread().isInterrupted()) { + onProcessInterrupted(pipelineId, inputModel); + throw new InterruptedException("业务被中断"); + } preProcess(pipelineId, inputModel); log.info("preProcess,pipelineId={},inputModel={}", pipelineId, JSON.toJSONString(inputModel)); } catch (Exception e) { preProcessException(pipelineId, inputModel, e); log.error("preProcessException,pipelineId={},inputModel={}", pipelineId, JSON.toJSONString(inputModel), e); - throw new BadRequestException(e); + throw new BadRequestException(e.getMessage()); + } + if (Thread.currentThread().isInterrupted()) { + throw new BadRequestException("业务被中断"); } while (isLocked(pipelineId, inputModel)) { ThreadUtil.safeSleep(2000); } try { + if (Thread.currentThread().isInterrupted()) { + throw new BadRequestException("业务被中断"); + } T processResult = process(pipelineId, inputModel); log.info("process,pipelineId={},inputModel={}", pipelineId, JSON.toJSONString(inputModel)); try { @@ -100,12 +118,12 @@ public abstract class SerialPipelineNodeHandler { } catch (Exception e) { postProcessException(pipelineId, inputModel, processResult, e); log.error("postProcessException,pipelineId={},inputModel={},processResult={}", pipelineId, JSON.toJSONString(inputModel), JSON.toJSONString(processResult)); - throw new BadRequestException(e); + throw new BadRequestException(e.getMessage()); } } catch (Exception e) { processException(pipelineId, inputModel, e); log.error("processException,pipelineId={},inputModel={}", pipelineId, JSON.toJSONString(inputModel), e); - throw new BadRequestException(e); + throw new BadRequestException(e.getMessage()); } } } diff --git a/cutejava/cutejava-pipline/src/main/java/cn/odboy/service/PipelineAppCreateReleaseBranchBiz.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/handler/impl/PipelineAppCreateReleaseBranchHandlerServiceImpl.java similarity index 67% rename from cutejava/cutejava-pipline/src/main/java/cn/odboy/service/PipelineAppCreateReleaseBranchBiz.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/handler/impl/PipelineAppCreateReleaseBranchHandlerServiceImpl.java index 8c8bae4c..5ea309f9 100644 --- a/cutejava/cutejava-pipline/src/main/java/cn/odboy/service/PipelineAppCreateReleaseBranchBiz.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/flow/handler/impl/PipelineAppCreateReleaseBranchHandlerServiceImpl.java @@ -1,18 +1,18 @@ -package cn.odboy.service; +package cn.odboy.core.framework.flow.handler.impl; -import cn.odboy.handler.SerialPipelineNodeHandler; +import cn.odboy.core.framework.flow.handler.SerialPipelineNodeHandler; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +@Slf4j @Service("pipeline:create_release_branch") -public class PipelineAppCreateReleaseBranchBiz extends SerialPipelineNodeHandler { +public class PipelineAppCreateReleaseBranchHandlerServiceImpl extends SerialPipelineNodeHandler { @Override public void preProcess(String pipelineId, Object inputModel) { - } @Override public void preProcessException(String pipelineId, Object inputModel, Exception e) { - } @Override @@ -22,21 +22,23 @@ public class PipelineAppCreateReleaseBranchBiz extends SerialPipelineNodeHandler @Override public void processException(String pipelineId, Object inputModel, Exception e) { - } @Override public void postProcess(String pipelineId, Object inputModel, Object processResult) { - } @Override public void postProcessException(String pipelineId, Object inputModel, Object processResult, Exception e) { - } @Override public boolean isLocked(String pipelineId, Object inputModel) { return false; } + + @Override + protected void onProcessInterrupted(String pipelineId, Object inputModel) { + log.error("pipeline is stopping"); + } } diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/config/MybatisPlusConfig.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/MybatisPlusConfig.java similarity index 93% rename from cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/config/MybatisPlusConfig.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/MybatisPlusConfig.java index 7f65a35d..babb4bd6 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/config/MybatisPlusConfig.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/MybatisPlusConfig.java @@ -1,6 +1,6 @@ -package cn.odboy.mybatis.config; +package cn.odboy.core.framework.mybatisplus.config; -import cn.odboy.mybatis.context.InsertBatchSqlInjector; +import cn.odboy.core.framework.mybatisplus.context.InsertBatchSqlInjector; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/config/RemoveDruidAdConfig.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/RemoveDruidAdConfig.java similarity index 98% rename from cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/config/RemoveDruidAdConfig.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/RemoveDruidAdConfig.java index 50f9b1d3..defc0613 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/config/RemoveDruidAdConfig.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/config/RemoveDruidAdConfig.java @@ -1,4 +1,4 @@ -package cn.odboy.mybatis.config; +package cn.odboy.core.framework.mybatisplus.config; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/constant/DataTypeEnum.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/constant/DataTypeEnum.java similarity index 98% rename from cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/constant/DataTypeEnum.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/constant/DataTypeEnum.java index ddd10eee..cd13fc2e 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/constant/DataTypeEnum.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/constant/DataTypeEnum.java @@ -1,4 +1,4 @@ -package cn.odboy.mybatis.constant; +package cn.odboy.core.framework.mybatisplus.constant; import cn.odboy.exception.BadRequestException; import lombok.extern.slf4j.Slf4j; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/constant/MpQuery.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/constant/MpQuery.java similarity index 95% rename from cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/constant/MpQuery.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/constant/MpQuery.java index 6eb8a27f..a92ea813 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/constant/MpQuery.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/constant/MpQuery.java @@ -1,4 +1,4 @@ -package cn.odboy.mybatis.constant; +package cn.odboy.core.framework.mybatisplus.constant; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/constant/QueryTypeEnum.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/constant/QueryTypeEnum.java similarity index 93% rename from cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/constant/QueryTypeEnum.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/constant/QueryTypeEnum.java index efb38d28..95e5b8fb 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/constant/QueryTypeEnum.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/constant/QueryTypeEnum.java @@ -1,4 +1,4 @@ -package cn.odboy.mybatis.constant; +package cn.odboy.core.framework.mybatisplus.constant; /** * 动态查询 枚举 diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/context/CustomP6SpyLogger.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/context/CustomP6SpyLogger.java similarity index 96% rename from cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/context/CustomP6SpyLogger.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/context/CustomP6SpyLogger.java index 5e73f280..bd46944b 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/context/CustomP6SpyLogger.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/context/CustomP6SpyLogger.java @@ -1,4 +1,4 @@ -package cn.odboy.mybatis.context; +package cn.odboy.core.framework.mybatisplus.context; import cn.hutool.core.util.StrUtil; import com.p6spy.engine.spy.appender.MessageFormattingStrategy; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/context/InsertBatchSqlInjector.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/context/InsertBatchSqlInjector.java similarity index 97% rename from cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/context/InsertBatchSqlInjector.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/context/InsertBatchSqlInjector.java index 90bc9c3e..19ba3d39 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/context/InsertBatchSqlInjector.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/context/InsertBatchSqlInjector.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.mybatis.context; +package cn.odboy.core.framework.mybatisplus.context; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.core.injector.AbstractMethod; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/context/MyMetaObjectHandler.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/context/MyMetaObjectHandler.java similarity index 92% rename from cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/context/MyMetaObjectHandler.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/context/MyMetaObjectHandler.java index aa8de61e..ed4fe001 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/context/MyMetaObjectHandler.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/context/MyMetaObjectHandler.java @@ -1,7 +1,7 @@ -package cn.odboy.mybatis.context; +package cn.odboy.core.framework.mybatisplus.context; import cn.hutool.core.date.DateTime; -import cn.odboy.context.SecurityHelper; +import cn.odboy.core.framework.permission.util.SecurityHelper; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.apache.ibatis.reflection.MetaObject; import org.springframework.stereotype.Component; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/EasyMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/interfaces/EasyMapper.java similarity index 99% rename from cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/EasyMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/interfaces/EasyMapper.java index ce56b71c..e38dcd6f 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/EasyMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/interfaces/EasyMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.mybatis.interfaces; +package cn.odboy.core.framework.mybatisplus.interfaces; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/EasyService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/interfaces/EasyService.java similarity index 97% rename from cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/EasyService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/interfaces/EasyService.java index d355aa15..1392bfbe 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/EasyService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/interfaces/EasyService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.mybatis.interfaces; +package cn.odboy.core.framework.mybatisplus.interfaces; import cn.odboy.base.PageResult; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/impl/EasyServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/interfaces/impl/EasyServiceImpl.java similarity index 97% rename from cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/impl/EasyServiceImpl.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/interfaces/impl/EasyServiceImpl.java index 5ff230f8..e7b4c712 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/impl/EasyServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/interfaces/impl/EasyServiceImpl.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.mybatis.interfaces.impl; +package cn.odboy.core.framework.mybatisplus.interfaces.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.odboy.base.PageResult; +import cn.odboy.core.framework.mybatisplus.interfaces.EasyMapper; +import cn.odboy.core.framework.mybatisplus.util.MybatisHelper; import cn.odboy.exception.BadRequestException; -import cn.odboy.mybatis.interfaces.EasyMapper; -import cn.odboy.mybatis.util.MybatisHelper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.enums.SqlMethod; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/util/CmdGenHelper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/util/CmdGenHelper.java similarity index 99% rename from cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/util/CmdGenHelper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/util/CmdGenHelper.java index e01ab87d..87a1b179 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/util/CmdGenHelper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/util/CmdGenHelper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.mybatis.util; +package cn.odboy.core.framework.mybatisplus.util; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.generator.FastAutoGenerator; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/util/MybatisHelper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/util/MybatisHelper.java similarity index 98% rename from cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/util/MybatisHelper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/util/MybatisHelper.java index e5bfdaa1..e2f60012 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/util/MybatisHelper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/util/MybatisHelper.java @@ -1,11 +1,11 @@ -package cn.odboy.mybatis.util; +package cn.odboy.core.framework.mybatisplus.util; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.odboy.base.MyEntity; +import cn.odboy.core.framework.mybatisplus.constant.MpQuery; import cn.odboy.exception.BadRequestException; -import cn.odboy.mybatis.constant.MpQuery; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/JwtAccessDeniedHandler.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/JwtAccessDeniedHandler.java similarity index 96% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/JwtAccessDeniedHandler.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/JwtAccessDeniedHandler.java index a2d687b6..27864037 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/JwtAccessDeniedHandler.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/JwtAccessDeniedHandler.java @@ -1,4 +1,4 @@ -package cn.odboy.application.core.context; +package cn.odboy.core.framework.permission; import cn.odboy.exception.handler.ApiError; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/JwtAuthenticationEntryPoint.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/JwtAuthenticationEntryPoint.java similarity index 96% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/JwtAuthenticationEntryPoint.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/JwtAuthenticationEntryPoint.java index 8bc43069..b4bea5c6 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/JwtAuthenticationEntryPoint.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/JwtAuthenticationEntryPoint.java @@ -1,4 +1,4 @@ -package cn.odboy.application.core.context; +package cn.odboy.core.framework.permission; import cn.odboy.exception.handler.ApiError; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/SpringSecurityConfig.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/SpringSecurityConfig.java similarity index 97% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/SpringSecurityConfig.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/SpringSecurityConfig.java index 145d05d4..614cb4e9 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/SpringSecurityConfig.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/SpringSecurityConfig.java @@ -1,7 +1,7 @@ -package cn.odboy.application.core.context; +package cn.odboy.core.framework.permission; -import cn.odboy.application.core.service.impl.UserOnlineServiceImpl; import cn.odboy.constant.RequestMethodEnum; +import cn.odboy.core.service.system.impl.UserOnlineServiceImpl; import cn.odboy.util.AnonTagUtil; import lombok.RequiredArgsConstructor; import org.springframework.context.ApplicationContext; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/TokenConfigurer.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/TokenConfigurer.java similarity index 88% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/TokenConfigurer.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/TokenConfigurer.java index 8f7c41b0..cc620642 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/TokenConfigurer.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/TokenConfigurer.java @@ -1,6 +1,6 @@ -package cn.odboy.application.core.context; +package cn.odboy.core.framework.permission; -import cn.odboy.application.core.service.impl.UserOnlineServiceImpl; +import cn.odboy.core.service.system.impl.UserOnlineServiceImpl; import lombok.RequiredArgsConstructor; import org.springframework.security.config.annotation.SecurityConfigurerAdapter; import org.springframework.security.config.annotation.web.builders.HttpSecurity; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/TokenFilter.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/TokenFilter.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/TokenFilter.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/TokenFilter.java index 7c45337d..dde26793 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/TokenFilter.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/TokenFilter.java @@ -1,9 +1,9 @@ -package cn.odboy.application.core.context; +package cn.odboy.core.framework.permission; import cn.hutool.core.util.StrUtil; -import cn.odboy.application.core.service.impl.UserOnlineServiceImpl; import cn.odboy.constant.SystemConst; -import cn.odboy.model.system.model.UserOnlineVo; +import cn.odboy.core.service.system.dto.UserOnlineVo; +import cn.odboy.core.service.system.impl.UserOnlineServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/TokenProvider.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/TokenProvider.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/TokenProvider.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/TokenProvider.java index cbcfe3a1..6b1ae426 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/TokenProvider.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/TokenProvider.java @@ -1,12 +1,12 @@ -package cn.odboy.application.core.context; +package cn.odboy.core.framework.permission; import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; -import cn.odboy.config.AppProperties; +import cn.odboy.core.framework.properties.AppProperties; import cn.odboy.constant.SystemConst; -import cn.odboy.constant.SystemRedisKey; -import cn.odboy.model.system.model.UserJwtVo; +import cn.odboy.core.constant.SystemRedisKey; +import cn.odboy.core.service.system.dto.UserJwtVo; import cn.odboy.redis.RedisHelper; import io.jsonwebtoken.Claims; import io.jsonwebtoken.JwtBuilder; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/context/AuthorityConfig.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/config/AuthorityConfig.java similarity index 87% rename from cutejava/cutejava-common/src/main/java/cn/odboy/context/AuthorityConfig.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/config/AuthorityConfig.java index a9d9b180..2f4ed2fd 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/context/AuthorityConfig.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/config/AuthorityConfig.java @@ -1,5 +1,6 @@ -package cn.odboy.context; +package cn.odboy.core.framework.permission.config; +import cn.odboy.core.framework.permission.util.SecurityHelper; import org.springframework.security.core.GrantedAuthority; import org.springframework.stereotype.Service; import java.util.Arrays; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/context/SecurityHelper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/util/SecurityHelper.java similarity index 96% rename from cutejava/cutejava-common/src/main/java/cn/odboy/context/SecurityHelper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/util/SecurityHelper.java index 6f451830..dac00783 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/context/SecurityHelper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/util/SecurityHelper.java @@ -1,10 +1,11 @@ -package cn.odboy.context; +package cn.odboy.core.framework.permission.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.jwt.JWT; import cn.hutool.jwt.JWTUtil; -import cn.odboy.constant.DataScopeEnum; import cn.odboy.constant.SystemConst; +import cn.odboy.context.SpringBeanHolder; +import cn.odboy.core.constant.DataScopeEnum; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/config/AppProperties.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/AppProperties.java similarity index 54% rename from cutejava/cutejava-common/src/main/java/cn/odboy/config/AppProperties.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/AppProperties.java index 0bea5e80..3e569746 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/config/AppProperties.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/AppProperties.java @@ -1,11 +1,11 @@ -package cn.odboy.config; +package cn.odboy.core.framework.properties; -import cn.odboy.config.model.ContentRsaEncodeSettingModel; -import cn.odboy.config.model.FileUploadSettingModel; -import cn.odboy.config.model.JwtAuthSettingModel; -import cn.odboy.config.model.QuartzTaskThreadPoolSettingModel; -import cn.odboy.config.model.SwaggerApiDocSettingModel; -import cn.odboy.config.model.UserLoginSettingModel; +import cn.odboy.core.framework.properties.dto.ContentRsaEncodeSettingModel; +import cn.odboy.core.framework.properties.dto.FileUploadSettingModel; +import cn.odboy.core.framework.properties.dto.JwtAuthSettingModel; +import cn.odboy.core.framework.properties.dto.QuartzTaskThreadPoolSettingModel; +import cn.odboy.core.framework.properties.dto.SwaggerApiDocSettingModel; +import cn.odboy.core.framework.properties.dto.UserLoginSettingModel; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/config/model/ContentRsaEncodeSettingModel.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/dto/ContentRsaEncodeSettingModel.java similarity index 78% rename from cutejava/cutejava-common/src/main/java/cn/odboy/config/model/ContentRsaEncodeSettingModel.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/dto/ContentRsaEncodeSettingModel.java index f283c318..8f4cf437 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/config/model/ContentRsaEncodeSettingModel.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/dto/ContentRsaEncodeSettingModel.java @@ -1,6 +1,7 @@ -package cn.odboy.config.model; +package cn.odboy.core.framework.properties.dto; import lombok.Data; + /** * 密码加密传输，前端公钥加密，后端私钥解密 */ diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/config/model/FileUploadSettingModel.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/dto/FileUploadSettingModel.java similarity index 94% rename from cutejava/cutejava-common/src/main/java/cn/odboy/config/model/FileUploadSettingModel.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/dto/FileUploadSettingModel.java index bdb97db7..7b443401 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/config/model/FileUploadSettingModel.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/dto/FileUploadSettingModel.java @@ -1,4 +1,4 @@ -package cn.odboy.config.model; +package cn.odboy.core.framework.properties.dto; import cn.odboy.constant.SystemConst; import lombok.Data; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/config/model/JwtAuthSettingModel.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/dto/JwtAuthSettingModel.java similarity index 90% rename from cutejava/cutejava-common/src/main/java/cn/odboy/config/model/JwtAuthSettingModel.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/dto/JwtAuthSettingModel.java index 563d92d9..5ff8bd5a 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/config/model/JwtAuthSettingModel.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/dto/JwtAuthSettingModel.java @@ -1,4 +1,4 @@ -package cn.odboy.config.model; +package cn.odboy.core.framework.properties.dto; import lombok.Data; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/config/model/QuartzTaskThreadPoolSettingModel.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/dto/QuartzTaskThreadPoolSettingModel.java similarity index 90% rename from cutejava/cutejava-common/src/main/java/cn/odboy/config/model/QuartzTaskThreadPoolSettingModel.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/dto/QuartzTaskThreadPoolSettingModel.java index 712f9178..1f090e8c 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/config/model/QuartzTaskThreadPoolSettingModel.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/dto/QuartzTaskThreadPoolSettingModel.java @@ -1,4 +1,4 @@ -package cn.odboy.config.model; +package cn.odboy.core.framework.properties.dto; import lombok.Data; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/config/model/SwaggerApiDocSettingModel.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/dto/SwaggerApiDocSettingModel.java similarity index 74% rename from cutejava/cutejava-common/src/main/java/cn/odboy/config/model/SwaggerApiDocSettingModel.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/dto/SwaggerApiDocSettingModel.java index 4049d058..d742b4ae 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/config/model/SwaggerApiDocSettingModel.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/dto/SwaggerApiDocSettingModel.java @@ -1,8 +1,8 @@ -package cn.odboy.config.model; +package cn.odboy.core.framework.properties.dto; import lombok.Data; + /** - * * @author odboy * @date 2025-04-13 */ diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/config/model/UserLoginCaptchaSettingModel.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/dto/UserLoginCaptchaSettingModel.java similarity index 96% rename from cutejava/cutejava-common/src/main/java/cn/odboy/config/model/UserLoginCaptchaSettingModel.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/dto/UserLoginCaptchaSettingModel.java index 3fb1d963..7c5af42a 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/config/model/UserLoginCaptchaSettingModel.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/dto/UserLoginCaptchaSettingModel.java @@ -1,6 +1,6 @@ -package cn.odboy.config.model; +package cn.odboy.core.framework.properties.dto; -import cn.odboy.constant.LoginCodeEnum; +import cn.odboy.core.constant.LoginCodeEnum; import cn.odboy.exception.BadRequestException; import cn.odboy.util.StringUtil; import com.wf.captcha.ArithmeticCaptcha; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/config/model/UserLoginSettingModel.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/dto/UserLoginSettingModel.java similarity index 82% rename from cutejava/cutejava-common/src/main/java/cn/odboy/config/model/UserLoginSettingModel.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/dto/UserLoginSettingModel.java index 4dfda60b..8454ef8e 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/config/model/UserLoginSettingModel.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/dto/UserLoginSettingModel.java @@ -1,4 +1,4 @@ -package cn.odboy.config.model; +package cn.odboy.core.framework.properties.dto; import lombok.Data; diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/ExecutionJobBean.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/ExecutionJobBean.java similarity index 93% rename from cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/ExecutionJobBean.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/ExecutionJobBean.java index aed4956b..fa2bd576 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/ExecutionJobBean.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/ExecutionJobBean.java @@ -1,17 +1,17 @@ -package cn.odboy.application.job.context; +package cn.odboy.core.framework.quartz; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.extra.template.Template; import cn.hutool.extra.template.TemplateConfig; import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateUtil; -import cn.odboy.application.job.mapper.QuartzLogMapper; -import cn.odboy.application.job.service.QuartzJobService; -import cn.odboy.application.tools.service.EmailService; import cn.odboy.context.SpringBeanHolder; -import cn.odboy.model.job.domain.QuartzJob; -import cn.odboy.model.job.domain.QuartzLog; -import cn.odboy.model.tools.request.SendEmailRequest; +import cn.odboy.core.service.tools.dto.SendEmailRequest; +import cn.odboy.core.dal.dataobject.job.QuartzJob; +import cn.odboy.core.dal.dataobject.job.QuartzLog; +import cn.odboy.core.dal.mysql.job.QuartzLogMapper; +import cn.odboy.core.service.job.QuartzJobService; +import cn.odboy.core.service.tools.EmailService; import cn.odboy.redis.RedisHelper; import cn.odboy.util.StringUtil; import lombok.extern.slf4j.Slf4j; diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/QuartzRunnable.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/QuartzRunnable.java similarity index 96% rename from cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/QuartzRunnable.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/QuartzRunnable.java index d0e130d4..8068d73e 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/QuartzRunnable.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/QuartzRunnable.java @@ -1,4 +1,4 @@ -package cn.odboy.application.job.context; +package cn.odboy.core.framework.quartz; import cn.odboy.context.SpringBeanHolder; import lombok.extern.slf4j.Slf4j; diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/QuartzConfig.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/config/QuartzConfig.java similarity index 97% rename from cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/QuartzConfig.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/config/QuartzConfig.java index e6164018..611a3bdf 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/QuartzConfig.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/config/QuartzConfig.java @@ -1,4 +1,4 @@ -package cn.odboy.application.job.context; +package cn.odboy.core.framework.quartz.config; import lombok.extern.slf4j.Slf4j; import org.quartz.spi.TriggerFiredBundle; diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/InitialActiveJobApplicationRunner.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/context/InitialActiveJobApplicationRunner.java similarity index 85% rename from cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/InitialActiveJobApplicationRunner.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/context/InitialActiveJobApplicationRunner.java index 82172b60..5f0c9125 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/InitialActiveJobApplicationRunner.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/context/InitialActiveJobApplicationRunner.java @@ -1,7 +1,7 @@ -package cn.odboy.application.job.context; +package cn.odboy.core.framework.quartz.context; -import cn.odboy.application.job.mapper.QuartzJobMapper; -import cn.odboy.model.job.domain.QuartzJob; +import cn.odboy.core.dal.dataobject.job.QuartzJob; +import cn.odboy.core.dal.mysql.job.QuartzJobMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.ApplicationArguments; diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/QuartzManage.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/context/QuartzManage.java similarity index 97% rename from cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/QuartzManage.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/context/QuartzManage.java index 78990b3e..6882a3f4 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/QuartzManage.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/context/QuartzManage.java @@ -1,7 +1,8 @@ -package cn.odboy.application.job.context; +package cn.odboy.core.framework.quartz.context; +import cn.odboy.core.dal.dataobject.job.QuartzJob; +import cn.odboy.core.framework.quartz.ExecutionJobBean; import cn.odboy.exception.BadRequestException; -import cn.odboy.model.job.domain.QuartzJob; import lombok.extern.slf4j.Slf4j; import org.quartz.CronScheduleBuilder; import org.quartz.CronTrigger; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/thread/AsyncExecutor.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/server/AsyncExecutor.java similarity index 94% rename from cutejava/cutejava-common/src/main/java/cn/odboy/thread/AsyncExecutor.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/server/AsyncExecutor.java index bd0ca464..cca62fef 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/thread/AsyncExecutor.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/server/AsyncExecutor.java @@ -1,7 +1,7 @@ -package cn.odboy.thread; +package cn.odboy.core.framework.server; -import cn.odboy.config.AppProperties; -import cn.odboy.config.model.QuartzTaskThreadPoolSettingModel; +import cn.odboy.core.framework.properties.AppProperties; +import cn.odboy.core.framework.properties.dto.QuartzTaskThreadPoolSettingModel; import com.alibaba.ttl.TtlRunnable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/server/ConfigurerAdapter.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/web/ConfigurerAdapter.java similarity index 96% rename from cutejava/cutejava-common/src/main/java/cn/odboy/server/ConfigurerAdapter.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/web/ConfigurerAdapter.java index fc346041..be0dc3b2 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/server/ConfigurerAdapter.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/web/ConfigurerAdapter.java @@ -1,7 +1,7 @@ -package cn.odboy.server; +package cn.odboy.core.framework.web; -import cn.odboy.config.AppProperties; -import cn.odboy.config.model.FileUploadSettingModel; +import cn.odboy.core.framework.properties.AppProperties; +import cn.odboy.core.framework.properties.dto.FileUploadSettingModel; import com.alibaba.fastjson2.JSONWriter; import com.alibaba.fastjson2.support.config.FastJsonConfig; import com.alibaba.fastjson2.support.spring.http.converter.FastJsonHttpMessageConverter; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/server/MultipartConfig.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/web/MultipartConfig.java similarity index 96% rename from cutejava/cutejava-common/src/main/java/cn/odboy/server/MultipartConfig.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/web/MultipartConfig.java index 51daf535..aed36691 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/server/MultipartConfig.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/web/MultipartConfig.java @@ -1,4 +1,4 @@ -package cn.odboy.server; +package cn.odboy.core.framework.web; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/task/TestTask.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/job/TestTask.java similarity index 90% rename from cutejava/cutejava-job/src/main/java/cn/odboy/application/job/task/TestTask.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/job/TestTask.java index d65b279b..353999e1 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/task/TestTask.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/job/TestTask.java @@ -1,4 +1,4 @@ -package cn.odboy.application.job.task; +package cn.odboy.core.job; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/QuartzJobService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/job/QuartzJobService.java similarity index 90% rename from cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/QuartzJobService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/job/QuartzJobService.java index af7f9727..d0b00796 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/QuartzJobService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/job/QuartzJobService.java @@ -1,10 +1,10 @@ -package cn.odboy.application.job.service; +package cn.odboy.core.service.job; import cn.odboy.base.PageResult; -import cn.odboy.model.job.domain.QuartzJob; -import cn.odboy.model.job.domain.QuartzLog; -import cn.odboy.model.job.request.UpdateQuartzJobRequest; -import cn.odboy.model.job.request.QueryQuartzJobRequest; +import cn.odboy.core.service.job.dto.QueryQuartzJobRequest; +import cn.odboy.core.service.job.dto.UpdateQuartzJobRequest; +import cn.odboy.core.dal.dataobject.job.QuartzJob; +import cn.odboy.core.dal.dataobject.job.QuartzLog; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletResponse; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/QueryQuartzJobRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/job/dto/QueryQuartzJobRequest.java similarity index 93% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/QueryQuartzJobRequest.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/job/dto/QueryQuartzJobRequest.java index 9f8d6f0c..1fc1c5d8 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/QueryQuartzJobRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/job/dto/QueryQuartzJobRequest.java @@ -1,4 +1,4 @@ -package cn.odboy.model.job.request; +package cn.odboy.core.service.job.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/UpdateQuartzJobRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/job/dto/UpdateQuartzJobRequest.java similarity index 94% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/UpdateQuartzJobRequest.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/job/dto/UpdateQuartzJobRequest.java index 126224ed..5f07cf21 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/UpdateQuartzJobRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/job/dto/UpdateQuartzJobRequest.java @@ -1,4 +1,4 @@ -package cn.odboy.model.job.request; +package cn.odboy.core.service.job.dto; import cn.odboy.base.MyObject; import lombok.Data; diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/job/impl/QuartzJobServiceImpl.java similarity index 93% rename from cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/job/impl/QuartzJobServiceImpl.java index f67d7cf6..d3157d96 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/job/impl/QuartzJobServiceImpl.java @@ -1,18 +1,18 @@ -package cn.odboy.application.job.service.impl; +package cn.odboy.core.service.job.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import cn.odboy.application.job.context.QuartzManage; -import cn.odboy.application.job.mapper.QuartzJobMapper; -import cn.odboy.application.job.mapper.QuartzLogMapper; -import cn.odboy.application.job.service.QuartzJobService; import cn.odboy.base.PageResult; +import cn.odboy.core.service.job.dto.QueryQuartzJobRequest; +import cn.odboy.core.service.job.dto.UpdateQuartzJobRequest; +import cn.odboy.core.dal.dataobject.job.QuartzJob; +import cn.odboy.core.dal.dataobject.job.QuartzLog; +import cn.odboy.core.dal.mysql.job.QuartzJobMapper; +import cn.odboy.core.dal.mysql.job.QuartzLogMapper; +import cn.odboy.core.framework.quartz.context.QuartzManage; +import cn.odboy.core.service.job.QuartzJobService; import cn.odboy.exception.BadRequestException; -import cn.odboy.model.job.domain.QuartzJob; -import cn.odboy.model.job.domain.QuartzLog; -import cn.odboy.model.job.request.QueryQuartzJobRequest; -import cn.odboy.model.job.request.UpdateQuartzJobRequest; import cn.odboy.redis.RedisHelper; import cn.odboy.util.FileUtil; import cn.odboy.util.PageUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DataService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/DataService.java similarity index 73% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DataService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/DataService.java index c2009d90..fe846acf 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DataService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/DataService.java @@ -1,7 +1,7 @@ -package cn.odboy.application.system.service; +package cn.odboy.core.service.system; -import cn.odboy.model.system.domain.User; +import cn.odboy.core.dal.dataobject.system.User; import java.util.List; /** diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DeptService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/DeptService.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DeptService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/DeptService.java index cacf1516..849c518e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DeptService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/DeptService.java @@ -1,9 +1,9 @@ -package cn.odboy.application.system.service; +package cn.odboy.core.service.system; import cn.odboy.base.BaseResult; -import cn.odboy.model.system.domain.Dept; -import cn.odboy.model.system.request.CreateDeptRequest; -import cn.odboy.model.system.request.QueryDeptRequest; +import cn.odboy.core.service.system.dto.CreateDeptRequest; +import cn.odboy.core.service.system.dto.QueryDeptRequest; +import cn.odboy.core.dal.dataobject.system.Dept; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictDetailService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/DictDetailService.java similarity index 81% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictDetailService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/DictDetailService.java index 5389fc1b..bbe2e55d 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictDetailService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/DictDetailService.java @@ -1,9 +1,9 @@ -package cn.odboy.application.system.service; +package cn.odboy.core.service.system; import cn.odboy.base.PageResult; -import cn.odboy.model.system.domain.DictDetail; -import cn.odboy.model.system.request.CreateDictDetailRequest; -import cn.odboy.model.system.request.QueryDictDetailRequest; +import cn.odboy.core.service.system.dto.CreateDictDetailRequest; +import cn.odboy.core.service.system.dto.QueryDictDetailRequest; +import cn.odboy.core.dal.dataobject.system.DictDetail; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/DictService.java similarity index 86% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/DictService.java index 720c50ef..15de1ee5 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/DictService.java @@ -1,9 +1,9 @@ -package cn.odboy.application.system.service; +package cn.odboy.core.service.system; import cn.odboy.base.PageResult; -import cn.odboy.model.system.domain.Dict; -import cn.odboy.model.system.request.CreateDictRequest; -import cn.odboy.model.system.request.QueryDictRequest; +import cn.odboy.core.service.system.dto.CreateDictRequest; +import cn.odboy.core.service.system.dto.QueryDictRequest; +import cn.odboy.core.dal.dataobject.system.Dict; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletResponse; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/JobService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/JobService.java similarity index 88% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/JobService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/JobService.java index 08356a54..6b209360 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/JobService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/JobService.java @@ -1,9 +1,9 @@ -package cn.odboy.application.system.service; +package cn.odboy.core.service.system; import cn.odboy.base.PageResult; -import cn.odboy.model.system.domain.Job; -import cn.odboy.model.system.request.CreateJobRequest; -import cn.odboy.model.system.request.QueryJobRequest; +import cn.odboy.core.service.system.dto.CreateJobRequest; +import cn.odboy.core.service.system.dto.QueryJobRequest; +import cn.odboy.core.dal.dataobject.system.Job; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletResponse; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/MenuService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/MenuService.java similarity index 91% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/MenuService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/MenuService.java index f6d80f06..11925880 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/MenuService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/MenuService.java @@ -1,8 +1,8 @@ -package cn.odboy.application.system.service; +package cn.odboy.core.service.system; -import cn.odboy.model.system.domain.Menu; -import cn.odboy.model.system.request.QueryMenuRequest; -import cn.odboy.model.system.response.MenuResponse; +import cn.odboy.core.service.system.dto.QueryMenuRequest; +import cn.odboy.core.dal.dataobject.system.Menu; +import cn.odboy.core.dal.dataobject.system.MenuResponse; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/MonitorService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/MonitorService.java similarity index 82% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/MonitorService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/MonitorService.java index 3b67d05e..f2f22e3e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/MonitorService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/MonitorService.java @@ -1,4 +1,4 @@ -package cn.odboy.application.system.service; +package cn.odboy.core.service.system; import java.util.Map; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/RoleService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/RoleService.java similarity index 88% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/RoleService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/RoleService.java index fa1ba2dd..e00c34c6 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/RoleService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/RoleService.java @@ -1,11 +1,11 @@ -package cn.odboy.application.system.service; +package cn.odboy.core.service.system; import cn.odboy.base.PageResult; -import cn.odboy.model.system.domain.Role; -import cn.odboy.model.system.domain.User; -import cn.odboy.model.system.model.RoleCodeVo; -import cn.odboy.model.system.request.CreateRoleRequest; -import cn.odboy.model.system.request.QueryRoleRequest; +import cn.odboy.core.service.system.dto.CreateRoleRequest; +import cn.odboy.core.service.system.dto.QueryRoleRequest; +import cn.odboy.core.service.system.dto.RoleCodeVo; +import cn.odboy.core.dal.dataobject.system.Role; +import cn.odboy.core.dal.dataobject.system.User; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletResponse; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/UserCacheService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/UserCacheService.java similarity index 87% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/UserCacheService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/UserCacheService.java index 93063a67..a1a0f79a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/UserCacheService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/UserCacheService.java @@ -1,6 +1,6 @@ -package cn.odboy.application.core.service; +package cn.odboy.core.service.system; -import cn.odboy.model.system.model.UserJwtVo; +import cn.odboy.core.service.system.dto.UserJwtVo; import org.springframework.scheduling.annotation.Async; public interface UserCacheService { diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/UserOnlineService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/UserOnlineService.java similarity index 88% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/UserOnlineService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/UserOnlineService.java index eec99b65..a05e3b41 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/UserOnlineService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/UserOnlineService.java @@ -1,8 +1,8 @@ -package cn.odboy.application.core.service; +package cn.odboy.core.service.system; import cn.odboy.base.PageResult; -import cn.odboy.model.system.model.UserJwtVo; -import cn.odboy.model.system.model.UserOnlineVo; +import cn.odboy.core.service.system.dto.UserJwtVo; +import cn.odboy.core.service.system.dto.UserOnlineVo; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -14,8 +14,8 @@ public interface UserOnlineService { * 保存在线用户信息 * * @param userJwtVo / - * @param token / - * @param request / + * @param token / + * @param request / */ void saveUserJwtModelByToken(UserJwtVo userJwtVo, String token, HttpServletRequest request); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/UserService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/UserService.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/UserService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/UserService.java index 3b2d5279..24caaa29 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/UserService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/UserService.java @@ -1,8 +1,8 @@ -package cn.odboy.application.system.service; +package cn.odboy.core.service.system; import cn.odboy.base.PageResult; -import cn.odboy.model.system.domain.User; -import cn.odboy.model.system.request.QueryUserRequest; +import cn.odboy.core.service.system.dto.QueryUserRequest; +import cn.odboy.core.dal.dataobject.system.User; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.web.multipart.MultipartFile; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDeptRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/CreateDeptRequest.java similarity index 92% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDeptRequest.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/CreateDeptRequest.java index 15d26385..1b7cfa93 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDeptRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/CreateDeptRequest.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.request; +package cn.odboy.core.service.system.dto; import cn.odboy.base.MyObject; import lombok.Data; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDictDetailRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/CreateDictDetailRequest.java similarity index 86% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDictDetailRequest.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/CreateDictDetailRequest.java index 6db9a707..d8ad9b88 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDictDetailRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/CreateDictDetailRequest.java @@ -1,7 +1,7 @@ -package cn.odboy.model.system.request; +package cn.odboy.core.service.system.dto; import cn.odboy.base.MyObject; -import cn.odboy.model.system.domain.Dict; +import cn.odboy.core.dal.dataobject.system.Dict; import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDictRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/CreateDictRequest.java similarity index 88% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDictRequest.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/CreateDictRequest.java index 2a8b3778..5c9cd19d 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDictRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/CreateDictRequest.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.request; +package cn.odboy.core.service.system.dto; import cn.odboy.base.MyObject; import lombok.Data; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateJobRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/CreateJobRequest.java similarity index 91% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateJobRequest.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/CreateJobRequest.java index ff228b67..e779709c 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateJobRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/CreateJobRequest.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.request; +package cn.odboy.core.service.system.dto; import cn.odboy.base.MyObject; import lombok.Data; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateRoleRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/CreateRoleRequest.java similarity index 87% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateRoleRequest.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/CreateRoleRequest.java index 48f69a31..68ad4edd 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateRoleRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/CreateRoleRequest.java @@ -1,7 +1,7 @@ -package cn.odboy.model.system.request; +package cn.odboy.core.service.system.dto; import cn.odboy.base.MyObject; -import cn.odboy.model.system.domain.Dept; +import cn.odboy.core.dal.dataobject.system.Dept; import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/model/MenuMetaVo.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/MenuMetaVo.java similarity index 92% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/model/MenuMetaVo.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/MenuMetaVo.java index 2d9fd0bc..b589624f 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/model/MenuMetaVo.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/MenuMetaVo.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.model; +package cn.odboy.core.service.system.dto; import cn.odboy.base.MyObject; import io.swagger.annotations.ApiModelProperty; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryDeptRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryDeptRequest.java similarity index 93% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryDeptRequest.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryDeptRequest.java index 7e2aa5a9..2079734d 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryDeptRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryDeptRequest.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.request; +package cn.odboy.core.service.system.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryDictDetailRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryDictDetailRequest.java similarity index 91% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryDictDetailRequest.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryDictDetailRequest.java index 5e1715c8..1c246dca 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryDictDetailRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryDictDetailRequest.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.request; +package cn.odboy.core.service.system.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryDictRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryDictRequest.java similarity index 89% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryDictRequest.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryDictRequest.java index 95acabe1..5dc3607e 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryDictRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryDictRequest.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.request; +package cn.odboy.core.service.system.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryJobRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryJobRequest.java similarity index 93% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryJobRequest.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryJobRequest.java index 3d1e8230..301b3975 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryJobRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryJobRequest.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.request; +package cn.odboy.core.service.system.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryMenuRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryMenuRequest.java similarity index 91% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryMenuRequest.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryMenuRequest.java index d43dbdbb..2fd473c8 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryMenuRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryMenuRequest.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.request; +package cn.odboy.core.service.system.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryRoleRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryRoleRequest.java similarity index 93% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryRoleRequest.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryRoleRequest.java index 142ad6d0..5efda8d7 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryRoleRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryRoleRequest.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.request; +package cn.odboy.core.service.system.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryUserRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryUserRequest.java similarity index 96% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryUserRequest.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryUserRequest.java index 2aec7b31..6b84699c 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryUserRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryUserRequest.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.request; +package cn.odboy.core.service.system.dto; import cn.odboy.base.MyObject; import io.swagger.annotations.ApiModelProperty; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/model/RoleCodeVo.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/RoleCodeVo.java similarity index 90% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/model/RoleCodeVo.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/RoleCodeVo.java index 05bb4edc..6587ffce 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/model/RoleCodeVo.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/RoleCodeVo.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.model; +package cn.odboy.core.service.system.dto; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/model/SimpleUserVo.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/SimpleUserVo.java similarity index 86% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/model/SimpleUserVo.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/SimpleUserVo.java index 18913dad..0512557c 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/model/SimpleUserVo.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/SimpleUserVo.java @@ -1,9 +1,9 @@ -package cn.odboy.model.system.model; +package cn.odboy.core.service.system.dto; import cn.odboy.base.MyObject; -import cn.odboy.model.system.domain.Dept; -import cn.odboy.model.system.domain.Job; -import cn.odboy.model.system.domain.Role; +import cn.odboy.core.dal.dataobject.system.Dept; +import cn.odboy.core.dal.dataobject.system.Job; +import cn.odboy.core.dal.dataobject.system.Role; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/model/UserJwtVo.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/UserJwtVo.java similarity index 94% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/model/UserJwtVo.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/UserJwtVo.java index 5947a05d..f23f2f68 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/model/UserJwtVo.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/UserJwtVo.java @@ -1,6 +1,6 @@ -package cn.odboy.model.system.model; +package cn.odboy.core.service.system.dto; -import cn.odboy.model.system.domain.User; +import cn.odboy.core.dal.dataobject.system.User; import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/UserLoginRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/UserLoginRequest.java similarity index 92% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/UserLoginRequest.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/UserLoginRequest.java index ee6dcfa2..53260c91 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/UserLoginRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/UserLoginRequest.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.request; +package cn.odboy.core.service.system.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/model/UserOnlineVo.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/UserOnlineVo.java similarity index 94% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/model/UserOnlineVo.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/UserOnlineVo.java index 98d6b8f1..99b1f60a 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/model/UserOnlineVo.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/UserOnlineVo.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.model; +package cn.odboy.core.service.system.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DataServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/DataServiceImpl.java similarity index 85% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DataServiceImpl.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/DataServiceImpl.java index 521c7231..3d170735 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DataServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/DataServiceImpl.java @@ -1,14 +1,14 @@ -package cn.odboy.application.system.service.impl; +package cn.odboy.core.service.system.impl; import cn.hutool.core.collection.CollUtil; -import cn.odboy.application.system.service.DataService; -import cn.odboy.application.system.service.DeptService; -import cn.odboy.application.system.service.RoleService; -import cn.odboy.constant.DataScopeEnum; -import cn.odboy.constant.SystemRedisKey; -import cn.odboy.model.system.domain.Dept; -import cn.odboy.model.system.domain.Role; -import cn.odboy.model.system.domain.User; +import cn.odboy.core.constant.DataScopeEnum; +import cn.odboy.core.constant.SystemRedisKey; +import cn.odboy.core.dal.dataobject.system.Dept; +import cn.odboy.core.dal.dataobject.system.Role; +import cn.odboy.core.dal.dataobject.system.User; +import cn.odboy.core.service.system.DataService; +import cn.odboy.core.service.system.DeptService; +import cn.odboy.core.service.system.RoleService; import cn.odboy.redis.RedisHelper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DeptServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/DeptServiceImpl.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DeptServiceImpl.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/DeptServiceImpl.java index dd4428c1..c96b011a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DeptServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/DeptServiceImpl.java @@ -1,22 +1,22 @@ -package cn.odboy.application.system.service.impl; +package cn.odboy.core.service.system.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; -import cn.odboy.application.system.mapper.DeptMapper; -import cn.odboy.application.system.mapper.RoleMapper; -import cn.odboy.application.system.mapper.UserMapper; -import cn.odboy.application.system.service.DeptService; import cn.odboy.base.BaseResult; -import cn.odboy.constant.DataScopeEnum; -import cn.odboy.constant.SystemRedisKey; -import cn.odboy.context.SecurityHelper; +import cn.odboy.core.constant.DataScopeEnum; +import cn.odboy.core.constant.SystemRedisKey; +import cn.odboy.core.framework.permission.util.SecurityHelper; +import cn.odboy.core.service.system.dto.CreateDeptRequest; +import cn.odboy.core.service.system.dto.QueryDeptRequest; +import cn.odboy.core.dal.dataobject.system.Dept; +import cn.odboy.core.dal.dataobject.system.User; +import cn.odboy.core.dal.mysql.system.DeptMapper; +import cn.odboy.core.dal.mysql.system.RoleMapper; +import cn.odboy.core.dal.mysql.system.UserMapper; +import cn.odboy.core.service.system.DeptService; import cn.odboy.exception.BadRequestException; -import cn.odboy.model.system.domain.Dept; -import cn.odboy.model.system.domain.User; -import cn.odboy.model.system.request.CreateDeptRequest; -import cn.odboy.model.system.request.QueryDeptRequest; import cn.odboy.redis.RedisHelper; import cn.odboy.util.ClassUtil; import cn.odboy.util.FileUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictDetailServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/DictDetailServiceImpl.java similarity index 84% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictDetailServiceImpl.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/DictDetailServiceImpl.java index 912dd741..e05bf891 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictDetailServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/DictDetailServiceImpl.java @@ -1,16 +1,16 @@ -package cn.odboy.application.system.service.impl; +package cn.odboy.core.service.system.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.odboy.application.system.mapper.DictDetailMapper; -import cn.odboy.application.system.mapper.DictMapper; -import cn.odboy.application.system.service.DictDetailService; import cn.odboy.base.PageResult; -import cn.odboy.constant.SystemRedisKey; -import cn.odboy.model.system.domain.Dict; -import cn.odboy.model.system.domain.DictDetail; -import cn.odboy.model.system.request.CreateDictDetailRequest; -import cn.odboy.model.system.request.QueryDictDetailRequest; +import cn.odboy.core.constant.SystemRedisKey; +import cn.odboy.core.service.system.dto.CreateDictDetailRequest; +import cn.odboy.core.service.system.dto.QueryDictDetailRequest; +import cn.odboy.core.dal.dataobject.system.Dict; +import cn.odboy.core.dal.dataobject.system.DictDetail; +import cn.odboy.core.dal.mysql.system.DictDetailMapper; +import cn.odboy.core.dal.mysql.system.DictMapper; +import cn.odboy.core.service.system.DictDetailService; import cn.odboy.redis.RedisHelper; import cn.odboy.util.PageUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/DictServiceImpl.java similarity index 89% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictServiceImpl.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/DictServiceImpl.java index d9fea3dd..deb09dcd 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/DictServiceImpl.java @@ -1,16 +1,16 @@ -package cn.odboy.application.system.service.impl; +package cn.odboy.core.service.system.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import cn.odboy.application.system.mapper.DictDetailMapper; -import cn.odboy.application.system.mapper.DictMapper; -import cn.odboy.application.system.service.DictService; import cn.odboy.base.PageResult; -import cn.odboy.constant.SystemRedisKey; -import cn.odboy.model.system.domain.Dict; -import cn.odboy.model.system.domain.DictDetail; -import cn.odboy.model.system.request.CreateDictRequest; -import cn.odboy.model.system.request.QueryDictRequest; +import cn.odboy.core.constant.SystemRedisKey; +import cn.odboy.core.service.system.dto.CreateDictRequest; +import cn.odboy.core.service.system.dto.QueryDictRequest; +import cn.odboy.core.dal.dataobject.system.Dict; +import cn.odboy.core.dal.dataobject.system.DictDetail; +import cn.odboy.core.dal.mysql.system.DictDetailMapper; +import cn.odboy.core.dal.mysql.system.DictMapper; +import cn.odboy.core.service.system.DictService; import cn.odboy.redis.RedisHelper; import cn.odboy.util.FileUtil; import cn.odboy.util.PageUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/JobServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/JobServiceImpl.java similarity index 90% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/JobServiceImpl.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/JobServiceImpl.java index 4e1984a5..986bdca0 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/JobServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/JobServiceImpl.java @@ -1,16 +1,16 @@ -package cn.odboy.application.system.service.impl; +package cn.odboy.core.service.system.impl; import cn.hutool.core.bean.BeanUtil; -import cn.odboy.application.system.mapper.JobMapper; -import cn.odboy.application.system.mapper.UserMapper; -import cn.odboy.application.system.service.JobService; import cn.odboy.base.PageResult; -import cn.odboy.constant.SystemRedisKey; +import cn.odboy.core.constant.SystemRedisKey; +import cn.odboy.core.service.system.dto.CreateJobRequest; +import cn.odboy.core.service.system.dto.QueryJobRequest; +import cn.odboy.core.dal.dataobject.system.Job; +import cn.odboy.core.dal.mysql.system.JobMapper; +import cn.odboy.core.dal.mysql.system.UserMapper; +import cn.odboy.core.service.system.JobService; import cn.odboy.exception.BadRequestException; import cn.odboy.exception.EntityExistException; -import cn.odboy.model.system.domain.Job; -import cn.odboy.model.system.request.CreateJobRequest; -import cn.odboy.model.system.request.QueryJobRequest; import cn.odboy.redis.RedisHelper; import cn.odboy.util.FileUtil; import cn.odboy.util.PageUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MenuServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/MenuServiceImpl.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MenuServiceImpl.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/MenuServiceImpl.java index ff328f43..1e052c68 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MenuServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/MenuServiceImpl.java @@ -1,23 +1,23 @@ -package cn.odboy.application.system.service.impl; +package cn.odboy.core.service.system.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; -import cn.odboy.application.system.mapper.MenuMapper; -import cn.odboy.application.system.mapper.RoleMenuMapper; -import cn.odboy.application.system.mapper.UserMapper; -import cn.odboy.application.system.service.MenuService; -import cn.odboy.application.system.service.RoleService; -import cn.odboy.constant.SystemRedisKey; -import cn.odboy.constant.TransferProtocolConst; +import cn.odboy.core.constant.SystemRedisKey; +import cn.odboy.core.constant.TransferProtocolConst; +import cn.odboy.core.service.system.dto.MenuMetaVo; +import cn.odboy.core.service.system.dto.QueryMenuRequest; +import cn.odboy.core.dal.dataobject.system.Menu; +import cn.odboy.core.dal.dataobject.system.MenuResponse; +import cn.odboy.core.dal.dataobject.system.Role; +import cn.odboy.core.dal.dataobject.system.User; +import cn.odboy.core.dal.mysql.system.MenuMapper; +import cn.odboy.core.dal.mysql.system.RoleMenuMapper; +import cn.odboy.core.dal.mysql.system.UserMapper; +import cn.odboy.core.service.system.MenuService; +import cn.odboy.core.service.system.RoleService; import cn.odboy.exception.BadRequestException; import cn.odboy.exception.EntityExistException; -import cn.odboy.model.system.domain.Menu; -import cn.odboy.model.system.domain.Role; -import cn.odboy.model.system.domain.User; -import cn.odboy.model.system.model.MenuMetaVo; -import cn.odboy.model.system.request.QueryMenuRequest; -import cn.odboy.model.system.response.MenuResponse; import cn.odboy.redis.RedisHelper; import cn.odboy.util.ClassUtil; import cn.odboy.util.FileUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MonitorServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/MonitorServiceImpl.java similarity index 98% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MonitorServiceImpl.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/MonitorServiceImpl.java index e6705e22..45904b98 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MonitorServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/MonitorServiceImpl.java @@ -1,9 +1,9 @@ -package cn.odboy.application.system.service.impl; +package cn.odboy.core.service.system.impl; import cn.hutool.core.date.BetweenFormatter.Level; import cn.hutool.core.date.DateUtil; -import cn.odboy.application.system.service.MonitorService; import cn.odboy.constant.SystemConst; +import cn.odboy.core.service.system.MonitorService; import cn.odboy.util.FileUtil; import cn.odboy.util.IpUtil; import lombok.extern.slf4j.Slf4j; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/RoleServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/RoleServiceImpl.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/RoleServiceImpl.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/RoleServiceImpl.java index c760c10d..b5c5d163 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/RoleServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/RoleServiceImpl.java @@ -1,24 +1,24 @@ -package cn.odboy.application.system.service.impl; +package cn.odboy.core.service.system.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; -import cn.odboy.application.core.service.UserCacheService; -import cn.odboy.application.system.mapper.RoleDeptMapper; -import cn.odboy.application.system.mapper.RoleMapper; -import cn.odboy.application.system.mapper.RoleMenuMapper; -import cn.odboy.application.system.mapper.UserMapper; -import cn.odboy.application.system.service.RoleService; import cn.odboy.base.PageResult; -import cn.odboy.constant.SystemRedisKey; +import cn.odboy.core.constant.SystemRedisKey; +import cn.odboy.core.service.system.dto.CreateRoleRequest; +import cn.odboy.core.service.system.dto.QueryRoleRequest; +import cn.odboy.core.service.system.dto.RoleCodeVo; +import cn.odboy.core.dal.dataobject.system.Menu; +import cn.odboy.core.dal.dataobject.system.Role; +import cn.odboy.core.dal.dataobject.system.User; +import cn.odboy.core.dal.mysql.system.RoleDeptMapper; +import cn.odboy.core.dal.mysql.system.RoleMapper; +import cn.odboy.core.dal.mysql.system.RoleMenuMapper; +import cn.odboy.core.dal.mysql.system.UserMapper; +import cn.odboy.core.service.system.RoleService; +import cn.odboy.core.service.system.UserCacheService; import cn.odboy.exception.BadRequestException; import cn.odboy.exception.EntityExistException; -import cn.odboy.model.system.domain.Menu; -import cn.odboy.model.system.domain.Role; -import cn.odboy.model.system.domain.User; -import cn.odboy.model.system.model.RoleCodeVo; -import cn.odboy.model.system.request.CreateRoleRequest; -import cn.odboy.model.system.request.QueryRoleRequest; import cn.odboy.redis.RedisHelper; import cn.odboy.util.FileUtil; import cn.odboy.util.PageUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserCacheServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/UserCacheServiceImpl.java similarity index 88% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserCacheServiceImpl.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/UserCacheServiceImpl.java index e3b2e219..baa0f68b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserCacheServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/UserCacheServiceImpl.java @@ -1,9 +1,9 @@ -package cn.odboy.application.core.service.impl; +package cn.odboy.core.service.system.impl; import cn.hutool.core.util.RandomUtil; -import cn.odboy.application.core.service.UserCacheService; -import cn.odboy.constant.SystemRedisKey; -import cn.odboy.model.system.model.UserJwtVo; +import cn.odboy.core.constant.SystemRedisKey; +import cn.odboy.core.service.system.dto.UserJwtVo; +import cn.odboy.core.service.system.UserCacheService; import cn.odboy.redis.RedisHelper; import cn.odboy.util.StringUtil; import org.springframework.stereotype.Service; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserDetailsServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/UserDetailsServiceImpl.java similarity index 79% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserDetailsServiceImpl.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/UserDetailsServiceImpl.java index d6b71f50..b4010bcb 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserDetailsServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/UserDetailsServiceImpl.java @@ -1,13 +1,13 @@ -package cn.odboy.application.core.service.impl; +package cn.odboy.core.service.system.impl; -import cn.odboy.application.core.service.UserCacheService; -import cn.odboy.application.system.service.DataService; -import cn.odboy.application.system.service.RoleService; -import cn.odboy.application.system.service.UserService; +import cn.odboy.core.service.system.dto.RoleCodeVo; +import cn.odboy.core.service.system.dto.UserJwtVo; +import cn.odboy.core.dal.dataobject.system.User; +import cn.odboy.core.service.system.DataService; +import cn.odboy.core.service.system.RoleService; +import cn.odboy.core.service.system.UserCacheService; +import cn.odboy.core.service.system.UserService; import cn.odboy.exception.BadRequestException; -import cn.odboy.model.system.domain.User; -import cn.odboy.model.system.model.RoleCodeVo; -import cn.odboy.model.system.model.UserJwtVo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserOnlineServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/UserOnlineServiceImpl.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserOnlineServiceImpl.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/UserOnlineServiceImpl.java index ce8e1c5c..a637da70 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserOnlineServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/UserOnlineServiceImpl.java @@ -1,12 +1,12 @@ -package cn.odboy.application.core.service.impl; +package cn.odboy.core.service.system.impl; -import cn.odboy.application.core.context.TokenProvider; -import cn.odboy.application.core.service.UserOnlineService; import cn.odboy.base.PageResult; -import cn.odboy.config.AppProperties; -import cn.odboy.constant.SystemRedisKey; -import cn.odboy.model.system.model.UserJwtVo; -import cn.odboy.model.system.model.UserOnlineVo; +import cn.odboy.core.framework.properties.AppProperties; +import cn.odboy.core.constant.SystemRedisKey; +import cn.odboy.core.service.system.dto.UserJwtVo; +import cn.odboy.core.service.system.dto.UserOnlineVo; +import cn.odboy.core.framework.permission.TokenProvider; +import cn.odboy.core.service.system.UserOnlineService; import cn.odboy.redis.RedisHelper; import cn.odboy.util.BrowserUtil; import cn.odboy.util.DesEncryptUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/UserServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/UserServiceImpl.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/UserServiceImpl.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/UserServiceImpl.java index 9c2fc73c..546c0d80 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/UserServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/UserServiceImpl.java @@ -1,21 +1,21 @@ -package cn.odboy.application.system.service.impl; +package cn.odboy.core.service.system.impl; -import cn.odboy.application.core.service.UserCacheService; -import cn.odboy.application.core.service.UserOnlineService; -import cn.odboy.application.system.mapper.UserJobMapper; -import cn.odboy.application.system.mapper.UserMapper; -import cn.odboy.application.system.mapper.UserRoleMapper; -import cn.odboy.application.system.service.UserService; import cn.odboy.base.PageResult; -import cn.odboy.config.AppProperties; -import cn.odboy.constant.SystemRedisKey; -import cn.odboy.context.SecurityHelper; +import cn.odboy.core.framework.properties.AppProperties; +import cn.odboy.core.constant.SystemRedisKey; +import cn.odboy.core.framework.permission.util.SecurityHelper; +import cn.odboy.core.service.system.dto.QueryUserRequest; +import cn.odboy.core.dal.dataobject.system.Job; +import cn.odboy.core.dal.dataobject.system.Role; +import cn.odboy.core.dal.dataobject.system.User; +import cn.odboy.core.dal.mysql.system.UserJobMapper; +import cn.odboy.core.dal.mysql.system.UserMapper; +import cn.odboy.core.dal.mysql.system.UserRoleMapper; +import cn.odboy.core.service.system.UserCacheService; +import cn.odboy.core.service.system.UserOnlineService; +import cn.odboy.core.service.system.UserService; import cn.odboy.exception.BadRequestException; import cn.odboy.exception.EntityExistException; -import cn.odboy.model.system.domain.Job; -import cn.odboy.model.system.domain.Role; -import cn.odboy.model.system.domain.User; -import cn.odboy.model.system.request.QueryUserRequest; import cn.odboy.redis.RedisHelper; import cn.odboy.util.FileUtil; import cn.odboy.util.PageUtil; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/CaptchaService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/CaptchaService.java similarity index 78% rename from cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/CaptchaService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/CaptchaService.java index f1c9e130..c9854ea1 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/CaptchaService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/CaptchaService.java @@ -1,7 +1,7 @@ -package cn.odboy.application.tools.service; +package cn.odboy.core.service.tools; -import cn.odboy.model.tools.request.SendEmailRequest; +import cn.odboy.core.service.tools.dto.SendEmailRequest; public interface CaptchaService { /** diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/EmailService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/EmailService.java similarity index 80% rename from cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/EmailService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/EmailService.java index f2f21e6e..fc9f569c 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/EmailService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/EmailService.java @@ -1,7 +1,7 @@ -package cn.odboy.application.tools.service; +package cn.odboy.core.service.tools; -import cn.odboy.model.tools.domain.EmailConfig; -import cn.odboy.model.tools.request.SendEmailRequest; +import cn.odboy.core.service.tools.dto.SendEmailRequest; +import cn.odboy.core.dal.dataobject.tools.EmailConfig; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/LocalStorageService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/LocalStorageService.java similarity index 90% rename from cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/LocalStorageService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/LocalStorageService.java index ba83cad5..7f144968 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/LocalStorageService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/LocalStorageService.java @@ -1,8 +1,8 @@ -package cn.odboy.application.tools.service; +package cn.odboy.core.service.tools; import cn.odboy.base.PageResult; -import cn.odboy.model.tools.domain.LocalStorage; -import cn.odboy.model.tools.request.QueryLocalStorageRequest; +import cn.odboy.core.service.tools.dto.QueryLocalStorageRequest; +import cn.odboy.core.dal.dataobject.tools.LocalStorage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.web.multipart.MultipartFile; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/QiniuConfigService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/QiniuConfigService.java similarity index 83% rename from cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/QiniuConfigService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/QiniuConfigService.java index d1543b52..a7eebef2 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/QiniuConfigService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/QiniuConfigService.java @@ -1,6 +1,6 @@ -package cn.odboy.application.tools.service; +package cn.odboy.core.service.tools; -import cn.odboy.model.tools.domain.QiniuConfig; +import cn.odboy.core.dal.dataobject.tools.QiniuConfig; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/QiniuContentService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/QiniuContentService.java similarity index 91% rename from cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/QiniuContentService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/QiniuContentService.java index 2596ffb4..200a4ece 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/QiniuContentService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/QiniuContentService.java @@ -1,8 +1,8 @@ -package cn.odboy.application.tools.service; +package cn.odboy.core.service.tools; import cn.odboy.base.PageResult; -import cn.odboy.model.tools.domain.QiniuContent; -import cn.odboy.model.tools.request.QueryQiniuRequest; +import cn.odboy.core.service.tools.dto.QueryQiniuRequest; +import cn.odboy.core.dal.dataobject.tools.QiniuContent; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.web.multipart.MultipartFile; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QueryLocalStorageRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/QueryLocalStorageRequest.java similarity index 92% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QueryLocalStorageRequest.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/QueryLocalStorageRequest.java index 4e5218c1..6115ee38 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QueryLocalStorageRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/QueryLocalStorageRequest.java @@ -1,4 +1,4 @@ -package cn.odboy.model.tools.request; +package cn.odboy.core.service.tools.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QueryQiniuRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/QueryQiniuRequest.java similarity index 92% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QueryQiniuRequest.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/QueryQiniuRequest.java index 0d2c71c7..96052f94 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QueryQiniuRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/QueryQiniuRequest.java @@ -1,4 +1,4 @@ -package cn.odboy.model.tools.request; +package cn.odboy.core.service.tools.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/SendEmailRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/SendEmailRequest.java similarity index 93% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/SendEmailRequest.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/SendEmailRequest.java index eae21867..4991704e 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/SendEmailRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/SendEmailRequest.java @@ -1,4 +1,4 @@ -package cn.odboy.model.tools.request; +package cn.odboy.core.service.tools.dto; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/CaptchaServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/impl/CaptchaServiceImpl.java similarity index 93% rename from cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/CaptchaServiceImpl.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/impl/CaptchaServiceImpl.java index 055f19d8..eadf7b4d 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/CaptchaServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/impl/CaptchaServiceImpl.java @@ -1,4 +1,4 @@ -package cn.odboy.application.tools.service.impl; +package cn.odboy.core.service.tools.impl; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.RandomUtil; @@ -6,9 +6,9 @@ import cn.hutool.extra.template.Template; import cn.hutool.extra.template.TemplateConfig; import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateUtil; -import cn.odboy.application.tools.service.CaptchaService; +import cn.odboy.core.service.tools.dto.SendEmailRequest; +import cn.odboy.core.service.tools.CaptchaService; import cn.odboy.exception.BadRequestException; -import cn.odboy.model.tools.request.SendEmailRequest; import cn.odboy.redis.RedisHelper; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/EmailServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/impl/EmailServiceImpl.java similarity index 91% rename from cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/EmailServiceImpl.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/impl/EmailServiceImpl.java index f1ac741a..f767fdc5 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/EmailServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/impl/EmailServiceImpl.java @@ -1,13 +1,13 @@ -package cn.odboy.application.tools.service.impl; +package cn.odboy.core.service.tools.impl; import cn.hutool.extra.mail.Mail; import cn.hutool.extra.mail.MailAccount; -import cn.odboy.application.tools.mapper.EmailConfigMapper; -import cn.odboy.application.tools.service.CaptchaService; -import cn.odboy.application.tools.service.EmailService; +import cn.odboy.core.service.tools.dto.SendEmailRequest; +import cn.odboy.core.dal.dataobject.tools.EmailConfig; +import cn.odboy.core.dal.mysql.tools.EmailConfigMapper; +import cn.odboy.core.service.tools.CaptchaService; +import cn.odboy.core.service.tools.EmailService; import cn.odboy.exception.BadRequestException; -import cn.odboy.model.tools.domain.EmailConfig; -import cn.odboy.model.tools.request.SendEmailRequest; import cn.odboy.util.DesEncryptUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/LocalStorageServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/impl/LocalStorageServiceImpl.java similarity index 92% rename from cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/LocalStorageServiceImpl.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/impl/LocalStorageServiceImpl.java index a61e6c9b..6ef7cffc 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/LocalStorageServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/impl/LocalStorageServiceImpl.java @@ -1,13 +1,13 @@ -package cn.odboy.application.tools.service.impl; +package cn.odboy.core.service.tools.impl; import cn.hutool.core.util.ObjectUtil; -import cn.odboy.application.tools.mapper.LocalStorageMapper; -import cn.odboy.application.tools.service.LocalStorageService; import cn.odboy.base.PageResult; -import cn.odboy.config.AppProperties; +import cn.odboy.core.framework.properties.AppProperties; +import cn.odboy.core.service.tools.dto.QueryLocalStorageRequest; +import cn.odboy.core.dal.dataobject.tools.LocalStorage; +import cn.odboy.core.dal.mysql.tools.LocalStorageMapper; +import cn.odboy.core.service.tools.LocalStorageService; import cn.odboy.exception.BadRequestException; -import cn.odboy.model.tools.domain.LocalStorage; -import cn.odboy.model.tools.request.QueryLocalStorageRequest; import cn.odboy.util.FileUtil; import cn.odboy.util.PageUtil; import cn.odboy.util.StringUtil; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/QiniuConfigServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/impl/QiniuConfigServiceImpl.java similarity index 85% rename from cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/QiniuConfigServiceImpl.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/impl/QiniuConfigServiceImpl.java index 43c7af6d..8f160798 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/QiniuConfigServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/impl/QiniuConfigServiceImpl.java @@ -1,10 +1,10 @@ -package cn.odboy.application.tools.service.impl; +package cn.odboy.core.service.tools.impl; -import cn.odboy.application.tools.mapper.QiniuConfigMapper; -import cn.odboy.application.tools.service.QiniuConfigService; -import cn.odboy.constant.TransferProtocolConst; +import cn.odboy.core.constant.TransferProtocolConst; +import cn.odboy.core.dal.dataobject.tools.QiniuConfig; +import cn.odboy.core.dal.mysql.tools.QiniuConfigMapper; +import cn.odboy.core.service.tools.QiniuConfigService; import cn.odboy.exception.BadRequestException; -import cn.odboy.model.tools.domain.QiniuConfig; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheConfig; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/QiniuContentServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/impl/QiniuContentServiceImpl.java similarity index 95% rename from cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/QiniuContentServiceImpl.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/impl/QiniuContentServiceImpl.java index a14f0cc1..97c4640c 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/QiniuContentServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/impl/QiniuContentServiceImpl.java @@ -1,14 +1,14 @@ -package cn.odboy.application.tools.service.impl; +package cn.odboy.core.service.tools.impl; -import cn.odboy.application.tools.mapper.QiniuContentMapper; -import cn.odboy.application.tools.service.QiniuConfigService; -import cn.odboy.application.tools.service.QiniuContentService; -import cn.odboy.application.tools.util.QiniuUtil; import cn.odboy.base.PageResult; +import cn.odboy.core.service.tools.dto.QueryQiniuRequest; +import cn.odboy.core.dal.dataobject.tools.QiniuConfig; +import cn.odboy.core.dal.dataobject.tools.QiniuContent; +import cn.odboy.core.dal.mysql.tools.QiniuContentMapper; +import cn.odboy.core.service.tools.QiniuConfigService; +import cn.odboy.core.service.tools.QiniuContentService; +import cn.odboy.core.util.QiniuUtil; import cn.odboy.exception.BadRequestException; -import cn.odboy.model.tools.domain.QiniuConfig; -import cn.odboy.model.tools.domain.QiniuContent; -import cn.odboy.model.tools.request.QueryQiniuRequest; import cn.odboy.util.FileUtil; import cn.odboy.util.PageUtil; import com.alibaba.fastjson2.JSON; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/util/QiniuUtil.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/util/QiniuUtil.java similarity index 96% rename from cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/util/QiniuUtil.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/util/QiniuUtil.java index 24141587..488c8573 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/util/QiniuUtil.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/util/QiniuUtil.java @@ -1,4 +1,4 @@ -package cn.odboy.application.tools.util; +package cn.odboy.core.util; import cn.odboy.util.FileUtil; import com.qiniu.storage.Region; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/SqlUtil.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/util/SqlUtil.java similarity index 97% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/SqlUtil.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/util/SqlUtil.java index 85794d4e..814fa2bc 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/SqlUtil.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/util/SqlUtil.java @@ -1,7 +1,8 @@ -package cn.odboy.util; +package cn.odboy.core.util; +import cn.odboy.core.framework.mybatisplus.constant.DataTypeEnum; import cn.odboy.exception.BadRequestException; -import cn.odboy.mybatis.constant.DataTypeEnum; +import cn.odboy.util.CloseUtil; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.google.common.collect.Lists; import com.zaxxer.hikari.HikariDataSource; diff --git a/cutejava/cutejava-job/src/main/resources/mapper/QuartzJobMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/job/QuartzJobMapper.xml similarity index 73% rename from cutejava/cutejava-job/src/main/resources/mapper/QuartzJobMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/job/QuartzJobMapper.xml index defd09d3..d7694043 100644 --- a/cutejava/cutejava-job/src/main/resources/mapper/QuartzJobMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/job/QuartzJobMapper.xml @@ -1,7 +1,7 @@ - - SELECT * FROM sys_quartz_job @@ -15,7 +15,7 @@ ORDER BY id DESC - SELECT * FROM sys_quartz_job WHERE is_pause = 0 diff --git a/cutejava/cutejava-job/src/main/resources/mapper/QuartzLogMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/job/QuartzLogMapper.xml similarity index 82% rename from cutejava/cutejava-job/src/main/resources/mapper/QuartzLogMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/job/QuartzLogMapper.xml index 42b3a3da..163bf1e6 100644 --- a/cutejava/cutejava-job/src/main/resources/mapper/QuartzLogMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/job/QuartzLogMapper.xml @@ -1,7 +1,7 @@ - - SELECT * FROM sys_quartz_log diff --git a/cutejava/cutejava-system/src/main/resources/mapper/DeptMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/system/DeptMapper.xml similarity index 93% rename from cutejava/cutejava-system/src/main/resources/mapper/DeptMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/system/DeptMapper.xml index 34127b51..fbbd3262 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/DeptMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/system/DeptMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -85,7 +85,7 @@ from sys_dept where pid is null - SELECT d.dept_id AS id, d.NAME, d.pid, diff --git a/cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/system/DictDetailMapper.xml similarity index 90% rename from cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/system/DictDetailMapper.xml index 4dc8bf51..7b23da9c 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/system/DictDetailMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -11,7 +11,7 @@ - + diff --git a/cutejava/cutejava-system/src/main/resources/mapper/DictMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/system/DictMapper.xml similarity index 78% rename from cutejava/cutejava-system/src/main/resources/mapper/DictMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/system/DictMapper.xml index 38d1bfc0..7dcc61e1 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/DictMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/system/DictMapper.xml @@ -1,7 +1,7 @@ - - SELECT * from sys_dict d diff --git a/cutejava/cutejava-system/src/main/resources/mapper/JobMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/system/JobMapper.xml similarity index 78% rename from cutejava/cutejava-system/src/main/resources/mapper/JobMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/system/JobMapper.xml index 5c012e5b..d31f9c4e 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/JobMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/system/JobMapper.xml @@ -1,12 +1,12 @@ - - select id from sys_job where name = #{name} - select * from sys_job diff --git a/cutejava/cutejava-system/src/main/resources/mapper/MenuMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/system/MenuMapper.xml similarity index 92% rename from cutejava/cutejava-system/src/main/resources/mapper/MenuMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/system/MenuMapper.xml index 1f970f08..09fac809 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/MenuMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/system/MenuMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -101,12 +101,12 @@ WHERE pid = #{pid} ORDER BY menu_sort - SELECT menu_id id FROM sys_menu WHERE title = #{title} - SELECT menu_id id FROM sys_menu WHERE name = #{name} diff --git a/cutejava/cutejava-system/src/main/resources/mapper/RoleDeptMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/system/RoleDeptMapper.xml similarity index 91% rename from cutejava/cutejava-system/src/main/resources/mapper/RoleDeptMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/system/RoleDeptMapper.xml index b948c5cc..70d0c510 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/RoleDeptMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/system/RoleDeptMapper.xml @@ -1,6 +1,6 @@ - + insert into sys_roles_depts (role_id, dept_id) values diff --git a/cutejava/cutejava-system/src/main/resources/mapper/RoleMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/system/RoleMapper.xml similarity index 91% rename from cutejava/cutejava-system/src/main/resources/mapper/RoleMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/system/RoleMapper.xml index be1673e6..32d00438 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/RoleMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/system/RoleMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -11,17 +11,17 @@ - + - + - select role_id as id, name, level from sys_role order by level @@ -73,7 +73,7 @@ - select role_id as id from sys_role where name = #{name} @@ -133,7 +133,7 @@ #{deptId} - SELECT role.role_id as id FROM sys_role role, sys_roles_menus rm diff --git a/cutejava/cutejava-system/src/main/resources/mapper/RoleMenuMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/system/RoleMenuMapper.xml similarity index 92% rename from cutejava/cutejava-system/src/main/resources/mapper/RoleMenuMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/system/RoleMenuMapper.xml index 19e68745..bdfbdde7 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/RoleMenuMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/system/RoleMenuMapper.xml @@ -1,6 +1,6 @@ - + insert into sys_roles_menus (role_id, menu_id) values diff --git a/cutejava/cutejava-system/src/main/resources/mapper/UserJobMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/system/UserJobMapper.xml similarity index 91% rename from cutejava/cutejava-system/src/main/resources/mapper/UserJobMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/system/UserJobMapper.xml index f8d667e1..d31cc170 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/UserJobMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/system/UserJobMapper.xml @@ -1,6 +1,6 @@ - + insert into sys_users_jobs (user_id, job_id) values diff --git a/cutejava/cutejava-system/src/main/resources/mapper/UserMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/system/UserMapper.xml similarity index 91% rename from cutejava/cutejava-system/src/main/resources/mapper/UserMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/system/UserMapper.xml index ab6c5558..11732130 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/UserMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/system/UserMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -19,15 +19,15 @@ - + - + - + @@ -135,12 +135,12 @@ left join sys_dept d on u.dept_id = d.dept_id where u.username = #{username} - select user_id as id, username from sys_user where email = #{email} - select user_id as id, username from sys_user where phone = #{phone} @@ -156,7 +156,7 @@ set email = #{email} where username = #{username} - SELECT u.user_id as id, u.username FROM sys_user u, sys_users_roles r @@ -164,7 +164,7 @@ AND r.role_id = #{roleId} group by u.user_id - SELECT u.* FROM sys_user u, sys_users_roles r, @@ -174,7 +174,7 @@ AND d.dept_id = #{deptId} group by u.user_id - SELECT u.user_id as id, u.username FROM sys_user u, sys_users_roles ur, diff --git a/cutejava/cutejava-system/src/main/resources/mapper/UserRoleMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/system/UserRoleMapper.xml similarity index 91% rename from cutejava/cutejava-system/src/main/resources/mapper/UserRoleMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/system/UserRoleMapper.xml index b73345ce..deddf97c 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/UserRoleMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/system/UserRoleMapper.xml @@ -1,6 +1,6 @@ - + insert into sys_users_roles (user_id, role_id) values diff --git a/cutejava/cutejava-tools/src/main/resources/mapper/LocalStorageMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/tools/LocalStorageMapper.xml similarity index 89% rename from cutejava/cutejava-tools/src/main/resources/mapper/LocalStorageMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/tools/LocalStorageMapper.xml index b13b3a37..0552bd4d 100644 --- a/cutejava/cutejava-tools/src/main/resources/mapper/LocalStorageMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/tools/LocalStorageMapper.xml @@ -1,7 +1,7 @@ - - select * from tool_local_storage diff --git a/cutejava/cutejava-tools/src/main/resources/mapper/QiniuContentMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/tools/QiniuContentMapper.xml similarity index 78% rename from cutejava/cutejava-tools/src/main/resources/mapper/QiniuContentMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/tools/QiniuContentMapper.xml index 4f52067b..587c2467 100644 --- a/cutejava/cutejava-tools/src/main/resources/mapper/QiniuContentMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/tools/QiniuContentMapper.xml @@ -1,13 +1,13 @@ - - SELECT * FROM tool_qiniu_content WHERE name = #{name} - SELECT * FROM tool_qiniu_content diff --git a/cutejava/cutejava-tools/src/main/resources/template/email.ftl b/cutejava/cutejava-system/src/main/resources/template/email.ftl similarity index 100% rename from cutejava/cutejava-tools/src/main/resources/template/email.ftl rename to cutejava/cutejava-system/src/main/resources/template/email.ftl diff --git a/cutejava/cutejava-tools/src/main/resources/template/taskAlarm.ftl b/cutejava/cutejava-system/src/main/resources/template/taskAlarm.ftl similarity index 100% rename from cutejava/cutejava-tools/src/main/resources/template/taskAlarm.ftl rename to cutejava/cutejava-system/src/main/resources/template/taskAlarm.ftl diff --git a/cutejava/cutejava-tools/pom.xml b/cutejava/cutejava-tools/pom.xml deleted file mode 100644 index a14f0a17..00000000 --- a/cutejava/cutejava-tools/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - cutejava - cn.odboy - 1.3.1 - - 4.0.0 - - cutejava-tools - 工具模块 - - - 1.4.7 - 7.9.3 - - - - - cn.odboy - cutejava-domain - 1.3.1 - - - - - javax.mail - mail - ${mail.version} - - - - - com.qiniu - qiniu-java-sdk - ${qiniu.version} - - - diff --git a/cutejava/pom.xml b/cutejava/pom.xml index 15e3727a..0ffb5659 100644 --- a/cutejava/pom.xml +++ b/cutejava/pom.xml @@ -9,10 +9,6 @@ cutejava-common - cutejava-domain - cutejava-tools - cutejava-job - cutejava-pipline cutejava-system cutejava-starter @@ -176,7 +172,7 @@ spring-boot-starter-websocket - + com.baomidou mybatis-plus-boot-starter @@ -187,7 +183,7 @@ mybatis-plus-jsqlparser ${mybatis-plus.version} - + org.springframework.boot spring-boot-starter-freemarker