Merge remote-tracking branch 'origin/dev0.2' into dev0.2

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"

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"]

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"

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
     </select>
 

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"