Commit 04eb646b93a57ac71ff0616aaca37ba3ad10aabe
Exists in
master
Merge remote-tracking branch 'origin/master'
# Conflicts: # cloud/autho/pom.xml
Showing
2 changed files
with
7 additions
and
7 deletions
Show diff stats
cloud/autho/pom.xml
| @@ -19,11 +19,11 @@ | @@ -19,11 +19,11 @@ | ||
| 19 | <artifactId>common</artifactId> | 19 | <artifactId>common</artifactId> |
| 20 | <version>1.0.0</version> | 20 | <version>1.0.0</version> |
| 21 | </dependency> | 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 | <dependency> | 27 | <dependency> |
| 28 | <groupId>org.springframework.cloud</groupId> | 28 | <groupId>org.springframework.cloud</groupId> |
| 29 | <artifactId>spring-cloud-starter-feign</artifactId> | 29 | <artifactId>spring-cloud-starter-feign</artifactId> |
| @@ -69,7 +69,7 @@ | @@ -69,7 +69,7 @@ | ||
| 69 | 69 | ||
| 70 | <build> | 70 | <build> |
| 71 | <!--打包文件名--> | 71 | <!--打包文件名--> |
| 72 | - <finalName>auth</finalName> | 72 | + <finalName>autho</finalName> |
| 73 | <!--打包方式--> | 73 | <!--打包方式--> |
| 74 | <plugins> | 74 | <plugins> |
| 75 | <!-- 设置编译版本 --> | 75 | <!-- 设置编译版本 --> |
cloud/user_search/pom.xml