Merge branch 'dev_v2.2.1' into release_v2.2.1

merge

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

@@ -145,7 +145,6 @@ sync.config.structureUrl=/api/exam/paper/save
 # \uFFFD\u00FB\uFFFD\u036C\uFFFD\uFFFD
 sync.config.userSaveUrl=/api/user/external/save
 
-
 sms.config.smsNormalCode=qmth
 sms.config.codeExpiredTime=2
 sms.config.codeSendInterval=60

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

@@ -145,7 +145,6 @@ sync.config.structureUrl=/api/exam/paper/save
 # \uFFFD\u00FB\uFFFD\u036C\uFFFD\uFFFD
 sync.config.userSaveUrl=/api/user/external/save
 
-
 sms.config.smsNormalCode=qmth
 sms.config.codeExpiredTime=2
 sms.config.codeSendInterval=60

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

@@ -108,6 +108,8 @@ prefix.url.work=admin/work
 prefix.url.client=admin/client
 prefix.url.flow=admin/flow
 prefix.url.statistics=admin/statistics
+prefix.url.sync=admin/sync
+prefix.url.menu=admin/menu
 
 #\u65E5\u671F\u683C\u5F0F\u5316
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
@@ -127,14 +129,21 @@ sync.config.examSaveUrl=/api/exam/save
 #\u036C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 sync.config.studentSaveUrl=/api/exam/student/save
 #\u036C\uFFFD\uFFFD\uFFFD\u2FE8
-sync.config.cardUploadUrl=/api/file/card/upload
-#第三方登录
+sync.config.fileUploadUrl=/api/file/{type}/upload
+# \uFFFD\u053E\uFFFD\u1E79\uFFFD\uFFFD\u046F\uFFFD\u04FF\uFFFD
+sync.config.queryPaperStructure=/api/exam/paper/query
+#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00BC
 sync.config.markLoginUrl=/open/mark/login
-#成绩回传考生数量
+#\uFFFD\uFFFD\uFFFD\u9CE4\uFFFD\uFFFD\u00BC
+sync.config.markLeaderLoginUrl=/open/subject_header/login
+#\uFFFD\u027C\uFFFD\uFFFD\u0634\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 sync.config.studentCountUrl=/api/exam/student/count
-#成绩回传
+#\uFFFD\u027C\uFFFD\uFFFD\u0634\uFFFD
 sync.config.studentScoreUrl=/api/exam/student/score
-
+# \u036C\uFFFD\uFFFD\uFFFD\u053E\uFFFD\u1E79
+sync.config.structureUrl=/api/exam/paper/save
+# \uFFFD\u00FB\uFFFD\u036C\uFFFD\uFFFD
+sync.config.userSaveUrl=/api/user/external/save
 
 sms.config.smsNormalCode=8635
 sms.config.codeExpiredTime=2
@@ -166,4 +175,6 @@ sms.config.aliyunSMSAuditWillExpireCode=SMS_217436302
 #\uFFFD\uFFFD\u02F4\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0368\u05AA
 sms.config.aliyunSMSAuditOverdueCode=SMS_217416271
 #\uFFFD\uFFFD\uFFFD\uFFFD
-sms.config.aliyunSMSAuditRejectCode=SMS_225394754
+sms.config.aliyunSMSAuditRejectCode=SMS_225394754
+# \uFFFD\u053E\uFFFD\u1E79\uFFFD\uFFFD\uFFFD\uFFFD\u03F4\uFFFD\u0368\u05AA
+sms.config.aliyunSMSUploadStructureCode=SMS_227253569

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

@@ -108,6 +108,8 @@ prefix.url.work=admin/work
 prefix.url.client=admin/client
 prefix.url.flow=admin/flow
 prefix.url.statistics=admin/statistics
+prefix.url.sync=admin/sync
+prefix.url.menu=admin/menu
 
 #\u65E5\u671F\u683C\u5F0F\u5316
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
@@ -121,20 +123,27 @@ com.qmth.logging.file-path=/opt/logs/distributed-print.log
 #spring.profiles.include=task
 
 #\u4E91\u9605\u5377\u76F8\u5173url
-sync.config.hostUrl=http://192.168.10.224:8080/
-#\u540C\u6B65\u8003\u8BD5
+sync.config.hostUrl=http://192.168.10.225:8000/
+#\u036C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 sync.config.examSaveUrl=/api/exam/save
-#\u540C\u6B65\u8003\u751F
+#\u036C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 sync.config.studentSaveUrl=/api/exam/student/save
-#\u540C\u6B65\u9898\u5361
-sync.config.cardUploadUrl=/api/file/card/upload
-#第三方登录
+#\u036C\uFFFD\uFFFD\uFFFD\u2FE8
+sync.config.fileUploadUrl=/api/file/{type}/upload
+# \uFFFD\u053E\uFFFD\u1E79\uFFFD\uFFFD\u046F\uFFFD\u04FF\uFFFD
+sync.config.queryPaperStructure=/api/exam/paper/query
+#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00BC
 sync.config.markLoginUrl=/open/mark/login
-#成绩回传考生数量
+#\uFFFD\uFFFD\uFFFD\u9CE4\uFFFD\uFFFD\u00BC
+sync.config.markLeaderLoginUrl=/open/subject_header/login
+#\uFFFD\u027C\uFFFD\uFFFD\u0634\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 sync.config.studentCountUrl=/api/exam/student/count
-#成绩回传
+#\uFFFD\u027C\uFFFD\uFFFD\u0634\uFFFD
 sync.config.studentScoreUrl=/api/exam/student/score
-
+# \u036C\uFFFD\uFFFD\uFFFD\u053E\uFFFD\u1E79
+sync.config.structureUrl=/api/exam/paper/save
+# \uFFFD\u00FB\uFFFD\u036C\uFFFD\uFFFD
+sync.config.userSaveUrl=/api/user/external/save
 
 sms.config.smsNormalCode=8635
 sms.config.codeExpiredTime=2
@@ -147,7 +156,6 @@ sms.config.aliyunSMSSignName=\u9038\u6559\u4E91
 sms.config.aliyunSMSTplCode=SMS_147416565
 sms.config.aliyunSMSAuditPassCode=SMS_216425141
 sms.config.aliyunSMSAuditNotPassCode=SMS_216275156
-
 #\u547D\u9898\u4EFB\u52A1\u5F85\u529E\u751F\u6210\u901A\u77E5
 sms.config.aliyunSMSExamTaskCreatedCode=SMS_217436292
 #\u547D\u9898\u4EFB\u52A1\u5F85\u529E\u5230\u671F\u9884\u8B66\u901A\u77E5
@@ -167,4 +175,6 @@ sms.config.aliyunSMSAuditWillExpireCode=SMS_217436302
 #\u5BA1\u6838\u5F85\u529E\u903E\u671F\u901A\u77E5
 sms.config.aliyunSMSAuditOverdueCode=SMS_217416271
 #\uFFFD\uFFFD\uFFFD\uFFFD
-sms.config.aliyunSMSAuditRejectCode=SMS_225394754
+sms.config.aliyunSMSAuditRejectCode=SMS_225394754
+# \uFFFD\u053E\uFFFD\u1E79\uFFFD\uFFFD\uFFFD\uFFFD\u03F4\uFFFD\u0368\u05AA
+sms.config.aliyunSMSUploadStructureCode=SMS_227253569