瀏覽代碼

任务运行模式属性改为只读;

xueli.xue 8 年之前
父節點
當前提交
ff5a5bcd4a

+ 4 - 10
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java 查看文件

151
 			return new ReturnT<String>(500, "路由策略非法");
151
 			return new ReturnT<String>(500, "路由策略非法");
152
 		}
152
 		}
153
 
153
 
154
-		if (GlueTypeEnum.match(jobInfo.getGlueType()) == null) {
155
-			return new ReturnT<String>(500, "运行模式非法非法");
156
-		}
157
-		if (GlueTypeEnum.BEAN==GlueTypeEnum.match(jobInfo.getGlueType()) && StringUtils.isBlank(jobInfo.getExecutorHandler())) {
158
-			return new ReturnT<String>(500, "请输入“JobHandler”");
159
-		}
160
-
161
 		// childJobKey valid
154
 		// childJobKey valid
162
 		if (StringUtils.isNotBlank(jobInfo.getChildJobKey())) {
155
 		if (StringUtils.isNotBlank(jobInfo.getChildJobKey())) {
163
 			String[] childJobKeys = jobInfo.getChildJobKey().split(",");
156
 			String[] childJobKeys = jobInfo.getChildJobKey().split(",");
187
 		exists_jobInfo.setExecutorRouteStrategy(jobInfo.getExecutorRouteStrategy());
180
 		exists_jobInfo.setExecutorRouteStrategy(jobInfo.getExecutorRouteStrategy());
188
 		exists_jobInfo.setExecutorHandler(jobInfo.getExecutorHandler());
181
 		exists_jobInfo.setExecutorHandler(jobInfo.getExecutorHandler());
189
 		exists_jobInfo.setExecutorParam(jobInfo.getExecutorParam());
182
 		exists_jobInfo.setExecutorParam(jobInfo.getExecutorParam());
190
-		exists_jobInfo.setGlueType(jobInfo.getGlueType());
191
 		exists_jobInfo.setChildJobKey(jobInfo.getChildJobKey());
183
 		exists_jobInfo.setChildJobKey(jobInfo.getChildJobKey());
192
         xxlJobInfoDao.update(exists_jobInfo);
184
         xxlJobInfoDao.update(exists_jobInfo);
193
 
185
 
186
+		// fresh quartz
187
+		String qz_group = String.valueOf(exists_jobInfo.getJobGroup());
188
+		String qz_name = String.valueOf(exists_jobInfo.getId());
194
         try {
189
         try {
195
-            // fresh quartz
196
-            boolean ret = XxlJobDynamicScheduler.rescheduleJob(String.valueOf(exists_jobInfo.getJobGroup()), String.valueOf(exists_jobInfo.getId()), exists_jobInfo.getJobCron());
190
+            boolean ret = XxlJobDynamicScheduler.rescheduleJob(qz_group, qz_name, exists_jobInfo.getJobCron());
197
             return ret?ReturnT.SUCCESS:ReturnT.FAIL;
191
             return ret?ReturnT.SUCCESS:ReturnT.FAIL;
198
         } catch (SchedulerException e) {
192
         } catch (SchedulerException e) {
199
             logger.error("", e);
193
             logger.error("", e);

+ 1 - 1
xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl 查看文件

264
                     <div class="form-group">
264
                     <div class="form-group">
265
                         <label for="firstname" class="col-sm-2 control-label">运行模式<font color="red">*</font></label>
265
                         <label for="firstname" class="col-sm-2 control-label">运行模式<font color="red">*</font></label>
266
                         <div class="col-sm-4">
266
                         <div class="col-sm-4">
267
-                            <select class="form-control glueType" name="glueType" >
267
+                            <select class="form-control glueType" name="glueType" disabled >
268
 							<#list GlueTypeEnum as item>
268
 							<#list GlueTypeEnum as item>
269
                                 <option value="${item}" >${item.desc}</option>
269
                                 <option value="${item}" >${item.desc}</option>
270
 							</#list>
270
 							</#list>