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

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/SqlMapping.java

@@ -4,10 +4,9 @@ import com.liquidnet.commons.lang.util.JsonUtils;
 import org.apache.logging.log4j.util.PropertiesUtil;
 import org.springframework.core.io.support.PropertiesLoaderUtils;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
+import java.io.*;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
@@ -16,15 +15,18 @@ import java.util.Properties;
 public class SqlMapping {
     private static final String sqlMapDir = "sqlmap";
     private static Map<String, String> sqlPropertiesMap = new HashMap<>();
-
     static {
         try {
             URL url = PropertiesUtil.class.getClassLoader().getResource(sqlMapDir);
+            System.out.println("sm.url:" + url);
             if (null != url) {
+                System.out.println("sm.url:" + url.getPath() + ",file:" + url.getFile());
                 File file = new File(url.getFile());
                 if (file.exists() && file.isDirectory()) {
+                    System.out.println("sm.url:" + file.getPath());
                     File[] files = file.listFiles();
                     for (File f : files) {
+                        System.out.println("sm.url:" + f.getPath());
                         if (f.isFile() && f.getName().endsWith("properties")) {
                             Properties props = PropertiesLoaderUtils.loadAllProperties(sqlMapDir.concat("/") + f.getName());
                             for (Object key : props.keySet()) {

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

@@ -94,8 +94,12 @@ public class AdamEntersServiceImpl extends ServiceImpl<AdamEntersMapper, AdamEnt
         paramList.add(info.getUpdatedAt());
         paramList.add(info.getDeletedAt());
         paramList.add(info.getComment());
+
+        String mqMsg = SqlMapping.get("adam_enters.add", paramList.toArray());
+        log.info("mq.sql:{}", mqMsg);
+
         rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
-                SqlMapping.get("adam_enters.add", paramList.toArray()));
+                mqMsg);
 
         entersList.add(info);
         adamRdmService.setEntersByUid(info.getUid(), entersList);