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

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-common/src/main/java/com/liquidnet/client/admin/common/enums/BannersTargetType.java

@@ -14,23 +14,23 @@ import java.util.*;
  */
 public enum BannersTargetType {
 
-    TARGET_TYPE1("PGC点播", 1),
-    TARGET_TYPE2("PGC直播", 2),
+//    TARGET_TYPE1("PGC点播", 1),
+//    TARGET_TYPE2("PGC直播", 2),
     TARGET_TYPE5("场地", 5),
     TARGET_TYPE6("票务", 6),
     TARGET_TYPE7("商品", 7),
 //    TARGET_TYPE8("巡演", 8),
     TARGET_TYPE12("活动跳转-可分享", 12),
     TARGET_TYPE100("活动跳转", 100),
-    TARGET_TYPE13("积分商品", 13),
+//    TARGET_TYPE13("积分商品", 13),
     TARGET_TYPE14("商品集合", 14),
     TARGET_TYPE20("音乐人", 20),
     TARGET_TYPE21("歌曲", 21),
     TARGET_TYPE22("专辑", 22),
-    TARGET_TYPE23("视频播单", 23),
+//    TARGET_TYPE23("视频播单", 23),
     TARGET_TYPE24("音乐人集合", 24),
     TARGET_TYPE26("摩登会员", 26),
-    TARGET_TYPE201("youngBlood报名跳转", 201),
+//    TARGET_TYPE201("youngBlood报名跳转", 201),
     TARGET_TYPE0("不跳转", 0);
 
     private String name;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/ShunfengSignUtils.java

@@ -93,7 +93,7 @@ public class ShunfengSignUtils {
      * @param hbody 请求body
      * @return
      */
-    /*public String generateSignatureAndRequest(HashMap<String, Object> hbody, String url) {
+    public String generateSignatureAndRequest(HashMap<String, Object> hbody, String url) {
         long currentTimeMillis = System.currentTimeMillis(); // 时间戳
         String timestamp = currentTimeMillis + "";
         hbody.put("companyId", APP_ID);
@@ -147,7 +147,7 @@ public class ShunfengSignUtils {
             }
         }
         return null;
-    }*/
+    }
 
     /**
      * 生成签名