From 73eec705b5a3a921f6fda06d4cf2e7652455c17f Mon Sep 17 00:00:00 2001
From: zer0Black <694429613@qq.com>
Date: Sat, 9 Apr 2022 10:54:54 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91=E4=BA=91=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6,=E4=B8=8D?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=9F=9F=E5=90=8D=E5=87=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20=E3=80=90fix=E3=80=91=E4=BF=AE=E5=A4=8D=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E7=BF=BB=E8=AF=91=E4=B8=8D=E6=9B=B4=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jero/common/aspect/DictAspect.java      | 4 +++-
 .../src/main/java/com/jero/common/util/oss/OssBootUtil.java   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java
index 0ddc899b..1e505fa1 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java
@@ -27,6 +27,7 @@ import java.text.SimpleDateFormat;
 import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 /**
@@ -263,7 +264,8 @@ public class DictAspect {
                 for (DictModel dict : texts) {
                     String redisKey = String.format("sys:cache:dictTable::SimpleKey [%s,%s]", dictCode, dict.getValue());
                     try {
-                        redisTemplate.opsForValue().set(redisKey, dict.getText());
+                        // 保留10分钟
+                        redisTemplate.opsForValue().set(redisKey, dict.getText(), 600, TimeUnit.SECONDS);
                     } catch (Exception e) {
                         log.warn(e.getMessage(), e);
                     }
diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/oss/OssBootUtil.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/oss/OssBootUtil.java
index 8f5acc04..e78e8314 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/oss/OssBootUtil.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/oss/OssBootUtil.java
@@ -154,7 +154,7 @@ public class OssBootUtil {
     */
     public static String getOriginalUrl(String url) {
         String originalDomain = "https://" + bucketName + "." + endPoint;
-        if(url.indexOf(staticDomain)!=-1){
+        if(oConvertUtils.isNotEmpty(staticDomain) && url.indexOf(staticDomain)!=-1){
             url = url.replace(staticDomain,originalDomain);
         }
         return url;