From 23653b907fb133ecc110f920fb0331a5117cfdb1 Mon Sep 17 00:00:00 2001 From: Lance Liao Date: Thu, 27 Apr 2023 01:49:02 +0800 Subject: [PATCH] Update TG group link --- README.md | 31 +++++++++--------- .../compensateday1.jpg | Bin .../compensateday2.jpg | Bin .../customCompensateday1.png | Bin .../customCompensateday2.png | Bin holiday1.jpg => screenshots/holiday1.jpg | Bin holiday2.jpg => screenshots/holiday2.jpg | Bin .../holidayAlarm.jpg | Bin .../queryHoliday.jpg | Bin 9 files changed, 16 insertions(+), 15 deletions(-) rename compensateday1.jpg => screenshots/compensateday1.jpg (100%) rename compensateday2.jpg => screenshots/compensateday2.jpg (100%) rename customCompensateday1.png => screenshots/customCompensateday1.png (100%) rename customCompensateday2.png => screenshots/customCompensateday2.png (100%) rename holiday1.jpg => screenshots/holiday1.jpg (100%) rename holiday2.jpg => screenshots/holiday2.jpg (100%) rename holidayAlarm.jpg => screenshots/holidayAlarm.jpg (100%) rename queryHoliday.jpg => screenshots/queryHoliday.jpg (100%) diff --git a/README.md b/README.md index 78a6a0c..f8b843b 100644 --- a/README.md +++ b/README.md @@ -1,41 +1,42 @@ -## 中国节假日补班日历 +# 中国节假日补班日历 -### 说明 +## 说明 2020~2023年中国放假、调休和补班日历 更新时间2022-12-09 13:00:03 -#### 日历名称 +### 支持3种类型的日历 - `holidayCal.ics` 包含放假和调休 - `holidayCal-HO.ics` 仅包含放假 - `holidayCal-CO.ics` 仅包含调休 -#### 订阅地址 +### 订阅地址 *注：链接地址为完整日历，若仅需放假或调休日历，替换URL的日历名称即可* - 国内订阅地址(**支持定制补班日程**): [https://www.shuyz.com/githubfiles/china-holiday-calender/master/holidayCal.ics](https://www.shuyz.com/githubfiles/china-holiday-calender/master/holidayCal.ics) - jsDelivr订阅地址: [https://cdn.jsdelivr.net/gh/lanceliao/china-holiday-calender/holidayCal.ics](https://cdn.jsdelivr.net/gh/lanceliao/china-holiday-calender/holidayCal.ics) - GitHub订阅地址(科学上网): [https://raw.githubusercontent.com/lanceliao/china-holiday-calender/master/holidayCal.ics](https://raw.githubusercontent.com/lanceliao/china-holiday-calender/master/holidayCal.ics) -- Telegram讨论组: [https://t.me/joinchat/EwhMZRVB7xI4OpuXLXukkw](https://t.me/joinchat/EwhMZRVB7xI4OpuXLXukkw) +- 参与Telegram讨论: [https://t.me/ShuYZGroup](https://t.me/ShuYZGroup) -### 特点 +## 特点 1. 节假日信息来自[中国政府网](http://www.gov.cn/)，一手信息、权威准确 2. 包含最近3年的节假日信息，机器人自动维护，更新及时 3. 日历标题包含放假、补班的天数信息 4. 日历标题包含放假、补班等关键字，方便脚本开发。例如使用`iPhone`的`快捷指令`应用编写工作日闹钟 5. 每个补班日程自动设置上班提醒，默认时间为`09:00~18:00`、提前一个小时提醒 6. 支持个性化定制补班日程的开始、结束时间和提醒时间(例如提前一天提醒) +7. 没有广告！！！ -### 放假日程 +## 放假日程 日程表 | 详细信息 :-------------------------:|:-------------------------: -![](./holiday1.jpg) | ![](./holiday2.jpg) +![](./screenshots/holiday1.jpg) | ![](./screenshots/holiday2.jpg) -### 补班日程 +## 补班日程 日程表 | 详细信息 :-------------------------:|:-------------------------: -![](./compensateday1.jpg) | ![](./compensateday2.jpg) +![](./screenshots/compensateday1.jpg) | ![](./screenshots/compensateday2.jpg) -### 定制补班日程 +## 定制补班日程 支持指定补班日程的开始、结束时间和提醒时间，格式为：`订阅地址`?token=`API密钥`&compStart=`上班时分秒`&compEnd=`下班时分秒`&compAlarm=`在开始时间点提前多少分钟提醒` @@ -43,18 +44,18 @@ **注意:** - 时间格式为24小时制的6位数字，个位补0，例如`8点零5分`表示为`080500` -- 最大可提前9999分钟提醒，所以提前几天也是可以的。例如`compStart`为`0800`，设定前一天早上8点提醒，则`compAlarm`为24x60=1440; 设定前一天晚上8点提醒，则`compAlarm`为12x60=720 +- 最大可提前9999分钟提醒，所以提前几天也是可以的。例如`compStart`为`0800`，设定前一天早上8点提醒，则`compAlarm`为`提前24小时x60=1440`; 设定前一天晚上8点提醒，则`compAlarm`为`提前12小时x60=720` - 补班日程可设置为全天事件，指定`compStart=*`并且`compEnd=*`即可 - 由于订阅功能需消耗服务器资源进行计算，如果影响到服务器的正常使用，则定制功能可能随时取消 定制补班日程表 | 详细信息 :-------------------------:|:-------------------------: -![](./customCompensateday1.png) | ![](./customCompensateday2.png) +![](./screenshots/customCompensateday1.png) | ![](./screenshots/customCompensateday2.png) -### 快捷指令应用 +## 快捷指令应用 节假日查询 | 节假日闹钟 :-------------------------:|:-------------------------: -![](./queryHoliday.jpg) | ![](./holidayAlarm.jpg) +![](./screenshots/queryHoliday.jpg) | ![](./screenshots/holidayAlarm.jpg) [https://www.shuyz.com/shortcuts/holiday-query](https://www.shuyz.com/shortcuts/holiday-query) | [https://www.shuyz.com/shortcuts/holiday-alarm](https://www.shuyz.com/shortcuts/holiday-alarm) diff --git a/compensateday1.jpg b/screenshots/compensateday1.jpg similarity index 100% rename from compensateday1.jpg rename to screenshots/compensateday1.jpg diff --git a/compensateday2.jpg b/screenshots/compensateday2.jpg similarity index 100% rename from compensateday2.jpg rename to screenshots/compensateday2.jpg diff --git a/customCompensateday1.png b/screenshots/customCompensateday1.png similarity index 100% rename from customCompensateday1.png rename to screenshots/customCompensateday1.png diff --git a/customCompensateday2.png b/screenshots/customCompensateday2.png similarity index 100% rename from customCompensateday2.png rename to screenshots/customCompensateday2.png diff --git a/holiday1.jpg b/screenshots/holiday1.jpg similarity index 100% rename from holiday1.jpg rename to screenshots/holiday1.jpg diff --git a/holiday2.jpg b/screenshots/holiday2.jpg similarity index 100% rename from holiday2.jpg rename to screenshots/holiday2.jpg diff --git a/holidayAlarm.jpg b/screenshots/holidayAlarm.jpg similarity index 100% rename from holidayAlarm.jpg rename to screenshots/holidayAlarm.jpg diff --git a/queryHoliday.jpg b/screenshots/queryHoliday.jpg similarity index 100% rename from queryHoliday.jpg rename to screenshots/queryHoliday.jpg