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

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

+app_id = 2019052365375151
+
+app_private_key = MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQC58Fvu4vxxbpDtcZX6ZYTfTuX9gB0n+ZEoIicDpbR9IBGH3xUN5IyQ/owaiHubB0gl0Cn5sVlBYgNbh3XiyD3C0l+eUtw5n923107mfiYPHSqPKqnhyWkyJuB38xo4mc3ztUYUTbHL/PuIU9rIS31PIRt06MNDK5NAjiZwbOl+2JrUAGf192+8qkGhTQTMpKWm8xTLGhImOhWHKmQKFpwb81S2epDDaKCjK4u9DHCLt0Bma6ka/Of2PWfpF9GRH2R5AiElCzbR2cNGA8VPuU5EbGi4TiWKTCGY2cinMYf2COdFp8xXOWx0+pGTa2vFXipQ3KWuBzBPGL+QMgvL90jXAgMBAAECggEBAKwFy4f/SD5JZJvIclDuizdt7ynQ1Sieo8TVk/Kz43+/o3ho0zm/MK0UUtpZWsHawsz5AVyYz1LGMwUDFfVx/HG53+zCDCzj0mS7NavZGazx9uXtOq5BgKl9fj57Es86vGe0VdmC5/MpYiyGJ+sWrCABKT3H+p6yOdGHsdhhasSGWjJDEe4c0cy9fUR/E2/Xx/aONBshYBVAKTePYQdlk0F1fXMRxKdHPvldAkI4vrmncDrTwe601xgJuSrGuXoi/gvifP09U3R3eOErNsAsIlqmeO7F5r21MJ+dnxOcPJh7cWimZNJ4sIsFRyPNQYWgxYQnlHlc4s+151CxEGRe0cECgYEA9s5sB2hv/b2xZNNVrB79hTD2nzM7guGQ+cqB2JmbMeN15Y88YkbSQCEeS2DZv5HWLD9EkHY+uh/R5Xibg0jqKUIpQa2wDFoZ3Tx1AMCgvDd4XbcZ+aMXVH9jtjtjY647X2bGF+/ik1C+2IVVXZkIY+XVlrZidshYh9U6F29co2sCgYEAwN1/SEMFZvGzVwDZwe8IVuIu8g7PjIEWa0AeOSDxHlOcNcvyDFVJpEwGT8y7azcgKs7gCsAkQ5p+wfS5oLq6jO1HBI4cxp0hBS1yKJgARhcMni9h81gkSn7EeaPcqkozbfrRB34mTBIjQkE9lh2ZLoiPuEGk8Ys9gLIeBGq590UCgYEAzQ62vPTtz4GzCNV54fchpm8HCUC02kp1fMTfW0pMooedJez7O6AiAfxCQlimsj8GFl8+pVRJS7UyXJj3hH2paDw7MQGROsIFqUYY5FYndhoUXLDL2RjDQoZRH1B6hJB3bg1i2vKJauJ0nksxoQGL8gw8iOriJlTREZJ8oIn7Cx8CgYEAssoi/ogy79XMnTEKrT+8CV8wifC08tmQQOh1nBwvqh90RmLEBi7iT86yYzO14pR923FgPFcWxxznuUH2+0tfONmV5mEfx/dN7xDMLVmLl24yoknmkcH6Ep0l4mXHYI3c022abUnCku6VhQwZ3ZmesYajRPqFv+2GnFGChjGyJ8kCgYEA4N6M0uPS1sKUyaWQQNTERLYfSoWJAmA7SatULoT3zigLG0kATMLkIYB/6Ewy6D69nn0KsGmZuJPI8kptYebmDe4vxTUh3Vrb/4h/QMus/YPE9dCYVSvd3OkKpoR93kG8qmBFkKy7gEMu0l5oLHl1Ym9MF7uzfd7pC3lOi0HgpYQ=
+
+ali_public_key = MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqxbtgusKyaaGD7fcZE+KA9JZSCDdySyRi5J0FNPyGaZFKOIA8D7GISl4K4xgF0ftlY9p3uVFV6TWRTTQvSJLcpBfyv6sYTvOGSnEp4PVTJ+8+xiDu0eyaI7cVZDSTpbYgKFt+X3P3j1DNSj/E6yuCg5GRQ9A93M0g0LdQUPGnRHL2PrW0Ze8tNpvP7hi1qGenYxOo2XN7nyISPndKLSPGRNHhYtkgtVQO4oENHPH6xK6VHPIDs6H5BbU+eaIk0WZjkjRKq/1F+Y/TU6dnCprttnfocYtSCuq260RIeIW+ytPRkwp9mJ8HJJLuiK8uxFQ0+4yIcD8fphyv6NKqXwRAwIDAQAB
+
+notify_url = https://adviser.5rs.me/tradecenter/v1.0/aliPay/aliPayBack
\ No newline at end of file

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

@@ -94,6 +94,8 @@ product.parentTutor.proLabelId = 7461
 
 book.group.qrcode.domain = https://qrcode.5rs.me
 
+wechat.group.link.prefix = https://wechat666.5rs.me
+
 ownAgentIds = 2,1362
 
 ## \u9519\u9898\u672C\u73AF\u5883\u57DF\u540D

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

@@ -31,7 +31,7 @@ org.quartz.jobStore.clusterCheckinInterval = 20000
 #============================================================================  
  
 org.quartz.dataSource.myDS.driver =  com.mysql.jdbc.Driver 
-org.quartz.dataSource.myDS.URL =  jdbc:mysql://rm-bp1wtm7tl51o3j6v0rw.mysql.rds.aliyuncs.com:3306/quartz?useUnicode=true&characterEncoding=utf-8&useSSL=false
+org.quartz.dataSource.myDS.URL =  jdbc:mysql://rm-bp16i2ig27pvsse5jrw.mysql.rds.aliyuncs.com:3306/quartz?useUnicode=true&characterEncoding=utf-8&useSSL=false
 org.quartz.dataSource.myDS.user = quartz 
 org.quartz.dataSource.myDS.password = quartz@6LgSc9!
 org.quartz.dataSource.myDS.maxConnections = 100  

pcloud-common-config/src/main/resources.uat/alipay.properties

+app_id = 2019052865412553
+
+app_private_key = MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDazUfF6XzlSm7rZNE6/obKvSlDjlHd5XBumqBhdLr6LvNcaqVhlKgtnjIe5WeDsVeqTHbM5RzM2Icg4CNYcm5zaJQs+Ifb6nojvGlzexaCQQjPq+s8nDgFKa7u+0v50XO6FchOMl8jyWhaUtFzjTubb2KIQX/7avxttCKkGlZZya2hO4WqjpeKB1dOkx+Sb4+VMgdGXxZ8YDdiAwpUOjduxKP/753qE0gFelGV59dxTTQYpFxLYv345wNfKHl8/t6ovtxvcamRb4jmHhC32H1zXfh5S145IDCKgRlStLkKe89NxT0ESdgf/WkKeqcMQ6NPxu/mqhOmNrppJr7o+lJBAgMBAAECggEAaeaBnqDr+m6UUQpy2oLm6qmzlycDKMssJ9xfU8wT05N15n0Xnqs82xd+WsXd3DexnpNzzKf30I3cmWTitqRsIR+02C9SUnaitzkyMNqagmDHyvwC10slMhqCuNiYZUmjIaX5VR+8PK32/ACpr6vj9c9reVd6gk2977sIKTU2Ji45ZDt3Z60Eh7FbCgik/jmxWswIShZIV0UMWxG1JdbilP9ZysF+Uvsu/igVT8I7GUivdugXjFkLN2wzr08fvXLsxA8LaQUhSQlH19A4zFYDMA6gg8ziwJjRgD2i63T1t+w9Hzewm4K9ppA6axWRV6CVdIMqMiFqRIDxm2vPm7jPgQKBgQD9LD/OeAIDNTvJcp3vfaBGT6HEjRWylImYqbLCpQRl9tr0v8ONcm2CAJIQUN0Y3i4dgm6oUBMKnPWp9XOvLRy9eEGnLryHFrOUu7jAOOZMNnZWv+JzWA5/C5hdNdgh3AvhTOC8iqrc2ABsoNRjzLCMcW3JqTbWoUfjflrIbeFonQKBgQDdPsYpc7lagfFuhJJYxC2/hLqnp2npUQklJKtQmRiyMAlUxzcpKN28QlDjAZNGtrsSMxst6LZ7t2+c++xS5QG/o9X9Nbom8v97SoxvlFOf6vUOfyDwc7taY5roltNpsDJsVEWLXFiYrhUgFyK1Suwl3v0nniOoqnOZrKQ7Hf3E9QKBgEsrz0o7wcU4EidvO8u3TlZyIIMerPmYNv64LFa07ohj8oFHSwX9mtxF1Ri5GdzfY2vppXeeRvkYv6yWL6Isz+LGCSBdtSabK/kWf/W7L04jwaFiWheLZsp8I+JRMXpkPrbHv9bbiX4HOKEIY+e6CBW7PDDraFf0DUdT5hqq3YnVAoGASjSMyEhtKaMdtAC5CRa7dVnyNNsc1cl9NL0IzJ6cvt8HsiyjHqX7QPJJKOpVWElfkyoa+pnr4rDSuadxSxhOLtWnpybHCdtEvzhww9fO+HsYuEUBakSW2SlBQrObsv4K23SkYqqVeJgis8GuvXmknMsew5Pxx9drsGZMKxvTCqUCgYEAvl+5FdBM2YdwFZWI78dtdQk0AQj12UoaVAu9QnRzizmPyXdGoPimqCJuzjAdueN9hWemDkFuhv+1Ckx9ieU1HRasqFVTzB2K5WpkcVXxZiZOgmJ/oTOf7RX9g1BA+rZqn2RLoeBbZTuN11aGqXO0GmZrWlvaY28hLGuxhkcId20=
+
+ali_public_key = MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl73S8jfzjSw8J2Xaq5SnK9ZjO9qtGhnz7cvs12arCzikxdy6YoYUrQvJwR7odLY3U1S5gdedlHyIzM9qQO9L9D6cKS5iQtyXqYYTWeBeOmSDu3G1hWU8EnYZrfiJf0StAzX2lZQSzLLS4DZUMhCJ64dzq23KStRMvdDQIBN6tUGEg3SMVImdSXgwdQmMw1y9kJHFCGakpWVaGKZ/JgP4bDw91YgwtE/LULIyypl0DbHey2u54hLfM8UdB4Po/u9JFsgwSVUO7gijUg8qU+ijxpAwsXCoM7g8Kut6V7mYH2/RqKrREwM6d4vNnnf66gO6UMryFh+2dgXrVeJIdHfIfQIDAQAB
+
+notify_url = https://adviser.raysyun.com/tradecenter/v1.0/aliPay/aliPayBack
\ No newline at end of file

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

@@ -95,6 +95,8 @@ product.parentTutor.proLabelId = 812
 
 book.group.qrcode.domain = https://qrcode.raysyun.com
 
+wechat.group.link.prefix = https://wechat666.raysyun.com
+
 ownAgentIds = 12829
 
 ## \u9519\u9898\u672C\u73AF\u5883\u57DF\u540D

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

@@ -153,7 +153,12 @@ public enum AppTypeEnum {
 	/**
 	 * 口语评测
 	 */
-	ORAL_EVALUATION("speak", com.pcloud.common.core.enums.AppTypeEnum.ORAL_EVALUATION.value);
+	ORAL_EVALUATION("speak", com.pcloud.common.core.enums.AppTypeEnum.ORAL_EVALUATION.value),
+
+	/**
+	 * 绘本故事
+	 */
+	PBSTORY("pbstory", com.pcloud.common.core.enums.AppTypeEnum.PBSTORY.value);
 	
 	/**
 	 * 值

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

@@ -60,7 +60,8 @@ public enum AppTypeEnum {
     ORAL_EVALUATION("ORAL_EVALUATION"), //口语评测
     WISH("WISH"),//愿望单
     DRAW("DRAW"),//抽奖
-    LIVE_TIMETABLE("LIVE_TIMETABLE");//直播
+	LIVE_TIMETABLE("LIVE_TIMETABLE"),//直播
+    PBSTORY("PBSTORY"); //绘本故事
     /**
      * 值
      */

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

@@ -70,6 +70,7 @@ public enum AppTypeEnum {
     CUSTOM_CLOCK("CUSTOM_CLOCK"), //自定义打卡
  	MEMBER("MEMBER"), //开通会员
     ORAL_EVALUATION("ORAL_EVALUATION"), //口语评测
+	 PBSTORY("PBSTORY"), //绘本故事
     PIC_NOTE("PIC_NOTE"); // 图文应用
 
     /**