From ba54f3179167b3e43baae413ee2b3514e1151798 Mon Sep 17 00:00:00 2001 From: Parker Date: Fri, 5 Feb 2021 14:39:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95=E7=A5=A8?= =?UTF-8?q?=E6=8D=AE=E5=89=8D=E7=BC=80=20null=20=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../conf/RedisMessageListenerConfig.java | 1 - .../conf/SpringWebMvcConfig.java | 1 + .../autoconfigure/conf/SwaggerConfig.java | 2 ++ .../java/org/opsli/core/utils/LogUtil.java | 3 ++- .../org/opsli/core/utils/UserTokenUtil.java | 20 ++++++++----------- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/autoconfigure/conf/RedisMessageListenerConfig.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/autoconfigure/conf/RedisMessageListenerConfig.java index 24e65758..737ab1f2 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/autoconfigure/conf/RedisMessageListenerConfig.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/autoconfigure/conf/RedisMessageListenerConfig.java @@ -17,7 +17,6 @@ package org.opsli.core.autoconfigure.conf; import lombok.extern.slf4j.Slf4j; import org.opsli.core.cache.pushsub.receiver.RedisPushSubReceiver; -import org.opsli.plugins.redis.conf.RedisPluginConfig; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/autoconfigure/conf/SpringWebMvcConfig.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/autoconfigure/conf/SpringWebMvcConfig.java index b071ce3f..dc6e934d 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/autoconfigure/conf/SpringWebMvcConfig.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/autoconfigure/conf/SpringWebMvcConfig.java @@ -30,6 +30,7 @@ import javax.annotation.Resource; /** * 配置统一的后台接口访问路径的前缀 + * * @author parker */ @Slf4j diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/autoconfigure/conf/SwaggerConfig.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/autoconfigure/conf/SwaggerConfig.java index c147771c..334141dd 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/autoconfigure/conf/SwaggerConfig.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/autoconfigure/conf/SwaggerConfig.java @@ -41,6 +41,8 @@ import javax.annotation.Resource; import java.util.List; /** + * Swagger 配置类 + * * @author parker */ @Configuration diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/LogUtil.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/LogUtil.java index b4ea7046..f0aaac48 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/LogUtil.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/LogUtil.java @@ -17,6 +17,7 @@ package org.opsli.core.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.json.JSONUtil; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -100,7 +101,7 @@ public final class LogUtil { // 设置IP logsModel.setRemoteAddr(clientIpAddress); // 设置参数 - logsModel.setParams(ToStringBuilder.reflectionToString(args)); + logsModel.setParams(JSONUtil.parse(args).toString()); // 设置方法 logsModel.setMethod(methodName); // 设置执行时长 diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserTokenUtil.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserTokenUtil.java index d7539a72..60f07b88 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserTokenUtil.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserTokenUtil.java @@ -62,11 +62,11 @@ public class UserTokenUtil { /** token 缓存名 */ public static final String TOKEN_NAME = TokenConstants.ACCESS_TOKEN; /** 缓存前缀 */ - private static final String TICKET_PREFIX; + private static String TICKET_PREFIX; /** 账号失败次数 */ - public static final String ACCOUNT_SLIP_COUNT_PREFIX; + public static String ACCOUNT_SLIP_COUNT_PREFIX; /** 账号失败锁定KEY */ - public static final String ACCOUNT_SLIP_LOCK_PREFIX; + public static String ACCOUNT_SLIP_LOCK_PREFIX; /** 限制登录数量 -1 为无限大 */ public static final int ACCOUNT_LIMIT_INFINITE = -1; /** 登录配置信息 */ @@ -74,15 +74,6 @@ public class UserTokenUtil { /** Redis插件 */ private static RedisPlugin redisPlugin; - - static{ - // 缓存前缀 - TICKET_PREFIX = CacheUtil.getPrefixName() + "ticket:"; - ACCOUNT_SLIP_COUNT_PREFIX = CacheUtil.getPrefixName() + "account:slip:count:"; - ACCOUNT_SLIP_LOCK_PREFIX = CacheUtil.getPrefixName() + "account:slip:lock:"; - } - - /** * 根据 user 创建Token * @param user 用户 @@ -364,6 +355,11 @@ public class UserTokenUtil { // Redis 插件 UserTokenUtil.redisPlugin = redisPlugin; + + // 缓存前缀 + TICKET_PREFIX = CacheUtil.getPrefixName() + "ticket:"; + ACCOUNT_SLIP_COUNT_PREFIX = CacheUtil.getPrefixName() + "account:slip:count:"; + ACCOUNT_SLIP_LOCK_PREFIX = CacheUtil.getPrefixName() + "account:slip:lock:"; }