Skip to content

熊鹏飞 / xxljob220

Go to a project
Commit 7d621452 by xuxueli
Options

Merge branch 'master'

parents 1a02e2e1 23c549a3
Expand all
Inline Side-by-side
Showing with 69 additions and 43 deletions
pom.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<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>1.9.2-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
...@@ -17,6 +17,10 @@ ...@@ -17,6 +17,10 @@
</modules> </modules>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<javax.servlet-api.version>3.1.0</javax.servlet-api.version> <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
<javax.servlet.jsp-api.version>2.3.3</javax.servlet.jsp-api.version> <javax.servlet.jsp-api.version>2.3.3</javax.servlet.jsp-api.version>
...@@ -70,7 +74,7 @@ ...@@ -70,7 +74,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>2.2</version> <version>2.5</version>
<configuration> <configuration>
<archiveClasses>false</archiveClasses> <archiveClasses>false</archiveClasses>
</configuration> </configuration>
...@@ -133,7 +137,7 @@ ...@@ -133,7 +137,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version> <version>2.10.3</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
......
xxl-job-admin/Dockerfile 0 → 100644
FROM tomcat:8.0-jre8-slim
MAINTAINER xuxueli
ADD target/xxl-job-admin*.war /usr/local/tomcat/webapps/xxl-job-admin.war
CMD ["catalina.sh", "run"]
\ No newline at end of file
xxl-job-admin/pom.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.xuxueli</groupId> <groupId>com.xuxueli</groupId>
<artifactId>xxl-job</artifactId> <artifactId>xxl-job</artifactId>
<version>1.9.2-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>xxl-job-admin</artifactId> <artifactId>xxl-job-admin</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
......
xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLFU.java
...@@ -31,7 +31,7 @@ public class ExecutorRouteLFU extends ExecutorRouter { ...@@ -31,7 +31,7 @@ public class ExecutorRouteLFU extends ExecutorRouter {
HashMap<String, Integer> lfuItemMap = jobLfuMap.get(jobId); // Key排序可以用TreeMap+构造入参Compare；Value排序暂时只能通过ArrayList； HashMap<String, Integer> lfuItemMap = jobLfuMap.get(jobId); // Key排序可以用TreeMap+构造入参Compare；Value排序暂时只能通过ArrayList；
if (lfuItemMap == null) { if (lfuItemMap == null) {
lfuItemMap = new HashMap<String, Integer>(); lfuItemMap = new HashMap<String, Integer>();
jobLfuMap.put(jobId, lfuItemMap); jobLfuMap.putIfAbsent(jobId, lfuItemMap); // 避免重复覆盖
} }
for (String address: addressList) { for (String address: addressList) {
if (!lfuItemMap.containsKey(address) || lfuItemMap.get(address) >1000000 ) { if (!lfuItemMap.containsKey(address) || lfuItemMap.get(address) >1000000 ) {
......
xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java
...@@ -37,7 +37,7 @@ public class ExecutorRouteLRU extends ExecutorRouter { ...@@ -37,7 +37,7 @@ public class ExecutorRouteLRU extends ExecutorRouter {
* b、removeEldestEntry：新增元素时将会调用，返回true时会删除最老元素；可封装LinkedHashMap并重写该方法，比如定义最大容量，超出是返回true即可实现固定长度的LRU算法； * b、removeEldestEntry：新增元素时将会调用，返回true时会删除最老元素；可封装LinkedHashMap并重写该方法，比如定义最大容量，超出是返回true即可实现固定长度的LRU算法；
*/ */
lruItem = new LinkedHashMap<>(16, 0.75f, true); lruItem = new LinkedHashMap<>(16, 0.75f, true);
jobLRUMap.put(jobId, lruItem); jobLRUMap.putIfAbsent(jobId, lruItem);
} }
// put // put
......
xxl-job-admin/src/main/resources/i18n/message.properties
admin_name=任务调度中心 admin_name=任务调度中心
admin_name_full=分布式任务调度平台XXL-JOB admin_name_full=分布式任务调度平台XXL-JOB
admin_version=1.9.2 (快照版) admin_version=2.0.0-SNAPSHOT
## system ## system
system_tips=系统提示 system_tips=系统提示
......
xxl-job-admin/src/main/resources/i18n/message_en.properties
admin_name=Scheduling Center admin_name=Scheduling Center
admin_name_full=Distributed Task Scheduling Platform XXL-JOB admin_name_full=Distributed Task Scheduling Platform XXL-JOB
admin_version=1.9.2 (SNAPSHOT) admin_version=2.0.0-SNAPSHOT
## system ## system
system_tips=System message system_tips=System message
...@@ -185,7 +185,7 @@ jobgroup_field_addressType_limit=Manually registration type, the machine address ...@@ -185,7 +185,7 @@ jobgroup_field_addressType_limit=Manually registration type, the machine address
jobgroup_field_registryList=machine address jobgroup_field_registryList=machine address
jobgroup_field_registryList_unvalid=registry machine address is illegal jobgroup_field_registryList_unvalid=registry machine address is illegal
jobgroup_field_registryList_placeholder=Please enter the machine address, if there are more than one comma separated jobgroup_field_registryList_placeholder=Please enter the machine address, if there are more than one comma separated
jobgroup_field_appName_limit=Limit the beginning of a lowercase letter, consists of lowercase letters、number and underscores. jobgroup_field_appName_limit=Limit the beginning of a lowercase letter, consists of lowercase letters、number and hyphen.
jobgroup_field_appName_length=AppName length is limited to 4~64 jobgroup_field_appName_length=AppName length is limited to 4~64
jobgroup_field_title_length=Title length is limited to 4~12 jobgroup_field_title_length=Title length is limited to 4~12
jobgroup_field_order_digits=Please enter a positive integer jobgroup_field_order_digits=Please enter a positive integer
......
xxl-job-core/pom.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.xuxueli</groupId> <groupId>com.xuxueli</groupId>
<artifactId>xxl-job</artifactId> <artifactId>xxl-job</artifactId>
<version>1.9.2-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>xxl-job-core</artifactId> <artifactId>xxl-job-core</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
......
xxl-job-executor-samples/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.xuxueli</groupId> <groupId>com.xuxueli</groupId>
<artifactId>xxl-job</artifactId> <artifactId>xxl-job</artifactId>
<version>1.9.2-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>xxl-job-executor-samples</artifactId> <artifactId>xxl-job-executor-samples</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
......
xxl-job-executor-samples/xxl-job-executor-sample-jfinal/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>xxl-job-executor-samples</artifactId> <artifactId>xxl-job-executor-samples</artifactId>
<groupId>com.xuxueli</groupId> <groupId>com.xuxueli</groupId>
<version>1.9.2-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>xxl-job-executor-sample-jfinal</artifactId> <artifactId>xxl-job-executor-sample-jfinal</artifactId>
......
xxl-job-executor-samples/xxl-job-executor-sample-nutz/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.xuxueli</groupId> <groupId>com.xuxueli</groupId>
<artifactId>xxl-job-executor-samples</artifactId> <artifactId>xxl-job-executor-samples</artifactId>
<version>1.9.2-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>xxl-job-executor-sample-nutz</artifactId> <artifactId>xxl-job-executor-sample-nutz</artifactId>
......
xxl-job-executor-samples/xxl-job-executor-sample-spring/pom.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.xuxueli</groupId> <groupId>com.xuxueli</groupId>
<artifactId>xxl-job-executor-samples</artifactId> <artifactId>xxl-job-executor-samples</artifactId>
<version>1.9.2-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>xxl-job-executor-sample-spring</artifactId> <artifactId>xxl-job-executor-sample-spring</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
......
xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.xuxueli</groupId> <groupId>com.xuxueli</groupId>
<artifactId>xxl-job-executor-samples</artifactId> <artifactId>xxl-job-executor-samples</artifactId>
<version>1.9.2-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>xxl-job-executor-sample-springboot</artifactId> <artifactId>xxl-job-executor-sample-springboot</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment