update

Author: Janloong-Doo

request/spring-demo/security.http

@@ -58,7 +58,8 @@ GET http://{{doo_host}}/quartz/update
 POST http://{{doo_host}}/quartz/add
 Content-Type: application/x-www-form-urlencoded
 
-jobName=job3&jobGroup=group3&className=com.janloong.springsecurity.quartz.job.DooJob
+#jobName=job3&jobGroup=group3&className=com.janloong.springsecurity.quartz.job.DooJob
+type=2&jobName=job_simple2&jobGroup=group3&className=com.janloong.springsecurity.quartz.job.DooJob&date=2020-07-14 17:45:00
 
 ###
 GET http://{{doo_host}}/quartz/pause?jobName=job3&jobGroup=group3

spring-demo/spring-security/README.md

@@ -1,6 +1,19 @@
 # spring security 
 > 独立集成security学习记录
 
+## 启动
+
+>端口: `9001`
+### 默认关闭
+>默认中间件关闭，开启需要在相应位置注释或放开注释
+
+1. RabbitMq: 
+com.janloong.springsecurity.rabbitmq.config.RabbitMqConfig#@EnableRabbit
+com.janloong.springsecurity.rabbitmq.config.RabbitMqConfig#@Configuration
+com.janloong.springsecurity.rabbitmq.controller.SendController#RabbitTemplate
+org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration
+org.springframework.boot.autoconfigure.admin.SpringApplicationAdminJmxAutoConfiguration
+2. 
 
 ## 问题
  前后端分离情况下,security集成后导致原有跨域配置不生效问题

spring-demo/spring-security/src/main/java/com/janloong/springsecurity/SpringSecurityApplication.java

@@ -1,7 +1,6 @@
 package com.janloong.springsecurity;
 
 import com.janloong.common.JanloongApplication;
-import org.springframework.amqp.rabbit.annotation.EnableRabbit;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;

spring-demo/spring-security/src/main/java/com/janloong/springsecurity/quartz/config/QuartzManager.java

@@ -18,6 +18,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -74,7 +75,7 @@ private void startJobTask(Scheduler scheduler) throws SchedulerException {
  //即使没有Trigger关联时，也不需要删除该JobDetail
  //.storeDurably()
  .build();
- //cron触发器构建
+ //1. cron触发器构建
  CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(DEFAULT_CRON);
  CronTrigger cronTrigger = TriggerBuilder.newTrigger()
  //关联job, 不关联有什么影响
@@ -92,11 +93,11 @@ private void startJobTask(Scheduler scheduler) throws SchedulerException {
  * @author <a href ="mailto: janloongdoo@gmail.com">Janloong</a>
  * @date 2020 /1/19 11:46
  */
- public void addJob(Class<? extends Job> clazz, String jobName, String jobGroup) throws SchedulerException {
- addJob(clazz, jobName, jobGroup, new JobDataMap());
+ public void addJobWithCron(Class<? extends Job> clazz, String jobName, String jobGroup) throws SchedulerException {
+ addJobWithCron(clazz, jobName, jobGroup, new JobDataMap());
  }
 
- public void addJob(Class<? extends Job> clazz, String jobName, String jobGroup, JobDataMap jobDataMap) throws SchedulerException {
+ public void addJobWithCron(Class<? extends Job> clazz, String jobName, String jobGroup, JobDataMap jobDataMap) throws SchedulerException {
  JobDetail jobDetail = JobBuilder
  //自定义的业务类
  .newJob(clazz)
@@ -109,17 +110,51 @@ public void addJob(Class<? extends Job> clazz, String jobName, String jobGroup,
  //.storeDurably()
  .build();
 
- //cron触发器构建
+ //1. cron触发器构建
  CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(DEFAULT_CRON);
  CronTrigger cronTrigger = TriggerBuilder.newTrigger()
  //关联job, 不关联有什么影响
  //.forJob(jobDetail)
  .withIdentity(jobName, jobGroup)
  .withSchedule(cronScheduleBuilder)
  .build();
+ //2. calendar触发器构建
+ //CalendarIntervalScheduleBuilder calendarIntervalSchedule = CalendarIntervalScheduleBuilder.calendarIntervalSchedule();
+
+ //3. simple
+ //TriggerBuilder.newTrigger().startAt();
  scheduler.scheduleJob(jobDetail, cronTrigger);
  }
 
+ public void addJobWithSimple(Class<? extends Job> clazz, String jobName, String jobGroup, Map<String, Object> map) throws SchedulerException {
+ JobDataMap jobDataMap = new JobDataMap();
+ jobDataMap.putAll(map);
+ JobDetail jobDetail = JobBuilder
+ //自定义的业务类
+ .newJob(clazz)
+ //对于该jobDetail的一个id
+ .withIdentity(jobName, jobGroup)
+ //每个JobDetail内都有一个Map，包含了关联到这个Job的数据，在Job类中可以通过context获取
+ //关联键值对
+ .usingJobData(jobDataMap)
+ //即使没有Trigger关联时，也不需要删除该JobDetail
+ //.storeDurably()
+ .build();
+ String dateS = String.valueOf(map.get("date"));
+ try {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+ Date from = format.parse(dateS);
+ Trigger build = TriggerBuilder.newTrigger()
+ .startAt(from)
+ .withSchedule(SimpleScheduleBuilder.repeatMinutelyForever())
+ .build();
+
+ scheduler.scheduleJob(jobDetail, build);
+ } catch (Exception e) {
+ log.error("时间格式化错误:{}", e.getMessage());
+ }
+ }
+
  /**
  * 获取Job信息
  *

spring-demo/spring-security/src/main/java/com/janloong/springsecurity/quartz/controller/QuartzController.java

@@ -21,6 +21,9 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * The type Quartz controller.
  *
@@ -59,11 +62,23 @@ public ResponseResult update(String name) throws Exception {
  public ResponseResult add(@RequestParam String className
  , @RequestParam String jobName
  , @RequestParam String jobGroup
+ , @RequestParam String date
+ , @RequestParam String type
  ) {
  Class<? extends Job> aClass = null;
  try {
  aClass = (Class<? extends Job>) Class.forName(className);
- quartzManager.addJob(aClass, jobName, jobGroup);
+ switch (type) {
+ case "1":
+ default:
+ quartzManager.addJobWithCron(aClass, jobName, jobGroup);
+ break;
+ case "2":
+ Map<String, Object> map = new HashMap<>();
+ map.put("date", date);
+ quartzManager.addJobWithSimple(aClass, jobName, jobGroup, map);
+ break;
+ }
  } catch (ClassNotFoundException | SchedulerException e) {
  e.printStackTrace();
  }

spring-demo/spring-security/src/main/java/com/janloong/springsecurity/rabbitmq/config/RabbitMqConfig.java

@@ -10,15 +10,14 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.util.ErrorHandler;
 
 /**
  * @author <a href ="mailto: janloongdoo@gmail.com">Janloong</a>
  * @date 2020-04-03 00:16
  */
 @EnableRabbit
-@Configuration
+//@Configuration
 @Slf4j
 public class RabbitMqConfig {
 

spring-demo/spring-security/src/main/java/com/janloong/springsecurity/rabbitmq/controller/SendController.java

@@ -3,7 +3,6 @@
 
 import com.janloong.common.utils.ResponseResult;
 import com.janloong.springsecurity.rabbitmq.handler.MsgSendHandlerFactory;
-import org.springframework.amqp.core.AmqpAdmin;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessagePropertiesBuilder;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -23,10 +22,10 @@
 @RequestMapping("send")
 public class SendController {
 
- @Autowired
- private AmqpAdmin amqpAdmin;
+ //@Autowired
+ //private AmqpAdmin amqpAdmin;
 
- @Autowired
+ //@Autowired
  private RabbitTemplate rabbitTemplate;
 
  @Autowired

spring-demo/spring-security/src/main/java/com/janloong/springsecurity/rabbitmq/handler/ConfirmSend.java

@@ -52,6 +52,8 @@ public Object sendMsg(RabbitTemplate rabbitTemplate) {
  //for (int i = 0; i < 20; i++) {
  CorrelationData correlationData = new CorrelationData("janloongdoo");
  Map<String, String> map6 = Map.of("routingKey", sendRoutingKey6, "content", "hello,JanloongDoo. I'm from ");
+
+ //消息属性设置 持久化消息 以下方式默认为持久化模式 messageporperties MessageDeliveryMode.PERSISTENT
  rabbitTemplate.convertAndSend(TopicQueueConfig.TOPIC_EXCHANGE, sendRoutingKey6, map6, correlationData);
  CorrelationData.Confirm confirm = correlationData.getFuture().get(10, TimeUnit.SECONDS);
  //先于全局confirm确认响应

spring-demo/spring-security/src/main/java/com/janloong/springsecurity/selfschedule/controller/ScheduledTaskController.java

@@ -10,11 +10,11 @@
 
 package com.janloong.springsecurity.selfschedule.controller;
 
+import com.janloong.common.utils.ResponseResult;
 import com.janloong.springsecurity.selfschedule.entity.ScheduledTask;
 import com.janloong.springsecurity.selfschedule.service.ScheduleTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -66,4 +66,20 @@ public String restart(String taskKey) {
  scheduledTaskService.restart(taskKey);
  return "restart success";
  }
+
+ /**
+ * @author <a href ="https://blog.janloong.com">Janloong</a>
+ * @since 2020/6/24 10:36
+ **/
+ @RequestMapping("/scheduleTest")
+ //@Schedules({
+ // @Scheduled(cron = "0/10 30-59 9 * * ? *")
+ // , @Scheduled(cron = "0/10 1-30 11 * * ? *")
+ // , @Scheduled(cron = "0/10 * 10,13 * * ? *")
+ // , @Scheduled(cron = "0/10 1-50 14 * * ? *")
+ //})
+ public ResponseResult scheduleTest(String name) {
+
+ return ResponseResult.success(null);
+ }
 }

spring-demo/spring-security/src/main/resources/application.yml

@@ -1,6 +1,12 @@
 server:
- port: 9001
+# port: 9001
+ port: 9002
 spring:
+ autoconfigure:
+ exclude:
+ #rabbitmq
+ - org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration
+ - org.springframework.boot.autoconfigure.admin.SpringApplicationAdminJmxAutoConfiguration
  profiles:
  # active: dev
  active: home