Merge branch 'dev' into test

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -96,6 +96,8 @@ liquidnet:
       service:
         appid: wx3498304dda39c5a1
         secret: a1307fab0a5f2380086a7c636f7339ea
+        token: tftipg1427706847
+        aeskey: LwVpmpuOcl7Mi3mtfQgBol11MsmMCATIqbPgHrEpDzx
     applet:
       strawberry:
         appid: wx08b852ade69f8019

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -96,6 +96,8 @@ liquidnet:
       service:
         appid: wx3498304dda39c5a1
         secret: a1307fab0a5f2380086a7c636f7339ea
+        token: tftipg1427706847
+        aeskey: LwVpmpuOcl7Mi3mtfQgBol11MsmMCATIqbPgHrEpDzx
     applet:
       strawberry:
         appid: wx08b852ade69f8019

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/mongo_db_ddl.sql

-use test_ln_scene;
-#创建集合
-db.createCollection("KylinCheckUserPerformanceVo");
-db.createCollection("KylinCheckUserVo");
-db.createCollection("KylinOrderRefundEntitiesVo");
-db.createCollection("KylinOrderRefundPicVo");
-db.createCollection("KylinOrderRefundsVo");
-db.createCollection("KylinOrderTicketEntitiesVo");
-db.createCollection("KylinOrderTicketVo");
-db.createCollection("KylinPerformanceVo");
-db.createCollection("KylinRoadShowVo");
-db.createCollection("KylinPerformanceMisVo");
-db.createCollection("KylinTicketPartnerVo");
-db.createCollection("KylinTicketTimesPartnerVo");
-db.createCollection("PerformanceMemberAuditParam");
-db.createCollection("AdminUpushVo");
-
-#创建索引
-db.KylinCheckUserPerformanceVo.createIndex({checkUserId:"hashed"});
-db.KylinCheckUserVo.createIndex({merchantId:"hashed"});
-db.KylinCheckUserVo.createIndex({mobile:"hashed"});
-db.KylinOrderRefundEntitiesVo.createIndex({orderRefundsId:"hashed"});
-db.KylinOrderRefundEntitiesVo.createIndex({orderTicketEntitiesId:"hashed"});
-db.KylinOrderRefundPicVo.createIndex({orderRefundsId:"hashed"});
-db.KylinOrderRefundsVo.createIndex({orderRefundsId:"hashed"});
-db.KylinOrderRefundsVo.createIndex({orderTicketsId:"hashed"});
-db.KylinOrderTicketEntitiesVo.createIndex({orderTicketEntitiesId:"hashed"});
-db.KylinOrderTicketEntitiesVo.createIndex({orderId:"hashed"});
-db.KylinOrderTicketVo.createIndex({orderTicketsId:"hashed"});
-db.KylinOrderTicketVo.createIndex({orderCode:"hashed"});
-db.KylinOrderTicketVo.createIndex({userId:"hashed"});
-db.KylinPerformanceVo.createIndex({performancesId:"hashed"});
-db.KylinPerformanceMisVo.createIndex({performancesId:"hashed"});
-db.KylinTicketPartnerVo.createIndex({ticketsId:"hashed"});
-db.KylinTicketPartnerVo.createIndex({timesId:"hashed"});
-db.KylinTicketTimesPartnerVo.createIndex({performancesId:"hashed"});
-db.KylinTicketTimesPartnerVo.createIndex({ticketTimesId:"hashed"});
-db.PerformanceMemberAuditParam.createIndex({performancesId:"hashed"});
-db.AdminUpushVo.createIndex({upushId:"hashed"});
-
-#创建分片
-sh.enableSharding("test_ln_scene");
-sh.shardCollection("test_ln_scene.KylinCheckUserPerformanceVo",{"checkUserId":"hashed"});
-sh.shardCollection("test_ln_scene.KylinCheckUserVo",{"checkUserId":"hashed"});
-sh.shardCollection("test_ln_scene.KylinOrderRefundEntitiesVo",{"orderRefundsEntitiesId":"hashed"});
-sh.shardCollection("test_ln_scene.KylinOrderRefundPicVo",{"refundPicId":"hashed"});
-sh.shardCollection("test_ln_scene.KylinOrderRefundsVo",{"orderRefundsId":"hashed"});
-sh.shardCollection("test_ln_scene.KylinOrderTicketEntitiesVo",{"orderTicketEntitiesId":"hashed"});
-sh.shardCollection("test_ln_scene.KylinOrderTicketVo",{"orderTicketsId":"hashed"});
-sh.shardCollection("test_ln_scene.KylinPerformanceVo",{"performancesId":"hashed"});
-sh.shardCollection("test_ln_scene.KylinRoadShowVo",{"roadShowsId":"hashed"});
-sh.shardCollection("test_ln_scene.KylinPerformanceMisVo",{"performancesId":"hashed"});
-sh.shardCollection("test_ln_scene.KylinTicketPartnerVo",{"ticketsId":"hashed"});
-sh.shardCollection("test_ln_scene.KylinTicketTimesPartnerVo",{"ticketTimesId":"hashed"});
-sh.shardCollection("test_ln_scene.PerformanceMemberAuditParam",{"performancesId":"hashed"});
-sh.shardCollection("test_ln_scene.AdminUpushVo",{"upushId":"hashed"});

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/mongo_db_del.sql

+use test_ln_scene;
+#删除集合内数据
+db.KylinCheckUserPerformanceVo.deleteMany({});
+db.KylinCheckUserVo.deleteMany({});
+db.KylinOrderRefundEntitiesVo.deleteMany({});
+db.KylinOrderRefundPicVo.deleteMany({});
+db.KylinOrderRefundsVo.deleteMany({});
+db.KylinOrderTicketEntitiesVo.deleteMany({});
+db.KylinOrderTicketVo.deleteMany({});
+db.KylinPerformanceVo.deleteMany({});
+db.KylinRoadShowVo.deleteMany({});
+db.KylinPerformanceMisVo.deleteMany({});
+db.KylinTicketPartnerVo.deleteMany({});
+db.KylinTicketTimesPartnerVo.deleteMany({});
+db.PerformanceMemberAuditParam.deleteMany({});
+db.AdminUpushVo.deleteMany({});
+
+

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

@@ -96,7 +96,7 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
                         dmRdmService.addAddressesVoByUid(uid, dmRdmService.getAddressesVoByUid(uid), vo);
                     }
 
-                    if (addressesList.size() == 500 || (addressesList.size() > 0 && smFlg)) {
+                    if (addressesList.size() == 1000 || (addressesList.size() > 0 && smFlg) || ct < 1000) {
                         tl += addressesList.size();
 //                        mongoTemplate.insert(vos, AdamAddressesVo.class.getSimpleName());
                         log.info("DM.execute.limit.result:{}", dmAddressesService.saveBatch(addressesList));

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

@@ -87,7 +87,7 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
                         collectionList.add(collection);
                         vos.add(AdamCollectBaseVo.getNew().copy(collection));
                     }
-                    if (collectionList.size() == 500 || (collectionList.size() > 0 && smFlg)) {
+                    if (collectionList.size() == 1000 || (collectionList.size() > 0 && smFlg) || ct < 1000) {
                         tl += collectionList.size();
 //                        mongoTemplate.insert(vos, AdamCollectBaseVo.class.getSimpleName());
                         log.info("DM.execute.limit.result:{}", dmCollectionService.saveBatch(collectionList));

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

@@ -100,7 +100,7 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
                         }
                         dmRdmService.addEntersVoByUid(uid, dmRdmService.getEntersVoByUid(uid), vo);
                     }
-                    if (entersList.size() == 500 || (entersList.size() > 0 && smFlg)) {
+                    if (entersList.size() == 1000 || (entersList.size() > 0 && smFlg) || ct < 1000) {
                         tl += entersList.size();
 //                        mongoTemplate.insert(vos, AdamEntersVo.class.getSimpleName());
                         log.info("DM.execute.limit.result:{}", dmEntersService.saveBatch(entersList));

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

@@ -251,7 +251,7 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
                         dmRdmService.setMemberCodeVoByCode(memberCode.getCode(), vo);
                     }
 //                }
-                    if (memberCodeList.size() == 500) {
+                    if (memberCodeList.size() == 1000 || ct < 1000) {
                         tl += memberCodeList.size();
 //                        mongoTemplate.insert(vos, AdamMemberCodeVo.class.getSimpleName());
                         log.info("DM.execute.limit.result:{}", dmMemberCodeService.saveBatch(memberCodeList));

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

@@ -132,7 +132,7 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
 
                         dmRdmService.addMemberOrderVoByUid(uid, dmRdmService.getMemberOrderVosByUid(uid), vo);
                     }
-                    if (memberOrderList.size() == 500 || (memberOrderList.size() > 0 && smFlg)) {
+                    if (memberOrderList.size() == 1000 || (memberOrderList.size() > 0 && smFlg) || ct < 1000) {
                         tl += memberOrderList.size();
 //                        mongoTemplate.insert(vos, AdamMemberOrderVo.class.getSimpleName());
                         log.info("DM.execute.limit.result:{}", dmMemberOrderService.saveBatch(memberOrderList));

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

@@ -99,7 +99,7 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
                         dmRdmService.setRealInfoVoByUid(uid, vo);
                         dmRdmService.setCertification(1, realName.getIdCard(), realName.getName());
                     }
-                    if (realNameList.size() == 500 || (realNameList.size() > 0 && smFlg)) {
+                    if (realNameList.size() == 1000 || (realNameList.size() > 0 && smFlg) || ct < 1000) {
                         tl += realNameList.size();
 //                        mongoTemplate.insert(vos, AdamRealInfoVo.class.getSimpleName());
                         log.info("DM.execute.limit.result:{}", dmRealNameService.saveBatch(realNameList));

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

@@ -108,7 +108,7 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
                         dmRdmService.setUidByPlatformOpenId(thirdParty.getPlatform(), thirdParty.getOpenId(), uid);
                         dmRdmService.addThirdPartVoListByUid(uid, dmRdmService.getThirdPartVoListByUid(uid), vo);
                     }
-                    if (thirdPartyList.size() == 500 || (thirdPartyList.size() > 0 && smFlg)) {
+                    if (thirdPartyList.size() == 1000 || (thirdPartyList.size() > 0 && smFlg) || ct < 1000) {
                         tl += thirdPartyList.size();
 //                        mongoTemplate.insert(vos, AdamThirdPartInfoVo.class.getSimpleName());
                         log.info("DM.execute.limit.result:{}", dmThirdPartyService.saveBatch(thirdPartyList));

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

@@ -147,7 +147,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
                             dmRdmService.setUserInfoVoByUid(uid, vo);
                         }
                     }
-                    if (userList.size() == 500 || (userList.size() > 0 && smFlg)) {
+                    if (userList.size() == 1000 || (userList.size() > 0 && smFlg) || ct < 1000) {
                         tl += userList.size();
 //                        mongoTemplate.insert(vos, AdamUserInfoVo.class.getSimpleName());
                         log.info("DM.execute.result:{} - {}", dmUserService.saveBatch(userList), dmUserInfoService.saveBatch(userInfoList));

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

@@ -99,7 +99,7 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
 
                         dmRdmService.setUserMemberVoByUid(uid, vo);
                     }
-                    if (userMemberList.size() == 500 || (userMemberList.size() > 0 && smFlg)) {
+                    if (userMemberList.size() == 1000 || (userMemberList.size() > 0 && smFlg) || ct < 1000) {
                         tl += userMemberList.size();
 //                        mongoTemplate.insert(vos, AdamUserMemberVo.class.getSimpleName());
                         log.info("DM.execute.limit.result:{}", dmUserMemberService.saveBatch(userMemberList));