update server/src/main/java/cn/keking/service/FileHandlerService.java.
修复xlsx7.4以上版本 乱码 Signed-off-by: 高雄 <admin@cxcp.com>pull/75/head
parent
99bdeef754
commit
94503ddc39
|
@ -41,8 +41,6 @@ import java.util.Map;
|
||||||
public class FileHandlerService {
|
public class FileHandlerService {
|
||||||
|
|
||||||
private final Logger logger = LoggerFactory.getLogger(FileHandlerService.class);
|
private final Logger logger = LoggerFactory.getLogger(FileHandlerService.class);
|
||||||
|
|
||||||
private static final String DEFAULT_CONVERTER_CHARSET = System.getProperty("sun.jnu.encoding");
|
|
||||||
private final String fileDir = ConfigConstants.getFileDir();
|
private final String fileDir = ConfigConstants.getFileDir();
|
||||||
private final CacheService cacheService;
|
private final CacheService cacheService;
|
||||||
|
|
||||||
|
@ -142,9 +140,10 @@ public class FileHandlerService {
|
||||||
* @param outFilePath 文件绝对路径
|
* @param outFilePath 文件绝对路径
|
||||||
*/
|
*/
|
||||||
public void doActionConvertedFile(String outFilePath) {
|
public void doActionConvertedFile(String outFilePath) {
|
||||||
|
String charset = EncodingDetects.getJavaEncode(outFilePath);
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
try (InputStream inputStream = new FileInputStream(outFilePath);
|
try (InputStream inputStream = new FileInputStream(outFilePath);
|
||||||
BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, DEFAULT_CONVERTER_CHARSET))) {
|
BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, charset))) {
|
||||||
String line;
|
String line;
|
||||||
while (null != (line = reader.readLine())) {
|
while (null != (line = reader.readLine())) {
|
||||||
if (line.contains("charset=gb2312")) {
|
if (line.contains("charset=gb2312")) {
|
||||||
|
|
Loading…
Reference in New Issue