Merge branch 'dev_merchant' into dev_merchant_tice

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/pom.xml

@@ -30,11 +30,20 @@
             <artifactId>liquidnet-common-cache-redis</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-service-merchant-api</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-kylin-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-api-feign-platform</artifactId>

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/util/InnerUtils.java

+package com.liquidnet.service.merchant.util;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class InnerUtils {
+
+
+
+//    public AdamUserInfoSimpleVo getUserInfo() throws Exception {
+//        MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
+//        header.add("Accept", "application/json;charset=UTF-8");
+//        header.add("Authorization", "Bearer " + CurrentUtil.getToken());
+//        String resultData = HttpUtil.post(adamUrl + "/adam/user/gif/mobile", null, header);
+//        ResponseDto<AdamUserInfoSimpleVo> innerReturnVo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<AdamUserInfoSimpleVo>>() {
+//        });
+//        return innerReturnVo.getData();
+//    }
+
+}

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/util/ObjectUtil.java

 package com.liquidnet.service.merchant.util;
 
 import com.liquidnet.service.merchant.dto.vo.MerchantFieldsAppliesVo;
+import com.mongodb.BasicDBObject;
 
 import java.util.ArrayList;
 
 public class ObjectUtil {
 
     private static final ArrayList<MerchantFieldsAppliesVo> merchantFieldsAppliesVoArrayList = new ArrayList<>();
+    private static final BasicDBObject basicDBObject = new BasicDBObject();
 
     public static ArrayList<MerchantFieldsAppliesVo> getMerchantFieldsAppliesVoArrayList() {
         return (ArrayList<MerchantFieldsAppliesVo>) merchantFieldsAppliesVoArrayList.clone();
     }
+
+    public static BasicDBObject cloneBasicDBObject() {
+        return (BasicDBObject) basicDBObject.clone();
+    }
 }