Browse Source

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

caozixuan 4 years ago
parent
commit
7ceea0c20f

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

@@ -69,6 +69,7 @@ public class SystemConstant {
     public static final String HYPHEN = "-";
     public static final String DEFAULT_SIGN = "#";
     public static final String PARENT_ORG = "武汉大学教务处";
+    public static final String SCHOOL_CODE = "wdfx";
 //    public static final int MAX_RETRY_CREATE_PDF_COUNT = 5;
 
     /**

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

@@ -4,6 +4,7 @@ import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.common.config.DictionaryConfig;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicSchool;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
@@ -45,7 +46,7 @@ public class WudaOpenApiController {
         if (Objects.isNull(uid)) {
             throw ExceptionResultEnum.NOT_LOGIN.exception();
         }
-        BasicSchool basicSchool = cacheService.schoolCache("wdfx");
+        BasicSchool basicSchool = cacheService.schoolCache(SystemConstant.SCHOOL_CODE);
         response.setHeader("Access-Control-Allow-Origin", "*");
         response.sendRedirect(dictionaryConfig.sysDomain().getReportUrl() + basicSchool.getId() + "/" + uid);
     }
@@ -56,7 +57,7 @@ public class WudaOpenApiController {
 //    @Aac(auth = BOOL.FALSE)
 //    public void authenticationStudentCode(HttpServletRequest request, HttpServletResponse response, @PathVariable String studentCode
 //    ) throws IOException {
-//        BasicSchool basicSchool = cacheService.schoolCache("wdfx");
+//        BasicSchool basicSchool = cacheService.schoolCache(SystemConstant.SCHOOL_CODE);
 //        response.setHeader("Access-Control-Allow-Origin", "*");
 //        response.sendRedirect(dictionaryConfig.sysDomain().getReportUrl() + basicSchool.getId() + "/" + studentCode);
 //    }