feat: 定时任务功能拆分

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
 ```
 
 ### 启动服务

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",

cutejava/cutejava-common/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>cutejava</artifactId>
         <groupId>cn.odboy</groupId>
-        <version>1.3</version>
+        <version>1.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>

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拦截器（用于分页）

cutejava/cutejava-job/pom.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>cutejava</artifactId>
+        <groupId>cn.odboy</groupId>
+        <version>1.3.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>cutejava-job</artifactId>
+    <name>定时任务模块</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.odboy</groupId>
+            <artifactId>cutejava-tools</artifactId>
+            <version>1.3.0</version>
+        </dependency>
+
+        <!-- quartz -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-quartz</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.quartz-scheduler</groupId>
+            <artifactId>quartz-jobs</artifactId>
+            <version>2.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.mchange</groupId>
+            <artifactId>c3p0</artifactId>
+            <version>0.10.1</version>
+        </dependency>
+    </dependencies>
+</project>

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.mapper.QuartzJobMapper;
-import cn.odboy.modules.quartz.mapper.QuartzJobMapper;
+import cn.odboy.domain.QuartzJob;
-import cn.odboy.modules.quartz.util.QuartzManage;
+import cn.odboy.util.QuartzManage;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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;

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;

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.*;

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;

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.domain.dto.QuartzJobQueryCriteria;
-import cn.odboy.modules.quartz.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;

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.domain.dto.QuartzJobQueryCriteria;
-import cn.odboy.modules.quartz.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;

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.service.QuartzJobService;
-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.util.PageResult;
 import cn.odboy.util.SpringBeanHolder;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

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.domain.dto.QuartzJobQueryCriteria;
-import cn.odboy.modules.quartz.domain.QuartzLog;
+import cn.odboy.domain.QuartzJob;
-import cn.odboy.modules.quartz.domain.dto.QuartzJobQueryCriteria;
+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;

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.mapper.QuartzJobMapper;
-import cn.odboy.modules.quartz.domain.QuartzLog;
+import cn.odboy.mapper.QuartzLogMapper;
-import cn.odboy.modules.quartz.domain.dto.QuartzJobQueryCriteria;
+import cn.odboy.domain.QuartzJob;
-import cn.odboy.modules.quartz.mapper.QuartzJobMapper;
+import cn.odboy.domain.QuartzLog;
-import cn.odboy.modules.quartz.mapper.QuartzLogMapper;
+import cn.odboy.service.QuartzJobService;
-import cn.odboy.modules.quartz.service.QuartzJobService;
-import cn.odboy.modules.quartz.util.QuartzManage;
 import cn.odboy.util.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

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;

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.mapper.QuartzLogMapper;
-import cn.odboy.modules.quartz.domain.QuartzLog;
+import cn.odboy.domain.QuartzJob;
-import cn.odboy.modules.quartz.mapper.QuartzLogMapper;
+import cn.odboy.domain.QuartzLog;
-import cn.odboy.modules.quartz.service.QuartzJobService;
+import cn.odboy.service.QuartzJobService;
 import cn.odboy.service.EmailService;
 import cn.odboy.util.RedisUtil;
 import cn.odboy.util.SpringBeanHolder;

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()))

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;

cutejava/cutejava-job/src/main/resources/mapper/QuartzJobMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.odboy.modules.quartz.mapper.QuartzJobMapper">
+<mapper namespace="cn.odboy.mapper.QuartzJobMapper">
 
-    <resultMap id="BaseResultMap" type="cn.odboy.modules.quartz.domain.QuartzJob">
+    <resultMap id="BaseResultMap" type="cn.odboy.domain.QuartzJob">
         <id column="job_id" property="id" jdbcType="BIGINT"/>
         <result column="job_name" property="jobName" jdbcType="VARCHAR"/>
         <result column="bean_name" property="beanName" jdbcType="VARCHAR"/>

cutejava/cutejava-job/src/main/resources/mapper/QuartzLogMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.odboy.modules.quartz.mapper.QuartzLogMapper">
+<mapper namespace="cn.odboy.mapper.QuartzLogMapper">
 
-    <resultMap id="BaseResultMap" type="cn.odboy.modules.quartz.domain.QuartzLog">
+    <resultMap id="BaseResultMap" type="cn.odboy.domain.QuartzLog">
         <id column="log_id" property="id" jdbcType="BIGINT"/>
         <result column="job_name" property="jobName" jdbcType="VARCHAR"/>
         <result column="bean_name" property="beanName" jdbcType="VARCHAR"/>

cutejava/cutejava-starter/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>cutejava</artifactId>
         <groupId>cn.odboy</groupId>
-        <version>1.3</version>
+        <version>1.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>cn.odboy</groupId>
             <artifactId>cutejava-system</artifactId>
-            <version>1.3</version>
+            <version>1.3.0</version>
         </dependency>
     </dependencies>
 

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) {

cutejava/cutejava-starter/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
     # 激活的环境，如果需要 quartz 分布式支持，需要修改 active: dev,quartz
-    active: dev,quartz
+    active: dev
 

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 {

cutejava/cutejava-system/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>cutejava</artifactId>
         <groupId>cn.odboy</groupId>
-        <version>1.3</version>
+        <version>1.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -20,24 +20,8 @@
     <dependencies>
         <dependency>
             <groupId>cn.odboy</groupId>
-            <artifactId>cutejava-tools</artifactId>
+            <artifactId>cutejava-job</artifactId>
-            <version>1.3</version>
+            <version>1.3.0</version>
-        </dependency>
-
-        <!-- quartz -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-quartz</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.quartz-scheduler</groupId>
-            <artifactId>quartz-jobs</artifactId>
-            <version>2.3.2</version>
-        </dependency>
-        <dependency>
-            <groupId>com.mchange</groupId>
-            <artifactId>c3p0</artifactId>
-            <version>0.10.1</version>
         </dependency>
 
         <!-- jwt -->

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);
     }
 }

cutejava/cutejava-tools/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>cutejava</artifactId>
         <groupId>cn.odboy</groupId>
-        <version>1.3</version>
+        <version>1.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>cn.odboy</groupId>
             <artifactId>cutejava-common</artifactId>
-            <version>1.3</version>
+            <version>1.3.0</version>
         </dependency>
 
         <!--邮件依赖-->

cutejava/pom.xml

@@ -5,11 +5,12 @@
     <groupId>cn.odboy</groupId>
     <artifactId>cutejava</artifactId>
     <packaging>pom</packaging>
-    <version>1.3</version>
+    <version>1.3.0</version>
 
     <modules>
         <module>cutejava-common</module>
         <module>cutejava-tools</module>
+        <module>cutejava-job</module>
         <module>cutejava-system</module>
         <module>cutejava-starter</module>
     </modules>