From 9c852da49ba82e878d3d94bab63d93017fb2f596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=94=8B?= Date: Fri, 17 Dec 2021 12:04:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DjFinal,jboot=E6=8F=92?= =?UTF-8?q?=E4=BB=B6Redis=E7=BC=93=E5=AD=98=E6=96=B9=E6=B3=95=E4=B8=8E?= =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=96=B9=E6=B3=95=E4=B8=8D=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20=E5=A2=9E=E5=8A=A0=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E5=BA=8F=E5=88=97=E5=8C=96=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dev33/satoken/jboot/SaJdkSerializer.java | 43 +++++++------------ .../cn/dev33/satoken/jboot/SaJedisImpl.java | 2 +- .../cn/dev33/satoken/jboot/SaRedisConfig.java | 10 ++--- .../cn/dev33/satoken/jfinal/test/Config.java | 9 ++-- 4 files changed, 25 insertions(+), 39 deletions(-) diff --git a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaJdkSerializer.java b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaJdkSerializer.java index 8562a653..7f8d694d 100644 --- a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaJdkSerializer.java +++ b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaJdkSerializer.java @@ -1,36 +1,22 @@ package cn.dev33.satoken.jboot; -import com.jfinal.kit.LogKit; -import com.jfinal.plugin.redis.serializer.ISerializer; -import com.jfinal.plugin.redis.serializer.JdkSerializer; -import redis.clients.jedis.util.SafeEncoder; +import com.jfinal.log.Log; +import io.jboot.components.serializer.JbootSerializer; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -public class SaJdkSerializer implements ISerializer { +public class SaJdkSerializer implements JbootSerializer { - public static final ISerializer me = new JdkSerializer(); + private static final Log LOG = Log.getLog(SaJdkSerializer.class); - public byte[] keyToBytes(String key) { - return SafeEncoder.encode(key); - } - - public String keyFromBytes(byte[] bytes) { - return SafeEncoder.encode(bytes); - } - - public byte[] fieldToBytes(Object field) { - return valueToBytes(field); - } - - public Object fieldFromBytes(byte[] bytes) { - return valueFromBytes(bytes); - } - - public byte[] valueToBytes(Object value) { + @Override + public byte[] serialize(Object value) { + if (value == null) { + return null; + } ObjectOutputStream objectOut = null; try { ByteArrayOutputStream bytesOut = new ByteArrayOutputStream(1024); @@ -45,14 +31,15 @@ public class SaJdkSerializer implements ISerializer { finally { if(objectOut != null) try {objectOut.close();} catch (Exception e) { - LogKit.error(e.getMessage(), e);} + LOG.error(e.getMessage(), e);} } } - public Object valueFromBytes(byte[] bytes) { - if(bytes == null || bytes.length == 0) + @Override + public Object deserialize(byte[] bytes) { + if (bytes == null || bytes.length == 0) { return null; - + } ObjectInputStream objectInput = null; try { ByteArrayInputStream bytesInput = new ByteArrayInputStream(bytes); @@ -64,7 +51,7 @@ public class SaJdkSerializer implements ISerializer { } finally { if (objectInput != null) - try {objectInput.close();} catch (Exception e) {LogKit.error(e.getMessage(), e);} + try {objectInput.close();} catch (Exception e) {LOG.error(e.getMessage(), e);} } } } diff --git a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaJedisImpl.java b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaJedisImpl.java index b5f56a5c..a720ed17 100644 --- a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaJedisImpl.java +++ b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaJedisImpl.java @@ -38,7 +38,7 @@ public class SaJedisImpl { Integer port = config.getPort(); Integer timeout = config.getTimeout(); String password = config.getPassword(); - Integer database = config.getSadb(); + Integer database = config.getDb()==null?config.getDatabase():config.getDb(); String clientName = config.getClientName(); if (host.contains(":")) { diff --git a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaRedisConfig.java b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaRedisConfig.java index 578b289d..fa7363a1 100644 --- a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaRedisConfig.java +++ b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaRedisConfig.java @@ -11,14 +11,14 @@ import io.jboot.support.redis.JbootRedisConfig; ) public class SaRedisConfig extends JbootRedisConfig{ - private Integer sadb = 1; + private Integer db; - public Integer getSadb() { - return this.sadb; + public Integer getDb() { + return this.db; } - public void setSadb(Integer sadb) { - this.sadb = sadb; + public void setDb(Integer db) { + this.db = db; } } diff --git a/sa-token-starter/sa-token-jfinal-plugin/src/test/java/cn/dev33/satoken/jfinal/test/Config.java b/sa-token-starter/sa-token-jfinal-plugin/src/test/java/cn/dev33/satoken/jfinal/test/Config.java index d4445dcb..abe1b26f 100644 --- a/sa-token-starter/sa-token-jfinal-plugin/src/test/java/cn/dev33/satoken/jfinal/test/Config.java +++ b/sa-token-starter/sa-token-jfinal-plugin/src/test/java/cn/dev33/satoken/jfinal/test/Config.java @@ -2,13 +2,10 @@ package cn.dev33.satoken.jfinal.test; import cn.dev33.satoken.SaManager; import cn.dev33.satoken.context.SaTokenContext; +import cn.dev33.satoken.jfinal.*; import com.jfinal.config.*; import com.jfinal.plugin.redis.RedisPlugin; import com.jfinal.template.Engine; -import cn.dev33.satoken.jfinal.SaAnnotationInterceptor; -import cn.dev33.satoken.jfinal.SaTokenActionHandler; -import cn.dev33.satoken.jfinal.SaTokenContextForJfinal; -import cn.dev33.satoken.jfinal.SaTokenDaoRedis; public class Config extends JFinalConfig { @@ -62,7 +59,9 @@ public class Config extends JFinalConfig { * @return */ private RedisPlugin createRedisPlugin(String name, Integer dbIndex) { - return new RedisPlugin(name, "redis-host", 6379, 3000,"pwd",dbIndex); + RedisPlugin redisPlugin=new RedisPlugin(name, "redis-host", 6379, 3000,"pwd",dbIndex); + redisPlugin.setSerializer(SaJdkSerializer.me); + return redisPlugin; } @Override public void onStart(){