修正 SystemProperties

examcloud-core-print-common/src/main/java/cn/com/qmth/examcloud/core/print/common/SysProperty.java

@@ -20,6 +20,7 @@ import java.io.Serializable;
  */
 @Component
 public class SysProperty implements Serializable {
+
     private static final long serialVersionUID = 1L;
 
     @Value("${$upyun.site.1.domain}")
@@ -37,24 +38,6 @@ public class SysProperty implements Serializable {
     @Value("${$upyun.site.1.uploadUrl}")
     private String uploadUrl;
 
-    /**
-     * 配置文件环境
-     */
-    @Value("${spring.profiles.active}")
-    private String profile;
-
-    /**
-     * 文件存放目录
-     */
-    @Value("${examcloud.web.sys.dataDir}")
-    private String dir;
-
-    /**
-     * 文件存放临时目录
-     */
-    @Value("${examcloud.web.sys.tempDataDir}")
-    private String tempDir;
-
     /**
      * 题库访问地址前缀
      */
@@ -62,10 +45,7 @@ public class SysProperty implements Serializable {
     private String questionUrlPrefix;
 
     public String getDomain() {
-        if (domain != null) {
-            return domain.trim();
-        }
-        return "";
+        return domain;
     }
 
     public void setDomain(String domain) {
@@ -73,10 +53,7 @@ public class SysProperty implements Serializable {
     }
 
     public String getBucketName() {
-        if (bucketName != null) {
-            return bucketName.trim();
-        }
-        return "";
+        return bucketName;
     }
 
     public void setBucketName(String bucketName) {
@@ -84,10 +61,7 @@ public class SysProperty implements Serializable {
     }
 
     public String getUserName() {
-        if (userName != null) {
-            return userName.trim();
-        }
-        return "";
+        return userName;
     }
 
     public void setUserName(String userName) {
@@ -95,10 +69,7 @@ public class SysProperty implements Serializable {
     }
 
     public String getPassword() {
-        if (password != null) {
-            return password.trim();
-        }
-        return "";
+        return password;
     }
 
     public void setPassword(String password) {
@@ -106,40 +77,13 @@ public class SysProperty implements Serializable {
     }
 
     public String getUploadUrl() {
-        if (uploadUrl != null) {
-            return uploadUrl.trim();
-        }
-        return "";
+        return uploadUrl;
     }
 
     public void setUploadUrl(String uploadUrl) {
         this.uploadUrl = uploadUrl;
     }
 
-    public String getProfile() {
-        return profile;
-    }
-
-    public void setProfile(String profile) {
-        this.profile = profile;
-    }
-
-    public String getDir() {
-        return dir;
-    }
-
-    public void setDir(String dir) {
-        this.dir = dir;
-    }
-
-    public String getTempDir() {
-        return tempDir;
-    }
-
-    public void setTempDir(String tempDir) {
-        this.tempDir = tempDir;
-    }
-
     public String getQuestionUrlPrefix() {
         return questionUrlPrefix;
     }
@@ -148,4 +92,4 @@ public class SysProperty implements Serializable {
         this.questionUrlPrefix = questionUrlPrefix;
     }
 
-}
+}

examcloud-core-print-common/src/main/java/cn/com/qmth/examcloud/core/print/common/upyun/UpYunClient.java

@@ -11,6 +11,7 @@ import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.print.common.SysProperty;
 import cn.com.qmth.examcloud.core.print.common.utils.Check;
 import cn.com.qmth.examcloud.core.print.common.utils.FileUtils;
+import cn.com.qmth.examcloud.web.config.SystemProperties;
 import main.java.com.UpYun;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,7 +29,12 @@ import static cn.com.qmth.examcloud.core.print.common.Constants.SYS_CODE_500;
  */
 @Component
 public class UpYunClient {
+
     private static final Logger log = LoggerFactory.getLogger(UpYunClient.class);
+
+    @Autowired
+    private SystemProperties systemProperties;
+
     @Autowired
     private SysProperty sysProperty;
 
@@ -71,7 +77,7 @@ public class UpYunClient {
     public File download(String filePath) {
         try {
             //final String rootDir = Constants.rootFileDir();
-            final String rootDir = sysProperty.getTempDir();
+            final String rootDir = systemProperties.getTempDataDir();
             FileUtils.makeDirs(rootDir);
             final String newFilePath = rootDir + "/" + FileUtils.newFileName(filePath);
             File file = new File(newFilePath);

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/CoursePaperServiceImpl.java

@@ -21,6 +21,7 @@ import cn.com.qmth.examcloud.core.print.repository.PrintingProjectRepository;
 import cn.com.qmth.examcloud.core.print.service.CoursePaperService;
 import cn.com.qmth.examcloud.core.print.service.ExamQuestionStructureService;
 import cn.com.qmth.examcloud.core.print.service.bean.coursepaper.*;
+import cn.com.qmth.examcloud.web.config.SystemProperties;
 import com.itextpdf.text.pdf.PdfReader;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -45,17 +46,27 @@ import static cn.com.qmth.examcloud.core.print.common.Constants.*;
  */
 @Service
 public class CoursePaperServiceImpl implements CoursePaperService {
+
     private static final Logger log = LoggerFactory.getLogger(CoursePaperServiceImpl.class);
+
     @Autowired
     private PrintingProjectRepository printingProjectRepository;
+
     @Autowired
     private CoursePaperRepository coursePaperRepository;
+
     @Autowired
     private CourseStatisticRepository courseStatisticRepository;
+
     @Autowired
     private ExamQuestionStructureService examQuestionStructureService;
+
+    @Autowired
+    private SystemProperties systemProperties;
+
     @Autowired
     private SysProperty sysProperty;
+
     @Autowired
     private UpYunClient upYunClient;
 
@@ -151,7 +162,7 @@ public class CoursePaperServiceImpl implements CoursePaperService {
 
             //将试卷和答案页面转换为PDF文件
             //final String rootDir = Constants.rootFileDir();
-            final String rootDir = sysProperty.getTempDir();
+            final String rootDir = systemProperties.getTempDataDir();
             final String paperPdfPath = rootDir + "/" + FileUtils.randomUUID() + SUFFIX_PDF;
             final String answerPdfPath = rootDir + "/" + FileUtils.randomUUID() + SUFFIX_PDF;
             FileUtils.makeDirs(rootDir);
@@ -164,13 +175,15 @@ public class CoursePaperServiceImpl implements CoursePaperService {
 
             final String title = String.format("?examName=%s", this.urlParamEncode(printingProject.getExamName()));
 
-            boolean paperResult = ElectronUtils.toPdf(sysProperty.getProfile(), sysProperty.getDir(), coursePaper.getPaperHtmlUrl() + title, paperPdfPath);
+            boolean paperResult = ElectronUtils.toPdf(systemProperties.getProfile(), systemProperties.getDataDir(),
+                    coursePaper.getPaperHtmlUrl() + title, paperPdfPath);
             if (!paperResult) {
                 log.warn(String.format("试卷页面转换PDF文件失败！paperId = %s", coursePaper.getPaperId()));
                 continue;
             }
 
-            boolean answerResult = ElectronUtils.toPdf(sysProperty.getProfile(), sysProperty.getDir(), coursePaper.getAnswerHtmlUrl() + title, answerPdfPath);
+            boolean answerResult = ElectronUtils.toPdf(systemProperties.getProfile(), systemProperties.getDataDir(),
+                    coursePaper.getAnswerHtmlUrl() + title, answerPdfPath);
             if (!answerResult) {
                 log.warn(String.format("答案页面转换PDF文件失败！paperId = %s", coursePaper.getPaperId()));
                 continue;
@@ -474,7 +487,7 @@ public class CoursePaperServiceImpl implements CoursePaperService {
 
         //文件存放目录
         //final String targetDir = Constants.rootFileDir() + "/" + FileUtils.randomUUID();
-        final String targetDir = sysProperty.getTempDir() + "/" + FileUtils.randomUUID();
+        final String targetDir = systemProperties.getTempDataDir() + "/" + FileUtils.randomUUID();
         FileUtils.makeDirs(targetDir);
 
         //优先处理试卷或答案文件(需要网络下载)

examcloud-core-print-starter/src/main/java/cn/com/qmth/examcloud/core/print/controller/IndexController.java

@@ -7,12 +7,12 @@
 
 package cn.com.qmth.examcloud.core.print.controller;
 
-import cn.com.qmth.examcloud.core.print.common.SysProperty;
 import cn.com.qmth.examcloud.core.print.common.utils.ElectronUtils;
 import cn.com.qmth.examcloud.core.print.common.utils.FileUtils;
 import cn.com.qmth.examcloud.core.print.service.CourseStatisticService;
 import cn.com.qmth.examcloud.core.print.service.PrintingProjectService;
 import cn.com.qmth.examcloud.core.print.service.PrintingProjectStatisticService;
+import cn.com.qmth.examcloud.web.config.SystemProperties;
 import cn.com.qmth.examcloud.web.support.Naked;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -26,14 +26,18 @@ import org.springframework.web.bind.annotation.ResponseBody;
  */
 @Controller
 public class IndexController {
+
     @Autowired
     private PrintingProjectStatisticService printingProjectStatisticService;
+
     @Autowired
     private CourseStatisticService courseStatisticService;
+
     @Autowired
     private PrintingProjectService printingProjectService;
+
     @Autowired
-    private SysProperty sysProperty;
+    private SystemProperties sysProperty;
 
     @Naked
     @ResponseBody
@@ -48,12 +52,12 @@ public class IndexController {
     @ResponseBody
     @RequestMapping(value = "/test", method = RequestMethod.GET)
     public void demo() {
-        final String rootDir = sysProperty.getTempDir();
+        final String rootDir = sysProperty.getTempDataDir();
         FileUtils.makeDirs(rootDir);
 
         String targetUrl = "https://www.baidu.com";
         String pdfPath = rootDir + "/test.pdf";
-        ElectronUtils.toPdf(sysProperty.getProfile(), sysProperty.getDir(), targetUrl, pdfPath);
+        ElectronUtils.toPdf(sysProperty.getProfile(), sysProperty.getDataDir(), targetUrl, pdfPath);
     }
 
 }