多个项目依赖升级至较新稳定版本,如mybatis、groovy和mysql驱动等;
默认数据库连接池调整为hikari;
This commit is contained in:
parent
92b98468d9
commit
15fb49a367
|
@ -415,7 +415,7 @@ XXL-JOB是一个分布式任务调度平台,其核心设计目标是开发迅
|
|||
|
||||
### 1.6 环境
|
||||
- Maven3+
|
||||
- Jdk1.7+
|
||||
- Jdk1.8+
|
||||
- Mysql5.7+
|
||||
|
||||
|
||||
|
@ -1689,6 +1689,8 @@ public ReturnT<String> execute(String param) {
|
|||
- 1、调度中心升级springboot2.x;因此,系统要求JDK8+;
|
||||
- 2、执行器注册默认值优化;
|
||||
- 3、SQL脚本编码默认utf8mb4执行,避免小概率下容器环境中乱码问题;
|
||||
- 4、多个项目依赖升级至较新稳定版本,如mybatis、groovy和mysql驱动等;
|
||||
- 5、默认数据库连接池调整为hikari;
|
||||
|
||||
|
||||
### TODO LIST
|
||||
|
@ -1717,17 +1719,16 @@ public ReturnT<String> execute(String param) {
|
|||
- 23、批量调度:调度请求入queue,调度线程批量获取调度请求并发起远程调度;提高线程效率;
|
||||
- 24、多语言执行器:约定跨语言通讯方案,以及通讯接口;
|
||||
- 25、移除commons-exec,采用原生实现;
|
||||
- 26、调度中心JDK版本调整为JDK8,从而升级至最新版本SpringBoot;
|
||||
- 27、执行器服务端口与注册端口分离,支持docker动态随机端口;
|
||||
- 28、执行器端口复用,复用容器端口提供通讯服务;
|
||||
- 29、自定义失败重试时间间隔;
|
||||
- 30、分片任务全部成功后触发子任务;
|
||||
- 31、任务复制功能;点击复制是弹出新建任务弹框,并初始化被复制任务信息;
|
||||
- 32、AccessToken按照执行器维度设置;控制调度、回调;
|
||||
- 33、任务执行一次的时候指定IP;
|
||||
- 34、通讯调整;双向HTTP,回调和其他API自定义AccessToken,Restful,执行器复用容器端口;
|
||||
- 35、父子任务参数传递;流程任务等,透传动态参数;
|
||||
- 36、新增执行器描述、任务描述属性;
|
||||
- 26、执行器服务端口与注册端口分离,支持docker动态随机端口;
|
||||
- 27、执行器端口复用,复用容器端口提供通讯服务;
|
||||
- 28、自定义失败重试时间间隔;
|
||||
- 29、分片任务全部成功后触发子任务;
|
||||
- 30、任务复制功能;点击复制是弹出新建任务弹框,并初始化被复制任务信息;
|
||||
- 31、AccessToken按照执行器维度设置;控制调度、回调;
|
||||
- 32、任务执行一次的时候指定IP;
|
||||
- 33、通讯调整;双向HTTP,回调和其他API自定义AccessToken,Restful,执行器复用容器端口;
|
||||
- 34、父子任务参数传递;流程任务等,透传动态参数;
|
||||
- 35、新增执行器描述、任务描述属性;
|
||||
|
||||
|
||||
## 七、其他
|
||||
|
|
22
pom.xml
22
pom.xml
|
@ -20,24 +20,24 @@
|
|||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
|
||||
<maven.compiler.source>1.7</maven.compiler.source>
|
||||
<maven.compiler.target>1.7</maven.compiler.target>
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
<maven.test.skip>true</maven.test.skip>
|
||||
|
||||
<xxl-rpc.version>1.5.0</xxl-rpc.version>
|
||||
|
||||
<spring.version>5.0.7.RELEASE</spring.version>
|
||||
<spring-boot.version>2.0.4.RELEASE</spring-boot.version>
|
||||
<mybatis-spring-boot-starter.version>1.3.5</mybatis-spring-boot-starter.version>
|
||||
<tomcat-jdbc.version>8.5.43</tomcat-jdbc.version>
|
||||
<mysql-connector-java.version>5.1.48</mysql-connector-java.version>
|
||||
<spring.version>5.2.3.RELEASE</spring.version>
|
||||
<spring-boot.version>2.2.3.RELEASE</spring-boot.version>
|
||||
|
||||
<slf4j-api.version>1.7.29</slf4j-api.version>
|
||||
<junit.version>4.12</junit.version>
|
||||
<mybatis-spring-boot-starter.version>2.1.1</mybatis-spring-boot-starter.version>
|
||||
<mysql-connector-java.version>8.0.18</mysql-connector-java.version>
|
||||
|
||||
<groovy.version>2.5.8</groovy.version>
|
||||
<slf4j-api.version>1.7.30</slf4j-api.version>
|
||||
<junit.version>4.13</junit.version>
|
||||
|
||||
<maven-source-plugin.version>3.2.0</maven-source-plugin.version>
|
||||
<groovy.version>2.5.9</groovy.version>
|
||||
|
||||
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
|
||||
<maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
|
||||
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
|
||||
<maven-war-plugin.version>3.2.3</maven-war-plugin.version>
|
||||
|
|
|
@ -53,18 +53,12 @@
|
|||
<artifactId>spring-boot-starter-actuator</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- mybatis-starter:mybatis + mybatis-spring + tomcat-jdbc(default) -->
|
||||
<!-- mybatis-starter:mybatis + mybatis-spring + hikari(default) -->
|
||||
<dependency>
|
||||
<groupId>org.mybatis.spring.boot</groupId>
|
||||
<artifactId>mybatis-spring-boot-starter</artifactId>
|
||||
<version>${mybatis-spring-boot-starter.version}</version>
|
||||
</dependency>
|
||||
<!-- tomcat-jdbc -->
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-jdbc</artifactId>
|
||||
<version>${tomcat-jdbc.version}</version>
|
||||
</dependency>
|
||||
<!-- mysql -->
|
||||
<dependency>
|
||||
<groupId>mysql</groupId>
|
||||
|
|
|
@ -20,6 +20,7 @@ spring.freemarker.settings.number_format=0.##########
|
|||
|
||||
### mybatis
|
||||
mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml
|
||||
#mybatis.type-aliases-package=com.xxl.job.admin.core.model
|
||||
|
||||
### xxl-job, datasource
|
||||
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xxl_job?Unicode=true&characterEncoding=UTF-8
|
||||
|
@ -27,14 +28,18 @@ spring.datasource.username=root
|
|||
spring.datasource.password=root_pwd
|
||||
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
|
||||
|
||||
spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource
|
||||
spring.datasource.tomcat.max-wait=10000
|
||||
spring.datasource.tomcat.max-active=30
|
||||
spring.datasource.tomcat.test-on-borrow=true
|
||||
spring.datasource.tomcat.validation-query=SELECT 1
|
||||
spring.datasource.tomcat.validation-interval=30000
|
||||
### datasource-pool
|
||||
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
|
||||
spring.datasource.hikari.minimum-idle=10
|
||||
spring.datasource.hikari.maximum-pool-size=30
|
||||
spring.datasource.hikari.auto-commit=true
|
||||
spring.datasource.hikari.idle-timeout=30000
|
||||
spring.datasource.hikari.pool-name=HikariCP
|
||||
spring.datasource.hikari.max-lifetime=900000
|
||||
spring.datasource.hikari.connection-timeout=10000
|
||||
spring.datasource.hikari.connection-test-query=SELECT 1
|
||||
|
||||
### xxl-job email
|
||||
### xxl-job, email
|
||||
spring.mail.host=smtp.qq.com
|
||||
spring.mail.port=25
|
||||
spring.mail.username=xxx@qq.com
|
||||
|
|
Loading…
Reference in New Issue