Browse Source

Log组件参数处理fix

xuxueli 7 years ago
parent
commit
239d3e684c

+ 1 - 1
xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobLogger.java View File

55
      */
55
      */
56
     public static void log(String appendLogPattern, Object ... appendLogArguments) {
56
     public static void log(String appendLogPattern, Object ... appendLogArguments) {
57
 
57
 
58
-    	FormattingTuple ft = MessageFormatter.format(appendLogPattern, appendLogArguments);
58
+    	FormattingTuple ft = MessageFormatter.arrayFormat(appendLogPattern, appendLogArguments);
59
         String appendLog = ft.getMessage();
59
         String appendLog = ft.getMessage();
60
 
60
 
61
         /*appendLog = appendLogPattern;
61
         /*appendLog = appendLogPattern;

+ 3 - 3
xxl-job-executor-samples/xxl-job-executor-sample-jfinal/src/main/java/com/xuxueli/executor/sample/jfinal/jobhandler/ShardingJobHandler.java View File

18
 
18
 
19
 		// 分片参数
19
 		// 分片参数
20
 		ShardingUtil.ShardingVO shardingVO = ShardingUtil.getShardingVo();
20
 		ShardingUtil.ShardingVO shardingVO = ShardingUtil.getShardingVo();
21
-		XxlJobLogger.log("分片参数:当前分片序号 = {0}, 总分片数 = {1}", shardingVO.getIndex(), shardingVO.getTotal());
21
+		XxlJobLogger.log("分片参数:当前分片序号 = {}, 总分片数 = {}", shardingVO.getIndex(), shardingVO.getTotal());
22
 
22
 
23
 		// 业务逻辑
23
 		// 业务逻辑
24
 		for (int i = 0; i < shardingVO.getTotal(); i++) {
24
 		for (int i = 0; i < shardingVO.getTotal(); i++) {
25
 			if (i == shardingVO.getIndex()) {
25
 			if (i == shardingVO.getIndex()) {
26
-				XxlJobLogger.log("第 {0} 片, 命中分片开始处理", i);
26
+				XxlJobLogger.log("第 {} 片, 命中分片开始处理", i);
27
 			} else {
27
 			} else {
28
-				XxlJobLogger.log("第 {0} 片, 忽略", i);
28
+				XxlJobLogger.log("第 {} 片, 忽略", i);
29
 			}
29
 			}
30
 		}
30
 		}
31
 
31
 

+ 3 - 3
xxl-job-executor-samples/xxl-job-executor-sample-nutz/src/main/java/com/xuxueli/executor/sample/nutz/jobhandler/ShardingJobHandler.java View File

22
 
22
 
23
 		// 分片参数
23
 		// 分片参数
24
 		ShardingUtil.ShardingVO shardingVO = ShardingUtil.getShardingVo();
24
 		ShardingUtil.ShardingVO shardingVO = ShardingUtil.getShardingVo();
25
-		XxlJobLogger.log("分片参数:当前分片序号 = {0}, 总分片数 = {1}", shardingVO.getIndex(), shardingVO.getTotal());
25
+		XxlJobLogger.log("分片参数:当前分片序号 = {}, 总分片数 = {}", shardingVO.getIndex(), shardingVO.getTotal());
26
 
26
 
27
 		// 业务逻辑
27
 		// 业务逻辑
28
 		for (int i = 0; i < shardingVO.getTotal(); i++) {
28
 		for (int i = 0; i < shardingVO.getTotal(); i++) {
29
 			if (i == shardingVO.getIndex()) {
29
 			if (i == shardingVO.getIndex()) {
30
-				XxlJobLogger.log("第 {0} 片, 命中分片开始处理", i);
30
+				XxlJobLogger.log("第 {} 片, 命中分片开始处理", i);
31
 			} else {
31
 			} else {
32
-				XxlJobLogger.log("第 {0} 片, 忽略", i);
32
+				XxlJobLogger.log("第 {} 片, 忽略", i);
33
 			}
33
 			}
34
 		}
34
 		}
35
 
35
 

+ 3 - 3
xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/java/com/xxl/job/executor/service/jobhandler/ShardingJobHandler.java View File

22
 
22
 
23
 		// 分片参数
23
 		// 分片参数
24
 		ShardingUtil.ShardingVO shardingVO = ShardingUtil.getShardingVo();
24
 		ShardingUtil.ShardingVO shardingVO = ShardingUtil.getShardingVo();
25
-		XxlJobLogger.log("分片参数:当前分片序号 = {0}, 总分片数 = {1}", shardingVO.getIndex(), shardingVO.getTotal());
25
+		XxlJobLogger.log("分片参数:当前分片序号 = {}, 总分片数 = {}", shardingVO.getIndex(), shardingVO.getTotal());
26
 
26
 
27
 		// 业务逻辑
27
 		// 业务逻辑
28
 		for (int i = 0; i < shardingVO.getTotal(); i++) {
28
 		for (int i = 0; i < shardingVO.getTotal(); i++) {
29
 			if (i == shardingVO.getIndex()) {
29
 			if (i == shardingVO.getIndex()) {
30
-				XxlJobLogger.log("第 {0} 片, 命中分片开始处理", i);
30
+				XxlJobLogger.log("第 {} 片, 命中分片开始处理", i);
31
 			} else {
31
 			} else {
32
-				XxlJobLogger.log("第 {0} 片, 忽略", i);
32
+				XxlJobLogger.log("第 {} 片, 忽略", i);
33
 			}
33
 			}
34
 		}
34
 		}
35
 
35
 

xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/Application.java → xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/XxlJobExecutorApplication.java View File

4
 import org.springframework.boot.autoconfigure.SpringBootApplication;
4
 import org.springframework.boot.autoconfigure.SpringBootApplication;
5
 
5
 
6
 @SpringBootApplication
6
 @SpringBootApplication
7
-public class Application {
7
+public class XxlJobExecutorApplication {
8
 
8
 
9
 	public static void main(String[] args) {
9
 	public static void main(String[] args) {
10
-        SpringApplication.run(Application.class, args);
10
+        SpringApplication.run(XxlJobExecutorApplication.class, args);
11
 	}
11
 	}
12
 
12
 
13
 }
13
 }

+ 3 - 3
xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/service/jobhandler/ShardingJobHandler.java View File

22
 
22
 
23
 		// 分片参数
23
 		// 分片参数
24
 		ShardingUtil.ShardingVO shardingVO = ShardingUtil.getShardingVo();
24
 		ShardingUtil.ShardingVO shardingVO = ShardingUtil.getShardingVo();
25
-		XxlJobLogger.log("分片参数:当前分片序号 = {0}, 总分片数 = {1}", shardingVO.getIndex(), shardingVO.getTotal());
25
+		XxlJobLogger.log("分片参数:当前分片序号 = {}, 总分片数 = {}", shardingVO.getIndex(), shardingVO.getTotal());
26
 
26
 
27
 		// 业务逻辑
27
 		// 业务逻辑
28
 		for (int i = 0; i < shardingVO.getTotal(); i++) {
28
 		for (int i = 0; i < shardingVO.getTotal(); i++) {
29
 			if (i == shardingVO.getIndex()) {
29
 			if (i == shardingVO.getIndex()) {
30
-				XxlJobLogger.log("第 {0} 片, 命中分片开始处理", i);
30
+				XxlJobLogger.log("第 {} 片, 命中分片开始处理", i);
31
 			} else {
31
 			} else {
32
-				XxlJobLogger.log("第 {0} 片, 忽略", i);
32
+				XxlJobLogger.log("第 {} 片, 忽略", i);
33
 			}
33
 			}
34
 		}
34
 		}
35
 
35