Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YeeAmosFireAutoSysRoot
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
station
YeeAmosFireAutoSysRoot
Commits
7e23a914
Commit
7e23a914
authored
Mar 25, 2024
by
李秀明
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 使用硬编码文件分隔符会导致可移植性问题
Links
https://docs.qq.com/sheet/DTkRSaWhSZXBlaldN?tab=000008&_t=1711087563249
(No.16)
parent
dcef3c7c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
12 deletions
+22
-12
FileUtils.java
...in/java/com/yeejoin/amos/fas/business/util/FileUtils.java
+13
-3
WordConverterUtils.java
...va/com/yeejoin/amos/fas/core/util/WordConverterUtils.java
+9
-9
No files found.
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/util/FileUtils.java
View file @
7e23a914
package
com
.
yeejoin
.
amos
.
fas
.
business
.
util
;
package
com
.
yeejoin
.
amos
.
fas
.
business
.
util
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.apache.logging.log4j.Logger
;
...
@@ -15,6 +16,9 @@ import java.io.InputStream;
...
@@ -15,6 +16,9 @@ import java.io.InputStream;
import
java.io.OutputStream
;
import
java.io.OutputStream
;
import
java.net.HttpURLConnection
;
import
java.net.HttpURLConnection
;
import
java.net.URL
;
import
java.net.URL
;
import
java.nio.charset.StandardCharsets
;
import
java.nio.file.Files
;
import
java.nio.file.Paths
;
import
java.util.List
;
import
java.util.List
;
import
java.util.zip.ZipEntry
;
import
java.util.zip.ZipEntry
;
import
java.util.zip.ZipOutputStream
;
import
java.util.zip.ZipOutputStream
;
...
@@ -44,8 +48,8 @@ public class FileUtils {
...
@@ -44,8 +48,8 @@ public class FileUtils {
OutputStream
out
=
null
;
OutputStream
out
=
null
;
BufferedInputStream
br
=
null
;
BufferedInputStream
br
=
null
;
try
{
try
{
String
fileName
=
new
String
(
zipname
.
getBytes
(
"UTF-8"
),
"iso-8859-1"
);
String
fileName
=
new
String
(
zipname
.
getBytes
(
StandardCharsets
.
UTF_8
),
StandardCharsets
.
ISO_8859_1
);
br
=
new
BufferedInputStream
(
new
FileInputStream
(
zippath
));
br
=
new
BufferedInputStream
(
Files
.
newInputStream
(
Paths
.
get
(
zippath
)
));
byte
[]
buf
=
new
byte
[
1024
];
byte
[]
buf
=
new
byte
[
1024
];
int
len
=
0
;
int
len
=
0
;
response
.
reset
();
response
.
reset
();
...
@@ -81,7 +85,13 @@ public class FileUtils {
...
@@ -81,7 +85,13 @@ public class FileUtils {
ZipOutputStream
zos
=
null
;
ZipOutputStream
zos
=
null
;
// 临时目录
// 临时目录
String
path
=
System
.
getProperty
(
"java.io.tmpdir"
)
+
fileName
;
String
tmpdir
=
System
.
getProperty
(
"java.io.tmpdir"
);
if
(
StringUtils
.
isNotBlank
(
tmpdir
)
&&
!
tmpdir
.
endsWith
(
File
.
separator
))
{
tmpdir
+=
File
.
separator
;
}
else
if
(
StringUtils
.
isBlank
(
tmpdir
)){
tmpdir
=
""
;
}
String
path
=
tmpdir
+
fileName
;
try
{
try
{
File
zipFile
=
new
File
(
path
);
File
zipFile
=
new
File
(
path
);
zipFile
.
deleteOnExit
();
zipFile
.
deleteOnExit
();
...
...
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/core/util/WordConverterUtils.java
View file @
7e23a914
...
@@ -16,7 +16,7 @@ import java.io.*;
...
@@ -16,7 +16,7 @@ import java.io.*;
/**
/**
* 文档转换工具
* 文档转换工具
*
*
* @date
* @date
* @author nihuanshan
* @author nihuanshan
*
*
...
@@ -26,11 +26,11 @@ public class WordConverterUtils {
...
@@ -26,11 +26,11 @@ public class WordConverterUtils {
/**
/**
* 图片存储相对文档路径
* 图片存储相对文档路径
*/
*/
private
static
String
imgPath
=
"\\image\\"
;
private
static
String
imgPath
=
File
.
separator
+
"image"
+
File
.
separator
;
/**
/**
* word文档转html文档
* word文档转html文档
*
*
* @author: nihuanshan
* @author: nihuanshan
* @date: 2018年12月6日 下午2:55:32
* @date: 2018年12月6日 下午2:55:32
* @param srcFile 原文档
* @param srcFile 原文档
...
@@ -50,7 +50,7 @@ public class WordConverterUtils {
...
@@ -50,7 +50,7 @@ public class WordConverterUtils {
}
}
}
}
}
}
/**
/**
* word转html字符串
* word转html字符串
* @param srcFile
* @param srcFile
...
@@ -69,7 +69,7 @@ public class WordConverterUtils {
...
@@ -69,7 +69,7 @@ public class WordConverterUtils {
/**
/**
* .doc文档转换成html
* .doc文档转换成html
*
*
* @author: nihuanshan
* @author: nihuanshan
* @date: 2018年12月6日 下午2:53:43
* @date: 2018年12月6日 下午2:53:43
* @param srcFile
* @param srcFile
...
@@ -114,7 +114,7 @@ public class WordConverterUtils {
...
@@ -114,7 +114,7 @@ public class WordConverterUtils {
}
}
}
}
/**
/**
* doc转htmlString
* doc转htmlString
* @param srcFile
* @param srcFile
...
@@ -156,7 +156,7 @@ public class WordConverterUtils {
...
@@ -156,7 +156,7 @@ public class WordConverterUtils {
serializer
.
setOutputProperty
(
OutputKeys
.
METHOD
,
"html"
);
serializer
.
setOutputProperty
(
OutputKeys
.
METHOD
,
"html"
);
serializer
.
transform
(
domSource
,
streamResult
);
serializer
.
transform
(
domSource
,
streamResult
);
return
stringWriter
.
toString
();
return
stringWriter
.
toString
();
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
...
@@ -205,9 +205,9 @@ public class WordConverterUtils {
...
@@ -205,9 +205,9 @@ public class WordConverterUtils {
}
}
}
}
/**
/**
*docx转htmlString
*docx转htmlString
* @param srcFile
* @param srcFile
* @param readUrl
* @param readUrl
* @return
* @return
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment