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

epmet-admin/epmet-admin-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar
 
 EXPOSE 8082
 
-ENTRYPOINT ["java","-jar","./app.jar"]
+ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

epmet-admin/epmet-admin-server/docker-compose.yml

@@ -2,7 +2,12 @@ version: "3.7"
 services:
   epmet-admin-server:
     container_name: epmet-admin-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-admin-server:2.0.1
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-admin-server:2.0.11
     ports:
       - "8082:8082"
-    network_mode: bridge # 不会创建新的网络
+    network_mode: host # 使用现有网络
+    deploy:
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 250M

epmet-admin/epmet-admin-server/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>2.0.11</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-admin</artifactId>
@@ -99,7 +99,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -129,7 +129,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-auth/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 8081
+
+ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

epmet-auth/docker-compose.yml

@@ -0,0 +1,13 @@
+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-server:2.0.11
+    ports:
+      - "8081:8081"
+    network_mode: host # 使用现有网络
+    deploy:
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 250M

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>2.0.11</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>
@@ -123,7 +123,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -157,7 +157,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@@ -174,4 +174,25 @@ public class RedisKeys {
 		return rootPrefix.concat("resiregister:confirm:").concat(userId).concat("-").concat(mobile).concat("-*");
 	}
 
+	/**
+	 * @Description 小组缓存信息key
+	 * @Param 组Id
+	 * @return epmet:resi:group:groupId
+	 * @Author wangc
+	 * @Date 2020.04.13 11:27
+	 **/
+	public static String getResiGroupInfoKey(String groupId){
+		return rootPrefix.concat("resi:group:").concat(groupId);
+	}
+
+	/**
+	 * @Description 组成员信息缓存key
+	 * @Param 组Id 用户Id
+	 * @return epmet:resi:group:member:groupId:userId
+	 * @Author wangc
+	 * @Date 2020.04.13 13:40
+	 **/
+	public static String getResiGroupMemberInfoKey(String groupId, String userId){
+		return rootPrefix.concat("resi:group:member:").concat(groupId).concat(":").concat(userId);
+	}
 }

epmet-gateway/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar
 
 EXPOSE 8080
 
-ENTRYPOINT ["java","-jar","./app.jar"]
+ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

epmet-gateway/docker-compose.yml

@@ -1,13 +1,13 @@
 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.1
+  epmet-gateway-server:
+    container_name: epmet-gateway-server-dev
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-gateway-server:2.0.11
     ports:
       - "8080:8080"
-    network_mode: bridge # 不会创建新的网络
-
-# 定义新的网络
-#networks:
-#  epmet-gateway: # 会自动生成容器网络名称: <当前所在目录>_epmet-gateway
-#    driver: bridge
+    network_mode: host # 使用现有网络
+    deploy:
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 250M

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>2.0.11</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>
@@ -95,7 +95,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -164,7 +164,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/epmet-activiti/epmet-activiti-server/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 8086
+
+ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

epmet-module/epmet-activiti/epmet-activiti-server/docker-compose.yml

@@ -0,0 +1,13 @@
+version: "3.7"
+services:
+  epmet-activiti-server:
+    container_name: epmet-activiti-server-dev
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-activiti-server:2.0.11
+    ports:
+      - "8086:8086"
+    network_mode: host # 使用现有网络
+    deploy:
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 250M

epmet-module/epmet-activiti/epmet-activiti-server/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>2.0.11</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-activiti</artifactId>
@@ -175,7 +175,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -203,7 +203,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/epmet-demo/epmet-demo-server/pom.xml

@@ -121,7 +121,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -151,7 +151,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/epmet-job/epmet-job-server/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 8084
+
+ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

epmet-module/epmet-job/epmet-job-server/docker-compose.yml

@@ -0,0 +1,13 @@
+version: "3.7"
+services:
+  epmet-job-server:
+    container_name: epmet-job-server-dev
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-job-server:2.0.11
+    ports:
+      - "8084:8084"
+    network_mode: host # 使用现有网络
+    deploy:
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 250M

epmet-module/epmet-job/epmet-job-server/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>2.0.11</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-job</artifactId>
@@ -112,7 +112,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -142,7 +142,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java

@@ -27,6 +27,11 @@ public class MymessageResultDTO implements Serializable {
 	/**
 	 * 消息内容
 	 */
+	private String messageContent;
+
+	/**
+	 * 已读标记
+	 */
 	private String readFlag;
 
 	/**

epmet-module/epmet-message/epmet-message-server/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 8085
+
+ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

epmet-module/epmet-message/epmet-message-server/docker-compose.yml

@@ -0,0 +1,13 @@
+version: "3.7"
+services:
+  epmet-message-server:
+    container_name: epmet-message-server-dev
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-message-server:2.0.11
+    ports:
+      - "8085:8085"
+    network_mode: host # 使用现有网络
+    deploy:
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 250M

epmet-module/epmet-message/epmet-message-server/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>2.0.11</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-message</artifactId>
@@ -133,7 +133,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -163,7 +163,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/epmet-oss/epmet-oss-server/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 8083
+
+ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

epmet-module/epmet-oss/epmet-oss-server/docker-compose.yml

@@ -0,0 +1,13 @@
+version: "3.7"
+services:
+  epmet-oss-server:
+    container_name: epmet-oss-server-dev
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:2.0.10
+    ports:
+      - "8083:8083"
+    network_mode: host # 使用现有网络
+    deploy:
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 250M

epmet-module/epmet-oss/epmet-oss-server/pom.xml

@@ -137,7 +137,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -167,7 +167,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/gov-org/gov-org-server/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 8092
+
+ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

epmet-module/gov-org/gov-org-server/docker-compose.yml

@@ -0,0 +1,13 @@
+version: "3.7"
+services:
+  gov-org-server:
+    container_name: gov-org-server-dev
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:2.0.11
+    ports:
+      - "8092:8092"
+    network_mode: host # 使用现有网络
+    deploy:
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 250M

epmet-module/gov-org/gov-org-server/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>2.0.11</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>
@@ -112,7 +112,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -142,7 +142,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/oper-access/oper-access-server/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 8093
+
+ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

epmet-module/oper-access/oper-access-server/docker-compose.yml

@@ -0,0 +1,13 @@
+version: "3.7"
+services:
+  oper-access-server:
+    container_name: oper-access-server-dev
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-access-server:2.0.11
+    ports:
+      - "8093:8093"
+    network_mode: host # 使用现有网络
+    deploy:
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 250M

epmet-module/oper-access/oper-access-server/pom.xml

@@ -8,7 +8,7 @@
         <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
+    <version>2.0.11</version>
     <artifactId>oper-access-server</artifactId>
     <packaging>jar</packaging>
 
@@ -108,7 +108,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -138,7 +138,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/oper-crm/oper-crm-server/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 8090
+
+ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

epmet-module/oper-crm/oper-crm-server/docker-compose.yml

@@ -0,0 +1,13 @@
+version: "3.7"
+services:
+  oper-crm-server:
+    container_name: oper-crm-server-dev
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-crm-server:2.0.11
+    ports:
+      - "8090:8090"
+    network_mode: host # 使用现有网络
+    deploy:
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 250M

epmet-module/oper-crm/oper-crm-server/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>2.0.11</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-crm</artifactId>
@@ -107,7 +107,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -137,7 +137,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/oper-customize/oper-customize-server/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 8089
+
+ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

epmet-module/oper-customize/oper-customize-server/docker-compose.yml

@@ -0,0 +1,13 @@
+version: "3.7"
+services:
+  oper-customize-server:
+    container_name: oper-customize-server-dev
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-customize-server:2.0.11
+    ports:
+      - "8089:8089"
+    network_mode: host # 使用现有网络
+    deploy:
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 250M

epmet-module/oper-customize/oper-customize-server/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>2.0.11</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-customize</artifactId>
@@ -101,7 +101,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -131,7 +131,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupInfoRedisDTO.java

@@ -9,6 +9,7 @@ import java.io.Serializable;
  * @ClassName ResiGroupInfoRedisDTO
  * @Author wangc
  * @date 2020.04.11 09:51
+ * @Mark RedisKey为:epmet:resi:group:groupId
  */
 @Data
 public class ResiGroupInfoRedisDTO implements Serializable{
@@ -56,10 +57,33 @@ public class ResiGroupInfoRedisDTO implements Serializable{
     private String latestTopicPublishDate;
 
     /**
-     * 组统计嘻嘻你系
+     * 组统计信息
      * */
     private ResiGroupStatisticalInfoRedisDTO groupStatisticalInfo;
 
-
+    /**
+     * Json事例
+     *
+     * {
+         "groupId": "62a8f9c690a60ff35dfbde96ac5f2267",
+         "groupHeadPhoto": "https://epdc-shibei.elinkservice.cn/epdcFile/M00/00/00/CgUipV3wgl6Afm4cAAAa8QfEb00266_big.png",
+         "groupName": "产品研发群",
+         "groupIntroduction": "亿联科技城市治理事业部产品研发群",
+         "customerId": "f76def116c9c2dc0269cc17867af122c",
+         "gridId": "d28be766680811eab9c900163e08c0f9",
+         "groupState": "approved",
+         "latestTopicPublishDate": "2020-04-02 10:21:54",
+         "groupStatisticalInfo":	{
+             "id": "7f38c68ae49257e415effd76372e2aed",
+             "totalMembers": 4,
+             "totalTopics": 11,
+             "totalIssues": 0,
+             "totalPartyMembers": 0,
+             "totalEarnestMembers": 1,
+             "totalNormalMembers": 4
+            }
+        }
+     *
+     * */
 
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupStatisticalInfoRedisDTO.java

@@ -49,4 +49,19 @@ public class ResiGroupStatisticalInfoRedisDTO implements Serializable {
      * 注册居民总数
      * */
     private Integer totalNormalMembers;
+
+    /**
+     * Json事例
+     *
+     {
+         "id": "7f38c68ae49257e415effd76372e2aed",
+         "totalMembers": 4,
+         "totalTopics": 11,
+         "totalIssues": 0,
+         "totalPartyMembers": 0,
+         "totalEarnestMembers": 1,
+         "totalNormalMembers": 4
+     }
+     *
+     * */
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/ResiGroupMemberInfoRedisDTO.java

@@ -9,6 +9,7 @@ import java.io.Serializable;
  * @ClassName ResiGroupMemberInfoRedisDTO
  * @Author wangc
  * @date 2020.04.11 09:52
+ * @Mark RedisKey为:epmet:resi:group:member:groupId:userId
  */
 @Data
 public class ResiGroupMemberInfoRedisDTO implements Serializable {
@@ -45,4 +46,23 @@ public class ResiGroupMemberInfoRedisDTO implements Serializable {
      * */
     private String memberStatus;
 
+    /**
+     * 组Id，不存在redis的value中，存在redis的key中
+     * */
+    private String groupId;
+
+    /**
+     * Json事例
+     *
+     * {
+         "userId": "sfjsdjfjkdsfiemrlwejrlknsdlfjsd",
+         "userHeadPhoto": "https://epdc-shibei.elinkservice.cn/epdcFile/M00/00/00/CgUipV3wgl6Afm4cAAAa8QfEb00266_big.png",
+         "userShowName": "山东路-尹女士",
+         "groupLeaderFlag": "leader",
+         "enterGroupType": "created",
+         "memberStatus": "approved"
+        }
+     *
+     *
+     * */
 }

epmet-module/resi-group/resi-group-server/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 8095
+
+ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

epmet-module/resi-group/resi-group-server/docker-compose.yml

@@ -0,0 +1,13 @@
+version: "3.7"
+services:
+  resi-group-server:
+    container_name: resi-group-server-dev
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:2.0.11
+    ports:
+      - "8095:8095"
+    network_mode: host # 使用现有网络
+    deploy:
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 250M

epmet-module/resi-group/resi-group-server/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>2.0.11</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>
@@ -113,7 +113,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>1</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -143,7 +143,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>1</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java

@@ -17,7 +17,10 @@
 
 package com.epmet.modules.group.redis;
 
+import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.resi.group.dto.group.ResiGroupInfoRedisDTO;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -35,9 +38,17 @@ public class ResiGroupRedis {
     public void delete(Object[] ids) {
 
     }
-
-    public void set(){
-
+    /**
+     * @Description 新增/更新群组缓存信息
+     * @Param 
+     * @return 
+     * @Author wangc
+     * @Date 2020.04.13 09:58
+     **/
+    public void set(ResiGroupInfoRedisDTO groupInfoRedis){
+        if(null != groupInfoRedis && StringUtils.isNotBlank(groupInfoRedis.getGroupId())){
+            redisUtils.set(RedisKeys.getResiGroupInfoKey(groupInfoRedis.getGroupId()), groupInfoRedis);
+        }
     }
 
     public String get(String id){

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -19,7 +19,6 @@ package com.epmet.modules.group.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.api.R;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
@@ -28,8 +27,8 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.form.UserRoleFormDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
@@ -39,9 +38,9 @@ import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.group.dao.ResiGroupDao;
 import com.epmet.modules.group.dao.ResiGroupOperationDao;
 import com.epmet.modules.group.entity.ResiGroupEntity;
+import com.epmet.modules.group.redis.ResiGroupRedis;
 import com.epmet.modules.group.service.ResiGroupOperationService;
 import com.epmet.modules.group.service.ResiGroupService;
-
 import com.epmet.modules.group.service.ResiGroupStatisticalService;
 import com.epmet.modules.member.dao.GroupMemeberOperationDao;
 import com.epmet.modules.member.dao.ResiGroupMemberDao;
@@ -53,10 +52,7 @@ import com.epmet.resi.group.constant.GroupStateConstant;
 import com.epmet.resi.group.constant.LeaderFlagConstant;
 import com.epmet.resi.group.constant.MemberStateConstant;
 import com.epmet.resi.group.dto.UserRoleDTO;
-import com.epmet.resi.group.dto.group.ResiGroupDTO;
-import com.epmet.resi.group.dto.group.ResiGroupOperationDTO;
-
-import com.epmet.resi.group.dto.group.ResiGroupStatisticalDTO;
+import com.epmet.resi.group.dto.group.*;
 import com.epmet.resi.group.dto.group.form.*;
 import com.epmet.resi.group.dto.group.result.CreatedResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupSummarizeResultDTO;
@@ -71,9 +67,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * 群组信息表
@@ -109,6 +104,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	@Autowired
 	private GroupMemeberOperationDao groupMemeberOperationDao;
 
+	@Autowired
+	private ResiGroupRedis resiGroupRedis;
+
+
 	@Override
 	public PageData<ResiGroupDTO> page(Map<String, Object> params) {
 		IPage<ResiGroupEntity> page = baseDao.selectPage(
@@ -462,6 +461,24 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		groupMemeberOperationDTO.setOperateUserId(agreeApplyGroupFormDTO.getUserId());
 		groupMemeberOperationService.update(groupMemeberOperationDTO);
 		//5、给用户发送消息？？？待定
+		//6、新增小组缓存信息
+		Map<String,Object> param = new HashMap<>();
+		param.put("resiGroupId",resiGroupDTO.getId());
+		List<ResiGroupStatisticalDTO> statisticalList = resiGroupStatisticalService.list(param);
+		if(null != statisticalList && statisticalList.size() > 0){
+			ResiGroupInfoRedisDTO groupRedis = transferToGroupInfoRedis(resiGroupDTO,statisticalList.get(0));
+			resiGroupRedis.set(groupRedis);
+		}else{
+			//当没有查询到组统计信息时
+			UserRoleFormDTO userRoleFormDTO = new UserRoleFormDTO();
+			userRoleFormDTO.setApp("resi");
+			userRoleFormDTO.setCustomerId(resiGroupDTO.getCustomerId());
+			userRoleFormDTO.setUserId(agreeApplyGroupFormDTO.getUserId());
+			//userRoleFormDTO.setGridId()
+			//epmetUserFeignClient.getUserRoleInfo(userRoleFormDTO);
+		}
+
+
 		return new Result();
 	}
 
@@ -537,4 +554,31 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		}
 		return userRoleDTO;
 	}
+
+	/**
+	 * @Description 将ResiGroupDTO与ResiGroupStatisticalDTO转换成ResiGroupInfoRedisDTO
+	 * @Param ResiGroupDTO
+	 * @Param ResiGroupStatisticalDTO
+	 * @return ResiGroupInfoRedisDTO
+	 * @Author wangc
+	 * @Date 2020.04.13 16:36
+	 **/
+	private ResiGroupInfoRedisDTO transferToGroupInfoRedis(ResiGroupDTO groupDTO,ResiGroupStatisticalDTO statisticalDTO){
+
+		ResiGroupStatisticalInfoRedisDTO statisticalObjct =
+				ConvertUtils.sourceToTarget(statisticalDTO,ResiGroupStatisticalInfoRedisDTO.class);
+		statisticalObjct.setTotalEarnestMembers(statisticalDTO.getTotalEarnestMemebers());
+		statisticalObjct.setTotalNormalMembers(statisticalDTO.getTotalNormalMemebers());
+		ResiGroupInfoRedisDTO sorceObject =
+				ConvertUtils.sourceToTarget(groupDTO,ResiGroupInfoRedisDTO.class);
+		sorceObject.setGroupId(groupDTO.getId());
+		sorceObject.setGroupState(groupDTO.getState());
+		SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN);
+		if(null!=groupDTO.getLatestTopicPublishDate()){
+			sorceObject.setLatestTopicPublishDate(format.format(groupDTO.getLatestTopicPublishDate()));
+		}
+		sorceObject.setGroupStatisticalInfo(statisticalObjct);
+		return sorceObject;
+	}
+
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java

@@ -17,7 +17,10 @@
 
 package com.epmet.modules.member.redis;
 
+import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.resi.group.dto.member.ResiGroupMemberInfoRedisDTO;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -36,8 +39,19 @@ public class ResiGroupMemberRedis {
 
     }
 
-    public void set(){
-
+    /**
+     * @Description 新增/更新组成员缓存信息
+     * @Param ResiGroupMemberInfoRedisDTO
+     * @return
+     * @Author wangc
+     * @Date 2020.04.13 13:54
+     **/
+    public void set(ResiGroupMemberInfoRedisDTO memberInfoRedis){
+        if(null != memberInfoRedis
+                && StringUtils.isNotBlank(memberInfoRedis.getUserId())
+                && StringUtils.isNotBlank(memberInfoRedis.getGroupId())){
+            redisUtils.set(RedisKeys.getResiGroupMemberInfoKey(memberInfoRedis.getGroupId(),memberInfoRedis.getUserId()),memberInfoRedis);
+        }
     }
 
     public String get(String id){

epmet-module/resi-guide/resi-guide-server/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 8091
+
+ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

epmet-module/resi-guide/resi-guide-server/docker-compose.yml

@@ -0,0 +1,13 @@
+version: "3.7"
+services:
+  resi-guide-server:
+    container_name: resi-guide-server-dev
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-guide-server:2.0.11
+    ports:
+      - "8091:8091"
+    network_mode: host # 使用现有网络
+    deploy:
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 250M

epmet-module/resi-guide/resi-guide-server/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>2.0.11</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-guide</artifactId>
@@ -119,7 +119,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -149,7 +149,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/ReadMessageFromDTO.java

@@ -0,0 +1,16 @@
+package com.epmet.resi.mine.dto.from;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/14 11:01
+ */
+@Data
+public class ReadMessageFromDTO implements Serializable {
+	private static final long serialVersionUID = 1116253566756531198L;
+	private String messageId;
+}

epmet-module/resi-mine/resi-mine-server/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 8094
+
+ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

epmet-module/resi-mine/resi-mine-server/docker-compose.yml

@@ -0,0 +1,13 @@
+version: "3.7"
+services:
+  resi-mine-server:
+    container_name: resi-mine-server-dev
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-mine-server:2.0.11
+    ports:
+      - "8094:8094"
+    network_mode: host # 使用现有网络
+    deploy:
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 250M

epmet-module/resi-mine/resi-mine-server/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>2.0.11</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-mine</artifactId>
@@ -125,7 +125,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -155,7 +155,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java

@@ -7,8 +7,12 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.UserMessageDTO;
 import com.epmet.dto.form.MymessageFormDTO;
 import com.epmet.modules.message.service.UserMessageService;
+import com.epmet.resi.mine.dto.from.ReadMessageFromDTO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -40,18 +44,16 @@ public class UserMessageController {
 	}
 
 	/**
-	 * @param tokenDto
-	 * @param messageId
+	 * @param fromDTO
 	 * @return com.epmet.commons.tools.utils.Result
 	 * @Author yinzuomei
 	 * @Description 单条消息标记为已读
 	 * @Date 2020/3/29 21:05
 	 **/
 	@PostMapping("readmsg")
-	public Result readMessage(@LoginUser TokenDto tokenDto,
-							  @RequestParam("messageId") String messageId) {
+	public Result readMessage(@RequestBody ReadMessageFromDTO fromDTO) {
 		//逻辑待实现
-		return userMessageService.readMessage(messageId);
+		return userMessageService.readMessage(fromDTO.getMessageId());
 	}
 
 	/**

epmet-module/resi-partymember/resi-partymember-server/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 8096
+
+ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml

@@ -0,0 +1,13 @@
+version: "3.7"
+services:
+  resi-partymember-server:
+    container_name: resi-partymember-server-dev
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:2.0.11
+    ports:
+      - "8096:8096"
+    network_mode: host # 使用现有网络
+    deploy:
+      resources:
+        limits:
+          cpus: '0.1'
+          memory: 250M

epmet-module/resi-partymember/resi-partymember-server/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>2.0.11</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-partymember</artifactId>
@@ -124,7 +124,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -154,7 +154,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java

@@ -105,4 +105,19 @@ public interface PartyMemberConstant {
 	 * 审核状态 未通过
 	 */
 	String REJECTED = "rejected";
+
+	/**
+	 * 网格ID
+	 */
+	String ALL = " all";
+
+	/**
+	 * 认证成功
+	 */
+	String CONFIRM_SUCCESS = "0";
+
+	/**
+	 * 认证失败
+	 */
+	String CONFIRM_FAILED = "1";
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -158,14 +158,13 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_FAILED);
 
 			//自动认证失败
-			partyMemberInfoEntity.setConfirmResult("1");
+			partyMemberInfoEntity.setConfirmResult(PartyMemberConstant.CONFIRM_FAILED);
 			if (partyMemberInfoEntity.getId().isEmpty()) {
 				partymemberInfoService.insert(partyMemberInfoEntity);
 			} else {
 				partymemberInfoService.updateById(partyMemberInfoEntity);
 			}
 
-
 			result.setCode(EpmetErrorCode.AUTO_CONFIRM_FAILED.getCode());
 			result.setMsg(EpmetErrorCode.AUTO_CONFIRM_FAILED.getMsg());
 		} else {
@@ -173,17 +172,26 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS);
 
 			//自动认证成功
-			partyMemberInfoEntity.setConfirmResult("0");
+			partyMemberInfoEntity.setConfirmResult(PartyMemberConstant.CONFIRM_SUCCESS);
 			if (partyMemberInfoEntity.getId().isEmpty()) {
 				partymemberInfoService.insert(partyMemberInfoEntity);
 			} else {
 				partymemberInfoService.updateById(partyMemberInfoEntity);
 			}
 
+			//人工审核数据状态设为通过
+			PartymemberConfirmManualDTO partymemberConfirmManualDTO =
+					partymemberConfirmManualService.getInfoByPartyMemberInfoId(partyMemberInfoDTO.getId());
+			if (null != partymemberConfirmManualDTO) {
+				partymemberConfirmManualDTO.setAuditStatus(PartyMemberConstant.APPROVED);
+				partymemberConfirmManualService.updateById(ConvertUtils.sourceToTarget(partymemberConfirmManualDTO,
+						PartymemberConfirmManualEntity.class));
+			}
+
 			//添加用户党员角色关系
 			UserRoleDTO userRole = new UserRoleDTO();
 			userRole.setCustomerId(partyMemberInfoDTO.getCustomerId());
-			userRole.setGridId("all");
+			userRole.setGridId(PartyMemberConstant.ALL);
 			userRole.setUserId(partyMemberInfoDTO.getUserId());
 			userRole.setRoleKey(EpmetRoleKeyConstant.PARTYMEMBER);
 			userRole.setApp(partyMemberInfoDTO.getApp());

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml

@@ -40,6 +40,7 @@
             pi.CUSTOMER_ID = #{customerId}
           AND pi.GRID_ID = #{gridId}
           AND pi.USER_ID = #{userId}
+          AND pi.CONFIRM_RESULT = '1'
           AND pi.DEL_FLAG = 0
           AND ( pcm.AUDIT_STATUS = 'under_auditting' OR pi.ORGANIZATION_TYPE IS NULL )
     </select>

epmet-user/epmet-user-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar
 
 EXPOSE 8087
 
-ENTRYPOINT ["java","-jar","./app.jar"]
+ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

epmet-user/epmet-user-server/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-user-server:2.0.0
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:2.0.11
     ports:
       - "8087:8087"
-    network_mode: bridge # 不会创建新的网络
+    network_mode: host # 不会创建新的网络

epmet-user/epmet-user-server/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>2.0.11</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>
@@ -115,7 +115,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -145,7 +145,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.77</spring.redis.host>
+                <spring.redis.host>10.10.10.248</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java

@@ -168,12 +168,16 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
         userCustomer.setCustomerId(enterGridFormDTO.getCustomerId());
         userCustomer.setUserId(enterGridFormDTO.getUserId());
         List<RegisterRelationEntity> registerRecords = baseDao.getListByUserId(enterGridFormDTO.getUserId());
+
+        QueryWrapper<UserCustomerEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(UserCustomerConstant.CUSTOMER_ID,enterGridFormDTO.getCustomerId());
+        wrapper.eq(UserCustomerConstant.USER_ID,enterGridFormDTO.getUserId());
+
+
         //1.查找用户注册关系表，如果没有表示当前用户为陌生人(拉取用户微信表信息)，如果有表示当前用户已经进行居民认证
         if(null == registerRecords || registerRecords.size() <= 0){
             //当前用户尚未注册过居民信息
-            QueryWrapper<UserCustomerEntity> wrapper = new QueryWrapper<>();
-            wrapper.eq(UserCustomerConstant.CUSTOMER_ID,enterGridFormDTO.getCustomerId());
-            wrapper.eq(UserCustomerConstant.USER_ID,enterGridFormDTO.getUserId());
+
             List<UserCustomerEntity> userCustomerList = userCustomerDao.selectList(wrapper);
             if(null == userCustomerList || userCustomerList.size() <= 0){
                 userCustomerDao.insert(userCustomer);
@@ -192,7 +196,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
             Optional<RegisterRelationEntity> registerRecordWithSameCustAndGrid =
                     registerRecords.stream().filter(obj -> customerId.equals(obj.getCustomerId()) && gridId.equals(obj.getGridId())).findFirst();
 
-            //是否存在相同客户相同网格的注册记录
+            //不存在相同客户相同网格的注册记录
             if(!registerRecordWithSameCustAndGrid.isPresent()){
                 Optional<RegisterRelationEntity> registerRecordWithSameCustAndDiffGrid =
                         registerRecords.stream().filter(obj -> customerId.equals(obj.getCustomerId()) && !gridId.equals(obj.getGridId())).findAny();
@@ -217,7 +221,10 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
                         registerRelationToSave.setParticipation(NumConstant.ONE_STR);
 
                         baseDao.insert(registerRelationToSave);
-                        userCustomerDao.insert(userCustomer);
+                        List<UserCustomerEntity> userCustomerList = userCustomerDao.selectList(wrapper);
+                        if(null == userCustomerList || userCustomerList.size() <= 0){
+                            userCustomerDao.insert(userCustomer);
+                        }
                     }else{
 
                         //如果不存在不同客户不同网格数据，说明在居民注册时没有成功记录register_relation信息