xiaofei hai 10 meses
pai
achega
4ef9ca16a6

+ 2 - 0
distributed-print/install/mysql/init/teachcloud_db.sql

@@ -653,6 +653,8 @@ CREATE TABLE IF NOT EXISTS `client_upgrade` (
   PRIMARY KEY (`platform`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
+INSERT INTO `client_upgrade` (`platform`,`install_path`,`install_upload_time`) select 'WINDOWS','{"md5":"b458068a408a11a82625b65e7e252eff","path":"知学知考-印刷扫描客户端_V3.4.0.exe","type":"oss","uploadType":"UPGRADE"}', unix_timestamp()*1000;
+
 -- ----------------------------
 -- Table structure for cloud_user_push_status
 -- ----------------------------

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

@@ -424,7 +424,7 @@ public class SysController {
         }
         Map<String, Object> map = new HashMap<>();
         map.put(SystemConstant.VERSION, SystemConstant.VERSION_VALUE);
-        if (!SystemConstant.ADMIN_CODE.equalsIgnoreCase(code)) {
+        if (!SystemConstant.ADMIN_CODE_LIST.contains(code.toLowerCase())) {
             BasicSchool basicSchool = null;
             if (StringUtils.isNotBlank(code)) {
                 basicSchool = commonCacheService.schoolCache(code);

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

@@ -18,6 +18,7 @@ import com.qmth.teachcloud.common.service.CommonCacheService;
 import com.qmth.teachcloud.common.util.*;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -309,6 +310,7 @@ public class SystemConstant {
     public static final String PARENT_ORG = "教务处";
     public static final String SCHOOL_CODE = "wdfx";
     public static final String ADMIN_CODE = "admin";
+    public static final List<String> ADMIN_CODE_LIST = (List<String>) ArrayUtils.toPrimitive(Arrays.asList("admin", "admin-teachcloud"));
     public static final String AUTH = "auth";//命题老师id
     //    public static final int MAX_RETRY_CREATE_PDF_COUNT = 5;
     //英文字母、数字、中文括号、英文括号、下划线(_)、减号(-)、中文横线(—)