Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg

epmet-module/gov-grid/gov-grid-server/Dockerfile

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

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

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-grid-server:
     container_name: gov-grid-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.13
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.14
     ports:
       - "8097:8097"
     network_mode: host # 使用现有网络
@@ -12,4 +12,4 @@ services:
       resources:
         limits:
           cpus: '0.1'
-          memory: 250M
+          memory: 300M

epmet-module/gov-grid/gov-grid-server/pom.xml

@@ -3,7 +3,7 @@
          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.13</version>
+    <version>0.3.14</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-grid</artifactId>

epmet-module/gov-org/gov-org-server/Dockerfile

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

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

@@ -2,7 +2,7 @@ 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:0.3.30
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.31
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络
@@ -12,4 +12,4 @@ services:
       resources:
         limits:
           cpus: '0.1'
-          memory: 250M
+          memory: 300M

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>0.3.30</version>
+    <version>0.3.31</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>

epmet-module/resi-mine/resi-mine-server/Dockerfile

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

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

@@ -2,7 +2,7 @@ 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:0.3.6
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-mine-server:0.3.7
     ports:
       - "8094:8094"
     network_mode: host # 使用现有网络
@@ -12,4 +12,4 @@ services:
       resources:
         limits:
           cpus: '0.1'
-          memory: 250M
+          memory: 300M

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>0.3.6</version>
+    <version>0.3.7</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-mine</artifactId>

epmet-user/epmet-user-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar
 
 EXPOSE 8087
 
-ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]
+ENTRYPOINT ["java","-Xms32m","-Xmx250m","-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-dev/epmet-user-server:0.3.24
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.25
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络
@@ -12,4 +12,4 @@ services:
       resources:
         limits:
           cpus: '0.1'
-          memory: 250M
+          memory: 300M

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>0.3.24</version>
+    <version>0.3.25</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>