Merge branch 'dev_v1.1.1' into release_v1.1.1

merge

themis-business/src/main/java/com/qmth/themis/business/service/impl/TMRocketMessageServiceImpl.java

@@ -33,11 +33,7 @@ public class TMRocketMessageServiceImpl extends ServiceImpl<TMRocketMessageMappe
     @Override
     public void saveMqMessageSuccess(MqDto mqDto, String key) {
         mqDto.setAck(SystemConstant.STANDARD_ACK_TYPE);
-        Gson gson = new Gson();
-        TMRocketMessage tmRocketMessage = gson.fromJson(gson.toJson(mqDto), TMRocketMessage.class);
-        tmRocketMessage.setBody(JacksonUtil.parseJson(tmRocketMessage.getBody()));
-        this.saveOrUpdate(tmRocketMessage);
-        redisUtil.delete(key, mqDto.getId());
+        this.saveMessage(mqDto, key);
     }
 
     /**
@@ -49,6 +45,16 @@ public class TMRocketMessageServiceImpl extends ServiceImpl<TMRocketMessageMappe
     @Override
     public void saveMqMessageError(MqDto mqDto, String key) {
         mqDto.setAck(SystemConstant.POSION_ACK_TYPE);
+        this.saveMessage(mqDto, key);
+    }
+
+    /**
+     * 保存消息
+     *
+     * @param mqDto
+     * @param key
+     */
+    protected void saveMessage(MqDto mqDto, String key) {
         Gson gson = new Gson();
         TMRocketMessage tmRocketMessage = gson.fromJson(gson.toJson(mqDto), TMRocketMessage.class);
         tmRocketMessage.setBody(JacksonUtil.parseJson(tmRocketMessage.getBody()));

themis-task/src/main/java/com/qmth/themis/task/start/StartRunning.java

@@ -55,7 +55,7 @@ public class StartRunning implements CommandLineRunner {
         Map mqMap = new HashMap();
         mqMap.put(SystemConstant.NAME, MqJob.class.getName());
         quartzService.deleteJob(QuartzTaskEnum.MQ_JOB_NAME.name(), QuartzTaskEnum.MQ_JOB_GROUP_NAME.name());
-        quartzService.addJob(MqJob.class, QuartzTaskEnum.MQ_JOB_NAME.name(), QuartzTaskEnum.MQ_JOB_GROUP_NAME.name(), "0 0/1 * * * ?", mqMap);
+        quartzService.addJob(MqJob.class, QuartzTaskEnum.MQ_JOB_NAME.name(), QuartzTaskEnum.MQ_JOB_GROUP_NAME.name(), "0/30 * * * * ?", mqMap);
         log.info("增加mqjob end");
 
         log.info("增加mqActivityjob start");