From 80b8d178fabbcea8eedd4c96eac1c3c4f2e9fe24 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 10 Apr 2020 12:30:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81=20?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E9=AA=8C=E8=AF=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/partymember/PartymemberInfoDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml index 601f396817..46c290d959 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml @@ -50,6 +50,7 @@ WHERE CUSTOMER_ID = #{customerId} AND MOBILE = #{mobile} + AND CONFIRM_RESULT = '0' AND DEL_FLAG = 0 From 451f053fb7cabb1f23f62eca3f50f4fa8d41bb09 Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 10 Apr 2020 12:40:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0gateway=E7=9A=84docker-co?= =?UTF-8?q?mpose.yml=E5=92=8CDockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/Dockerfile | 11 +++++++++++ epmet-gateway/docker-compose.yml | 6 ++++++ 2 files changed, 17 insertions(+) create mode 100644 epmet-gateway/Dockerfile create mode 100644 epmet-gateway/docker-compose.yml diff --git a/epmet-gateway/Dockerfile b/epmet-gateway/Dockerfile new file mode 100644 index 0000000000..dc143291df --- /dev/null +++ b/epmet-gateway/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./app.jar + +EXPOSE 8080 + +ENTRYPOINT ["java","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-gateway/docker-compose.yml b/epmet-gateway/docker-compose.yml new file mode 100644 index 0000000000..e4040eb3d4 --- /dev/null +++ b/epmet-gateway/docker-compose.yml @@ -0,0 +1,6 @@ +version: "3.7" +services: + web: + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-gateway:2.0.0 + ports: + - "8080:8080" \ No newline at end of file From f0a69df06c51aa7c8eb750a5d675f1e985016c64 Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 10 Apr 2020 13:26:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?docker-compose.yml=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/docker-compose.yml | 3 ++- epmet-gateway/docker-compose.yml | 3 ++- epmet-user/epmet-user-server/docker-compose.yml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/epmet-admin/epmet-admin-server/docker-compose.yml b/epmet-admin/epmet-admin-server/docker-compose.yml index 2c66d64ffd..41161bf100 100644 --- a/epmet-admin/epmet-admin-server/docker-compose.yml +++ b/epmet-admin/epmet-admin-server/docker-compose.yml @@ -1,6 +1,7 @@ version: "3.7" services: - web: + epmet-admin-server: + container_name: epmet-admin-server-dev image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-admin-server:2.0.0 ports: - "8082:8082" \ No newline at end of file diff --git a/epmet-gateway/docker-compose.yml b/epmet-gateway/docker-compose.yml index e4040eb3d4..53b7ea7aeb 100644 --- a/epmet-gateway/docker-compose.yml +++ b/epmet-gateway/docker-compose.yml @@ -1,6 +1,7 @@ version: "3.7" services: - web: + epmet-gateway: # 会自动生成容器名称: <当前所在目录>_epmet-gateway_1，依赖于所在目录，不稳定，所以使用container_name 完全手动指定 + container_name: epmet-gateway-dev # 完全手动指定容器NAME image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-gateway:2.0.0 ports: - "8080:8080" \ No newline at end of file diff --git a/epmet-user/epmet-user-server/docker-compose.yml b/epmet-user/epmet-user-server/docker-compose.yml index 97af53a921..c38941b8c3 100644 --- a/epmet-user/epmet-user-server/docker-compose.yml +++ b/epmet-user/epmet-user-server/docker-compose.yml @@ -1,6 +1,7 @@ version: "3.7" services: - web: + epmet-user-server: + container_name: epmet-user-server-dev image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-user-server:2.0.0 ports: - "8087:8087" \ No newline at end of file