Merge branch 'dev_v2.2.2' into dev_v3.0.0

merge

distributed-print-business/src/main/resources/mapper/ExamDetailMapper.xml

@@ -449,7 +449,8 @@
         SELECT DISTINCT
             b.school_id schoolId,
             b.course_code courseCode,
-            b.paper_number paperNumber
+            b.paper_number paperNumber,
+            b.paper_type paperType
         FROM
             exam_detail a
                 LEFT JOIN

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

@@ -125,7 +125,7 @@ com.qmth.logging.file-path=/opt/logs/distributed-print.log
 #spring.profiles.include=task
 
 #\uFFFD\uFFFD\uFFFD\u013E\uFFFD\uFFFD\uFFFD\uFFFDurl
-sync.config.hostUrl=https://epcc.markingcloud.com/
+sync.config.hostUrl=https://www.markingcloud.com
 #\u036C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 sync.config.examSaveUrl=/api/exam/save
 #\u036C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD

teachcloud-common/src/main/java/com/qmth/teachcloud/common/sync/StmmsUtils.java

@@ -216,8 +216,12 @@ public class StmmsUtils {
             JSONObject jsonObject = JSONObject.parseObject(result);
             if (jsonObject.containsKey("success")) {
                 String success = jsonObject.get("success").toString();
-                if (Boolean.valueOf(success) && jsonObject.containsKey("url")) {
-                    return jsonObject.get("url").toString();
+                if (Boolean.valueOf(success)) {
+                    if(jsonObject.containsKey("url")) {
+                        return jsonObject.get("url").toString();
+                    } else {
+                        return success;
+                    }
                 }
             }
         } catch (Exception e) {

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

@@ -81,7 +81,7 @@ sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
 sys.config.sessionActive=4h
 sys.config.flowSchoolCodeMap.GdykdxPaperApprove=gdpu
-sys.config.flowSchoolCodeMap.JxzyyPaperApprove=jxutcm
+sys.config.flowSchoolCodeMap.JxzyyPaperApprove=jxutcm,sisu,test-school-2
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
 #\u65E5\u671F\u683C\u5F0F\u5316
@@ -131,5 +131,5 @@ spring.quartz.properties.org.quartz.threadPool.threadPriority=5
 
 #\u914D\u7F6E\u6587\u4EF6
 #spring.profiles=task
-sync.config.hostUrl=https://epcc.markingcloud.com/
+sync.config.hostUrl=https://www.markingcloud.com
 sync.config.userSaveUrl=/api/user/external/save