eureka关掉自我保护机制

eureka-server/src/main/resources/application.yml

@@ -7,5 +7,8 @@ server:
 
 eureka:
     client:
-        registerWithEureka: false  #false:不作为一个客户端注册到注册中心
-        fetchRegistry: false      #为true时，可以启动，但报异常：Cannot execute request on any known server
+        registerWithEureka: false  #是否向Eureka注册服务。该应用为服务注册中心，不需要自注册，设置为false
+        fetchRegistry: false  #是否检索服务。该应用为服务注册中心，职责为注册和发现服务，无需检索服务，设置为false
+    server:
+        waitTimeInMsWhenSyncEmpty: 0 #设置同步为空时的等待时间。默认5 * minutes
+        enableSelfPreservation: false #自我保护

springboot-demo/pom.xml

@@ -68,10 +68,6 @@
 		<dependency>
 			<groupId>org.mybatis.spring.boot</groupId>
 			<artifactId>mybatis-spring-boot-starter</artifactId>
-<<<<<<< HEAD
-=======
-			<version>${mybatis3.version}</version>
->>>>>>> 4f38f52c0b2c56dda5ef49af496bc52279a4ab2e
 		</dependency>
 
 		<dependency>

springboot-demo/src/main/resources/application.yml

 spring:
   application:
-<<<<<<< HEAD
-    name: springboot-demo
-=======
     name: dictionary
->>>>>>> 4f38f52c0b2c56dda5ef49af496bc52279a4ab2e
   redis:
     host: 115.159.67.166
     port: 5289