xiewj 1 год назад
Родитель
Сommit
d0b6a3dfd9

+ 14 - 8
720yun_fd_consumer/gis_consumer/src/main/resources/application-pro.yml

@@ -43,15 +43,21 @@ spring:
                 enabled: true
         type: com.alibaba.druid.pool.DruidDataSource
     rabbitmq:
-        address: 172.18.157.42:5672
-        connection-timeout: 15000
-        password: guest
-        publisher-confirms: true
-        publisher-returns: true
-        template:
-            mandatory: true
+        host: 172.18.157.42
+        port: 5672
         username: guest
-        virtual-host: /
+        password: guest
+        virtual-host: 4dkankan
+        connection-timeout: 0
+        listener:
+            simple:
+                prefetch: 5
+                max-concurrency: 10
+                acknowledge-mode: manual #开启消费者手动确认
+            direct:
+                acknowledge-mode: manual #开启消费者手动确认
+        #开启消息投递确认机制
+        publisher-confirm-type: correlated
     redis:
         database: 0
         host: r-wz9owsphxqwi4ztqlf.redis.rds.aliyuncs.com

+ 13 - 7
720yun_fd_manage/gis_application/src/main/resources/application-pro.yml

@@ -52,15 +52,21 @@ spring:
                 enabled: true
         type: com.alibaba.druid.pool.DruidDataSource
     rabbitmq:
-        address: 172.18.157.42:5672
-        connection-timeout: 15000
+        host: 172.18.157.42
+        port: 5672
+        username: guest
         password: guest
+        virtual-host: 4dkankan
+        connection-timeout: 0
+        listener:
+            simple:
+                prefetch: 5
+                max-concurrency: 10
+                acknowledge-mode: manual #开启消费者手动确认
+            direct:
+                acknowledge-mode: manual #开启消费者手动确认
+        #开启消息投递确认机制
         publisher-confirm-type: correlated
-        publisher-returns: true
-        template:
-            mandatory: true
-        username: guest
-        virtual-host: /
     redis:
         database: 0
         host: r-wz9owsphxqwi4ztqlf.redis.rds.aliyuncs.com

+ 1 - 1
720yun_fd_manage/gis_mapper/src/main/java/com/gis/mapper/WorkMapper.java

@@ -35,7 +35,7 @@ public interface WorkMapper extends IBaseStrMapper<WorkEntity, String> {
      * @param id
      * @return
      */
-    @Select("select id, name, scene_codes, user_id, type, sn_code from tb_work where is_delete = 0 and id = #{id} for update")
+    @Select("select id, name, scene_codes, user_id, type, sn_code , num from tb_work where is_delete = 0 and id = #{id} for update")
     WorkEntity findByIdForUpdate(String id);