Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-dragon/src/main/java/com/liquidnet/service/consumer/dragon/receiver/AbstractRedisReceiver.java

@@ -38,17 +38,15 @@ public abstract class AbstractRedisReceiver implements StreamListener<String, Ma
         boolean result = this.consumerSqlDaoHandler(message.getValue().get("message"));
 
         // 消费成功确认，消息删除和消息确认是一个事务
-        if(result){
-            log.error("consumer success delete message messageId:{} ",message.getId());
-            try {
+        log.info("consumer success delete message messageId:{} ",message.getId());
+        try {
 //                stringRedisTemplate.multi();
-                stringRedisTemplate.opsForStream().delete(this.getRedisStreamKey(), message.getId());
+            stringRedisTemplate.opsForStream().delete(this.getRedisStreamKey(), message.getId());
 //                stringRedisTemplate.opsForStream().acknowledge(getRedisStreamGroup(), message);
 //                stringRedisTemplate.exec();
-            } catch (Exception e) {
-                e.printStackTrace();
-                log.error("delete redis queue message error messageId:{} errMsg:{}",message.getId(),e.getMessage());
-            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("delete redis queue message error messageId:{} errMsg:{}",message.getId(),e.getMessage());
         }
     }
 
@@ -61,6 +59,8 @@ public abstract class AbstractRedisReceiver implements StreamListener<String, Ma
             log.debug("CONSUMER SQL result of execution:{}", rstBatchSqls);
             if (rstBatchSqls) {
                 return true;
+            }else{
+                sendMySqlRedis(msg);
             }
         } catch (Exception e) {
             e.printStackTrace();

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-dragon/src/main/java/com/liquidnet/service/consumer/dragon/receiver/RedisRefundReceiver.java

@@ -31,17 +31,15 @@ public class RedisRefundReceiver implements StreamListener<String, MapRecord<Str
         System.out.println("stream " + message.getStream());
         System.out.println("body " + message.getValue());
         boolean result = this.consumerSqlDaoHandler(message.getValue().get("message"));
-        if(result){
-            log.error("consumer success delete message messageId:{} ",message.getId());
-            try {
+        log.info("consumer success delete message messageId:{} ",message.getId());
+        try {
 //                stringRedisTemplate.multi();
-                stringRedisTemplate.opsForStream().delete(DragonConstant.MysqlRedisQueueEnum.DRAGON_REFUND_KEY.getCode(), message.getId());
+            stringRedisTemplate.opsForStream().delete(DragonConstant.MysqlRedisQueueEnum.DRAGON_REFUND_KEY.getCode(), message.getId());
 //                stringRedisTemplate.opsForStream().acknowledge(getRedisStreamGroup(), message);
 //                stringRedisTemplate.exec();
-            } catch (Exception e) {
-                log.error("delete redis queue message Exception error: {} ",e);
-                log.error("delete redis queue message error messageId:{} errMsg:{}",message.getId(),e.getMessage());
-            }
+        } catch (Exception e) {
+            log.error("delete redis queue message Exception error: {} ",e);
+            log.error("delete redis queue message error messageId:{} errMsg:{}",message.getId(),e.getMessage());
         }
     }
 
@@ -54,6 +52,8 @@ public class RedisRefundReceiver implements StreamListener<String, MapRecord<Str
             log.debug("CONSUMER SQL result of execution:{}", rstBatchSqls);
             if (rstBatchSqls) {
                 return true;
+            } else {
+                sendMySqlRedis(msg);
             }
         } catch (Exception e) {
             e.printStackTrace();