Kaynağa Gözat

1、新增左侧菜单"运行报表";

xuxueli 7 yıl önce
ebeveyn
işleme
af83c58d4a

+ 3 - 2
doc/XXL-JOB官方文档.md Dosyayı Görüntüle

1237
 - 18、核心依赖Core内部国际化处理;
1237
 - 18、核心依赖Core内部国际化处理;
1238
 - 19、默认Quartz线程数调整为50;
1238
 - 19、默认Quartz线程数调整为50;
1239
 - 20、调度全异步处理:任务触发之后,推送到调度队列,多线程并发处理调度请求,提高任务调度速率的同时,避免因网络问题导致quartz调度线程阻塞的问题;
1239
 - 20、调度全异步处理:任务触发之后,推送到调度队列,多线程并发处理调度请求,提高任务调度速率的同时,避免因网络问题导致quartz调度线程阻塞的问题;
1240
-- 21、[迭代中]任务失败重试优化:收敛并废弃现有失败重试策略,新增任务属性 "失败重试次数",支持自定义失败重试次数,任务失败时将会根据该值进行失败重试
1241
-- 22、[迭代中]调度线程池改为协程方式实现,大幅降低系统内存消耗
1240
+- 21、新增左侧菜单"运行报表"
1241
+- 22、[迭代中]任务失败重试优化:收敛并废弃现有失败重试策略,新增任务属性 "失败重试次数",支持自定义失败重试次数,任务失败时将会根据该值进行失败重试
1242
 
1242
 
1243
 
1243
 
1244
 ### TODO LIST
1244
 ### TODO LIST
1263
 - 19、流程任务,支持参数传递;
1263
 - 19、流程任务,支持参数传递;
1264
 - 20、SimpleTrigger 支持;
1264
 - 20、SimpleTrigger 支持;
1265
 - 21、支持通过API服务操作任务信息;
1265
 - 21、支持通过API服务操作任务信息;
1266
+- 22、调度线程池改为协程方式实现,大幅降低系统内存消耗;
1266
 
1267
 
1267
 
1268
 
1268
 ## 七、其他
1269
 ## 七、其他

+ 2 - 2
xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobTriggerPoolHelper.java Dosyayı Görüntüle

20
     // ---------------------- trigger pool ----------------------
20
     // ---------------------- trigger pool ----------------------
21
 
21
 
22
     private ThreadPoolExecutor triggerPool = new ThreadPoolExecutor(
22
     private ThreadPoolExecutor triggerPool = new ThreadPoolExecutor(
23
-            50,
24
-            500,
23
+            20,
24
+            200,
25
             60L,
25
             60L,
26
             TimeUnit.SECONDS,
26
             TimeUnit.SECONDS,
27
             new LinkedBlockingQueue<Runnable>(100000),
27
             new LinkedBlockingQueue<Runnable>(100000),

+ 4 - 3
xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl Dosyayı Görüntüle

93
 			<!-- sidebar menu: : style can be found in sidebar.less -->
93
 			<!-- sidebar menu: : style can be found in sidebar.less -->
94
 			<ul class="sidebar-menu">
94
 			<ul class="sidebar-menu">
95
                 <li class="header">${I18n.system_nav}</li>
95
                 <li class="header">${I18n.system_nav}</li>
96
-				<li class="nav-click <#if pageName == "jobinfo">active</#if>" ><a href="${request.contextPath}/jobinfo"><i class="fa fa-circle-o text-aqua"></i><span>${I18n.jobinfo_name}</span></a></li>
97
-				<li class="nav-click <#if pageName == "joblog">active</#if>" ><a href="${request.contextPath}/joblog"><i class="fa fa-circle-o text-yellow"></i><span>${I18n.joblog_name}</span></a></li>
98
-                <li class="nav-click <#if pageName == "jobgroup">active</#if>" ><a href="${request.contextPath}/jobgroup"><i class="fa fa-circle-o text-green"></i><span>${I18n.jobgroup_name}</span></a></li>
96
+                <li class="nav-click <#if pageName == "index">active</#if>" ><a href="${request.contextPath}/"><i class="fa fa-circle-o text-aqua"></i><span>${I18n.job_dashboard_name}</span></a></li>
97
+				<li class="nav-click <#if pageName == "jobinfo">active</#if>" ><a href="${request.contextPath}/jobinfo"><i class="fa fa-circle-o text-yellow"></i><span>${I18n.jobinfo_name}</span></a></li>
98
+				<li class="nav-click <#if pageName == "joblog">active</#if>" ><a href="${request.contextPath}/joblog"><i class="fa fa-circle-o text-green"></i><span>${I18n.joblog_name}</span></a></li>
99
+                <li class="nav-click <#if pageName == "jobgroup">active</#if>" ><a href="${request.contextPath}/jobgroup"><i class="fa fa-circle-o text-red"></i><span>${I18n.jobgroup_name}</span></a></li>
99
 				<li class="nav-click <#if pageName == "help">active</#if>" ><a href="${request.contextPath}/help"><i class="fa fa-circle-o text-gray"></i><span>${I18n.job_help}</span></a></li>
100
 				<li class="nav-click <#if pageName == "help">active</#if>" ><a href="${request.contextPath}/help"><i class="fa fa-circle-o text-gray"></i><span>${I18n.job_help}</span></a></li>
100
 			</ul>
101
 			</ul>
101
 		</section>
102
 		</section>