Merge remote-tracking branch 'origin/dev_v3.4.1' into dev_v3.4.1

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

@@ -167,6 +167,11 @@ public class ImportLogicServiceImpl implements ImportLogicService {
                         stringJoiner.add(m.getName() + "必填");
                     }
                 }
+
+                // 试卷编号不为空时，校区（考点）必填
+                if (StringUtils.isNotBlank(basicExamStudent.getPaperNumber()) && m.getCode().equals(RequiredFieldsEnum.EXAM_PLACE.getCode()) && m.getEnable() && StringUtils.isBlank(basicExamStudent.getExamPlace())) {
+                    stringJoiner.add(RequiredFieldsEnum.EXAM_PLACE.getName() + "必填");
+                }
             });
             // 任课老师和任课老师工号都有值或都没值
             if (StringUtils.isNotBlank(basicExamStudentImport.getTeacherCode()) && StringUtils.isBlank(basicExamStudentImport.getTeacherName())) {
@@ -275,11 +280,6 @@ public class ImportLogicServiceImpl implements ImportLogicService {
                             paperNumberExamTimeMap.put(basicExamStudent.getPaperNumber(), examTimeValue);
                         }
                     }
-
-                    // 试卷编号不为空时，校区（考点必填）
-                    if (StringUtils.isBlank(basicExamStudent.getExamPlace())) {
-                        stringJoiner.add("校区（考点）必填");
-                    }
                 }
 
                 // 校验课程学号唯一

distributed-print/install/config.ini

@@ -1,6 +1,6 @@
 [app]
-version=3.4.0
-name=֪ѧ֪¿¼
+version=3.4.1
+name=֪ѧ֪��
 portal=http://localhost:7400/
 module=print
 depend=mysql,nginx,redis

distributed-print/src/main/java/com/qmth/distributed/print/config/MultipartConfig.java

@@ -27,7 +27,7 @@ public class MultipartConfig {
         resolver.setDefaultEncoding(SystemConstant.CHARSET_NAME);
         resolver.setResolveLazily(true);// resolveLazily属性启用是为了推迟文件解析，以在在UploadAction中捕获文件大小异常
         resolver.setMaxInMemorySize(2);// 低于此值，只保留在内存里，超过此阈值，生成硬盘上的临时文件。
-        resolver.setMaxUploadSize(200 * 1024 * 1024);// 最大200M
+        resolver.setMaxUploadSize(500 * 1024 * 1024);// 最大500M
         return resolver;
     }
 }

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

@@ -41,10 +41,6 @@ public class SysToolsServiceImpl extends ServiceImpl<SysToolsMapper, SysTools> i
         try {
             String fileName = FilenameUtils.getName(file.getOriginalFilename());
 
-//            if (!fileName.endsWith(".zip")) {
-//                throw ExceptionResultEnum.ERROR.exception("只能上传后缀为[.zip]的文件");
-//            }
-
             String fileMd5 = DigestUtils.md5Hex(file.getBytes());
             if (!Objects.equals(fileMd5, md5)) {
                 throw ExceptionResultEnum.MD5_EQUALS_FALSE.exception();
@@ -58,6 +54,7 @@ public class SysToolsServiceImpl extends ServiceImpl<SysToolsMapper, SysTools> i
             String filePathName = buildPath(true, UploadFileEnum.FILE.getTitle(), type.name()) + fileName;
             FilePathVo filePathVo = fileUploadService.uploadFile(file, UploadFileEnum.FILE, filePathName, fileMd5);
             sysTools.setPath(JSON.toJSONString(filePathVo));
+            sysTools.setCreateTime(System.currentTimeMillis());
             // 保存或更新
             this.saveOrUpdate(sysTools);
         } catch (Exception e) {