From ef3663aa36149cf539e1b22df596c0ada2e4e8cf Mon Sep 17 00:00:00 2001
From: Redkale <8730487+redkale@users.noreply.github.com>
Date: Thu, 13 Jun 2019 22:23:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DDataSource=E4=B8=ADjson?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=8D=E4=B8=BASerializable=E6=97=B6?=
 =?UTF-8?q?=E4=BC=9A=E5=BC=82=E5=B8=B8=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/org/redkale/source/DataJdbcSource.java | 2 +-
 src/org/redkale/source/EntityInfo.java     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/org/redkale/source/DataJdbcSource.java b/src/org/redkale/source/DataJdbcSource.java
index 08239c6e4..5bd5b1af3 100644
--- a/src/org/redkale/source/DataJdbcSource.java
+++ b/src/org/redkale/source/DataJdbcSource.java
@@ -177,7 +177,7 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
     protected <T> int batchStatementParameters(Connection conn, PreparedStatement prestmt, EntityInfo<T> info, Attribute<T, Serializable>[] attrs, T entity) throws SQLException {
         int i = 0;
         for (Attribute<T, Serializable> attr : attrs) {
-            Serializable val = info.getSQLValue(attr, entity);
+            Object val = info.getSQLValue(attr, entity);
             if (val instanceof byte[]) {
                 Blob blob = conn.createBlob();
                 blob.setBytes(1, (byte[]) val);
diff --git a/src/org/redkale/source/EntityInfo.java b/src/org/redkale/source/EntityInfo.java
index 0efa6ba74..e076d4d6e 100644
--- a/src/org/redkale/source/EntityInfo.java
+++ b/src/org/redkale/source/EntityInfo.java
@@ -902,10 +902,10 @@ public final class EntityInfo<T> {
      *
      * @return Object
      */
-    public Serializable getSQLValue(Attribute<T, Serializable> attr, T entity) {
-        Serializable val = attr.get(entity);
+    public <F> Object getSQLValue(Attribute<T, F> attr, T entity) {
+        Object val = attr.get(entity);
         CryptHandler cryptHandler = attr.attach();
-        if (cryptHandler != null) val = (Serializable) cryptHandler.encrypt(val);
+        if (cryptHandler != null) val = cryptHandler.encrypt(val);
         return val;
     }