diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 466529a..b118b6b 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -5,13 +5,16 @@ services: container_name: mysql restart: always environment: - MYSQL_DATABASE: weekly_report - MYSQL_ROOT_PASSWORD: root + - MYSQL_DATABASE=weekly_report + - MYSQL_ROOT_PASSWORD=root + - SET_CONTAINER_TIMEZONE=true + - CONTAINER_TIMEZONE=Asia/Shanghai ports: - 3306:3306 volumes: - ./mysql/initdb.d:/docker-entrypoint-initdb.d - ./mysql/conf.d:/etc/mysql/conf.d + # - ./mysql/data:/var/lib/mysql # mysql 数据存储目录 nginx: depends_on: @@ -36,6 +39,8 @@ services: environment: - GO111MODULE=on - GOPROXY=https://goproxy.cn + - SET_CONTAINER_TIMEZONE=true + - CONTAINER_TIMEZONE=Asia/Shanghai privileged: true restart: always ports: @@ -44,3 +49,8 @@ services: - ../server/:/usr/local/weekly_report - ./web/:/usr/local/web + # alpine 更新时间 + # echo 'http://mirrors.ustc.edu.cn/alpine/v3.5/main' > /etc/apk/repositories + # echo 'http://mirrors.ustc.edu.cn/alpine/v3.5/community' >>/etc/apk/repositories + # 时间同步: RUN apk add tzdata ; cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo "Asia/Shanghai" > /etc/timezone && apk del tzdata + diff --git a/docker/mysql/initdb.d/weekly_report.sql b/docker/mysql/initdb.d/weekly_report.sql index 5fb8b4e..89a32ce 100644 --- a/docker/mysql/initdb.d/weekly_report.sql +++ b/docker/mysql/initdb.d/weekly_report.sql @@ -632,7 +632,7 @@ CREATE TABLE `wt_reports` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `user_name` varchar(100) COLLATE utf8_bin DEFAULT NULL COMMENT '用户名', `user_id` int(11) DEFAULT NULL COMMENT '用户id', - `send_to` varchar(100) COLLATE utf8_bin DEFAULT NULL COMMENT '发送给谁', + `send_to` varchar(5000) COLLATE utf8_bin DEFAULT NULL COMMENT '发送给谁', `header` varchar(100) COLLATE utf8_bin DEFAULT NULL COMMENT '报告标题名', `contents` mediumtext COLLATE utf8_bin COMMENT '报告内容', `pictures` text COLLATE utf8_bin COMMENT '图片',