资源文件api修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/SsoServiceImpl.java

@@ -160,16 +160,18 @@ public class SsoServiceImpl implements SsoService {
         map.computeIfAbsent("returnUrl", v -> returnUrl);
 
         Long timestamp = System.currentTimeMillis();
-        String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, dictionaryConfig.reportOpenDomain().getSsoLoginApi(), timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
+        String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, SystemConstant.TEACHCLOUD_REPORT_SSO_LOGIN_API, timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
         map.computeIfAbsent("time", v -> timestamp);
         map.computeIfAbsent("authorization", v -> accessToken);
 
-        SystemConstant.getLocalFileHost(dictionaryConfig.reportOpenDomain().getHostUrl());
-        String hostUrl = dictionaryConfig.reportOpenDomain().getHostUrl();
+        //TODO 教研分析地址待完善
+//        SystemConstant.getLocalFileHost(dictionaryConfig.reportOpenDomain().getHostUrl());
+//        String hostUrl = dictionaryConfig.reportOpenDomain().getHostUrl();
+        String hostUrl = null;
         Optional.ofNullable(hostUrl).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置教研分析host"));
 
         hostUrl = SystemConstant.getLocalFileHost(hostUrl);
-        map.put("redirectUrl", hostUrl + dictionaryConfig.reportOpenDomain().getSsoLoginApi());
+        map.put("redirectUrl", hostUrl + SystemConstant.TEACHCLOUD_REPORT_SSO_LOGIN_API);
         System.out.println(JSON.toJSONString(map));
         return map;
     }
@@ -207,12 +209,14 @@ public class SsoServiceImpl implements SsoService {
         Optional.ofNullable(sysUserRole).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("用户没有该角色"));
 
         long timestamp = System.currentTimeMillis();
-        String questionLoginUrl = dictionaryConfig.casDomain().getQuestionHostUrl();
+        //TODO 题库地址待完善
+//        String questionLoginUrl = dictionaryConfig.casDomain().getQuestionHostUrl();
+        String questionLoginUrl = null;
         if (questionLoginUrl.contains("*")) {
             questionLoginUrl = questionLoginUrl.replace("*", basicSchool.getCode());
         }
-        questionLoginUrl = questionLoginUrl + dictionaryConfig.casDomain().getQuestionLoginUri();
-        String path = dictionaryConfig.casDomain().getQuestionLoginUri();
+        questionLoginUrl = questionLoginUrl + SystemConstant.QUESTION_CAS_ADMIN_LOGIN_OPEN_API;
+        String path = SystemConstant.QUESTION_CAS_ADMIN_LOGIN_OPEN_API;
         String signature = SignatureEntity.build(SignatureType.SECRET, SystemConstant.GET, path, timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
         signature = URLEncoder.encode(signature, SystemConstant.CHARSET_NAME);
 

distributed-print/src/main/java/com/qmth/distributed/print/api/NotifyApiController.java

@@ -70,7 +70,9 @@ public class NotifyApiController {
             String decodeJson = URLDecoder.decode(result, SystemConstant.CHARSET_NAME);
             log.info("analysis_progress decodeJson:{}", decodeJson);
 
-            String callbackPwd = dictionaryConfig.printOpenDomain().getCallbackPwd();
+            //TODO 分布式印刷回调密码待完善
+//            String callbackPwd = dictionaryConfig.printOpenDomain().getCallbackPwd();
+            String callbackPwd = null;
             Optional.ofNullable(callbackPwd).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("配置文件回调密码为空"));
 
             String sign = ServletUtil.getRequestAuthorization();

distributed-print/src/main/java/com/qmth/distributed/print/api/SysController.java

@@ -179,9 +179,10 @@ public class SysController {
                     sysUserService.checkSmsCode(sysUser.getId(), sysUser.getMobileNumber(), login.getCode());
 
                     // 如果不是共用验证码再过期
-                    if (!dictionaryConfig.smsDomain().getSmsNormalCode().equals(login.getCode())) {
-                        sysUserService.expiredVerifyCode(sysUser.getId(), sysUser.getMobileNumber());
-                    }
+                    //TODO 万能短信验证码待完善
+//                    if (!dictionaryConfig.smsDomain().getSmsNormalCode().equals(login.getCode())) {
+                    sysUserService.expiredVerifyCode(sysUser.getId(), sysUser.getMobileNumber());
+//                    }
                 }
             }
         } else if (LoginTypeEnum.PHONE.name().equals(login.getType())) {
@@ -209,9 +210,10 @@ public class SysController {
             sysUserService.checkSmsCode(sysUser.getId(), sysUser.getMobileNumber(), code);
 
             // 如果不是共用验证码再过期
-            if (!dictionaryConfig.smsDomain().getSmsNormalCode().equals(login.getCode())) {
-                sysUserService.expiredVerifyCode(sysUser.getId(), sysUser.getMobileNumber());
-            }
+            //TODO 万能短信验证码待完善
+//            if (!dictionaryConfig.smsDomain().getSmsNormalCode().equals(login.getCode())) {
+            sysUserService.expiredVerifyCode(sysUser.getId(), sysUser.getMobileNumber());
+//            }
         } else {
             throw ExceptionResultEnum.ERROR.exception("登录参数错误");
         }

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

@@ -80,44 +80,6 @@ spring.jackson.time-zone=GMT+8
 com.qmth.logging.root-level=info
 com.qmth.logging.file-path=/Users/king/Downloads/distributed-print.log
 
-#\u5F15\u5165task\u914D\u7F6E\u6587\u4EF6
-#spring.profiles.include=task
-
-#\uFFFD\uFFFD\uFFFD\u013E\uFFFD\uFFFD\uFFFD\uFFFDurl
-sync.config.hostUrl=http://192.168.10.224:80
-#\u036C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
-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.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
-sync.config.groupSaveUrl=/api/exam/mark_group/save
-sync.config.groupCountUrl=/api/exam/mark_group/count
-sync.config.groupDeleteUrl=/api/exam/mark_group/delete
-sync.config.markerSaveUrl=/api/exam/marker/save
-sync.config.markLeaderSaveUrl=/api/exam/subject_header/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
-
-sms.config.smsNormalCode=qmth
-sms.config.codeExpiredTime=2
-sms.config.codeSendInterval=60
 #aliyun SMS key
 sms.config.aliyunSMSKey=LTAI4Fi8jVRYT49QBXU9x5QX
 #aliyun SMS secret
@@ -148,19 +110,4 @@ sms.config.aliyunSMSAuditOverdueCode=SMS_217416271
 sms.config.aliyunSMSAuditRejectCode=SMS_237206063
 # \uFFFD\u053E\uFFFD\u1E79\uFFFD\uFFFD\uFFFD\uFFFD\u03F4\uFFFD\u0368\u05AA
 sms.config.aliyunSMSUploadStructureCode=SMS_237201068
-sms.config.aliyunSMSAuditCopyUserCode=SMS_237206065
-
-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.examDeleteApi=/api/report/open/exam_delete
-report.open.courseEditApi=/api/report/open/course_edit
-report.open.courseDelApi=/api/report/open/course_del
-report.open.calculateApi=/api/report/open/calculate
-report.open.publishApi=/api/report/open/publish
-report.open.ssoLoginApi=/api/report/sso/login
-
-print.open.callbackPwd=123456
-
-cas.config.questionHostUrl=http://127.0.0.1:7000
-cas.config.questionLoginUri=/admin/login-open
+sms.config.aliyunSMSAuditCopyUserCode=SMS_237206065

teachcloud-common/src/main/java/com/qmth/teachcloud/common/config/DictionaryConfig.java

@@ -1,6 +1,9 @@
 package com.qmth.teachcloud.common.config;
 
-import com.qmth.teachcloud.common.domain.*;
+import com.qmth.teachcloud.common.domain.FssPrivateDomain;
+import com.qmth.teachcloud.common.domain.FssPublicDomain;
+import com.qmth.teachcloud.common.domain.SmsDomain;
+import com.qmth.teachcloud.common.domain.SysDomain;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -26,17 +29,6 @@ public class DictionaryConfig {
         return new SysDomain();
     }
 
-    /**
-     * cas配置
-     *
-     * @return
-     */
-    @Bean
-    @ConfigurationProperties(prefix = "cas.config")
-    public CasDomain casDomain() {
-        return new CasDomain();
-    }
-
     /**
      * 短信配置
      *
@@ -48,28 +40,6 @@ public class DictionaryConfig {
         return new SmsDomain();
     }
 
-    /**
-     * 云阅卷同步推送
-     *
-     * @return
-     */
-    @Bean
-    @ConfigurationProperties(prefix = "sync.config", ignoreUnknownFields = false)
-    public SyncDataDomain syncDataDomain() {
-        return new SyncDataDomain();
-    }
-
-    /**
-     * 云阅卷配置
-     *
-     * @return
-     */
-    @Bean
-    @ConfigurationProperties(prefix = "yun.mark", ignoreUnknownFields = false)
-    public YunMarkDomain yunMarkDomain() {
-        return new YunMarkDomain();
-    }
-
     @Bean
     @ConfigurationProperties(prefix = "com.qmth.fss.public", ignoreUnknownFields = false)
     public FssPublicDomain fssPublicDomain() {
@@ -81,26 +51,4 @@ public class DictionaryConfig {
     public FssPrivateDomain fssPrivateDomain() {
         return new FssPrivateDomain();
     }
-
-    /**
-     * 分布式印刷开放接口
-     *
-     * @return
-     */
-    @Bean
-    @ConfigurationProperties(prefix = "print.open", ignoreUnknownFields = false)
-    public PrintOpenDomain printOpenDomain() {
-        return new PrintOpenDomain();
-    }
-
-    /**
-     * 教研分析开放接口
-     *
-     * @return
-     */
-    @Bean
-    @ConfigurationProperties(prefix = "report.open", ignoreUnknownFields = false)
-    public ReportOpenDomain reportOpenDomain() {
-        return new ReportOpenDomain();
-    }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -66,6 +66,53 @@ public class SystemConstant {
     public static final String PREFIX_URL_REPORT_OPEN = "/report/open";
     public static final String PREFIX_URL_REPORT_SSO = "/report/sso";
 
+    /**
+     * 云阅卷api
+     */
+    public static final String CLOUD_MARK_EXAM_SAVE_API = "/api/exam/save";
+    public static final String CLOUD_MARK_EXAM_STUDENT_SAVE_API = "/api/exam/student/save";
+    public static final String CLOUD_MARK_FILE_UPLOAD_API = "/api/file/{type}/upload";
+    public static final String CLOUD_MARK_EXAM_PAPER_QUERY_API = "/api/exam/paper/query";
+    public static final String CLOUD_MARK_OPEN_MARK_LOGIN_API = "/open/mark/login";
+    public static final String CLOUD_MARK_OPEN_SUBJECT_HEADER_LOGIN_API = "/open/subject_header/login";
+    public static final String CLOUD_MARK_EXAM_STUDENT_COUNT_API = "/api/exam/student/count";
+    public static final String CLOUD_MARK_EXAM_STUDENT_SCORE_API = "/api/exam/student/score";
+    public static final String CLOUD_MARK_EXAM_PAPER_SAVE_API = "/api/exam/paper/save";
+    public static final String CLOUD_MARK_USER_EXTERNAL_SAVE_API = "/api/user/external/save";
+    public static final String CLOUD_MARK_EXAM_MARK_GROUP_SAVE_API = "/api/exam/mark_group/save";
+    public static final String CLOUD_MARK_EXAM_MARK_GROUP_COUNT_API = "/api/exam/mark_group/count";
+    public static final String CLOUD_MARK_EXAM_MARK_GROUP_DELETE_API = "/api/exam/mark_group/delete";
+    public static final String CLOUD_MARK_EXAM_MARKER_SAVE_API = "/api/exam/marker/save";
+    public static final String CLOUD_MARK_EXAM_SUBJECT_HEADER_SAVE_API = "/api/exam/subject_header/save";
+
+    /**
+     * 教研分析api
+     */
+    public static final String TEACHCLOUD_REPORT_OPEN_SEMESTER_EDIT_API = "/api/report/open/semester_edit";
+    public static final String TEACHCLOUD_REPORT_OPEN_EXAM_EDIT_API = "/api/report/open/exam_edit";
+    public static final String TEACHCLOUD_REPORT_OPEN_EXAM_DELETE_API = "/api/report/open/exam_delete";
+    public static final String TEACHCLOUD_REPORT_OPEN_COURSE_EDIT_API = "/api/report/open/course_edit";
+    public static final String TEACHCLOUD_REPORT_OPEN_COURSE_DEL_API = "/api/report/open/course_del";
+    public static final String TEACHCLOUD_REPORT_OPEN_CALCULATE_API = "/api/report/open/calculate";
+    public static final String TEACHCLOUD_REPORT_OPEN_PUBLISH_API = "/api/report/open/publish";
+    public static final String TEACHCLOUD_REPORT_SSO_LOGIN_API = "/api/report/sso/login";
+
+    /**
+     * 分布式印刷api
+     */
+    public static final String TEACHCLOUD_PRINT_NOTIFY_ANALYSIS_PROGRESS_API = "/api/admin/print/notify/analysis/progress";
+    public static final String TEACHCLOUD_PRINT_OPEN_PAPER_CONFIG_API = "/api/admin/print/open/paper_config";
+    public static final String TEACHCLOUD_PRINT_OPEN_PAPER_DIMENSION_API = "/api/admin/print/open/paper_dimension";
+    public static final String TEACHCLOUD_PRINT_OPEN_PAPER_STRUCTURE_API = "/api/admin/print/open/paper_structure";
+    public static final String TEACHCLOUD_PRINT_OPEN_PAPER_EVALUATION_API = "/api/admin/print/open/paper_evaluation";
+    public static final String TEACHCLOUD_PRINT_OPEN_EXAM_STUDENT_SCORE_API = "/api/admin/print/open/exam_student_score";
+
+
+    /**
+     * 题库cas登录地址
+     */
+    public static final String QUESTION_CAS_ADMIN_LOGIN_OPEN_API = "/admin/login-open";
+
     /**
      * 系统常量
      */

teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/CasDomain.java

@@ -1,33 +0,0 @@
-package com.qmth.teachcloud.common.domain;
-
-import java.io.Serializable;
-
-/**
- * @Description: cas配置
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2020/4/10
- */
-public class CasDomain implements Serializable {
-
-    String questionHostUrl;
-
-    String questionLoginUri;
-
-    public String getQuestionHostUrl() {
-        return questionHostUrl;
-    }
-
-    public void setQuestionHostUrl(String questionHostUrl) {
-        this.questionHostUrl = questionHostUrl;
-    }
-
-    public String getQuestionLoginUri() {
-        return questionLoginUri;
-    }
-
-    public void setQuestionLoginUri(String questionLoginUri) {
-        this.questionLoginUri = questionLoginUri;
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/PrintOpenDomain.java

@@ -1,98 +0,0 @@
-package com.qmth.teachcloud.common.domain;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * @Description: 分布式印刷开放接口
- * @Author: wangliang
- * @Date: 2020/4/10
- */
-public class PrintOpenDomain implements Serializable {
-
-    String hostUrl;
-
-    String callbackUrlApi;
-
-    String callbackPwd;
-
-    @ApiModelProperty(value = "知学知考开放接口：试卷基础配置查询接口")
-    String paperConfig;
-
-    @ApiModelProperty(value = "知学知考开放接口：试卷考察点查询接口")
-    String paperDimension;
-
-    @ApiModelProperty(value = "知学知考开放接口：试卷蓝图查询接口")
-    String paperStructure;
-
-    @ApiModelProperty(value = "知学知考开放接口：试卷评价模型查询接口")
-    String paperEvaluation;
-
-    @ApiModelProperty(value = "知学知考开放接口：考生成绩查询接口")
-    String examStudentScore;
-
-    public String getHostUrl() {
-        return hostUrl;
-    }
-
-    public void setHostUrl(String hostUrl) {
-        this.hostUrl = hostUrl;
-    }
-
-    public String getCallbackUrlApi() {
-        return callbackUrlApi;
-    }
-
-    public void setCallbackUrlApi(String callbackUrlApi) {
-        this.callbackUrlApi = callbackUrlApi;
-    }
-
-    public String getCallbackPwd() {
-        return callbackPwd;
-    }
-
-    public void setCallbackPwd(String callbackPwd) {
-        this.callbackPwd = callbackPwd;
-    }
-
-    public String getPaperConfig() {
-        return paperConfig;
-    }
-
-    public void setPaperConfig(String paperConfig) {
-        this.paperConfig = paperConfig;
-    }
-
-    public String getPaperDimension() {
-        return paperDimension;
-    }
-
-    public void setPaperDimension(String paperDimension) {
-        this.paperDimension = paperDimension;
-    }
-
-    public String getPaperStructure() {
-        return paperStructure;
-    }
-
-    public void setPaperStructure(String paperStructure) {
-        this.paperStructure = paperStructure;
-    }
-
-    public String getPaperEvaluation() {
-        return paperEvaluation;
-    }
-
-    public void setPaperEvaluation(String paperEvaluation) {
-        this.paperEvaluation = paperEvaluation;
-    }
-
-    public String getExamStudentScore() {
-        return examStudentScore;
-    }
-
-    public void setExamStudentScore(String examStudentScore) {
-        this.examStudentScore = examStudentScore;
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/ReportOpenDomain.java

@@ -1,103 +0,0 @@
-package com.qmth.teachcloud.common.domain;
-
-import java.io.Serializable;
-
-/**
- * @Description: 分布式印刷开放接口
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2020/4/10
- */
-public class ReportOpenDomain implements Serializable {
-
-    String hostUrl;
-
-    String semesterApi;
-
-    String examApi;
-
-    String examDeleteApi;
-
-    String courseEditApi;
-
-    String courseDelApi;
-
-    String calculateApi;
-
-    String publishApi;
-
-    String ssoLoginApi;
-
-    public String getSsoLoginApi() {
-        return ssoLoginApi;
-    }
-
-    public void setSsoLoginApi(String ssoLoginApi) {
-        this.ssoLoginApi = ssoLoginApi;
-    }
-
-    public String getHostUrl() {
-        return hostUrl;
-    }
-
-    public void setHostUrl(String hostUrl) {
-        this.hostUrl = hostUrl;
-    }
-
-    public String getExamApi() {
-        return examApi;
-    }
-
-    public void setExamApi(String examApi) {
-        this.examApi = examApi;
-    }
-
-    public String getExamDeleteApi() {
-        return examDeleteApi;
-    }
-
-    public void setExamDeleteApi(String examDeleteApi) {
-        this.examDeleteApi = examDeleteApi;
-    }
-
-    public String getCourseEditApi() {
-        return courseEditApi;
-    }
-
-    public void setCourseEditApi(String courseEditApi) {
-        this.courseEditApi = courseEditApi;
-    }
-
-    public String getCourseDelApi() {
-        return courseDelApi;
-    }
-
-    public void setCourseDelApi(String courseDelApi) {
-        this.courseDelApi = courseDelApi;
-    }
-
-    public String getCalculateApi() {
-        return calculateApi;
-    }
-
-    public void setCalculateApi(String calculateApi) {
-        this.calculateApi = calculateApi;
-    }
-
-    public String getPublishApi() {
-        return publishApi;
-    }
-
-    public void setPublishApi(String publishApi) {
-        this.publishApi = publishApi;
-    }
-
-    public String getSemesterApi() {
-        return semesterApi;
-    }
-
-    public void setSemesterApi(String semesterApi) {
-        this.semesterApi = semesterApi;
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/SmsDomain.java

@@ -5,9 +5,9 @@ package com.qmth.teachcloud.common.domain;
  */
 public class SmsDomain {
 
-    String smsNormalCode;
-    Integer codeExpiredTime;
-    Integer codeSendInterval;
+//    String smsNormalCode;
+//    Integer codeExpiredTime;
+//    Integer codeSendInterval;
     String aliyunSMSKey;
     String aliyunSMSSecret;
     String aliyunSMSSignName;
@@ -27,29 +27,29 @@ public class SmsDomain {
     String aliyunSMSUploadStructureCode;
     String aliyunSMSAuditCopyUserCode;
 
-    public String getSmsNormalCode() {
-        return smsNormalCode;
-    }
-
-    public void setSmsNormalCode(String smsNormalCode) {
-        this.smsNormalCode = smsNormalCode;
-    }
-
-    public Integer getCodeExpiredTime() {
-        return codeExpiredTime;
-    }
-
-    public void setCodeExpiredTime(Integer codeExpiredTime) {
-        this.codeExpiredTime = codeExpiredTime;
-    }
-
-    public Integer getCodeSendInterval() {
-        return codeSendInterval;
-    }
-
-    public void setCodeSendInterval(Integer codeSendInterval) {
-        this.codeSendInterval = codeSendInterval;
-    }
+//    public String getSmsNormalCode() {
+//        return smsNormalCode;
+//    }
+//
+//    public void setSmsNormalCode(String smsNormalCode) {
+//        this.smsNormalCode = smsNormalCode;
+//    }
+//
+//    public Integer getCodeExpiredTime() {
+//        return codeExpiredTime;
+//    }
+//
+//    public void setCodeExpiredTime(Integer codeExpiredTime) {
+//        this.codeExpiredTime = codeExpiredTime;
+//    }
+//
+//    public Integer getCodeSendInterval() {
+//        return codeSendInterval;
+//    }
+//
+//    public void setCodeSendInterval(Integer codeSendInterval) {
+//        this.codeSendInterval = codeSendInterval;
+//    }
 
     public String getAliyunSMSKey() {
         return aliyunSMSKey;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/SyncDataDomain.java

@@ -1,167 +0,0 @@
-package com.qmth.teachcloud.common.domain;
-
-/**
- * @Description: 同步云阅卷参数
- */
-public class SyncDataDomain {
-
-    String hostUrl;
-
-    String examSaveUrl;
-
-    String studentSaveUrl;
-
-    String fileUploadUrl;
-
-    String queryPaperStructure;
-
-    String markLoginUrl;
-
-    String markLeaderLoginUrl;
-
-    String studentCountUrl;
-
-    String studentScoreUrl;
-
-    String structureUrl;
-
-    String userSaveUrl;
-
-    String groupSaveUrl;
-
-    String groupCountUrl;
-
-    String groupDeleteUrl;
-
-    String markerSaveUrl;
-
-    String markLeaderSaveUrl;
-
-    public String getHostUrl() {
-        return hostUrl;
-    }
-
-    public void setHostUrl(String hostUrl) {
-        this.hostUrl = hostUrl;
-    }
-
-    public String getExamSaveUrl() {
-        return examSaveUrl;
-    }
-
-    public void setExamSaveUrl(String examSaveUrl) {
-        this.examSaveUrl = examSaveUrl;
-    }
-
-    public String getStudentSaveUrl() {
-        return studentSaveUrl;
-    }
-
-    public void setStudentSaveUrl(String studentSaveUrl) {
-        this.studentSaveUrl = studentSaveUrl;
-    }
-
-    public String getFileUploadUrl() {
-        return fileUploadUrl;
-    }
-
-    public void setFileUploadUrl(String fileUploadUrl) {
-        this.fileUploadUrl = fileUploadUrl;
-    }
-
-    public String getQueryPaperStructure() {
-        return queryPaperStructure;
-    }
-
-    public void setQueryPaperStructure(String queryPaperStructure) {
-        this.queryPaperStructure = queryPaperStructure;
-    }
-
-    public String getMarkLoginUrl() {
-        return markLoginUrl;
-    }
-
-    public void setMarkLoginUrl(String markLoginUrl) {
-        this.markLoginUrl = markLoginUrl;
-    }
-
-    public String getStudentCountUrl() {
-        return studentCountUrl;
-    }
-
-    public void setStudentCountUrl(String studentCountUrl) {
-        this.studentCountUrl = studentCountUrl;
-    }
-
-    public String getStudentScoreUrl() {
-        return studentScoreUrl;
-    }
-
-    public void setStudentScoreUrl(String studentScoreUrl) {
-        this.studentScoreUrl = studentScoreUrl;
-    }
-
-    public String getStructureUrl() {
-        return structureUrl;
-    }
-
-    public void setStructureUrl(String structureUrl) {
-        this.structureUrl = structureUrl;
-    }
-
-    public String getUserSaveUrl() {
-        return userSaveUrl;
-    }
-
-    public void setUserSaveUrl(String userSaveUrl) {
-        this.userSaveUrl = userSaveUrl;
-    }
-
-    public String getMarkLeaderLoginUrl() {
-        return markLeaderLoginUrl;
-    }
-
-    public void setMarkLeaderLoginUrl(String markLeaderLoginUrl) {
-        this.markLeaderLoginUrl = markLeaderLoginUrl;
-    }
-
-    public String getGroupSaveUrl() {
-        return groupSaveUrl;
-    }
-
-    public void setGroupSaveUrl(String groupSaveUrl) {
-        this.groupSaveUrl = groupSaveUrl;
-    }
-
-    public String getGroupCountUrl() {
-        return groupCountUrl;
-    }
-
-    public void setGroupCountUrl(String groupCountUrl) {
-        this.groupCountUrl = groupCountUrl;
-    }
-
-    public String getGroupDeleteUrl() {
-        return groupDeleteUrl;
-    }
-
-    public void setGroupDeleteUrl(String groupDeleteUrl) {
-        this.groupDeleteUrl = groupDeleteUrl;
-    }
-
-    public String getMarkerSaveUrl() {
-        return markerSaveUrl;
-    }
-
-    public void setMarkerSaveUrl(String markerSaveUrl) {
-        this.markerSaveUrl = markerSaveUrl;
-    }
-
-    public String getMarkLeaderSaveUrl() {
-        return markLeaderSaveUrl;
-    }
-
-    public void setMarkLeaderSaveUrl(String markLeaderSaveUrl) {
-        this.markLeaderSaveUrl = markLeaderSaveUrl;
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/SysDomain.java

@@ -1,8 +1,6 @@
 package com.qmth.teachcloud.common.domain;
 
 import java.io.Serializable;
-import java.time.Duration;
-import java.util.List;
 
 /**
  * @Description: 系统配置
@@ -33,27 +31,27 @@ public class SysDomain implements Serializable {
 //
 //    boolean customThreadPoolCoreSize;
 
-    String reportUrl;
+//    String reportUrl;
 
 //    Duration sessionActive;
 
-    String loginAuthenUrl;
+//    String loginAuthenUrl;
 
-    public String getLoginAuthenUrl() {
-        return loginAuthenUrl;
-    }
-
-    public void setLoginAuthenUrl(String loginAuthenUrl) {
-        this.loginAuthenUrl = loginAuthenUrl;
-    }
-
-    public String getReportUrl() {
-        return reportUrl;
-    }
-
-    public void setReportUrl(String reportUrl) {
-        this.reportUrl = reportUrl;
-    }
+//    public String getLoginAuthenUrl() {
+//        return loginAuthenUrl;
+//    }
+//
+//    public void setLoginAuthenUrl(String loginAuthenUrl) {
+//        this.loginAuthenUrl = loginAuthenUrl;
+//    }
+//
+//    public String getReportUrl() {
+//        return reportUrl;
+//    }
+//
+//    public void setReportUrl(String reportUrl) {
+//        this.reportUrl = reportUrl;
+//    }
 
     public String getHtmlToPdfUrl() {
         return htmlToPdfUrl;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/YunMarkDomain.java

@@ -1,39 +0,0 @@
-package com.qmth.teachcloud.common.domain;
-
-import java.io.Serializable;
-
-/**
- * @Description: 系统配置
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2020/4/10
- */
-public class YunMarkDomain implements Serializable {
-
-    private static final long serialVersionUID = 7510626406622200443L;
-
-    private String url;
-
-    private String studentScoreApi;
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getStudentScoreApi() {
-        return studentScoreApi;
-    }
-
-    public void setStudentScoreApi(String studentScoreApi) {
-        this.studentScoreApi = studentScoreApi;
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicVerifyCodeServiceImpl.java

@@ -55,7 +55,9 @@ public class BasicVerifyCodeServiceImpl extends ServiceImpl<BasicVerifyCodeMappe
         BasicVerifyCode basicVerifyCode = this.getOne(wrapper);
         if (basicVerifyCode != null) {
             Date oldCreateTime = new Date(basicVerifyCode.getCreateTime());
-            Integer sendInterval = dictionaryConfig.smsDomain().getCodeSendInterval();
+            //TODO 短信验证码发送间隔待完善
+//            Integer sendInterval = dictionaryConfig.smsDomain().getCodeSendInterval();
+            Integer sendInterval = null;
             if ((System.currentTimeMillis() - oldCreateTime.getTime()) < sendInterval * 1000) {
                 throw ExceptionResultEnum.ERROR.exception("发送验证码过于频繁，请" + sendInterval + "秒之后再试");
             }
@@ -97,7 +99,9 @@ public class BasicVerifyCodeServiceImpl extends ServiceImpl<BasicVerifyCodeMappe
             SendSmsResponse sendSmsResponse = acsClient.getAcsResponse(request);
             if (sendSmsResponse.getCode() != null && sendSmsResponse.getCode().equals("OK")) {
                 // 请求成功
-                Integer codeExpiredTime = dictionaryConfig.smsDomain().getCodeExpiredTime();
+                //TODO 短信验证码有效时间待完善
+//                Integer codeExpiredTime = dictionaryConfig.smsDomain().getCodeExpiredTime();
+                Integer codeExpiredTime = null;
                 if (basicVerifyCode == null) {
                     basicVerifyCode = new BasicVerifyCode();
                     basicVerifyCode.setUserId(sysUser.getId());
@@ -118,9 +122,9 @@ public class BasicVerifyCodeServiceImpl extends ServiceImpl<BasicVerifyCodeMappe
                     this.updateById(basicVerifyCode);
                 }
             } else {
-                if("isv.MOBILE_NUMBER_ILLEGAL".equals(sendSmsResponse.getCode())){
+                if ("isv.MOBILE_NUMBER_ILLEGAL".equals(sendSmsResponse.getCode())) {
                     throw ExceptionResultEnum.ERROR.exception("非法手机号");
-                }else {
+                } else {
                     throw ExceptionResultEnum.ERROR.exception(sendSmsResponse.getMessage());
                 }
             }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysUserServiceImpl.java

@@ -258,9 +258,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             }
         }
         // 如果不是共用验证码 再过期
-        if (Objects.nonNull(verifyCode) && !dictionaryConfig.smsDomain().getSmsNormalCode().equals(verifyCode)) {
+        //TODO 万能短信验证码待完善
+//        if (Objects.nonNull(verifyCode) && !dictionaryConfig.smsDomain().getSmsNormalCode().equals(verifyCode)) {
             sysUserService.expiredVerifyCode(sysUser.getId(), sysUser.getMobileNumber());
-        }
+//        }
 
         // 登录
         BasicSchool basicSchool;
@@ -312,7 +313,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             throw ExceptionResultEnum.ERROR.exception("用户学校不匹配");
         }
         // 校验验证码
-        sysUserService.checkSmsCode(sysUser.getId(), sysUser.getMobileNumber(), dictionaryConfig.smsDomain().getSmsNormalCode());
+        // TODO 万能短信验证码待完善
+//        sysUserService.checkSmsCode(sysUser.getId(), sysUser.getMobileNumber(), dictionaryConfig.smsDomain().getSmsNormalCode());
 
         return teachcloudCommonService.login(sysUser.getPassword(), sysUser, AppSourceEnum.SYSTEM);
     }
@@ -786,7 +788,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             if (Objects.isNull(code)) {
                 throw ExceptionResultEnum.ERROR.exception("验证码为空");
             }
-            if (!dictionaryConfig.smsDomain().getSmsNormalCode().equals(code)) {
+            //TODO 万能短信验证码待完善
+//            if (!dictionaryConfig.smsDomain().getSmsNormalCode().equals(code)) {
                 List<VerifyCodeCheckDto> verifyCodeCheckDtoList = this.baseMapper.findVerifyCodeByUser(userId, mobileNumber);
                 if (verifyCodeCheckDtoList.size() < 1) {
                     throw ExceptionResultEnum.ERROR.exception("请确认已经发送了验证码");
@@ -799,7 +802,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 if (new Date(accessControl.getExpireTime()).before(new Date())) {
                     throw ExceptionResultEnum.ERROR.exception("短信验证码已过期");
                 }
-            }
+//            }
         }
     }
 

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

@@ -71,8 +71,10 @@ public class CloudMarkingTaskUtils {
      * @return 考试ID
      */
     public Long syncExam(Long schoolId, String code, String name, String examTime) {
-        String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
-        String examSaveUrl = dictionaryConfig.syncDataDomain().getExamSaveUrl();
+//        TODO 云阅卷地址待完善
+//        String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
+        String hostUrl = null;
+        String examSaveUrl = SystemConstant.CLOUD_MARK_EXAM_SAVE_API;
         validUrl(hostUrl, examSaveUrl);
         String postUrl = hostUrl.concat(examSaveUrl);
         //参数
@@ -103,9 +105,10 @@ public class CloudMarkingTaskUtils {
         Boolean enable = userPushParam.getEnable();
         Long schoolId = userPushParam.getSchoolId();
 
-
-        String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
-        String userSaveUrl = dictionaryConfig.syncDataDomain().getUserSaveUrl();
+//        TODO 云阅卷地址待完善
+//        String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
+        String hostUrl = null;
+        String userSaveUrl = SystemConstant.CLOUD_MARK_USER_EXTERNAL_SAVE_API;
         String postUrl = hostUrl.concat(userSaveUrl);
         // 参数
         Map<String, Object> map = new HashMap<>();
@@ -154,8 +157,10 @@ public class CloudMarkingTaskUtils {
     public boolean syncStudent(Long schoolId, String examId, String examNumber, String studentCode, String name, String college,
                                String className, String teacher, String subjectCode, String subjectName,
                                String packageCode, String paperType, String examSite, String examRoom) {
-        String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
-        String studentSaveUrl = dictionaryConfig.syncDataDomain().getStudentSaveUrl();
+//        TODO 云阅卷地址待完善
+//        String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
+        String hostUrl = null;
+        String studentSaveUrl = SystemConstant.CLOUD_MARK_EXAM_STUDENT_SAVE_API;
         validUrl(hostUrl, studentSaveUrl);
         String postUrl = hostUrl.concat(studentSaveUrl);
         try {
@@ -197,8 +202,10 @@ public class CloudMarkingTaskUtils {
      * @param file        文件
      */
     public String syncFile(Long schoolId, String examId, String subjectCode, SyncFileTypeEnum type, File file) {
-        String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
-        String fileUploadUrl = dictionaryConfig.syncDataDomain().getFileUploadUrl();
+        //TODO 云阅卷地址待完善
+        //String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
+        String hostUrl = null;
+        String fileUploadUrl = SystemConstant.CLOUD_MARK_FILE_UPLOAD_API;
         validUrl(hostUrl, fileUploadUrl);
         fileUploadUrl = fileUploadUrl.replace("{type}", type.name().toLowerCase());
         String postUrl = hostUrl.concat(fileUploadUrl);
@@ -263,8 +270,10 @@ public class CloudMarkingTaskUtils {
      */
     public boolean syncPaperStructure(Long schoolId, String examId, String subjectCode, Boolean objective,
                                       String paperType, List<QuestionDTO> questions) {
-        String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
-        String structureUrl = dictionaryConfig.syncDataDomain().getStructureUrl();
+        //TODO 云阅卷地址待完善
+        //String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
+        String hostUrl = null;
+        String structureUrl = SystemConstant.CLOUD_MARK_EXAM_PAPER_SAVE_API;
         validUrl(hostUrl, structureUrl);
         String postUrl = hostUrl.concat(structureUrl);
         try {
@@ -295,8 +304,10 @@ public class CloudMarkingTaskUtils {
      * @param paperType   试卷编号
      */
     public String queryPaperStructure(Long schoolId, String examId, String subjectCode, String paperType) {
-        String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
-        String queryPaperStructure = dictionaryConfig.syncDataDomain().getQueryPaperStructure();
+        //TODO 云阅卷地址待完善
+        //String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
+        String hostUrl = null;
+        String queryPaperStructure = SystemConstant.CLOUD_MARK_EXAM_PAPER_QUERY_API;
         validUrl(hostUrl, queryPaperStructure);
         String postUrl = hostUrl.concat(queryPaperStructure);
         try {
@@ -321,8 +332,10 @@ public class CloudMarkingTaskUtils {
      * @param groups      试卷结构JSON
      */
     public boolean saveMarkerGroup(Long schoolId, String examId, String subjectCode, Integer trialCount, List<GroupDetailDTO> groups) {
-        String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
-        String groupSaveUrl = dictionaryConfig.syncDataDomain().getGroupSaveUrl();
+        //TODO 云阅卷地址待完善
+        //String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
+        String hostUrl = null;
+        String groupSaveUrl = SystemConstant.CLOUD_MARK_EXAM_MARK_GROUP_SAVE_API;
         validUrl(hostUrl, groupSaveUrl);
         String postUrl = hostUrl.concat(groupSaveUrl);
         try {
@@ -351,8 +364,10 @@ public class CloudMarkingTaskUtils {
      * @param subjectCode 科目代码
      */
     public int countGroup(Long schoolId, String examId, String subjectCode) {
-        String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
-        String groupCountUrl = dictionaryConfig.syncDataDomain().getGroupCountUrl();
+        //TODO 云阅卷地址待完善
+        //String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
+        String hostUrl = null;
+        String groupCountUrl = SystemConstant.CLOUD_MARK_EXAM_MARK_GROUP_COUNT_API;
         validUrl(hostUrl, groupCountUrl);
         String postUrl = hostUrl.concat(groupCountUrl);
         try {
@@ -380,8 +395,10 @@ public class CloudMarkingTaskUtils {
      * @param subjectCode 科目代码
      */
     public boolean deleteGroup(Long schoolId, String examId, String subjectCode) {
-        String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
-        String groupDeleteUrl = dictionaryConfig.syncDataDomain().getGroupDeleteUrl();
+        //TODO 云阅卷地址待完善
+        //String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
+        String hostUrl = null;
+        String groupDeleteUrl = SystemConstant.CLOUD_MARK_EXAM_MARK_GROUP_DELETE_API;
         validUrl(hostUrl, groupDeleteUrl);
         String postUrl = hostUrl.concat(groupDeleteUrl);
         try {
@@ -408,8 +425,10 @@ public class CloudMarkingTaskUtils {
      * @param loginName   用户名
      */
     public boolean saveMarker(Long schoolId, String examId, String subjectCode, Integer groupNumber, String loginName) {
-        String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
-        String markerSaveUrl = dictionaryConfig.syncDataDomain().getMarkerSaveUrl();
+        //TODO 云阅卷地址待完善
+        //String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
+        String hostUrl = null;
+        String markerSaveUrl = SystemConstant.CLOUD_MARK_EXAM_MARKER_SAVE_API;
         validUrl(hostUrl, markerSaveUrl);
         String postUrl = hostUrl.concat(markerSaveUrl);
         try {
@@ -436,8 +455,10 @@ public class CloudMarkingTaskUtils {
      * @param loginName   用户名
      */
     public boolean saveMarkLeader(Long schoolId, String subjectCode, String loginName) {
-        String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
-        String markLeaderSaveUrl = dictionaryConfig.syncDataDomain().getMarkLeaderSaveUrl();
+        //TODO 云阅卷地址待完善
+        //String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
+        String hostUrl = null;
+        String markLeaderSaveUrl = SystemConstant.CLOUD_MARK_EXAM_SUBJECT_HEADER_SAVE_API;
         validUrl(hostUrl, markLeaderSaveUrl);
         String postUrl = hostUrl.concat(markLeaderSaveUrl);
         try {
@@ -458,7 +479,7 @@ public class CloudMarkingTaskUtils {
      * 评卷员登录
      */
     public Map<String, Object> markLogin(SysUser sysUser) {
-        String markLoginUrl = dictionaryConfig.syncDataDomain().getMarkLoginUrl();
+        String markLoginUrl = SystemConstant.CLOUD_MARK_OPEN_MARK_LOGIN_API;
         try {
             //参数
             return openLogin(sysUser, markLoginUrl, MARKER_PREFIX);
@@ -471,7 +492,7 @@ public class CloudMarkingTaskUtils {
      * 科组长登录
      */
     public Map<String, Object> markLeaderLogin(SysUser sysUser) {
-        String markLeaderLoginUrl = dictionaryConfig.syncDataDomain().getMarkLeaderLoginUrl();
+        String markLeaderLoginUrl = SystemConstant.CLOUD_MARK_OPEN_SUBJECT_HEADER_LOGIN_API;
         try {
             //参数
             return openLogin(sysUser, markLeaderLoginUrl, MARKER_LEADER_PREFIX);
@@ -487,7 +508,9 @@ public class CloudMarkingTaskUtils {
      * @param prefix   账号前缀
      */
     private Map<String, Object> openLogin(SysUser sysUser, String loginUrl, String prefix) {
-        String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
+        //TODO 云阅卷地址待完善
+        //String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
+        String hostUrl = null;
         validUrl(hostUrl, loginUrl);
         String postUrl = hostUrl.concat(loginUrl);
 
@@ -643,8 +666,10 @@ public class CloudMarkingTaskUtils {
         map.put("examId", validParam(String.valueOf(examId), null, true, "考试ID"));
         map.put("withMarkTrack", validParam(withMarkTrack, true, false, "评分标记"));
 
-        String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
-        String studentCountUrl = dictionaryConfig.syncDataDomain().getStudentCountUrl();
+        //TODO 云阅卷地址待完善
+        //String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
+        String hostUrl = null;
+        String studentCountUrl = SystemConstant.CLOUD_MARK_EXAM_STUDENT_COUNT_API;
         validUrl(hostUrl, studentCountUrl);
         String postUrl = hostUrl.concat(studentCountUrl);
 
@@ -688,8 +713,10 @@ public class CloudMarkingTaskUtils {
         map.put("pageNumber", validParam(String.valueOf(pageNo), null, true, "页码"));
         map.put("pageSize", validParam(String.valueOf(pageSize), null, true, "数量"));
 
-        String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
-        String studentScoreUrl = dictionaryConfig.syncDataDomain().getStudentScoreUrl();
+        //TODO 云阅卷地址待完善
+        //String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
+        String hostUrl = null;
+        String studentScoreUrl = SystemConstant.CLOUD_MARK_EXAM_STUDENT_SCORE_API;
         validUrl(hostUrl, studentScoreUrl);
         String postUrl = hostUrl.concat(studentScoreUrl);
         //请求

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

@@ -50,13 +50,15 @@ public class TeachCloudReportTaskUtils {
      * @param enable          启用/禁用，ture：启用，false：禁用，默认启用
      */
     public Long syncSemester(Long schoolId, Long thirdSemesterId, String semesterName, Long startTime, Long endTime, Boolean enable) {
-        String hostUrl = dictionaryConfig.reportOpenDomain().getHostUrl();
+        //TODO 教研分析地址待完善
+//        String hostUrl = dictionaryConfig.reportOpenDomain().getHostUrl();
+        String hostUrl = null;
         Optional.ofNullable(hostUrl).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置教研分析host"));
         BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);
         if (hostUrl.contains("*")) {
             hostUrl = hostUrl.replace("*", basicSchool.getCode());
         }
-        String saveUrl = dictionaryConfig.reportOpenDomain().getSemesterApi();
+        String saveUrl = SystemConstant.TEACHCLOUD_REPORT_OPEN_SEMESTER_EDIT_API;
         validUrl(hostUrl, saveUrl);
         String postUrl = hostUrl.concat(saveUrl);
         long timestamp = System.currentTimeMillis();
@@ -98,13 +100,15 @@ public class TeachCloudReportTaskUtils {
      * @param enable     启用/禁用，ture：启用，false：禁用，默认启用
      */
     public Long syncExam(Long schoolId, Long id, String examName, Long examTime, String semesterId, Boolean enable) {
-        String hostUrl = dictionaryConfig.reportOpenDomain().getHostUrl();
+        //TODO 教研分析地址待完善
+//      String hostUrl = dictionaryConfig.reportOpenDomain().getHostUrl();
+        String hostUrl = null;
         Optional.ofNullable(hostUrl).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置教研分析host"));
         BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);
         if (hostUrl.contains("*")) {
             hostUrl = hostUrl.replace("*", basicSchool.getCode());
         }
-        String saveUrl = dictionaryConfig.reportOpenDomain().getExamApi();
+        String saveUrl = SystemConstant.TEACHCLOUD_REPORT_OPEN_EXAM_EDIT_API;
         validUrl(hostUrl, saveUrl);
         String postUrl = hostUrl.concat(saveUrl);
         long timestamp = System.currentTimeMillis();
@@ -137,18 +141,21 @@ public class TeachCloudReportTaskUtils {
 
     /**
      * 同步删除排批次（考试）
+     *
      * @param schoolId 学校id
-     * @param id 第三方id
+     * @param id       第三方id
      * @return 结果
      */
     public Boolean syncDeleteExam(Long schoolId, Long id) {
-        String hostUrl = dictionaryConfig.reportOpenDomain().getHostUrl();
+        //TODO 教研分析地址待完善
+//        String hostUrl = dictionaryConfig.reportOpenDomain().getHostUrl();
+        String hostUrl = null;
         Optional.ofNullable(hostUrl).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置教研分析host"));
         BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);
         if (hostUrl.contains("*")) {
             hostUrl = hostUrl.replace("*", basicSchool.getCode());
         }
-        String saveUrl = dictionaryConfig.reportOpenDomain().getExamDeleteApi();
+        String saveUrl = SystemConstant.TEACHCLOUD_REPORT_OPEN_EXAM_DELETE_API;
         validUrl(hostUrl, saveUrl);
         String postUrl = hostUrl.concat(saveUrl);
         long timestamp = System.currentTimeMillis();
@@ -186,13 +193,15 @@ public class TeachCloudReportTaskUtils {
      */
     public boolean syncCourse(Long schoolId, String examId, String courseCode, String courseName,
                               String paperType, String teachCollegeName, Boolean enable) {
-        String hostUrl = dictionaryConfig.reportOpenDomain().getHostUrl();
+        //TODO 教研分析地址待完善
+//        String hostUrl = dictionaryConfig.reportOpenDomain().getHostUrl();
+        String hostUrl = null;
         Optional.ofNullable(hostUrl).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置教研分析host"));
         BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);
         if (hostUrl.contains("*")) {
             hostUrl = hostUrl.replace("*", basicSchool.getCode());
         }
-        String saveUrl = dictionaryConfig.reportOpenDomain().getCourseEditApi();
+        String saveUrl = SystemConstant.TEACHCLOUD_REPORT_OPEN_COURSE_EDIT_API;
         validUrl(hostUrl, saveUrl);
         String postUrl = hostUrl.concat(saveUrl);
         long timestamp = System.currentTimeMillis();
@@ -231,13 +240,15 @@ public class TeachCloudReportTaskUtils {
      * @param courseCodes 分析试卷的唯一标识
      */
     public boolean startCalc(Long schoolId, Long examId, List<String> courseCodes) {
-        String hostUrl = dictionaryConfig.reportOpenDomain().getHostUrl();
+        //TODO 教研分析地址待完善
+//        String hostUrl = dictionaryConfig.reportOpenDomain().getHostUrl();
+        String hostUrl = null;
         Optional.ofNullable(hostUrl).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置教研分析host"));
         BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);
         if (hostUrl.contains("*")) {
             hostUrl = hostUrl.replace("*", basicSchool.getCode());
         }
-        String saveUrl = dictionaryConfig.reportOpenDomain().getCalculateApi();
+        String saveUrl = SystemConstant.TEACHCLOUD_REPORT_OPEN_CALCULATE_API;
         validUrl(hostUrl, saveUrl);
         String postUrl = hostUrl.concat(saveUrl);
         long timestamp = System.currentTimeMillis();
@@ -276,13 +287,15 @@ public class TeachCloudReportTaskUtils {
      * @return
      */
     public boolean publish(Long schoolId, Long thirdExamId, String gradeCourseCode, boolean publishStatus) {
-        String hostUrl = dictionaryConfig.reportOpenDomain().getHostUrl();
+        //TODO 教研分析地址待完善
+//        String hostUrl = dictionaryConfig.reportOpenDomain().getHostUrl();
+        String hostUrl = null;
         Optional.ofNullable(hostUrl).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置教研分析host"));
         BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);
         if (hostUrl.contains("*")) {
             hostUrl = hostUrl.replace("*", basicSchool.getCode());
         }
-        String saveUrl = dictionaryConfig.reportOpenDomain().getPublishApi();
+        String saveUrl = SystemConstant.TEACHCLOUD_REPORT_OPEN_PUBLISH_API;
         validUrl(hostUrl, saveUrl);
         String postUrl = hostUrl.concat(saveUrl);
         long timestamp = System.currentTimeMillis();

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/CallPrintOpenApiServiceImpl.java

@@ -32,6 +32,7 @@ import java.util.Optional;
  */
 @Service
 public class CallPrintOpenApiServiceImpl implements CallPrintOpenApiService {
+
     @Resource
     CommonCacheService commonCacheService;
 
@@ -49,14 +50,16 @@ public class CallPrintOpenApiServiceImpl implements CallPrintOpenApiService {
         printOpenParams.put("gradeCourseCode", gradeCourseCode);
         long timestamp = System.currentTimeMillis();
 
-        String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, dictionaryConfig.printOpenDomain().getPaperConfig(), timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
+        String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, SystemConstant.TEACHCLOUD_PRINT_OPEN_PAPER_CONFIG_API, timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
 
-        String hostUrl = dictionaryConfig.printOpenDomain().getHostUrl();
+        //TODO 分布式印刷地址待完善
+//        String hostUrl = dictionaryConfig.printOpenDomain().getHostUrl();
+        String hostUrl = null;
         Optional.ofNullable(hostUrl).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置知学知考host"));
         if (hostUrl.contains("*")) {
             hostUrl = hostUrl.replace("*", basicSchool.getCode());
         }
-        String callResult = HttpUtil.postJson(hostUrl + dictionaryConfig.printOpenDomain().getPaperConfig(), JacksonUtil.parseJson(printOpenParams), accessToken, timestamp);
+        String callResult = HttpUtil.postJson(hostUrl + SystemConstant.TEACHCLOUD_PRINT_OPEN_PAPER_CONFIG_API, JacksonUtil.parseJson(printOpenParams), accessToken, timestamp);
         PaperConfig paperConfig = new PaperConfig();
         if (Objects.nonNull(callResult)) {
             log.info("callResult:{}", JacksonUtil.parseJson(callResult));
@@ -76,13 +79,15 @@ public class CallPrintOpenApiServiceImpl implements CallPrintOpenApiService {
         printOpenParams.put("gradeCourseCode", gradeCourseCode);
         long timestamp = System.currentTimeMillis();
 
-        String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, dictionaryConfig.printOpenDomain().getPaperDimension(), timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
-        String hostUrl = dictionaryConfig.printOpenDomain().getHostUrl();
+        String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, SystemConstant.TEACHCLOUD_PRINT_OPEN_PAPER_DIMENSION_API, timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
+        //TODO 分布式印刷地址待完善
+//        String hostUrl = dictionaryConfig.printOpenDomain().getHostUrl();
+        String hostUrl = null;
         Optional.ofNullable(hostUrl).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置知学知考host"));
         if (hostUrl.contains("*")) {
             hostUrl = hostUrl.replace("*", basicSchool.getCode());
         }
-        String callResult = HttpUtil.postJson(hostUrl + dictionaryConfig.printOpenDomain().getPaperDimension(), JacksonUtil.parseJson(printOpenParams), accessToken, timestamp);
+        String callResult = HttpUtil.postJson(hostUrl + SystemConstant.TEACHCLOUD_PRINT_OPEN_PAPER_DIMENSION_API, JacksonUtil.parseJson(printOpenParams), accessToken, timestamp);
         List<PaperDimension> paperDimensionList = new ArrayList<>();
         if (Objects.nonNull(callResult)) {
             log.info("callResult:{}", JacksonUtil.parseJson(callResult));
@@ -102,13 +107,15 @@ public class CallPrintOpenApiServiceImpl implements CallPrintOpenApiService {
         printOpenParams.put("gradeCourseCode", gradeCourseCode);
         long timestamp = System.currentTimeMillis();
 
-        String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, dictionaryConfig.printOpenDomain().getPaperStructure(), timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
-        String hostUrl = dictionaryConfig.printOpenDomain().getHostUrl();
+        String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, SystemConstant.TEACHCLOUD_PRINT_OPEN_PAPER_STRUCTURE_API, timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
+        //TODO 分布式印刷地址待完善
+//        String hostUrl = dictionaryConfig.printOpenDomain().getHostUrl();
+        String hostUrl = null;
         Optional.ofNullable(hostUrl).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置知学知考host"));
         if (hostUrl.contains("*")) {
             hostUrl = hostUrl.replace("*", basicSchool.getCode());
         }
-        String callResult = HttpUtil.postJson(hostUrl + dictionaryConfig.printOpenDomain().getPaperStructure(), JacksonUtil.parseJson(printOpenParams), accessToken, timestamp);
+        String callResult = HttpUtil.postJson(hostUrl + SystemConstant.TEACHCLOUD_PRINT_OPEN_PAPER_STRUCTURE_API, JacksonUtil.parseJson(printOpenParams), accessToken, timestamp);
         List<PaperStructure> paperStructureList = new ArrayList<>();
         if (Objects.nonNull(callResult)) {
             log.info("callResult:{}", JacksonUtil.parseJson(callResult));
@@ -128,13 +135,15 @@ public class CallPrintOpenApiServiceImpl implements CallPrintOpenApiService {
         printOpenParams.put("gradeCourseCode", gradeCourseCode);
         long timestamp = System.currentTimeMillis();
 
-        String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, dictionaryConfig.printOpenDomain().getPaperEvaluation(), timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
-        String hostUrl = dictionaryConfig.printOpenDomain().getHostUrl();
+        String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, SystemConstant.TEACHCLOUD_PRINT_OPEN_PAPER_EVALUATION_API, timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
+        //TODO 分布式印刷地址待完善
+//        String hostUrl = dictionaryConfig.printOpenDomain().getHostUrl();
+        String hostUrl = null;
         Optional.ofNullable(hostUrl).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置知学知考host"));
         if (hostUrl.contains("*")) {
             hostUrl = hostUrl.replace("*", basicSchool.getCode());
         }
-        String callResult = HttpUtil.postJson(hostUrl + dictionaryConfig.printOpenDomain().getPaperEvaluation(), JacksonUtil.parseJson(printOpenParams), accessToken, timestamp);
+        String callResult = HttpUtil.postJson(hostUrl + SystemConstant.TEACHCLOUD_PRINT_OPEN_PAPER_EVALUATION_API, JacksonUtil.parseJson(printOpenParams), accessToken, timestamp);
         List<PaperEvaluation> paperEvaluationList = new ArrayList<>();
         if (Objects.nonNull(callResult)) {
             log.info("callResult:{}", JacksonUtil.parseJson(callResult));
@@ -155,7 +164,9 @@ public class CallPrintOpenApiServiceImpl implements CallPrintOpenApiService {
         printOpenParams.put("pageSize", 100);
         List<ExamStudentScore> examStudentScoreList = new ArrayList<>();
         List<ExamStudentScore> examStudentScoreCell = new ArrayList<>();
-        String hostUrl = dictionaryConfig.printOpenDomain().getHostUrl();
+        //TODO 分布式印刷地址待完善
+//        String hostUrl = dictionaryConfig.printOpenDomain().getHostUrl();
+        String hostUrl = null;
         Optional.ofNullable(hostUrl).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置知学知考host"));
         if (hostUrl.contains("*")) {
             hostUrl = hostUrl.replace("*", basicSchool.getCode());
@@ -165,12 +176,12 @@ public class CallPrintOpenApiServiceImpl implements CallPrintOpenApiService {
         do {
             printOpenParams.put("pageNumber", pageNumber);
             long timestamp = System.currentTimeMillis();
-            String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, dictionaryConfig.printOpenDomain().getExamStudentScore(), timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
-            String callResult = HttpUtil.postJson(hostUrl + dictionaryConfig.printOpenDomain().getExamStudentScore(), JacksonUtil.parseJson(printOpenParams), accessToken, timestamp);
+            String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, SystemConstant.TEACHCLOUD_PRINT_OPEN_EXAM_STUDENT_SCORE_API, timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
+            String callResult = HttpUtil.postJson(hostUrl + SystemConstant.TEACHCLOUD_PRINT_OPEN_EXAM_STUDENT_SCORE_API, JacksonUtil.parseJson(printOpenParams), accessToken, timestamp);
             if (Objects.nonNull(callResult)) {
                 log.info("callResult:{}", JacksonUtil.parseJson(callResult));
                 Result result = JSON.parseObject(callResult, Result.class);
-                if (result.getData() == null){
+                if (result.getData() == null) {
                     throw ExceptionResultEnum.ERROR.exception(result.getMessage());
                 }
                 Object data = result.getData();

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/NewCallApiServiceImpl.java

@@ -45,7 +45,9 @@ public class NewCallApiServiceImpl implements NewCallApiService {
      */
     @Override
     public List<Map> callStudentScore(Long examId, String examCode) throws IOException {
-        String url = dictionaryConfig.yunMarkDomain().getUrl() + dictionaryConfig.yunMarkDomain().getStudentScoreApi();
+        //TODO 云阅卷地址待完善
+        //String url = dictionaryConfig.yunMarkDomain().getUrl() + dictionaryConfig.yunMarkDomain().getStudentScoreApi();
+        String url = null;
         Map<String, Object> params = new HashMap<>();
         if (Objects.nonNull(examId)) {
             params.put("examId", examId);
@@ -63,7 +65,7 @@ public class NewCallApiServiceImpl implements NewCallApiService {
             params.put("pageNumber", pageNumber);
             params.put("pageSize", pageSize);
             Long timestamp = System.currentTimeMillis();
-            String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, dictionaryConfig.yunMarkDomain().getStudentScoreApi(), timestamp, tbCloudExam.getAccessKey(), tbCloudExam.getAccessSecret());
+            String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, SystemConstant.CLOUD_MARK_EXAM_STUDENT_SCORE_API, timestamp, tbCloudExam.getAccessKey(), tbCloudExam.getAccessSecret());
             String result = HttpUtil.post(url, params, accessToken, timestamp);
             result = StringEscapeUtils.unescapeHtml4(result);
             if (Objects.nonNull(result)) {

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/templete/strategy/CalculateTaskTemplate.java

@@ -21,7 +21,6 @@ import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
-import java.net.URLEncoder;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -150,14 +149,18 @@ public abstract class CalculateTaskTemplate {
         jsonObject.put("result", tbSyncTask.getResult());
         jsonObject.put("time", time);
 
-        String sign = URLEncoder.encode(Base64Util.encode(ShaUtils.sha1(dictionaryConfig.printOpenDomain().getCallbackPwd() + jsonObject.toJSONString())), SystemConstant.CHARSET_NAME);
-        String hostUrl = dictionaryConfig.printOpenDomain().getHostUrl();
+        //TODO 分布式印刷回调密码待完善
+//        String sign = URLEncoder.encode(Base64Util.encode(ShaUtils.sha1(dictionaryConfig.printOpenDomain().getCallbackPwd() + jsonObject.toJSONString())), SystemConstant.CHARSET_NAME);
+        String sign = null;
+        //TODO 分布式印刷地址待完善
+//        String hostUrl = dictionaryConfig.printOpenDomain().getHostUrl();
+        String hostUrl = null;
         BasicSchool basicSchool = commonCacheService.schoolCache(calculateParams.getSchoolId());
         if (hostUrl.contains("*")) {
             hostUrl = hostUrl.replace("*", basicSchool.getCode());
         }
 
-        String callbackResult = HttpUtil.postJson(hostUrl + dictionaryConfig.printOpenDomain().getCallbackUrlApi(), jsonObject.toJSONString(), sign, time);
+        String callbackResult = HttpUtil.postJson(hostUrl + SystemConstant.TEACHCLOUD_PRINT_NOTIFY_ANALYSIS_PROGRESS_API, jsonObject.toJSONString(), sign, time);
         if (Objects.nonNull(callbackResult)) {
             log.info("callbackResult:{}", JacksonUtil.parseJson(callbackResult));
         }

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/OpenApiController.java

@@ -169,7 +169,9 @@ public class OpenApiController {
         BasicSchool basicSchool = AuthThirdUtil.hasPermission();
         calculateParams.setSchoolId(basicSchool.getId());
 
-        String callbackPwd = dictionaryConfig.printOpenDomain().getCallbackPwd();
+        //TODO 分布式印刷回调密码待完善
+//        String callbackPwd = dictionaryConfig.printOpenDomain().getCallbackPwd();
+        String callbackPwd = null;
         Optional.ofNullable(callbackPwd).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("配置文件回调密码为空"));
 
         courseCodeSyncTaskService.start(calculateParams);

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/SsoApiController.java

@@ -149,7 +149,9 @@ public class SsoApiController {
 
         HttpServletResponse response = ServletUtil.getResponse();
         response.setHeader("Access-Control-Allow-Origin", "*");
-        String loginAuthenUrl = dictionaryConfig.sysDomain().getLoginAuthenUrl();
+        //TODO 教研分析单点登录地址待完善
+//        String loginAuthenUrl = dictionaryConfig.sysDomain().getLoginAuthenUrl();
+        String loginAuthenUrl = null;
         if (loginAuthenUrl.contains("*")) {
             loginAuthenUrl = loginAuthenUrl.replace("*", basicSchool.getCode());
         }

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/SysController.java

@@ -146,18 +146,19 @@ public class SysController {
             if (Objects.isNull(code)) {
                 throw ExceptionResultEnum.ERROR.exception("验证码为空");
             }
-            if (!dictionaryConfig.smsDomain().getSmsNormalCode().equals(code)) {
-                QueryWrapper<BasicVerifyCode> codeWrapper = new QueryWrapper<>();
-                codeWrapper.lambda().eq(BasicVerifyCode::getMobileNumber, sysUser.getMobileNumber()).eq(BasicVerifyCode::getUserId, sysUser.getId());
-                BasicVerifyCode accessControl = basicVerifyCodeService.getOne(codeWrapper);
-                if (accessControl == null || (accessControl != null && !accessControl.getVerifyCode().equals(code))) {
-                    throw ExceptionResultEnum.ERROR.exception("短信验证码错误，请仔细核对后再次输入");
-                }
+            //TODO 万能短信验证码待完善
+//            if (!dictionaryConfig.smsDomain().getSmsNormalCode().equals(code)) {
+            QueryWrapper<BasicVerifyCode> codeWrapper = new QueryWrapper<>();
+            codeWrapper.lambda().eq(BasicVerifyCode::getMobileNumber, sysUser.getMobileNumber()).eq(BasicVerifyCode::getUserId, sysUser.getId());
+            BasicVerifyCode accessControl = basicVerifyCodeService.getOne(codeWrapper);
+            if (accessControl == null || (accessControl != null && !accessControl.getVerifyCode().equals(code))) {
+                throw ExceptionResultEnum.ERROR.exception("短信验证码错误，请仔细核对后再次输入");
+            }
 
-                if (new Date(accessControl.getExpireTime()).before(new Date())) {
-                    throw ExceptionResultEnum.ERROR.exception("短信验证码已过期");
-                }
+            if (new Date(accessControl.getExpireTime()).before(new Date())) {
+                throw ExceptionResultEnum.ERROR.exception("短信验证码已过期");
             }
+//            }
         }
         return ResultUtil.ok(teachcloudCommonService.login(login.getPassword(), sysUser, AppSourceEnum.SYSTEM));
     }

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/WudaOpenApiController.java

@@ -90,11 +90,14 @@ public class WudaOpenApiController {
             log.info("test-stu-cn:{}", cn);
         }
         BasicSchool basicSchool = commonCacheService.schoolCache(SystemConstant.SCHOOL_CODE);
-        String testUrl = dictionaryConfig.sysDomain().getReportUrl() + basicSchool.getId() + "/" + uid + "/" + cn;
+        //TODO 教研分析学生报告地址待完善
+        //        String testUrl = dictionaryConfig.sysDomain().getReportUrl() + basicSchool.getId() + "/" + uid + "/" + cn;
+        String testUrl = null;
         log.info("test-stu-testUrl:{}", testUrl);
         String encoderUid = EncrypAES.encrypt(uid);
         log.info("test-encoderUid:{}", encoderUid);
-        response.sendRedirect(dictionaryConfig.sysDomain().getReportUrl() + basicSchool.getId() + "/" + encoderUid);
+        //TODO 教研分析学生报告地址待完善
+//        response.sendRedirect(dictionaryConfig.sysDomain().getReportUrl() + basicSchool.getId() + "/" + encoderUid);
     }
 
     @ApiOperation(value = "cas用户鉴权退出接口")
@@ -136,11 +139,13 @@ public class WudaOpenApiController {
         String testPattern = "{0}{1}{2}{3}";
         String testCode = URLEncoder.encode(MessageFormat.format(testPattern, userAuthenticationDto.getUid() + "/" + cn, SignatureEntityTest.FIELD_JOINER, SignatureEntityTest.encrypt(userAuthenticationDto.getCode())), SystemConstant.CHARSET_NAME);
         log.info("test-tea-code:{}", testCode);
-        log.info("test-tea-url:{}", dictionaryConfig.sysDomain().getLoginAuthenUrl() + testCode);
+        //教研分析单点登录地址待完善
+//        log.info("test-tea-url:{}", dictionaryConfig.sysDomain().getLoginAuthenUrl() + testCode);
         // 测试结束
         log.info("code:{}", code);
         response.setHeader("Access-Control-Allow-Origin", "*");
-        response.sendRedirect(dictionaryConfig.sysDomain().getLoginAuthenUrl() + code + "/" + AppSourceEnum.WHU_THIRD);
+        //教研分析单点登录地址待完善
+//        response.sendRedirect(dictionaryConfig.sysDomain().getLoginAuthenUrl() + code + "/" + AppSourceEnum.WHU_THIRD);
     }
 
 //    @ApiOperation(value = "cas用户鉴权测试接口")

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

@@ -28,23 +28,14 @@ com.qmth.datasource.username=${db.username}
 com.qmth.datasource.password=${db.password}
 com.qmth.mybatis.log-level=debug
 
-com.qmth.fss.localfile.config=/Users/king/Downloads/file-temp
-com.qmth.fss.localfile.server=http://127.0.0.1:7001
-com.qmth.fss.localpdf.config=/Users/king/Downloads/pdf-temp
-com.qmth.fss.localpdf.server=http://127.0.0.1:7001
+com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.qmth.com.cn
+com.qmth.fss.public.server=https://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=https://oss-file.qmth.com.cn/teachcloud-print-dev-private
 
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=false
-sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav,.dll,.exe,.ftl
-sys.config.attachmentLength=100
-sys.config.attachmentSize=200
 sys.config.serverUpload=
-sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
-sys.config.threadPoolCoreSize=1
-sys.config.customThreadPoolCoreSize=true
-sys.config.sessionActive=2h
-sys.config.reportUrl=http://localhost:9099/#/student-report/
-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/
 
 #com.qmth.api.uri-prefix=/aaa
@@ -69,9 +60,6 @@ spring.jackson.time-zone=GMT+8
 com.qmth.logging.root-level=info
 com.qmth.logging.file-path=/Users/king/Downloads/teachcloud-report.log
 
-sms.config.smsNormalCode=qmth
-sms.config.codeExpiredTime=2
-sms.config.codeSendInterval=60
 #aliyun SMS key
 sms.config.aliyunSMSKey=LTAI4Fi8jVRYT49QBXU9x5QX
 #aliyun SMS secret
@@ -97,21 +85,4 @@ sms.config.aliyunSMSAuditReviewCode=SMS_217416269
 #\uFFFD\uFFFD\u02F4\uFFFD\uFFFD\uCD7D\uFFFD\uFFFD\u0524\uFFFD\uFFFD\u0368\u05AA
 sms.config.aliyunSMSAuditWillExpireCode=SMS_217436302
 #\uFFFD\uFFFD\u02F4\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0368\u05AA
-sms.config.aliyunSMSAuditOverdueCode=SMS_217416271
-
-#yun.mark.url=https://www.markingcloud.com
-yun.mark.url=http://192.168.10.224:80
-yun.mark.studentScoreApi=/api/exam/student/score
-
-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
-print.open.paperDimension=/api/admin/print/open/paper_dimension
-print.open.paperStructure=/api/admin/print/open/paper_structure
-print.open.paperEvaluation=/api/admin/print/open/paper_evaluation
-print.open.examStudentScore=/api/admin/print/open/exam_student_score
-
-#com.qmth.solar.access-key=0bf05ef4857b4fb58b6cd480b7f0dcd0
-#com.qmth.solar.access-secret=28yvjWPtLqIQPgxS2UWZPAF8McwMteaZ
-#com.qmth.solar.license=/Volumes/extend/\u542F\u660E/\u5206\u5E03\u5F0F\u5370\u5237/\u5206\u5E03\u5F0F\u5370\u5237&\u6559\u7814\u5206\u6790v3.1.0/jy-dev-wangliang.lic
+sms.config.aliyunSMSAuditOverdueCode=SMS_217416271

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

@@ -52,23 +52,10 @@ com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.
 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.localfile.config=/Users/king/Downloads/file-temp
-com.qmth.fss.localfile.server=http://127.0.0.1:7001
-com.qmth.fss.localpdf.config=/Users/king/Downloads/pdf-temp
-com.qmth.fss.localpdf.server=http://127.0.0.1:7001
 
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=false
-sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav,.dll,.exe,.ftl,.bpmn,.xml
-sys.config.attachmentLength=100
-sys.config.attachmentSize=200
-sys.config.serverUpload=
-sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
 sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
-sys.config.autoCreatePdfResetMaxCount=5
-sys.config.threadPoolCoreSize=1
-sys.config.customThreadPoolCoreSize=true
-sys.config.sessionActive=4h
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
 #\u65E5\u671F\u683C\u5F0F\u5316
@@ -114,14 +101,4 @@ spring.quartz.properties.org.quartz.threadPool.class=org.quartz.simpl.SimpleThre
 # \u6307\u5B9A\u7EBF\u7A0B\u6570\uFF0C\u4E00\u822C\u8BBE\u7F6E\u4E3A1-100\u76F4\u63A5\u7684\u6574\u6570\uFF0C\u6839\u636E\u7CFB\u7EDF\u8D44\u6E90\u914D\u7F6E
 spring.quartz.properties.org.quartz.threadPool.threadCount=10
 # \u8BBE\u7F6E\u7EBF\u7A0B\u7684\u4F18\u5148\u7EA7(\u53EF\u4EE5\u662FThread.MIN_PRIORITY\uFF08\u53731\uFF09\u548CThread.MAX_PRIORITY\uFF08\u8FD9\u662F10\uFF09\u4E4B\u95F4\u7684\u4EFB\u4F55int \u3002\u9ED8\u8BA4\u503C\u4E3AThread.NORM_PRIORITY\uFF085\uFF09\u3002)
-spring.quartz.properties.org.quartz.threadPool.threadPriority=5
-
-#\u914D\u7F6E\u6587\u4EF6
-#spring.profiles=task
-sync.config.hostUrl=http://192.168.10.224:80
-#sync.config.hostUrl=http://192.168.10.225:8000
-sync.config.userSaveUrl=/api/user/external/save
-sync.config.groupSaveUrl=/api/exam/mark_group/save
-sync.config.groupCountUrl=/api/exam/mark_group/count
-sync.config.groupDeleteUrl=/api/exam/mark_group/delete
-sync.config.markerSaveUrl=/api/exam/marker/save
+spring.quartz.properties.org.quartz.threadPool.threadPriority=5