lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DataSource增加字段加解密功能，主类:CryptColumn/CryptHandler

Browse Source
This commit is contained in:
Redkale
2019-01-11 16:41:14 +08:00
parent 623c0a127e
commit 91d4477ed9
6 changed files with 165 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/org/redkale/source/CryptColumn.java Normal file
View File

@@ -0,0 +1,29 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package org.redkale.source;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.*;
/**
* 加密字段标记 <br>
* 注意: 加密字段不能用于 LIKE 等过滤查询
*
* <p>
* 详情见: https://redkale.org
*
* @author zhangjx
* @since 2.0.0
*/
@Inherited
@Documented
@Target({FIELD})
@Retention(RUNTIME)
public @interface CryptColumn {
Class<? extends CryptHandler> handler();
}

38
src/org/redkale/source/CryptHandler.java Normal file
View File

@@ -0,0 +1,38 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package org.redkale.source;
/**
* 字段加密解密接口
*
* <p>
* 详情见: https://redkale.org
*
* @author zhangjx
* @since 2.0.0
* @param <S> 加密的字段类型
* @param <D> 加密后的数据类型
*/
public interface CryptHandler<S, D> {
/**
* 加密
*
* @param value 加密前的字段值
*
* @return 加密后的字段值
*/
public D encrypt(S value);
/**
* 解密
*
* @param value 加密的字段值
*
* @return 解密后的字段值
*/
public S decrypt(D value);
}

12
src/org/redkale/source/DataJdbcSource.java
View File

@@ -137,7 +137,7 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
int i = 0; int i = 0;
for (char ch : sqlchars) { for (char ch : sqlchars) {
if (ch == '?') { if (ch == '?') {
Object obj = attrs[i++].get(value); Object obj = info.getSQLValue(attrs[i++], value);
if (obj != null && obj.getClass().isArray()) { if (obj != null && obj.getClass().isArray()) {
sb.append("'[length=").append(java.lang.reflect.Array.getLength(obj)).append("]'"); sb.append("'[length=").append(java.lang.reflect.Array.getLength(obj)).append("]'");
} else { } else {
@@ -174,10 +174,10 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
return prestmt; return prestmt;
} }
protected <T> int batchStatementParameters(Connection conn, PreparedStatement prestmt, EntityInfo<T> info, Attribute<T, Serializable>[] attrs, T value) throws SQLException { protected <T> int batchStatementParameters(Connection conn, PreparedStatement prestmt, EntityInfo<T> info, Attribute<T, Serializable>[] attrs, T entity) throws SQLException {
int i = 0; int i = 0;
for (Attribute<T, Serializable> attr : attrs) { for (Attribute<T, Serializable> attr : attrs) {
Serializable val = attr.get(value); Serializable val = info.getSQLValue(attr, entity);
if (val instanceof byte[]) { if (val instanceof byte[]) {
Blob blob = conn.createBlob(); Blob blob = conn.createBlob();
blob.setBytes(1, (byte[]) val); blob.setBytes(1, (byte[]) val);
@@ -186,7 +186,7 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
prestmt.setObject(++i, ((AtomicInteger) val).get()); prestmt.setObject(++i, ((AtomicInteger) val).get());
} else if (val instanceof AtomicLong) { } else if (val instanceof AtomicLong) {
prestmt.setObject(++i, ((AtomicLong) val).get()); prestmt.setObject(++i, ((AtomicLong) val).get());
} else if (val != null && !(val instanceof Number) && !(val instanceof CharSequence) && !(value instanceof java.util.Date) } else if (val != null && !(val instanceof Number) && !(val instanceof CharSequence) && !(entity instanceof java.util.Date)
&& !val.getClass().getName().startsWith("java.sql.") && !val.getClass().getName().startsWith("java.time.")) { && !val.getClass().getName().startsWith("java.sql.") && !val.getClass().getName().startsWith("java.time.")) {
prestmt.setObject(++i, info.jsonConvert.convertTo(attr.genericType(), val)); prestmt.setObject(++i, info.jsonConvert.convertTo(attr.genericType(), val));
} else { } else {
@@ -281,7 +281,7 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
StringBuilder sb = new StringBuilder(128); StringBuilder sb = new StringBuilder(128);
for (char ch : sqlchars) { for (char ch : sqlchars) {
if (ch == '?') { if (ch == '?') {
Object obj = i == attrs.length ? primary.get(value) : attrs[i++].get(value); Object obj = i == attrs.length ? info.getSQLValue(primary, value) : info.getSQLValue(attrs[i++], value);
if (obj != null && obj.getClass().isArray()) { if (obj != null && obj.getClass().isArray()) {
sb.append("'[length=").append(java.lang.reflect.Array.getLength(obj)).append("]'"); sb.append("'[length=").append(java.lang.reflect.Array.getLength(obj)).append("]'");
} else { } else {
@@ -292,7 +292,7 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
} }
} }
String debugsql = sb.toString(); String debugsql = sb.toString();
if (info.isLoggable(logger, Level.FINEST, debugsql)) logger.finest(info.getType().getSimpleName() + " update sql=" + debugsql.replaceAll("(\r|\n)", "\\n")); if (info.isLoggable(logger, Level.FINEST, debugsql)) logger.finest(info.getType().getSimpleName() + " updates sql=" + debugsql.replaceAll("(\r|\n)", "\\n"));
} //打印结束 } //打印结束
} }
int[] pc = prestmt.executeBatch(); int[] pc = prestmt.executeBatch();

27
src/org/redkale/source/DataSqlSource.java
View File

@@ -483,13 +483,13 @@ public abstract class DataSqlSource<DBChannel> extends AbstractService implement
protected <T> CompletableFuture<Integer> deleteCompose(final EntityInfo<T> info, final Serializable... ids) { protected <T> CompletableFuture<Integer> deleteCompose(final EntityInfo<T> info, final Serializable... ids) {
if (ids.length == 1) { if (ids.length == 1) {
String sql = "DELETE FROM " + info.getTable(ids[0]) + " WHERE " + info.getPrimarySQLColumn() + " = " + FilterNode.formatToString(ids[0]); String sql = "DELETE FROM " + info.getTable(ids[0]) + " WHERE " + info.getPrimarySQLColumn() + " = " + FilterNode.formatToString(info.getSQLValue(info.getPrimarySQLColumn(), ids[0]));
return deleteDB(info, null, sql); return deleteDB(info, null, sql);
} }
String sql = "DELETE FROM " + info.getTable(ids[0]) + " WHERE " + info.getPrimarySQLColumn() + " IN ("; String sql = "DELETE FROM " + info.getTable(ids[0]) + " WHERE " + info.getPrimarySQLColumn() + " IN (";
for (int i = 0; i < ids.length; i++) { for (int i = 0; i < ids.length; i++) {
if (i > 0) sql += ','; if (i > 0) sql += ',';
sql += FilterNode.formatToString(ids[i]); sql += FilterNode.formatToString(info.getSQLValue(info.getPrimarySQLColumn(), ids[i]));
} }
sql += ")"; sql += ")";
if (info.isLoggable(logger, Level.FINEST, sql)) logger.finest(info.getType().getSimpleName() + " delete sql=" + sql); if (info.isLoggable(logger, Level.FINEST, sql)) logger.finest(info.getType().getSimpleName() + " delete sql=" + sql);
@@ -772,11 +772,11 @@ public abstract class DataSqlSource<DBChannel> extends AbstractService implement
protected <T> CompletableFuture<Integer> updateColumnCompose(final EntityInfo<T> info, Serializable id, String column, final Serializable value) { protected <T> CompletableFuture<Integer> updateColumnCompose(final EntityInfo<T> info, Serializable id, String column, final Serializable value) {
if (value instanceof byte[]) { if (value instanceof byte[]) {
String sql = "UPDATE " + info.getTable(id) + " SET " + info.getSQLColumn(null, column) + " = " + prepareParamSign(1) + " WHERE " + info.getPrimarySQLColumn() + " = " + FilterNode.formatToString(id); String sql = "UPDATE " + info.getTable(id) + " SET " + info.getSQLColumn(null, column) + " = " + prepareParamSign(1) + " WHERE " + info.getPrimarySQLColumn() + " = " + FilterNode.formatToString(info.getSQLValue(info.getPrimarySQLColumn(), id));
return updateDB(info, null, sql, true, value); return updateDB(info, null, sql, true, value);
} else { } else {
String sql = "UPDATE " + info.getTable(id) + " SET " + info.getSQLColumn(null, column) + " = " String sql = "UPDATE " + info.getTable(id) + " SET " + info.getSQLColumn(null, column) + " = "
+ info.formatToString(value) + " WHERE " + info.getPrimarySQLColumn() + " = " + FilterNode.formatToString(id); + info.formatToString(info.getSQLValue(column, value)) + " WHERE " + info.getPrimarySQLColumn() + " = " + FilterNode.formatToString(info.getSQLValue(info.getPrimarySQLColumn(), id));
return updateDB(info, null, sql, false); return updateDB(info, null, sql, false);
} }
} }
@@ -917,11 +917,11 @@ public abstract class DataSqlSource<DBChannel> extends AbstractService implement
blobs.add((byte[]) col.getValue()); blobs.add((byte[]) col.getValue());
setsql.append(c).append(" = ").append(prepareParamSign(++index)); setsql.append(c).append(" = ").append(prepareParamSign(++index));
} else { } else {
setsql.append(c).append(" = ").append(info.formatSQLValue(c, col)); setsql.append(c).append(" = ").append(info.formatSQLValue(c, attr, col));
} }
} }
if (setsql.length() < 1) return CompletableFuture.completedFuture(0); if (setsql.length() < 1) return CompletableFuture.completedFuture(0);
String sql = "UPDATE " + info.getTable(id) + " SET " + setsql + " WHERE " + info.getPrimarySQLColumn() + " = " + FilterNode.formatToString(id); String sql = "UPDATE " + info.getTable(id) + " SET " + setsql + " WHERE " + info.getPrimarySQLColumn() + " = " + FilterNode.formatToString(info.getSQLValue(info.getPrimarySQLColumn(), id));
if (blobs == null) return updateDB(info, null, sql, false); if (blobs == null) return updateDB(info, null, sql, false);
return updateDB(info, null, sql, true, blobs.toArray()); return updateDB(info, null, sql, true, blobs.toArray());
} }
@@ -999,7 +999,7 @@ public abstract class DataSqlSource<DBChannel> extends AbstractService implement
blobs.add((byte[]) col.getValue()); blobs.add((byte[]) col.getValue());
setsql.append(c).append(" = ").append(prepareParamSign(++index)); setsql.append(c).append(" = ").append(prepareParamSign(++index));
} else { } else {
setsql.append(c).append(" = ").append(info.formatSQLValue(c, col)); setsql.append(c).append(" = ").append(info.formatSQLValue(c, attr, col));
} }
} }
if (setsql.length() < 1) return CompletableFuture.completedFuture(0); if (setsql.length() < 1) return CompletableFuture.completedFuture(0);
@@ -1128,7 +1128,7 @@ public abstract class DataSqlSource<DBChannel> extends AbstractService implement
if (!selects.test(attr.field())) continue; if (!selects.test(attr.field())) continue;
if (setsql.length() > 0) setsql.append(", "); if (setsql.length() > 0) setsql.append(", ");
setsql.append(info.getSQLColumn(alias, attr.field())); setsql.append(info.getSQLColumn(alias, attr.field()));
Serializable val = attr.get(bean); Serializable val = info.getFieldValue(attr, bean);
if (val instanceof byte[]) { if (val instanceof byte[]) {
if (blobs == null) blobs = new ArrayList<>(); if (blobs == null) blobs = new ArrayList<>();
blobs.add((byte[]) val); blobs.add((byte[]) val);
@@ -1154,8 +1154,8 @@ public abstract class DataSqlSource<DBChannel> extends AbstractService implement
if (blobs == null) return updateDB(info, null, sql, false); if (blobs == null) return updateDB(info, null, sql, false);
return updateDB(info, null, sql, true, blobs.toArray()); return updateDB(info, null, sql, true, blobs.toArray());
} else { } else {
final Serializable id = info.getPrimary().get(bean); final Serializable id = info.getSQLValue(info.getPrimary(), bean);
String sql = "UPDATE " + info.getTable(id) + " a SET " + setsql + " WHERE " + info.getPrimarySQLColumn() + " = " + FilterNode.formatToString(id); String sql = "UPDATE " + info.getTable(id) + " a SET " + setsql + " WHERE " + info.getPrimarySQLColumn() + " = " + info.getSQLValue(info.getPrimarySQLColumn(), id);
if (blobs == null) return updateDB(info, null, sql, false); if (blobs == null) return updateDB(info, null, sql, false);
return updateDB(info, null, sql, true, blobs.toArray()); return updateDB(info, null, sql, true, blobs.toArray());
} }
@@ -1533,7 +1533,8 @@ public abstract class DataSqlSource<DBChannel> extends AbstractService implement
} }
protected <T> CompletableFuture<T> findCompose(final EntityInfo<T> info, final SelectColumn selects, Serializable pk) { protected <T> CompletableFuture<T> findCompose(final EntityInfo<T> info, final SelectColumn selects, Serializable pk) {
final String sql = "SELECT " + info.getQueryColumns(null, selects) + " FROM " + info.getTable(pk) + " WHERE " + info.getPrimarySQLColumn() + " = " + FilterNode.formatToString(pk); String column = info.getPrimarySQLColumn();
final String sql = "SELECT " + info.getQueryColumns(null, selects) + " FROM " + info.getTable(pk) + " WHERE " + column + " = " + FilterNode.formatToString(info.getSQLValue(column, pk));
if (info.isLoggable(logger, Level.FINEST, sql)) logger.finest(info.getType().getSimpleName() + " find sql=" + sql); if (info.isLoggable(logger, Level.FINEST, sql)) logger.finest(info.getType().getSimpleName() + " find sql=" + sql);
return findDB(info, sql, true, selects); return findDB(info, sql, true, selects);
} }
@@ -1670,7 +1671,7 @@ public abstract class DataSqlSource<DBChannel> extends AbstractService implement
} }
protected <T> CompletableFuture<Serializable> findColumnCompose(final EntityInfo<T> info, String column, final Serializable defValue, final Serializable pk) { protected <T> CompletableFuture<Serializable> findColumnCompose(final EntityInfo<T> info, String column, final Serializable defValue, final Serializable pk) {
final String sql = "SELECT " + info.getSQLColumn(null, column) + " FROM " + info.getTable(pk) + " WHERE " + info.getPrimarySQLColumn() + " = " + FilterNode.formatToString(pk); final String sql = "SELECT " + info.getSQLColumn(null, column) + " FROM " + info.getTable(pk) + " WHERE " + info.getPrimarySQLColumn() + " = " + FilterNode.formatToString(info.getSQLValue(info.getPrimarySQLColumn(), pk));
if (info.isLoggable(logger, Level.FINEST, sql)) logger.finest(info.getType().getSimpleName() + " find sql=" + sql); if (info.isLoggable(logger, Level.FINEST, sql)) logger.finest(info.getType().getSimpleName() + " find sql=" + sql);
return findColumnDB(info, sql, true, column, defValue); return findColumnDB(info, sql, true, column, defValue);
} }
@@ -1732,7 +1733,7 @@ public abstract class DataSqlSource<DBChannel> extends AbstractService implement
} }
protected <T> CompletableFuture<Boolean> existsCompose(final EntityInfo<T> info, Serializable pk) { protected <T> CompletableFuture<Boolean> existsCompose(final EntityInfo<T> info, Serializable pk) {
final String sql = "SELECT COUNT(*) FROM " + info.getTable(pk) + " WHERE " + info.getPrimarySQLColumn() + " = " + FilterNode.formatToString(pk); final String sql = "SELECT COUNT(*) FROM " + info.getTable(pk) + " WHERE " + info.getPrimarySQLColumn() + " = " + FilterNode.formatToString(info.getSQLValue(info.getPrimarySQLColumn(), pk));
if (info.isLoggable(logger, Level.FINEST, sql)) logger.finest(info.getType().getSimpleName() + " exists sql=" + sql); if (info.isLoggable(logger, Level.FINEST, sql)) logger.finest(info.getType().getSimpleName() + " exists sql=" + sql);
return existsDB(info, sql, true); return existsDB(info, sql, true);
} }

84
src/org/redkale/source/EntityInfo.java
View File

@@ -75,6 +75,10 @@ public final class EntityInfo<T> {
//只有field.name 与 Column.name不同才存放在aliasmap里. //只有field.name 与 Column.name不同才存放在aliasmap里.
private final Map<String, String> aliasmap; private final Map<String, String> aliasmap;
//key是field的name， value是CryptHandler
//字段都不存在CryptHandler时值因为为null，减少判断
private final Map<String, CryptHandler> cryptmap;
//所有可更新字段，即排除了主键字段和标记为&#064;Column(updatable=false)的字段 //所有可更新字段，即排除了主键字段和标记为&#064;Column(updatable=false)的字段
private final Map<String, Attribute<T, Serializable>> updateAttributeMap = new HashMap<>(); private final Map<String, Attribute<T, Serializable>> updateAttributeMap = new HashMap<>();
@@ -274,6 +278,7 @@ public final class EntityInfo<T> {
} }
this.constructorParameters = (cp == null || cp.value().length < 1) ? null : cp.value(); this.constructorParameters = (cp == null || cp.value().length < 1) ? null : cp.value();
Attribute idAttr0 = null; Attribute idAttr0 = null;
Map<String, CryptHandler> cryptmap0 = null;
Map<String, String> aliasmap0 = null; Map<String, String> aliasmap0 = null;
Class cltmp = type; Class cltmp = type;
Set<String> fields = new HashSet<>(); Set<String> fields = new HashSet<>();
@@ -284,7 +289,7 @@ public final class EntityInfo<T> {
List<Attribute<T, Serializable>> updateattrs = new ArrayList<>(); List<Attribute<T, Serializable>> updateattrs = new ArrayList<>();
boolean auto = false; boolean auto = false;
boolean uuid = false; boolean uuid = false;
Map<Class, Creator<CryptHandler>> cryptCreatorMap = new HashMap<>();
do { do {
for (Field field : cltmp.getDeclaredFields()) { for (Field field : cltmp.getDeclaredFields()) {
if (Modifier.isStatic(field.getModifiers())) continue; if (Modifier.isStatic(field.getModifiers())) continue;
@@ -298,9 +303,16 @@ public final class EntityInfo<T> {
if (aliasmap0 == null) aliasmap0 = new HashMap<>(); if (aliasmap0 == null) aliasmap0 = new HashMap<>();
aliasmap0.put(fieldname, sqlfield); aliasmap0.put(fieldname, sqlfield);
} }
final CryptColumn cpt = field.getAnnotation(CryptColumn.class);
CryptHandler cryptHandler = null;
if (cpt != null) {
if (cryptmap0 == null) cryptmap0 = new HashMap<>();
cryptHandler = cryptCreatorMap.computeIfAbsent(cpt.handler(), c -> (Creator<CryptHandler>) Creator.create(cpt.handler())).create();
cryptmap0.put(fieldname, cryptHandler);
}
Attribute attr; Attribute attr;
try { try {
attr = Attribute.create(cltmp, field); attr = Attribute.create(cltmp, field, cryptHandler);
} catch (RuntimeException e) { } catch (RuntimeException e) {
continue; continue;
} }
@@ -357,6 +369,7 @@ public final class EntityInfo<T> {
this.primary = idAttr0; this.primary = idAttr0;
this.aliasmap = aliasmap0; this.aliasmap = aliasmap0;
this.cryptmap = cryptmap0;
this.attributes = attributeMap.values().toArray(new Attribute[attributeMap.size()]); this.attributes = attributeMap.values().toArray(new Attribute[attributeMap.size()]);
this.queryAttributes = queryattrs.toArray(new Attribute[queryattrs.size()]); this.queryAttributes = queryattrs.toArray(new Attribute[queryattrs.size()]);
this.insertAttributes = insertattrs.toArray(new Attribute[insertattrs.size()]); this.insertAttributes = insertattrs.toArray(new Attribute[insertattrs.size()]);
@@ -857,6 +870,51 @@ public final class EntityInfo<T> {
: (tabalis == null ? aliasmap.getOrDefault(fieldname, fieldname) : (tabalis + '.' + aliasmap.getOrDefault(fieldname, fieldname))); : (tabalis == null ? aliasmap.getOrDefault(fieldname, fieldname) : (tabalis + '.' + aliasmap.getOrDefault(fieldname, fieldname)));
} }
/**
* 字段值转换成数据库的值
*
* @param fieldname 字段名
* @param fieldvalue 字段值
*
* @return Object
*/
public Object getSQLValue(String fieldname, Object fieldvalue) {
if (this.cryptmap == null) return fieldvalue;
CryptHandler handler = this.cryptmap.get(fieldname);
if (handler == null) return fieldvalue;
return handler.encrypt(fieldvalue);
}
/**
* 字段值转换成数据库的值
*
* @param attr Attribute
* @param entity 记录对象
*
* @return Object
*/
public Serializable getSQLValue(Attribute<T, Serializable> attr, T entity) {
Serializable val = attr.get(entity);
CryptHandler cryptHandler = attr.attach();
if (cryptHandler != null) val = (Serializable) cryptHandler.encrypt(val);
return val;
}
/**
* 数据库的值转换成数字段值
*
* @param attr Attribute
* @param entity 记录对象
*
* @return Object
*/
public Serializable getFieldValue(Attribute<T, Serializable> attr, T entity) {
Serializable val = attr.get(entity);
CryptHandler cryptHandler = attr.attach();
if (cryptHandler != null) val = (Serializable) cryptHandler.decrypt(val);
return val;
}
/** /**
* 获取主键字段的表字段名 * 获取主键字段的表字段名
* *
@@ -881,25 +939,29 @@ public final class EntityInfo<T> {
* 拼接UPDATE给字段赋值的SQL片段 * 拼接UPDATE给字段赋值的SQL片段
* *
* @param col 表字段名 * @param col 表字段名
* @param attr Attribute
* @param cv ColumnValue * @param cv ColumnValue
* *
* @return CharSequence * @return CharSequence
*/ */
protected CharSequence formatSQLValue(String col, final ColumnValue cv) { protected CharSequence formatSQLValue(String col, Attribute<T, Serializable> attr, final ColumnValue cv) {
if (cv == null) return null; if (cv == null) return null;
Object val = cv.getValue();
CryptHandler handler = attr.attach();
if (handler != null) val = handler.encrypt(val);
switch (cv.getExpress()) { switch (cv.getExpress()) {
case INC: case INC:
return new StringBuilder().append(col).append(" + ").append(cv.getValue()); return new StringBuilder().append(col).append(" + ").append(val);
case MUL: case MUL:
return new StringBuilder().append(col).append(" * ").append(cv.getValue()); return new StringBuilder().append(col).append(" * ").append(val);
case AND: case AND:
return new StringBuilder().append(col).append(" & ").append(cv.getValue()); return new StringBuilder().append(col).append(" & ").append(val);
case ORR: case ORR:
return new StringBuilder().append(col).append(" | ").append(cv.getValue()); return new StringBuilder().append(col).append(" | ").append(val);
case MOV: case MOV:
return formatToString(cv.getValue()); return formatToString(val);
} }
return formatToString(cv.getValue()); return formatToString(val);
} }
/** /**
@@ -1003,9 +1065,13 @@ public final class EntityInfo<T> {
o = null; o = null;
} else { //不支持超过2G的数据 } else { //不支持超过2G的数据
o = blob.getBytes(1, (int) blob.length()); o = blob.getBytes(1, (int) blob.length());
CryptHandler cryptHandler = attr.attach();
if (cryptHandler != null) o = (Serializable) cryptHandler.decrypt(o);
} }
} else { } else {
o = (Serializable) set.getObject(this.getSQLColumn(null, attr.field())); o = (Serializable) set.getObject(this.getSQLColumn(null, attr.field()));
CryptHandler cryptHandler = attr.attach();
if (cryptHandler != null) o = (Serializable) cryptHandler.decrypt(o);
if (t.isPrimitive()) { if (t.isPrimitive()) {
if (o != null) { if (o != null) {
if (t == int.class) { if (t == int.class) {

2
src/org/redkale/source/FilterNode.java
View File

@@ -389,7 +389,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
.append(' ').append(fv.getExpress().value()).append(' ').append(fv.getDestvalue()); .append(' ').append(fv.getExpress().value()).append(' ').append(fv.getDestvalue());
} }
final boolean fk = (val0 instanceof FilterKey); final boolean fk = (val0 instanceof FilterKey);
CharSequence val = fk ? info.getSQLColumn(talis, ((FilterKey) val0).getColumn()) : formatToString(express, val0); CharSequence val = fk ? info.getSQLColumn(talis, ((FilterKey) val0).getColumn()) : formatToString(express, info.getSQLValue(column, val0));
if (val == null) return null; if (val == null) return null;
StringBuilder sb = new StringBuilder(32); StringBuilder sb = new StringBuilder(32);
if (express == CONTAIN) return info.containSQL.replace("${column}", info.getSQLColumn(talis, column)).replace("${keystr}", val); if (express == CONTAIN) return info.containSQL.replace("${column}", info.getSQLColumn(talis, column)).replace("${keystr}", val);