合并分支 'gwj' 到 'master'

notes-pas/src/main/java/com/zjty/tynotes/pas/controller/ExcelController.java

@@ -14,6 +14,8 @@ import com.zjty.tynotes.pas.service.IUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.ResponseEntity;
@@ -45,6 +47,7 @@ import static org.springframework.http.ResponseEntity.ok;
 @RequestMapping("/pas/excel")
 @AutoDocument
 public class ExcelController {
+    private final static Logger logger = LoggerFactory.getLogger(ExcelController.class);
     @Autowired
     private IUserService iUserService;
     @Autowired
@@ -153,6 +156,8 @@ public class ExcelController {
             } catch (Exception e) {
                 // TODO Auto-generated catch block
                 e.printStackTrace();
+                logger.error(e.getMessage());
+
             }
             System.out.println("----------file download---" + filename);
             try {
@@ -161,6 +166,7 @@ public class ExcelController {
             } catch (IOException e) {
                 // TODO Auto-generated catch block
                 e.printStackTrace();
+                logger.error(e.getMessage());
             }
         }
         return ok("下载失败");