Merge remote-tracking branch 'origin/dev_v3.1.0' into dev_v3.1.0

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

@@ -68,8 +68,8 @@ sys.config.attachmentSize=200
 sys.config.serverUpload=
 #sys.config.fileHost=localhost:7001
 #sys.config.serverHost=localhost:7001
-sys.config.fileHost=http://*.teachcloud-print-wl-test.cn
-sys.config.serverHost=http://*.teachcloud-print-wl-test.cn
+sys.config.fileHost=http://127.0.0.1
+sys.config.serverHost=http://127.0.0.1
 #sys.config.accessKey=0bce69d94a7b4aef8bc0badf150351a9
 #sys.config.accessSecret=LdUwb5X4etmjW7fDn0KAdoXG0Yt7AkDu
 sys.config.accessKey=274f823e5f59410f8b3bb6edcd8e2b6e
@@ -160,9 +160,9 @@ sync.config.groupCountUrl=/api/exam/mark_group/count
 sync.config.groupDeleteUrl=/api/exam/mark_group/delete
 sync.config.markerSaveUrl=/api/exam/marker/save
 
-#com.qmth.solar.access-key=274f823e5f59410f8b3bb6edcd8e2b6e
-#com.qmth.solar.access-secret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
-com.qmth.solar.license=/Volumes/extend/\u542F\u660E/\u5206\u5E03\u5F0F\u5370\u5237/\u5206\u5E03\u5F0F\u5370\u5237&\u6559\u7814\u5206\u6790v3.1.0/tc-dev-wl.lic
+com.qmth.solar.access-key=274f823e5f59410f8b3bb6edcd8e2b6e
+com.qmth.solar.access-secret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
+#com.qmth.solar.license=/Volumes/extend/\u542F\u660E/\u5206\u5E03\u5F0F\u5370\u5237/\u5206\u5E03\u5F0F\u5370\u5237&\u6559\u7814\u5206\u6790v3.1.0/tc-dev-wl.lic
 
 sms.config.smsNormalCode=qmth
 sms.config.codeExpiredTime=2
@@ -199,7 +199,7 @@ sms.config.aliyunSMSAuditRejectCode=SMS_237206063
 sms.config.aliyunSMSUploadStructureCode=SMS_237201068
 sms.config.aliyunSMSAuditCopyUserCode=SMS_237206065
 
-report.open.hostUrl=http://192.168.10.86:7004
+report.open.hostUrl=http://127.0.0.1:7004
 report.open.semesterApi=/api/report/open/semester_edit
 report.open.examApi=/api/report/open/exam_edit
 report.open.courseEditApi=/api/report/open/course_edit

teachcloud-report/src/main/resources/application-dev.properties

@@ -56,7 +56,7 @@ sys.config.customThreadPoolCoreSize=true
 sys.config.analyzeThreadPoolCoreSize=false
 sys.config.sessionActive=1h
 sys.config.reportUrl=http://localhost:9099/#/student-report/
-sys.config.loginAuthenUrl=http://192.168.10.86:8057/#/login-authen/
+sys.config.loginAuthenUrl=http://127.0.0.1:8057/#/login-authen/
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
 org.center.url=https://solar.qmth.com.cn
@@ -133,7 +133,7 @@ sms.config.aliyunSMSAuditOverdueCode=SMS_217416271
 yun.mark.url=http://192.168.10.224:80
 yun.mark.studentScoreApi=/api/exam/student/score
 
-print.open.hostUrl=http://192.168.10.86:7001
+print.open.hostUrl=http://127.0.0.1:7001
 print.open.callbackUrlApi=/api/admin/print/notify/analysis/progress
 print.open.callbackPwd=123456
 print.open.paperConfig=/api/admin/print/open/paper_config