瀏覽代碼

fix:
1.dir

caozixuan 1 年之前
父節點
當前提交
4e4a967bee

+ 35 - 35
src/main/java/cn/com/qmth/print/manage/config/SysProperty.java

@@ -1,35 +1,35 @@
-package cn.com.qmth.print.manage.config;
-
-import org.springframework.stereotype.Component;
-
-import java.io.File;
-import java.util.Objects;
-
-/**
- * @Description:
- * @Author: CaoZixuan
- * @Date:
- */
-@Component
-public class SysProperty {
-
-    private String tempDir = initTempDataDir();
-
-    public static String initTempDataDir() {
-        ClassLoader classLoader = SysProperty.class.getClassLoader();
-        // 步骤 2:获取当前类的所在路径
-        String path = Objects.requireNonNull(classLoader.getResource("")).getPath();
-        // 步骤 3:定位到项目的根目录
-        String rootPath = path.substring(0, path.indexOf("/target"));
-        // 打印根目录路径
-        return new File(rootPath).getParent() + "/temp";
-    }
-
-    public String getTempDir() {
-        return tempDir;
-    }
-
-    public void setTempDir(String tempDir) {
-        this.tempDir = tempDir;
-    }
-}
+//package cn.com.qmth.print.manage.config;
+//
+//import org.springframework.stereotype.Component;
+//
+//import java.io.File;
+//import java.util.Objects;
+//
+///**
+// * @Description:
+// * @Author: CaoZixuan
+// * @Date:
+// */
+//@Component
+//public class SysProperty {
+//
+//    private String tempDir = initTempDataDir();
+//
+//    public static String initTempDataDir() {
+//        ClassLoader classLoader = SysProperty.class.getClassLoader();
+//        // 步骤 2:获取当前类的所在路径
+//        String path = Objects.requireNonNull(classLoader.getResource("")).getPath();
+//        // 步骤 3:定位到项目的根目录
+//        String rootPath = path.substring(0, path.indexOf("/target"));
+//        // 打印根目录路径
+//        return new File(rootPath).getParent() + "/temp";
+//    }
+//
+//    public String getTempDir() {
+//        return tempDir;
+//    }
+//
+//    public void setTempDir(String tempDir) {
+//        this.tempDir = tempDir;
+//    }
+//}

+ 4 - 4
src/main/java/cn/com/qmth/print/manage/service/impl/ExamStudentServiceImpl.java

@@ -1,7 +1,6 @@
 package cn.com.qmth.print.manage.service.impl;
 
 import cn.com.qmth.print.manage.config.PmConstants;
-import cn.com.qmth.print.manage.config.SysProperty;
 import cn.com.qmth.print.manage.dao.ExamDao;
 import cn.com.qmth.print.manage.dao.ExamStudentDao;
 import cn.com.qmth.print.manage.dto.ExamStudentExportDTO;
@@ -31,6 +30,7 @@ import com.qmth.boot.tools.crypto.AES;
 import com.qmth.boot.tools.models.ByteArray;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -55,8 +55,8 @@ public class ExamStudentServiceImpl extends ServiceImpl<ExamStudentDao, ExamStud
     @Resource
     private ExamDao examDao;
 
-    @Resource
-    private SysProperty sysProperty;
+    @Value("${temp-data-dir}")
+    String tempDir;
 
     @Override
     public ExamStudentEntity findByExamIdAndExamNumber(Long examId, String examNumber) {
@@ -202,7 +202,7 @@ public class ExamStudentServiceImpl extends ServiceImpl<ExamStudentDao, ExamStud
     @Transactional
     @Override
     public Object analyzeZipAndImportStudents(Long examId, MultipartFile file) {
-        String tempPath = sysProperty.getTempDir() + "/importExamStudent";
+        String tempPath = tempDir + "/importExamStudent";
         try {
             byte[] bytes = file.getBytes();
             byte[] keyArr = Arrays.copyOfRange(bytes, 0, 16);

+ 2 - 0
src/main/resources/application.properties

@@ -32,3 +32,5 @@ spring.datasource.hikari.maximum-pool-size=10
 com.qmth.solar.server=https://solar.qmth.com.cn
 com.qmth.solar.accessKey=274f823e5f59410f8b3bb6edcd8e2b6e
 com.qmth.solar.accessSecret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
+
+temp-data-dir=E:/qiming/qiming_dev/print-manage/print-manage-api/temp