From 0fbc53868d29975ce6eed9c0d7391a504650d007 Mon Sep 17 00:00:00 2001 From: smallchill Date: Tue, 31 Mar 2020 13:10:38 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E7=BD=91=E5=85=B3=EF=BC=8C=E6=94=AF=E6=8C=81=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89namespace=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gateway/dynamic/DynamicRouteServiceListener.java | 8 ++++++-- .../system/user/service/impl/UserServiceImpl.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/blade-gateway/src/main/java/org/springblade/gateway/dynamic/DynamicRouteServiceListener.java b/blade-gateway/src/main/java/org/springblade/gateway/dynamic/DynamicRouteServiceListener.java index 9bc6d23e..1f49f790 100644 --- a/blade-gateway/src/main/java/org/springblade/gateway/dynamic/DynamicRouteServiceListener.java +++ b/blade-gateway/src/main/java/org/springblade/gateway/dynamic/DynamicRouteServiceListener.java @@ -20,6 +20,7 @@ import com.alibaba.cloud.nacos.NacosConfigProperties; import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.fastjson.JSON; import com.alibaba.nacos.api.NacosFactory; +import com.alibaba.nacos.api.PropertyKeyConst; import com.alibaba.nacos.api.config.ConfigService; import com.alibaba.nacos.api.config.listener.Listener; import com.alibaba.nacos.api.exception.NacosException; @@ -31,6 +32,7 @@ import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; import java.util.List; +import java.util.Properties; import java.util.concurrent.Executor; /** @@ -63,8 +65,10 @@ public class DynamicRouteServiceListener { try { String dataId = NacosConstant.dataId(bladeProperties.getName(), bladeProperties.getEnv(), NacosConstant.NACOS_CONFIG_JSON_FORMAT); String group = nacosConfigProperties.getGroup(); - String serverAddr = nacosDiscoveryProperties.getServerAddr(); - ConfigService configService = NacosFactory.createConfigService(serverAddr); + Properties properties = new Properties(); + properties.setProperty(PropertyKeyConst.SERVER_ADDR, nacosDiscoveryProperties.getServerAddr()); + properties.setProperty(PropertyKeyConst.NAMESPACE, nacosDiscoveryProperties.getNamespace()); + ConfigService configService = NacosFactory.createConfigService(properties); configService.addListener(dataId, group, new Listener() { @Override public void receiveConfigInfo(String configInfo) { diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java index 5773a91c..ad8ad578 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java @@ -69,7 +69,7 @@ public class UserServiceImpl extends BaseServiceImpl implement Integer accountNumber = tenant.getAccountNumber(); Integer tenantCount = baseMapper.selectCount(Wrappers.query().lambda().eq(User::getTenantId, tenantId)); if (accountNumber != null && accountNumber > 0 && accountNumber < tenantCount) { - throw new ServiceException("当前租户已到最大账号额度"); + throw new ServiceException("当前租户已到最大账号额度!"); } } if (Func.isNotEmpty(user.getPassword())) {