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 2017-03-01 21:03:11 +08:00
parent 78f7779e8d
commit b6acd4bf59
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/conf/dev/beetlsql.properties
View File

@ -9,7 +9,7 @@ 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.core.engine.EmptyExpressionFunction
FN.isNotEmpty = org.beetl.sql.core.engine.NotEmptyExpressionFunction FN.isNotEmpty = org.beetl.sql.core.engine.NotEmptyExpressionFunction
FN.db.testNull = org.beetl.sql.core.engine.TestNullFunction FN.db.testNull = org.beetl.sql.core.engine.TestNullFunction
FN.db.dynamicSql = org.beetl.sql.core.engine.DynamicSqlFunction FN.db.dynamicSql = org.beetl.sql.core.engine.DynamicSqlFunction

2
src/main/conf/production/beetlsql.properties
View File

@ -9,7 +9,7 @@ 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.core.engine.EmptyExpressionFunction
FN.isNotEmpty = org.beetl.sql.core.engine.NotEmptyExpressionFunction FN.isNotEmpty = org.beetl.sql.core.engine.NotEmptyExpressionFunction
FN.db.testNull = org.beetl.sql.core.engine.TestNullFunction FN.db.testNull = org.beetl.sql.core.engine.TestNullFunction
FN.db.dynamicSql = org.beetl.sql.core.engine.DynamicSqlFunction FN.db.dynamicSql = org.beetl.sql.core.engine.DynamicSqlFunction

10
src/main/java/com/smallchill/core/beetl/ReportInterceptor.java
View File

@ -18,15 +18,21 @@ package com.smallchill.core.beetl;
import org.beetl.sql.core.InterceptorContext; import org.beetl.sql.core.InterceptorContext;
import org.beetl.sql.ext.DebugInterceptor; import org.beetl.sql.ext.DebugInterceptor;
import com.smallchill.core.constant.Cst;
import com.smallchill.core.toolbox.kit.DateKit; import com.smallchill.core.toolbox.kit.DateKit;
import com.smallchill.core.toolbox.kit.Prop;
import com.smallchill.core.toolbox.kit.PropKit;
/** /**
* 重写beetlsql输出的sql语句格式 * 重写beetlsql输出的sql语句格式
*/ */
public class ReportInterceptor extends DebugInterceptor { public class ReportInterceptor extends DebugInterceptor {
public static boolean productMode = !Cst.me().isDevMode(); public static boolean productMode;
static {
Prop prop = PropKit.use("config.properties");
productMode = !prop.getBoolean("config.devMode", false);
}
@Override @Override
public void before(InterceptorContext ctx) { public void before(InterceptorContext ctx) {

6
src/main/java/com/smallchill/core/toolbox/support/Convert.java
View File

@ -37,10 +37,6 @@ public class Convert {
public static Object parse(Class<?> clazz, Object value) { public static Object parse(Class<?> clazz, Object value) {
try { try {
if (clazz.isAssignableFrom(String.class)) { if (clazz.isAssignableFrom(String.class)) {
// ----2016-12-19---zhuangqian----防止beetlsql对空字符串不检测导致无法入库的问题----
if (StrKit.isBlank(String.valueOf(value)))
return " ";
else
return String.valueOf(value); return String.valueOf(value);
} }
return clazz.cast(value); return clazz.cast(value);
@ -84,8 +80,6 @@ public class Convert {
return null; return null;
} }
if (StrKit.isBlank(valueStr)) return null;
BasicType basicType = null; BasicType basicType = null;
try { try {
basicType = BasicType.valueOf(clazz.getSimpleName().toUpperCase()); basicType = BasicType.valueOf(clazz.getSimpleName().toUpperCase());