From d8a840e7e41935e55c39f0a0019be43a20148883 Mon Sep 17 00:00:00 2001
From: cuilijin <davidclj@gmail.com>
Date: Sun, 4 Jun 2017 10:24:33 +0800
Subject: [PATCH] by clj

---
 microservice-provider-acct/pom.xml            | 39 -------------------
 .../credit2go/cloud/config/SwaggerConfig.java |  2 +-
 .../src/main/resources/application.yml        | 34 ++++++++--------
 pom.xml                                       |  6 ---
 test01.txt                                    |  2 +-
 5 files changed, 19 insertions(+), 64 deletions(-)

diff --git a/microservice-provider-acct/pom.xml b/microservice-provider-acct/pom.xml
index b9f0bb1..d753bdf 100644
--- a/microservice-provider-acct/pom.xml
+++ b/microservice-provider-acct/pom.xml
@@ -182,43 +182,4 @@
         </dependency>
     </dependencies>
 
-
-    <build>
-        <!-- docker 中使用 -->
-        <finalName>app</finalName>
-        <plugins>
-            <!-- docker 打包 -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <configuration>
-                    <imageName>${project.name}:${project.version}</imageName>
-                    <imageTags>
-                        <imageTag>${project.version}</imageTag>
-                        <imageTag>latest</imageTag>
-                    </imageTags>
-                    <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
-                    <skipDockerBuild>false</skipDockerBuild>
-                    <resources>
-                        <resource>
-                            <directory>${project.build.directory}</directory>
-                            <include>${project.build.finalName}.jar</include>
-                        </resource>
-                    </resources>
-                </configuration>
-
-                <!--直接在package的时候执行docker build-->
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-
 </project>
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 85b4c7f..06015dd 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 4f23252..a09ecda 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&amp;characterEncoding=UTF-8
+    url: jdbc:mysql://mysql_docker:3306/mywork?useUnicode=true&amp;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 60f3e31..d964516 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,12 +64,6 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
-
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>0.4.13</version>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/test01.txt b/test01.txt
index f4c3bde..03be551 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
-- 
Gitee