Bläddra i källkod

Merge branch 'dev0410' of https://git.oschina.net/songyue123456/comm-ques-bank into dev0410

chenken 8 år sedan
förälder
incheckning
3bd01dc1ca

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

@@ -562,11 +562,9 @@ public final class DocxProcessUtil {
 
                             // 过滤题干标题
                             if (tmpText.matches("^\\d{1,}\\.[\\s\\S]*")) {
-                                if (index == 2) {
-                                    return p;
-                                }
                                 tmpText = tmpText.replaceFirst("\\d{1,}\\.","");
                                 text.setValue(tmpText);
+                                return p;
                             } else if(tmpText.matches("^\\d{1,}$")){
                                 tmpText = tmpText.replaceFirst("\\d{1,}","");
                                 text.setValue(tmpText);
@@ -580,11 +578,9 @@ public final class DocxProcessUtil {
 
                             // 过滤选项标题
                             if (tmpText.matches("^[A-Z]\\.[\\s\\S]*")) {
-                                if (index == 2) {
-                                    return p;
-                                }
                                 tmpText = tmpText.replaceFirst("[A-Z]\\.","");
                                 text.setValue(tmpText);
+                                return p;
                             } else if(tmpText.matches("^[A-Z]$")){
                                 tmpText = tmpText.replaceFirst("[A-Z]","");
                                 text.setValue(tmpText);

+ 2 - 1
cqb-starter/src/main/resources/application-prod.properties

@@ -1,4 +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://root:Qmth87863577@119.23.127.95:3717/?authSource=admin&authMechanism=SCRAM-SHA-1
+spring.data.mongodb.uri=mongodb://root:Qmth87863577@dds-wz93958e4b3d8b142.mongodb.rds.aliyuncs.com:3717/?authSource=admin&authMechanism=SCRAM-SHA-1
 spring.data.mongodb.database=comm-ques-bank
 spring.data.mongodb.grid-fs-database=comm-ques-bank
 eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/