提交本地代码

.gitignore

@@ -16,4 +16,5 @@ target/
 # Package Files #
 *.jar
 *.war
-*.ear
+*.ear
+/cqb-paper/src/main/java/com/qmth/cqb/paper/service/.gitignore

cqb-comm-utils/src/main/java/com/qmth/cqb/utils/word/DocxProcessUtil.java

@@ -530,6 +530,13 @@ public final class DocxProcessUtil {
         namespaces.stream().forEach(namespace -> {
             root.remove(namespace);
         });
+        List<org.dom4j.Element> elements = root.elements();
+        elements.stream().forEach(element ->{
+        	if("w:bookmarkStart".equals(element.getQualifiedName())||
+                	"w:bookmarkEnd".equals(element.getQualifiedName())){
+        		root.remove(element);
+        	}
+        });
         return root.asXML();
     }
 

cqb-paper/src/main/java/com/qmth/cqb/paper/service/ImportPaperService.java

@@ -467,7 +467,7 @@ public class ImportPaperService {
                 tmpWordMl = DocxProcessUtil.formatPWordMl(tmpWordMl);
                 quesBodyWordMl.append(tmpWordMl);
                 quesBodyHtml.append(DocxProcessUtil.docx2Html(tmpWordMl, wordMLPackage));
-            } else if (tmpText.matches("^[a-zA-Z]\\.[\\s\\S]*") || tmpText.startsWith("[")) {
+            } else if (tmpText.matches("^[a-zA-Z]\\.[\\s\\S]*") || tmpText.startsWith(ImportPaperMsg.left_bracket)) {
                 // 检测到选项或其他特殊段落直接退出
                 break;
             } else{
@@ -959,7 +959,7 @@ public class ImportPaperService {
     		}
         	for(String answer:pAnswerArray){
         		answer = answer.trim();
-        		String pattern = "\\s*([A-Z]|[a-z])\\s*";
+        		String pattern = "[A-Z]|[a-z]";
         		if(!Pattern.matches(pattern,answer)){
         			importPaperCheck.setErrorInfo(getQuesNumInfo(importPaperCheck.quesName, subQuesNum)+
        					 "中,答案格式不正确,答案为:"+answerWord);
@@ -1024,5 +1024,9 @@ public class ImportPaperService {
     	String word = replaceContent.replace("[", "").replace("]", "");
     	return pText.replaceAll("\\["+word+"\\]","").replaceAll("[:|：]", "").trim();
     }
-    
+    public static void main(String[] args){
+    	String answer = "a";
+    	String pattern = "[A-Z]|[a-z]";
+    	System.out.println(Pattern.matches(pattern,answer));
+    }
 }

cqb-starter/src/main/java/com/qmth/cqb/App.java

@@ -17,7 +17,7 @@ import org.springframework.web.multipart.commons.CommonsMultipartResolver;
  *
  */
 @SpringBootApplication
-@EnableEurekaClient
+//@EnableEurekaClient
 @EnableFeignClients
 @EnableAutoConfiguration(exclude = {MultipartAutoConfiguration.class})
 public class App {

cqb-starter/src/main/resources/application-dev.properties

@@ -1,5 +1,5 @@
-spring.data.mongodb.uri=mongodb://root:Qmth87863577@119.23.127.95:3717/?authSource=admin&authMechanism=SCRAM-SHA-1
-#spring.data.mongodb.uri=mongodb://localhost:27017/comm-ques-bank
+#spring.data.mongodb.uri=mongodb://root:Qmth87863577@119.23.127.95:3717/?authSource=admin&authMechanism=SCRAM-SHA-1
+spring.data.mongodb.uri=mongodb://192.168.1.99:27017/comm-ques-bank
 spring.data.mongodb.grid-fs-database=comm-ques-bank
 spring.data.mongodb.database=comm-ques-bank
 eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/

cqb-starter/src/test/java/com/qmth/cqb/ExtractConfigServiceTest.java

@@ -3,6 +3,7 @@ package com.qmth.cqb;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -126,6 +127,23 @@ public class ExtractConfigServiceTest {
 		return examPaperList;
 	}
 	
+	@Test
+	public void testGetExamPaperId(){
+		String courseCode = "0003";
+		String orgId = "1";
+		List<String> paperIds = extractConfigService.getExamPaperId(courseCode, orgId);
+		System.out.println(paperIds);
+	}
+	
+	@Test
+	public void testExtract(){
+		Long exam_id = 59L;
+		String course_code = "012027";
+		String group_code = "A";
+		Map<String, Object> returnMap = extractConfigService.extract(exam_id, course_code, group_code);
+		System.out.println(returnMap);
+	}
+	
 	public static void main(String[] args) {
 		List<String> newList = new ArrayList<String>();
 		newList.add("a");

cqb-starter/src/test/java/com/qmth/cqb/PaperServiceTest.java

@@ -1,5 +1,6 @@
 package com.qmth.cqb;
 
+import org.apache.commons.lang.StringUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,5 +27,10 @@ public class PaperServiceTest {
 		String userId = "chenken";
 		paperService.useBasePaper(selectedPaperIds, userId);
 	}
+	
+	public static void main(String[] args){
+		String[] answers = {"A","B"};
+		System.out.println(StringUtils.join(answers,","));
+	}
 }