Merge remote-tracking branch 'shucheng/mk'
# Conflicts: # blade-service-api/blade-open-api/src/main/java/org/springblade/openapi/mk/api/IApi4MK.java # blade-service-api/pom.xml # blade-service/blade-file/src/main/java/org/springblade/file/FileApplication.java # blade-service/blade-file/src/main/resources/bootstrap.yml # blade-service/blade-openapi/src/main/java/org/springblade/openapi/OpenApiApplication.java # blade-service/blade-openapi/src/main/resources/bootstrap.yml # pom.xml
This commit is contained in:
@@ -38,6 +38,20 @@
|
||||
<groupId>org.springblade</groupId>
|
||||
<artifactId>blade-mk-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springblade</groupId>
|
||||
<artifactId>blade-process-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springblade</groupId>
|
||||
<artifactId>blade-core-launch</artifactId>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>spring-cloud-starter-bootstrap</artifactId>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.mapstruct</groupId>
|
||||
|
||||
Reference in New Issue
Block a user