diff --git a/microservice-provider-acct/pom.xml b/microservice-provider-acct/pom.xml index b9f0bb1d9f32943b8da5d17e5f64e96e865306b3..d753bdfbf2696e8c59869468351035d3d6e677ec 100644 --- a/microservice-provider-acct/pom.xml +++ b/microservice-provider-acct/pom.xml @@ -182,43 +182,4 @@ - - - - app - - - - com.spotify - docker-maven-plugin - - ${project.name}:${project.version} - - ${project.version} - latest - - ${project.basedir}/src/main/docker - false - - - ${project.build.directory} - ${project.build.finalName}.jar - - - - - - - - package - - build - - - - - - - - diff --git a/microservice-provider-acct/src/main/java/com/credit2go/cloud/config/SwaggerConfig.java b/microservice-provider-acct/src/main/java/com/credit2go/cloud/config/SwaggerConfig.java index 85b4c7f8af3df37ff0dd15136bb6fe2c03faf010..06015ddd3c730560ede4444789cfb6ddb9856d28 100644 --- a/microservice-provider-acct/src/main/java/com/credit2go/cloud/config/SwaggerConfig.java +++ b/microservice-provider-acct/src/main/java/com/credit2go/cloud/config/SwaggerConfig.java @@ -33,7 +33,7 @@ public class SwaggerConfig { } - + //http://127.0.0.1:7904/swagger-ui.html private ApiInfo apiInfo() { ApiInfo apiInfo = new ApiInfo("provider-acct Swagger-api",//大标题 "acct api",//小标题 diff --git a/microservice-provider-acct/src/main/resources/application.yml b/microservice-provider-acct/src/main/resources/application.yml index 4f23252bef6802500c94ccaf49dce966cbc9798d..a09ecdac7640a9ebf835ba1b905affd4009256a3 100644 --- a/microservice-provider-acct/src/main/resources/application.yml +++ b/microservice-provider-acct/src/main/resources/application.yml @@ -8,8 +8,8 @@ spring: ddl-auto: none application: name: microservice-provider-acct - zipkin: - base-url: http://localhost:9966 +# zipkin: +# base-url: http://localhost:9966 # boot: # admin: # url: http://localhost:8090 @@ -17,7 +17,7 @@ spring: sampler: percentage: 1.0 datasource: - url: jdbc:mysql://127.0.0.1:3306/mywork?useUnicode=true&characterEncoding=UTF-8 + url: jdbc:mysql://mysql_docker:3306/mywork?useUnicode=true&characterEncoding=UTF-8 username: root password: 123456 driver-class-name: com.mysql.jdbc.Driver @@ -36,19 +36,19 @@ logging: level: root: INFO com.credit2go: DEBUG -eureka: - client: - healthcheck: - enabled: true - serviceUrl: - defaultZone: http://user:password123@discovery:8761/eureka - instance: - prefer-ip-address: true - instance-id: ${spring.application.name}:${spring.cloud.client.ipAddress}:${spring.application.instance_id:${server.port}} - metadata-map: - zone: 7900 # eureka可以理解的元数据 - lilizhou: 7900 # 不会影响客户端行为 - lease-renewal-interval-in-seconds: 5 +#eureka: +# client: +# healthcheck: +# enabled: true +# serviceUrl: +# defaultZone: http://user:password123@discovery:8761/eureka +# instance: +# prefer-ip-address: true +# instance-id: ${spring.application.name}:${spring.cloud.client.ipAddress}:${spring.application.instance_id:${server.port}} +# metadata-map: +# zone: 7900 # eureka可以理解的元数据 +# lilizhou: 7900 # 不会影响客户端行为 +# lease-renewal-interval-in-seconds: 5 -debug: true \ No newline at end of file +#debug: true \ No newline at end of file diff --git a/pom.xml b/pom.xml index 60f3e316e8d61945e031c797c3cc36a2f7344be9..d96451687577e55b61c2f334400bda7d44a127ee 100644 --- a/pom.xml +++ b/pom.xml @@ -64,12 +64,6 @@ org.springframework.boot spring-boot-maven-plugin - - - com.spotify - docker-maven-plugin - 0.4.13 - diff --git a/test01.txt b/test01.txt index f4c3bde72c978da16de0028715b5312130ed82d5..03be5512e487d6b4c179a33824d3478e7f71ee72 100644 --- a/test01.txt +++ b/test01.txt @@ -2,6 +2,6 @@ add test01 by clj add test01 by clj add test01 by clj add test01 by clj -add test01 by clj +add test01 by clj add by clj add test01 by clj add test01 by clj \ No newline at end of file