diff --git a/boot-starter/boot-starter-elasticsearch/pom.xml b/boot-starter/boot-starter-elasticsearch/pom.xml index 6781ea1..a352a63 100644 --- a/boot-starter/boot-starter-elasticsearch/pom.xml +++ b/boot-starter/boot-starter-elasticsearch/pom.xml @@ -40,6 +40,7 @@ + org.springframework.boot spring-boot-maven-plugin diff --git a/boot-starter/boot-starter-fastdfs-client/pom.xml b/boot-starter/boot-starter-fastdfs-client/pom.xml index b1bf555..9563ac7 100644 --- a/boot-starter/boot-starter-fastdfs-client/pom.xml +++ b/boot-starter/boot-starter-fastdfs-client/pom.xml @@ -40,6 +40,7 @@ + org.springframework.boot spring-boot-maven-plugin diff --git a/boot-starter/boot-starter-security/boot-starter-security-app/pom.xml b/boot-starter/boot-starter-security/boot-starter-security-app/pom.xml index 34179d6..912f0be 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-app/pom.xml +++ b/boot-starter/boot-starter-security/boot-starter-security-app/pom.xml @@ -30,6 +30,7 @@ + org.springframework.boot spring-boot-maven-plugin diff --git a/boot-starter/boot-starter-security/boot-starter-security-browser/pom.xml b/boot-starter/boot-starter-security/boot-starter-security-browser/pom.xml index a9b7b54..44ed939 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-browser/pom.xml +++ b/boot-starter/boot-starter-security/boot-starter-security-browser/pom.xml @@ -34,6 +34,7 @@ + org.springframework.boot spring-boot-maven-plugin diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/pom.xml b/boot-starter/boot-starter-security/boot-starter-security-core/pom.xml index 40b11d5..b4808e1 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-core/pom.xml +++ b/boot-starter/boot-starter-security/boot-starter-security-core/pom.xml @@ -77,6 +77,7 @@ + org.springframework.boot spring-boot-maven-plugin diff --git a/boot-starter/boot-starter-ssm/pom.xml b/boot-starter/boot-starter-ssm/pom.xml index 3ff4f22..995deb7 100644 --- a/boot-starter/boot-starter-ssm/pom.xml +++ b/boot-starter/boot-starter-ssm/pom.xml @@ -98,19 +98,20 @@ - - org.springframework.boot - spring-boot-maven-plugin - + + + + + org.apache.maven.plugins maven-compiler-plugin - - org.apache.maven.plugins - maven-javadoc-plugin - + + + + boot-starter-ssm diff --git a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/CommonApplication.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/CommonApplication.java index fbfc9d2..4a0429d 100644 --- a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/CommonApplication.java +++ b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/CommonApplication.java @@ -12,5 +12,7 @@ import org.springframework.context.annotation.Configuration; @Configuration @ComponentScan(basePackages = {"com.micro.fast.common.config"}) public class CommonApplication { - +// public static void main(String[] args) { +// SpringApplication.run(CommonApplication.class, args); +// } } \ No newline at end of file diff --git a/boot-starter/boot-starter-util/pom.xml b/boot-starter/boot-starter-util/pom.xml index e621464..e4209eb 100644 --- a/boot-starter/boot-starter-util/pom.xml +++ b/boot-starter/boot-starter-util/pom.xml @@ -59,10 +59,10 @@ org.apache.maven.plugins maven-compiler-plugin - - org.apache.maven.plugins - maven-javadoc-plugin - + + + + boot-starter-util diff --git a/ms/cms/src/main/resources/bootstrap.yml b/ms/cms/src/main/resources/bootstrap.yml index 3211f51..d984f1a 100644 --- a/ms/cms/src/main/resources/bootstrap.yml +++ b/ms/cms/src/main/resources/bootstrap.yml @@ -19,4 +19,5 @@ eureka: serviceUrl: defaultZone: http://micro:fast@${register.server.ip}:10002/eureka/,http://micro:fast@${register.server.ip}:10004/eureka/ #配置所有的注册中心 instance: - prefer-ip-address: true \ No newline at end of file + prefer-ip-address: true + ip-address: 172.17.0.1 \ No newline at end of file diff --git a/ms/gateway/src/main/resources/bootstrap.yml b/ms/gateway/src/main/resources/bootstrap.yml index a6b936f..e147f9e 100644 --- a/ms/gateway/src/main/resources/bootstrap.yml +++ b/ms/gateway/src/main/resources/bootstrap.yml @@ -20,3 +20,4 @@ eureka: defaultZone: http://micro:fast@${register.server.ip}:10002/eureka/,http://micro:fast@${register.server.ip}:10004/eureka/ #配置所有的注册中心 instance: prefer-ip-address: true + ip-address: 172.17.0.1 diff --git a/ms/register-center1/src/main/resources/bootstrap.yml b/ms/register-center1/src/main/resources/bootstrap.yml index b88cb43..3b28e42 100644 --- a/ms/register-center1/src/main/resources/bootstrap.yml +++ b/ms/register-center1/src/main/resources/bootstrap.yml @@ -18,4 +18,5 @@ eureka: service-url: defaultZone: http://micro:fast@${register.server.ip}:10004/eureka #和其他注册中心连接 instance: - prefer-ip-address: true \ No newline at end of file + prefer-ip-address: true + ip-address: 172.17.0.1 \ No newline at end of file diff --git a/ms/register-center2/src/main/resources/bootstrap.yml b/ms/register-center2/src/main/resources/bootstrap.yml index ac4cf63..d02ccef 100644 --- a/ms/register-center2/src/main/resources/bootstrap.yml +++ b/ms/register-center2/src/main/resources/bootstrap.yml @@ -17,4 +17,5 @@ eureka: service-url: defaultZone: http://micro:fast@${register.server.ip}:10002/eureka #和其他注册中心连接 instance: - prefer-ip-address: true \ No newline at end of file + prefer-ip-address: true + ip-address: 172.17.0.1 \ No newline at end of file diff --git a/ms/ucenter/src/main/resources/bootstrap.yml b/ms/ucenter/src/main/resources/bootstrap.yml index 4973567..e0b0305 100644 --- a/ms/ucenter/src/main/resources/bootstrap.yml +++ b/ms/ucenter/src/main/resources/bootstrap.yml @@ -19,4 +19,5 @@ eureka: serviceUrl: defaultZone: http://micro:fast@${register.server.ip}:10002/eureka/,http://micro:fast@${register.server.ip}:10004/eureka/ #配置所有的注册中心 instance: - prefer-ip-address: true \ No newline at end of file + prefer-ip-address: true + ip-address: 172.17.0.1 \ No newline at end of file diff --git a/ms/upms/src/main/resources/bootstrap.yml b/ms/upms/src/main/resources/bootstrap.yml index 6b3bc42..848f35f 100644 --- a/ms/upms/src/main/resources/bootstrap.yml +++ b/ms/upms/src/main/resources/bootstrap.yml @@ -19,4 +19,5 @@ eureka: serviceUrl: defaultZone: http://micro:fast@${register.server.ip}:10002/eureka/,http://micro:fast@${register.server.ip}:10004/eureka/ #配置所有的注册中心 instance: - prefer-ip-address: true \ No newline at end of file + prefer-ip-address: true + ip-address: 172.17.0.1 \ No newline at end of file diff --git a/pom.xml b/pom.xml index a98fa8f..5abe3d3 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ 1.2.17 0.9.4 1.3.0 - 5.1.43 + 5.1.44 1.0.27 5.3.5.Final 8.5.16