diff --git a/common/src/main/java/com/jeesite/common/codec/EncodeUtils.java b/common/src/main/java/com/jeesite/common/codec/EncodeUtils.java index d5c308ab..af3d685f 100644 --- a/common/src/main/java/com/jeesite/common/codec/EncodeUtils.java +++ b/common/src/main/java/com/jeesite/common/codec/EncodeUtils.java @@ -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); } diff --git a/common/src/main/java/com/jeesite/common/lang/StringUtils.java b/common/src/main/java/com/jeesite/common/lang/StringUtils.java index 00ad4333..e645babb 100644 --- a/common/src/main/java/com/jeesite/common/lang/StringUtils.java +++ b/common/src/main/java/com/jeesite/common/lang/StringUtils.java @@ -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", "
"), "\t", "    "); + return replace(replace(EncodeUtils.encodeHtml(trim(txt)), "\n", "
"), "\t", "    "); } /** diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm index b11454a1..3e50c377 100644 --- a/modules/core/db/core.erm +++ b/modules/core/db/core.erm @@ -11,8 +11,8 @@ 0 0.5 - 85 - 836 + 717 + 685 128 128 @@ -3112,8 +3112,8 @@ nvarchar(n) - 3bb91c4711f1cc7f2b386349d9df0a8cc620a0f7 - 1 + c37221af63cbefcf4e7f94fcfbc2e6af6779c915 + 16 null false null @@ -3122,10 +3122,10 @@ false false - 1 短信 2 邮件 + sms 短信 mail 邮件 模板类型 tpl_type - character(n) + varchar(n) 40b63ab3e485fd55370d6d04b063c4397483ebc1 @@ -10825,13 +10825,13 @@ - 3bb91c4711f1cc7f2b386349d9df0a8cc620a0f7 + c37221af63cbefcf4e7f94fcfbc2e6af6779c915 e76a1511b06ae78cfda28f6c2b8c0a7f24f28be1 - character(n) + varchar(n) false diff --git a/modules/core/db/mysql/core.sql b/modules/core/db/mysql/core.sql index 1440bd39..722c0be1 100644 --- a/modules/core/db/mysql/core.sql +++ b/modules/core/db/mysql/core.sql @@ -522,7 +522,7 @@ CREATE TABLE js_sys_msg_template module_code varchar(64) COMMENT '归属模块', tpl_key varchar(100) NOT NULL COMMENT '模板键值', tpl_name varchar(100) NOT NULL COMMENT '模板名称', - tpl_type char(1) NOT NULL COMMENT '模板类型', + tpl_type varchar(16) NOT NULL COMMENT '模板类型', tpl_content text NOT NULL COMMENT '模板内容', status char(1) DEFAULT '0' NOT NULL COMMENT '状态（0正常 1删除 2停用）', create_by varchar(64) NOT NULL COMMENT '创建者', diff --git a/modules/core/db/oracle/core.sql b/modules/core/db/oracle/core.sql index 6caa428a..740371f1 100644 --- a/modules/core/db/oracle/core.sql +++ b/modules/core/db/oracle/core.sql @@ -519,7 +519,7 @@ CREATE TABLE js_sys_msg_template module_code varchar2(64), tpl_key varchar2(100) NOT NULL, tpl_name nvarchar2(100) NOT NULL, - tpl_type char(1) NOT NULL, + tpl_type varchar2(16) NOT NULL, tpl_content clob NOT NULL, status char(1) DEFAULT '0' NOT NULL, create_by varchar2(64) NOT NULL, diff --git a/web/db/mysql/core.sql b/web/db/mysql/core.sql index 1440bd39..722c0be1 100644 --- a/web/db/mysql/core.sql +++ b/web/db/mysql/core.sql @@ -522,7 +522,7 @@ CREATE TABLE js_sys_msg_template module_code varchar(64) COMMENT '归属模块', tpl_key varchar(100) NOT NULL COMMENT '模板键值', tpl_name varchar(100) NOT NULL COMMENT '模板名称', - tpl_type char(1) NOT NULL COMMENT '模板类型', + tpl_type varchar(16) NOT NULL COMMENT '模板类型', tpl_content text NOT NULL COMMENT '模板内容', status char(1) DEFAULT '0' NOT NULL COMMENT '状态（0正常 1删除 2停用）', create_by varchar(64) NOT NULL COMMENT '创建者', diff --git a/web/db/oracle/core.sql b/web/db/oracle/core.sql index 7c8e0dbd..740371f1 100644 --- a/web/db/oracle/core.sql +++ b/web/db/oracle/core.sql @@ -1,5 +1,4 @@ - /* Drop Tables */ DROP TABLE js_sys_company_office CASCADE CONSTRAINTS; @@ -520,7 +519,7 @@ CREATE TABLE js_sys_msg_template module_code varchar2(64), tpl_key varchar2(100) NOT NULL, tpl_name nvarchar2(100) NOT NULL, - tpl_type char(1) NOT NULL, + tpl_type varchar2(16) NOT NULL, tpl_content clob NOT NULL, status char(1) DEFAULT '0' NOT NULL, create_by varchar2(64) NOT NULL, diff --git a/web/src/main/resources/views/modules/test/testDataForm.html b/web/src/main/resources/views/modules/test/testDataForm.html index 680cb27c..68ef86d1 100644 --- a/web/src/main/resources/views/modules/test/testDataForm.html +++ b/web/src/main/resources/views/modules/test/testDataForm.html @@ -143,8 +143,7 @@
- - <#form:ueditor name="remarks" maxlength="10000" height="200" class="required" + <#form:ueditor path="remarks" maxlength="10000" height="200" class="required" simpleToolbars="true" readonly="false" outline="false"/>