Merge branches 'dev' and 'dev_issue_project' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_issue_project

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

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.35
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.36
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络

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

@@ -2,16 +2,16 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.35
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.36
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar"
     deploy:
       resources:
         limits:
           cpus: '0.1'
-          memory: 250M
+          memory: 400M

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>0.3.35</version>
+    <version>0.3.36</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>