fix:DM;

liquidnet-bus-config/liquidnet-config/liquidnet-service-platform.yml

@@ -121,11 +121,9 @@ spring:
 #    type: org.apache.tomcat.jdbc.pool.DataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
     hikari:
-      # 迁移数据暂设500
-      maximum-pool-size: 500
-      # 迁移数据暂设10分钟
-      connection-timeout: 600000
-      minimum-idle: 8
+      maximum-pool-size: 50
+      connection-timeout: 60000
+      minimum-idle: 10
       connection-test-query: SELECT 1
 # -----------------------------------------------------------
 

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

@@ -60,8 +60,8 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
         if (null != dg) {
             sqlCount = sqlCount + " and uid%" + dG + "=" + dg;
         }
-        String field = "uid,mobile,username,sex,birthday,area,sign,face_url,back_url,created_at,updated_at,is_complete,rong_cloud_token,rong_cloud_tag";
-//                     1-uid,2-mobile,3-username,4-sex,5-birthday,6-area,7-sign,8-face_url,9-back_url,10-created_at,11-updated_at,12-is_complete,13-rong_cloud_token,14-rong_cloud_tag
+        String field = "uid,mobile,username,sex,birthday,area,sign,face_url,back_url,created_at,updated_at,is_complete,rong_cloud_token,rong_cloud_tag,password";
+//                     1-uid,2-mobile,3-username,4-sex,5-birthday,6-area,7-sign,8-face_url,9-back_url,10-created_at,11-updated_at,12-is_complete,13-rong_cloud_token,14-rong_cloud_tag,15-password
         String sql = sqlCount.replace("count(1)", field);
         boolean smFlg = "1".equals(flg);
         if (smFlg) {
@@ -103,6 +103,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
                         user.setUid(uid);
                         String mobile = row.getString(2);
                         user.setMobile(mobile);
+                        user.setPasswd(row.getString(15));
                         LocalDateTime createdAt = row.getLocalDateTime(10), updatedAt = row.getLocalDateTime(11);
                         user.setIsComplete(row.getInt(12));
                         user.setCreatedAt(createdAt);
@@ -125,6 +126,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
                         AdamUserInfoVo vo = AdamUserInfoVo.getNew();
                         vo.setUid(user.getUid());
                         vo.setMobile(user.getMobile());
+                        vo.setPasswd(user.getPasswd());
                         vo.setNickname(userInfo.getNickname());
                         vo.setState(user.getState());
                         vo.setSex(sex);