domain trim

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/PaperController.java

@@ -19,6 +19,7 @@ import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperDetailExp;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperDetailUnitExp;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
 import cn.com.qmth.examcloud.core.questions.service.bean.paper.PreviewPaperHandler;
+import cn.com.qmth.examcloud.core.questions.service.config.UpYunProperty;
 import cn.com.qmth.examcloud.core.questions.service.export.ExportPaperAbstractService;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.web.support.Naked;
@@ -26,7 +27,6 @@ import com.google.gson.Gson;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -60,8 +60,8 @@ public class PaperController extends ControllerSupport {
     @Autowired
     Gson gson;
 
-    @Value("${question.reduplicate.similarity}")
-    private double reduplicateSimilarity;
+    @Autowired
+    UpYunProperty sysProperty;
 
     @Autowired
     QuesService quesService;
@@ -398,7 +398,7 @@ public class PaperController extends ControllerSupport {
                     continue;
                 }
                 double similarity = StringSimilarityUtils.getSimilarityWithCosinesBySeg(quesText1, quesText2);
-                if (similarity > reduplicateSimilarity) {
+                if (similarity > sysProperty.getReduplicateSimilarity()) {
                     boolean found = false;
                     for (int k = 0; k < reduplicateId.size(); k++) {
                         if (reduplicateId.get(k).contains(paperDetailUnitExp1.getId())

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/config/UpYunProperty.java

@@ -5,15 +5,16 @@ import org.springframework.stereotype.Component;
 
 @Component
 public class UpYunProperty {
+
+    @Value("${$upyun.site.1.domain}")
+    protected String domain;
+
     @Value("${$upyun.site.1.bucketName}")
     protected String bucketName;
 
     @Value("${$upyun.site.1.userName}")
     protected String userName;
 
-    @Value("${$upyun.site.1.domain}")
-    protected String domain;
-
     @Value("${$upyun.site.1.password}")
     protected String password;
 
@@ -35,8 +36,25 @@ public class UpYunProperty {
     @Value("${upyun.zipDirectory}")
     private String zipDirectory;
 
+    @Value("${question.reduplicate.similarity}")
+    private Double reduplicateSimilarity;
+
+    public String getDomain() {
+        if (domain != null) {
+            return domain.trim();
+        }
+        return "";
+    }
+
+    public void setDomain(String domain) {
+        this.domain = domain;
+    }
+
     public String getBucketName() {
-        return bucketName;
+        if (bucketName != null) {
+            return bucketName.trim();
+        }
+        return "";
     }
 
     public void setBucketName(String bucketName) {
@@ -44,23 +62,21 @@ public class UpYunProperty {
     }
 
     public String getUserName() {
-        return userName;
+        if (userName != null) {
+            return userName.trim();
+        }
+        return "";
     }
 
     public void setUserName(String userName) {
         this.userName = userName;
     }
 
-    public String getDomain() {
-        return domain;
-    }
-
-    public void setDomain(String domain) {
-        this.domain = domain;
-    }
-
     public String getPassword() {
-        return password;
+        if (password != null) {
+            return password.trim();
+        }
+        return "";
     }
 
     public void setPassword(String password) {
@@ -68,7 +84,10 @@ public class UpYunProperty {
     }
 
     public String getUploadPath() {
-        return uploadPath;
+        if (uploadPath != null) {
+            return uploadPath.trim();
+        }
+        return "";
     }
 
     public void setUploadPath(String uploadPath) {
@@ -76,7 +95,10 @@ public class UpYunProperty {
     }
 
     public String getRadioUploadPath() {
-        return radioUploadPath;
+        if (radioUploadPath != null) {
+            return radioUploadPath.trim();
+        }
+        return "";
     }
 
     public void setRadioUploadPath(String radioUploadPath) {
@@ -84,7 +106,10 @@ public class UpYunProperty {
     }
 
     public String getRadioType() {
-        return radioType;
+        if (radioType != null) {
+            return radioType.trim();
+        }
+        return "";
     }
 
     public void setRadioType(String radioType) {
@@ -92,7 +117,10 @@ public class UpYunProperty {
     }
 
     public String getAudioMaxsize() {
-        return audioMaxsize;
+        if (audioMaxsize != null) {
+            return audioMaxsize.trim();
+        }
+        return "";
     }
 
     public void setAudioMaxsize(String audioMaxsize) {
@@ -100,7 +128,10 @@ public class UpYunProperty {
     }
 
     public String getDownloadDirectory() {
-        return downloadDirectory;
+        if (downloadDirectory != null) {
+            return downloadDirectory.trim();
+        }
+        return "";
     }
 
     public void setDownloadDirectory(String downloadDirectory) {
@@ -108,10 +139,22 @@ public class UpYunProperty {
     }
 
     public String getZipDirectory() {
-        return zipDirectory;
+        if (zipDirectory != null) {
+            return zipDirectory.trim();
+        }
+        return "";
     }
 
     public void setZipDirectory(String zipDirectory) {
         this.zipDirectory = zipDirectory;
     }
+
+    public Double getReduplicateSimilarity() {
+        return reduplicateSimilarity;
+    }
+
+    public void setReduplicateSimilarity(Double reduplicateSimilarity) {
+        this.reduplicateSimilarity = reduplicateSimilarity;
+    }
+
 }