From c3be06ee328e35409dac8337ae9f374565983dae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Sat, 20 Apr 2019 19:59:30 +0800
Subject: [PATCH] =?UTF-8?q?:whale:=20Work=20about=20Docker.=20=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9host=20pigx-register?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml                                | 12 +++++++++++-
 pigx-auth/src/main/resources/bootstrap.yml        |  2 +-
 pigx-gateway/src/main/resources/bootstrap.yml     |  2 +-
 pigx-register/Dockerfile                          | 15 +++++++++++++++
 pigx-register/src/main/resources/bootstrap.yml    |  2 +-
 .../src/main/resources/bootstrap.yml              |  2 +-
 .../src/main/resources/bootstrap.yml              |  2 +-
 .../pigx-codegen/src/main/resources/bootstrap.yml |  2 +-
 .../src/main/resources/bootstrap.yml              |  2 +-
 .../src/main/resources/bootstrap.yml              |  2 +-
 .../pigx-monitor/src/main/resources/bootstrap.yml |  2 +-
 .../src/main/resources/bootstrap.yml              |  2 +-
 .../src/main/resources/bootstrap.yml              |  2 +-
 .../pigx-zipkin/src/main/resources/bootstrap.yml  |  2 +-
 14 files changed, 38 insertions(+), 13 deletions(-)
 create mode 100644 pigx-register/Dockerfile

diff --git a/docker-compose.yml b/docker-compose.yml
index 33b9489db..95329d27e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-# 使用说明 V2.8.0
+# 使用说明 V3.0.0
 # 1. 使用docker-compose  宿主机不需要配置host来发现
 # 2. 无需修改源码，根目录  docker-compose up 即可
 # 3. 静静等待服务启动
@@ -27,6 +27,16 @@ services:
     restart: always
     container_name: pigx-redis
 
+  pigx-register:
+    build:
+      context: ./
+      dockerfile: ./pigx-register/Dockerfile
+    restart: always
+    container_name: pigx-register
+    image: pigx-register
+    ports:
+      - 8848:8848
+
   pigx-gateway:
     build:
       context: ./
diff --git a/pigx-auth/src/main/resources/bootstrap.yml b/pigx-auth/src/main/resources/bootstrap.yml
index d9e485139..b4f92c53a 100644
--- a/pigx-auth/src/main/resources/bootstrap.yml
+++ b/pigx-auth/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS-HOST:pigx-nacos}:${NACOS-PORT:8848}
+        server-addr: ${NACOS-HOST:pigx-register}:${NACOS-PORT:8848}
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml
diff --git a/pigx-gateway/src/main/resources/bootstrap.yml b/pigx-gateway/src/main/resources/bootstrap.yml
index 98383600f..e4817417f 100644
--- a/pigx-gateway/src/main/resources/bootstrap.yml
+++ b/pigx-gateway/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS-HOST:pigx-nacos}:${NACOS-PORT:8848}
+        server-addr: ${NACOS-HOST:pigx-register}:${NACOS-PORT:8848}
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml
diff --git a/pigx-register/Dockerfile b/pigx-register/Dockerfile
new file mode 100644
index 000000000..4cc8f96a0
--- /dev/null
+++ b/pigx-register/Dockerfile
@@ -0,0 +1,15 @@
+FROM anapsix/alpine-java:8_server-jre_unlimited
+
+MAINTAINER wangiegie@gmail.com
+
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
+RUN mkdir -p /pigx-register
+
+WORKDIR /pigx-register
+
+EXPOSE 9999
+
+ADD ./pigx-register/target/pigx-register.jar ./
+
+CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-register.jar
diff --git a/pigx-register/src/main/resources/bootstrap.yml b/pigx-register/src/main/resources/bootstrap.yml
index c560ab10d..e17627c76 100755
--- a/pigx-register/src/main/resources/bootstrap.yml
+++ b/pigx-register/src/main/resources/bootstrap.yml
@@ -11,7 +11,7 @@ db:
   user: root
   password: root
   url:
-    0: jdbc:mysql://127.0.0.1:3306/pigxx_config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true
+    0: jdbc:mysql://127.0.0.1:3306/pigx_mysql?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true
 
 spring:
   datasource:
diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml b/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml
index 353439b2d..66c989810 100644
--- a/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml
+++ b/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS-HOST:pigx-nacos}:${NACOS-PORT:8848}
+        server-addr: ${NACOS-HOST:pigx-register}:${NACOS-PORT:8848}
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml
diff --git a/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml b/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml
index 96823e399..5e0afb632 100644
--- a/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS-HOST:pigx-nacos}:${NACOS-PORT:8848}
+        server-addr: ${NACOS-HOST:pigx-register}:${NACOS-PORT:8848}
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml
diff --git a/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml b/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml
index 3263fb296..8d8a9b22c 100644
--- a/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS-HOST:pigx-nacos}:${NACOS-PORT:8848}
+        server-addr: ${NACOS-HOST:pigx-register}:${NACOS-PORT:8848}
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml
diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/bootstrap.yml b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/bootstrap.yml
index 987027c18..50ba8da29 100644
--- a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS-HOST:pigx-nacos}:${NACOS-PORT:8848}
+        server-addr: ${NACOS-HOST:pigx-register}:${NACOS-PORT:8848}
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml
diff --git a/pigx-visual/pigx-daemon-quartz/src/main/resources/bootstrap.yml b/pigx-visual/pigx-daemon-quartz/src/main/resources/bootstrap.yml
index 32f68a260..065b72a7a 100644
--- a/pigx-visual/pigx-daemon-quartz/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-daemon-quartz/src/main/resources/bootstrap.yml
@@ -10,7 +10,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS-HOST:pigx-nacos}:${NACOS-PORT:8848}
+        server-addr: ${NACOS-HOST:pigx-register}:${NACOS-PORT:8848}
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml
diff --git a/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml b/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml
index e21eaa536..3521d5bf7 100644
--- a/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS-HOST:pigx-nacos}:${NACOS-PORT:8848}
+        server-addr: ${NACOS-HOST:pigx-register}:${NACOS-PORT:8848}
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml
diff --git a/pigx-visual/pigx-mp-manager/src/main/resources/bootstrap.yml b/pigx-visual/pigx-mp-manager/src/main/resources/bootstrap.yml
index 316d0f6da..2b69b11f5 100644
--- a/pigx-visual/pigx-mp-manager/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-mp-manager/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS-HOST:pigx-nacos}:${NACOS-PORT:8848}
+        server-addr: ${NACOS-HOST:pigx-register}:${NACOS-PORT:8848}
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml
diff --git a/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml b/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml
index a8a65890a..5811026b8 100644
--- a/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS-HOST:pigx-nacos}:${NACOS-PORT:8848}
+        server-addr: ${NACOS-HOST:pigx-register}:${NACOS-PORT:8848}
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml
diff --git a/pigx-visual/pigx-zipkin/src/main/resources/bootstrap.yml b/pigx-visual/pigx-zipkin/src/main/resources/bootstrap.yml
index 786113ba2..09f5c46fa 100644
--- a/pigx-visual/pigx-zipkin/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-zipkin/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS-HOST:pigx-nacos}:${NACOS-PORT:8848}
+        server-addr: ${NACOS-HOST:pigx-register}:${NACOS-PORT:8848}
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml