From e88a769fa3a4946775e5e7263a1a4381adcba212 Mon Sep 17 00:00:00 2001 From: heibaiying <31504331+heibaiying@users.noreply.github.com> Date: Thu, 17 Jan 2019 10:25:26 +0800 Subject: [PATCH 1/7] Update application.yml --- .../spring-cloud-test-config/application.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/spring-cloud/spring-cloud-test-config/application.yml b/spring-cloud/spring-cloud-test-config/application.yml index fdd706d..7508b0c 100644 --- a/spring-cloud/spring-cloud-test-config/application.yml +++ b/spring-cloud/spring-cloud-test-config/application.yml @@ -1,19 +1,3 @@ -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 From 30ccb3801fc2e4cd12cffb4b14e8a8759e3a9e5d Mon Sep 17 00:00:00 2001 From: heibaiying <31504331+heibaiying@users.noreply.github.com> Date: Thu, 17 Jan 2019 10:25:58 +0800 Subject: [PATCH 2/7] Update application-dev.yml --- .../spring-cloud-test-config/application-dev.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/spring-cloud/spring-cloud-test-config/application-dev.yml b/spring-cloud/spring-cloud-test-config/application-dev.yml index c717f60..4bb874a 100644 --- a/spring-cloud/spring-cloud-test-config/application-dev.yml +++ b/spring-cloud/spring-cloud-test-config/application-dev.yml @@ -1,19 +1,3 @@ -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 From 73be11b751ae472f093755df6e6ef48fa7118a9c Mon Sep 17 00:00:00 2001 From: heibaiying <31504331+heibaiying@users.noreply.github.com> Date: Thu, 17 Jan 2019 11:41:04 +0800 Subject: [PATCH 3/7] Update application.yml --- spring-cloud/spring-cloud-test-config/application.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/spring-cloud/spring-cloud-test-config/application.yml b/spring-cloud/spring-cloud-test-config/application.yml index 7508b0c..979bfd4 100644 --- a/spring-cloud/spring-cloud-test-config/application.yml +++ b/spring-cloud/spring-cloud-test-config/application.yml @@ -1,3 +1,10 @@ +spring: + datasource: + url: jdbc:mysql://127.0.0.1:3306/mysql?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false + username: root + password: root + driver-class-name: com.mysql.cj.jdbc.Driver + programmer: name: xiaoming married: false From 50dcfb85cd751e4f28761cd6bad84c1f73034002 Mon Sep 17 00:00:00 2001 From: heibaiying <31504331+heibaiying@users.noreply.github.com> Date: Thu, 17 Jan 2019 12:44:36 +0800 Subject: [PATCH 4/7] Update application.yml --- spring-cloud/spring-cloud-test-config/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud/spring-cloud-test-config/application.yml b/spring-cloud/spring-cloud-test-config/application.yml index 979bfd4..c24e755 100644 --- a/spring-cloud/spring-cloud-test-config/application.yml +++ b/spring-cloud/spring-cloud-test-config/application.yml @@ -6,7 +6,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver programmer: - name: xiaoming + name: xiaolan married: false hireDate: 2018/12/23 salary: 66666.88 From a3781968b8015144f757d05b10807d4327d381b1 Mon Sep 17 00:00:00 2001 From: heibaiying <31504331+heibaiying@users.noreply.github.com> Date: Thu, 17 Jan 2019 14:21:51 +0800 Subject: [PATCH 5/7] Update application.yml --- spring-cloud/spring-cloud-test-config/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud/spring-cloud-test-config/application.yml b/spring-cloud/spring-cloud-test-config/application.yml index c24e755..1c08fbf 100644 --- a/spring-cloud/spring-cloud-test-config/application.yml +++ b/spring-cloud/spring-cloud-test-config/application.yml @@ -6,7 +6,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver programmer: - name: xiaolan + name: xiaohuo married: false hireDate: 2018/12/23 salary: 66666.88 From 0c967c0770e83537d9bb5fb3705b228d50a40432 Mon Sep 17 00:00:00 2001 From: heibaiying <31504331+heibaiying@users.noreply.github.com> Date: Thu, 17 Jan 2019 15:18:26 +0800 Subject: [PATCH 6/7] Update application.yml --- spring-cloud/spring-cloud-test-config/application.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-cloud/spring-cloud-test-config/application.yml b/spring-cloud/spring-cloud-test-config/application.yml index 1c08fbf..4ad09bd 100644 --- a/spring-cloud/spring-cloud-test-config/application.yml +++ b/spring-cloud/spring-cloud-test-config/application.yml @@ -6,6 +6,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver programmer: + age:20 name: xiaohuo married: false hireDate: 2018/12/23 From 99696b97397472fb3f7a4d4a88d5f4de5c2859c1 Mon Sep 17 00:00:00 2001 From: heibaiying <31504331+heibaiying@users.noreply.github.com> Date: Thu, 17 Jan 2019 15:18:42 +0800 Subject: [PATCH 7/7] Update application.yml --- spring-cloud/spring-cloud-test-config/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud/spring-cloud-test-config/application.yml b/spring-cloud/spring-cloud-test-config/application.yml index 4ad09bd..2e52c4e 100644 --- a/spring-cloud/spring-cloud-test-config/application.yml +++ b/spring-cloud/spring-cloud-test-config/application.yml @@ -6,7 +6,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver programmer: - age:20 + age: 20 name: xiaohuo married: false hireDate: 2018/12/23