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

Conflicts: epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
4 years ago · 13c0c70c3a
1 changed files with 2 additions and 2 deletions
--- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
@ -9,10 +9,10 @@ services:
    volumes:
      - "/opt/epmet-cloud-logs/prod:/logs"
    environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx1724m -jar ./data-stats.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx3000m -jar ./data-stats.jar"
    restart: "unless-stopped"
    deploy:
      resources:
        limits:
          cpus: '0.1'
-          memory: 1800M
+          memory: 3200M