fix:close.dev.smscode;

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -240,9 +240,9 @@ public class AdamLoginController {
     /* ---------------------------- Internal Method ---------------------------- */
 
     private boolean checkSmsCode(String mobile, String code) {
-        if (Arrays.asList("dev").contains(env.getProperty("spring.profiles.active"))) {
-            return "111111".equals(code);
-        }
+//        if (Arrays.asList("dev").contains(env.getProperty("spring.profiles.active"))) {
+//            return "111111".equals(code);
+//        }
 
         LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
         paramsMap.add("mobile", mobile);

liquidnet-bus-service/liquidnet-service-consumer/src/main/java/com/liquidnet/service/consumer/service/processor/ConsumerProcessor.java

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.amqp.core.Message;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 
 /**
  * ConsumerProcessor.class
@@ -35,16 +36,50 @@ public class ConsumerProcessor {
 //    }
 
     @RabbitListener(queues = MQConst.QUEUES_SQL_MAIN)
-    public void consumerSql(String msg) {
-        SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(msg, SqlMapping.SqlMessage.class);
+    public void consumerSql(Message msg, Channel channel) {
+        SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(new String(msg.getBody()), SqlMapping.SqlMessage.class);
         log.debug("consumer sql ==> Preparing:{}", JsonUtils.toJson(sqlMessage.getSqls()));
         log.debug("consumer sql ==> Parameters:{}", JsonUtils.toJson(sqlMessage.getArgs()));
 
         try {
             Boolean rstBatchSqls = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
-            log.debug("batchSqls result of execution:{}", rstBatchSqls);
+            log.debug("consumer sql result of execution:{}", rstBatchSqls);
+            if (rstBatchSqls) {
+                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), true);
+            } else {
+                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+            }
         } catch (Exception e) {
-            log.error("error:sqlMessage:{}", JsonUtils.toJson(sqlMessage), e);
+            log.error("error:consumer sql:{}", JsonUtils.toJson(sqlMessage), e);
+            try {
+                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+            } catch (IOException ioException) {
+                log.error("error:consumer sql:basicReject.msg.tag:{}", msg.getMessageProperties().getDeliveryTag(), ioException);
+            }
+        }
+    }
+
+    @RabbitListener(queues = MQConst.QUEUES_SQL_MAIN)
+    public void consumerSql2(Message msg, Channel channel) {
+        SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(new String(msg.getBody()), SqlMapping.SqlMessage.class);
+        log.debug("consumer sql2 ==> Preparing:{}", JsonUtils.toJson(sqlMessage.getSqls()));
+        log.debug("consumer sql2 ==> Parameters:{}", JsonUtils.toJson(sqlMessage.getArgs()));
+
+        try {
+            Boolean rstBatchSqls = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
+            log.debug("consumer sql2 result of execution:{}", rstBatchSqls);
+            if (rstBatchSqls) {
+                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), true);
+            } else {
+                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+            }
+        } catch (Exception e) {
+            log.error("error:consumer sql2:{}", JsonUtils.toJson(sqlMessage), e);
+            try {
+                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+            } catch (IOException ioException) {
+                log.error("error:consumer sql2:basicReject.msg.tag:{}", msg.getMessageProperties().getDeliveryTag(), ioException);
+            }
         }
     }