diff --git a/cutejava-ui/README.md b/cutejava-ui/README.md index 11836c69..c771a9bd 100644 --- a/cutejava-ui/README.md +++ b/cutejava-ui/README.md @@ -10,13 +10,13 @@ ### 环境要求 -**推荐 node 版本：12-16** +**推荐 node 版本：12-16 LTS** ### 安装依赖 ``` bash # 安装依赖（依赖python） -npm install --registry https://registry.npmmirror.com --save +npm install --registry https://registry.npmmirror.com ``` ### 启动服务 diff --git a/cutejava-ui/package.json b/cutejava-ui/package.json index 429ce013..9736d352 100644 --- a/cutejava-ui/package.json +++ b/cutejava-ui/package.json @@ -1,6 +1,6 @@ { "name": "cutejava", - "version": "1.0", + "version": "1.3.0", "description": "CuteJava 前端源码", "author": "Odboy", "license": "Apache-2.0", diff --git a/cutejava/cutejava-common/pom.xml b/cutejava/cutejava-common/pom.xml index c8cfc631..e05dfe46 100644 --- a/cutejava/cutejava-common/pom.xml +++ b/cutejava/cutejava-common/pom.xml @@ -4,7 +4,7 @@ cutejava cn.odboy - 1.3 + 1.3.0 4.0.0 diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/config/mybatis/MybatisPlusConfig.java b/cutejava/cutejava-common/src/main/java/cn/odboy/config/mybatis/MybatisPlusConfig.java index 0f2bafa4..4c2c1055 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/config/mybatis/MybatisPlusConfig.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/config/mybatis/MybatisPlusConfig.java @@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.transaction.annotation.EnableTransactionManagement; @Configuration +@EnableTransactionManagement public class MybatisPlusConfig { /** * MyBatisPlus拦截器（用于分页） diff --git a/cutejava/cutejava-job/pom.xml b/cutejava/cutejava-job/pom.xml new file mode 100644 index 00000000..981bb409 --- /dev/null +++ b/cutejava/cutejava-job/pom.xml @@ -0,0 +1,37 @@ + + + + cutejava + cn.odboy + 1.3.0 + + 4.0.0 + + cutejava-job + 定时任务模块 + + + + cn.odboy + cutejava-tools + 1.3.0 + + + + + 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-system/src/main/java/cn/odboy/modules/quartz/config/JobRunner.java b/cutejava/cutejava-job/src/main/java/cn/odboy/config/JobRunner.java similarity index 82% rename from cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/config/JobRunner.java rename to cutejava/cutejava-job/src/main/java/cn/odboy/config/JobRunner.java index 8ea68945..3017a2a8 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/config/JobRunner.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/config/JobRunner.java @@ -1,8 +1,8 @@ -package cn.odboy.modules.quartz.config; +package cn.odboy.config; -import cn.odboy.modules.quartz.domain.QuartzJob; -import cn.odboy.modules.quartz.mapper.QuartzJobMapper; -import cn.odboy.modules.quartz.util.QuartzManage; +import cn.odboy.mapper.QuartzJobMapper; +import cn.odboy.domain.QuartzJob; +import cn.odboy.util.QuartzManage; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/config/QuartzConfig.java b/cutejava/cutejava-job/src/main/java/cn/odboy/config/QuartzConfig.java similarity index 97% rename from cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/config/QuartzConfig.java rename to cutejava/cutejava-job/src/main/java/cn/odboy/config/QuartzConfig.java index c06d4beb..27eb9d9d 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/config/QuartzConfig.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/config/QuartzConfig.java @@ -1,4 +1,4 @@ -package cn.odboy.modules.quartz.config; +package cn.odboy.config; import lombok.extern.slf4j.Slf4j; import org.quartz.spi.TriggerFiredBundle; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/domain/QuartzJob.java b/cutejava/cutejava-job/src/main/java/cn/odboy/domain/QuartzJob.java similarity index 97% rename from cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/domain/QuartzJob.java rename to cutejava/cutejava-job/src/main/java/cn/odboy/domain/QuartzJob.java index 83e9623a..e36f334a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/domain/QuartzJob.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/domain/QuartzJob.java @@ -1,4 +1,4 @@ -package cn.odboy.modules.quartz.domain; +package cn.odboy.domain; import cn.odboy.base.BaseEntity; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/domain/QuartzLog.java b/cutejava/cutejava-job/src/main/java/cn/odboy/domain/QuartzLog.java similarity index 97% rename from cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/domain/QuartzLog.java rename to cutejava/cutejava-job/src/main/java/cn/odboy/domain/QuartzLog.java index df6b8389..9c03e8d8 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/domain/QuartzLog.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/domain/QuartzLog.java @@ -1,4 +1,4 @@ -package cn.odboy.modules.quartz.domain; +package cn.odboy.domain; import cn.odboy.base.MyObject; import com.baomidou.mybatisplus.annotation.*; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/domain/dto/QuartzJobQueryCriteria.java b/cutejava/cutejava-job/src/main/java/cn/odboy/domain/dto/QuartzJobQueryCriteria.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/domain/dto/QuartzJobQueryCriteria.java rename to cutejava/cutejava-job/src/main/java/cn/odboy/domain/dto/QuartzJobQueryCriteria.java index 2b0057cf..5c2f03db 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/domain/dto/QuartzJobQueryCriteria.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/domain/dto/QuartzJobQueryCriteria.java @@ -1,4 +1,4 @@ -package cn.odboy.modules.quartz.domain.dto; +package cn.odboy.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/mapper/QuartzJobMapper.java b/cutejava/cutejava-job/src/main/java/cn/odboy/mapper/QuartzJobMapper.java similarity index 79% rename from cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/mapper/QuartzJobMapper.java rename to cutejava/cutejava-job/src/main/java/cn/odboy/mapper/QuartzJobMapper.java index e4b6ce6c..0e4a7a2c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/mapper/QuartzJobMapper.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/mapper/QuartzJobMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.modules.quartz.mapper; +package cn.odboy.mapper; -import cn.odboy.modules.quartz.domain.QuartzJob; -import cn.odboy.modules.quartz.domain.dto.QuartzJobQueryCriteria; +import cn.odboy.domain.dto.QuartzJobQueryCriteria; +import cn.odboy.domain.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-system/src/main/java/cn/odboy/modules/quartz/mapper/QuartzLogMapper.java b/cutejava/cutejava-job/src/main/java/cn/odboy/mapper/QuartzLogMapper.java similarity index 78% rename from cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/mapper/QuartzLogMapper.java rename to cutejava/cutejava-job/src/main/java/cn/odboy/mapper/QuartzLogMapper.java index d5725052..57cfc0e5 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/mapper/QuartzLogMapper.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/mapper/QuartzLogMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.modules.quartz.mapper; +package cn.odboy.mapper; -import cn.odboy.modules.quartz.domain.QuartzLog; -import cn.odboy.modules.quartz.domain.dto.QuartzJobQueryCriteria; +import cn.odboy.domain.dto.QuartzJobQueryCriteria; +import cn.odboy.domain.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/modules/quartz/rest/QuartzJobController.java b/cutejava/cutejava-job/src/main/java/cn/odboy/rest/QuartzJobController.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/rest/QuartzJobController.java rename to cutejava/cutejava-job/src/main/java/cn/odboy/rest/QuartzJobController.java index d85ef9c9..386dc7ed 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/rest/QuartzJobController.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/rest/QuartzJobController.java @@ -1,10 +1,10 @@ -package cn.odboy.modules.quartz.rest; +package cn.odboy.rest; +import cn.odboy.domain.QuartzJob; +import cn.odboy.domain.QuartzLog; +import cn.odboy.domain.dto.QuartzJobQueryCriteria; import cn.odboy.exception.BadRequestException; -import cn.odboy.modules.quartz.domain.QuartzJob; -import cn.odboy.modules.quartz.domain.QuartzLog; -import cn.odboy.modules.quartz.domain.dto.QuartzJobQueryCriteria; -import cn.odboy.modules.quartz.service.QuartzJobService; +import cn.odboy.service.QuartzJobService; import cn.odboy.util.PageResult; import cn.odboy.util.SpringBeanHolder; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/service/QuartzJobService.java b/cutejava/cutejava-job/src/main/java/cn/odboy/service/QuartzJobService.java similarity index 91% rename from cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/service/QuartzJobService.java rename to cutejava/cutejava-job/src/main/java/cn/odboy/service/QuartzJobService.java index f648875b..6051749b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/service/QuartzJobService.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/service/QuartzJobService.java @@ -1,8 +1,8 @@ -package cn.odboy.modules.quartz.service; +package cn.odboy.service; -import cn.odboy.modules.quartz.domain.QuartzJob; -import cn.odboy.modules.quartz.domain.QuartzLog; -import cn.odboy.modules.quartz.domain.dto.QuartzJobQueryCriteria; +import cn.odboy.domain.dto.QuartzJobQueryCriteria; +import cn.odboy.domain.QuartzJob; +import cn.odboy.domain.QuartzLog; import cn.odboy.util.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/service/impl/QuartzJobServiceImpl.java b/cutejava/cutejava-job/src/main/java/cn/odboy/service/impl/QuartzJobServiceImpl.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/service/impl/QuartzJobServiceImpl.java rename to cutejava/cutejava-job/src/main/java/cn/odboy/service/impl/QuartzJobServiceImpl.java index 9fe22590..bf644d7d 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/service/impl/QuartzJobServiceImpl.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/service/impl/QuartzJobServiceImpl.java @@ -1,15 +1,14 @@ -package cn.odboy.modules.quartz.service.impl; +package cn.odboy.service.impl; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; +import cn.odboy.domain.dto.QuartzJobQueryCriteria; import cn.odboy.exception.BadRequestException; -import cn.odboy.modules.quartz.domain.QuartzJob; -import cn.odboy.modules.quartz.domain.QuartzLog; -import cn.odboy.modules.quartz.domain.dto.QuartzJobQueryCriteria; -import cn.odboy.modules.quartz.mapper.QuartzJobMapper; -import cn.odboy.modules.quartz.mapper.QuartzLogMapper; -import cn.odboy.modules.quartz.service.QuartzJobService; -import cn.odboy.modules.quartz.util.QuartzManage; +import cn.odboy.mapper.QuartzJobMapper; +import cn.odboy.mapper.QuartzLogMapper; +import cn.odboy.domain.QuartzJob; +import cn.odboy.domain.QuartzLog; +import cn.odboy.service.QuartzJobService; import cn.odboy.util.*; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/task/TestTask.java b/cutejava/cutejava-job/src/main/java/cn/odboy/task/TestTask.java similarity index 90% rename from cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/task/TestTask.java rename to cutejava/cutejava-job/src/main/java/cn/odboy/task/TestTask.java index ba74effa..ee03b4dc 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/task/TestTask.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/task/TestTask.java @@ -1,4 +1,4 @@ -package cn.odboy.modules.quartz.task; +package cn.odboy.task; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/util/ExecutionJob.java b/cutejava/cutejava-job/src/main/java/cn/odboy/util/ExecutionJob.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/util/ExecutionJob.java rename to cutejava/cutejava-job/src/main/java/cn/odboy/util/ExecutionJob.java index 771f4487..9f583421 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/util/ExecutionJob.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/util/ExecutionJob.java @@ -1,14 +1,14 @@ -package cn.odboy.modules.quartz.util; +package cn.odboy.util; 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.domain.dto.EmailDto; -import cn.odboy.modules.quartz.domain.QuartzJob; -import cn.odboy.modules.quartz.domain.QuartzLog; -import cn.odboy.modules.quartz.mapper.QuartzLogMapper; -import cn.odboy.modules.quartz.service.QuartzJobService; +import cn.odboy.mapper.QuartzLogMapper; +import cn.odboy.domain.QuartzJob; +import cn.odboy.domain.QuartzLog; +import cn.odboy.service.QuartzJobService; import cn.odboy.service.EmailService; import cn.odboy.util.RedisUtil; import cn.odboy.util.SpringBeanHolder; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/util/QuartzManage.java b/cutejava/cutejava-job/src/main/java/cn/odboy/util/QuartzManage.java similarity index 97% rename from cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/util/QuartzManage.java rename to cutejava/cutejava-job/src/main/java/cn/odboy/util/QuartzManage.java index 86844511..5791e977 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/util/QuartzManage.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/util/QuartzManage.java @@ -1,7 +1,7 @@ -package cn.odboy.modules.quartz.util; +package cn.odboy.util; import cn.odboy.exception.BadRequestException; -import cn.odboy.modules.quartz.domain.QuartzJob; +import cn.odboy.domain.QuartzJob; import lombok.extern.slf4j.Slf4j; import org.quartz.*; import org.quartz.impl.triggers.CronTriggerImpl; @@ -28,7 +28,7 @@ public class QuartzManage { withIdentity(JOB_NAME + quartzJob.getId()).build(); //通过触发器名和cron 表达式创建 Trigger - Trigger cronTrigger = newTrigger() + Trigger cronTrigger = TriggerBuilder.newTrigger() .withIdentity(JOB_NAME + quartzJob.getId()) .startNow() .withSchedule(CronScheduleBuilder.cronSchedule(quartzJob.getCronExpression())) diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/util/QuartzRunnable.java b/cutejava/cutejava-job/src/main/java/cn/odboy/util/QuartzRunnable.java similarity index 97% rename from cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/util/QuartzRunnable.java rename to cutejava/cutejava-job/src/main/java/cn/odboy/util/QuartzRunnable.java index 01cdecb3..0b022229 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/quartz/util/QuartzRunnable.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/util/QuartzRunnable.java @@ -1,4 +1,4 @@ -package cn.odboy.modules.quartz.util; +package cn.odboy.util; import cn.odboy.util.SpringBeanHolder; import lombok.extern.slf4j.Slf4j; diff --git a/cutejava/cutejava-starter/src/main/resources/mapper/quartz/QuartzJobMapper.xml b/cutejava/cutejava-job/src/main/resources/mapper/QuartzJobMapper.xml similarity index 94% rename from cutejava/cutejava-starter/src/main/resources/mapper/quartz/QuartzJobMapper.xml rename to cutejava/cutejava-job/src/main/resources/mapper/QuartzJobMapper.xml index 925a708b..f0d2da64 100644 --- a/cutejava/cutejava-starter/src/main/resources/mapper/quartz/QuartzJobMapper.xml +++ b/cutejava/cutejava-job/src/main/resources/mapper/QuartzJobMapper.xml @@ -1,8 +1,8 @@ - + - + diff --git a/cutejava/cutejava-starter/src/main/resources/mapper/quartz/QuartzLogMapper.xml b/cutejava/cutejava-job/src/main/resources/mapper/QuartzLogMapper.xml similarity index 92% rename from cutejava/cutejava-starter/src/main/resources/mapper/quartz/QuartzLogMapper.xml rename to cutejava/cutejava-job/src/main/resources/mapper/QuartzLogMapper.xml index b9ca6f39..aceb4a57 100644 --- a/cutejava/cutejava-starter/src/main/resources/mapper/quartz/QuartzLogMapper.xml +++ b/cutejava/cutejava-job/src/main/resources/mapper/QuartzLogMapper.xml @@ -1,8 +1,8 @@ - + - + diff --git a/cutejava/cutejava-starter/pom.xml b/cutejava/cutejava-starter/pom.xml index 633f3187..77ead9ae 100644 --- a/cutejava/cutejava-starter/pom.xml +++ b/cutejava/cutejava-starter/pom.xml @@ -4,7 +4,7 @@ cutejava cn.odboy - 1.3 + 1.3.0 4.0.0 @@ -15,7 +15,7 @@ cn.odboy cutejava-system - 1.3 + 1.3.0 diff --git a/cutejava/cutejava-starter/src/main/java/cn/odboy/AppRun.java b/cutejava/cutejava-starter/src/main/java/cn/odboy/AppRun.java index f6f2f6ec..74faf878 100644 --- a/cutejava/cutejava-starter/src/main/java/cn/odboy/AppRun.java +++ b/cutejava/cutejava-starter/src/main/java/cn/odboy/AppRun.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Api(hidden = true) @SpringBootApplication -@EnableTransactionManagement public class AppRun { public static void main(String[] args) { diff --git a/cutejava/cutejava-starter/src/main/resources/config/application-dev.yml b/cutejava/cutejava-starter/src/main/resources/application-dev.yml similarity index 100% rename from cutejava/cutejava-starter/src/main/resources/config/application-dev.yml rename to cutejava/cutejava-starter/src/main/resources/application-dev.yml diff --git a/cutejava/cutejava-starter/src/main/resources/config/application-prod.yml b/cutejava/cutejava-starter/src/main/resources/application-prod.yml similarity index 100% rename from cutejava/cutejava-starter/src/main/resources/config/application-prod.yml rename to cutejava/cutejava-starter/src/main/resources/application-prod.yml diff --git a/cutejava/cutejava-starter/src/main/resources/config/application-quartz.yml b/cutejava/cutejava-starter/src/main/resources/application-quartz.yml similarity index 100% rename from cutejava/cutejava-starter/src/main/resources/config/application-quartz.yml rename to cutejava/cutejava-starter/src/main/resources/application-quartz.yml diff --git a/cutejava/cutejava-starter/src/main/resources/config/application.yml b/cutejava/cutejava-starter/src/main/resources/application.yml similarity index 83% rename from cutejava/cutejava-starter/src/main/resources/config/application.yml rename to cutejava/cutejava-starter/src/main/resources/application.yml index 1530734c..824e8fe2 100644 --- a/cutejava/cutejava-starter/src/main/resources/config/application.yml +++ b/cutejava/cutejava-starter/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: # 激活的环境，如果需要 quartz 分布式支持，需要修改 active: dev,quartz - active: dev,quartz + active: dev diff --git a/cutejava/cutejava-starter/src/test/java/cn/odboy/util/FileUtilTest.java b/cutejava/cutejava-starter/src/test/java/cn/odboy/util/FileUtilTest.java index d2f9a23a..68d6118b 100644 --- a/cutejava/cutejava-starter/src/test/java/cn/odboy/util/FileUtilTest.java +++ b/cutejava/cutejava-starter/src/test/java/cn/odboy/util/FileUtilTest.java @@ -3,6 +3,7 @@ package cn.odboy.util; import org.junit.jupiter.api.Test; import org.springframework.mock.web.MockMultipartFile; +import static cn.odboy.util.FileUtil.*; import static org.junit.jupiter.api.Assertions.assertEquals; public class FileUtilTest { diff --git a/cutejava/cutejava-system/pom.xml b/cutejava/cutejava-system/pom.xml index 9f4585d8..35a2f0ca 100644 --- a/cutejava/cutejava-system/pom.xml +++ b/cutejava/cutejava-system/pom.xml @@ -4,7 +4,7 @@ cutejava cn.odboy - 1.3 + 1.3.0 4.0.0 @@ -20,24 +20,8 @@ cn.odboy - cutejava-tools - 1.3 - - - - - org.springframework.boot - spring-boot-starter-quartz - - - org.quartz-scheduler - quartz-jobs - 2.3.2 - - - com.mchange - c3p0 - 0.10.1 + cutejava-job + 1.3.0 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/security/config/SpringSecurityConfig.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/security/config/SpringSecurityConfig.java index c1ef95e9..09b53350 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/security/config/SpringSecurityConfig.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/security/config/SpringSecurityConfig.java @@ -35,7 +35,7 @@ public class SpringSecurityConfig { private final JwtAuthenticationEntryPoint authenticationErrorHandler; private final JwtAccessDeniedHandler jwtAccessDeniedHandler; private final ApplicationContext applicationContext; - private final SecurityProperties properties; + private final SecurityProperties securityProperties; private final OnlineUserService onlineUserService; @Bean @@ -114,6 +114,6 @@ public class SpringSecurityConfig { } private TokenConfigurer securityConfigurerAdapter() { - return new TokenConfigurer(tokenProvider, properties, onlineUserService); + return new TokenConfigurer(tokenProvider, securityProperties, onlineUserService); } } diff --git a/cutejava/cutejava-starter/src/main/resources/mapper/system/DeptMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/DeptMapper.xml similarity index 100% rename from cutejava/cutejava-starter/src/main/resources/mapper/system/DeptMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/DeptMapper.xml diff --git a/cutejava/cutejava-starter/src/main/resources/mapper/system/DictDetailMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml similarity index 100% rename from cutejava/cutejava-starter/src/main/resources/mapper/system/DictDetailMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml diff --git a/cutejava/cutejava-starter/src/main/resources/mapper/system/DictMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/DictMapper.xml similarity index 100% rename from cutejava/cutejava-starter/src/main/resources/mapper/system/DictMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/DictMapper.xml diff --git a/cutejava/cutejava-starter/src/main/resources/mapper/system/JobMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/JobMapper.xml similarity index 100% rename from cutejava/cutejava-starter/src/main/resources/mapper/system/JobMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/JobMapper.xml diff --git a/cutejava/cutejava-starter/src/main/resources/mapper/system/MenuMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/MenuMapper.xml similarity index 100% rename from cutejava/cutejava-starter/src/main/resources/mapper/system/MenuMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/MenuMapper.xml diff --git a/cutejava/cutejava-starter/src/main/resources/mapper/system/RoleDeptMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/RoleDeptMapper.xml similarity index 100% rename from cutejava/cutejava-starter/src/main/resources/mapper/system/RoleDeptMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/RoleDeptMapper.xml diff --git a/cutejava/cutejava-starter/src/main/resources/mapper/system/RoleMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/RoleMapper.xml similarity index 100% rename from cutejava/cutejava-starter/src/main/resources/mapper/system/RoleMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/RoleMapper.xml diff --git a/cutejava/cutejava-starter/src/main/resources/mapper/system/RoleMenuMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/RoleMenuMapper.xml similarity index 100% rename from cutejava/cutejava-starter/src/main/resources/mapper/system/RoleMenuMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/RoleMenuMapper.xml diff --git a/cutejava/cutejava-starter/src/main/resources/mapper/system/UserJobMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/UserJobMapper.xml similarity index 100% rename from cutejava/cutejava-starter/src/main/resources/mapper/system/UserJobMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/UserJobMapper.xml diff --git a/cutejava/cutejava-starter/src/main/resources/mapper/system/UserMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/UserMapper.xml similarity index 100% rename from cutejava/cutejava-starter/src/main/resources/mapper/system/UserMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/UserMapper.xml diff --git a/cutejava/cutejava-starter/src/main/resources/mapper/system/UserRoleMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/UserRoleMapper.xml similarity index 100% rename from cutejava/cutejava-starter/src/main/resources/mapper/system/UserRoleMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/UserRoleMapper.xml diff --git a/cutejava/cutejava-tools/pom.xml b/cutejava/cutejava-tools/pom.xml index 08b68256..3d8175da 100644 --- a/cutejava/cutejava-tools/pom.xml +++ b/cutejava/cutejava-tools/pom.xml @@ -4,7 +4,7 @@ cutejava cn.odboy - 1.3 + 1.3.0 4.0.0 @@ -20,7 +20,7 @@ cn.odboy cutejava-common - 1.3 + 1.3.0 diff --git a/cutejava/cutejava-starter/src/main/resources/template/email.ftl b/cutejava/cutejava-tools/src/main/resources/template/email.ftl similarity index 100% rename from cutejava/cutejava-starter/src/main/resources/template/email.ftl rename to cutejava/cutejava-tools/src/main/resources/template/email.ftl diff --git a/cutejava/cutejava-starter/src/main/resources/template/taskAlarm.ftl b/cutejava/cutejava-tools/src/main/resources/template/taskAlarm.ftl similarity index 100% rename from cutejava/cutejava-starter/src/main/resources/template/taskAlarm.ftl rename to cutejava/cutejava-tools/src/main/resources/template/taskAlarm.ftl diff --git a/cutejava/pom.xml b/cutejava/pom.xml index 4f6d5f54..049cd8a5 100644 --- a/cutejava/pom.xml +++ b/cutejava/pom.xml @@ -5,11 +5,12 @@ cn.odboy cutejava pom - 1.3 + 1.3.0 cutejava-common cutejava-tools + cutejava-job cutejava-system cutejava-starter