修改配置文件,去掉冗余包

pom.xml

@@ -88,13 +88,6 @@
 		    <artifactId>guava</artifactId>
 		    <version>17.0</version>
 		</dependency> -->
-		<!-- lombok -->
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<version>1.18.22</version>
-		</dependency>
-
 		<dependency>
 		    <groupId>commons-codec</groupId>
 		    <artifactId>commons-codec</artifactId>
@@ -246,22 +239,16 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
         </dependency>
-<<<<<<< HEAD
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
 		</dependency>
-=======
-
-
 		<!-- hutool -->
 		<dependency>
 			<groupId>cn.hutool</groupId>
 			<artifactId>hutool-all</artifactId>
 			<version>5.8.12</version>
 		</dependency>
-
->>>>>>> dev
 		<dependency>  
 	       <groupId>log4j</groupId>  
 	       <artifactId>log4j</artifactId>  

src/main/resources/bootstrap-dev.yml

@@ -5,7 +5,7 @@ feign:
 eureka:
   client:
     service-url:
-      defaultZone: http://localhost:9001/eureka/
+      defaultZone: http://172.16.0.46:9001/eureka/
   instance:
     hostname: 172.16.0.46
     prefer-ip-address: true

src/main/resources/bootstrap.yml

@@ -4,6 +4,6 @@ server:
     uri-encoding: utf-8
 spring:
   application:
-    name: depot-business-${user.name}
+    name: depot-business
   profiles:
     active: dev