Merge branch 'master' of

http://192.168.89.173/rays/pcloud-common-parent.git

Conflicts:
	pcloud-common-core/src/main/java/com/pcloud/common/core/constant/ConvertEnum.java

pcloud-common-core/src/main/java/com/pcloud/common/core/constant/ProductTypeConstant.java

@@ -183,11 +183,26 @@ public class ProductTypeConstant {
     public static final String PBMUSIC = "PBMUSIC";
 
     /**
+     * 绘本资源
+     */
+    public static final String MUSIC = "MUSIC";
+
+    /**
      * 一对一辅导
      */
     public static final String TUTORIAL = "TUTORIAL";
 
     /**
+     * 视频课表
+     */
+    public static final String VIDEO_SCHEDULE = "VIDEO_SCHEDULE";
+
+    /**
+     * 视频课表
+     */
+    public static final String VIDEO_COURSE = "VIDEO_COURSE";
+
+    /**
      * 热门作品类型
      */
     public static final String[] HOT_PRODUCT_TYPE = {QA, PDF, VIDEO, PRETEST};
@@ -196,7 +211,7 @@ public class ProductTypeConstant {
      * 资源型作品（免费即可体验）
      */
     public static final String[] RESOURCE_PRODUCT = {AUDIO, VIDEO, PDF, EBOOK, ALBUM, PRETEST, QANEWS,
-            FORMAT, WORD, ARTICLE, LISTEN, SCHEDULE, PBMUSIC, TUTORIAL};
+            FORMAT, WORD, ARTICLE, LISTEN, SCHEDULE, PBMUSIC, TUTORIAL, VIDEO_SCHEDULE};
 
     /**
      * 服务型作品（需要特殊操作方可完成使用）
@@ -206,7 +221,7 @@ public class ProductTypeConstant {
     /**
      * 应用型作品（伴随应用使用）
      */
-    public static final String[] APP_PRODUCT = {LOOK, LIVE, TUTOR, GROUP, ZSCORE, VOTE, CLOCK, TEST, AUDIOAPP, ANSWER, EF};
+    public static final String[] APP_PRODUCT = {LOOK, LIVE, TUTOR, GROUP, ZSCORE, VOTE, CLOCK, TEST, AUDIOAPP, ANSWER, EF, MUSIC, VIDEO_COURSE};
 
     /**
      * 数据平台埋点型作品

pcloud-common/src/main/java/com/pcloud/common/utils/cookie/Cookie.java

@@ -84,6 +84,11 @@ public class Cookie {
     public static final String PREVIEW_TYPE = "previewType";
 
     /**
+     * 二维码ID来源
+     */
+    public static final String SOURCE_TYPE = "sourceType";
+
+    /**
      * cookie 信息處理
      * @param userInfo
      * @return
@@ -174,10 +179,16 @@ public class Cookie {
                 userInfos.put("agentMemberId", StringUtil.isEmpty(agentMemberId) || "undefined".equalsIgnoreCase(agentMemberId)
                         || "null".equalsIgnoreCase(agentMemberId) ? null : Long.valueOf(agentMemberId));
             }
-            if (userInfoArry[i].contains("previewType")) {
+            // add by gaop
+            if (userInfoArry[i].contains(PREVIEW_TYPE)) {
                 String[] previewType = userInfoArry[i].split("=");
                 String code = previewType[previewType.length - 1];
-                userInfos.put("previewType", code);
+                userInfos.put(PREVIEW_TYPE, code);
+            }
+            if (userInfoArry[i].contains(SOURCE_TYPE)) {
+                String[] sourceType = userInfoArry[i].split("=");
+                String code = sourceType[sourceType.length - 1];
+                userInfos.put(SOURCE_TYPE, code);
             }
         }
         return userInfos;