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/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..53b7ea7aeb --- /dev/null +++ b/epmet-gateway/docker-compose.yml @@ -0,0 +1,7 @@ +version: "3.7" +services: + 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-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 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