客户端启动后第一次修线程池参数错误. (#29)

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]);
                 }

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);

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<ConfigAllInfo> wrapper = Wrappers.lambdaQuery(ConfigAllInfo.class)
-                .eq(!StringUtils.isBlank(tpId), ConfigAllInfo::getTpId, tpId)
+                .eq(StrUtil.isNotBlank(tpId), ConfigAllInfo::getTpId, tpId)
-                .eq(!StringUtils.isBlank(itemId), ConfigAllInfo::getItemId, itemId)
+                .eq(StrUtil.isNotBlank(itemId), ConfigAllInfo::getItemId, itemId)
-                .eq(!StringUtils.isBlank(tenantId), ConfigAllInfo::getTenantId, tenantId);
+                .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<ConfigInstanceInfo> 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");