江门

prod-env/docker-compose.yml

@@ -11,7 +11,6 @@ services:
     environment:
       - ALLOW_ANONYMOUS_LOGIN=yes
       - ZK_LOG_LEVEL=WARN
-      - TZ=Asia/Bangkok
     labels:
       com.description: "物业 物联网 后端 zookeeper 服务"
       com.maintainer: "anfioo <anfioozys@gmail.com>"
@@ -67,7 +66,6 @@ services:
       - KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092
       - KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=PLAINTEXT:PLAINTEXT
       - KAFKA_CFG_INTER_BROKER_LISTENER_NAME=PLAINTEXT
-      - TZ=Asia/Bangkok
     logging:
       driver: "json-file"
       options:
@@ -122,7 +120,6 @@ services:
       - mqtt-config:/mosquitto/config
       - mqtt-log:/mosquitto/log
     environment:
-      - TZ=Asia/Bangkok
       - MQTT_USERNAME=${MQTT_USERNAME}
       - MQTT_PASSWORD=${MQTT_PASSWORD}
     labels:
@@ -161,7 +158,6 @@ services:
       - "3306:3306"
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
-      - TZ=Asia/Bangkok
     labels:
       com.description: "物业 物联网 后端 mysql 服务"
       com.maintainer: "anfioo <anfioozys@gmail.com>"
@@ -188,7 +184,6 @@ services:
           echo "sql_mode = \"STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION\"";
           echo "max_connections = 300";
           echo "symbolic-links = 0";
-          echo "default-time_zone = \"+7:00\"";
           echo "lower_case_table_names=1";
       
           echo "innodb_buffer_pool_size = 24G";         
@@ -244,7 +239,6 @@ services:
     restart: unless-stopped
     environment:
       - REDIS_PASSWORD=${REDIS_PASSWORD}  # 可修改密码
-      - TZ=Asia/Bangkok
     ports:
       - "6379:6379"
     labels:
@@ -312,7 +306,6 @@ services:
     environment:
       REDIS_PASSWORD: ${REDIS_PASSWORD}
       MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
-      TZ: Asia/Bangkok
     volumes:
       - backend-property-logs:/logs
       - backend-property-data:/jar
@@ -345,7 +338,6 @@ services:
       MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
       MQTT_PASSWORD: ${MQTT_PASSWORD}
       MQTT_USERNAME: ${MQTT_USERNAME}
-      TZ: Asia/Bangkok
     volumes:
       - backend-iot-logs:/logs
       - backend-iot-data:/jar
@@ -377,8 +369,6 @@ services:
       - web-property-data:/MicroCommunityWeb
       - web-property-conf:/etc/nginx
       - web-property-logs:/var/log/
-    environment:
-      TZ: Asia/Bangkok
     networks:
       - anfioonet
     depends_on:
@@ -396,8 +386,6 @@ services:
       dockerfile: Dockerfile
     container_name: micro-community-iot-web
     restart: unless-stopped
-    environment:
-      TZ: Asia/Bangkok
     ports:
       - "8112:8112"   # 宿主机端口:容器端口
     labels:
@@ -425,8 +413,6 @@ services:
       context: ../resources/Web/WechatOwnerService
       dockerfile: Dockerfile
     container_name: wechat-owner-service-web
-    environment:
-      TZ: Asia/Bangkok
     restart: unless-stopped
     labels:
       com.description: "微信业主端 Web 服务 H5页面（Nginx 静态前端）"
@@ -455,8 +441,6 @@ services:
       context: ../resources/Web/PropertyApp
       dockerfile: Dockerfile
     container_name: property-app-web
-    environment:
-      TZ: Asia/Bangkok
     restart: unless-stopped
     labels:
       com.description: "微信员工端 Web 服务 H5页面（Nginx 静态前端）"
@@ -489,8 +473,6 @@ services:
         PASSWORD: ${VOLUME_HELPER_SSH_PASSWORD}   # 可自定义 root 密码
     container_name: volume-helper-ssh
     restart: unless-stopped
-    environment:
-      TZ: Asia/Bangkok
     labels:
       com.description: "容器帮助者"
       com.maintainer: "anfioo <anfioozys@gmail.com>"

resources/MicroCommunity/Dockerfile

@@ -1,13 +1,5 @@
 FROM openjdk:8-jdk
 
-# 添加环境变量
-ENV TZ=Asia/Phnom_Penh
-
-# 保留原有的时区配置
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-
-
 # 创建 jar 目录
 RUN mkdir -p /jar
 # 复制 jar 文件到镜像
@@ -15,4 +7,4 @@ COPY MicroCommunityBoot.jar /jar/MicroCommunityBoot.jar
 
 EXPOSE 8008
 
-ENTRYPOINT ["java", "-Dfile.encoding=UTF-8", "-Duser.timezone=Asia/Phnom_Penh", "-XX:+UseG1GC", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseContainerSupport", "-XX:MaxRAMPercentage=75.0", "-jar", "/jar/MicroCommunityBoot.jar"]
+ENTRYPOINT ["java", "-Dfile.encoding=UTF-8", "-XX:+UseG1GC", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseContainerSupport", "-XX:MaxRAMPercentage=75.0", "-jar", "/jar/MicroCommunityBoot.jar"]

resources/MicroCommunityIot/Dockerfile

@@ -1,13 +1,6 @@
 FROM openjdk:8-jdk
 # 创建 jar 目录
 
-# 添加环境变量
-ENV TZ=Asia/Phnom_Penh
-
-# 保留原有的时区配置
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-
 RUN mkdir -p /jar
 # 复制 jar 文件到镜像
 COPY MicroCommunityIot.jar /jar/MicroCommunityIot.jar
@@ -15,4 +8,4 @@ COPY MicroCommunityIot.jar /jar/MicroCommunityIot.jar
 EXPOSE 9999 20011
 
 
-ENTRYPOINT ["java", "-Dfile.encoding=UTF-8", "-Duser.timezone=Asia/Phnom_Penh", "-XX:+UseG1GC", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseContainerSupport", "-XX:MaxRAMPercentage=75.0", "-jar", "/jar/MicroCommunityIot.jar"]
+ENTRYPOINT ["java", "-Dfile.encoding=UTF-8",  "-XX:+UseG1GC", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseContainerSupport", "-XX:MaxRAMPercentage=75.0", "-jar", "/jar/MicroCommunityIot.jar"]