Sfoglia il codice sorgente

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

xueli.xue 8 anni fa
parent
commit
ff5a5bcd4a

+ 4 - 10
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java Vedi File

@@ -151,13 +151,6 @@ public class XxlJobServiceImpl implements IXxlJobService {
151 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 154
 		// childJobKey valid
162 155
 		if (StringUtils.isNotBlank(jobInfo.getChildJobKey())) {
163 156
 			String[] childJobKeys = jobInfo.getChildJobKey().split(",");
@@ -187,13 +180,14 @@ public class XxlJobServiceImpl implements IXxlJobService {
187 180
 		exists_jobInfo.setExecutorRouteStrategy(jobInfo.getExecutorRouteStrategy());
188 181
 		exists_jobInfo.setExecutorHandler(jobInfo.getExecutorHandler());
189 182
 		exists_jobInfo.setExecutorParam(jobInfo.getExecutorParam());
190
-		exists_jobInfo.setGlueType(jobInfo.getGlueType());
191 183
 		exists_jobInfo.setChildJobKey(jobInfo.getChildJobKey());
192 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 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 191
             return ret?ReturnT.SUCCESS:ReturnT.FAIL;
198 192
         } catch (SchedulerException e) {
199 193
             logger.error("", e);

+ 1 - 1
xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl Vedi File

@@ -264,7 +264,7 @@ logging.info("脚本文件:" + sys.argv[0])
264 264
                     <div class="form-group">
265 265
                         <label for="firstname" class="col-sm-2 control-label">运行模式<font color="red">*</font></label>
266 266
                         <div class="col-sm-4">
267
-                            <select class="form-control glueType" name="glueType" >
267
+                            <select class="form-control glueType" name="glueType" disabled >
268 268
 							<#list GlueTypeEnum as item>
269 269
                                 <option value="${item}" >${item.desc}</option>
270 270
 							</#list>