Merge branch 'master' into 3.x

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

@@ -20,6 +20,7 @@ spring:
     maxWait: 60000
     timeBetweenEvictionRunsMillis: 3000
     minEvictableIdleTimeMillis: 3600000
+    maxEvictableIdleTimeMillis: 7200000
     validationQuery: SELECT 'x' FROM DUAL
     testWhileIdle: true
     testOnBorrow: false

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

@@ -20,6 +20,7 @@ spring:
     maxWait: 60000
     timeBetweenEvictionRunsMillis: 3000
     minEvictableIdleTimeMillis: 3600000
+    maxEvictableIdleTimeMillis: 7200000
     validationQuery: SELECT 'x' FROM DUAL
     testWhileIdle: true
     testOnBorrow: false

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

@@ -20,6 +20,7 @@ spring:
     maxWait: 60000
     timeBetweenEvictionRunsMillis: 3000
     minEvictableIdleTimeMillis: 3600000
+    maxEvictableIdleTimeMillis: 7200000
     validationQuery: SELECT 'x' FROM DUAL
     testWhileIdle: true
     testOnBorrow: false

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

@@ -20,6 +20,7 @@ spring:
     maxWait: 60000
     timeBetweenEvictionRunsMillis: 3000
     minEvictableIdleTimeMillis: 3600000
+    maxEvictableIdleTimeMillis: 7200000
     validationQuery: SELECT 'x' FROM DUAL
     testWhileIdle: true
     testOnBorrow: false

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

@@ -20,6 +20,7 @@ spring:
     maxWait: 60000
     timeBetweenEvictionRunsMillis: 3000
     minEvictableIdleTimeMillis: 3600000
+    maxEvictableIdleTimeMillis: 7200000
     validationQuery: SELECT 'x' FROM DUAL
     testWhileIdle: true
     testOnBorrow: false

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

@@ -109,5 +109,5 @@ public enum AppProductTypeEnum {
             AppTypeEnum.PBSTORY.value, AppTypeEnum.WORD_DICTATION.value, AppTypeEnum.ENGLISH_WALKMAN.value,
             AppTypeEnum.ARTICLE_READING.value, AppTypeEnum.ORAL_EVALUATION.value, AppTypeEnum.IMAGE.value,
             AppTypeEnum.STROKE_ORDER.value, AppTypeEnum.SUBJECTNOTE.value, AppTypeEnum.ZSCORE.value, AppTypeEnum.RECITE_WORD.value,
-            AppTypeEnum.ARTICLE.value};
+            AppTypeEnum.ARTICLE.value, AppTypeEnum.BOOK.value};
 }