Merge remote-tracking branch 'origin/master'

deploy/prod/winsun-docker-application-list/core/Dockerfile

@@ -4,4 +4,4 @@ ENV JAR_NAME=core \
     TZ=Asia/Shanghai
     TZ=Asia/Shanghai
 COPY $JAR_NAME.jar $JAR_NAME.jar
 COPY $JAR_NAME.jar $JAR_NAME.jar
 EXPOSE 11002
 EXPOSE 11002
-CMD java -jar -Xms512m -Xmx512m $JAR_NAME.jar --spring.profiles.active=prod
+CMD java -jar $JAR_NAME.jar --spring.profiles.active=prod
\ No newline at end of file

deploy/prod/winsun-docker-application-list/docker-compose.yml

+version: '3.7'
+services:
+  rabbitmq:
+    image: rabbitmq
+    container_name: rabbitmq
+    ports:
+      - "5672:5672"
+      - "15672:15672"
+  redis:
+    image: redis
+    container_name: redis
+    ports:
+      - "6379:6379"
+  eureka:
+    image: eureka
+    container_name: eureka
+    ports:
+      - "20000:20000"
+    build:
+      context: eureka/
+      dockerfile: Dockerfile
+    depends_on:
+      - rabbitmq
+    deploy:
+      resources:
+        limits:
+          memory: 128M
+  gateway:
+    image: gateway
+    container_name: gateway
+    ports:
+      - "10001:10001"
+    build:
+      context: gateway/
+      dockerfile: Dockerfile
+    depends_on:
+      - rabbitmq
+      - eureka
+    deploy:
+      resources:
+        limits:
+          memory: 256M
+  core:
+    image: core
+    container_name: core
+    build:
+      context: core/
+      dockerfile: Dockerfile
+    ports:
+      - "10002:10002"
+    depends_on:
+      - rabbitmq
+      - eureka
+    deploy:
+      resources:
+        limits:
+          memory: 512M
+  gdtelgztelschoolcentermanager:
+    image: gdtelgztelschoolcentermanager
+    container_name: gdtelgztelschoolcentermanager
+    build:
+      context: gdtel-gztel-school-center/manager/
+      dockerfile: Dockerfile
+    ports:
+      - "11091:11091"
+    depends_on:
+      - rabbitmq
+      - eureka
+      - redis
+      - core
+    deploy:
+      resources:
+        limits:
+          memory: 256M
+  gdtelgztelschoolcentertask:
+    image: gdtelgztelschoolcentertask
+    container_name: gdtelgztelschoolcentertask
+    build:
+      context: gdtel-gztel-school-center/task/
+      dockerfile: Dockerfile
+    ports:
+      - "11191:11191"
+      - "8199:8199"
+    depends_on:
+      - rabbitmq
+      - eureka
+      - redis
+      - core
+    deploy:
+      resources:
+        limits:
+          memory: 256M
+  gdtelgztelschoolcenterapplynet:
+    image: gdtelgztelschoolcenterapplynet
+    container_name: gdtelgztelschoolcenterapplynet
+    build:
+      context: gdtel-gztel-school-center/applynet/
+      dockerfile: Dockerfile
+    ports:
+      - "11092:11092"
+    depends_on:
+      - rabbitmq
+      - eureka
+      - redis
+      - core
+    deploy:
+      resources:
+        limits:
+          memory: 256M
+  gdtelgztelschoolcenternewuser:
+    image: gdtelgztelschoolcenternewuser
+    container_name: gdtelgztelschoolcenternewuser
+    build:
+      context: gdtel-gztel-school-center/newuser/
+      dockerfile: Dockerfile
+    ports:
+      - "11093:11093"
+    depends_on:
+      - rabbitmq
+      - eureka
+      - redis
+      - core
+    deploy:
+      resources:
+        limits:
+          memory: 256M
+  gdtelgztelschoolcenterolduser:
+    image: gdtelgztelschoolcenterolduser
+    container_name: gdtelgztelschoolcenterolduser
+    build:
+      context: gdtel-gztel-school-center/olduser/
+      dockerfile: Dockerfile
+    ports:
+      - "11094:11094"
+    depends_on:
+      - rabbitmq
+      - eureka
+      - redis
+      - core
+    deploy:
+      resources:
+        limits:
+          memory: 256M
+  gdtelgztelschoolcenterrenewaluser:
+    image: gdtelgztelschoolcenterrenewaluser
+    container_name: gdtelgztelschoolcenterrenewaluser
+    build:
+      context: gdtel-gztel-school-center/renewaluser/
+      dockerfile: Dockerfile
+    ports:
+      - "11095:11095"
+    depends_on:
+      - rabbitmq
+      - eureka
+      - redis
+      - core
+    deploy:
+      resources:
+        limits:
+          memory: 256M
+  gdtelgztelschoolcenterui:
+    image: gdtelgztelschoolcenterui
+    container_name: gdtelgztelschoolcenterui
+    build:
+      context: gdtel-gztel-school-center/ui/
+      dockerfile: Dockerfile
+    ports:
+      - "11090:11090"
+    depends_on:
+      - rabbitmq
+      - redis
+      - eureka
+      - gateway
+      - core
+    deploy:
+      resources:
+        limits:
+          memory: 128M
+  winsunoaui:
+    image: winsunoaui
+    container_name: winsunoaui
+    build:
+      context: winsun-oa/ui/
+      dockerfile: Dockerfile
+    ports:
+      - "11080:11080"
+    depends_on:
+      - rabbitmq
+      - redis
+      - eureka
+      - gateway
+      - core
+    deploy:
+      resources:
+        limits:
+          memory: 128M
+  winsunoareport:
+    image: winsunoareport
+    container_name: winsunoareport
+    ports:
+      - "10003:10003"
+    build:
+      context: winsun-oa/report/
+      dockerfile: Dockerfile
+    depends_on:
+      - rabbitmq
+      - redis
+      - eureka
+      - core
+    deploy:
+      resources:
+        limits:
+          memory: 256M

deploy/prod/winsun-docker-application-list/eureka/Dockerfile

@@ -4,4 +4,4 @@ ENV JAR_NAME=eureka \
     TZ=Asia/Shanghai
     TZ=Asia/Shanghai
 COPY eureka.jar eureka.jar
 COPY eureka.jar eureka.jar
 EXPOSE 21000
 EXPOSE 21000
-CMD java -jar -Xms256m -Xmx256m eureka.jar --spring.profiles.active=prod
+CMD java -jar eureka.jar --spring.profiles.active=prod
\ No newline at end of file

deploy/prod/winsun-docker-application-list/gateway/Dockerfile

@@ -4,4 +4,4 @@ ENV JAR_NAME=gateway \
     TZ=Asia/Shanghai
     TZ=Asia/Shanghai
 COPY $JAR_NAME.jar $JAR_NAME.jar
 COPY $JAR_NAME.jar $JAR_NAME.jar
 EXPOSE 10001
 EXPOSE 10001
-CMD java -jar -Xms512m -Xmx512m $JAR_NAME.jar --spring.profiles.active=prod
+CMD java -jar $JAR_NAME.jar --spring.profiles.active=prod
\ No newline at end of file

deploy/prod/winsun-docker-application-list/gdtel-gztel-school-center/applynet/Dockerfile

@@ -4,4 +4,4 @@ ENV JAR_NAME=applynet \
     TZ=Asia/Shanghai
     TZ=Asia/Shanghai
 COPY $JAR_NAME.jar $JAR_NAME.jar
 COPY $JAR_NAME.jar $JAR_NAME.jar
 EXPOSE 11092
 EXPOSE 11092
-CMD java -jar -Xms512m -Xmx512m $JAR_NAME.jar --spring.profiles.active=prod
+CMD java -jar $JAR_NAME.jar --spring.profiles.active=prod
\ No newline at end of file

deploy/prod/winsun-docker-application-list/gdtel-gztel-school-center/manager/Dockerfile

@@ -4,4 +4,4 @@ ENV JAR_NAME=manager \
     TZ=Asia/Shanghai
     TZ=Asia/Shanghai
 COPY $JAR_NAME.jar $JAR_NAME.jar
 COPY $JAR_NAME.jar $JAR_NAME.jar
 EXPOSE 11091
 EXPOSE 11091
-CMD java -jar -Xms512m -Xmx512m $JAR_NAME.jar --spring.profiles.active=prod
+CMD java -jar $JAR_NAME.jar --spring.profiles.active=prod
\ No newline at end of file

deploy/prod/winsun-docker-application-list/gdtel-gztel-school-center/newuser/Dockerfile

@@ -4,4 +4,4 @@ ENV JAR_NAME=newuser \
     TZ=Asia/Shanghai
     TZ=Asia/Shanghai
 COPY $JAR_NAME.jar $JAR_NAME.jar
 COPY $JAR_NAME.jar $JAR_NAME.jar
 EXPOSE 11093
 EXPOSE 11093
-CMD java -jar -Xms512m -Xmx512m $JAR_NAME.jar --spring.profiles.active=prod
+CMD java -jar $JAR_NAME.jar --spring.profiles.active=prod
\ No newline at end of file

deploy/prod/winsun-docker-application-list/gdtel-gztel-school-center/olduser/Dockerfile

@@ -4,4 +4,4 @@ ENV JAR_NAME=olduser \
     TZ=Asia/Shanghai
     TZ=Asia/Shanghai
 COPY $JAR_NAME.jar $JAR_NAME.jar
 COPY $JAR_NAME.jar $JAR_NAME.jar
 EXPOSE 11094
 EXPOSE 11094
-CMD java -jar -Xms512m -Xmx512m $JAR_NAME.jar --spring.profiles.active=prod
+CMD java -jar $JAR_NAME.jar --spring.profiles.active=prod
\ No newline at end of file

deploy/prod/winsun-docker-application-list/gdtel-gztel-school-center/renewaluser/Dockerfile

@@ -4,4 +4,4 @@ ENV JAR_NAME=renewaluser \
     TZ=Asia/Shanghai
     TZ=Asia/Shanghai
 COPY $JAR_NAME.jar $JAR_NAME.jar
 COPY $JAR_NAME.jar $JAR_NAME.jar
 EXPOSE 11095
 EXPOSE 11095
-CMD java -jar -Xms512m -Xmx512m $JAR_NAME.jar --spring.profiles.active=prod
+CMD java -jar $JAR_NAME.jar --spring.profiles.active=prod
\ No newline at end of file

deploy/prod/winsun-docker-application-list/gdtel-gztel-school-center/task/Dockerfile

@@ -4,4 +4,4 @@ ENV JAR_NAME=task \
     TZ=Asia/Shanghai
     TZ=Asia/Shanghai
 COPY $JAR_NAME.jar $JAR_NAME.jar
 COPY $JAR_NAME.jar $JAR_NAME.jar
 EXPOSE 11191
 EXPOSE 11191
-CMD java -jar -Xms512m -Xmx512m $JAR_NAME.jar --spring.profiles.active=prod
+CMD java -jar $JAR_NAME.jar --spring.profiles.active=prod
\ No newline at end of file