From 10459588ce5e80309315ce834eee2362340f7629 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 25 May 2020 09:58:15 +0800
Subject: [PATCH] =?UTF-8?q?1.resigroup=E8=B0=83=E6=95=B4=E5=86=85=E5=AD=98?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=202.=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi-group-server/deploy/docker-compose-dev.yml         | 2 +-
 .../resi-group-server/deploy/docker-compose-test.yml        | 6 +++---
 epmet-module/resi-group/resi-group-server/pom.xml           | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
index f1102dc2c2..e1fbfcdba5 100644
--- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
+++ b/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 # 使用现有网络
diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
index bfd588c12f..90a785fe5f 100644
--- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
+++ b/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
\ No newline at end of file
+          memory: 400M
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml
index 6583734168..6442ba77d5 100644
--- a/epmet-module/resi-group/resi-group-server/pom.xml
+++ b/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>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.epmet</groupId>
             <artifactId>resi-group-client</artifactId>
-            <version>2.0.0</version>
+            <version>2.0.0</version>ws
         </dependency>
         <dependency>
             <groupId>com.epmet</groupId>