Merge branch 'dev' into test

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

@@ -15,11 +15,16 @@ liquidnet:
     username: testmall
     password: zhengzai!mYT
   rabbitmq:
-    host: rabbitmq.zhengzai.tv
+#    host: rabbitmq.zhengzai.tv
+#    port: 5672
+#    username: admin
+#    password: admin
+#    virtual-host: /
+    host: 101.201.127.58
     port: 5672
     username: admin
     password: admin
-    virtual-host: /
+    virtual-host: liquidnet
   knife4j:
     disable: false
   redis:

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

@@ -15,10 +15,10 @@ liquidnet:
     username: zhengzai
     password: $hAh4SGcDQ
   rabbitmq:
-    host: amqp-cn-7pp26mhtn001.mq-amqp.cn-beijing-327844-a-internal.aliyuncs.com
+    host: 101.201.127.58
     port: 5672
-    username: MjphbXFwLWNuLTdwcDI2bWh0bjAwMTpMVEFJNXRGajR0UWplbW82NjRCcmtxS1o=
-    password: MzlENTBFRDE0NEE4MkM1RUE2MTc1RDhBMTVFNzhDQTNDQTQ3NEY4RDoxNjIyODE1ODU3ODEz
+    username: admin
+    password: admin
     virtual-host: liquidnet
   knife4j:
     disable: false

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

@@ -39,6 +39,8 @@ public class AdamDMAdminController extends AdamBaseController {
     DMMemberOrderProcessor dmMemberOrderProcessor;
     @Autowired
     DMMemberCodeProcessor dmMemberCodeProcessor;
+    @Autowired
+    DMCollectionProcessor dmCollectionProcessor;
 
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "user")
@@ -111,4 +113,12 @@ public class AdamDMAdminController extends AdamBaseController {
         dmMemberCodeProcessor.handler();
         return ResponseDto.success();
     }
+
+    @ApiOperationSupport(order = 10)
+    @ApiOperation(value = "collect")
+    @GetMapping(value = {"collect"})
+    public ResponseDto<Object> dataMigrationForCollect() {
+        dmCollectionProcessor.handler();
+        return ResponseDto.success();
+    }
 }