合并分支 'gwj' 到 'master'

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

@@ -58,13 +58,12 @@ public class ExcelController {
     @PostMapping("/import")
     public List<Address> upload(@RequestParam("file") MultipartFile multipartFile,HttpServletRequest request,HttpServletResponse response) throws Exception {
         ImportParams params = new ImportParams();
-        params.setHeadRows(4);
+        params.setHeadRows(1);
 //        params.setNeedVerfiy(true);
-//         params.setTitleRows(1);
+         params.setTitleRows(1);
         List<Address> result = ExcelImportUtil.importExcel(multipartFile.getInputStream(),
                 Address.class, params);
         List<User> users = new ArrayList<>();
-        System.out.println(result);
         if(result!=null){
             result.forEach(address -> {
                 User user = pasUserDao.findByUsername(address.getName());
@@ -134,9 +133,9 @@ public class ExcelController {
 //        System.out.println(addressUrl);
 //        System.out.println("存在？？");
         if(file.exists()){ //判断文件父目录是否存在
-            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
-            response.setCharacterEncoding("UTF-8");
-            response.setHeader("Content-Disposition", "attachment;fileName=" +   java.net.URLEncoder.encode(filename,"UTF-8"));
+//            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+//            response.setCharacterEncoding("UTF-8");
+//            response.setHeader("Content-Disposition", "attachment;fileName=" +   java.net.URLEncoder.encode(filename,"UTF-8"));
             byte[] buffer = new byte[1024];
             FileInputStream fis = null; //文件输入流
             BufferedInputStream bis = null;

notes-union/src/main/resources/application.properties

@@ -12,7 +12,7 @@ server.ssl.keyStoreType=PKCS12
 server.ssl.keyAlias= alias
 
 #mongodb configuration
-spring.data.mongodb.uri=mongodb://localhost:27017/notes5
+spring.data.mongodb.uri=mongodb://localhost:27017/notes6
 # servlet configuration
 spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=1000MB