|  | @@ -2,6 +2,7 @@ package com.ruixuan.salesLeads.utils;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  import com.ruixuan.common.utils.StringUtils;
 | 
	
		
			
				|  |  | +import com.ruixuan.common.utils.file.FileUtils;
 | 
	
		
			
				|  |  |  import de.siegmar.fastcsv.reader.CsvContainer;
 | 
	
		
			
				|  |  |  import de.siegmar.fastcsv.reader.CsvReader;
 | 
	
		
			
				|  |  |  import de.siegmar.fastcsv.reader.CsvRow;
 | 
	
	
		
			
				|  | @@ -38,7 +39,6 @@ public class CsvImportUtil {
 | 
	
		
			
				|  |  |       * @throws Exception
 | 
	
		
			
				|  |  |       */
 | 
	
		
			
				|  |  |      public static List<Map<String,String>> readCSV(MultipartFile multipartFile)throws Exception {
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |          //multipartFile 转 file
 | 
	
		
			
				|  |  |          File file = CsvImportUtil.multipartFile2File(multipartFile);
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -49,7 +49,14 @@ public class CsvImportUtil {
 | 
	
		
			
				|  |  |  //        CsvContainer csv = csvReader.read(file, StandardCharsets.UTF_8);
 | 
	
		
			
				|  |  |          CsvContainer csv = csvReader.read(file, Charset.forName("gbk"));
 | 
	
		
			
				|  |  |  */
 | 
	
		
			
				|  |  | -        InputStreamReader isr = new InputStreamReader(new FileInputStream(file),"GBK");
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +        String encoding = System.getProperty("file.encoding");
 | 
	
		
			
				|  |  | +        System.out.println("系统编码===="+encoding);
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +        String charset = FileUtils.getFileEncoding(file);
 | 
	
		
			
				|  |  | +        System.out.println("文件编码===="+charset);
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +        InputStreamReader isr = new InputStreamReader(new FileInputStream(file),charset);
 | 
	
		
			
				|  |  |          CsvContainer csv = csvReader.read(isr);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          //行数据
 |