第一次提交，修改定时任务，完成新接口，新增完后直接开启等待执行

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java

@@ -8,6 +8,7 @@ import com.xxl.job.admin.core.model.XxlJobUser;
 import com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum;
 import com.xxl.job.admin.core.thread.JobTriggerPoolHelper;
 import com.xxl.job.admin.core.trigger.TriggerTypeEnum;
+import com.xxl.job.admin.core.util.Base64Util;
 import com.xxl.job.admin.core.util.I18nUtil;
 import com.xxl.job.admin.dao.XxlJobGroupDao;
 import com.xxl.job.admin.service.LoginService;
@@ -29,138 +30,201 @@ import java.util.*;
 
 /**
  * index controller
+ *
  * @author xuxueli 2015-12-19 16:13:16
  */
 @Controller
 @RequestMapping("/jobinfo")
 public class JobInfoController {
 
-	@Resource
-	private XxlJobGroupDao xxlJobGroupDao;
-	@Resource
-	private XxlJobService xxlJobService;
-	
-	@RequestMapping
-	public String index(HttpServletRequest request, Model model, @RequestParam(required = false, defaultValue = "-1") int jobGroup) {
-
-		// 枚举-字典
-		model.addAttribute("ExecutorRouteStrategyEnum", ExecutorRouteStrategyEnum.values());	    // 路由策略-列表
-		model.addAttribute("GlueTypeEnum", GlueTypeEnum.values());								// Glue类型-字典
-		model.addAttribute("ExecutorBlockStrategyEnum", ExecutorBlockStrategyEnum.values());	    // 阻塞处理策略-字典
-
-		// 执行器列表
-		List<XxlJobGroup> jobGroupList_all =  xxlJobGroupDao.findAll();
-
-		// filter group
-		List<XxlJobGroup> jobGroupList = filterJobGroupByRole(request, jobGroupList_all);
-		if (jobGroupList==null || jobGroupList.size()==0) {
-			throw new XxlJobException(I18nUtil.getString("jobgroup_empty"));
-		}
-
-		model.addAttribute("JobGroupList", jobGroupList);
-		model.addAttribute("jobGroup", jobGroup);
-
-		return "jobinfo/jobinfo.index";
-	}
-
-	public static List<XxlJobGroup> filterJobGroupByRole(HttpServletRequest request, List<XxlJobGroup> jobGroupList_all){
-		List<XxlJobGroup> jobGroupList = new ArrayList<>();
-		if (jobGroupList_all!=null && jobGroupList_all.size()>0) {
-			XxlJobUser loginUser = (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY);
-			if (loginUser.getRole() == 1) {
-				jobGroupList = jobGroupList_all;
-			} else {
-				List<String> groupIdStrs = new ArrayList<>();
-				if (loginUser.getPermission()!=null && loginUser.getPermission().trim().length()>0) {
-					groupIdStrs = Arrays.asList(loginUser.getPermission().trim().split(","));
-				}
-				for (XxlJobGroup groupItem:jobGroupList_all) {
-					if (groupIdStrs.contains(String.valueOf(groupItem.getId()))) {
-						jobGroupList.add(groupItem);
-					}
-				}
-			}
-		}
-		return jobGroupList;
-	}
-	public static void validPermission(HttpServletRequest request, int jobGroup) {
-		XxlJobUser loginUser = (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY);
-		if (!loginUser.validPermission(jobGroup)) {
-			throw new RuntimeException(I18nUtil.getString("system_permission_limit") + "[username="+ loginUser.getUsername() +"]");
-		}
-	}
-	
-	@RequestMapping("/pageList")
-	@ResponseBody
-	public Map<String, Object> pageList(@RequestParam(required = false, defaultValue = "0") int start,  
-			@RequestParam(required = false, defaultValue = "10") int length,
-			int jobGroup, int triggerStatus, String jobDesc, String executorHandler, String author) {
-		
-		return xxlJobService.pageList(start, length, jobGroup, triggerStatus, jobDesc, executorHandler, author);
-	}
-	
-	@RequestMapping("/add")
-	@ResponseBody
-	public ReturnT<String> add(XxlJobInfo jobInfo) {
-		return xxlJobService.add(jobInfo);
-	}
-	
-	@RequestMapping("/update")
-	@ResponseBody
-	public ReturnT<String> update(XxlJobInfo jobInfo) {
-		return xxlJobService.update(jobInfo);
-	}
-	
-	@RequestMapping("/remove")
-	@ResponseBody
-	public ReturnT<String> remove(int id) {
-		return xxlJobService.remove(id);
-	}
-	
-	@RequestMapping("/stop")
-	@ResponseBody
-	public ReturnT<String> pause(int id) {
-		return xxlJobService.stop(id);
-	}
-	
-	@RequestMapping("/start")
-	@ResponseBody
-	public ReturnT<String> start(int id) {
-		return xxlJobService.start(id);
-	}
-	
-	@RequestMapping("/trigger")
-	@ResponseBody
-	//@PermissionLimit(limit = false)
-	public ReturnT<String> triggerJob(int id, String executorParam, String addressList) {
-		// force cover job param
-		if (executorParam == null) {
-			executorParam = "";
-		}
-
-		JobTriggerPoolHelper.trigger(id, TriggerTypeEnum.MANUAL, -1, null, executorParam, addressList);
-		return ReturnT.SUCCESS;
-	}
-
-	@RequestMapping("/nextTriggerTime")
-	@ResponseBody
-	public ReturnT<List<String>> nextTriggerTime(String cron) {
-		List<String> result = new ArrayList<>();
-		try {
-			CronExpression cronExpression = new CronExpression(cron);
-			Date lastTime = new Date();
-			for (int i = 0; i < 5; i++) {
-				lastTime = cronExpression.getNextValidTimeAfter(lastTime);
-				if (lastTime != null) {
-					result.add(DateUtil.formatDateTime(lastTime));
-				} else {
-					break;
-				}
-			}
-		} catch (ParseException e) {
-			return new ReturnT<List<String>>(ReturnT.FAIL_CODE, I18nUtil.getString("jobinfo_field_cron_unvalid"));
-		}
-		return new ReturnT<List<String>>(result);
-	}
-	
+    @Resource
+    private XxlJobGroupDao xxlJobGroupDao;
+    @Resource
+    private XxlJobService xxlJobService;
+
+    @RequestMapping
+    public String index(HttpServletRequest request, Model model, @RequestParam(required = false, defaultValue = "-1") int jobGroup) {
+
+        // 枚举-字典
+        model.addAttribute("ExecutorRouteStrategyEnum", ExecutorRouteStrategyEnum.values());        // 路由策略-列表
+        model.addAttribute("GlueTypeEnum", GlueTypeEnum.values());                                // Glue类型-字典
+        model.addAttribute("ExecutorBlockStrategyEnum", ExecutorBlockStrategyEnum.values());        // 阻塞处理策略-字典
+
+        // 执行器列表
+        List<XxlJobGroup> jobGroupList_all = xxlJobGroupDao.findAll();
+
+        // filter group
+        List<XxlJobGroup> jobGroupList = filterJobGroupByRole(request, jobGroupList_all);
+        if (jobGroupList == null || jobGroupList.size() == 0) {
+            throw new XxlJobException(I18nUtil.getString("jobgroup_empty"));
+        }
+
+        model.addAttribute("JobGroupList", jobGroupList);
+        model.addAttribute("jobGroup", jobGroup);
+
+        return "jobinfo/jobinfo.index";
+    }
+
+    public static List<XxlJobGroup> filterJobGroupByRole(HttpServletRequest request, List<XxlJobGroup> jobGroupList_all) {
+        List<XxlJobGroup> jobGroupList = new ArrayList<>();
+        if (jobGroupList_all != null && jobGroupList_all.size() > 0) {
+            XxlJobUser loginUser = (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY);
+            if (loginUser.getRole() == 1) {
+                jobGroupList = jobGroupList_all;
+            } else {
+                List<String> groupIdStrs = new ArrayList<>();
+                if (loginUser.getPermission() != null && loginUser.getPermission().trim().length() > 0) {
+                    groupIdStrs = Arrays.asList(loginUser.getPermission().trim().split(","));
+                }
+                for (XxlJobGroup groupItem : jobGroupList_all) {
+                    if (groupIdStrs.contains(String.valueOf(groupItem.getId()))) {
+                        jobGroupList.add(groupItem);
+                    }
+                }
+            }
+        }
+        return jobGroupList;
+    }
+
+    public static void validPermission(HttpServletRequest request, int jobGroup) {
+        XxlJobUser loginUser = (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY);
+        if (!loginUser.validPermission(jobGroup)) {
+            throw new RuntimeException(I18nUtil.getString("system_permission_limit") + "[username=" + loginUser.getUsername() + "]");
+        }
+    }
+
+    @RequestMapping("/pageList")
+    @ResponseBody
+    public Map<String, Object> pageList(@RequestParam(required = false, defaultValue = "0") int start,
+                                        @RequestParam(required = false, defaultValue = "10") int length,
+                                        int jobGroup, int triggerStatus, String jobDesc, String executorHandler, String author) {
+
+        return xxlJobService.pageList(start, length, jobGroup, triggerStatus, jobDesc, executorHandler, author);
+    }
+
+    @RequestMapping("/add")
+    @ResponseBody
+    public ReturnT<String> add(XxlJobInfo jobInfo) {
+        return xxlJobService.add(jobInfo);
+    }
+
+    /**
+     * 新增定时任务，并启动
+     *
+     * @param executeName   任务别名(英文)
+     * @param executorParam 任务执行参数
+     * @param cron          cron
+     * @param author        作者
+     * @return
+     */
+    //@GetMapping("/onlyoneadd")
+    @RequestMapping("/onlyoneadd")
+    public ReturnT<String> onlyOneAdd(String executeName, String executorParam, String cron, String author) {
+//        System.err.println("executorParam==" + executorParam);
+//        System.err.println("cron==" + cron);
+//        System.err.println("executeName==" + executeName);
+//        System.err.println("author==" + author);
+        boolean isProgram = executeName.indexOf("program") >= 0;
+        executeName = executeName.substring(executeName.indexOf("_") + 1, executeName.length());
+        executeName = executeName.replaceAll(" ", "+");
+
+        if (isProgram) {
+            executeName = "【节目】" + Base64Util.decodeReplace(executeName);
+        } else {
+            executeName = "【照明策略】" + Base64Util.decodeReplace(executeName);
+        }
+
+
+        XxlJobInfo xxlJobInfo = new XxlJobInfo();
+        xxlJobInfo.setJobGroup(2);
+        xxlJobInfo.setJobDesc(executeName);
+        xxlJobInfo.setExecutorRouteStrategy("FIRST");
+        xxlJobInfo.setJobCron(cron);
+        xxlJobInfo.setGlueType("BEAN");
+        xxlJobInfo.setExecutorHandler("executeJob");//调用本地方法运行
+        xxlJobInfo.setExecutorBlockStrategy("SERIAL_EXECUTION");
+        xxlJobInfo.setAuthor(author);
+        xxlJobInfo.setExecutorParam(executorParam);
+        xxlJobInfo.setGlueRemark("创建定时任务结束");
+        xxlJobInfo.setExecutorTimeout(2);
+        xxlJobInfo.setExecutorFailRetryCount(3);        // 失败重试次数
+
+        ReturnT<String> addT = xxlJobService.add(xxlJobInfo);
+
+        xxlJobInfo.setExecutorParam(xxlJobInfo.getExecutorParam() + ",executeId:" + xxlJobInfo.getId());
+        addT = update(xxlJobInfo);
+        // add SUCCESS
+        if (addT.getCode() == 200) {
+            ReturnT<String> addB = xxlJobService.start(xxlJobInfo.getId());
+            return addB;
+        }
+        return addT;
+    }
+
+
+    @RequestMapping("/update")
+    @ResponseBody
+    public ReturnT<String> update(XxlJobInfo jobInfo) {
+//        System.err.println("update");
+//        System.err.println("update");
+//        System.err.println("update");
+//        System.err.println("update");
+//        System.err.println("update");
+//        System.err.println("update");
+
+        return xxlJobService.update(jobInfo);
+    }
+
+    @RequestMapping("/remove")
+    @ResponseBody
+    public ReturnT<String> remove(int id) {
+        return xxlJobService.remove(id);
+    }
+
+    @RequestMapping("/stop")
+    @ResponseBody
+    public ReturnT<String> pause(int id) {
+        return xxlJobService.stop(id);
+    }
+
+    @RequestMapping("/start")
+    @ResponseBody
+    public ReturnT<String> start(int id) {
+        return xxlJobService.start(id);
+    }
+
+    @RequestMapping("/trigger")
+    @ResponseBody
+    //@PermissionLimit(limit = false)
+    public ReturnT<String> triggerJob(int id, String executorParam, String addressList) {
+        // force cover job param
+        if (executorParam == null) {
+            executorParam = "";
+        }
+
+        JobTriggerPoolHelper.trigger(id, TriggerTypeEnum.MANUAL, -1, null, executorParam, addressList);
+        return ReturnT.SUCCESS;
+    }
+
+    @RequestMapping("/nextTriggerTime")
+    @ResponseBody
+    public ReturnT<List<String>> nextTriggerTime(String cron) {
+        List<String> result = new ArrayList<>();
+        try {
+            CronExpression cronExpression = new CronExpression(cron);
+            Date lastTime = new Date();
+            for (int i = 0; i < 5; i++) {
+                lastTime = cronExpression.getNextValidTimeAfter(lastTime);
+                if (lastTime != null) {
+                    result.add(DateUtil.formatDateTime(lastTime));
+                } else {
+                    break;
+                }
+            }
+        } catch (ParseException e) {
+            return new ReturnT<List<String>>(ReturnT.FAIL_CODE, I18nUtil.getString("jobinfo_field_cron_unvalid"));
+        }
+        return new ReturnT<List<String>>(result);
+    }
+
 }

xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/Base64Util.java

@@ -0,0 +1,157 @@
+package com.xxl.job.admin.core.util;
+
+import java.io.UnsupportedEncodingException;
+
+/**
+ * base64编码/解码
+ *
+ * @author: Crown
+ * @Date 2020/8/17 14:17
+ * @Version 1.0
+ */
+public class Base64Util {
+
+    public static String encode(String content) {
+        return new String(encode(content.getBytes()));
+    }
+
+    public static String decode(String content) {
+        try {
+            return new String(decode(content.toCharArray()), "utf-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    private static char[] alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="
+            .toCharArray();
+
+    private static byte[] codes = new byte[256];
+
+    static {
+        for (int i = 0; i < 256; i++) {
+            codes[i] = -1;
+        }
+        for (int i = 'A'; i <= 'Z'; i++) {
+            codes[i] = (byte) (i - 'A');
+        }
+
+        for (int i = 'a'; i <= 'z'; i++) {
+            codes[i] = (byte) (26 + i - 'a');
+        }
+        for (int i = '0'; i <= '9'; i++) {
+            codes[i] = (byte) (52 + i - '0');
+        }
+        codes['+'] = 62;
+        codes['/'] = 63;
+    }
+
+    private static char[] encode(byte[] data) {
+        char[] out = new char[((data.length + 2) / 3) * 4];
+        for (int i = 0, index = 0; i < data.length; i += 3, index += 4) {
+            boolean quad = false;
+            boolean trip = false;
+
+            int val = (0xFF & (int) data[i]);
+            val <<= 8;
+            if ((i + 1) < data.length) {
+                val |= (0xFF & (int) data[i + 1]);
+                trip = true;
+            }
+            val <<= 8;
+            if ((i + 2) < data.length) {
+                val |= (0xFF & (int) data[i + 2]);
+                quad = true;
+            }
+            out[index + 3] = alphabet[(quad ? (val & 0x3F) : 64)];
+            val >>= 6;
+            out[index + 2] = alphabet[(trip ? (val & 0x3F) : 64)];
+            val >>= 6;
+            out[index + 1] = alphabet[val & 0x3F];
+            val >>= 6;
+            out[index + 0] = alphabet[val & 0x3F];
+        }
+        return out;
+    }
+
+    private static byte[] decode(char[] data) {
+        int tempLen = data.length;
+        for (int ix = 0; ix < data.length; ix++) {
+            if ((data[ix] > 255) || codes[data[ix]] < 0) {
+                --tempLen;
+            }
+        }
+        int len = (tempLen / 4) * 3;
+        if ((tempLen % 4) == 3) {
+            len += 2;
+        }
+        if ((tempLen % 4) == 2) {
+            len += 1;
+
+        }
+        byte[] out = new byte[len];
+
+        int shift = 0;
+        int accum = 0;
+        int index = 0;
+
+        for (int ix = 0; ix < data.length; ix++) {
+            int value = (data[ix] > 255) ? -1 : codes[data[ix]];
+
+            if (value >= 0) {
+                accum <<= 6;
+                shift += 6;
+                accum |= value;
+                if (shift >= 8) {
+                    shift -= 8;
+                    out[index++] = (byte) ((accum >> shift) & 0xff);
+                }
+            }
+        }
+
+        if (index != out.length) {
+            throw new Error("Miscalculated data length (wrote " + index
+                    + " instead of " + out.length + ")");
+        }
+
+        return out;
+    }
+
+    public static String encodeReplace(String content) {
+        String encryptStr = encode(content);
+        String replaceStr = encryptStr.replaceAll("=", "CCCCC");
+        return replaceStr;
+    }
+
+    public static String decodeReplace(String content) {
+        String replaceStr = content.replaceAll("CCCCC", "=");
+        String decode = decode(replaceStr);
+        return decode;
+    }
+
+    public static void main(String[] args) {
+        try {
+            //=================客户端=================
+            //hello, i am infi, good night!加密
+            String message = "hello, i am infi, good night!";
+            String encryptStr = encode(message);
+            System.out.println("加密并Base64编码的结果：" + encryptStr);
+            String str = encodeReplace(message);
+            System.out.println("加密并Base64编码的结果：" + str);
+            //##############	网络上传输的内容有Base64编码后的秘钥 和 Base64编码加密后的内容		#################
+
+
+            //===================服务端================
+            String decryptStr = decode(encryptStr);
+            //解密后的明文
+            System.out.println("解密后的明文: " + decryptStr);
+            String decode = decodeReplace(encryptStr);
+            //解密后的明文
+            System.out.println("解密后的明文: " + decode);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

xxl-job-admin/src/main/java/com/xxl/job/admin/service/LoginService.java

@@ -40,9 +40,7 @@ public class LoginService {
         return xxlJobUser;
     }
 
-
     public ReturnT<String> login(HttpServletRequest request, HttpServletResponse response, String username, String password, boolean ifRemember){
-
         // param
         if (username==null || username.trim().length()==0 || password==null || password.trim().length()==0){
             return new ReturnT<String>(500, I18nUtil.getString("login_param_empty"));

xxl-job-admin/src/main/resources/application.properties

@@ -1,5 +1,6 @@
 ### web
 server.port=8080
+#server.port=7009
 server.servlet.context-path=/xxl-job-admin
 
 ### actuator
@@ -25,7 +26,7 @@ mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml
 ### xxl-job, datasource
 spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
 spring.datasource.username=root
-spring.datasource.password=root_pwd
+spring.datasource.password=root
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 ### datasource-pool
@@ -40,17 +41,18 @@ spring.datasource.hikari.connection-timeout=10000
 spring.datasource.hikari.connection-test-query=SELECT 1
 
 ### xxl-job, email
-spring.mail.host=smtp.qq.com
+spring.mail.host=
 spring.mail.port=25
-spring.mail.username=xxx@qq.com
-spring.mail.from=xxx@qq.com
-spring.mail.password=xxx
+spring.mail.username=Áú³ÛÕÕÃ÷
+spring.mail.from=
+###longchizhaoming@outlook.com lczm123456 smtp-mail.outlook.com
+spring.mail.password=
 spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.starttls.enable=true
 spring.mail.properties.mail.smtp.starttls.required=true
 spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
 
-### xxl-job, access token
+### xxl-job, access token 4303861684744312254A3A1D518F60C5
 xxl.job.accessToken=
 
 ### xxl-job, i18n (default is zh_CN, and you can choose "zh_CN", "zh_TC" and "en")