修复登录票据前缀 null 问题

v1.4.1
Parker 5 years ago
parent 9dde02cb9b
commit ba54f31791

@ -17,7 +17,6 @@ package org.opsli.core.autoconfigure.conf;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.opsli.core.cache.pushsub.receiver.RedisPushSubReceiver; 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.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;

@ -30,6 +30,7 @@ import javax.annotation.Resource;
/** /**
* 访 * 访
*
* @author parker * @author parker
*/ */
@Slf4j @Slf4j

@ -41,6 +41,8 @@ import javax.annotation.Resource;
import java.util.List; import java.util.List;
/** /**
* Swagger
*
* @author parker * @author parker
*/ */
@Configuration @Configuration

@ -17,6 +17,7 @@ package org.opsli.core.utils;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.json.JSONUtil;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -100,7 +101,7 @@ public final class LogUtil {
// 设置IP // 设置IP
logsModel.setRemoteAddr(clientIpAddress); logsModel.setRemoteAddr(clientIpAddress);
// 设置参数 // 设置参数
logsModel.setParams(ToStringBuilder.reflectionToString(args)); logsModel.setParams(JSONUtil.parse(args).toString());
// 设置方法 // 设置方法
logsModel.setMethod(methodName); logsModel.setMethod(methodName);
// 设置执行时长 // 设置执行时长

@ -62,11 +62,11 @@ public class UserTokenUtil {
/** token 缓存名 */ /** token 缓存名 */
public static final String TOKEN_NAME = TokenConstants.ACCESS_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 */ /** 账号失败锁定KEY */
public static final String ACCOUNT_SLIP_LOCK_PREFIX; public static String ACCOUNT_SLIP_LOCK_PREFIX;
/** 限制登录数量 -1 为无限大 */ /** 限制登录数量 -1 为无限大 */
public static final int ACCOUNT_LIMIT_INFINITE = -1; public static final int ACCOUNT_LIMIT_INFINITE = -1;
/** 登录配置信息 */ /** 登录配置信息 */
@ -74,15 +74,6 @@ public class UserTokenUtil {
/** Redis插件 */ /** Redis插件 */
private static RedisPlugin redisPlugin; 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 * user Token
* @param user * @param user
@ -364,6 +355,11 @@ public class UserTokenUtil {
// Redis 插件 // Redis 插件
UserTokenUtil.redisPlugin = redisPlugin; 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:";
} }

Loading…
Cancel
Save