Merge branch 'dev_v2.2.0' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev_v2.2.0

distributed-print/src/main/resources/application-release.properties

@@ -1,4 +1,4 @@
-server.port=7003
+server.port=7811
 #tomcat\u6700\u5927\u7EBF\u7A0B\u6570\uFF0C\u9ED8\u8BA4\u4E3A200
 server.tomcat.threads.max=2500
 #tomcat\u6700\u5927\u8FDE\u63A5\u6570
@@ -10,23 +10,23 @@ server.tomcat.uri-encoding=UTF-8
 spring.application.name=distributed-print
 
 #\u6570\u636E\u6E90\u914D\u7F6E
-db.host=localhost
+db.host=rm-wz9m2v52uw2at1173.mysql.rds.aliyuncs.com
 db.port=3306
-db.name=merge
-db.username=root
-db.password=123456789
+db.name=dps_guangyao
+db.username=online_exam
+db.password=Online_Exam
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
-com.qmth.redis.host=${db.host}
+com.qmth.redis.host=r-wz9utlnf2gp7hiqoqi.redis.rds.aliyuncs.com
+com.qmth.redis.db=4
 com.qmth.redis.port=6379
-com.qmth.redis.db=0
-#com.qmth.redis.password
+com.qmth.redis.password=Online_Exam
 
 #mysql\u914D\u7F6E
 com.qmth.datasource.url=jdbc:mysql://${db.host}:${db.port}/${db.name}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
 com.qmth.datasource.username=${db.username}
 com.qmth.datasource.password=${db.password}
-com.qmth.mysql.log-level=debug
+com.qmth.mybatis.log-level=debug
 
 #activiti\u914D\u7F6E
 #activiti\u4F1A\u5BF9\u6570\u636E\u5E93\u4E2D\u6240\u6709\u8868\u8FDB\u884C\u66F4\u65B0\u64CD\u4F5C\u3002\u5982\u679C\u8868\u4E0D\u5B58\u5728\uFF0C\u5219\u81EA\u52A8\u521B\u5EFA
@@ -52,13 +52,13 @@ aliyun.oss.name=oss-cn-shenzhen.aliyuncs.com
 aliyun.oss.endpoint=http://${aliyun.oss.name}
 aliyun.oss.accessKeyId=LTAI4Fi8jVRYT49QBXU9x5QX
 aliyun.oss.accessKeySecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
-aliyun.oss.bucket=teachcloud-test
+aliyun.oss.bucket=teachcloud-prod-guangyao
 aliyun.oss.url=http://${aliyun.oss.bucket}.${aliyun.oss.name}
 
-com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.qmth.com.cn
-com.qmth.fss.public.server=http://oss-file.qmth.com.cn/teachcloud-print-dev-public
-com.qmth.fss.private.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn
-com.qmth.fss.private.server=http://oss-file.qmth.com.cn/teachcloud-print-dev-private
+com.qmth.fss.public.config=oss://LTAI4Fi8jVRYT49QBXU9x5QX:97aBLBfkQR5mzCiQa82yWLAH57eUd8@teachcloud-prod-guangyao.oss-cn-shenzhen.aliyuncs.com
+com.qmth.fss.public.server=https://teachcloud-prod-guangyao.oss-cn-shenzhen.aliyuncs.com
+com.qmth.fss.private.config=oss://LTAI4Fi8jVRYT49QBXU9x5QX:97aBLBfkQR5mzCiQa82yWLAH57eUd8@teachcloud-prod-guangyao.oss-cn-shenzhen.aliyuncs.com
+com.qmth.fss.private.server=https://teachcloud-prod-guangyao.oss-cn-shenzhen.aliyuncs.com
 
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=true
@@ -66,12 +66,12 @@ sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,
 sys.config.attachmentLength=100
 sys.config.attachmentSize=200
 sys.config.serverUpload=
-sys.config.fileHost=localhost:7001
-sys.config.serverHost=localhost:7001
+sys.config.fileHost=localhost:7811
+sys.config.serverHost=localhost:7811
 #sys.config.accessKey=0bce69d94a7b4aef8bc0badf150351a9
 #sys.config.accessSecret=LdUwb5X4etmjW7fDn0KAdoXG0Yt7AkDu
-sys.config.accessKey=274f823e5f59410f8b3bb6edcd8e2b6e
-sys.config.accessSecret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
+sys.config.accessKey=df8baa73072c4725a07fe4d119cceb24
+sys.config.accessSecret=r18hy2X8zkj8OPkRoemq1owt4qS87Gal
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
 #sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
@@ -115,7 +115,7 @@ spring.jackson.time-zone=GMT+8
 
 #\u65E5\u5FD7\u914D\u7F6E
 com.qmth.logging.root-level=info
-com.qmth.logging.file-path=/Users/king/Downloads/distributed-print.log
+com.qmth.logging.file-path=/opt/logs/distributed-print.log
 
 #\u5F15\u5165task\u914D\u7F6E\u6587\u4EF6
 #spring.profiles.include=task

teachcloud-task/src/main/resources/application-task_release.properties

@@ -1,5 +1,5 @@
 #\u7AEF\u53E3\u914D\u7F6E
-server.port=7011
+server.port=7812
 #tomcat\u6700\u5927\u7EBF\u7A0B\u6570\uFF0C\u9ED8\u8BA4\u4E3A200
 server.tomcat.threads.max=2500
 #tomcat\u6700\u5927\u8FDE\u63A5\u6570
@@ -11,17 +11,17 @@ server.tomcat.uri-encoding=UTF-8
 spring.application.name=teachcloud-task
 
 #\u6570\u636E\u6E90\u914D\u7F6E
-db.host=localhost
+db.host=rm-wz9m2v52uw2at1173.mysql.rds.aliyuncs.com
 db.port=3306
-db.name=distributed-v2.2.0-test
-db.username=root
-db.password=123456789
+db.name=dps_guangyao
+db.username=online_exam
+db.password=Online_Exam
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
-com.qmth.redis.host=${db.host}
+com.qmth.redis.host=r-wz9utlnf2gp7hiqoqi.redis.rds.aliyuncs.com
+com.qmth.redis.db=4
 com.qmth.redis.port=6379
-com.qmth.redis.db=15
-#com.qmth.redis.password
+com.qmth.redis.password=Online_Exam
 
 #mysql\u914D\u7F6E
 com.qmth.datasource.url=jdbc:mysql://${db.host}:${db.port}/${db.name}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
@@ -53,13 +53,13 @@ aliyun.oss.name=oss-cn-shenzhen.aliyuncs.com
 aliyun.oss.endpoint=http://${aliyun.oss.name}
 aliyun.oss.accessKeyId=LTAI4Fi8jVRYT49QBXU9x5QX
 aliyun.oss.accessKeySecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
-aliyun.oss.bucket=teachcloud-test
+aliyun.oss.bucket=teachcloud-prod-guangyao
 aliyun.oss.url=http://${aliyun.oss.bucket}.${aliyun.oss.name}
 
-com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.qmth.com.cn
-com.qmth.fss.public.server=http://oss-file.qmth.com.cn/teachcloud-print-dev-public
-com.qmth.fss.private.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn
-com.qmth.fss.private.server=http://oss-file.qmth.com.cn/teachcloud-print-dev-private
+com.qmth.fss.public.config=oss://LTAI4Fi8jVRYT49QBXU9x5QX:97aBLBfkQR5mzCiQa82yWLAH57eUd8@teachcloud-prod-guangyao.oss-cn-shenzhen.aliyuncs.com
+com.qmth.fss.public.server=https://teachcloud-prod-guangyao.oss-cn-shenzhen.aliyuncs.com
+com.qmth.fss.private.config=oss://LTAI4Fi8jVRYT49QBXU9x5QX:97aBLBfkQR5mzCiQa82yWLAH57eUd8@teachcloud-prod-guangyao.oss-cn-shenzhen.aliyuncs.com
+com.qmth.fss.private.server=https://teachcloud-prod-guangyao.oss-cn-shenzhen.aliyuncs.com
 
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=true
@@ -67,12 +67,12 @@ sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,
 sys.config.attachmentLength=100
 sys.config.attachmentSize=200
 sys.config.serverUpload=
-sys.config.fileHost=localhost:7011
-sys.config.serverHost=localhost:7011
+sys.config.fileHost=localhost:7812
+sys.config.serverHost=localhost:7812
 #sys.config.accessKey=0bce69d94a7b4aef8bc0badf150351a9
 #sys.config.accessSecret=LdUwb5X4etmjW7fDn0KAdoXG0Yt7AkDu
-sys.config.accessKey=274f823e5f59410f8b3bb6edcd8e2b6e
-sys.config.accessSecret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
+sys.config.accessKey=df8baa73072c4725a07fe4d119cceb24
+sys.config.accessSecret=r18hy2X8zkj8OPkRoemq1owt4qS87Gal
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
 #sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
@@ -88,7 +88,7 @@ spring.jackson.time-zone=GMT+8
 
 #\u65E5\u5FD7\u914D\u7F6E
 com.qmth.logging.root-level=info
-com.qmth.logging.file-path=/ONLINE_EXAM/distributed/task_tomcat/logs/distributed-task.log
+com.qmth.logging.file-path=/opt/logs/distributed-task.log
 
 #============================================================================
 # \u914D\u7F6EJobStore