Merge branch 'master' of http://192.168.89.173/rays/pcloud-common-parent.git

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

@@ -98,7 +98,11 @@ public enum ConvertEnum {
 	/**
 	 * 场景化应用
 	 */
-	SCENARIZED_APP("SCENARIZED_APP");
+	SCENARIZED_APP("SCENARIZED_APP"),
+    /**
+     * BOOK
+     */
+    BOOK("BOOK");
 
 	/**
 	 * 值

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

@@ -103,6 +103,10 @@ public class MQQueueConstant {
 	 * 文件转码结束(音视频)->场景化应用
 	 */
 	public static final String CONVERT_TO_SCENARIZEDAPP = "convert2ScenarizedAppQueue";
+	/**
+	 * 文件转码结束(音视频)->BOOK
+	 */
+	public static final String CONVERT_TO_BOOK = "convert2BookQueue";
 
 	/**
 	 * 数据埋点

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

@@ -1131,7 +1131,27 @@ public enum WeektaskCode {
     /**
      * 创建英语随身听应用(周B2)
      */
-    W6_CREATE_ENGLISH_WALKMAN_APP("w6_create_english_walkman_app")
+    W6_CREATE_ENGLISH_WALKMAN_APP("w6_create_english_walkman_app"),
+    /**
+     * 体验精英任务(周F1)
+     */
+    W6_EXPERIENCE_ELITE_TASK("w6_experience_elite_task"),
+    /**
+     * 添加红榜小助手(周F2)
+     */
+    W6_ADD_RAYSTASK_HELPER("w6_add_raystask_helper"),
+    /**
+     * 了解融合出版基金项目路演(周F6)
+     */
+    W6_VIEW_ROADSHOW("w6_view_roadshow"),
+    /**
+     * 提交开通会员应用(周D3)
+     */
+    W6_CREATE_MEMBER_APP("w6_create_member_app"),
+    /**
+     * 提交错题本应用(周F3)
+     */
+    W6_CREATE_SUBJECTNOTE_APP("w6_create_subjectnote_app")
     ;