Merge branch 'master' of http://begitlab.chubanyun.me/rays/pcloud-common-parent into mergeuat

pcloud-common-config/src/main/resources.prod/bootstrap.yml

@@ -54,6 +54,9 @@ spring:
   data:
     solr:
       zkHost: 192.168.1.102:9983,192.168.1.102:8574
+    elasticsearch:
+      cluster-nodes: 192.168.1.102:9300
+      cluster-name: elasticsearch-prod
 redis:
   cluster:
     nodes:

pcloud-common-config/src/main/resources.prod/public_system.properties

@@ -83,6 +83,7 @@ liveRunEnvironment = prod_
 
 uedThirdPartyOrderUrl=https://rayscloud.chubanyun.net 
 group.qr.domain = https://weixin23.5rs.me/W23/C3/other/
+fission.use.email = 363875180@qq.com
 
 ## \u7CFB\u7EDF\u73AF\u5883
 system.env = pro

pcloud-common-config/src/main/resources.uat/bootstrap.yml

@@ -54,6 +54,9 @@ spring:
   data:
     solr:
       zkHost: 192.168.89.13:9983,192.168.89.13:8574
+    elasticsearch:
+      cluster-nodes: 192.168.1.102:9303
+      cluster-name: elasticsearch-uat
 redis:
   cluster:
     nodes:

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

@@ -82,7 +82,12 @@ public enum AppTypeEnum {
     /**
      * 伴读魔法箱
      */
-    AUDIO_MAGIC("magic");
+    AUDIO_MAGIC("magic"),
+
+	/**
+	 * 课件
+	 */
+	COURSE_WARE("courseWare");
 	
 	
 	

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

@@ -238,6 +238,36 @@ public class ProductTypeConstant {
     public static final String AUDIO_COURSE = "AUDIO_COURSE";
 
     /**
+     * 导学号
+     */
+    public static final String DAOXUEHAO = "DAOXUEHAO";
+
+    /**
+     * 教辅资料包
+     */
+    public static final String TEACH_RESOURCE_APP = "TEACH_RESOURCE_APP";
+
+    /**
+     * 课件
+     */
+    public static final String COURSE_WARE = "COURSE_WARE";
+
+    /**
+     * 试卷
+     */
+    public static final String TEST_PAPER_APP = "TEST_PAPER_APP";
+
+    /**
+     * 配套听力
+     */
+    public static final String MATCH_LISTEN = "MATCH_LISTEN";
+
+    /**
+     * 生词听写
+     */
+    public static final String WORD_DICTATION = "WORD_DICTATION";
+
+    /**
      * 热门作品类型
      */
     public static final String[] HOT_PRODUCT_TYPE = {QA, PDF, VIDEO, PRETEST};
@@ -263,7 +293,8 @@ public class ProductTypeConstant {
      * 应用型作品（伴随应用使用）
      */
     public static final String[] APP_PRODUCT = {LOOK, LIVE, TUTOR, GROUP, ZSCORE, VOTE, CLOCK, TEST, AUDIOAPP, ANSWER,
-            EF, MUSIC, VIDEO_COURSE, PRETESTAPP, AUDIO_RESOURCE, QA_APP, EBOOK_APP, AUDIO_MAGIC};
+            EF, MUSIC, VIDEO_COURSE, PRETESTAPP, AUDIO_RESOURCE, QA_APP, EBOOK_APP, AUDIO_MAGIC, TEACH_RESOURCE_APP,
+            COURSE_WARE, TEST_PAPER_APP, MATCH_LISTEN, WORD_DICTATION};
 
     /**
      * 数据平台埋点型作品
@@ -274,5 +305,5 @@ public class ProductTypeConstant {
     /**
      * 作品下资源来源于content中心的作品
      */
-    public static final String[] RESOURCE_CONTENT_PRODUCT = {AUDIO,VIDEO,BOOK,LISTEN,PDF,ALBUM,FORMAT,EBOOK};
+    public static final String[] RESOURCE_CONTENT_PRODUCT = {AUDIO, VIDEO, BOOK, LISTEN, PDF, ALBUM, FORMAT, EBOOK};
 }

pcloud-common-core/src/main/java/com/pcloud/common/core/enums/AppTypeEnum.java

@@ -45,7 +45,12 @@ public enum AppTypeEnum {
     LIVEAPP("LIVEAPP"),         //直播3.0
 	CLOCK("CLOCK"),             //打卡
 	TASTETEST("TASTETEST"),   //趣味测试
-	VIDEO_CLASSIC("VIDEO_CLASSIC");     //经典版视频
+	VIDEO_CLASSIC("VIDEO_CLASSIC"),     //经典版视频
+	TEACH_RESOURCE("TEACH_RESOURCE"),    //教辅资料包
+	COURSE_WARE("COURSE_WARE"),    //课件
+	TEST_PAPER("TEST_PAPER"),   //试卷
+	MATCH_LISTEN("MATCH_LISTEN"),  //配套听力
+	WORD_DICTATION("WORD_DICTATION");    //生词听写
 	/**
 	 * 值
 	 */

pcloud-common/src/main/java/com/pcloud/common/enums/AppTypeEnum.java

@@ -55,7 +55,18 @@ public enum AppTypeEnum {
     LIVEAPP("LIVEAPP"),         //直播3.0
     TASTETEST("TASTETEST"),    //趣味测试
     VIDEO_CLASSIC("VIDEO_CLASSIC"),     //经典版视频
-    AUDIO_MAGIC("AUDIO_MAGIC"); //音频伴读魔法箱
+    AUDIO_MAGIC("AUDIO_MAGIC"), //音频伴读魔法箱
+    TEACH_RESOURCE("TEACH_RESOURCE"),    //教辅资料包
+    COURSE_WARE("COURSE_WARE"),    //课件
+    TEST_PAPER("TEST_PAPER"),   //试卷
+    MATCH_LISTEN("MATCH_LISTEN"),  //配套听力
+    WORD_DICTATION("WORD_DICTATION"),    //生词听写
+    STROKE_ORDER("STROKE_ORDER"),     //笔顺动图
+    WECHAT_STUDY_GROUP("WECHAT_STUDY_GROUP"), // 微信学习交流圈
+    TASK_CLOCK("TASK_CLOCK"), //任务打卡
+    REWARD_CLOCK("REWARD_CLOCK"), //奖励打卡
+    CUSTOM_CLOCK("CUSTOM_CLOCK"), //自定义打卡
+    PIC_NOTE("PIC_NOTE"); // 图文应用
 
     /**
      * 枚举转换

pcloud-common/src/main/java/com/pcloud/common/utils/cache/redis/JedisClusterUtils.java

@@ -1371,6 +1371,23 @@ public class JedisClusterUtils {
     }
 
     /**
+     * 缓存值自增
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public static Long incrBy(String key, Long value) {
+        Long result = null;
+        try {
+            result = jedisCluster.incrBy(key, value);
+        } catch (Exception e) {
+            LOGGER.warn("jedis缓存值自增1失败:" + e.getMessage(), e);
+        }
+        return result;
+    }
+
+    /**
      * 缓存值自增1
      *
      * @param key

pcloud-common/src/main/java/com/pcloud/common/utils/string/StringComparator.java

@@ -54,8 +54,8 @@ public class StringComparator implements Comparator<String> {
             boolean isCh1Num = ch1 >= '0' && ch1 <= '9';
             boolean isCh2Num = ch2 >= '0' && ch2 <= '9';
             if (isCh1Num && isCh2Num) {
-                long i1 = getNumber(str1.substring(i));
-                long i2 = getNumber(str2.substring(i));
+                long i1 = getNumber(str1.substring(i,i+1));
+                long i2 = getNumber(str2.substring(i,i+1));
                 if (i1 != i2) {
                     return i1 > i2 ? 1 : -1;
                 }