浏览代码

去除本地上传配置,解决Win/Mac环境下启动时,需要修改dev配置的bug,修改同名试卷判断逻辑

4228306 5 年之前
父节点
当前提交
c906fa1a49

+ 3 - 0
src/main/java/edu/math/diagnosis/config/Constants.java

@@ -109,4 +109,7 @@ public class Constants {
     public static final int PICTURE_MIDDLE_SIZE = 400;
     public static final int PICTURE_LARGE_SIZE = 800;
 
+    public static final int PAPER_STATUS_PREPARE = 0;
+    public static final int PAPER_STATUS_READY = 1;
+    public static final int PAPER_STATUS_INVALIDATE = 2;
 }

+ 6 - 4
src/main/java/edu/math/diagnosis/service/PaperService.java

@@ -143,7 +143,9 @@ public class PaperService {
     @Transactional(rollbackFor = Exception.class)
     public Result addWithQuestion(Paper paper) {
         if (hasPaper(paper.getName())) {
-            return Result.fail("存在同名试卷");
+            String msg = "存在同名试卷";
+            logger.info(msg + " " + paper.getName());
+            return Result.fail(msg);
         }
         paper.setId(null);
         //保存试卷
@@ -190,7 +192,7 @@ public class PaperService {
     public boolean hasPaper(String name) {
         Paper check = new Paper();
         check.setName(name);
-
+        check.setStatus(Constants.READY);
         Example<Paper> example = Example.of(check);
         List<Paper> papers = paperRepo.findAll(example);
         return CommonUtil.notEmpty(papers);
@@ -242,8 +244,8 @@ public class PaperService {
         //TODO convert parse exception to reason
         //TODO use parallel
 //        Result<Paper> paperResult = add(paper);
-//        return addWithQuestion(paper);
-        return Result.ok(paper);
+        return addWithQuestion(paper);
+//        return Result.ok(paper);
     }
 
     private Map<String, List<XWPFParagraph>> initSections(Paper paper, String sectionPattern, String questionPattern, String picturePattern, List<XWPFParagraph> paragraphs) {

+ 4 - 4
src/main/resources/application-cloud.properties

@@ -3,11 +3,11 @@ server.port=8080
 #serverAddress=119.23.22.31
 #serverOutsideAddress=www.yaoxiangedu.com
 
-uploadPattern=/upload/**
+#uploadPattern=/upload/**
 #baseLocation=/opt/diagnosis/${server.port}
-baseLocation=/tmp/diagnosis/data
-uploadLocation=${baseLocation}/upload/
-spring.servlet.multipart.location=${baseLocation}/uploadTemp/
+#baseLocation=/tmp/diagnosis/data
+#uploadLocation=${baseLocation}/upload/
+#spring.servlet.multipart.location=${baseLocation}/uploadTemp/
 spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${uploadLocation}
 
 #spring.datasource.url=jdbc:mysql://47.104.200.54:3306/OnlinePapers?useUnicode=true&characterEncoding=utf-8

+ 4 - 4
src/main/resources/application-docker.properties

@@ -1,10 +1,10 @@
 server.port=8080
 serverAddress=119.23.22.31
 
-uploadPattern=/upload/**
-baseLocation=/tmp/diagnosis/data
-uploadLocation=${baseLocation}/upload/
-spring.servlet.multipart.location=${baseLocation}/uploadTemp/
+#uploadPattern=/upload/**
+#baseLocation=/tmp/diagnosis/data
+#uploadLocation=${baseLocation}/upload/
+#spring.servlet.multipart.location=${baseLocation}/uploadTemp/
 spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${uploadLocation}
 
 #spring.datasource.url=jdbc:mysql://47.104.200.54:3306/OnlinePapers?useUnicode=true&characterEncoding=utf-8

+ 4 - 4
src/main/resources/application-prod.properties

@@ -3,11 +3,11 @@ server.port=8080
 serverAddress=119.23.22.31
 serverOutsideAddress=www.yaoxiangedu.com
 
-uploadPattern=/upload/**
+#uploadPattern=/upload/**
 #baseLocation=/opt/diagnosis/${server.port}
-baseLocation=d:/diagnosis
-uploadLocation=${baseLocation}/upload/
-spring.servlet.multipart.location=${baseLocation}/uploadTemp/
+#baseLocation=d:/diagnosis
+#uploadLocation=${baseLocation}/upload/
+#spring.servlet.multipart.location=${baseLocation}/uploadTemp/
 spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${uploadLocation}
 
 #spring.datasource.url=jdbc:mysql://47.104.200.54:3306/OnlinePapers?useUnicode=true&characterEncoding=utf-8

+ 1 - 1
src/main/resources/application.properties

@@ -40,4 +40,4 @@ spring.data.redis.repositories.enabled=false
 swagger.enabled=true
 web.loginPage=/login
 web.logoutUrl=/logout
-web.permitUrls=/**/*.png
+web.permitUrls=/login,/logout,/**/*.js,/**/*.png,/**/*.jpg,/**/*.css