Merge branch 'master' of github.com:heibaiying/Spring-All-In-One

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

spring-cloud/spring-cloud-test-config/application.yml

@@ -1,21 +1,13 @@
 spring:
-  application:
+  datasource:
-    name: server
+    url: jdbc:mysql://127.0.0.1:3306/mysql?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false
-server:
+    username: root
-  port: 8010
+    password: root
-eureka:
+    driver-class-name: com.mysql.cj.jdbc.Driver
-  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
+  age: 20
+  name: xiaohuo
   married: false
   hireDate: 2018/12/23
   salary: 66666.88