manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix ueditor upload error

Browse Source
This commit is contained in:
thinkgem
2018-03-10 10:09:52 +08:00
parent 33eda68534
commit 504fa68d03
8 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/com/jeesite/common/codec/EncodeUtils.java
View File

@@ -14,11 +14,11 @@ import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.jeesite.common.lang.ExceptionUtils;
import com.jeesite.common.lang.StringUtils;
/**
* 封装各种格式的编码解码工具类.
@@ -110,28 +110,28 @@ public class EncodeUtils {
/**
* Html 转码.
*/
public static String escapeHtml(String html) {
public static String encodeHtml(String html) {
return StringEscapeUtils.escapeHtml4(html);
}
/**
* Html 解码.
*/
public static String unescapeHtml(String htmlEscaped) {
public static String decodeHtml(String htmlEscaped) {
return StringEscapeUtils.unescapeHtml4(htmlEscaped);
}
/**
* Xml 转码.
*/
public static String escapeXml(String xml) {
public static String encodeXml(String xml) {
return StringEscapeUtils.escapeXml10(xml);
}
/**
* Xml 解码.
*/
public static String unescapeXml(String xmlEscaped) {
public static String decodeXml(String xmlEscaped) {
return StringEscapeUtils.unescapeXml(xmlEscaped);
}

2
common/src/main/java/com/jeesite/common/lang/StringUtils.java
View File

@@ -124,7 +124,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
if (txt == null){
return "";
}
return replace(replace(EncodeUtils.escapeHtml(trim(txt)), "\n", "<br/>"), "\t", "&nbsp; &nbsp; ");
return replace(replace(EncodeUtils.encodeHtml(trim(txt)), "\n", "<br/>"), "\t", "&nbsp; &nbsp; ");
}
/**