Merge remote-tracking branch 'origin/publish' into publish

# Conflicts:
#	application-prod.properties

application-dev.properties

@@ -135,7 +135,6 @@ dhst_ms_url=http://www.dh3t.com
 
 type-aliases-package: com.pica.cloud
 
-push_is_production=false
 
 #oss
 pica.foundation.oss.config={"accessKeyId":"LTAI1P48GGvkKtMp","bucketName":"pica-test-huabei2","accessKeySecret":"zpdUiy3nsi7ikuQUz3eaHVfol9QKrn","endpoint":"oss-cn-beijing.aliyuncs.com"}

application-prod.properties

 #######################################################################################
-### 				pica-cloud-service-starter 配置 (禁止修改key名称)				### 
+### 				pica-cloud-service-starter \u914D\u7F6E (\u7981\u6B62\u4FEE\u6539key\u540D\u79F0)				###
 #######################################################################################
 environment.name=prod
 
@@ -59,7 +59,7 @@ spring.redis.config=\
       "password":"Uu49Kz1olY85HQBu",\
       "prefix":""\
   }
-  
+
 #tomcat settings
 server.tomcat.max-connections=2000
 server.tomcat.max-threads=800
@@ -77,12 +77,12 @@ mybatis.mapper-locations=classpath:mapper/*.xml
 logging.path=/opt/tomcat-log/${spring.application.name}
 
 #######################################################################################
-### 								应用配置											###
-###																					### 
-### 1. key 规则：[app开头].[组名称(去掉pica.cloud)].[应用名].[key描述(单词用"."分割)] ### 
-### 	例子：app.founction.token.user.expire										### 
-### 2. 当某个Key不使用时，立即删除													###
-### 3. key命名全部小写，单词间仅允许使用点(.),中划线(-)分割							###
+### 								\u5E94\u7528\u914D\u7F6E											###
+###																					###
+### 1. key \u89C4\u5219\uFF1A[app\u5F00\u5934].[\u7EC4\u540D\u79F0(\u53BB\u6389pica.cloud)].[\u5E94\u7528\u540D].[key\u63CF\u8FF0(\u5355\u8BCD\u7528"."\u5206\u5272)] ###
+### 	\u4F8B\u5B50\uFF1Aapp.founction.token.user.expire										###
+### 2. \u5F53\u67D0\u4E2AKey\u4E0D\u4F7F\u7528\u65F6\uFF0C\u7ACB\u5373\u5220\u9664													###
+### 3. key\u547D\u540D\u5168\u90E8\u5C0F\u5199\uFF0C\u5355\u8BCD\u95F4\u4EC5\u5141\u8BB8\u4F7F\u7528\u70B9(.),\u4E2D\u5212\u7EBF(-)\u5206\u5272							###
 #######################################################################################
 
 app.foundation.token.user.expire=2592000
@@ -129,19 +129,26 @@ pica.foundation.sts.roleSessionName=alice-001
 #oss
 pica.foundation.oss.config={"accessKeyId":"LTAI1P48GGvkKtMp","bucketName":"pica-pro","accessKeySecret":"zpdUiy3nsi7ikuQUz3eaHVfol9QKrn","endpoint":"oss-cn-shanghai.aliyuncs.com"}
 
+
 #
-file_url=https://test-file.yunqueyi.com
+file_url=https://file.yunqueyi.com
+
+
+#\u6587\u4EF6\u57DF\u540D
+common.file.url=https://file.yunqueyi.com
+#\u8BFE\u7A0B\u5206\u4EAB\u7CFB\u7EDF\u57DF\u540D
+course.share.url=https://m.yunqueyi.com
 
 #qiniu begin
-#七牛上传空间
+#\u4E03\u725B\u4E0A\u4F20\u7A7A\u95F4
 qiniu.bucket=videos
 qiniu_access_key=BRVB4TpxVFA5Wo6lIpfltmWKOltzGar46tvC3BlR
 qiniu_secret_key=hphTOdohPDBDsvKwlWthAQmfzs_RFGT9YG-ZTlqQ
-#七牛处理队列
+#\u4E03\u725B\u5904\u7406\u961F\u5217
 qiniu_persistent_pipeline=pica-pro
-#视频域名
+#\u89C6\u9891\u57DF\u540D
 qiniu_video_domain=https://video.yunqueyi.com
-#七牛转码定时任务 300s轮询
+#\u4E03\u725B\u8F6C\u7801\u5B9A\u65F6\u4EFB\u52A1 300s\u8F6E\u8BE2
 qiniu_video_trans_fixed_rate=300000
 #qiniu end
 
@@ -195,6 +202,5 @@ qiniu_video_trans_fixed_rate=300000
 
 
 
-
 
 

application-test1.properties

 #######################################################################################
-### 				pica-cloud-service-starter 配置 (禁止修改key名称)				### 
+### 				pica-cloud-service-starter \u914D\u7F6E (\u7981\u6B62\u4FEE\u6539key\u540D\u79F0)				###
 #######################################################################################
 environment.name=com.pica.cloud.education.test1
 
@@ -61,7 +61,7 @@ spring.redis.config=\
       "password":"Uu49Kz1olY85HQBu",\
       "prefix":""\
   }
-  
+
 #tomcat settings
 server.tomcat.max-connections=2000
 server.tomcat.max-threads=800
@@ -80,12 +80,12 @@ mybatis.mapper-locations=classpath:mybatis/*.xml
 logging.path=/opt/tomcat-log/${spring.application.name}
 
 #######################################################################################
-### 								应用配置											###
-###																					### 
-### 1. key 规则：[app开头].[组名称(去掉pica.cloud)].[应用名].[key描述(单词用"."分割)] ### 
-### 	例子：app.founction.token.user.expire										### 
-### 2. 当某个Key不使用时，立即删除													###
-### 3. key命名全部小写，单词间仅允许使用点(.),中划线(-)分割							###
+### 								\u5E94\u7528\u914D\u7F6E											###
+###																					###
+### 1. key \u89C4\u5219\uFF1A[app\u5F00\u5934].[\u7EC4\u540D\u79F0(\u53BB\u6389pica.cloud)].[\u5E94\u7528\u540D].[key\u63CF\u8FF0(\u5355\u8BCD\u7528"."\u5206\u5272)] ###
+### 	\u4F8B\u5B50\uFF1Aapp.founction.token.user.expire										###
+### 2. \u5F53\u67D0\u4E2AKey\u4E0D\u4F7F\u7528\u65F6\uFF0C\u7ACB\u5373\u5220\u9664													###
+### 3. key\u547D\u540D\u5168\u90E8\u5C0F\u5199\uFF0C\u5355\u8BCD\u95F4\u4EC5\u5141\u8BB8\u4F7F\u7528\u70B9(.),\u4E2D\u5212\u7EBF(-)\u5206\u5272							###
 #######################################################################################
 
 # pica-cloud-login-token-service settings
@@ -133,9 +133,6 @@ dhst_ms_url=http://www.dh3t.com
 type-aliases-package: com.pica.cloud
 
 
-# 
-push_is_production=false
-
 #oss
 pica.foundation.oss.config={"accessKeyId":"LTAI1P48GGvkKtMp","bucketName":"pica-test-huabei2","accessKeySecret":"zpdUiy3nsi7ikuQUz3eaHVfol9QKrn","endpoint":"oss-cn-beijing.aliyuncs.com"}
 
@@ -144,20 +141,20 @@ file_url=https://test-file.yunqueyi.com
 
 #\u6587\u4EF6\u57DF\u540D
 common.file.url=https://test-file.yunqueyi.com
-#课程分享系统域名
+#\u8BFE\u7A0B\u5206\u4EAB\u7CFB\u7EDF\u57DF\u540D
 course.share.url=https://test1-m.yunqueyi.com
 
 #qiniu begin
-#七牛上传空间
+#\u4E03\u725B\u4E0A\u4F20\u7A7A\u95F4
 qiniu_bucket=pica-test
 qiniu_access_key=BRVB4TpxVFA5Wo6lIpfltmWKOltzGar46tvC3BlR
 qiniu_secret_key=hphTOdohPDBDsvKwlWthAQmfzs_RFGT9YG-ZTlqQ
-#七牛处理队列
+#\u4E03\u725B\u5904\u7406\u961F\u5217
 qiniu_persistent_pipeline=pica-test
-#视频域名
+#\u89C6\u9891\u57DF\u540D
 #qiniu_video_domain=http://p6wtf96c0.bkt.clouddn.com
 qiniu_video_domain=https://test1-videos.yunqueyi.com
-#七牛转码定时任务 120s轮询
+#\u4E03\u725B\u8F6C\u7801\u5B9A\u65F6\u4EFB\u52A1 120s\u8F6E\u8BE2
 qiniu_video_trans_fixed_rate=120000
 
 #qiniu end

application-test2.properties

 #######################################################################################
-### 				pica-cloud-service-starter 配置 (禁止修改key名称)				### 
+### 				pica-cloud-service-starter \u914D\u7F6E (\u7981\u6B62\u4FEE\u6539key\u540D\u79F0)				###
 #######################################################################################
 environment.name=test2
 
@@ -61,7 +61,7 @@ spring.redis.config=\
       "password":"Uu49Kz1olY85HQBu",\
       "prefix":""\
   }
-  
+
 #tomcat settings
 server.tomcat.max-connections=2000
 server.tomcat.max-threads=800
@@ -80,12 +80,12 @@ mybatis.mapper-locations=classpath:mybatis/*.xml
 logging.path=/opt/tomcat-log/${spring.application.name}
 
 #######################################################################################
-### 								应用配置											###
-###																					### 
-### 1. key 规则：[app开头].[组名称(去掉pica.cloud)].[应用名].[key描述(单词用"."分割)] ### 
-### 	例子：app.founction.token.user.expire										### 
-### 2. 当某个Key不使用时，立即删除													###
-### 3. key命名全部小写，单词间仅允许使用点(.),中划线(-)分割							###
+### 								\u5E94\u7528\u914D\u7F6E											###
+###																					###
+### 1. key \u89C4\u5219\uFF1A[app\u5F00\u5934].[\u7EC4\u540D\u79F0(\u53BB\u6389pica.cloud)].[\u5E94\u7528\u540D].[key\u63CF\u8FF0(\u5355\u8BCD\u7528"."\u5206\u5272)] ###
+### 	\u4F8B\u5B50\uFF1Aapp.founction.token.user.expire										###
+### 2. \u5F53\u67D0\u4E2AKey\u4E0D\u4F7F\u7528\u65F6\uFF0C\u7ACB\u5373\u5220\u9664													###
+### 3. key\u547D\u540D\u5168\u90E8\u5C0F\u5199\uFF0C\u5355\u8BCD\u95F4\u4EC5\u5141\u8BB8\u4F7F\u7528\u70B9(.),\u4E2D\u5212\u7EBF(-)\u5206\u5272							###
 #######################################################################################
 
 # pica-cloud-login-token-service settings
@@ -133,8 +133,6 @@ dhst_ms_url=http://www.dh3t.com
 type-aliases-package: com.pica.cloud
 
 
-# 
-push_is_production=false
 
 #oss
 pica.foundation.oss.config={"accessKeyId":"LTAI1P48GGvkKtMp","bucketName":"pica-test-huabei2","accessKeySecret":"zpdUiy3nsi7ikuQUz3eaHVfol9QKrn","endpoint":"oss-cn-beijing.aliyuncs.com"}
@@ -144,12 +142,25 @@ file_url=https://test-file.yunqueyi.com
 
 
 common.file.url=https://test-file.yunqueyi.com
-#课程分享系统域名
+#\u8BFE\u7A0B\u5206\u4EAB\u7CFB\u7EDF\u57DF\u540D
 course.share.url=https://test2-m.yunqueyi.com
 
 
 
+#qiniu begin
+#\u4E03\u725B\u4E0A\u4F20\u7A7A\u95F4
+qiniu_bucket=pica-test
+qiniu_access_key=BRVB4TpxVFA5Wo6lIpfltmWKOltzGar46tvC3BlR
+qiniu_secret_key=hphTOdohPDBDsvKwlWthAQmfzs_RFGT9YG-ZTlqQ
+#\u4E03\u725B\u5904\u7406\u961F\u5217
+qiniu_persistent_pipeline=pica-test
+#\u89C6\u9891\u57DF\u540D
+#qiniu_video_domain=http://p6wtf96c0.bkt.clouddn.com
+qiniu_video_domain=https://test1-videos.yunqueyi.com
+#\u4E03\u725B\u8F6C\u7801\u5B9A\u65F6\u4EFB\u52A1 120s\u8F6E\u8BE2
+qiniu_video_trans_fixed_rate=120000
 
+#qiniu end
 
 
 

application-uat.properties

 #######################################################################################
-### 				pica-cloud-service-starter 配置 (禁止修改key名称)				### 
+### 				pica-cloud-service-starter \u914D\u7F6E (\u7981\u6B62\u4FEE\u6539key\u540D\u79F0)				###
 #######################################################################################
 environment.name=uat
 
@@ -61,7 +61,7 @@ spring.redis.config=\
       "password":"Uu49Kz1olY85HQBu",\
       "prefix":""\
   }
-  
+
 #tomcat settings
 server.tomcat.max-connections=2000
 server.tomcat.max-threads=800
@@ -80,12 +80,12 @@ mybatis.mapper-locations=classpath:mybatis/*.xml
 logging.path=/opt/tomcat-log/${spring.application.name}
 
 #######################################################################################
-### 								应用配置											###
-###																					### 
-### 1. key 规则：[app开头].[组名称(去掉pica.cloud)].[应用名].[key描述(单词用"."分割)] ### 
-### 	例子：app.founction.token.user.expire										### 
-### 2. 当某个Key不使用时，立即删除													###
-### 3. key命名全部小写，单词间仅允许使用点(.),中划线(-)分割							###
+### 								\u5E94\u7528\u914D\u7F6E											###
+###																					###
+### 1. key \u89C4\u5219\uFF1A[app\u5F00\u5934].[\u7EC4\u540D\u79F0(\u53BB\u6389pica.cloud)].[\u5E94\u7528\u540D].[key\u63CF\u8FF0(\u5355\u8BCD\u7528"."\u5206\u5272)] ###
+### 	\u4F8B\u5B50\uFF1Aapp.founction.token.user.expire										###
+### 2. \u5F53\u67D0\u4E2AKey\u4E0D\u4F7F\u7528\u65F6\uFF0C\u7ACB\u5373\u5220\u9664													###
+### 3. key\u547D\u540D\u5168\u90E8\u5C0F\u5199\uFF0C\u5355\u8BCD\u95F4\u4EC5\u5141\u8BB8\u4F7F\u7528\u70B9(.),\u4E2D\u5212\u7EBF(-)\u5206\u5272							###
 #######################################################################################
 
 app.foundation.token.user.expire=2592000
@@ -133,25 +133,25 @@ pica.foundation.sts.roleSessionName=alice-001
 pica.foundation.oss.config={"accessKeyId":"LTAI1P48GGvkKtMp","bucketName":"pica-pro","accessKeySecret":"zpdUiy3nsi7ikuQUz3eaHVfol9QKrn","endpoint":"oss-cn-shanghai.aliyuncs.com"}
 
 #
-file_url=https://test-file.yunqueyi.com
+file_url=https://file.yunqueyi.com
 
 
 
 #\u6587\u4EF6\u57DF\u540D
 common.file.url=https://file.yunqueyi.com
-#课程分享系统域名
+#\u8BFE\u7A0B\u5206\u4EAB\u7CFB\u7EDF\u57DF\u540D
 course.share.url=https://uat-m.yunqueyi.com
 
 #qiniu begin
-#七牛上传空间
+#\u4E03\u725B\u4E0A\u4F20\u7A7A\u95F4
 qiniu.bucket=videos
 qiniu_access_key=BRVB4TpxVFA5Wo6lIpfltmWKOltzGar46tvC3BlR
 qiniu_secret_key=hphTOdohPDBDsvKwlWthAQmfzs_RFGT9YG-ZTlqQ
-#七牛处理队列
+#\u4E03\u725B\u5904\u7406\u961F\u5217
 qiniu_persistent_pipeline=pica-pro
-#视频域名
+#\u89C6\u9891\u57DF\u540D
 qiniu_video_domain=https://video.yunqueyi.com
-#七牛转码定时任务 300s轮询
+#\u4E03\u725B\u8F6C\u7801\u5B9A\u65F6\u4EFB\u52A1 300s\u8F6E\u8BE2
 qiniu_video_trans_fixed_rate=300000
 #qiniu end