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

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/DMRdmService.java

@@ -16,7 +16,13 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
@@ -30,11 +36,58 @@ public class DMRdmService {
     @Autowired
     RedisUtil redisUtil;
 
+    public void setSwitch(String rk, int val) {
+        redisUtil.set(rk, val);
+    }
+
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | Switch config */
+
     public Integer getSwitch(String rk) {
         Integer i = (Integer) redisUtil.get(rk);
         return null == i ? 1 : i;
     }
 
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | Loader meta-fil */
+
+    public List<String> getNknameList() {
+        ArrayList<String> list = (ArrayList<String>) redisUtil.get(AdamRedisConst.INFO_LIBRARY_NKNAME);
+        if (CollectionUtils.isEmpty(list)) {
+            InputStream inputStream = null;
+            InputStreamReader inputStreamReader = null;
+            BufferedReader bufferedReader = null;
+            try {
+                inputStream = this.getClass().getClassLoader().getResourceAsStream("META-FIL/library_nickname.csv");
+                inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
+                bufferedReader = new BufferedReader(inputStreamReader);
+
+                String line;
+                while ((line = bufferedReader.readLine()) != null) {
+                    int l = org.apache.commons.lang3.StringUtils.length(line);
+                    if (l == 0) {
+                        break;
+                    }
+                    if (l > 11) {
+                        line = line.substring(0, 11);
+                    }
+                    list.add(line);
+                }
+            } catch (IOException e) {
+                log.error("Read CSV[library_nickname.csv] failure.", e);
+            } finally {
+                try {
+                    if (null != bufferedReader) bufferedReader.close();
+                    if (null != inputStreamReader) inputStreamReader.close();
+                    if (null != inputStream) inputStream.close();
+                } catch (IOException e) {
+                    log.error("Close stream failure.", e);
+                }
+            }
+
+            if (!CollectionUtils.isEmpty(list)) redisUtil.set(AdamRedisConst.INFO_LIBRARY_NKNAME, list);
+        }
+        return list;
+    }
+
     /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <Mobile｜OPENID, UID> */
 
     public boolean setUidByMobile(String mobile, String uid) {

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMAddressesProcessor.java

@@ -43,8 +43,8 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
         String sql = sqlCount.replace("count(1)", field);
         boolean smFlg = "1".equals(flg);
         if (smFlg) {
-            sqlCount += " and user_id in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
-            sql += " and user_id in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
+            sqlCount += " and user_id in (" + DG_UID + ")";
+            sql += " and user_id in (" + DG_UID + ")";
         }
         sql += " order by id limit ?,?";
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMCollectionProcessor.java

@@ -44,8 +44,8 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
         String sql = sqlCount.replace("count(1)", field);
         boolean smFlg = "1".equals(flg);
         if (smFlg) {
-            sqlCount += " and uid in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
-            sql += " and uid in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
+            sqlCount += " and uid in (" + DG_UID + ")";
+            sql += " and uid in (" + DG_UID + ")";
         }
         sql += " order by id limit ?,?";
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMEntersProcessor.java

@@ -46,8 +46,8 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
         String sql = sqlCount.replace("count(1)", field);
         boolean smFlg = "1".equals(flg);
         if (smFlg) {
-            sqlCount += " and user_id in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
-            sql += " and user_id in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
+            sqlCount += " and user_id in (" + DG_UID + ")";
+            sql += " and user_id in (" + DG_UID + ")";
         }
         sql += " order by id limit ?,?";
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMMemberOrderProcessor.java

@@ -69,8 +69,8 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
         String sql = sqlCount.replace("count(1)", field);
         boolean smFlg = "1".equals(flg);
         if (smFlg) {
-            sqlCount += " and uid in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
-            sql += " and uid in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
+            sqlCount += " and uid in (" + DG_UID + ")";
+            sql += " and uid in (" + DG_UID + ")";
         }
         sql += " order by id limit ?,?";
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMRealNameProcessor.java

@@ -44,8 +44,8 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
         String sql = sqlCount.replace("count(1)", field);
         boolean smFlg = "1".equals(flg);
         if (smFlg) {
-            sqlCount += " and uid in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
-            sql += " and uid in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
+            sqlCount += " and uid in (" + DG_UID + ")";
+            sql += " and uid in (" + DG_UID + ")";
         }
         sql += " order by id limit ?,?";
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMThirdPartsProcessor.java

@@ -48,8 +48,8 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
         String sql = sqlCount.replace("count(1)", field);
         boolean smFlg = "1".equals(flg);
         if (smFlg) {
-            sqlCount += " and uid in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
-            sql += " and uid in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
+            sqlCount += " and uid in (" + DG_UID + ")";
+            sql += " and uid in (" + DG_UID + ")";
         }
         sql += " order by id limit ?,?";
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMTracesInfoProcessor.java

 package com.liquidnet.service.platform.service.impl.adam.dm.processor;
 
+import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.vo.AdamMemberPriceVo;
 import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
 import com.liquidnet.service.adam.entity.AdamMember;
@@ -44,6 +45,7 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
         this.memberCardInfoHandler();
         this.memberCardPriceHandler();
         this.userMemberBlackListHandler();
+        this.setRdsCache();
     }
 
     @SneakyThrows
@@ -210,4 +212,11 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
         } catch (SQLException ignored) {
         }
     }
+
+    private void setRdsCache() {
+        dmRdmService.setSwitch(AdamRedisConst.SWITCH_GRAY_LOGIN_SMS, 612543);
+        log.info("switch {}:{}", AdamRedisConst.SWITCH_GRAY_LOGIN_SMS, dmRdmService.getSwitch(AdamRedisConst.SWITCH_GRAY_LOGIN_SMS));
+        List<String> nknameList = dmRdmService.getNknameList();
+        log.info("init loader nknameList.size:{}", nknameList.size());
+    }
 }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMUserInformationProcessor.java

@@ -65,8 +65,8 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
         String sql = sqlCount.replace("count(1)", field);
         boolean smFlg = "1".equals(flg);
         if (smFlg) {
-            sqlCount += "and mobile in ('13753596360','17701223310','18518013286','18548596019','15901093014','17382319723','13631444097','13671737873')";
-            sql += " and mobile in ('13753596360','17701223310','18518013286','18548596019','15901093014','17382319723','13631444097','13671737873')";
+            sqlCount += "and mobile in (" + DG_MBL + ")";
+            sql += " and mobile in (" + DG_MBL + ")";
         }
         sql += " order by uid limit ?,?";
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMUserMemberProcessor.java

@@ -44,8 +44,8 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
         String sql = sqlCount.replace("count(1)", field);
         boolean smFlg = "1".equals(flg);
         if (smFlg) {
-            sqlCount += " and uid in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
-            sql += " and uid in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
+            sqlCount += " and uid in (" + DG_UID + ")";
+            sql += " and uid in (" + DG_UID + ")";
         }
         sql += " order by id limit ?,?";