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;