ak
/
xx-job
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调度中心升级springboot2.x；因此，系统要求JDK8+；

This commit is contained in:
xuxueli 2020-01-19 17:21:13 +08:00
parent 6a91bfa55c e4ed8f329a
commit 92b98468d9
4 changed files with 264 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/XXL-JOB官方文档.md
View File

@ -1686,7 +1686,7 @@ public ReturnT<String> execute(String param) {
- 注意：最新版本 "XxlJobSpringExecutor" 逻辑有调整，历史项目中该组件的配置方式请参考Sample示例项目进行调整，尤其注意需要移除组件的init和destroy方法； - 注意：最新版本 "XxlJobSpringExecutor" 逻辑有调整，历史项目中该组件的配置方式请参考Sample示例项目进行调整，尤其注意需要移除组件的init和destroy方法；
### 6.28 版本 v2.2.0 Release Notes[迭代中] ### 6.28 版本 v2.2.0 Release Notes[迭代中]
- 1、[迭代中]调度中心升级springboot2.x；因此，系统要求JDK8+； - 1、调度中心升级springboot2.x；因此，系统要求JDK8+；
- 2、执行器注册默认值优化； - 2、执行器注册默认值优化；
- 3、SQL脚本编码默认utf8mb4执行，避免小概率下容器环境中乱码问题； - 3、SQL脚本编码默认utf8mb4执行，避免小概率下容器环境中乱码问题；

283
pom.xml
View File

@ -1,142 +1,143 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xuxueli</groupId> <groupId>com.xuxueli</groupId>
<artifactId>xxl-job</artifactId> <artifactId>xxl-job</artifactId>
<version>2.2.0-SNAPSHOT</version> <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<description>A distributed task scheduling framework.</description> <description>A distributed task scheduling framework.</description>
<url>https://www.xuxueli.com/</url> <url>https://www.xuxueli.com/</url>
<modules> <modules>
<module>xxl-job-core</module> <module>xxl-job-core</module>
<module>xxl-job-admin</module> <module>xxl-job-admin</module>
<module>xxl-job-executor-samples</module> <module>xxl-job-executor-samples</module>
</modules> </modules>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding> <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target> <maven.compiler.target>1.7</maven.compiler.target>
<maven.test.skip>true</maven.test.skip> <maven.test.skip>true</maven.test.skip>
<xxl-rpc.version>1.5.0</xxl-rpc.version> <xxl-rpc.version>1.5.0</xxl-rpc.version>
<spring.version>4.3.25.RELEASE</spring.version> <spring.version>5.0.7.RELEASE</spring.version>
<spring-boot.version>1.5.22.RELEASE</spring-boot.version> <spring-boot.version>2.0.4.RELEASE</spring-boot.version>
<mybatis-spring-boot-starter.version>1.3.5</mybatis-spring-boot-starter.version> <mybatis-spring-boot-starter.version>1.3.5</mybatis-spring-boot-starter.version>
<mysql-connector-java.version>5.1.48</mysql-connector-java.version> <tomcat-jdbc.version>8.5.43</tomcat-jdbc.version>
<mysql-connector-java.version>5.1.48</mysql-connector-java.version>
<slf4j-api.version>1.7.29</slf4j-api.version>
<junit.version>4.12</junit.version> <slf4j-api.version>1.7.29</slf4j-api.version>
<junit.version>4.12</junit.version>
<groovy.version>2.5.8</groovy.version>
<groovy.version>2.5.8</groovy.version>
<maven-source-plugin.version>3.2.0</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version> <maven-source-plugin.version>3.2.0</maven-source-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version> <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
<maven-war-plugin.version>3.2.3</maven-war-plugin.version> <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
</properties> <maven-war-plugin.version>3.2.3</maven-war-plugin.version>
</properties>
<build>
<plugins> <build>
</plugins> <plugins>
</build> </plugins>
</build>
<licenses>
<license> <licenses>
<name>GNU General Public License version 3</name> <license>
<url>https://opensource.org/licenses/GPL-3.0</url> <name>GNU General Public License version 3</name>
</license> <url>https://opensource.org/licenses/GPL-3.0</url>
</licenses> </license>
</licenses>
<scm>
<tag>master</tag> <scm>
<url>https://github.com/xuxueli/xxl-job.git</url> <tag>master</tag>
<connection>scm:git:https://github.com/xuxueli/xxl-job.git</connection> <url>https://github.com/xuxueli/xxl-job.git</url>
<developerConnection>scm:git:git@github.com:xuxueli/xxl-job.git</developerConnection> <connection>scm:git:https://github.com/xuxueli/xxl-job.git</connection>
</scm> <developerConnection>scm:git:git@github.com:xuxueli/xxl-job.git</developerConnection>
<developers> </scm>
<developer> <developers>
<id>XXL</id> <developer>
<name>xuxueli</name> <id>XXL</id>
<email>931591021@qq.com</email> <name>xuxueli</name>
<url>https://github.com/xuxueli</url> <email>931591021@qq.com</email>
</developer> <url>https://github.com/xuxueli</url>
</developers> </developer>
</developers>
<profiles>
<profiles>
<profile>
<id>release</id> <profile>
<build> <id>release</id>
<plugins> <build>
<!-- Source --> <plugins>
<plugin> <!-- Source -->
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-source-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>${maven-source-plugin.version}</version> <artifactId>maven-source-plugin</artifactId>
<executions> <version>${maven-source-plugin.version}</version>
<execution> <executions>
<phase>package</phase> <execution>
<goals> <phase>package</phase>
<goal>jar-no-fork</goal> <goals>
</goals> <goal>jar-no-fork</goal>
</execution> </goals>
</executions> </execution>
</plugin> </executions>
<!-- Javadoc --> </plugin>
<plugin> <!-- Javadoc -->
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-javadoc-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>${maven-javadoc-plugin.version}</version> <artifactId>maven-javadoc-plugin</artifactId>
<executions> <version>${maven-javadoc-plugin.version}</version>
<execution> <executions>
<phase>package</phase> <execution>
<goals> <phase>package</phase>
<goal>jar</goal> <goals>
</goals> <goal>jar</goal>
<configuration> </goals>
<doclint>none</doclint> <configuration>
</configuration> <doclint>none</doclint>
</execution> </configuration>
</executions> </execution>
</plugin> </executions>
<!-- GPG --> </plugin>
<plugin> <!-- GPG -->
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-gpg-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>${maven-gpg-plugin.version}</version> <artifactId>maven-gpg-plugin</artifactId>
<configuration> <version>${maven-gpg-plugin.version}</version>
<useAgent>false</useAgent> <configuration>
</configuration> <useAgent>false</useAgent>
<executions> </configuration>
<execution> <executions>
<phase>verify</phase> <execution>
<goals> <phase>verify</phase>
<goal>sign</goal> <goals>
</goals> <goal>sign</goal>
</execution> </goals>
</executions> </execution>
</plugin> </executions>
</plugins> </plugin>
</build> </plugins>
<distributionManagement> </build>
<snapshotRepository> <distributionManagement>
<id>oss</id> <snapshotRepository>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url> <id>oss</id>
</snapshotRepository> <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
<repository> </snapshotRepository>
<id>oss</id> <repository>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url> <id>oss</id>
</repository> <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</distributionManagement> </repository>
</profile> </distributionManagement>
</profiles> </profile>
</profiles>
</project> </project>

232
xxl-job-admin/pom.xml
View File

@ -1,113 +1,119 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.xuxueli</groupId> <groupId>com.xuxueli</groupId>
<artifactId>xxl-job</artifactId> <artifactId>xxl-job</artifactId>
<version>2.2.0-SNAPSHOT</version> <version>2.2.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>xxl-job-admin</artifactId> <artifactId>xxl-job-admin</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>${spring-boot.version}</version> <version>${spring-boot.version}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<dependencies> <dependencies>
<!-- starter-web：spring-webmvc + autoconfigure + logback + yaml + tomcat --> <!-- starter-web：spring-webmvc + autoconfigure + logback + yaml + tomcat -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
</dependency> </dependency>
<!-- starter-test：junit + spring-test + mockito --> <!-- starter-test：junit + spring-test + mockito -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- freemarker-starter --> <!-- freemarker-starter -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-freemarker</artifactId> <artifactId>spring-boot-starter-freemarker</artifactId>
</dependency> </dependency>
<!-- mail-starter --> <!-- mail-starter -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId> <artifactId>spring-boot-starter-mail</artifactId>
</dependency> </dependency>
<!-- starter-actuator --> <!-- starter-actuator -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId> <artifactId>spring-boot-starter-actuator</artifactId>
</dependency> </dependency>
<!-- mybatis-starter：mybatis + mybatis-spring + tomcat-jdbc（default） --> <!-- mybatis-starter：mybatis + mybatis-spring + tomcat-jdbc（default） -->
<dependency> <dependency>
<groupId>org.mybatis.spring.boot</groupId> <groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId> <artifactId>mybatis-spring-boot-starter</artifactId>
<version>${mybatis-spring-boot-starter.version}</version> <version>${mybatis-spring-boot-starter.version}</version>
</dependency> </dependency>
<!-- mysql --> <!-- tomcat-jdbc -->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>org.apache.tomcat</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>tomcat-jdbc</artifactId>
<version>${mysql-connector-java.version}</version> <version>${tomcat-jdbc.version}</version>
</dependency> </dependency>
<!-- mysql -->
<!-- xxl-job-core --> <dependency>
<dependency> <groupId>mysql</groupId>
<groupId>com.xuxueli</groupId> <artifactId>mysql-connector-java</artifactId>
<artifactId>xxl-job-core</artifactId> <version>${mysql-connector-java.version}</version>
<version>${project.parent.version}</version> </dependency>
</dependency>
<!-- xxl-job-core -->
</dependencies> <dependency>
<groupId>com.xuxueli</groupId>
<build> <artifactId>xxl-job-core</artifactId>
<plugins> <version>${project.parent.version}</version>
<plugin> </dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> </dependencies>
<version>${spring-boot.version}</version>
<executions> <build>
<execution> <plugins>
<goals> <plugin>
<goal>repackage</goal> <groupId>org.springframework.boot</groupId>
</goals> <artifactId>spring-boot-maven-plugin</artifactId>
</execution> <version>${spring-boot.version}</version>
</executions> <executions>
</plugin> <execution>
<!-- docker --> <goals>
<plugin> <goal>repackage</goal>
<groupId>com.spotify</groupId> </goals>
<artifactId>docker-maven-plugin</artifactId> </execution>
<version>0.4.13</version> </executions>
<configuration> </plugin>
<!-- made of '[a-z0-9-_.]' --> <!-- docker -->
<imageName>${project.artifactId}:${project.version}</imageName> <plugin>
<dockerDirectory>${project.basedir}</dockerDirectory> <groupId>com.spotify</groupId>
<resources> <artifactId>docker-maven-plugin</artifactId>
<resource> <version>0.4.13</version>
<targetPath>/</targetPath> <configuration>
<directory>${project.build.directory}</directory> <!-- made of '[a-z0-9-_.]' -->
<include>${project.build.finalName}.jar</include> <imageName>${project.artifactId}:${project.version}</imageName>
</resource> <dockerDirectory>${project.basedir}</dockerDirectory>
</resources> <resources>
</configuration> <resource>
</plugin> <targetPath>/</targetPath>
</plugins> <directory>${project.build.directory}</directory>
</build> <include>${project.build.finalName}.jar</include>
</resource>
</project> </resources>
</configuration>
</plugin>
</plugins>
</build>
</project>

4
xxl-job-admin/src/main/resources/application.properties
View File

@ -1,9 +1,9 @@
### web ### web
server.port=8080 server.port=8080
server.context-path=/xxl-job-admin server.servlet.context-path=/xxl-job-admin
### actuator ### actuator
management.context-path=/actuator management.server.servlet.context-path=/actuator
management.health.mail.enabled=false management.health.mail.enabled=false
### resources ### resources