Merge remote-tracking branch 'origin/master'

# Conflicts: # cloud/autho/pom.xml

Merge remote-tracking branch 'origin/master'
# Conflicts: # cloud/autho/pom.xml
陶汉栋
2 parents c3c29397 dd63aaa5
Showing 2 changed files with 7 additions and 7 deletions Show diff stats
cloud/autho/pom.xml
cloud/user_search/pom.xml
@@ -19,11 +19,11 @@
             <artifactId>common</artifactId>
             <version>1.0.0</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-test</artifactId>-->
-<!--            <scope>test</scope>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-feign</artifactId>
@@ -69,7 +69,7 @@
  
     <build>
         <!--打包文件名-->
-        <finalName>auth</finalName>
+        <finalName>autho</finalName>
         <!--打包方式-->
         <plugins>
             <!-- 设置编译版本 -->
@@ -67,7 +67,7 @@
  
     <build>
         <!--打包文件名-->
-        <finalName>quartz_server</finalName>
+        <finalName>user_search</finalName>
         <!--打包方式-->
         <plugins>
             <!-- 设置编译版本 -->
...	...	@@ -19,11 +19,11 @@
19	19	<artifactId>common</artifactId>
20	20	<version>1.0.0</version>
21	21	</dependency>
22		-<!-- <dependency>-->
23		-<!-- <groupId>org.springframework.boot</groupId>-->
24		-<!-- <artifactId>spring-boot-starter-test</artifactId>-->
25		-<!-- <scope>test</scope>-->
26		-<!-- </dependency>-->
	22	+ <dependency>
	23	+ <groupId>org.springframework.boot</groupId>
	24	+ <artifactId>spring-boot-starter-test</artifactId>
	25	+ <scope>test</scope>
	26	+ </dependency>
27	27	<dependency>
28	28	<groupId>org.springframework.cloud</groupId>
29	29	<artifactId>spring-cloud-starter-feign</artifactId>
...	...	@@ -69,7 +69,7 @@
69	69
70	70	<build>
71	71	<!--打包文件名-->
72		- <finalName>auth</finalName>
	72	+ <finalName>autho</finalName>
73	73	<!--打包方式-->
74	74	<plugins>
75	75	<!-- 设置编译版本 -->
...	...
...	...	@@ -67,7 +67,7 @@
67	67
68	68	<build>
69	69	<!--打包文件名-->
70		- <finalName>quartz_server</finalName>
	70	+ <finalName>user_search</finalName>
71	71	<!--打包方式-->
72	72	<plugins>
73	73	<!-- 设置编译版本 -->
...	...