diff --git a/.env.docker b/.env.docker index af3a54dea..399e91d7d 100644 --- a/.env.docker +++ b/.env.docker @@ -1,3 +1,5 @@ +TIMEZONE=PRC + APP_NAME=DooTask APP_ENV=local APP_KEY= diff --git a/.env.example b/.env.example index 3e36d2aeb..49c2212c5 100644 --- a/.env.example +++ b/.env.example @@ -1,3 +1,5 @@ +TIMEZONE=PRC + APP_NAME=Laravel APP_ENV=local APP_KEY= diff --git a/config/app.php b/config/app.php index 987bbb270..484ade76c 100644 --- a/config/app.php +++ b/config/app.php @@ -67,7 +67,7 @@ return [ | */ - 'timezone' => 'PRC', + 'timezone' => env('TIMEZONE', 'PRC'), /* |-------------------------------------------------------------------------- diff --git a/docker-compose.yml b/docker-compose.yml index d7378d2e3..d8357db07 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -151,7 +151,7 @@ services: container_name: "dootask-approve-${APP_ID}" image: "hitosea2020/go-approve:0.1.3" environment: - TZ: "Asia/Shanghai" + TZ: "${TIMEZONE:-PRC}" MYSQL_HOST: "${DB_HOST}" MYSQL_PORT: "${DB_PORT}" MYSQL_DBNAME: "${DB_DATABASE}" diff --git a/public/images/emoticon/18/1.gif b/public/images/emoticon/18/1.gif index b334b6009..98ab86212 100644 Binary files a/public/images/emoticon/18/1.gif and b/public/images/emoticon/18/1.gif differ diff --git a/public/images/emoticon/18/10.gif b/public/images/emoticon/18/10.gif index ef505fa5e..4715c28a3 100644 Binary files a/public/images/emoticon/18/10.gif and b/public/images/emoticon/18/10.gif differ diff --git a/public/images/emoticon/18/11.gif b/public/images/emoticon/18/11.gif index c0111c16b..31cabfe64 100644 Binary files a/public/images/emoticon/18/11.gif and b/public/images/emoticon/18/11.gif differ diff --git a/public/images/emoticon/18/12.gif b/public/images/emoticon/18/12.gif index 5cde8ada6..acd485058 100644 Binary files a/public/images/emoticon/18/12.gif and b/public/images/emoticon/18/12.gif differ diff --git a/public/images/emoticon/18/13.gif b/public/images/emoticon/18/13.gif index 753ce4f7e..f222934af 100644 Binary files a/public/images/emoticon/18/13.gif and b/public/images/emoticon/18/13.gif differ diff --git a/public/images/emoticon/18/14.gif b/public/images/emoticon/18/14.gif index 31d3970cb..0bdd7d515 100644 Binary files a/public/images/emoticon/18/14.gif and b/public/images/emoticon/18/14.gif differ diff --git a/public/images/emoticon/18/15.gif b/public/images/emoticon/18/15.gif index c8128bddd..6bc58fa15 100644 Binary files a/public/images/emoticon/18/15.gif and b/public/images/emoticon/18/15.gif differ diff --git a/public/images/emoticon/18/16.gif b/public/images/emoticon/18/16.gif index 90e8ec70b..7bb29a7cd 100644 Binary files a/public/images/emoticon/18/16.gif and b/public/images/emoticon/18/16.gif differ diff --git a/public/images/emoticon/18/17.gif b/public/images/emoticon/18/17.gif index e479895e5..d6e07a655 100644 Binary files a/public/images/emoticon/18/17.gif and b/public/images/emoticon/18/17.gif differ diff --git a/public/images/emoticon/18/18.gif b/public/images/emoticon/18/18.gif index 59ec47c4e..39dcc9d24 100644 Binary files a/public/images/emoticon/18/18.gif and b/public/images/emoticon/18/18.gif differ diff --git a/public/images/emoticon/18/19.gif b/public/images/emoticon/18/19.gif index a612b4f81..40e8b59a0 100644 Binary files a/public/images/emoticon/18/19.gif and b/public/images/emoticon/18/19.gif differ diff --git a/public/images/emoticon/18/2.gif b/public/images/emoticon/18/2.gif index 710637a09..6a13ad15b 100644 Binary files a/public/images/emoticon/18/2.gif and b/public/images/emoticon/18/2.gif differ diff --git a/public/images/emoticon/18/20.gif b/public/images/emoticon/18/20.gif index 4861c1287..3a48bb6aa 100644 Binary files a/public/images/emoticon/18/20.gif and b/public/images/emoticon/18/20.gif differ diff --git a/public/images/emoticon/18/21.gif b/public/images/emoticon/18/21.gif index 41cc3313f..c711308a8 100644 Binary files a/public/images/emoticon/18/21.gif and b/public/images/emoticon/18/21.gif differ diff --git a/public/images/emoticon/18/22.gif b/public/images/emoticon/18/22.gif index bce8868ec..384c17d82 100644 Binary files a/public/images/emoticon/18/22.gif and b/public/images/emoticon/18/22.gif differ diff --git a/public/images/emoticon/18/23.gif b/public/images/emoticon/18/23.gif index 3fcc8d252..0d7c43804 100644 Binary files a/public/images/emoticon/18/23.gif and b/public/images/emoticon/18/23.gif differ diff --git a/public/images/emoticon/18/24.gif b/public/images/emoticon/18/24.gif index bf4cd1b77..9d53993eb 100644 Binary files a/public/images/emoticon/18/24.gif and b/public/images/emoticon/18/24.gif differ diff --git a/public/images/emoticon/18/25.gif b/public/images/emoticon/18/25.gif index 2449b09ec..e16cf0860 100644 Binary files a/public/images/emoticon/18/25.gif and b/public/images/emoticon/18/25.gif differ diff --git a/public/images/emoticon/18/26.gif b/public/images/emoticon/18/26.gif index a7eede251..11439f823 100644 Binary files a/public/images/emoticon/18/26.gif and b/public/images/emoticon/18/26.gif differ diff --git a/public/images/emoticon/18/27.gif b/public/images/emoticon/18/27.gif index 34b355179..32249e102 100644 Binary files a/public/images/emoticon/18/27.gif and b/public/images/emoticon/18/27.gif differ diff --git a/public/images/emoticon/18/28.gif b/public/images/emoticon/18/28.gif index 6559cf642..26f1a3733 100644 Binary files a/public/images/emoticon/18/28.gif and b/public/images/emoticon/18/28.gif differ diff --git a/public/images/emoticon/18/29.gif b/public/images/emoticon/18/29.gif index e9d87d09c..382210e35 100644 Binary files a/public/images/emoticon/18/29.gif and b/public/images/emoticon/18/29.gif differ diff --git a/public/images/emoticon/18/3.gif b/public/images/emoticon/18/3.gif index dd0e4b1dc..4d1d7193c 100644 Binary files a/public/images/emoticon/18/3.gif and b/public/images/emoticon/18/3.gif differ diff --git a/public/images/emoticon/18/30.gif b/public/images/emoticon/18/30.gif index 45e21f036..ce454b78e 100644 Binary files a/public/images/emoticon/18/30.gif and b/public/images/emoticon/18/30.gif differ diff --git a/public/images/emoticon/18/31.gif b/public/images/emoticon/18/31.gif index d034173c2..0293eb46f 100644 Binary files a/public/images/emoticon/18/31.gif and b/public/images/emoticon/18/31.gif differ diff --git a/public/images/emoticon/18/32.gif b/public/images/emoticon/18/32.gif index 9bb8ebf06..1aed51f6f 100644 Binary files a/public/images/emoticon/18/32.gif and b/public/images/emoticon/18/32.gif differ diff --git a/public/images/emoticon/18/33.gif b/public/images/emoticon/18/33.gif index c64636310..a378003d5 100644 Binary files a/public/images/emoticon/18/33.gif and b/public/images/emoticon/18/33.gif differ diff --git a/public/images/emoticon/18/34.gif b/public/images/emoticon/18/34.gif index 79e7a736b..9181135bd 100644 Binary files a/public/images/emoticon/18/34.gif and b/public/images/emoticon/18/34.gif differ diff --git a/public/images/emoticon/18/4.gif b/public/images/emoticon/18/4.gif index f24703f08..091fd8300 100644 Binary files a/public/images/emoticon/18/4.gif and b/public/images/emoticon/18/4.gif differ diff --git a/public/images/emoticon/18/5.gif b/public/images/emoticon/18/5.gif index 332fc8fc1..d65ffedd3 100644 Binary files a/public/images/emoticon/18/5.gif and b/public/images/emoticon/18/5.gif differ diff --git a/public/images/emoticon/18/6.gif b/public/images/emoticon/18/6.gif index 3632ad277..4b6e329fe 100644 Binary files a/public/images/emoticon/18/6.gif and b/public/images/emoticon/18/6.gif differ diff --git a/public/images/emoticon/18/7.gif b/public/images/emoticon/18/7.gif index 987eef864..50b0cc82e 100644 Binary files a/public/images/emoticon/18/7.gif and b/public/images/emoticon/18/7.gif differ diff --git a/public/images/emoticon/18/8.gif b/public/images/emoticon/18/8.gif index ea99b914f..2aa7ddab8 100644 Binary files a/public/images/emoticon/18/8.gif and b/public/images/emoticon/18/8.gif differ diff --git a/public/images/emoticon/18/9.gif b/public/images/emoticon/18/9.gif index 3c22ed446..8202395e9 100644 Binary files a/public/images/emoticon/18/9.gif and b/public/images/emoticon/18/9.gif differ diff --git a/public/js/emoticon.all.js b/public/js/emoticon.all.js index 2bba7b87b..ed308554b 100644 --- a/public/js/emoticon.all.js +++ b/public/js/emoticon.all.js @@ -5,40 +5,40 @@ "path": "18", "icon": "icon.png", "list": [ - {"name": "爱你", "key": "爱你 爱你哟 爱老虎油 爱你啦 亲亲 亲一个 啵啵 比心 笔芯 爱心", "path": "1.gif"}, - {"name": "搬砖", "key": "搬砖 工作 努力", "path": "2.gif"}, - {"name": "不愧是精英", "key": "不愧是精英 精英 大佬 厉害 真棒 你真棒 牛逼 6 666 不愧是你 还得是你", "path": "3.gif"}, - {"name": "不想理你", "key": "生气 不理 不开心 哼 不想理你", "path": "4.gif"}, - {"name": "不想面对", "key": "不想面对 瑟瑟发抖 体重 担忧 不想理你 又胖了", "path": "5.gif"}, - {"name": "沉迷工作", "key": "工作 认真 做事 干活 电脑 沉迷工作", "path": "6.gif"}, - {"name": "打卡了么", "key": "打卡 上班 报 记得打卡", "path": "7.gif"}, - {"name": "发生了啥", "key": "冒泡 浮出水面 发生了啥 八卦 露头 我看看 怎么个事 怎么了", "path": "8.gif"}, - {"name": "给你个眼神", "key": "眼神 真的 质疑 疑问 不确定 给你个眼神", "path": "9.gif"}, - {"name": "恭喜发财", "key": "恭喜发财 新年好 新年 拜年", "path": "10.gif"}, - {"name": "跪谢", "key": "谢谢 感动 跪 多谢 THANKS THANK YOU 谢了", "path": "11.gif"}, - {"name": "Hi", "key": "Hi 打招呼 欢迎 招呼 你好 好 哈喽 哈啰 hello 大家好", "path": "12.gif"}, + {"name": "爱你", "key": "爱你哟 爱老虎油 爱你啦 亲亲 亲一个 啵啵", "path": "1.gif"}, + {"name": "搬砖", "key": "工作 努力", "path": "2.gif"}, + {"name": "不愧是精英", "key": "精英 大佬 厉害 真棒 你真棒 牛逼", "path": "3.gif"}, + {"name": "不想理你", "key": "生气 不理 不开心", "path": "4.gif"}, + {"name": "不想面对", "key": "瑟瑟发抖 体重", "path": "5.gif"}, + {"name": "沉迷工作", "key": "工作 认真 做事 干活 电脑", "path": "6.gif"}, + {"name": "打卡了么", "key": "打卡 上班 报", "path": "7.gif"}, + {"name": "发生了啥", "key": "冒泡 浮出水面 八卦 露头", "path": "8.gif"}, + {"name": "给你个眼神", "key": "眼神 真的 质疑 疑问 不确定", "path": "9.gif"}, + {"name": "恭喜发财", "key": "新年好 新年 拜年", "path": "10.gif"}, + {"name": "跪谢", "key": "谢谢 感动 跪", "path": "11.gif"}, + {"name": "Hi", "key": "打招呼 欢迎 招呼 你好 好", "path": "12.gif"}, {"name": "欢迎欢迎", "key": "欢迎 新人 兴奋 开心 庆祝 喝彩 气氛组", "path": "13.gif"}, - {"name": "加油", "key": "加油 喝彩 气氛组", "path": "14.gif"}, - {"name": "静静看着你", "key": "静静 看着 不说话 沉默 静静看着你 无语 看你表演", "path": "15.gif"}, - {"name": "开会啦", "key": "开会 会 通知 敲锣 开会啦 开会了", "path": "16.gif"}, - {"name": "可以吗", "key": "可以吗 害羞 不好意思 脸红 可以 可以不", "path": "17.gif"}, - {"name": "迷之自信", "key": "自信 迷之自信 自我欣赏 自恋 我真帅", "path": "18.gif"}, - {"name": "明白", "key": "明白 收到 好的 收 OK", "path": "19.gif"}, - {"name": "摸摸", "key": "摸摸 摸头 你真乖 乖 棒", "path": "20.gif"}, - {"name": "你真棒", "key": "大拇指 你真棒 太棒了 太棒啦 棒棒棒 棒", "path": "21.gif"}, - {"name": "佩服", "key": "佩服 五体投地 崇拜 仰慕 牛逼 厉害", "path": "22.gif"}, - {"name": "撒花", "key": "撒花 欢迎 花 开心 耶 真好 真棒", "path": "23.gif"}, - {"name": "生日快乐", "key": "生日快乐 吃蛋糕 蛋糕 生日", "path": "24.gif"}, - {"name": "收到", "key": "明白 收到 好的 收 已阅 已读", "path": "25.gif"}, + {"name": "加油", "key": "喝彩 气氛组", "path": "14.gif"}, + {"name": "静静看着你", "key": "静静 看着 不说话 沉默", "path": "15.gif"}, + {"name": "开会啦", "key": "开会 会 通知 敲锣", "path": "16.gif"}, + {"name": "可以吗", "key": "害羞 不好意思", "path": "17.gif"}, + {"name": "迷之自信", "key": "自信 自我欣赏", "path": "18.gif"}, + {"name": "明白", "key": "收到 好的 收", "path": "19.gif"}, + {"name": "摸摸", "key": "摸头 你真乖 乖 棒", "path": "20.gif"}, + {"name": "你真棒", "key": "大拇指 太棒了 太棒啦 棒棒棒 棒", "path": "21.gif"}, + {"name": "佩服", "key": "五体投地 崇拜 仰慕 牛逼 厉害", "path": "22.gif"}, + {"name": "撒花", "key": "欢迎 花 开心", "path": "23.gif"}, + {"name": "生日快乐", "key": "吃蛋糕 蛋糕", "path": "24.gif"}, + {"name": "收到", "key": "明白 好的 收 已阅 已读", "path": "25.gif"}, {"name": "送你花花", "key": "送花 送你花 花 兴奋 开心 庆祝 喝彩 气氛组", "path": "26.gif"}, - {"name": "在线吃瓜", "key": "吃瓜 八卦 看戏 看热闹 在线吃瓜 凑热闹 吃瓜群众 围观", "path": "27.gif"}, - {"name": "我错了", "key": "认错 错了 哭 难过 悲伤 我错了 对不起 道歉", "path": "28.gif"}, - {"name": "我太难了", "key": "我太难了 太难了 难过 不开心 委屈", "path": "29.gif"}, - {"name": "笑而不语", "key": "笑 不说话 静静 不发表 沉默", "path": "30.gif"}, - {"name": "行行好吧", "key": "行行好 乞丐 乞求 请求 求助 给点吧", "path": "31.gif"}, - {"name": "幸福", "key": "幸福 满足 洗澡 泡澡 开心", "path": "32.gif"}, - {"name": "赞", "key": "大拇指 赞 点赞 厉害 你真棒 太棒了 太棒啦 棒棒棒 棒 6 666 牛", "path": "33.gif"}, - {"name": "走人了", "key": "下班 闪人 走人 溜人 走了 关机", "path": "34.gif"} + {"name": "在线吃瓜", "key": "吃瓜 八卦", "path": "27.gif"}, + {"name": "我错了", "key": "认错 错了 哭 难过", "path": "28.gif"}, + {"name": "我太难了", "key": "太难了 难过 不开心 委屈", "path": "29.gif"}, + {"name": "笑而不语", "key": "笑 不说话 静静 不发表", "path": "30.gif"}, + {"name": "行行好吧", "key": "行行好 乞丐 乞求 请求 求助", "path": "31.gif"}, + {"name": "幸福", "key": "满足 洗澡 泡澡", "path": "32.gif"}, + {"name": "赞", "key": "大拇指 点赞 厉害 你真棒 太棒了 太棒啦 棒棒棒 棒", "path": "33.gif"}, + {"name": "走人了", "key": "下班 闪人 走人 溜人", "path": "34.gif"} ] }, {