Commit 4c271ffc by Nepxion

重构类结构

parent 52317fdc
...@@ -58,7 +58,7 @@ public class AdminEndpoint implements MvcEndpoint, ApplicationContextAware, Envi ...@@ -58,7 +58,7 @@ public class AdminEndpoint implements MvcEndpoint, ApplicationContextAware, Envi
@RequestMapping(path = "filter", method = RequestMethod.GET) @RequestMapping(path = "filter", method = RequestMethod.GET)
@ManagedOperation @ManagedOperation
public Object filter(@RequestParam("serviceId") String serviceId, @RequestParam("ip") String ip) { public Object filter(@RequestParam("serviceId") String serviceId, @RequestParam("ip") String ip) {
Boolean discoveryControlEnabled = environment.getProperty(PluginConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED, Boolean.class); Boolean discoveryControlEnabled = environment.getProperty(PluginConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED, Boolean.class, Boolean.TRUE);
if (!discoveryControlEnabled) { if (!discoveryControlEnabled) {
return new ResponseEntity<>(Collections.singletonMap("Message", "Discovery control is disabled"), HttpStatus.NOT_FOUND); return new ResponseEntity<>(Collections.singletonMap("Message", "Discovery control is disabled"), HttpStatus.NOT_FOUND);
} }
......
...@@ -32,7 +32,7 @@ import com.nepxion.eventbus.core.Event; ...@@ -32,7 +32,7 @@ import com.nepxion.eventbus.core.Event;
public class ConfigSubscriber { public class ConfigSubscriber {
private static final Logger LOG = LoggerFactory.getLogger(ConfigSubscriber.class); private static final Logger LOG = LoggerFactory.getLogger(ConfigSubscriber.class);
@Value("${" + ConfigConstant.SPRING_APPLICATION_DISCOVERY_REMOTE_CONFIG_ENABLED + ":false}") @Value("${" + ConfigConstant.SPRING_APPLICATION_DISCOVERY_REMOTE_CONFIG_ENABLED + ":true}")
private Boolean remoteConfigEnabled; private Boolean remoteConfigEnabled;
@Autowired @Autowired
......
...@@ -45,7 +45,7 @@ public class DiscoveryClientDecorator implements DiscoveryClient { ...@@ -45,7 +45,7 @@ public class DiscoveryClientDecorator implements DiscoveryClient {
public List<ServiceInstance> getInstances(String serviceId) { public List<ServiceInstance> getInstances(String serviceId) {
List<ServiceInstance> instances = discoveryClient.getInstances(serviceId); List<ServiceInstance> instances = discoveryClient.getInstances(serviceId);
Boolean discoveryControlEnabled = environment.getProperty(PluginConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED, Boolean.class); Boolean discoveryControlEnabled = environment.getProperty(PluginConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED, Boolean.class, Boolean.TRUE);
if (discoveryControlEnabled) { if (discoveryControlEnabled) {
String applicationName = environment.getProperty(PluginConstant.SPRING_APPLICATION_NAME); String applicationName = environment.getProperty(PluginConstant.SPRING_APPLICATION_NAME);
String metadataVersion = environment.getProperty(PluginConstant.EUREKA_METADATA_VERSION); String metadataVersion = environment.getProperty(PluginConstant.EUREKA_METADATA_VERSION);
......
...@@ -31,7 +31,7 @@ public class EurekaServiceRegistryDecorator extends EurekaServiceRegistry { ...@@ -31,7 +31,7 @@ public class EurekaServiceRegistryDecorator extends EurekaServiceRegistry {
@Override @Override
public void register(EurekaRegistration registration) { public void register(EurekaRegistration registration) {
Boolean registerControlEnabled = environment.getProperty(PluginConstant.SPRING_APPLICATION_REGISTER_CONTROL_ENABLED, Boolean.class); Boolean registerControlEnabled = environment.getProperty(PluginConstant.SPRING_APPLICATION_REGISTER_CONTROL_ENABLED, Boolean.class, Boolean.TRUE);
if (registerControlEnabled) { if (registerControlEnabled) {
String serviceId = registration.getServiceId(); String serviceId = registration.getServiceId();
String ipAddress = registration.getInstanceConfig().getIpAddress(); String ipAddress = registration.getInstanceConfig().getIpAddress();
......
...@@ -6,13 +6,13 @@ eureka.instance.preferIpAddress=true ...@@ -6,13 +6,13 @@ eureka.instance.preferIpAddress=true
eureka.instance.metadataMap.version=1.0 eureka.instance.metadataMap.version=1.0
# Plugin config # Plugin config
# 开启和关闭服务注册层面的控制。一旦关闭,服务注册的黑/白名单过滤功能将失效 # 开启和关闭服务注册层面的控制。一旦关闭,服务注册的黑/白名单过滤功能将失效。缺失则默认为true
spring.application.register.control.enabled=true spring.application.register.control.enabled=true
# 开启和关闭服务发现层面的控制。一旦关闭,服务多版本调用的控制功能将失效,动态屏蔽指定IP地址的服务示例功能将失效 # 开启和关闭服务发现层面的控制。一旦关闭,服务多版本调用的控制功能将失效,动态屏蔽指定IP地址的服务示例功能将失效。缺失则默认为true
spring.application.discovery.control.enabled=true spring.application.discovery.control.enabled=true
# 开启和关闭远程配置中心规则配置文件读取。一旦关闭,默认读取本地规则配置文件(例如:rule.xml) # 开启和关闭远程配置中心规则配置文件读取。一旦关闭,默认读取本地规则配置文件(例如:rule.xml)。缺失则默认为true
spring.application.discovery.remote.config.enabled=true spring.application.discovery.remote.config.enabled=true
management.security.enabled=false management.security.enabled=false
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment