From f4c181608411d60293c836621dc90b9120e3a451 Mon Sep 17 00:00:00 2001
From: JaneYork <janeyork1314@163.com>
Date: 星期五, 22 七月 2022 15:27:00 +0800
Subject: [PATCH] 主动设置文件公共读，适配天翼云OSS 主动设置文件公共读，适配天翼云OSS。 天翼云，即便bucket设置公共读，文件默认也是private，除非手动设置，详见天翼云：https://console.xstore.ctyun.cn/doc/store/sdk/java/objectOperation/putObject.html 已测试： 所有兼容S3协议的OSS，已测试：阿里云、腾讯云、百度、京东、天翼、自建Minio、七牛
---
ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java
index a08503d..68df5a6 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java
@@ -68,7 +68,8 @@
*/
@Override
public long getTimeout(String key) {
- return RedisUtils.getTimeToLive(key) / 1000;
+ long timeout = RedisUtils.getTimeToLive(key);
+ return timeout < 0 ? timeout : timeout / 1000;
}
/**
@@ -141,7 +142,8 @@
*/
@Override
public long getObjectTimeout(String key) {
- return RedisUtils.getTimeToLive(key) / 1000;
+ long timeout = RedisUtils.getTimeToLive(key);
+ return timeout < 0 ? timeout : timeout / 1000;
}
/**
--
Gitblit v1.9.3