fix ueditor upload error

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);
 	}
 

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", "<br/>"), "\t", "&nbsp; &nbsp; ");
+		return replace(replace(EncodeUtils.encodeHtml(trim(txt)), "\n", "<br/>"), "\t", "&nbsp; &nbsp; ");
 	}
 
 	/**

modules/core/db/core.erm

@@ -11,8 +11,8 @@
 	</page_setting>
 	<category_index>0</category_index>
 	<zoom>0.5</zoom>
-	<x>85</x>
+	<x>717</x>
-	<y>836</y>
+	<y>685</y>
 	<default_color>
 		<r>128</r>
 		<g>128</g>
@@ -3112,8 +3112,8 @@
 			<type>nvarchar(n)</type>
 		</word>
 		<word>
-			<id>3bb91c4711f1cc7f2b386349d9df0a8cc620a0f7</id>
+			<id>c37221af63cbefcf4e7f94fcfbc2e6af6779c915</id>
-			<length>1</length>
+			<length>16</length>
 			<decimal>null</decimal>
 			<array>false</array>
 			<array_dimension>null</array_dimension>
@@ -3122,10 +3122,10 @@
 			<binary>false</binary>
 			<args></args>
 			<char_semantics>false</char_semantics>
-			<description>1 短信 2 邮件</description>
+			<description>sms 短信 mail 邮件</description>
 			<logical_name>模板类型</logical_name>
 			<physical_name>tpl_type</physical_name>
-			<type>character(n)</type>
+			<type>varchar(n)</type>
 		</word>
 		<word>
 			<id>40b63ab3e485fd55370d6d04b063c4397483ebc1</id>
@@ -10825,13 +10825,13 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>3bb91c4711f1cc7f2b386349d9df0a8cc620a0f7</word_id>
+					<word_id>c37221af63cbefcf4e7f94fcfbc2e6af6779c915</word_id>
 					<id>e76a1511b06ae78cfda28f6c2b8c0a7f24f28be1</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>character(n)</type>
+					<type>varchar(n)</type>
 					<constraint></constraint>
 					<default_value></default_value>
 					<auto_increment>false</auto_increment>

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 '创建者',

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,

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 '创建者',

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,

web/src/main/resources/views/modules/test/testDataForm.html

@@ -143,8 +143,7 @@
 							<label class="control-label col-sm-2" title="">
 								<span class="required hide">*</span> 备注信息：<i class="fa icon-question hide"></i></label>
 							<div class="col-sm-10">
-<!-- 								<#form:textarea path="remarks" rows="4" maxlength="500" class="form-control"/> -->
+								<#form:ueditor path="remarks" maxlength="10000" height="200" class="required"
-								<#form:ueditor name="remarks" maxlength="10000" height="200" class="required"
 									simpleToolbars="true" readonly="false" outline="false"/>
 							</div>
 						</div>