From 92f030887b45604744d488131a506abbda14b4b5 Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期一, 02 五月 2022 21:21:14 +0800
Subject: [PATCH] [add]: 1. (common) pom.xml - 增加邮件依赖 ; 2. (admin) application-dev.yml - 增加邮件配置 ; 3. (framework) MailProperties, MailConfig - 增加邮件属性配置 ; 4. (common) MailUtils - 重写 Hutool MailUtil方法 ; 5. (demo) MailController - 邮件发送测试方法 ;

---
 ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 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 174cd0f..a08503d 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
@@ -5,10 +5,10 @@
 import com.ruoyi.common.utils.redis.RedisUtils;
 import org.springframework.stereotype.Component;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Sa-Token鎸佷箙灞傛帴鍙�(浣跨敤妗嗘灦鑷甫RedisUtils瀹炵幇 鍗忚缁熶竴)
@@ -31,14 +31,14 @@
      */
     @Override
     public void set(String key, String value, long timeout) {
-        if(timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE)  {
+        if (timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE) {
             return;
         }
         // 鍒ゆ柇鏄惁涓烘案涓嶈繃鏈�
-        if(timeout == SaTokenDao.NEVER_EXPIRE) {
+        if (timeout == SaTokenDao.NEVER_EXPIRE) {
             RedisUtils.setCacheObject(key, value);
         } else {
-            RedisUtils.setCacheObject(key, value, timeout, TimeUnit.SECONDS);
+            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 == SaTokenDao.NOT_VALUE_EXPIRE) {
             return;
         }
         this.set(key, value, expire);
@@ -77,9 +77,9 @@
     @Override
     public void updateTimeout(String key, long timeout) {
         // 鍒ゆ柇鏄惁鎯宠璁剧疆涓烘案涔�
-        if(timeout == SaTokenDao.NEVER_EXPIRE) {
+        if (timeout == SaTokenDao.NEVER_EXPIRE) {
             long expire = getTimeout(key);
-            if(expire == SaTokenDao.NEVER_EXPIRE) {
+            if (expire == SaTokenDao.NEVER_EXPIRE) {
                 // 濡傛灉鍏跺凡缁忚璁剧疆涓烘案涔咃紝鍒欎笉浣滀换浣曞鐞�
             } else {
                 // 濡傛灉灏氭湭琚缃负姘镐箙锛岄偅涔堝啀娆et涓�娆�
@@ -87,9 +87,8 @@
             }
             return;
         }
-        RedisUtils.expire(key, timeout, TimeUnit.SECONDS);
+        RedisUtils.expire(key, Duration.ofSeconds(timeout));
     }
-
 
 
     /**
@@ -105,14 +104,14 @@
      */
     @Override
     public void setObject(String key, Object object, long timeout) {
-        if(timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE)  {
+        if (timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE) {
             return;
         }
         // 鍒ゆ柇鏄惁涓烘案涓嶈繃鏈�
-        if(timeout == SaTokenDao.NEVER_EXPIRE) {
+        if (timeout == SaTokenDao.NEVER_EXPIRE) {
             RedisUtils.setCacheObject(key, object);
         } else {
-            RedisUtils.setCacheObject(key, object, timeout, TimeUnit.SECONDS);
+            RedisUtils.setCacheObject(key, object, Duration.ofSeconds(timeout));
         }
     }
 
@@ -123,7 +122,7 @@
     public void updateObject(String key, Object object) {
         long expire = getObjectTimeout(key);
         // -2 = 鏃犳閿�
-        if(expire == SaTokenDao.NOT_VALUE_EXPIRE) {
+        if (expire == SaTokenDao.NOT_VALUE_EXPIRE) {
             return;
         }
         this.setObject(key, object, expire);
@@ -151,9 +150,9 @@
     @Override
     public void updateObjectTimeout(String key, long timeout) {
         // 鍒ゆ柇鏄惁鎯宠璁剧疆涓烘案涔�
-        if(timeout == SaTokenDao.NEVER_EXPIRE) {
+        if (timeout == SaTokenDao.NEVER_EXPIRE) {
             long expire = getObjectTimeout(key);
-            if(expire == SaTokenDao.NEVER_EXPIRE) {
+            if (expire == SaTokenDao.NEVER_EXPIRE) {
                 // 濡傛灉鍏跺凡缁忚璁剧疆涓烘案涔咃紝鍒欎笉浣滀换浣曞鐞�
             } else {
                 // 濡傛灉灏氭湭琚缃负姘镐箙锛岄偅涔堝啀娆et涓�娆�
@@ -161,7 +160,7 @@
             }
             return;
         }
-        RedisUtils.expire(key, timeout, TimeUnit.SECONDS);
+        RedisUtils.expire(key, Duration.ofSeconds(timeout));
     }
 
 

--
Gitblit v1.9.3