From 312f2194510b9c550f14cff80fa92a9bf6b02668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E7=A5=A5?= <1366971433@qq.com>
Date: Thu, 17 Jan 2019 09:22:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0spring=20cloud=20config?=
=?UTF-8?q?=E7=9A=84=E6=B5=8B=E8=AF=95=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
spring-cloud/spring-cloud-config/pom.xml | 6 ++++
.../config/server/config/Programmer.java | 28 +++++++++++++++++++
.../config/server/config/School.java | 12 ++++++++
.../server/controller/ConfigController.java | 22 +++++++++++++++
.../server/src/main/resources/application.yml | 3 +-
.../application-dev.yml | 20 +++++++++++++
.../spring-cloud-test-config/application.yml | 24 ++++++++++++++++
7 files changed, 114 insertions(+), 1 deletion(-)
create mode 100644 spring-cloud/spring-cloud-config/server/src/main/java/com/heibaiying/config/server/config/Programmer.java
create mode 100644 spring-cloud/spring-cloud-config/server/src/main/java/com/heibaiying/config/server/config/School.java
create mode 100644 spring-cloud/spring-cloud-config/server/src/main/java/com/heibaiying/config/server/controller/ConfigController.java
create mode 100644 spring-cloud/spring-cloud-test-config/application-dev.yml
create mode 100644 spring-cloud/spring-cloud-test-config/application.yml
diff --git a/spring-cloud/spring-cloud-config/pom.xml b/spring-cloud/spring-cloud-config/pom.xml
index 12a63f3..12468e8 100644
--- a/spring-cloud/spring-cloud-config/pom.xml
+++ b/spring-cloud/spring-cloud-config/pom.xml
@@ -28,6 +28,12 @@
spring-boot-starter-test
test
+
+ org.projectlombok
+ lombok
+ 1.18.4
+ provided
+
diff --git a/spring-cloud/spring-cloud-config/server/src/main/java/com/heibaiying/config/server/config/Programmer.java b/spring-cloud/spring-cloud-config/server/src/main/java/com/heibaiying/config/server/config/Programmer.java
new file mode 100644
index 0000000..571e21e
--- /dev/null
+++ b/spring-cloud/spring-cloud-config/server/src/main/java/com/heibaiying/config/server/config/Programmer.java
@@ -0,0 +1,28 @@
+package com.heibaiying.config.server.config;
+
+import lombok.Data;
+import lombok.ToString;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@ConfigurationProperties(prefix = "programmer")
+@Data
+@ToString
+public class Programmer {
+
+ private String name;
+ private int age;
+ private boolean married;
+ private Date hireDate;
+ private float salary;
+ private int random;
+ private Map skill;
+ private List company;
+ private School school;
+
+}
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-config/server/src/main/java/com/heibaiying/config/server/config/School.java b/spring-cloud/spring-cloud-config/server/src/main/java/com/heibaiying/config/server/config/School.java
new file mode 100644
index 0000000..6f45d6d
--- /dev/null
+++ b/spring-cloud/spring-cloud-config/server/src/main/java/com/heibaiying/config/server/config/School.java
@@ -0,0 +1,12 @@
+package com.heibaiying.config.server.config;
+
+import lombok.Data;
+
+/**
+ * @author : heibaiying
+ */
+@Data
+public class School {
+ private String name;
+ private String location;
+}
diff --git a/spring-cloud/spring-cloud-config/server/src/main/java/com/heibaiying/config/server/controller/ConfigController.java b/spring-cloud/spring-cloud-config/server/src/main/java/com/heibaiying/config/server/controller/ConfigController.java
new file mode 100644
index 0000000..28aee19
--- /dev/null
+++ b/spring-cloud/spring-cloud-config/server/src/main/java/com/heibaiying/config/server/controller/ConfigController.java
@@ -0,0 +1,22 @@
+package com.heibaiying.config.server.controller;
+
+import com.heibaiying.config.server.config.Programmer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author : heibaiying
+ */
+
+@RestController
+public class ConfigController {
+
+ @Autowired
+ private Programmer programmer;
+
+ @RequestMapping("programmer")
+ public Programmer getProgrammer(){
+ return programmer;
+ }
+}
diff --git a/spring-cloud/spring-cloud-config/server/src/main/resources/application.yml b/spring-cloud/spring-cloud-config/server/src/main/resources/application.yml
index c65b430..92e6380 100644
--- a/spring-cloud/spring-cloud-config/server/src/main/resources/application.yml
+++ b/spring-cloud/spring-cloud-config/server/src/main/resources/application.yml
@@ -8,7 +8,8 @@ spring:
server:
git:
uri: https://github.com/heibaiying/spring-samples-for-all/
- search-paths: spring-cloud/spring-cloud-eureka-cluster/eureka-server/src/main/resources/
+ search-paths: spring-cloud/spring-cloud-test-config/
+ # 如果代码仓库是公开的 则 不需要设置用户名和密码
username:
password:
label: master
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-test-config/application-dev.yml b/spring-cloud/spring-cloud-test-config/application-dev.yml
new file mode 100644
index 0000000..c717f60
--- /dev/null
+++ b/spring-cloud/spring-cloud-test-config/application-dev.yml
@@ -0,0 +1,20 @@
+spring:
+ application:
+ name: server
+server:
+ port: 8010
+eureka:
+ server:
+ # 关闭自我保护机制 开发的时候可以开启 保证不可用的服务能够及时剔除
+ enable-self-preservation: false
+ instance:
+ hostname: 127.0.0.1
+ client:
+ serviceUrl:
+ defaultZone: http://localhost:8020/eureka/,http://192.168.200.228:8030/eureka/
+
+
+programmer:
+ school:
+ name: unviersity
+ location: shanghai
diff --git a/spring-cloud/spring-cloud-test-config/application.yml b/spring-cloud/spring-cloud-test-config/application.yml
new file mode 100644
index 0000000..fdd706d
--- /dev/null
+++ b/spring-cloud/spring-cloud-test-config/application.yml
@@ -0,0 +1,24 @@
+spring:
+ application:
+ name: server
+server:
+ port: 8010
+eureka:
+ server:
+ # 关闭自我保护机制 开发的时候可以开启 保证不可用的服务能够及时剔除
+ enable-self-preservation: false
+ instance:
+ hostname: 127.0.0.1
+ client:
+ serviceUrl:
+ defaultZone: http://localhost:8020/eureka/,http://192.168.200.228:8030/eureka/
+
+
+programmer:
+ name: xiaoming
+ married: false
+ hireDate: 2018/12/23
+ salary: 66666.88
+ random: ${random.int[1024,65536]}
+ skill: {java: master, jquery: proficiency}
+ company: [baidu,tengxun,alibaba]