diff --git a/script/assembly/server/bin/startup.sh b/script/assembly/server/bin/startup.sh index 6fb7cc1..0f93266 100644 --- a/script/assembly/server/bin/startup.sh +++ b/script/assembly/server/bin/startup.sh @@ -66,11 +66,10 @@ if [ ! -d $LOGS_DIR ]; then fi # JVM Configuration -JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true " +JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Duser.timezone=Asia/Shanghai" JAVA_MEM_OPTS=" -server -Xms256m -Xmx1024m -XX:SurvivorRatio=2 -XX:+UseParallelGC " - # 加载外部log文件的配置 LOG_IMPL_FILE=logback-spring.xml LOGGING_CONFIG="" diff --git a/script/docker/server/Dockerfile b/script/docker/server/Dockerfile index 5e888d4..bd842b3 100644 --- a/script/docker/server/Dockerfile +++ b/script/docker/server/Dockerfile @@ -4,6 +4,10 @@ MAINTAINER tomsun28 "tomsun28@outlook.com" ADD hertzbeat-1.0-beta.5.tar /opt/ +RUN apk add --no-cache tzdata + +ENV TZ=Asia/Shanghai + EXPOSE 1157 WORKDIR /opt/hertzbeat/ diff --git a/script/sql/schema.sql b/script/sql/schema.sql index 7b85496..fac0c8c 100644 --- a/script/sql/schema.sql +++ b/script/sql/schema.sql @@ -1,3 +1,6 @@ +set names utf8mb4; +drop database if exists hertzbeat; +create database hertzbeat; use hertzbeat; -- ---------------------------- diff --git a/web-app/src/app/routes/alert/alert-center/alert-center.component.html b/web-app/src/app/routes/alert/alert-center/alert-center.component.html index 51972d0..ec34603 100644 --- a/web-app/src/app/routes/alert/alert-center/alert-center.component.html +++ b/web-app/src/app/routes/alert/alert-center/alert-center.component.html @@ -117,7 +117,7 @@ {{ data.status === 0 ? '未处理' : '已处理' }} - {{ data.gmtCreate }} + {{ data.gmtCreate | date: 'YYYY-MM-dd HH:mm:ss' }}