定期更新数据并生成 gfw.pac

.github/workflows/auto-generate-pac.yml

@@ -0,0 +1,42 @@
+name: Auto Generate PAC File
+
+on:
+  schedule:
+    - cron: '10 0 * * 4'
+  push:
+    paths:
+      - 'gfw-pac.py'
+      - 'pac-template'
+      - 'local-tlds.txt'
+      - 'direct-domains.txt'
+      - 'proxy-domains.txt'
+      - 'cidrs-cn.txt'
+  workflow_dispatch:
+
+jobs:
+  update-gfw-pac:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Download the latest cn.txt
+        run: curl -L https://raw.githubusercontent.com/Loyalsoldier/geoip/release/text/cn.txt -o cidrs-cn.txt
+
+      - name: Run gfw-pac.py script
+        run: ./gfw-pac.py -f gfw.pac -p "PROXY 127.0.0.1:3128" --proxy-domains=proxy-domains.txt --direct-domains=direct-domains.txt --localtld-domains=local-tlds.txt --ip-file=cidrs-cn.txt
+
+      - name: Commit and push changes
+        run: |
+          last_commit_message=$(git log -1 --pretty=%B)
+          commit_message=$([[ "${{ github.event_name }}" == "schedule" ]] && echo "定期更新数据并生成 gfw.pac" || echo "自动生成 gfw.pac: $last_commit_message")
+          git config --local user.email "action@github.com"
+          git config --local user.name "GitHub Action"
+          git add -A
+          git commit -a -m "${commit_message}"
+          git push
+
+      - name: Trigger Auto-Release
+        uses: benc-uk/workflow-dispatch@v1
+        with:
+          workflow: Auto Generate Release

.github/workflows/auto-release.yml

@@ -13,8 +13,6 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-        env:
-          GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
         with:
           fetch-depth: 0
 
@@ -25,10 +23,8 @@ jobs:
 
       - name: Generate Release Name
         id: commit_count
-        env:
-          GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
         run: |
-          today=$(date +%Y%m%d)
+          today=$(TZ=Asia/Shanghai date +%Y%m%d)
           commit_count=$(TZ=Asia/Shanghai git log --date=local --since="$today 00:00:00" --until="$today 23:59:59" --pretty=format: --name-only | grep -c '^gfw.pac$')
           echo "COMMIT_COUNT=$commit_count" >> $GITHUB_ENV
           echo "RELEASE_NAME=v$(TZ='Asia/Shanghai' date +%Y%m%d).$commit_count" >> $GITHUB_ENV
@@ -36,8 +32,6 @@ jobs:
 
       - name: Create Tag
         id: create_tag
-        env:
-          GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
         run: |
           git tag "${{ env.RELEASE_NAME }}"
           git push origin ${{ env.RELEASE_NAME }}
@@ -45,8 +39,6 @@ jobs:
       - name: Create Release
         id: create_release
         uses: softprops/action-gh-release@v2
-        env:
-          GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
         with:
           tag_name: "${{ env.RELEASE_NAME }}"
           name: "${{ env.RELEASE_NAME }}"

.github/workflows/auto-update-gfw-pac.yml

@@ -1,38 +0,0 @@
-name: GFW PAC Update
-
-on:
-  schedule:
-    - cron: '0 0 */7 * *'
-  workflow_dispatch:
-
-jobs:
-  update-gfw-pac:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        env:
-          GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
-        uses: actions/checkout@v4
-
-      - name: Download cn.txt
-        run: curl https://raw.githubusercontent.com/Loyalsoldier/geoip/refs/heads/release/text/cn.txt -o cidrs-cn.txt
-
-      - name: Run gfw-pac.py script
-        run: ./gfw-pac.py -f gfw.pac -p "PROXY 127.0.0.1:3128" --proxy-domains=proxy-domains.txt --direct-domains=direct-domains.txt --localtld-domains=local-tlds.txt --ip-file=cidrs-cn.txt
-
-      - name: Commit changes
-        env:
-          GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
-        run: |
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
-          git add .
-          git commit -a -m "自动更新 cidrs-cn.txt 和 gfw.pac"
-
-      - name: Push changes
-        uses: ad-m/github-push-action@master
-        env:
-          GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
-        with:
-          github_token: ${{ secrets.PERSONAL_TOKEN }}
-          branch: master

README.md

@@ -2,7 +2,7 @@
 
 科学上网 PAC 文件以及生成器。通过自定义域名和 CNIP 地址生成 PAC(Proxy auto-config) 文件。对存在于自定义域名和解析出的IP不是CNIP的域名使用代理，支持IPv6。
 
-**此仓库每 7 天自动通过 GitHub Action 从 `Loyalsoldier/geoip` 获取国内地址段并更新 `gfw.pac` 文件**
+**此仓库每周四自动通过 GitHub Action 从 `Loyalsoldier/geoip` 同步数据并更新 `gfw.pac` 文件**
 
 ## 特性
 * 开箱即用，直接可用的 `gfw.pac` 包含了常用的直连域名和代理域名以及国内IPv4/IPv6地址段

direct-domains.txt

@@ -69,8 +69,18 @@ douyinstatic.com
 douyinvod.com
 supercachenode.com
 bytedance.com
+bytedanceapi.com
 bytescm.com
 bytecdn.cn
+byteoc.com
+bytednsdoc.com
+bytetcc.com
+feishu.cn
+feishucdn.com
+toutiao.com
+toutiaoimg.com
+toutiaostatic.com
+yhgfb-cn-static.com
 cmbchina.com
 mi.com
 xiaomi.com
@@ -81,6 +91,10 @@ meituan.net
 sogou.com
 dianping.com
 quark.cn
+wps.cn
+wpscdn.cn
+xiaohongshu.com
+xhscdn.com
 push.apple.com
 setup.icloud.com
 appldnld.apple.com
@@ -109,11 +123,16 @@ idv.cdn-apple.com
 adcdownload.apple.com
 alpdownloadit.cdn-apple.com
 bricks.cdn-apple.com
-blob.core.windows.net
 self.events.data.microsoft.com
 mobile.events.data.microsoft.com
 browser.events.data.microsoft.com
 ocsp.globalsign.com
 ocsp2.globalsign.com
 ocsp.digicert.cn
-ocsp.dcocsp.cn
+ocsp.dcocsp.cn
+api.onedrive.com
+storage.live.com
+skyapi.live.net
+roaming.officeapps.live.com
+blob.core.windows.net
+default.exp-tas.com

proxy-domains.txt

@@ -10,12 +10,14 @@ githubassets.com
 bing.com
 bing.cn
 bing.net
+bingapis.com
 live.com
 stackoverflow.com
 wikipedia.org
 godaddy.com
 cloudflare.com
 twitter.com
+x.com
 twimg.com
 docker.com
 facebook.com
@@ -24,4 +26,10 @@ fbcdn.net
 segment.io
 unpkg.com
 jsdelivr.com
-tv.apple.com
+tv.apple.com
+instagram.com
+cdninstagram.com
+reddit.com
+redd.it
+whatsapp.com
+whatsapp.net