diff --git a/doc/XXL-JOB-English-Documentation.md b/doc/XXL-JOB-English-Documentation.md index 155f4468..af68f6d0 100644 --- a/doc/XXL-JOB-English-Documentation.md +++ b/doc/XXL-JOB-English-Documentation.md @@ -504,7 +504,7 @@ Concrete contet describe as follows: - + @@ -663,7 +663,7 @@ If you want to create a new executor,please click "+新增执行器" button: ### Description of executor attributes - AppName: the unique identity of the executor cluster,executor will registe automatically and periodically by appName so that it can be scheduled. + Appname: the unique identity of the executor cluster,executor will registe automatically and periodically by appname so that it can be scheduled. 名称: the name of ther executor,it is used to describe the executor. 排序: the order of executor,it will be used in the place where need to select executor. 注册方式:which way the schedule center used to acquire executor address through; diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index adaeed09..b2a2e38a 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -617,7 +617,7 @@ public XxlJobSpringExecutor xxlJobExecutor() { logger.info(">>>>>>>>>>> xxl-job config init."); XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor(); xxlJobSpringExecutor.setAdminAddresses(adminAddresses); - xxlJobSpringExecutor.setAppName(appName); + xxlJobSpringExecutor.setAppname(appname); xxlJobSpringExecutor.setIp(ip); xxlJobSpringExecutor.setPort(port); xxlJobSpringExecutor.setAccessToken(accessToken); diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java index e87666e8..f1d1168a 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java @@ -43,11 +43,11 @@ public class JobGroupController { public Map pageList(HttpServletRequest request, @RequestParam(required = false, defaultValue = "0") int start, @RequestParam(required = false, defaultValue = "10") int length, - String appName, String title) { + String appname, String title) { // page query - List list = xxlJobGroupDao.pageList(start, length, appName, title); - int list_count = xxlJobGroupDao.pageListCount(start, length, appName, title); + List list = xxlJobGroupDao.pageList(start, length, appname, title); + int list_count = xxlJobGroupDao.pageListCount(start, length, appname, title); // package result Map maps = new HashMap(); @@ -62,10 +62,10 @@ public class JobGroupController { public ReturnT save(XxlJobGroup xxlJobGroup){ // valid - if (xxlJobGroup.getAppName()==null || xxlJobGroup.getAppName().trim().length()==0) { + if (xxlJobGroup.getAppname()==null || xxlJobGroup.getAppname().trim().length()==0) { return new ReturnT(500, (I18nUtil.getString("system_please_input")+"AppName") ); } - if (xxlJobGroup.getAppName().length()<4 || xxlJobGroup.getAppName().length()>64) { + if (xxlJobGroup.getAppname().length()<4 || xxlJobGroup.getAppname().length()>64) { return new ReturnT(500, I18nUtil.getString("jobgroup_field_appname_length") ); } if (xxlJobGroup.getTitle()==null || xxlJobGroup.getTitle().trim().length()==0) { @@ -91,10 +91,10 @@ public class JobGroupController { @ResponseBody public ReturnT update(XxlJobGroup xxlJobGroup){ // valid - if (xxlJobGroup.getAppName()==null || xxlJobGroup.getAppName().trim().length()==0) { + if (xxlJobGroup.getAppname()==null || xxlJobGroup.getAppname().trim().length()==0) { return new ReturnT(500, (I18nUtil.getString("system_please_input")+"AppName") ); } - if (xxlJobGroup.getAppName().length()<4 || xxlJobGroup.getAppName().length()>64) { + if (xxlJobGroup.getAppname().length()<4 || xxlJobGroup.getAppname().length()>64) { return new ReturnT(500, I18nUtil.getString("jobgroup_field_appname_length") ); } if (xxlJobGroup.getTitle()==null || xxlJobGroup.getTitle().trim().length()==0) { @@ -102,7 +102,7 @@ public class JobGroupController { } if (xxlJobGroup.getAddressType() == 0) { // 0=自动注册 - List registryList = findRegistryByAppName(xxlJobGroup.getAppName()); + List registryList = findRegistryByAppName(xxlJobGroup.getAppname()); String addressListStr = null; if (registryList!=null && !registryList.isEmpty()) { Collections.sort(registryList); @@ -130,14 +130,14 @@ public class JobGroupController { return (ret>0)?ReturnT.SUCCESS:ReturnT.FAIL; } - private List findRegistryByAppName(String appNameParam){ + private List findRegistryByAppName(String appnameParam){ HashMap> appAddressMap = new HashMap>(); List list = xxlJobRegistryDao.findAll(RegistryConfig.DEAD_TIMEOUT, new Date()); if (list != null) { for (XxlJobRegistry item: list) { if (RegistryConfig.RegistType.EXECUTOR.name().equals(item.getRegistryGroup())) { - String appName = item.getRegistryKey(); - List registryList = appAddressMap.get(appName); + String appname = item.getRegistryKey(); + List registryList = appAddressMap.get(appname); if (registryList == null) { registryList = new ArrayList(); } @@ -145,11 +145,11 @@ public class JobGroupController { if (!registryList.contains(item.getRegistryValue())) { registryList.add(item.getRegistryValue()); } - appAddressMap.put(appName, registryList); + appAddressMap.put(appname, registryList); } } } - return appAddressMap.get(appNameParam); + return appAddressMap.get(appnameParam); } @RequestMapping("/remove") diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobGroup.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobGroup.java index 4a37dd7f..f87a7a68 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobGroup.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobGroup.java @@ -10,7 +10,7 @@ import java.util.List; public class XxlJobGroup { private int id; - private String appName; + private String appname; private String title; private int addressType; // 执行器地址类型:0=自动注册、1=手动录入 private String addressList; // 执行器地址列表,多地址逗号分隔(手动录入) @@ -32,12 +32,12 @@ public class XxlJobGroup { this.id = id; } - public String getAppName() { - return appName; + public String getAppname() { + return appname; } - public void setAppName(String appName) { - this.appName = appName; + public void setAppname(String appname) { + this.appname = appname; } public String getTitle() { diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java index 1e91014f..5c23237d 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java @@ -46,8 +46,8 @@ public class JobRegistryMonitorHelper { if (list != null) { for (XxlJobRegistry item: list) { if (RegistryConfig.RegistType.EXECUTOR.name().equals(item.getRegistryGroup())) { - String appName = item.getRegistryKey(); - List registryList = appAddressMap.get(appName); + String appname = item.getRegistryKey(); + List registryList = appAddressMap.get(appname); if (registryList == null) { registryList = new ArrayList(); } @@ -55,14 +55,14 @@ public class JobRegistryMonitorHelper { if (!registryList.contains(item.getRegistryValue())) { registryList.add(item.getRegistryValue()); } - appAddressMap.put(appName, registryList); + appAddressMap.put(appname, registryList); } } } // fresh group address for (XxlJobGroup group: groupList) { - List registryList = appAddressMap.get(group.getAppName()); + List registryList = appAddressMap.get(group.getAppname()); String addressListStr = null; if (registryList!=null && !registryList.isEmpty()) { Collections.sort(registryList); diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobGroupDao.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobGroupDao.java index a0910249..b608d9fb 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobGroupDao.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobGroupDao.java @@ -26,12 +26,12 @@ public interface XxlJobGroupDao { public List pageList(@Param("offset") int offset, @Param("pagesize") int pagesize, - @Param("appName") String appName, + @Param("appname") String appname, @Param("title") String title); public int pageListCount(@Param("offset") int offset, @Param("pagesize") int pagesize, - @Param("appName") String appName, + @Param("appname") String appname, @Param("title") String title); } diff --git a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml index bd893cc5..7635214a 100644 --- a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml +++ b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml @@ -5,7 +5,7 @@ - + @@ -34,12 +34,12 @@ INSERT INTO xxl_job_group ( `app_name`, `title`, `address_type`, `address_list`) - values ( #{appName}, #{title}, #{addressType}, #{addressList}); + values ( #{appname}, #{title}, #{addressType}, #{addressList}); UPDATE xxl_job_group - SET `app_name` = #{appName}, + SET `app_name` = #{appname}, `title` = #{title}, `address_type` = #{addressType}, `address_list` = #{addressList} @@ -61,8 +61,8 @@ SELECT FROM xxl_job_group AS t - - AND t.app_name like CONCAT(CONCAT('%', #{appName}), '%') + + AND t.app_name like CONCAT(CONCAT('%', #{appname}), '%') AND t.title like CONCAT(CONCAT('%', #{title}), '%') @@ -76,8 +76,8 @@ SELECT count(1) FROM xxl_job_group AS t - - AND t.app_name like CONCAT(CONCAT('%', #{appName}), '%') + + AND t.app_name like CONCAT(CONCAT('%', #{appname}), '%') AND t.title like CONCAT(CONCAT('%', #{title}), '%') diff --git a/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js b/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js index e950496f..5eb65598 100644 --- a/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js +++ b/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js @@ -10,7 +10,7 @@ $(function() { type:"post", data : function ( d ) { var obj = {}; - obj.appName = $('#appName').val(); + obj.appname = $('#appname').val(); obj.title = $('#title').val(); obj.start = d.start; obj.length = d.length; @@ -26,7 +26,7 @@ $(function() { "visible" : false }, { - "data": 'appName', + "data": 'appname', "visible" : true, "width":'30%' }, @@ -196,7 +196,7 @@ $(function() { errorClass : 'help-block', focusInvalid : true, rules : { - appName : { + appname : { required : true, rangelength:[4,64], myValid01 : true @@ -207,7 +207,7 @@ $(function() { } }, messages : { - appName : { + appname : { required : I18n.system_please_input+"AppName", rangelength: I18n.jobgroup_field_appname_length , myValid01: I18n.jobgroup_field_appname_limit @@ -277,7 +277,7 @@ $(function() { var row = tableData['key'+id]; $("#updateModal .form input[name='id']").val( row.id ); - $("#updateModal .form input[name='appName']").val( row.appName ); + $("#updateModal .form input[name='appname']").val( row.appname ); $("#updateModal .form input[name='title']").val( row.title ); // 注册方式 @@ -293,7 +293,7 @@ $(function() { errorClass : 'help-block', focusInvalid : true, rules : { - appName : { + appname : { required : true, rangelength:[4,64], myValid01 : true @@ -304,7 +304,7 @@ $(function() { } }, messages : { - appName : { + appname : { required : I18n.system_please_input+"AppName", rangelength: I18n.jobgroup_field_appname_length , myValid01: I18n.jobgroup_field_appname_limit diff --git a/xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl b/xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl index dc53f2ed..6ef0d7c6 100644 --- a/xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl +++ b/xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl @@ -28,7 +28,7 @@
AppName - +
@@ -53,7 +53,7 @@ ID - AppName + AppName ${I18n.jobgroup_field_title} ${I18n.jobgroup_field_addressType} OnLine ${I18n.jobgroup_field_registryList} @@ -81,7 +81,7 @@
-
+
@@ -125,7 +125,7 @@
-
+
diff --git a/xxl-job-admin/src/main/resources/templates/user/user.index.ftl b/xxl-job-admin/src/main/resources/templates/user/user.index.ftl index 9902055e..01203982 100644 --- a/xxl-job-admin/src/main/resources/templates/user/user.index.ftl +++ b/xxl-job-admin/src/main/resources/templates/user/user.index.ftl @@ -108,7 +108,7 @@
<#if groupList?exists && groupList?size gt 0> <#list groupList as item> - ${item.title}(${item.appName})
+ ${item.title}(${item.appname})
@@ -158,7 +158,7 @@
<#if groupList?exists && groupList?size gt 0> <#list groupList as item> - ${item.title}(${item.appName})
+ ${item.title}(${item.appname})
diff --git a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobGroupDaoTest.java b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobGroupDaoTest.java index 44c916a3..0f4edc3b 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobGroupDaoTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobGroupDaoTest.java @@ -23,7 +23,7 @@ public class XxlJobGroupDaoTest { List list2 = xxlJobGroupDao.findByAddressType(0); XxlJobGroup group = new XxlJobGroup(); - group.setAppName("setAppName"); + group.setAppname("setAppName"); group.setTitle("setTitle"); group.setAddressType(0); group.setAddressList("setAddressList"); @@ -31,7 +31,7 @@ public class XxlJobGroupDaoTest { int ret = xxlJobGroupDao.save(group); XxlJobGroup group2 = xxlJobGroupDao.load(group.getId()); - group2.setAppName("setAppName2"); + group2.setAppname("setAppName2"); group2.setTitle("setTitle2"); group2.setAddressType(2); group2.setAddressList("setAddressList2"); diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java b/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java index c8a5d2f2..86936365 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java @@ -135,7 +135,7 @@ public class XxlJobExecutor { // ---------------------- executor-server (rpc provider) ---------------------- private EmbedServer embedServer = null; - private void initEmbedServer(String address, String ip, int port, String appName, String accessToken) throws Exception { + private void initEmbedServer(String address, String ip, int port, String appname, String accessToken) throws Exception { // fill ip port port = port>0?port: NetUtil.findAvailablePort(9999); @@ -149,7 +149,7 @@ public class XxlJobExecutor { // start embedServer = new EmbedServer(); - embedServer.start(address, port, appName, accessToken); + embedServer.start(address, port, appname, accessToken); } private void stopEmbedServer() {