Merge branch 'rabbit' of wangfan/adweb3-server into master

jeecg-module-system/jeecg-system-biz/pom.xml

@@ -44,7 +44,7 @@
 			<artifactId>hutool-all</artifactId>
 			<version>5.8.25</version>
 		</dependency>
-	<!-- 积木报表 mongo redis 支持包 
+	<!-- 积木报表 mongo redis 支持包
 		<dependency>
 			<groupId>org.jeecgframework.jimureport</groupId>
 			<artifactId>jimureport-nosql-starter</artifactId>
@@ -52,11 +52,15 @@
 
         <!--xxl-job定时任务-->
         <dependency>
-            <groupId>com.xuxueli</groupId>
-            <artifactId>xxl-job-core</artifactId>
-            <version>${xxl-job-core.version}</version>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-boot-starter3-job</artifactId>
         </dependency>
 
-	</dependencies>
-	
+        <!--rabbitmq消息队列-->
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-boot-starter3-rabbitmq</artifactId>
+        </dependency>
+    </dependencies>
+
 </project>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/dto/EnquiryDTO.java

@@ -0,0 +1,16 @@
+package org.jeecg.modules.adweb.enquiry.dto;
+
+import lombok.Data;
+
+/**
+ * @author wfansh
+ */
+@Data
+public class EnquiryDTO {
+
+    private long id;
+
+    private String msg;
+
+    // TODO
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/mq/EnquiryReceiver.java

@@ -0,0 +1,43 @@
+package org.jeecg.modules.adweb.enquiry.mq;
+
+import com.rabbitmq.client.Channel;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.boot.starter.rabbitmq.core.BaseRabbiMqHandler;
+import org.jeecg.boot.starter.rabbitmq.listenter.MqListener;
+import org.jeecg.common.annotation.RabbitComponent;
+import org.jeecg.modules.adweb.enquiry.dto.EnquiryDTO;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.amqp.support.AmqpHeaders;
+import org.springframework.messaging.handler.annotation.Header;
+
+/**
+ * Rabbit MQ - 询盘消息接收
+ *
+ * @author wfansh
+ */
+@Slf4j
+@RabbitComponent(value = "enquiryReceiver")
+public class EnquiryReceiver extends BaseRabbiMqHandler<EnquiryDTO> {
+
+    @RabbitHandler
+    @RabbitListener(queues = "enquiry")
+    public void onMessage(
+            EnquiryDTO enquiryDTO,
+            Channel channel,
+            @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) {
+        super.onMessage(
+                enquiryDTO,
+                deliveryTag,
+                channel,
+                new MqListener<EnquiryDTO>() {
+                    @Override
+                    public void handler(EnquiryDTO enquiry, Channel channel) {
+                        // 业务处理
+                        log.info("收到MQ消息 {}", enquiry);
+                    }
+                });
+    }
+}

jeecg-module-system/jeecg-system-start/pom.xml

@@ -42,18 +42,6 @@
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
-
-        <!--xxl-job定时任务-->
-        <dependency>
-            <groupId>org.jeecgframework.boot</groupId>
-            <artifactId>jeecg-boot-starter3-job</artifactId>
-        </dependency>
-
-        <!--rabbitmq消息队列-->
-        <dependency>
-            <groupId>org.jeecgframework.boot</groupId>
-            <artifactId>jeecg-boot-starter3-rabbitmq</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -189,9 +189,9 @@ spring:
     username: admin
     password: Initial0
     port: 5672
-    publisher-confirms: true
+    publisher-confirm-type: correlated
     publisher-returns: true
-    virtual-host: /adweb
+    virtual-host: /adweb3
     listener:
       simple:
         acknowledge-mode: manual

jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml

@@ -189,9 +189,9 @@ spring:
     username: admin
     password: Initial0
     port: 5672
-    publisher-confirms: true
+    publisher-confirm-type: correlated
     publisher-returns: true
-    virtual-host: /adweb
+    virtual-host: /adweb3
     listener:
       simple:
         acknowledge-mode: manual

jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml

@@ -188,9 +188,9 @@ spring:
     username: admin
     password: Initial0
     port: 5672
-    publisher-confirms: true
+    publisher-confirm-type: correlated
     publisher-returns: true
-    virtual-host: /adweb
+    virtual-host: /adweb3
     listener:
       simple:
         acknowledge-mode: manual