From 71a2a8245db4c04be3f96a9eb9b47931d3130650 Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期三, 18 一月 2023 17:09:43 +0800
Subject: [PATCH] refactor 重构 common, framework 包结构, 参照 cloud 版本拆分子模块 ; update 更新模块包名 ; delete 移除 sms 模块, oss 模块, framework 模块 (并入 common 模块) ;
---
ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/core/dao/PlusSaTokenDao.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/core/dao/PlusSaTokenDao.java
similarity index 86%
rename from ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java
rename to ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/core/dao/PlusSaTokenDao.java
index 83c3d54..52dd903 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java
+++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/core/dao/PlusSaTokenDao.java
@@ -1,8 +1,8 @@
-package com.ruoyi.framework.satoken.dao;
+package com.ruoyi.common.satoken.core.dao;
import cn.dev33.satoken.dao.SaTokenDao;
import cn.dev33.satoken.util.SaFoxUtil;
-import com.ruoyi.common.utils.redis.RedisUtils;
+import com.ruoyi.common.redis.utils.RedisUtils;
import org.springframework.stereotype.Component;
import java.time.Duration;
@@ -31,11 +31,11 @@
*/
@Override
public void set(String key, String value, long timeout) {
- if (timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE) {
+ if (timeout == 0 || timeout <= NOT_VALUE_EXPIRE) {
return;
}
// 鍒ゆ柇鏄惁涓烘案涓嶈繃鏈�
- if (timeout == SaTokenDao.NEVER_EXPIRE) {
+ if (timeout == NEVER_EXPIRE) {
RedisUtils.setCacheObject(key, value);
} else {
RedisUtils.setCacheObject(key, value, Duration.ofSeconds(timeout));
@@ -49,7 +49,7 @@
public void update(String key, String value) {
long expire = getTimeout(key);
// -2 = 鏃犳閿�
- if (expire == SaTokenDao.NOT_VALUE_EXPIRE) {
+ if (expire == NOT_VALUE_EXPIRE) {
return;
}
this.set(key, value, expire);
@@ -78,9 +78,9 @@
@Override
public void updateTimeout(String key, long timeout) {
// 鍒ゆ柇鏄惁鎯宠璁剧疆涓烘案涔�
- if (timeout == SaTokenDao.NEVER_EXPIRE) {
+ if (timeout == NEVER_EXPIRE) {
long expire = getTimeout(key);
- if (expire == SaTokenDao.NEVER_EXPIRE) {
+ if (expire == NEVER_EXPIRE) {
// 濡傛灉鍏跺凡缁忚璁剧疆涓烘案涔咃紝鍒欎笉浣滀换浣曞鐞�
} else {
// 濡傛灉灏氭湭琚缃负姘镐箙锛岄偅涔堝啀娆et涓�娆�
@@ -105,11 +105,11 @@
*/
@Override
public void setObject(String key, Object object, long timeout) {
- if (timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE) {
+ if (timeout == 0 || timeout <= NOT_VALUE_EXPIRE) {
return;
}
// 鍒ゆ柇鏄惁涓烘案涓嶈繃鏈�
- if (timeout == SaTokenDao.NEVER_EXPIRE) {
+ if (timeout == NEVER_EXPIRE) {
RedisUtils.setCacheObject(key, object);
} else {
RedisUtils.setCacheObject(key, object, Duration.ofSeconds(timeout));
@@ -123,7 +123,7 @@
public void updateObject(String key, Object object) {
long expire = getObjectTimeout(key);
// -2 = 鏃犳閿�
- if (expire == SaTokenDao.NOT_VALUE_EXPIRE) {
+ if (expire == NOT_VALUE_EXPIRE) {
return;
}
this.setObject(key, object, expire);
@@ -152,9 +152,9 @@
@Override
public void updateObjectTimeout(String key, long timeout) {
// 鍒ゆ柇鏄惁鎯宠璁剧疆涓烘案涔�
- if (timeout == SaTokenDao.NEVER_EXPIRE) {
+ if (timeout == NEVER_EXPIRE) {
long expire = getObjectTimeout(key);
- if (expire == SaTokenDao.NEVER_EXPIRE) {
+ if (expire == NEVER_EXPIRE) {
// 濡傛灉鍏跺凡缁忚璁剧疆涓烘案涔咃紝鍒欎笉浣滀换浣曞鐞�
} else {
// 濡傛灉灏氭湭琚缃负姘镐箙锛岄偅涔堝啀娆et涓�娆�
--
Gitblit v1.9.3