From 35381e009511172f7ecfbdc4bf10e484ddd8d138 Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Thu, 16 Dec 2021 22:51:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E5=90=8E=E7=AC=AC=E4=B8=80=E6=AC=A1=E4=BF=AE=E7=BA=BF=E7=A8=8B?= =?UTF-8?q?=E6=B1=A0=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF.=20(#29)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/hippo4j/common/toolkit/Md5Util.java | 9 +++++++-- .../cn/hippo4j/config/service/ConfigCacheService.java | 3 ++- .../config/service/biz/impl/ConfigServiceImpl.java | 10 ++++++---- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java index 50a89cb0..15964dab 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java @@ -2,7 +2,7 @@ package cn.hippo4j.common.toolkit; import cn.hippo4j.common.constant.Constants; import cn.hippo4j.common.model.PoolParameter; -import org.springframework.util.StringUtils; +import cn.hutool.core.util.StrUtil; import java.io.IOException; import java.net.URLEncoder; @@ -78,7 +78,12 @@ public class Md5Util { sb.append(dataIdGroupId[1]); // if have tenant, then set it if (dataIdGroupId.length == 3) { - if (!StringUtils.isEmpty(dataIdGroupId[2])) { + if (StrUtil.isNotBlank(dataIdGroupId[2])) { + sb.append(Constants.WORD_SEPARATOR); + sb.append(dataIdGroupId[2]); + } + } else if (dataIdGroupId.length == 4) { + if (StrUtil.isNotBlank(dataIdGroupId[2])) { sb.append(Constants.WORD_SEPARATOR); sb.append(dataIdGroupId[2]); } diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/ConfigCacheService.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/ConfigCacheService.java index b4cab72f..f4b6744a 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/ConfigCacheService.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/ConfigCacheService.java @@ -11,6 +11,7 @@ import cn.hippo4j.config.notify.NotifyCenter; import cn.hippo4j.config.service.biz.ConfigService; import cn.hippo4j.config.toolkit.MapUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.springframework.util.StringUtils; @@ -68,7 +69,7 @@ public class ConfigCacheService { } String[] params = groupKey.split("\\+"); ConfigAllInfo config = CONFIG_SERVICE.findConfigRecentInfo(params); - if (config != null && !StringUtils.isEmpty(config.getTpId())) { + if (config != null && StrUtil.isNotBlank(config.getTpId())) { cacheItem = new CacheItem(groupKey, config); cacheItemMap.put(clientIdentify, cacheItem); CLIENT_CONFIG_CACHE.put(groupKey, cacheItemMap); diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigServiceImpl.java index cadf479d..8b1b9989 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigServiceImpl.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigServiceImpl.java @@ -18,7 +18,6 @@ import cn.hippo4j.tools.logrecord.annotation.LogRecord; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import lombok.AllArgsConstructor; @@ -50,9 +49,9 @@ public class ConfigServiceImpl implements ConfigService { @Override public ConfigAllInfo findConfigAllInfo(String tpId, String itemId, String tenantId) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(ConfigAllInfo.class) - .eq(!StringUtils.isBlank(tpId), ConfigAllInfo::getTpId, tpId) - .eq(!StringUtils.isBlank(itemId), ConfigAllInfo::getItemId, itemId) - .eq(!StringUtils.isBlank(tenantId), ConfigAllInfo::getTenantId, tenantId); + .eq(StrUtil.isNotBlank(tpId), ConfigAllInfo::getTpId, tpId) + .eq(StrUtil.isNotBlank(itemId), ConfigAllInfo::getItemId, itemId) + .eq(StrUtil.isNotBlank(tenantId), ConfigAllInfo::getTenantId, tenantId); ConfigAllInfo configAllInfo = configInfoMapper.selectOne(wrapper); return configAllInfo; @@ -66,6 +65,9 @@ public class ConfigServiceImpl implements ConfigService { String instanceId = params[3]; if (StrUtil.isNotBlank(instanceId)) { LambdaQueryWrapper instanceQueryWrapper = Wrappers.lambdaQuery(ConfigInstanceInfo.class) + .eq(ConfigInstanceInfo::getTpId, params[0]) + .eq(ConfigInstanceInfo::getItemId, params[1]) + .eq(ConfigInstanceInfo::getTenantId, params[2]) .eq(ConfigInstanceInfo::getInstanceId, params[3]) .orderByDesc(ConfigInstanceInfo::getGmtCreate) .last("LIMIT 1");