|
@@ -13,6 +13,7 @@ import java.util.regex.Pattern;
|
|
import javax.xml.parsers.DocumentBuilder;
|
|
import javax.xml.parsers.DocumentBuilder;
|
|
import javax.xml.parsers.DocumentBuilderFactory;
|
|
import javax.xml.parsers.DocumentBuilderFactory;
|
|
|
|
|
|
|
|
+import cn.com.qmth.examcloud.web.config.SystemProperties;
|
|
import org.apache.commons.collections4.map.HashedMap;
|
|
import org.apache.commons.collections4.map.HashedMap;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
@@ -45,7 +46,6 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.QuesOption;
|
|
import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
|
|
import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
|
|
import cn.com.qmth.examcloud.core.questions.service.QuesTypeNameService;
|
|
import cn.com.qmth.examcloud.core.questions.service.QuesTypeNameService;
|
|
import cn.com.qmth.examcloud.core.questions.service.impl.CourseService;
|
|
import cn.com.qmth.examcloud.core.questions.service.impl.CourseService;
|
|
-import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
|
|
|
|
|
|
|
|
@Component
|
|
@Component
|
|
public class CqdxService {
|
|
public class CqdxService {
|
|
@@ -66,9 +66,11 @@ public class CqdxService {
|
|
// private QuesPkgPathRepo quesPkgPathRepo;
|
|
// private QuesPkgPathRepo quesPkgPathRepo;
|
|
@Autowired
|
|
@Autowired
|
|
private QuesTypeNameService quesTypeNameService;
|
|
private QuesTypeNameService quesTypeNameService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private SystemProperties systemProperties;
|
|
|
|
|
|
public void bulidPaper(MultipartFile dataFile, User user, Long rootOrgId, String paperNameSuffix, String impType) {
|
|
public void bulidPaper(MultipartFile dataFile, User user, Long rootOrgId, String paperNameSuffix, String impType) {
|
|
- String tempDir = PropertyHolder.getString("examcloud.web.sys.tempDataDir");
|
|
|
|
|
|
+ String tempDir = systemProperties.getTempDataDir();
|
|
String dir = tempDir + File.separator + UUID.randomUUID() + File.separator;
|
|
String dir = tempDir + File.separator + UUID.randomUUID() + File.separator;
|
|
try {
|
|
try {
|
|
File dfile = new File(dir);
|
|
File dfile = new File(dir);
|