github/SpringBlade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
zhuangqian 2016-11-25 22:29:17 +08:00
parent c49c4cdc4f
commit 7363fe2bb1
10 changed files with 213 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/conf/dev/config/beetlsql.properties
View File

@ -1,7 +1,7 @@
ENGINE=org.beetl.sql.core.engine.SQLTemplateEngine ENGINE = org.beetl.sql.core.engine.SQLTemplateEngine
DELIMITER_PLACEHOLDER_START=#{ DELIMITER_PLACEHOLDER_START = #{
DELIMITER_PLACEHOLDER_END=} DELIMITER_PLACEHOLDER_END = }
DELIMITER_STATEMENT_START=@ DELIMITER_STATEMENT_START = @
DELIMITER_STATEMENT_END= DELIMITER_STATEMENT_END=
HTML_TAG_SUPPORT = false HTML_TAG_SUPPORT = false
CHARSET= UTF-8 CHARSET= UTF-8
@ -9,12 +9,12 @@ FN.use = org.beetl.sql.core.engine.UseFunction
FN.globalUse = org.beetl.sql.core.engine.GlobalUseFunction FN.globalUse = org.beetl.sql.core.engine.GlobalUseFunction
FN.text = org.beetl.sql.core.engine.TextFunction FN.text = org.beetl.sql.core.engine.TextFunction
FN.join = org.beetl.sql.ext.JoinFunction FN.join = org.beetl.sql.ext.JoinFunction
FN.isEmpty=org.beetl.sql.ext.EmptyExpressionFunction FN.isEmpty = org.beetl.sql.ext.EmptyExpressionFunction
FN.page=org.beetl.sql.core.engine.PageQueryFuntion FN.page = org.beetl.sql.core.engine.PageQueryFuntion
FN.orm.many=org.beetl.sql.core.orm.ORMManyEntityFunction FN.orm.many = org.beetl.sql.core.orm.ORMManyEntityFunction
FN.orm.single=org.beetl.sql.core.orm.ORMSingleEntityFunction FN.orm.single = org.beetl.sql.core.orm.ORMSingleEntityFunction
TAG.trim= org.beetl.sql.core.engine.TrimTag TAG.trim = org.beetl.sql.core.engine.TrimTag
TAG.pageTag= org.beetl.sql.core.engine.PageQueryTag TAG.pageTag = org.beetl.sql.core.engine.PageQueryTag
ERROR_HANDLER = org.beetl.sql.core.engine.BeetlSQLTemplateExceptionHandler ERROR_HANDLER = org.beetl.sql.core.engine.BeetlSQLTemplateExceptionHandler
PRODUCT_MODE = false PRODUCT_MODE = false
OFFSET_START_ZERO = false OFFSET_START_ZERO = false

20
src/main/conf/production/config/beetlsql.properties
View File

@ -1,7 +1,7 @@
ENGINE=org.beetl.sql.core.engine.SQLTemplateEngine ENGINE = org.beetl.sql.core.engine.SQLTemplateEngine
DELIMITER_PLACEHOLDER_START=#{ DELIMITER_PLACEHOLDER_START = #{
DELIMITER_PLACEHOLDER_END=} DELIMITER_PLACEHOLDER_END = }
DELIMITER_STATEMENT_START=@ DELIMITER_STATEMENT_START = @
DELIMITER_STATEMENT_END= DELIMITER_STATEMENT_END=
HTML_TAG_SUPPORT = false HTML_TAG_SUPPORT = false
CHARSET= UTF-8 CHARSET= UTF-8
@ -9,12 +9,12 @@ FN.use = org.beetl.sql.core.engine.UseFunction
FN.globalUse = org.beetl.sql.core.engine.GlobalUseFunction FN.globalUse = org.beetl.sql.core.engine.GlobalUseFunction
FN.text = org.beetl.sql.core.engine.TextFunction FN.text = org.beetl.sql.core.engine.TextFunction
FN.join = org.beetl.sql.ext.JoinFunction FN.join = org.beetl.sql.ext.JoinFunction
FN.isEmpty=org.beetl.sql.ext.EmptyExpressionFunction FN.isEmpty = org.beetl.sql.ext.EmptyExpressionFunction
FN.page=org.beetl.sql.core.engine.PageQueryFuntion FN.page = org.beetl.sql.core.engine.PageQueryFuntion
FN.orm.many=org.beetl.sql.core.orm.ORMManyEntityFunction FN.orm.many = org.beetl.sql.core.orm.ORMManyEntityFunction
FN.orm.single=org.beetl.sql.core.orm.ORMSingleEntityFunction FN.orm.single = org.beetl.sql.core.orm.ORMSingleEntityFunction
TAG.trim= org.beetl.sql.core.engine.TrimTag TAG.trim = org.beetl.sql.core.engine.TrimTag
TAG.pageTag= org.beetl.sql.core.engine.PageQueryTag TAG.pageTag = org.beetl.sql.core.engine.PageQueryTag
ERROR_HANDLER = org.beetl.sql.core.engine.BeetlSQLTemplateExceptionHandler ERROR_HANDLER = org.beetl.sql.core.engine.BeetlSQLTemplateExceptionHandler
PRODUCT_MODE = true PRODUCT_MODE = true
OFFSET_START_ZERO = false OFFSET_START_ZERO = false

3
src/main/java/com/smallchill/core/beetl/BeetlMaker.java
View File

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

2
src/main/java/com/smallchill/core/toolbox/kit/HashKit.java
View File

@ -46,7 +46,7 @@ public class HashKit {
try { try {
StringBuilder result = new StringBuilder(); StringBuilder result = new StringBuilder();
MessageDigest md = MessageDigest.getInstance(algorithm); 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) { for (byte b : bytes) {
String hex = Integer.toHexString(b&0xFF); String hex = Integer.toHexString(b&0xFF);
if (hex.length() == 1) if (hex.length() == 1)

5
src/main/java/com/smallchill/core/toolbox/kit/HttpKit.java
View File

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

4
src/main/java/com/smallchill/core/toolbox/kit/URLKit.java
View File

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

7
src/main/java/com/smallchill/core/toolbox/log/BladeLogFactory.java
View File

@ -38,7 +38,7 @@ import com.smallchill.system.model.OperationLog;
public class BladeLogFactory implements ILog { public class BladeLogFactory implements ILog {
public String[] logPatten() { 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; return patten;
} }
@ -52,7 +52,8 @@ public class BladeLogFactory implements ILog {
.set("remove", "删除") .set("remove", "删除")
.set("del", "删除") .set("del", "删除")
.set("delete", "删除") .set("delete", "删除")
.set("restore", "还原"); .set("restore", "还原")
.set("restore", "变更");
return rd; return rd;
} }
@ -79,7 +80,7 @@ public class BladeLogFactory implements ILog {
OperationLog log = new OperationLog(); OperationLog log = new OperationLog();
log.setMethod(msg); log.setMethod(msg);
log.setCreatetime(new Date()); log.setCreatetime(new Date());
log.setSucceed((succeed)?"1":"0"); log.setSucceed((succeed) ? "1" : "0");
log.setUserid(Func.toStr(user.getId())); log.setUserid(Func.toStr(user.getId()));
log.setLogname(logName); log.setLogname(logName);
boolean temp = Blade.create(OperationLog.class).save(log); boolean temp = Blade.create(OperationLog.class).save(log);

24
src/main/resources/beetl.properties
View File

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

7
src/main/resources/spring/springmvc-servlet.xml
View File

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

3
src/test/java/com/smallchill/test/beetlsql/BeetlTest.java
View File

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