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

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/CollectionUtil.java

@@ -4,6 +4,8 @@
  */
 package com.liquidnet.commons.lang.util;
 
+import org.springframework.util.LinkedMultiValueMap;
+
 import java.util.*;
 import java.util.function.Predicate;
 
@@ -16,6 +18,7 @@ public class CollectionUtil {
     private static final HashMap<String, Object> STRING_OBJECT_HASH_MAP = new HashMap<>();
     private static final LinkedList<String> STRING_LINKED_LIST = new LinkedList<>();
     private static final LinkedList<Object[]> OBJECTS_LINKED_LIST = new LinkedList<>();
+    private static final LinkedMultiValueMap<String, String> STRING_STRING_LINKED_MULTI_VALUE_MAP = new LinkedMultiValueMap<>();
     private static final ArrayList<Object> OBJECT_ARRAY_LIST = new ArrayList<>();
 
 
@@ -35,6 +38,10 @@ public class CollectionUtil {
         return (LinkedList<Object[]>) OBJECTS_LINKED_LIST.clone();
     }
 
+    public static LinkedMultiValueMap<String, String> linkedMultiValueMapStringString() {
+        return (LinkedMultiValueMap<String, String>) STRING_STRING_LINKED_MULTI_VALUE_MAP.clone();
+    }
+
     public static ArrayList<Object> arrayListObject() {
         return (ArrayList<Object>) OBJECT_ARRAY_LIST.clone();
     }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamAddressesServiceImpl.java

@@ -3,10 +3,7 @@ package com.liquidnet.service.adam.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.common.mq.constant.MQConst;
-import com.liquidnet.commons.lang.util.BsonUtil;
-import com.liquidnet.commons.lang.util.CurrentUtil;
-import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.adam.dto.AdamAddressesParam;
 import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
 import com.liquidnet.service.adam.entity.AdamAddresses;
@@ -91,7 +88,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
     public void def(String uid, String addressesId) {
         LocalDateTime now = LocalDateTime.now();
 
-        LinkedList<Object[]> toMqObjs = new LinkedList<>();
+        LinkedList<Object[]> toMqObjs = CollectionUtil.linkedListObjectArr();
         List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(uid);
         if (vos.size() > 1) {// 取消原默认
 //            AdamAddressesVo unDeaultVo = AdamAddressesVo.getNew();

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamCollectionServiceImpl.java

@@ -2,6 +2,7 @@ package com.liquidnet.service.adam.service.impl;
 
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.common.mq.constant.MQConst;
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.service.adam.dto.vo.AdamCollectBaseVo;
 import com.liquidnet.service.adam.dto.vo.AdamCollectInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
@@ -77,7 +78,7 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
                 AdamCollectBaseVo.class.getSimpleName()
         );
         if (deleteResult.getDeletedCount() > 0) {
-            LinkedList<Object[]> toMqObjs = new LinkedList<>();
+            LinkedList<Object[]> toMqObjs = CollectionUtil.linkedListObjectArr();
             for (String c : contentIds) {
                 toMqObjs.add(new Object[]{now, uid, c});
             }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamDisposedServiceImpl.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.adam.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.common.mq.constant.MQConst;
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.service.adam.dto.vo.AdamCollectInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo;
 import com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo;
@@ -85,7 +86,7 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
                 AdamDisposedBaseVo.class.getSimpleName()
         );
         if (deleteResult.getDeletedCount() > 0) {
-            LinkedList<Object[]> toMqObjs = new LinkedList<>();
+            LinkedList<Object[]> toMqObjs = CollectionUtil.linkedListObjectArr();
             for (String c : contentIds) {
                 toMqObjs.add(new Object[]{now, uid, c});
             }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamEntersServiceImpl.java

@@ -110,7 +110,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
     public void def(String uid, String entersId) {
         LocalDateTime now = LocalDateTime.now();
 
-        LinkedList<Object[]> toMqObjs = new LinkedList<>();
+        LinkedList<Object[]> toMqObjs = CollectionUtil.linkedListObjectArr();
         List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(uid);
         if (vos.size() > 1) {// 取消原默认
 //            AdamEntersVo unDeaultVo = AdamEntersVo.getNew();

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java

@@ -69,7 +69,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
         String clientIp = CurrentUtil.getCliIpAddr();
 
         // 调取对应支付接口
-        LinkedMultiValueMap<String, String> payParam = new LinkedMultiValueMap<>();
+        LinkedMultiValueMap<String, String> payParam = CollectionUtil.linkedMultiValueMapStringString();
         payParam.add("type", "VIP");// TICKET,PRODUCT,COST,MBEANS,LIVE,VIDEO,VIP,CLUB
         payParam.add("price", String.valueOf(memberPriceVo.getPrice()));
         payParam.add("name", memberVo.getName());

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/alipay/biz/AlipayBiz.java

@@ -85,7 +85,7 @@ public class AlipayBiz{
 
         AlipayClient alipayClient = PayAlipayUtils.getInstance().getHttpClient();
 
-        SortedMap<String, Object> paramMap = ObjectUtil.cloneSortedMapStringAndObj();
+        SortedMap<String, Object> paramMap = new TreeMap<>();
         paramMap.put("product_code", alipayTradePayReq.getProductCode());
         paramMap.put("total_amount", alipayTradePayReq.getTotalAmount().toString());
         paramMap.put("subject", alipayTradePayReq.getSubject());

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/utils/MqHandleUtil.java

@@ -32,7 +32,7 @@ public class MqHandleUtil {
      */
     public boolean sendNotifyErrorQueue(PayNotifyReqBo payNotifyReqBo,String queueKey) {
         try {
-            HashMap<String, String> map = ObjectUtil.hashMapStringAndString;
+            HashMap<String, String> map = ObjectUtil.cloneHashMapStringAndString();
             map.put("message", payNotifyReqBo.toString());
             MapRecord<String, String, String> record = StreamRecords.mapBacked(map).withStreamKey(queueKey);
             stringRedisTemplate.opsForStream().add(record);

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/utils/ObjectUtil.java

@@ -4,10 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.alipay.api.request.AlipayTradeWapPayRequest;
 import org.springframework.stereotype.Component;
 
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.SortedMap;
-import java.util.TreeMap;
+import java.util.*;
 
 /**
  * @author AnJiabin <anjiabin@zhengzai.tv>
@@ -20,31 +17,22 @@ import java.util.TreeMap;
  */
 @Component
 public class ObjectUtil {
-    public static final LinkedList<Object[]> linkedListObj = new LinkedList<Object[]>();
-    public static final LinkedList<String> linkedListStr = new LinkedList<String>();
-    public static final HashMap<String, String> hashMapStringAndString = new HashMap<>();
-    public static final SortedMap<String, Object> sortedMapStringAndObj = new TreeMap<>();
-    public static final AlipayTradeWapPayRequest alipayTradeWapPayRequest = new AlipayTradeWapPayRequest();
-    public static final JSONObject jsonObjectObj = new JSONObject();
+    private static final LinkedList<Object[]> linkedListObj = new LinkedList<Object[]>();
+    private static final LinkedList<String> linkedListStr = new LinkedList<String>();
+    private static final HashMap<String, String> hashMapStringAndString = new HashMap<>();
+    private static final AlipayTradeWapPayRequest alipayTradeWapPayRequest = new AlipayTradeWapPayRequest();
+    private static final JSONObject jsonObjectObj = new JSONObject();
 
     public static LinkedList<Object[]> cloneLinkedListObj() {
-        linkedListObj.clear();
-        return linkedListObj;
+        return (LinkedList<Object[]>) linkedListObj.clone();
     }
 
     public static LinkedList<String> cloneLinkedListStr() {
-        linkedListStr.clear();
-        return linkedListStr;
+        return (LinkedList<String>) linkedListStr.clone();
     }
 
     public static HashMap<String, String> cloneHashMapStringAndString() {
-        hashMapStringAndString.clear();
-        return hashMapStringAndString;
-    }
-
-    public static SortedMap<String, Object> cloneSortedMapStringAndObj() {
-        sortedMapStringAndObj.clear();
-        return sortedMapStringAndObj;
+        return (HashMap<String, String>) hashMapStringAndString.clone();
     }
 
     public static AlipayTradeWapPayRequest cloneAlipayTradeWapPayRequest() {
@@ -52,6 +40,6 @@ public class ObjectUtil {
     }
 
     public static JSONObject cloneJsonObjectObj() {
-        return jsonObjectObj;
+        return (JSONObject) jsonObjectObj.clone();
     }
 }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/ObjectUtil.java

@@ -21,44 +21,38 @@ import java.util.List;
  */
 @Component
 public class ObjectUtil {
-    public static final LinkedList<Object[]> linkedListObj = new LinkedList<Object[]>();
-    public static final LinkedList<String> linkedListStr = new LinkedList<String>();
-    public static final HashMap<String, String> hashMapStringAndString = new HashMap<String, String>();
-    public static final HashMap<String, Object> hashMapStringAndObject = new HashMap<String, Object>();
-    public static final List<AdamEntersVo> arrayListObject = new ArrayList<>();
-    public static final LinkedMultiValueMap<String, String> linkedMultiValueMapStringAndString = new LinkedMultiValueMap<String, String>();
-    public static final BasicDBObject basicDBObject = new BasicDBObject();
+    private static final LinkedList<Object[]> linkedListObj = new LinkedList<Object[]>();
+    private static final LinkedList<String> linkedListStr = new LinkedList<String>();
+    private static final HashMap<String, String> hashMapStringAndString = new HashMap<String, String>();
+    private static final HashMap<String, Object> hashMapStringAndObject = new HashMap<String, Object>();
+    private static final ArrayList<AdamEntersVo> arrayListObject = new ArrayList<>();
+    private static final LinkedMultiValueMap<String, String> linkedMultiValueMapStringAndString = new LinkedMultiValueMap<String, String>();
+    private static final BasicDBObject basicDBObject = new BasicDBObject();
 
     public static final Object[] objectsArray = new Object[100];
 
     public static LinkedList<Object[]> cloneLinkedListObj() {
-        linkedListObj.clear();
-        return linkedListObj;
+        return (LinkedList<Object[]>) linkedListObj.clone();
     }
 
     public static LinkedList<String> cloneLinkedListStr() {
-        linkedListStr.clear();
-        return linkedListStr;
+        return (LinkedList<String>) linkedListStr.clone();
     }
 
     public static HashMap<String, String> cloneHashMapStringAndString() {
-        hashMapStringAndString.clear();
-        return hashMapStringAndString;
+        return (HashMap<String, String>) hashMapStringAndString.clone();
     }
 
     public static HashMap<String, Object> cloneHashMapStringAndObject() {
-        hashMapStringAndObject.clear();
-        return hashMapStringAndObject;
+        return (HashMap<String, Object>) hashMapStringAndObject.clone();
     }
 
-    public static List<AdamEntersVo> cloneArrayListObject() {
-        arrayListObject.clear();
-        return arrayListObject;
+    public static ArrayList<AdamEntersVo> cloneArrayListObject() {
+        return (ArrayList<AdamEntersVo>) arrayListObject.clone();
     }
 
     public static LinkedMultiValueMap<String, String> cloneLinkedMultiValueMapStringAndString() {
-        linkedMultiValueMapStringAndString.clear();
-        return linkedMultiValueMapStringAndString;
+        return linkedMultiValueMapStringAndString.clone();
     }
 
     public static Object[] cloneObjectsArray() {
@@ -66,7 +60,6 @@ public class ObjectUtil {
     }
 
     public static BasicDBObject cloneBasicDBObject() {
-        basicDBObject.clear();
-        return basicDBObject;
+        return (BasicDBObject) basicDBObject.clone();
     }
 }