update

src/main/java/com/smallchill/core/beetl/BeetlMaker.java

@@ -20,6 +20,7 @@ import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.util.Map;
 
+import com.smallchill.core.toolbox.kit.CharsetKit;
 import com.smallchill.core.toolbox.kit.FileKit;
 
 /**
@@ -35,7 +36,7 @@ public abstract class BeetlMaker {
 	 * @param htmlPath  html文件保存路径
 	 */
 	public static void makeHtml(String tlPath, Map<String, Object> paras, String htmlPath) {
-		makeHtml(tlPath, paras, htmlPath, "UTF-8");
+		makeHtml(tlPath, paras, htmlPath, CharsetKit.UTF_8);
 	}
 	
 	/**

src/main/java/com/smallchill/core/toolbox/kit/HashKit.java

@@ -46,7 +46,7 @@ public class HashKit {
 		try {
 			StringBuilder result = new StringBuilder();
 			MessageDigest md = MessageDigest.getInstance(algorithm);
-			byte[] bytes = md.digest(srcStr.getBytes("utf-8"));
+			byte[] bytes = md.digest(srcStr.getBytes(CharsetKit.UTF_8));
 			for (byte b : bytes) {
 				String hex = Integer.toHexString(b&0xFF);
 				if (hex.length() == 1)

src/main/java/com/smallchill/core/toolbox/kit/HttpKit.java

@@ -29,7 +29,6 @@ import com.smallchill.core.toolbox.support.WafRequestWrapper;
 public class HttpKit {
 	private static PoolingHttpClientConnectionManager cm;
 	private static String EMPTY_STR = "";
-	private static String UTF_8 = "UTF-8";
 
 	private static void init() {
 		if (cm == null) {
@@ -85,7 +84,7 @@ public class HttpKit {
 	public static String post(String url, Map<String, Object> params) throws UnsupportedEncodingException {
 		HttpPost httpPost = new HttpPost(url);
 		ArrayList<NameValuePair> pairs = covertParams2NVPS(params);
-		httpPost.setEntity(new UrlEncodedFormEntity(pairs, UTF_8));
+		httpPost.setEntity(new UrlEncodedFormEntity(pairs, CharsetKit.UTF_8));
 		return getResult(httpPost);
 	}
 
@@ -97,7 +96,7 @@ public class HttpKit {
 		}
 
 		ArrayList<NameValuePair> pairs = covertParams2NVPS(params);
-		httpPost.setEntity(new UrlEncodedFormEntity(pairs, UTF_8));
+		httpPost.setEntity(new UrlEncodedFormEntity(pairs, CharsetKit.UTF_8));
 
 		return getResult(httpPost);
 	}

src/main/java/com/smallchill/core/toolbox/kit/URLKit.java

@@ -135,6 +135,8 @@ public class URLKit {
 	 * @exception ToolBoxException UnsupportedEncodingException
 	 */
 	public static String encode(String url, String charset) {
+		if (StrKit.isBlank(url))
+			return StrKit.EMPTY;
 		try {
 			return URLEncoder.encode(url, charset);
 		} catch (UnsupportedEncodingException e) {
@@ -150,6 +152,8 @@ public class URLKit {
 	 * @exception ToolBoxException UnsupportedEncodingException
 	 */
 	public static String decode(String url, String charset) {
+		if (StrKit.isBlank(url))
+			return StrKit.EMPTY;
 		try {
 			return URLDecoder.decode(url, charset);
 		} catch (UnsupportedEncodingException e) {

src/main/java/com/smallchill/core/toolbox/log/BladeLogFactory.java

@@ -38,7 +38,7 @@ import com.smallchill.system.model.OperationLog;
 public class BladeLogFactory implements ILog {
 
 	public String[] logPatten() {
-		String[] patten = { "login", "logout", "grant", "save", "update", "remove", "del", "delete", "restore" };
+		String[] patten = { "login", "logout", "grant", "save", "update", "remove", "del", "delete", "restore", "change" };
 		return patten;
 	}
 
@@ -52,7 +52,8 @@ public class BladeLogFactory implements ILog {
 				.set("remove", "删除")
 				.set("del", "删除")
 				.set("delete", "删除")
-				.set("restore", "还原");
+				.set("restore", "还原")
+				.set("restore", "变更");
 		return rd;
 	}
 

src/main/resources/beetl.properties

@@ -1,10 +1,14 @@
 #默认配置
 ENGINE=org.beetl.core.engine.FastRuntimeEngine
+
+#开始结束占位符
 DELIMITER_PLACEHOLDER_START = ${
 DELIMITER_PLACEHOLDER_END = }
+
 #开始结束标签
 DELIMITER_STATEMENT_START = @
 DELIMITER_STATEMENT_END = null
+
 DIRECT_BYTE_OUTPUT = FALSE
 HTML_TAG_SUPPORT = true
 HTML_TAG_FLAG = blade:
@@ -14,18 +18,24 @@ TEMPLATE_CHARSET = UTF-8
 ERROR_HANDLER = org.beetl.core.ConsoleErrorHandler
 NATIVE_SECUARTY_MANAGER= org.beetl.core.DefaultNativeSecurityManager
 MVC_STRICT = FALSE
+
 #资源配置，resource后的属性只限于特定ResourceLoader
 RESOURCE_LOADER=org.beetl.core.resource.ClasspathResourceLoader
+
 #classpath 根路径
 RESOURCE.root = /WEB-INF/view
+
 #是否检测文件变化
 RESOURCE.autoCheck= true
+
 #自定义脚本方法文件的Root目录和后缀
 RESOURCE.functionRoot = functions
 RESOURCE.functionSuffix = html
+
 #自定义标签文件Root目录和后缀
 RESOURCE.tagRoot = common/_widget
 RESOURCE.tagSuffix = tag
+
 ##### 扩展 ##############
 TAG.trim= org.beetl.sql.core.engine.TrimTag
 ## 内置的方法

src/main/resources/spring/springmvc-servlet.xml

@@ -60,12 +60,11 @@
 		                <value>DisableCircularReferenceDetect</value>
 		            </list>
         		</property>
-        		<property name="serializerFeatures">
+        		<!-- <property name="serializerFeatures">
 	        		<list>
-	        			<!-- 空字段也返回, 不需要的可以注释掉 -->
+		                <value>WriteMapNullValue</value>
-		                <!-- <value>WriteMapNullValue</value> -->
 		            </list>
-        		</property>
+        		</property> -->
         		<property name="dateFormat" value="yyyy-MM-dd HH:mm:ss"></property>
         	</bean>
         </property>

src/test/java/com/smallchill/test/beetlsql/BeetlTest.java

@@ -12,6 +12,7 @@ import org.beetl.sql.core.db.MySqlStyle;
 import org.junit.Test;
 
 import com.smallchill.core.beetl.ReportInterceptor;
+import com.smallchill.core.toolbox.kit.CharsetKit;
 
 @SuppressWarnings("rawtypes")
 public class BeetlTest {
@@ -29,7 +30,7 @@ public class BeetlTest {
 		MySqlConnection cs = new MySqlConnection();
 		SQLLoader loader = new ClasspathLoader("/beetlsql");
 		SQLManager sql = new SQLManager(style, loader, cs, new DefaultNameConversion(), new Interceptor[] { new ReportInterceptor() });
-		sql.getSqlLoader().setCharset("UTF-8");
+		sql.getSqlLoader().setCharset(CharsetKit.UTF_8);
 		sql.getSqlLoader().setAutoCheck(true);
 		return sql;
 	}