From aef29a33506e35c27b847ff93a68306175865913 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 14 May 2020 09:48:31 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8D=87=E7=BA=A7=EF=BC=8C=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?130dev=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-auth/Dockerfile                                |  2 +-
 .../docker-compose-dev.yml}                          |  4 +++-
 epmet-auth/pom.xml                                   | 10 +++++-----
 epmet-gateway/Dockerfile                             |  2 +-
 .../docker-compose-dev.yml}                          |  4 +++-
 epmet-gateway/pom.xml                                | 12 ++++++------
 6 files changed, 19 insertions(+), 15 deletions(-)
 rename epmet-auth/{docker-compose.yml => deploy/docker-compose-dev.yml} (63%)
 rename epmet-gateway/{docker-compose.yml => deploy/docker-compose-dev.yml} (63%)

diff --git a/epmet-auth/Dockerfile b/epmet-auth/Dockerfile
index ab95a2ca96..c106eaf299 100644
--- a/epmet-auth/Dockerfile
+++ b/epmet-auth/Dockerfile
@@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar
 
 EXPOSE 8081
 
-ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]
\ No newline at end of file
+ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
\ No newline at end of file
diff --git a/epmet-auth/docker-compose.yml b/epmet-auth/deploy/docker-compose-dev.yml
similarity index 63%
rename from epmet-auth/docker-compose.yml
rename to epmet-auth/deploy/docker-compose-dev.yml
index 4efc5abb82..47bdcb1a5f 100644
--- a/epmet-auth/docker-compose.yml
+++ b/epmet-auth/deploy/docker-compose-dev.yml
@@ -2,12 +2,14 @@ version: "3.7"
 services:
   epmet-auth-server:
     container_name: epmet-auth-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-auth:0.3.5
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.6
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
+    environment:
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
     deploy:
       resources:
         limits:
diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml
index 1c532a59da..7f654c6876 100644
--- a/epmet-auth/pom.xml
+++ b/epmet-auth/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.5</version>
+    <version>0.3.6</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>
@@ -172,13 +172,13 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.1.130</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
+                <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
-                <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
+                <nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
+                <nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
diff --git a/epmet-gateway/Dockerfile b/epmet-gateway/Dockerfile
index f14c4a8d68..a237b2929f 100644
--- a/epmet-gateway/Dockerfile
+++ b/epmet-gateway/Dockerfile
@@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar
 
 EXPOSE 8080
 
-ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]
\ No newline at end of file
+ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
\ No newline at end of file
diff --git a/epmet-gateway/docker-compose.yml b/epmet-gateway/deploy/docker-compose-dev.yml
similarity index 63%
rename from epmet-gateway/docker-compose.yml
rename to epmet-gateway/deploy/docker-compose-dev.yml
index 330e7dfed7..2a0aabf6ac 100644
--- a/epmet-gateway/docker-compose.yml
+++ b/epmet-gateway/deploy/docker-compose-dev.yml
@@ -2,12 +2,14 @@ version: "3.7"
 services:
   epmet-gateway-server:
     container_name: epmet-gateway-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-gateway:0.3.5
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.6
     ports:
       - "8080:8080"
     network_mode: host # 使用现有网络
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
+    environment:
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
     deploy:
       resources:
         limits:
diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index e3c45756f4..a8bca75aee 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.5</version>
+    <version>0.3.6</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>
@@ -186,17 +186,17 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.1.130</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
+                <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
-                <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
+                <nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
+                <nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
-                <nacos.ip/>
+                <nacos.ip></nacos.ip>
                 <!-- gateway routes -->
                 <!--  1、认证服务  -->
                 <gateway.routes.epmet-auth-server.uri>lb://epmet-auth-server</gateway.routes.epmet-auth-server.uri>