Commit 403b95ef authored by lihaipeng's avatar lihaipeng

modify

parent c7aed1bc
package com.unififi.config; package com.unififi.config;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@Getter
@Setter
@Configuration @Configuration
@RefreshScope @RefreshScope
@Data
public class AppConfig { public class AppConfig {
@Value("${user.name}") @Value("${user.name}")
......
...@@ -13,7 +13,6 @@ public class AppConfigListener implements ApplicationListener<ActionConfigEvent> ...@@ -13,7 +13,6 @@ public class AppConfigListener implements ApplicationListener<ActionConfigEvent>
@Override @Override
public void onApplicationEvent(ActionConfigEvent event) { public void onApplicationEvent(ActionConfigEvent event) {
log.info("配置变更"); log.info("NACOS_CONFIG_CHANGE_EVENT. {}", event.getPropertyMap().toString());
log.info(event.getPropertyMap().toString());
} }
} }
\ No newline at end of file
package com.unififi.config; package com.unififi.config;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@Configuration @Configuration
@RefreshScope
@ConfigurationProperties(ignoreInvalidFields = true, prefix = UnififiProperties.PREFIX) @ConfigurationProperties(ignoreInvalidFields = true, prefix = UnififiProperties.PREFIX)
public class UnififiProperties { public class UnififiProperties {
......
...@@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
...@@ -57,7 +56,7 @@ public class Demo1Controller { ...@@ -57,7 +56,7 @@ public class Demo1Controller {
} }
@GetMapping("/user/get") @GetMapping("/user/get")
public User userGet(@RequestParam("name") String name, @RequestParam("age") Integer age, @RequestHeader HttpHeaders headers) { public User userGet(@RequestParam("name") String name, @RequestParam("age") Integer age) {
log.info("header. token:{}", request.getHeader("token")); log.info("header. token:{}", request.getHeader("token"));
return userApi.get(name, age); return userApi.get(name, age);
} }
......
...@@ -37,7 +37,6 @@ spring: ...@@ -37,7 +37,6 @@ spring:
discovery: discovery:
#ip: 39.106.6.97 #ip: 39.106.6.97
metadata: metadata:
#unififi.grayscale: ${unififi.grayscale:}
unififi.env: ${spring.profiles.active:} unififi.env: ${spring.profiles.active:}
unififi.service.version: '@unififi-service.version@' unififi.service.version: '@unififi-service.version@'
user.home: ${user.home} user.home: ${user.home}
......
...@@ -34,13 +34,6 @@ spring: ...@@ -34,13 +34,6 @@ spring:
discovery: discovery:
#ip: 39.106.6.97 #ip: 39.106.6.97
metadata: metadata:
#unififi.grayscale: ${unififi.grayscale:}
unififi.env: ${spring.profiles.active:} unififi.env: ${spring.profiles.active:}
unififi.service.version: '@unififi-service.version@' unififi.service.version: '@unififi-service.version@'
user.home: ${user.home} user.home: ${user.home}
\ 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