From 9351d47948e1421f308eac1fa761b18b621580a9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 29 十一月 2021 14:10:53 +0800
Subject: [PATCH] fix 修复 合并错误
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtils.java | 23 -----------------------
1 files changed, 0 insertions(+), 23 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtils.java
index 04db787..7f4d2ca 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtils.java
@@ -115,29 +115,6 @@
}
/**
- * 缂撳瓨鍩烘湰鐨勫璞★紝淇濈暀褰撳墠瀵硅薄 TTL 鏈夋晥鏈�
- *
- * @param key 缂撳瓨鐨勯敭鍊�
- * @param value 缂撳瓨鐨勫��
- * @param isSaveTtl 鏄惁淇濈暀TTL鏈夋晥鏈�(渚嬪: set涔嬪墠ttl鍓╀綑90 set涔嬪悗杩樻槸涓�90)
- * @since Redis 6.X 浠ヤ笂浣跨敤 setAndKeepTTL 鍏煎 5.X 鏂规
- */
- public static <T> void setCacheObject(final String key, final T value, final boolean isSaveTtl) {
- RBucket<Object> bucket = client.getBucket(key);
- if (isSaveTtl) {
- try {
- bucket.setAndKeepTTL(value);
- } catch (Exception e) {
- long timeToLive = bucket.remainTimeToLive();
- bucket.set(value);
- bucket.expire(timeToLive, TimeUnit.MILLISECONDS);
- }
- } else {
- bucket.set(value);
- }
- }
-
- /**
* 缂撳瓨鍩烘湰鐨勫璞★紝Integer銆丼tring銆佸疄浣撶被绛�
*
* @param key 缂撳瓨鐨勯敭鍊�
--
Gitblit v1.9.3