Forráskód Böngészése

replace e.printStackTrace();

deason 5 éve
szülő
commit
4aaa360775
18 módosított fájl, 136 hozzáadás és 168 törlés
  1. 3 5
      examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/ExportPaperController.java
  2. 4 6
      examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/ExtractConfigController.java
  3. 0 1
      examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/ImportPaperController.java
  4. 4 4
      examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/PropertyController.java
  5. 2 2
      examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/CommonUtils.java
  6. 14 28
      examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/FileDisposeUtil.java
  7. 12 18
      examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/excel/ExcelWriter.java
  8. 7 10
      examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/excel/ExportUtils.java
  9. 2 2
      examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/word/DocxProcessUtil.java
  10. 4 4
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/ImportPaperService.java
  11. 8 8
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/ExportPaperAbstractService.java
  12. 2 2
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExportPaperServiceImpl.java
  13. 19 23
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/QuesServiceImpl.java
  14. 1 1
      examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/temp/DdCollegeUtilService.java
  15. 2 2
      examcloud-core-questions-starter/src/test/java/cn/com/qmth/examcloud/core/questions/starter/ApplicationTest.java
  16. 15 13
      examcloud-core-questions-starter/src/test/java/cn/com/qmth/examcloud/core/questions/starter/DdCollegeUtilTest.java
  17. 21 24
      examcloud-core-questions-starter/src/test/java/cn/com/qmth/examcloud/core/questions/starter/ExtractConfigServiceTest.java
  18. 16 15
      examcloud-core-questions-starter/src/test/java/cn/com/qmth/examcloud/core/questions/starter/PaperServiceTest.java

+ 3 - 5
examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/ExportPaperController.java

@@ -59,7 +59,6 @@ public class ExportPaperController {
             ExportServiceManage esm = exportServiceManageRepo.findByOrgName(orgName);
             exportPaperService.exportPaperFile(id, esm.getExportServiceName(), exportContentList, response, loginName, examType, psw);
         } catch (Exception e) {
-            e.printStackTrace();
             log.error("导出异常:" + e);
         }
         log.info("导出结束");
@@ -89,7 +88,6 @@ public class ExportPaperController {
         try {
             exportPaperService.exportPaperFiles(paperList, esm.getExportServiceName(), exportContentList, response, loginName, examType);
         } catch (Exception e) {
-            e.printStackTrace();
             log.error("导出异常:" + e.getMessage());
         }
         log.info("导出结束");
@@ -102,7 +100,7 @@ public class ExportPaperController {
         try {
             exportPaperService.downQuestionDistribute(courseNo, response);
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
     }
 
@@ -113,7 +111,7 @@ public class ExportPaperController {
         try {
             exportPaperService.downQuestionDistributeByPapers(paperIds, response);
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
     }
 
@@ -123,7 +121,7 @@ public class ExportPaperController {
         try {
             exportPaperService.downOriginalPaper(paperId, loginName, response);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
         log.info("开始导出原始导入的试卷");
     }

+ 4 - 6
examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/ExtractConfigController.java

@@ -61,7 +61,7 @@ public class ExtractConfigController extends ControllerSupport {
             Page<ExtractConfig> extractConfigPageList = extractConfigService.findPageExtractConfig(currentPage, pageSize, examId, courseNo, String.valueOf(user.getRootOrgId()));
             return new ResponseEntity<Object>(extractConfigPageList, HttpStatus.OK);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
             throw new StatusException("Q-050065", e.getMessage());
         }
     }
@@ -76,7 +76,6 @@ public class ExtractConfigController extends ControllerSupport {
             extractConfigFileService.saveExtractConfigAndBuildPaperFile(extractConfig, isbuildFile, user);
             return new ResponseEntity<Object>(HttpStatus.OK);
         } catch (Exception e) {
-            //e.printStackTrace();
             logger.error(e.getMessage(), e);
             throw new StatusException("Q-050099", e.getMessage());
         }
@@ -140,7 +139,6 @@ public class ExtractConfigController extends ControllerSupport {
             return new ResponseEntity<Object>(questionDto, HttpStatus.OK);
         } catch (Exception e) {
             logger.error("抽题失败", e);
-            e.printStackTrace();
             return new ResponseEntity<Object>("抽题失败:" + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         }
 
@@ -193,7 +191,7 @@ public class ExtractConfigController extends ControllerSupport {
         try {
             extractConfigFileService.exportExamPaperInfo(exportModel, response, loginName, orgName, psw);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
     }
 
@@ -209,7 +207,7 @@ public class ExtractConfigController extends ControllerSupport {
             extractConfigFileService.exportExamPaperInfoCheck(exportModel, response);
             return new ResponseEntity<Object>(HttpStatus.OK);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
             throw new StatusException("Q-050200", e.getMessage());
         }
     }
@@ -235,7 +233,7 @@ public class ExtractConfigController extends ControllerSupport {
         try {
             extractConfigFileService.exportExamPaperInfo(exportModel, response, loginName, orgName, null);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
     }
 

+ 0 - 1
examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/ImportPaperController.java

@@ -61,7 +61,6 @@ public class ImportPaperController extends ControllerSupport {
             Paper newPaper = importPaperService.importPaper(paper, user, tempFile);
             return new ResponseEntity<Object>(newPaper, HttpStatus.OK);
         } catch (Exception e) {
-            e.printStackTrace();
             log.error("导入异常:" + e.getMessage());
             throw new StatusException("Q-090072", e.getMessage());
         } finally {

+ 4 - 4
examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/PropertyController.java

@@ -42,7 +42,7 @@ public class PropertyController extends ControllerSupport {
                 propertyService.saveProperty(property, user);
                 return new ResponseEntity<Object>(HttpStatus.OK);
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error(e.getMessage(), e);
                 return new ResponseEntity<Object>(HttpStatus.INTERNAL_SERVER_ERROR);
             }
         }
@@ -69,7 +69,7 @@ public class PropertyController extends ControllerSupport {
                 propertyService.saveProperty(property, user);
                 return new ResponseEntity<Object>(HttpStatus.OK);
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error(e.getMessage(), e);
                 return new ResponseEntity<Object>(HttpStatus.INTERNAL_SERVER_ERROR);
             }
         }
@@ -130,7 +130,7 @@ public class PropertyController extends ControllerSupport {
                 propertyService.moveUp(property);
                 return new ResponseEntity<Object>(HttpStatus.OK);
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error(e.getMessage(), e);
                 return new ResponseEntity<Object>(HttpStatus.INTERNAL_SERVER_ERROR);
             }
         }
@@ -147,7 +147,7 @@ public class PropertyController extends ControllerSupport {
                 propertyService.moveDown(property);
                 return new ResponseEntity<Object>(HttpStatus.OK);
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error(e.getMessage(), e);
                 return new ResponseEntity<Object>(HttpStatus.INTERNAL_SERVER_ERROR);
             }
         }

+ 2 - 2
examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/CommonUtils.java

@@ -473,7 +473,7 @@ public final class CommonUtils {
                 idValues.add(attr.getValue());
             }
         } catch (DocumentException e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
         return idValues;
     }
@@ -716,7 +716,7 @@ public final class CommonUtils {
                 }
             }
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
         return content;
     }

+ 14 - 28
examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/FileDisposeUtil.java

@@ -1,17 +1,12 @@
 package cn.com.qmth.examcloud.core.questions.base;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
@@ -21,20 +16,11 @@ import java.nio.file.Paths;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 
 /**
  * @author chenken
  * @date 2017年7月17日 上午9:36:32
  * @company QMTH
- * @description FileUtil.java
  */
 public class FileDisposeUtil {
 
@@ -83,7 +69,7 @@ public class FileDisposeUtil {
                     dataInputStream = null;
                 }
             } catch (IOException e) {
-                e.printStackTrace();
+                logger.error(e.getMessage(), e);
             }
             if (connection != null) {
                 connection.disconnect();
@@ -131,9 +117,9 @@ public class FileDisposeUtil {
             out.close();
             in.close();
         } catch (FileNotFoundException e) {
-            e.printStackTrace();
+            logger.error(e.getMessage(), e);
         } catch (IOException e) {
-            e.printStackTrace();
+            logger.error(e.getMessage(), e);
         } finally {
             try {
                 if (null != out) {
@@ -145,7 +131,7 @@ public class FileDisposeUtil {
                     in = null;
                 }
             } catch (IOException e) {
-                e.printStackTrace();
+                logger.error(e.getMessage(), e);
                 throw new RuntimeException(e);
             }
         }
@@ -164,7 +150,7 @@ public class FileDisposeUtil {
         try {
             type = Files.probeContentType(path);
         } catch (IOException e) {
-            e.printStackTrace();
+            logger.error(e.getMessage(), e);
         }
         return type;
     }
@@ -220,7 +206,7 @@ public class FileDisposeUtil {
                                 }
                                 zos.flush();
                             } catch (Exception e) {
-                                e.printStackTrace();
+                                logger.error(e.getMessage(), e);
                             } finally {
                                 IOUtils.closeQuietly(bis);
                                 IOUtils.closeQuietly(fis);
@@ -230,7 +216,7 @@ public class FileDisposeUtil {
                     }
                 }
             } catch (Exception e) {
-                e.printStackTrace();
+                logger.error(e.getMessage(), e);
             } finally {
                 IOUtils.closeQuietly(bis);
                 IOUtils.closeQuietly(fis);

+ 12 - 18
examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/excel/ExcelWriter.java

@@ -1,5 +1,9 @@
 package cn.com.qmth.examcloud.core.questions.base.excel;
 
+import org.apache.poi.xssf.usermodel.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.reflect.Field;
@@ -10,16 +14,11 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.poi.xssf.usermodel.*;
-
-import cn.com.qmth.examcloud.core.questions.base.excel.ColumnSetting;
-import cn.com.qmth.examcloud.core.questions.base.excel.ExcelUtils;
-
 /**
  * Created by dizhi on 2016/6/19.
  */
 public class ExcelWriter extends ExcelUtils {
-
+    private static final Logger log = LoggerFactory.getLogger(ExcelWriter.class);
 
     public ExcelWriter(Class<?> dataClass) {
         super(dataClass, false);
@@ -167,17 +166,13 @@ public class ExcelWriter extends ExcelUtils {
                         textValue = "";
                     }
                 } catch (NoSuchFieldException e) {
-                    // TODO Auto-generated catch block
-                    e.printStackTrace();
+                    log.error(e.getMessage(), e);
                 } catch (IllegalAccessException e) {
-                    // TODO Auto-generated catch block
-                    e.printStackTrace();
+                    log.error(e.getMessage(), e);
                 } catch (SecurityException e) {
-                    // TODO Auto-generated catch block
-                    e.printStackTrace();
+                    log.error(e.getMessage(), e);
                 } catch (IllegalArgumentException e) {
-                    // TODO Auto-generated catch block
-                    e.printStackTrace();
+                    log.error(e.getMessage(), e);
                 } finally {
                     // 清理资源
                 }
@@ -187,9 +182,8 @@ public class ExcelWriter extends ExcelUtils {
         try {
             workbook.write(out);
         } catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
-
     }
-}
+
+}

+ 7 - 10
examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/excel/ExportUtils.java

@@ -1,27 +1,23 @@
 package cn.com.qmth.examcloud.core.questions.base.excel;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
-
-import cn.com.qmth.examcloud.core.questions.base.excel.ExcelWriter;
-
 import java.net.URLEncoder;
 import java.util.Collection;
 
-
 /*
  * excel导出工具
  */
 public class ExportUtils {
-
+    private static final Logger log = LoggerFactory.getLogger(ExportUtils.class);
     private static final String DEFALUT_CONTENT_TYPE = "application/vnd.ms-excel";
-
     private static final String DEFALUT_EXT = ".xlsx";
 
-    public static void exportEXCEL(String fileName, Class<?> dataClass,
-                                   Collection<?> dataset, HttpServletResponse response) {
+    public static void exportEXCEL(String fileName, Class<?> dataClass, Collection<?> dataset, HttpServletResponse response) {
         try {
-
             response.setHeader("Content-Disposition", "inline; filename="
                     + URLEncoder.encode(fileName, "UTF-8") + DEFALUT_EXT);
             response.setContentType(DEFALUT_CONTENT_TYPE);
@@ -31,7 +27,8 @@ public class ExportUtils {
             outputStream.flush();
             outputStream.close();
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
     }
+
 }

+ 2 - 2
examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/word/DocxProcessUtil.java

@@ -445,7 +445,7 @@ public final class DocxProcessUtil {
             }
             return textStr;
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error(e.getMessage(), e);
         }
         return htmlStr;
     }
@@ -827,7 +827,7 @@ public final class DocxProcessUtil {
         try {
             wordMLPackage = Docx4J.load(inputStream);
         } catch (Docx4JException e) {
-            e.printStackTrace();
+            logger.error(e.getMessage(), e);
         }
         return wordMLPackage;
     }

+ 4 - 4
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/ImportPaperService.java

@@ -1815,7 +1815,7 @@ public class ImportPaperService {
                     try {
                         upyun.readFile(oldAudio.getFileUrl(), audioFile);
                     } catch (Exception e) {
-                        e.printStackTrace();
+                        log.error(e.getMessage(), e);
                         throw new RuntimeException("下载音频失败");
                     }
                     //重新上传新的音频文件
@@ -1866,7 +1866,7 @@ public class ImportPaperService {
                 }
                 newQuestion = quesRepo.save(newQuestion);
             } catch (IOException e) {
-                e.printStackTrace();
+                log.error(e.getMessage(), e);
             }
         }
         paperDetailUnit.setQuestion(newQuestion);
@@ -1885,9 +1885,9 @@ public class ImportPaperService {
             upyun.writeFile("/comm-ques-bank/dev/audio/" + newAudioFileName, audioFileNew, true);
             //audioFile.delete();
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
-        System.out.println("OK");
+        log.debug("OK");
     }
 
     //克隆原试卷所有属性

+ 8 - 8
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/ExportPaperAbstractService.java

@@ -306,7 +306,7 @@ public abstract class ExportPaperAbstractService {
 
             ORIGINAL_PAPER = CONFIGURATION.getTemplate("original_paper.ftl", ENCODING);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
     }
 
@@ -913,9 +913,9 @@ public abstract class ExportPaperAbstractService {
             outputStream.write(b);
             outputStream.close();
         } catch (FileNotFoundException e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
     }
 
@@ -1008,7 +1008,7 @@ public abstract class ExportPaperAbstractService {
             examFileService.saveExamFile(examFile, accessUser);
             file.delete();
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
     }
 
@@ -1055,9 +1055,9 @@ public abstract class ExportPaperAbstractService {
             examFileService.saveExamFile(examFile, accessUser);
             file.delete();
         } catch (FileNotFoundException e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
     }
 
@@ -1092,9 +1092,9 @@ public abstract class ExportPaperAbstractService {
             examFileService.saveExamFile(examFile, accessUser);
             file.delete();
         } catch (FileNotFoundException e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
     }
 

+ 2 - 2
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExportPaperServiceImpl.java

@@ -463,9 +463,9 @@ public class ExportPaperServiceImpl implements ExportPaperService {
             outputStream.write(b);
             outputStream.flush();
         } catch (FileNotFoundException e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         } finally {
             IOUtils.closeQuietly(outputStream);
         }

+ 19 - 23
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/QuesServiceImpl.java

@@ -1,18 +1,16 @@
 package cn.com.qmth.examcloud.core.questions.service.impl;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import javax.xml.bind.JAXBElement;
-
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
+import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.Model;
-import cn.com.qmth.examcloud.core.questions.dao.QuesPkgPathRepo;
+import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
+import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
+import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
+import cn.com.qmth.examcloud.core.questions.dao.*;
 import cn.com.qmth.examcloud.core.questions.dao.entity.*;
-
+import cn.com.qmth.examcloud.core.questions.service.PaperService;
+import cn.com.qmth.examcloud.core.questions.service.QuesService;
+import cn.com.qmth.examcloud.core.questions.service.QuestionAudioService;
 import org.apache.commons.lang3.StringUtils;
 import org.bson.types.ObjectId;
 import org.docx4j.XmlUtils;
@@ -25,6 +23,8 @@ import org.docx4j.wml.Body;
 import org.docx4j.wml.Drawing;
 import org.docx4j.wml.P;
 import org.docx4j.wml.R;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -38,17 +38,12 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Service;
 
-import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
-import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
-import cn.com.qmth.examcloud.core.questions.dao.PaperDetailUnitRepo;
-import cn.com.qmth.examcloud.core.questions.dao.PaperRepo;
-import cn.com.qmth.examcloud.core.questions.dao.QuesRepo;
-import cn.com.qmth.examcloud.core.questions.dao.QuestionAudioRepo;
-import cn.com.qmth.examcloud.core.questions.service.PaperService;
-import cn.com.qmth.examcloud.core.questions.service.QuesService;
-import cn.com.qmth.examcloud.core.questions.service.QuestionAudioService;
-import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
-import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
+import javax.xml.bind.JAXBElement;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Pattern;
 
 /**
  * @author chenken
@@ -58,6 +53,7 @@ import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
  */
 @Service("quesService")
 public class QuesServiceImpl implements QuesService {
+    private static final Logger log = LoggerFactory.getLogger(QuesServiceImpl.class);
     @Autowired
     private QuesRepo quesRepo;
 
@@ -88,7 +84,7 @@ public class QuesServiceImpl implements QuesService {
         try {
             wordMLPackage = WordprocessingMLPackage.createPackage();
         } catch (InvalidFormatException e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
     }
 
@@ -404,7 +400,7 @@ public class QuesServiceImpl implements QuesService {
             }
             pkgByte = null;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
     }
 

+ 1 - 1
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/temp/DdCollegeUtilService.java

@@ -194,7 +194,7 @@ public class DdCollegeUtilService {
 								try {
 									question = initQuestion(testQuestionInfo,testQuestion,course,map2,difficulty);
 								} catch (Exception e) {
-									e.printStackTrace();
+									log.error(e.getMessage(), e);
 									System.out.println("错误题号:"+ error);
 								}
 								//初始化小题对象

+ 2 - 2
examcloud-core-questions-starter/src/test/java/cn/com/qmth/examcloud/core/questions/starter/ApplicationTest.java

@@ -207,7 +207,7 @@ public class ApplicationTest {
 //
 //
 //        } catch (Exception e) {
-//            e.printStackTrace();
+//            log.error(e.getMessage(), e);
 //        }
 
 
@@ -234,7 +234,7 @@ public class ApplicationTest {
             DocxProcessUtil.initPkgImage(wordMLPackage);
             Docx4J.save(wordMLPackage, new FileOutputStream(outFilePath));
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
     }
 

+ 15 - 13
examcloud-core-questions-starter/src/test/java/cn/com/qmth/examcloud/core/questions/starter/DdCollegeUtilTest.java

@@ -1,13 +1,14 @@
 package cn.com.qmth.examcloud.core.questions.starter;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
+import cn.com.qmth.examcloud.core.questions.dao.PaperDetailUnitRepo;
+import cn.com.qmth.examcloud.core.questions.dao.QuesRepo;
+import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
+import cn.com.qmth.examcloud.core.questions.service.temp.DdExcelService;
+import cn.com.qmth.examcloud.core.questions.service.temp.UpdatePaperStruct;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -15,11 +16,11 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import cn.com.qmth.examcloud.core.questions.dao.PaperDetailUnitRepo;
-import cn.com.qmth.examcloud.core.questions.dao.QuesRepo;
-import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
-import cn.com.qmth.examcloud.core.questions.service.temp.DdExcelService;
-import cn.com.qmth.examcloud.core.questions.service.temp.UpdatePaperStruct;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
 
 /**
  * @author weiwenhai
@@ -30,6 +31,7 @@ import cn.com.qmth.examcloud.core.questions.service.temp.UpdatePaperStruct;
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class DdCollegeUtilTest {
+    private static final Logger log = LoggerFactory.getLogger(DdCollegeUtilTest.class);
 
 	/*@Autowired
 	private DdCollegeUtilService ddCollegeUtilService;
@@ -60,7 +62,7 @@ public class DdCollegeUtilTest {
 			ddCollegeUtilService.importPaper("1627", "F09020010",2);
 	
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error(e.getMessage(), e);
 		}
 		List<TestQuestion> list = ddCollegeUtilService.querySubQuestions("24AE438A37B67D7F0430D434A9D0C929");
 		System.out.println(list);
@@ -105,7 +107,7 @@ public class DdCollegeUtilTest {
             //ddExcelService.exporExcel("1627");
             ddExcelService.exportPaperExcel("1387");
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
     }
 

+ 21 - 24
examcloud-core-questions-starter/src/test/java/cn/com/qmth/examcloud/core/questions/starter/ExtractConfigServiceTest.java

@@ -1,18 +1,22 @@
 package cn.com.qmth.examcloud.core.questions.starter;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
+import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
+import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
+import cn.com.qmth.examcloud.core.questions.base.question.QuestionDto;
+import cn.com.qmth.examcloud.core.questions.dao.ExportServiceManageRepo;
+import cn.com.qmth.examcloud.core.questions.dao.PaperRepo;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExamFile;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExamPaper;
+import cn.com.qmth.examcloud.core.questions.dao.entity.Paper;
+import cn.com.qmth.examcloud.core.questions.service.ExamFileService;
+import cn.com.qmth.examcloud.core.questions.service.ExtractConfigService;
+import cn.com.qmth.examcloud.core.questions.service.export.SddxExportPaperService;
+import cn.com.qmth.examcloud.core.questions.service.export.SxsfExportPaperService;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -22,28 +26,21 @@ import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import cn.com.qmth.examcloud.core.questions.base.question.QuestionDto;
-import cn.com.qmth.examcloud.core.questions.dao.ExportServiceManageRepo;
-import cn.com.qmth.examcloud.core.questions.dao.PaperRepo;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExamFile;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExamPaper;
-import cn.com.qmth.examcloud.core.questions.dao.entity.Paper;
-import cn.com.qmth.examcloud.core.questions.service.ExamFileService;
-import cn.com.qmth.examcloud.core.questions.service.ExtractConfigService;
-import cn.com.qmth.examcloud.core.questions.service.export.SddxExportPaperService;
-import cn.com.qmth.examcloud.core.questions.service.export.SxsfExportPaperService;
-import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
-import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author chenken
  * @date 2017年4月18日 下午3:32:25
  * @company QMTH
- * @description PaperServiceTest.java
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class ExtractConfigServiceTest {
+    private static final Logger log = LoggerFactory.getLogger(ExtractConfigServiceTest.class);
 
     @Autowired
     private PaperRepo paperRepo;
@@ -87,7 +84,7 @@ public class ExtractConfigServiceTest {
                     writeToFile(sb.toString() + "\r\n" + paper.getId());
                 }
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error(e.getMessage(), e);
             }
         }
     }

+ 16 - 15
examcloud-core-questions-starter/src/test/java/cn/com/qmth/examcloud/core/questions/starter/PaperServiceTest.java

@@ -1,18 +1,5 @@
 package cn.com.qmth.examcloud.core.questions.starter;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang.StringUtils;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.test.context.junit4.SpringRunner;
-
 import cn.com.qmth.examcloud.core.questions.base.enums.PaperType;
 import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.core.questions.dao.ExportServiceManageRepo;
@@ -25,16 +12,30 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnit;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
 import cn.com.qmth.examcloud.core.questions.service.PaperService;
 import cn.com.qmth.examcloud.core.questions.service.temp.DdExcelService;
+import org.apache.commons.lang.StringUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author chenken
  * @date 2017年5月12日 下午1:35:39
  * @company QMTH
- * @description PaperServiceTest.java
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class PaperServiceTest {
+    private static final Logger log = LoggerFactory.getLogger(PaperServiceTest.class);
     @Autowired
     PaperService paperService;
     @Autowired
@@ -141,7 +142,7 @@ public class PaperServiceTest {
         try {
             dService.exportSubQues("1", 105l, codes);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
     }
 }