mq改造修改

pom.xml

@@ -45,6 +45,7 @@
         <jackson.version>2.11.0</jackson.version>
         <ehcache.version>2.10.6</ehcache.version>
         <swagger2-bootstrap.version>1.9.6</swagger2-bootstrap.version>
+        <jetbrains.version>13.0</jetbrains.version>
     </properties>
 
     <dependencyManagement>
@@ -224,6 +225,12 @@
                 <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
                 <version>${spring-boot.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.jetbrains</groupId>
+                <artifactId>annotations</artifactId>
+                <version>${jetbrains.version}</version>
+                <scope>compile</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

themis-backend/pom.xml

@@ -22,6 +22,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.qmth.themis.mq</groupId>
+            <artifactId>themis-mq</artifactId>
+        </dependency>
 <!--        <dependency>-->
 <!--            <groupId>org.springframework.boot</groupId>-->
 <!--            <artifactId>spring-boot-starter-data-mongodb</artifactId>-->

themis-backend/src/main/java/com/qmth/themis/backend/api/TBExamInvigilateUserController.java

@@ -20,10 +20,10 @@ import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;
 import com.qmth.themis.common.util.ResultUtil;
-import com.qmth.themis.mq.dto.MqDto;
-import com.qmth.themis.mq.enums.MqTagEnum;
-import com.qmth.themis.mq.enums.MqTopicEnum;
-import com.qmth.themis.mq.service.MqDtoService;
+import com.qmth.themis.business.dto.MqDto;
+import com.qmth.themis.business.enums.MqTagEnum;
+import com.qmth.themis.business.enums.MqTopicEnum;
+import com.qmth.themis.business.service.MqDtoService;
 import io.swagger.annotations.*;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.transaction.annotation.Transactional;

themis-backend/src/main/java/com/qmth/themis/backend/api/TBUserController.java

@@ -34,9 +34,9 @@ import com.qmth.themis.common.signature.SignatureType;
 import com.qmth.themis.common.util.AesUtil;
 import com.qmth.themis.common.util.Result;
 import com.qmth.themis.common.util.ResultUtil;
-import com.qmth.themis.mq.enums.MqTagEnum;
-import com.qmth.themis.mq.enums.MqTopicEnum;
-import com.qmth.themis.mq.service.MqDtoService;
+import com.qmth.themis.business.enums.MqTagEnum;
+import com.qmth.themis.business.enums.MqTopicEnum;
+import com.qmth.themis.business.service.MqDtoService;
 import io.swagger.annotations.*;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.poi.ss.formula.functions.T;

themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamActivityController.java

@@ -19,10 +19,10 @@ import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;
 import com.qmth.themis.common.util.ResultUtil;
-import com.qmth.themis.mq.dto.MqDto;
-import com.qmth.themis.mq.enums.MqTagEnum;
-import com.qmth.themis.mq.enums.MqTopicEnum;
-import com.qmth.themis.mq.service.MqDtoService;
+import com.qmth.themis.business.dto.MqDto;
+import com.qmth.themis.business.enums.MqTagEnum;
+import com.qmth.themis.business.enums.MqTopicEnum;
+import com.qmth.themis.business.service.MqDtoService;
 import io.swagger.annotations.*;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.transaction.annotation.Transactional;

themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamController.java

@@ -25,10 +25,10 @@ import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;
 import com.qmth.themis.common.util.ResultUtil;
-import com.qmth.themis.mq.dto.MqDto;
-import com.qmth.themis.mq.enums.MqTagEnum;
-import com.qmth.themis.mq.enums.MqTopicEnum;
-import com.qmth.themis.mq.service.MqDtoService;
+import com.qmth.themis.business.dto.MqDto;
+import com.qmth.themis.business.enums.MqTagEnum;
+import com.qmth.themis.business.enums.MqTopicEnum;
+import com.qmth.themis.business.service.MqDtoService;
 import io.swagger.annotations.*;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.transaction.annotation.Transactional;

themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamPaperController.java

@@ -39,10 +39,10 @@ import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;
 import com.qmth.themis.common.util.ResultUtil;
-import com.qmth.themis.mq.dto.MqDto;
-import com.qmth.themis.mq.enums.MqTagEnum;
-import com.qmth.themis.mq.enums.MqTopicEnum;
-import com.qmth.themis.mq.service.MqDtoService;
+import com.qmth.themis.business.dto.MqDto;
+import com.qmth.themis.business.enums.MqTagEnum;
+import com.qmth.themis.business.enums.MqTopicEnum;
+import com.qmth.themis.business.service.MqDtoService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamStudentController.java

@@ -21,10 +21,10 @@ import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;
 import com.qmth.themis.common.util.ResultUtil;
-import com.qmth.themis.mq.dto.MqDto;
-import com.qmth.themis.mq.enums.MqTagEnum;
-import com.qmth.themis.mq.enums.MqTopicEnum;
-import com.qmth.themis.mq.service.MqDtoService;
+import com.qmth.themis.business.dto.MqDto;
+import com.qmth.themis.business.enums.MqTagEnum;
+import com.qmth.themis.business.enums.MqTopicEnum;
+import com.qmth.themis.business.service.MqDtoService;
 import io.swagger.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

themis-backend/src/main/java/com/qmth/themis/backend/api/TIeInvigilateController.java

@@ -12,10 +12,10 @@ import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;
 import com.qmth.themis.common.util.ResultUtil;
-import com.qmth.themis.mq.dto.MqDto;
-import com.qmth.themis.mq.enums.MqTagEnum;
-import com.qmth.themis.mq.enums.MqTopicEnum;
-import com.qmth.themis.mq.service.MqDtoService;
+import com.qmth.themis.business.dto.MqDto;
+import com.qmth.themis.business.enums.MqTagEnum;
+import com.qmth.themis.business.enums.MqTopicEnum;
+import com.qmth.themis.business.service.MqDtoService;
 import io.swagger.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

themis-backend/src/main/java/com/qmth/themis/backend/listener/service/MqAdminLogicService.java

@@ -1,6 +1,6 @@
 package com.qmth.themis.backend.listener.service;
 
-import com.qmth.themis.mq.dto.MqDto;
+import com.qmth.themis.business.dto.MqDto;
 
 import java.lang.reflect.InvocationTargetException;
 

themis-backend/src/main/java/com/qmth/themis/backend/listener/service/impl/MqAdminLogicServiceImpl.java

@@ -7,7 +7,7 @@ import com.qmth.themis.business.entity.TMRocketMessage;
 import com.qmth.themis.business.service.TMRocketMessageService;
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
-import com.qmth.themis.mq.dto.MqDto;
+import com.qmth.themis.business.dto.MqDto;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

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

@@ -11,9 +11,9 @@ import org.springframework.stereotype.Component;
 
 import com.qmth.themis.business.constant.SpringContextHolder;
 import com.qmth.themis.business.constant.SystemConstant;
-import com.qmth.themis.mq.enums.MqGroupEnum;
-import com.qmth.themis.mq.enums.MqTagEnum;
-import com.qmth.themis.mq.enums.MqTopicEnum;
+import com.qmth.themis.business.enums.MqGroupEnum;
+import com.qmth.themis.business.enums.MqTagEnum;
+import com.qmth.themis.business.enums.MqTopicEnum;
 import com.qmth.themis.mq.listener.RocketMessageConsumer;
 import com.qmth.themis.mq.templete.impl.CalculateObjectiveScoreConcurrentlyImpl;
 import com.qmth.themis.mq.templete.impl.FaceVerifyConcurrentlyImpl;

themis-backend/src/main/java/com/qmth/themis/backend/websocket/WebSocketAdminServer.java

@@ -19,10 +19,10 @@ import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.signature.SignatureInfo;
 import com.qmth.themis.common.signature.SignatureType;
-import com.qmth.themis.mq.dto.MqDto;
-import com.qmth.themis.mq.enums.MqTagEnum;
-import com.qmth.themis.mq.enums.MqTopicEnum;
-import com.qmth.themis.mq.service.MqDtoService;
+import com.qmth.themis.business.dto.MqDto;
+import com.qmth.themis.business.enums.MqTagEnum;
+import com.qmth.themis.business.enums.MqTopicEnum;
+import com.qmth.themis.business.service.MqDtoService;
 import com.qmth.themis.mq.templete.Concurrently;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;

themis-business/pom.xml

@@ -91,13 +91,11 @@
 		<dependency>
 			<groupId>org.jetbrains</groupId>
 			<artifactId>annotations</artifactId>
-			<version>13.0</version>
-			<scope>compile</scope>
 		</dependency>
-		<!-- <dependency> -->
-		<!-- <groupId>org.apache.rocketmq</groupId> -->
-		<!-- <artifactId>rocketmq-spring-boot-starter</artifactId> -->
-		<!-- </dependency> -->
+		<dependency>
+			<groupId>org.apache.rocketmq</groupId>
+			<artifactId>rocketmq-spring-boot-starter</artifactId>
+		</dependency>
 		<!-- <dependency> -->
 		<!-- <groupId>org.springframework.boot</groupId> -->
 		<!-- <artifactId>spring-boot-starter-quartz</artifactId> -->

themis-mq/src/main/java/com/qmth/themis/mq/dto/MqDto.java → themis-business/src/main/java/com/qmth/themis/business/dto/MqDto.java

@@ -1,4 +1,4 @@
-package com.qmth.themis.mq.dto;
+package com.qmth.themis.business.dto;
 
 import com.qmth.themis.business.enums.MqEnum;
 

themis-mq/src/main/java/com/qmth/themis/mq/enums/MqGroupEnum.java → themis-business/src/main/java/com/qmth/themis/business/enums/MqGroupEnum.java

@@ -1,4 +1,4 @@
-package com.qmth.themis.mq.enums;
+package com.qmth.themis.business.enums;
 
 /**
  * @Description: mq group enum

themis-mq/src/main/java/com/qmth/themis/mq/enums/MqTagEnum.java → themis-business/src/main/java/com/qmth/themis/business/enums/MqTagEnum.java

@@ -1,4 +1,4 @@
-package com.qmth.themis.mq.enums;
+package com.qmth.themis.business.enums;
 
 /**
  * @Description: mq tag enum

themis-mq/src/main/java/com/qmth/themis/mq/enums/MqTopicEnum.java → themis-business/src/main/java/com/qmth/themis/business/enums/MqTopicEnum.java

@@ -1,4 +1,4 @@
-package com.qmth.themis.mq.enums;
+package com.qmth.themis.business.enums;
 
 /**
  * @Description: mq topic enum

themis-mq/src/main/java/com/qmth/themis/mq/service/MqDtoService.java → themis-business/src/main/java/com/qmth/themis/business/service/MqDtoService.java

@@ -1,7 +1,6 @@
-package com.qmth.themis.mq.service;
+package com.qmth.themis.business.service;
 
-
-import com.qmth.themis.mq.dto.MqDto;
+import com.qmth.themis.business.dto.MqDto;
 
 /**
  * @Description: mqdto 服务类

themis-mq/src/main/java/com/qmth/themis/mq/service/ProducerServer.java → themis-business/src/main/java/com/qmth/themis/business/service/ProducerServer.java

@@ -1,7 +1,7 @@
-package com.qmth.themis.mq.service;
+package com.qmth.themis.business.service;
 
 import com.qmth.themis.common.util.Result;
-import com.qmth.themis.mq.dto.MqDto;
+import com.qmth.themis.business.dto.MqDto;
 
 /**
  * @Description: mq 服务类

themis-mq/src/main/java/com/qmth/themis/mq/service/impl/MqDtoServiceImpl.java → themis-business/src/main/java/com/qmth/themis/business/service/impl/MqDtoServiceImpl.java

@@ -1,11 +1,11 @@
-package com.qmth.themis.mq.service.impl;
+package com.qmth.themis.business.service.impl;
 
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.enums.MqEnum;
 import com.qmth.themis.business.util.RedisUtil;
-import com.qmth.themis.mq.dto.MqDto;
-import com.qmth.themis.mq.service.MqDtoService;
-import com.qmth.themis.mq.service.ProducerServer;
+import com.qmth.themis.business.dto.MqDto;
+import com.qmth.themis.business.service.MqDtoService;
+import com.qmth.themis.business.service.ProducerServer;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

themis-mq/src/main/java/com/qmth/themis/mq/service/impl/ProducerServerImpl.java → themis-business/src/main/java/com/qmth/themis/business/service/impl/ProducerServerImpl.java

@@ -1,12 +1,12 @@
-package com.qmth.themis.mq.service.impl;
+package com.qmth.themis.business.service.impl;
 
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;
 import com.qmth.themis.common.util.ResultUtil;
-import com.qmth.themis.mq.dto.MqDto;
-import com.qmth.themis.mq.service.ProducerServer;
+import com.qmth.themis.business.dto.MqDto;
+import com.qmth.themis.business.service.ProducerServer;
 import org.apache.rocketmq.client.producer.SendCallback;
 import org.apache.rocketmq.client.producer.SendResult;
 import org.apache.rocketmq.client.producer.TransactionSendResult;

themis-exam/src/main/java/com/qmth/themis/exam/api/TEExamController.java

@@ -39,10 +39,10 @@ import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;
 import com.qmth.themis.common.util.ResultUtil;
-import com.qmth.themis.mq.dto.MqDto;
-import com.qmth.themis.mq.enums.MqTagEnum;
-import com.qmth.themis.mq.enums.MqTopicEnum;
-import com.qmth.themis.mq.service.MqDtoService;
+import com.qmth.themis.business.dto.MqDto;
+import com.qmth.themis.business.enums.MqTagEnum;
+import com.qmth.themis.business.enums.MqTopicEnum;
+import com.qmth.themis.business.service.MqDtoService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

themis-exam/src/main/java/com/qmth/themis/exam/api/TEFaceController.java

@@ -18,10 +18,10 @@ import com.qmth.themis.business.service.TOeFaceVerifyHistoryService;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;
 import com.qmth.themis.common.util.ResultUtil;
-import com.qmth.themis.mq.dto.MqDto;
-import com.qmth.themis.mq.enums.MqTagEnum;
-import com.qmth.themis.mq.enums.MqTopicEnum;
-import com.qmth.themis.mq.service.MqDtoService;
+import com.qmth.themis.business.dto.MqDto;
+import com.qmth.themis.business.enums.MqTagEnum;
+import com.qmth.themis.business.enums.MqTopicEnum;
+import com.qmth.themis.business.service.MqDtoService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

themis-exam/src/main/java/com/qmth/themis/exam/api/TELivenessController.java

@@ -18,10 +18,10 @@ import com.qmth.themis.business.service.TOeLivenessVerifyHistoryService;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;
 import com.qmth.themis.common.util.ResultUtil;
-import com.qmth.themis.mq.dto.MqDto;
-import com.qmth.themis.mq.enums.MqTagEnum;
-import com.qmth.themis.mq.enums.MqTopicEnum;
-import com.qmth.themis.mq.service.MqDtoService;
+import com.qmth.themis.business.dto.MqDto;
+import com.qmth.themis.business.enums.MqTagEnum;
+import com.qmth.themis.business.enums.MqTopicEnum;
+import com.qmth.themis.business.service.MqDtoService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

themis-exam/src/main/java/com/qmth/themis/exam/api/TEStudentController.java

@@ -37,10 +37,10 @@ import com.qmth.themis.common.signature.SignatureType;
 import com.qmth.themis.common.util.AesUtil;
 import com.qmth.themis.common.util.Result;
 import com.qmth.themis.common.util.ResultUtil;
-import com.qmth.themis.mq.dto.MqDto;
-import com.qmth.themis.mq.enums.MqTagEnum;
-import com.qmth.themis.mq.enums.MqTopicEnum;
-import com.qmth.themis.mq.service.MqDtoService;
+import com.qmth.themis.business.dto.MqDto;
+import com.qmth.themis.business.enums.MqTagEnum;
+import com.qmth.themis.business.enums.MqTopicEnum;
+import com.qmth.themis.business.service.MqDtoService;
 import io.swagger.annotations.*;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.web.bind.annotation.RequestBody;

themis-exam/src/main/java/com/qmth/themis/exam/listener/service/MqOeLogicService.java

@@ -1,6 +1,6 @@
 package com.qmth.themis.exam.listener.service;
 
-import com.qmth.themis.mq.dto.MqDto;
+import com.qmth.themis.business.dto.MqDto;
 
 import java.lang.reflect.InvocationTargetException;
 

themis-exam/src/main/java/com/qmth/themis/exam/listener/service/impl/MqOeLogicServiceImpl.java

@@ -15,7 +15,7 @@ import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.exam.listener.service.MqOeLogicService;
 import com.qmth.themis.exam.websocket.WebSocketOeServer;
-import com.qmth.themis.mq.dto.MqDto;
+import com.qmth.themis.business.dto.MqDto;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

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

@@ -13,9 +13,9 @@ import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
 import com.qmth.themis.business.constant.SystemConstant;
-import com.qmth.themis.mq.enums.MqGroupEnum;
-import com.qmth.themis.mq.enums.MqTagEnum;
-import com.qmth.themis.mq.enums.MqTopicEnum;
+import com.qmth.themis.business.enums.MqGroupEnum;
+import com.qmth.themis.business.enums.MqTagEnum;
+import com.qmth.themis.business.enums.MqTopicEnum;
 import com.qmth.themis.mq.listener.RocketMessageConsumer;
 
 /**

themis-exam/src/main/java/com/qmth/themis/exam/websocket/WebSocketOeServer.java

@@ -19,10 +19,10 @@ import com.qmth.themis.common.signature.SignatureInfo;
 import com.qmth.themis.common.signature.SignatureType;
 import com.qmth.themis.exam.listener.service.MqOeLogicService;
 import com.qmth.themis.exam.websocketTemplete.WebSocketOeMessageTemplete;
-import com.qmth.themis.mq.dto.MqDto;
-import com.qmth.themis.mq.enums.MqTagEnum;
-import com.qmth.themis.mq.enums.MqTopicEnum;
-import com.qmth.themis.mq.service.MqDtoService;
+import com.qmth.themis.business.dto.MqDto;
+import com.qmth.themis.business.enums.MqTagEnum;
+import com.qmth.themis.business.enums.MqTopicEnum;
+import com.qmth.themis.business.service.MqDtoService;
 import com.qmth.themis.mq.templete.Concurrently;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;

themis-mq/pom.xml

@@ -18,9 +18,9 @@
             <groupId>com.qmth.themis.business</groupId>
             <artifactId>themis-business</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.rocketmq</groupId>
-            <artifactId>rocketmq-spring-boot-starter</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.apache.rocketmq</groupId>-->
+<!--            <artifactId>rocketmq-spring-boot-starter</artifactId>-->
+<!--        </dependency>-->
     </dependencies>
 </project>

themis-mq/src/main/java/com/qmth/themis/mq/listener/RocketMessageConsumer.java

@@ -1,21 +1,17 @@
 package com.qmth.themis.mq.listener;
 
 import com.qmth.themis.business.constant.SystemConstant;
-import com.qmth.themis.business.util.JacksonUtil;
-import com.qmth.themis.common.contanst.Constants;
-import com.qmth.themis.mq.dto.MqDto;
 import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
-import org.apache.rocketmq.client.consumer.listener.*;
+import org.apache.rocketmq.client.consumer.listener.MessageListener;
+import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
+import org.apache.rocketmq.client.consumer.listener.MessageListenerOrderly;
 import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.consumer.ConsumeFromWhere;
-import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @Description: rocketmq 动态注册消费者
  * @Param:

themis-mq/src/main/java/com/qmth/themis/mq/service/MqLogicService.java

@@ -1,6 +1,6 @@
 package com.qmth.themis.mq.service;
 
-import com.qmth.themis.mq.dto.MqDto;
+import com.qmth.themis.business.dto.MqDto;
 
 /**
  * @Description: mq执行逻辑

themis-mq/src/main/java/com/qmth/themis/mq/service/impl/MqLogicServiceImpl.java

@@ -45,7 +45,7 @@ import com.qmth.themis.business.threadPool.MyThreadPool;
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.common.util.SimpleBeanUtil;
-import com.qmth.themis.mq.dto.MqDto;
+import com.qmth.themis.business.dto.MqDto;
 import com.qmth.themis.mq.service.MqLogicService;
 
 /**

themis-mq/src/main/java/com/qmth/themis/mq/templete/impl/CalculateObjectiveScoreConcurrentlyImpl.java

@@ -5,7 +5,7 @@ import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.common.contanst.Constants;
-import com.qmth.themis.mq.dto.MqDto;
+import com.qmth.themis.business.dto.MqDto;
 import com.qmth.themis.mq.service.MqLogicService;
 import com.qmth.themis.mq.templete.Concurrently;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;

themis-mq/src/main/java/com/qmth/themis/mq/templete/impl/ExamBreakHistoryConcurrentlyImpl.java

@@ -5,7 +5,7 @@ import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.common.contanst.Constants;
-import com.qmth.themis.mq.dto.MqDto;
+import com.qmth.themis.business.dto.MqDto;
 import com.qmth.themis.mq.service.MqLogicService;
 import com.qmth.themis.mq.templete.Concurrently;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;

themis-mq/src/main/java/com/qmth/themis/mq/templete/impl/ExamRecordPersistedConcurrentlyImpl.java

@@ -16,7 +16,7 @@ import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.common.contanst.Constants;
-import com.qmth.themis.mq.dto.MqDto;
+import com.qmth.themis.business.dto.MqDto;
 import com.qmth.themis.mq.service.MqLogicService;
 import com.qmth.themis.mq.templete.Concurrently;
 

themis-mq/src/main/java/com/qmth/themis/mq/templete/impl/FaceVerifyConcurrentlyImpl.java

@@ -16,7 +16,7 @@ import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.common.contanst.Constants;
-import com.qmth.themis.mq.dto.MqDto;
+import com.qmth.themis.business.dto.MqDto;
 import com.qmth.themis.mq.service.MqLogicService;
 import com.qmth.themis.mq.templete.Concurrently;
 

themis-mq/src/main/java/com/qmth/themis/mq/templete/impl/LivenessVerifyConcurrentlyImpl.java

@@ -16,7 +16,7 @@ import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.common.contanst.Constants;
-import com.qmth.themis.mq.dto.MqDto;
+import com.qmth.themis.business.dto.MqDto;
 import com.qmth.themis.mq.service.MqLogicService;
 import com.qmth.themis.mq.templete.Concurrently;
 

themis-mq/src/main/java/com/qmth/themis/mq/templete/impl/SessionConcurrentlyImpl.java

@@ -9,7 +9,7 @@ import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.common.contanst.Constants;
 import com.qmth.themis.common.exception.BusinessException;
-import com.qmth.themis.mq.dto.MqDto;
+import com.qmth.themis.business.dto.MqDto;
 import com.qmth.themis.mq.service.MqLogicService;
 import com.qmth.themis.mq.templete.Concurrently;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;

themis-mq/src/main/java/com/qmth/themis/mq/templete/impl/TaskConcurrentlyImpl.java

@@ -5,7 +5,7 @@ import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.common.contanst.Constants;
-import com.qmth.themis.mq.dto.MqDto;
+import com.qmth.themis.business.dto.MqDto;
 import com.qmth.themis.mq.service.MqLogicService;
 import com.qmth.themis.mq.templete.Concurrently;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;

themis-mq/src/main/java/com/qmth/themis/mq/templete/impl/UserLogConcurrentlyImpl.java

@@ -5,7 +5,7 @@ import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.common.contanst.Constants;
-import com.qmth.themis.mq.dto.MqDto;
+import com.qmth.themis.business.dto.MqDto;
 import com.qmth.themis.mq.service.MqLogicService;
 import com.qmth.themis.mq.templete.Concurrently;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;

themis-mq/src/main/java/com/qmth/themis/mq/templete/impl/WebsocketUnNormalConcurrentlyImpl.java

@@ -6,7 +6,7 @@ import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.common.contanst.Constants;
-import com.qmth.themis.mq.dto.MqDto;
+import com.qmth.themis.business.dto.MqDto;
 import com.qmth.themis.mq.service.MqLogicService;
 import com.qmth.themis.mq.templete.Concurrently;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;

themis-task/src/main/java/com/qmth/themis/task/listener/QuartzOrderlyImpl.java

@@ -5,7 +5,7 @@ import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.common.contanst.Constants;
-import com.qmth.themis.mq.dto.MqDto;
+import com.qmth.themis.business.dto.MqDto;
 import com.qmth.themis.mq.templete.Orderly;
 import com.qmth.themis.task.listener.service.MqTaskLogicService;
 import org.apache.rocketmq.client.consumer.listener.ConsumeOrderlyContext;

themis-task/src/main/java/com/qmth/themis/task/listener/service/MqTaskLogicService.java

@@ -1,6 +1,6 @@
 package com.qmth.themis.task.listener.service;
 
-import com.qmth.themis.mq.dto.MqDto;
+import com.qmth.themis.business.dto.MqDto;
 
 import java.lang.reflect.InvocationTargetException;
 

themis-task/src/main/java/com/qmth/themis/task/listener/service/impl/MqTaskLogicServiceImpl.java

@@ -12,7 +12,7 @@ import com.qmth.themis.business.entity.TMRocketMessage;
 import com.qmth.themis.business.service.TMRocketMessageService;
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
-import com.qmth.themis.mq.dto.MqDto;
+import com.qmth.themis.business.dto.MqDto;
 import com.qmth.themis.task.enums.QuartzTaskEnum;
 import com.qmth.themis.task.listener.service.MqTaskLogicService;
 import com.qmth.themis.task.quartz.ExamActivityJob;

themis-task/src/main/java/com/qmth/themis/task/quartz/MqJob.java

@@ -2,8 +2,8 @@ package com.qmth.themis.task.quartz;
 
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.util.RedisUtil;
-import com.qmth.themis.mq.dto.MqDto;
-import com.qmth.themis.mq.service.ProducerServer;
+import com.qmth.themis.business.dto.MqDto;
+import com.qmth.themis.business.service.ProducerServer;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.slf4j.Logger;

themis-task/src/main/java/com/qmth/themis/task/quartz/service/impl/QuartzLogicServiceImpl.java

@@ -13,10 +13,10 @@ import com.qmth.themis.business.service.TEExamStudentService;
 import com.qmth.themis.business.service.TOeExamRecordService;
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
-import com.qmth.themis.mq.dto.MqDto;
-import com.qmth.themis.mq.enums.MqTagEnum;
-import com.qmth.themis.mq.enums.MqTopicEnum;
-import com.qmth.themis.mq.service.MqDtoService;
+import com.qmth.themis.business.dto.MqDto;
+import com.qmth.themis.business.enums.MqTagEnum;
+import com.qmth.themis.business.enums.MqTopicEnum;
+import com.qmth.themis.business.service.MqDtoService;
 import com.qmth.themis.task.quartz.service.QuartzLogicService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -14,9 +14,9 @@ import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
 import com.qmth.themis.business.constant.SpringContextHolder;
-import com.qmth.themis.mq.enums.MqGroupEnum;
-import com.qmth.themis.mq.enums.MqTagEnum;
-import com.qmth.themis.mq.enums.MqTopicEnum;
+import com.qmth.themis.business.enums.MqGroupEnum;
+import com.qmth.themis.business.enums.MqTagEnum;
+import com.qmth.themis.business.enums.MqTopicEnum;
 import com.qmth.themis.mq.listener.RocketMessageConsumer;
 import com.qmth.themis.task.enums.QuartzTaskEnum;
 import com.qmth.themis.task.listener.QuartzOrderlyImpl;