Commit 6aba3b85 by henry

删除配置文件

1 parent 07d88822
...@@ -4,6 +4,7 @@ import com.alibaba.cloud.nacos.NacosDiscoveryProperties; ...@@ -4,6 +4,7 @@ import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.nacos.api.exception.NacosException; import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.api.naming.NamingService; import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.client.naming.NacosNamingService; import com.alibaba.nacos.client.naming.NacosNamingService;
import lombok.extern.slf4j.Slf4j;
import org.arch.nacos.properties.NacosRegisterProperties; import org.arch.nacos.properties.NacosRegisterProperties;
import org.arch.nacos.properties.NacosServiceProperties; import org.arch.nacos.properties.NacosServiceProperties;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -11,15 +12,17 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; ...@@ -11,15 +12,17 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.commons.util.InetUtils; import org.springframework.cloud.commons.util.InetUtils;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.Properties; import java.util.Properties;
@Slf4j
@ConditionalOnProperty(prefix = "spring.cloud.nacos", name = "enable-register", havingValue = "true") @ConditionalOnProperty(prefix = "spring.cloud.nacos", name = "enable-register", havingValue = "true")
@Configuration @Configuration
@ComponentScan("org.arch.nacos")
@EnableConfigurationProperties(NacosRegisterProperties.class) @EnableConfigurationProperties(NacosRegisterProperties.class)
public class NacosRegisterConfig { public class NacosRegisterConfig {
@Autowired @Autowired
...@@ -29,6 +32,9 @@ public class NacosRegisterConfig { ...@@ -29,6 +32,9 @@ public class NacosRegisterConfig {
@Autowired @Autowired
private InetUtils inetUtils; private InetUtils inetUtils;
public NacosRegisterConfig(){
log.info("~~~~~~~~~~~~~~~加载nacos配置~~~~~~~~~");
}
@Bean @Bean
public NamingService namingService() throws NacosException { public NamingService namingService() throws NacosException {
return new NacosNamingService(getNacosProperties()); return new NacosNamingService(getNacosProperties());
......
...@@ -27,8 +27,6 @@ spring: ...@@ -27,8 +27,6 @@ spring:
refresh: true refresh: true
- data-id: common-mybatis.${nacos.file-extension} - data-id: common-mybatis.${nacos.file-extension}
refresh: true refresh: true
- data-id: common-redis.${nacos.file-extension}
refresh: true
discovery: discovery:
ip: localhost ip: localhost
server-addr: ${nacos.server-addr} server-addr: ${nacos.server-addr}
......
...@@ -10,6 +10,3 @@ spring: ...@@ -10,6 +10,3 @@ spring:
max-request-size: 100MB max-request-size: 100MB
profiles: profiles:
active: dev active: dev
This diff could not be displayed because it is too large.
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!