diff --git a/README.md b/README.md index 7afbac21..95934649 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ ## 配置中心 * [《芋道 Spring Boot 配置文件》](http://www.iocoder.cn/Spring-Boot/config-file/?github) 对应 [lab-43](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-43) 。 -* [《芋道 Spring Boot 配置中心 Apollo》]()计划中... +* [《芋道 Spring Boot 配置中心 Apollo》](http://www.iocoder.cn/Spring-Boot/config-apollo/?github) 对应 [lab-45](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-45) 。 * [《芋道 Spring Boot 配置中心 Nacos》](http://www.iocoder.cn/Spring-Boot/config-nacos/?github) 对应 [lab-44](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-44) 。 ## 注册中心 diff --git a/lab-44/lab-44-nacos-config-demo/src/main/java/cn/iocoder/springboot/lab44/nacosdemo/Application.java b/lab-44/lab-44-nacos-config-demo/src/main/java/cn/iocoder/springboot/lab44/nacosdemo/Application.java index 2f0bf53d..2da10ee4 100644 --- a/lab-44/lab-44-nacos-config-demo/src/main/java/cn/iocoder/springboot/lab44/nacosdemo/Application.java +++ b/lab-44/lab-44-nacos-config-demo/src/main/java/cn/iocoder/springboot/lab44/nacosdemo/Application.java @@ -42,8 +42,8 @@ public class Application { @Value(value = "${order.pay-timeout-seconds}") private Integer payTimeoutSeconds; -// @NacosValue(value = "${order.pay-timeout-seconds}") - @Value(value = "${order.pay-timeout-seconds}") +// @NacosValue(value = "${order.create-frequency-seconds}") + @Value(value = "${order.create-frequency-seconds}") private Integer createFrequencySeconds; @Override diff --git a/lab-45/lab-45-apollo-demo-profiles/pom.xml b/lab-45/lab-45-apollo-demo-profiles/pom.xml new file mode 100644 index 00000000..46caf772 --- /dev/null +++ b/lab-45/lab-45-apollo-demo-profiles/pom.xml @@ -0,0 +1,31 @@ + + + + org.springframework.boot + spring-boot-starter-parent + 2.2.2.RELEASE + + + 4.0.0 + + lab-45-apollo-demo-profiles + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + com.ctrip.framework.apollo + apollo-client + 1.5.1 + + + + diff --git a/lab-45/lab-45-apollo-demo-profiles/src/main/java/cn/iocoder/springboot/lab45/apollodemo/ProfilesApplication.java b/lab-45/lab-45-apollo-demo-profiles/src/main/java/cn/iocoder/springboot/lab45/apollodemo/ProfilesApplication.java new file mode 100644 index 00000000..56fd72b0 --- /dev/null +++ b/lab-45/lab-45-apollo-demo-profiles/src/main/java/cn/iocoder/springboot/lab45/apollodemo/ProfilesApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab45.apollodemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ProfilesApplication { + + public static void main(String[] args) { + SpringApplication.run(ProfilesApplication.class, args); + } + +} diff --git a/lab-45/lab-45-apollo-demo-profiles/src/main/resources/application-dev.yaml b/lab-45/lab-45-apollo-demo-profiles/src/main/resources/application-dev.yaml new file mode 100644 index 00000000..1cd63581 --- /dev/null +++ b/lab-45/lab-45-apollo-demo-profiles/src/main/resources/application-dev.yaml @@ -0,0 +1,9 @@ +app: + id: demo-application-profiles # 使用的 Apollo 的项目(应用)编号 +apollo: + meta: http://127.0.0.1:8080 # Apollo Meta Server 地址 + bootstrap: + enabled: true # 是否开启 Apollo 配置预加载功能。默认为 false。 + eagerLoad: + enable: true # 是否开启 Apollo 支持日志级别的加载时机。默认为 false。 + namespaces: application # 使用的 Apollo 的命名空间,默认为 application。 diff --git a/lab-45/lab-45-apollo-demo-profiles/src/main/resources/application-prod.yaml b/lab-45/lab-45-apollo-demo-profiles/src/main/resources/application-prod.yaml new file mode 100644 index 00000000..b017e5aa --- /dev/null +++ b/lab-45/lab-45-apollo-demo-profiles/src/main/resources/application-prod.yaml @@ -0,0 +1,9 @@ +app: + id: demo-application-profiles # 使用的 Apollo 的项目(应用)编号 +apollo: + meta: http://127.0.0.1:18080 # Apollo Meta Server 地址 + bootstrap: + enabled: true # 是否开启 Apollo 配置预加载功能。默认为 false。 + eagerLoad: + enable: true # 是否开启 Apollo 支持日志级别的加载时机。默认为 false。 + namespaces: application # 使用的 Apollo 的命名空间,默认为 application。 diff --git a/lab-45/lab-45-apollo-demo-profiles/src/main/resources/application.yaml b/lab-45/lab-45-apollo-demo-profiles/src/main/resources/application.yaml new file mode 100644 index 00000000..001e788a --- /dev/null +++ b/lab-45/lab-45-apollo-demo-profiles/src/main/resources/application.yaml @@ -0,0 +1,6 @@ +#server: +# port: 7070 + +spring: + application: + name: demo-application diff --git a/lab-45/lab-45-apollo-demo/pom.xml b/lab-45/lab-45-apollo-demo/pom.xml index 053a46e2..78d364c6 100644 --- a/lab-45/lab-45-apollo-demo/pom.xml +++ b/lab-45/lab-45-apollo-demo/pom.xml @@ -20,7 +20,7 @@ spring-boot-starter - + com.ctrip.framework.apollo apollo-client diff --git a/lab-45/lab-45-apollo-demo/src/main/java/cn/iocoder/springboot/lab45/apollodemo/Application.java b/lab-45/lab-45-apollo-demo/src/main/java/cn/iocoder/springboot/lab45/apollodemo/Application.java index d2348569..fa8dfbfb 100644 --- a/lab-45/lab-45-apollo-demo/src/main/java/cn/iocoder/springboot/lab45/apollodemo/Application.java +++ b/lab-45/lab-45-apollo-demo/src/main/java/cn/iocoder/springboot/lab45/apollodemo/Application.java @@ -38,12 +38,10 @@ public class Application { private final Logger logger = LoggerFactory.getLogger(getClass()); -// @NacosValue(value = "${order.pay-timeout-seconds}") @Value(value = "${order.pay-timeout-seconds}") private Integer payTimeoutSeconds; -// @NacosValue(value = "${order.pay-timeout-seconds}") - @Value(value = "${order.pay-timeout-seconds}") + @Value(value = "${order.create-frequency-seconds}") private Integer createFrequencySeconds; @Override diff --git a/lab-45/lab-45-apollo-demo/src/main/resources/application.yaml b/lab-45/lab-45-apollo-demo/src/main/resources/application.yaml index b3e67149..ee007579 100644 --- a/lab-45/lab-45-apollo-demo/src/main/resources/application.yaml +++ b/lab-45/lab-45-apollo-demo/src/main/resources/application.yaml @@ -1,9 +1,9 @@ app: - id: demo-application + id: demo-application # 使用的 Apollo 的项目(应用)编号 apollo: - meta: http://127.0.0.1:8080 + meta: http://127.0.0.1:8080 # Apollo Meta Server 地址 bootstrap: - enabled: true + enabled: true # 是否开启 Apollo 配置预加载功能。默认为 false。 eagerLoad: - enable: true - namespace: application + enable: true # 是否开启 Apollo 支持日志级别的加载时机。默认为 false。 + namespaces: application # 使用的 Apollo 的命名空间,默认为 application。 diff --git a/lab-45/pom.xml b/lab-45/pom.xml index 4671ab5d..8d02ac8e 100644 --- a/lab-45/pom.xml +++ b/lab-45/pom.xml @@ -13,6 +13,7 @@ pom lab-45-apollo-demo + lab-45-apollo-demo-profiles