!1 admin增加nacos的namespace

Merge pull request !1 from bigbenfather/master
pull/1/MERGE
tanghc 5 years ago committed by Gitee
commit 59d07d94f8
  1. 17
      sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/service/impl/RegistryServiceNacosImpl.java

@ -2,6 +2,7 @@ package com.gitee.sop.adminserver.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.api.PropertyKeyConst;
import com.alibaba.nacos.api.exception.NacosException; import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.api.naming.NamingFactory; import com.alibaba.nacos.api.naming.NamingFactory;
import com.alibaba.nacos.api.naming.NamingService; import com.alibaba.nacos.api.naming.NamingService;
@ -18,11 +19,7 @@ import org.springframework.util.CollectionUtils;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.*;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* nacos接口实现, https://nacos.io/zh-cn/docs/open-api.html * nacos接口实现, https://nacos.io/zh-cn/docs/open-api.html
@ -36,6 +33,9 @@ public class RegistryServiceNacosImpl implements RegistryService {
@Value("${nacos.discovery.server-addr:${spring.cloud.nacos.discovery.server-addr:}}") @Value("${nacos.discovery.server-addr:${spring.cloud.nacos.discovery.server-addr:}}")
private String nacosAddr; private String nacosAddr;
@Value("${nacos.discovery.namespace:${spring.cloud.nacos.discovery.namespace:}}")
private String nacosNamespace;
private NamingService namingService; private NamingService namingService;
@PostConstruct @PostConstruct
@ -43,7 +43,12 @@ public class RegistryServiceNacosImpl implements RegistryService {
if (StringUtils.isBlank(nacosAddr)) { if (StringUtils.isBlank(nacosAddr)) {
throw new IllegalArgumentException("请在配置文件中指定nacos.discovery.server-addr参数"); throw new IllegalArgumentException("请在配置文件中指定nacos.discovery.server-addr参数");
} }
namingService = NamingFactory.createNamingService(nacosAddr); Properties nacosProperties = new Properties();
nacosProperties.put(PropertyKeyConst.SERVER_ADDR, nacosAddr);
if (StringUtils.isNotBlank(nacosNamespace)) {
nacosProperties.put(PropertyKeyConst.NAMESPACE, nacosNamespace);
}
namingService = NamingFactory.createNamingService(nacosProperties);
} }
@Override @Override

Loading…
Cancel
Save