From b85b01ecbdf7e3e17bc145859828eb7077204b1a Mon Sep 17 00:00:00 2001 From: "ZGQ Inc." Date: Wed, 25 Dec 2024 17:03:58 +0800 Subject: [PATCH 01/12] Update sync.yml --- .github/workflows/sync.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index a6b562a8..c156c400 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -32,12 +32,12 @@ jobs: if: env.SKIP_SYNC != 'true' run: | git fetch upstream - git checkout main - git merge upstream/main --allow-unrelated-histories + git checkout master + git merge upstream/master --allow-unrelated-histories - name: Push Changes if: env.SKIP_SYNC != 'true' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - git push origin main + git push origin master From 9e02b7e13096f69259fdb3cbe0e5111eb771edd8 Mon Sep 17 00:00:00 2001 From: "ZGQ Inc." Date: Wed, 25 Dec 2024 17:06:47 +0800 Subject: [PATCH 02/12] Create sync_manual --- .github/workflows/sync_manual | 42 +++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .github/workflows/sync_manual diff --git a/.github/workflows/sync_manual b/.github/workflows/sync_manual new file mode 100644 index 00000000..4f3929bb --- /dev/null +++ b/.github/workflows/sync_manual @@ -0,0 +1,42 @@ +name: Sync Fork Manual + +on: + workflow_dispatch: # 仅手动触发 + +jobs: + sync: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Setup Git + run: | + git remote add upstream https://github.com/yoyodadada/haoruanfenxiang.git + # 获取上游仓库 URL + UPSTREAM_URL=$(git remote get-url upstream) + # 获取当前仓库 URL + ORIGIN_URL=$(git remote get-url origin) + echo "Upstream URL: $UPSTREAM_URL" + echo "Origin URL: $ORIGIN_URL" + # 检查是否相同,并设置环境变量 + if [ "$UPSTREAM_URL" = "$ORIGIN_URL" ]; then + echo "Skipping sync because the upstream is the same as origin." + echo "SKIP_SYNC=true" >> $GITHUB_ENV + else + echo "SKIP_SYNC=false" >> $GITHUB_ENV + fi + + - name: Fetch and Merge Upstream + if: env.SKIP_SYNC != 'true' + run: | + git fetch upstream + git checkout master + git merge upstream/master --allow-unrelated-histories + + - name: Push Changes + if: env.SKIP_SYNC != 'true' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + git push origin master From 24849ebbbc37e412262d48b2acb9107099224ef9 Mon Sep 17 00:00:00 2001 From: "ZGQ Inc." Date: Wed, 25 Dec 2024 17:07:57 +0800 Subject: [PATCH 03/12] fix --- .github/workflows/{sync_manual => sync_manual.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{sync_manual => sync_manual.yml} (100%) diff --git a/.github/workflows/sync_manual b/.github/workflows/sync_manual.yml similarity index 100% rename from .github/workflows/sync_manual rename to .github/workflows/sync_manual.yml From a99bebea0a450d8830e61e580d02194cecaadc14 Mon Sep 17 00:00:00 2001 From: "ZGQ Inc." Date: Wed, 25 Dec 2024 17:12:02 +0800 Subject: [PATCH 04/12] improve --- _layouts/default.html | 3 +-- index.md | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/_layouts/default.html b/_layouts/default.html index 32699640..2d082066 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -26,7 +26,6 @@

好软分享

-

项目地址

@@ -37,7 +36,7 @@

项目地址

好软分享

-

©2024 好软分享.All rights reserved.

+

©2024 好软分享. All rights reserved.

diff --git a/index.md b/index.md index ea0e56ed..a6cf1c9f 100644 --- a/index.md +++ b/index.md @@ -4,6 +4,8 @@ layout: default # 好软分享 +### https://haoruanfenxiang.pages.dev + ### https://yoyodadada.github.io/haoruanfenxiang ## 项目地址: @@ -16,10 +18,10 @@ GitHub:https://github.com/yoyodadada/haoruanfenxiang ## 软件列表(按软件名首字母归类): -GitHub:https://github.com/yoyodadada/haoruanfenxiang/blob/master/List.md - pages.dev(免翻):https://haoruanfenxiang.pages.dev/List +GitHub:https://github.com/yoyodadada/haoruanfenxiang/blob/master/List.md + ## TG频道及群组: Telegram频道:https://t.me/haoruanfenxiang From fdfc290935a37ec7b4e889dea919eae939cb867b Mon Sep 17 00:00:00 2001 From: "ZGQ Inc." Date: Wed, 25 Dec 2024 17:13:36 +0800 Subject: [PATCH 05/12] improve --- List.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/List.md b/List.md index a3cb51fb..a9c423bc 100644 --- a/List.md +++ b/List.md @@ -31,7 +31,7 @@ layout: default # 目录 -### [A](#a) [B](#b) [C](#c) [D](#d) [E](#e) [F](#f) [G](#g) [H](#h) [I](#i) [J](#j) [K](#k) [L](#l) [M](#m) [N](#n) [O](#o) [P](#p) [Q](#q) [R](#r) [S](#s) [T](#t) [U](#u) [V](#v) [W](#w) [X](#x) [Y](#y) [Z](#z) [未归类、合集](#未归类合集) +## [A](#a) [B](#b) [C](#c) [D](#d) [E](#e) [F](#f) [G](#g) [H](#h) [I](#i) [J](#j) [K](#k) [L](#l) [M](#m) [N](#n) [O](#o) [P](#p) [Q](#q) [R](#r) [S](#s) [T](#t) [U](#u) [V](#v) [W](#w) [X](#x) [Y](#y) [Z](#z) [未归类、合集](#未归类合集) --- From a8863ebcf45c2fa5d35757aa5c2213540c079b86 Mon Sep 17 00:00:00 2001 From: "ZGQ Inc." Date: Wed, 25 Dec 2024 17:16:38 +0800 Subject: [PATCH 06/12] improve --- List.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/List.md b/List.md index a9c423bc..b3e436fa 100644 --- a/List.md +++ b/List.md @@ -31,7 +31,15 @@ layout: default # 目录 -## [A](#a) [B](#b) [C](#c) [D](#d) [E](#e) [F](#f) [G](#g) [H](#h) [I](#i) [J](#j) [K](#k) [L](#l) [M](#m) [N](#n) [O](#o) [P](#p) [Q](#q) [R](#r) [S](#s) [T](#t) [U](#u) [V](#v) [W](#w) [X](#x) [Y](#y) [Z](#z) [未归类、合集](#未归类合集) +## [A](#a) [B](#b) [C](#c) [D](#d) [E](#e) [F](#f) [G](#g) + +## [H](#h) [I](#i) [J](#j) [K](#k) [L](#l) [M](#m) [N](#n) + +## [O](#o) [P](#p) [Q](#q) [R](#r) [S](#s) [T](#t) [U](#u) + +## [V](#v) [W](#w) [X](#x) [Y](#y) [Z](#z) + +## [未归类、合集](#未归类合集) --- From f8db8283c4d8888bfbf9be717ea5c60ecf3c47bf Mon Sep 17 00:00:00 2001 From: "ZGQ Inc." Date: Wed, 25 Dec 2024 17:20:09 +0800 Subject: [PATCH 07/12] improve --- List.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/List.md b/List.md index b3e436fa..9238b010 100644 --- a/List.md +++ b/List.md @@ -31,13 +31,13 @@ layout: default # 目录 -## [A](#a) [B](#b) [C](#c) [D](#d) [E](#e) [F](#f) [G](#g) +## [A](#a) [B](#b) [C](#c) [D](#d) [E](#e) [F](#f) [G](#g) -## [H](#h) [I](#i) [J](#j) [K](#k) [L](#l) [M](#m) [N](#n) +## [H](#h) [I](#i) [J](#j) [K](#k) [L](#l) [M](#m) [N](#n) -## [O](#o) [P](#p) [Q](#q) [R](#r) [S](#s) [T](#t) [U](#u) +## [O](#o) [P](#p) [Q](#q) [R](#r) [S](#s) [T](#t) [U](#u) -## [V](#v) [W](#w) [X](#x) [Y](#y) [Z](#z) +## [V](#v) [W](#w) [X](#x) [Y](#y) [Z](#z) ## [未归类、合集](#未归类合集) From ba8fa4c005e8f0495c6e3207e781d06851eb0438 Mon Sep 17 00:00:00 2001 From: "ZGQ Inc." Date: Wed, 25 Dec 2024 17:24:40 +0800 Subject: [PATCH 08/12] improve --- List.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/List.md b/List.md index 9238b010..177ee54c 100644 --- a/List.md +++ b/List.md @@ -31,13 +31,13 @@ layout: default # 目录 -## [A](#a) [B](#b) [C](#c) [D](#d) [E](#e) [F](#f) [G](#g) +## [A](#a) [B](#b) [C](#c) [D](#d) [E](#e) [F](#f) [G](#g) -## [H](#h) [I](#i) [J](#j) [K](#k) [L](#l) [M](#m) [N](#n) +## [H](#h) [I](#i) [J](#j) [K](#k) [L](#l) [M](#m) [N](#n) -## [O](#o) [P](#p) [Q](#q) [R](#r) [S](#s) [T](#t) [U](#u) +## [O](#o) [P](#p) [Q](#q) [R](#r) [S](#s) [T](#t) [U](#u) -## [V](#v) [W](#w) [X](#x) [Y](#y) [Z](#z) +## [V](#v) [W](#w) [X](#x) [Y](#y) [Z](#z) ## [未归类、合集](#未归类合集) From 3ed1dfed19ac11b75d45429e7a5b7dbeffaf3b71 Mon Sep 17 00:00:00 2001 From: "ZGQ Inc." Date: Wed, 25 Dec 2024 17:31:16 +0800 Subject: [PATCH 09/12] improve --- _layouts/default.html | 6 +++--- index.md | 14 ++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/_layouts/default.html b/_layouts/default.html index 2d082066..54f3d0f2 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -49,11 +49,11 @@

好软分享

if (node.nodeType === Node.TEXT_NODE) { const text = node.nodeValue; if (regex.test(text)) { - const span = document.createElement("span"); - span.innerHTML = text.replace(regex, function (url) { + const p = document.createElement("p"); + p.innerHTML = text.replace(regex, function (url) { return `${url}`; }); - node.replaceWith(span); + node.replaceWith(p); } } else if (node.nodeType === Node.ELEMENT_NODE && node.tagName !== "A") { // 遍历子节点,避免修改 标签中的内容 diff --git a/index.md b/index.md index a6cf1c9f..c14c6e9a 100644 --- a/index.md +++ b/index.md @@ -2,33 +2,31 @@ layout: default --- -# 好软分享 - ### https://haoruanfenxiang.pages.dev ### https://yoyodadada.github.io/haoruanfenxiang -## 项目地址: +## 项目地址 GitHub:https://github.com/yoyodadada/haoruanfenxiang -## 下载地址(按更新时间倒序排列): +## 下载地址(按更新时间倒序排列) 蓝奏主页:https://yoyodadada.lanzouw.com/u/yoyodadada -## 软件列表(按软件名首字母归类): +## 软件列表(按软件名首字母归类) pages.dev(免翻):https://haoruanfenxiang.pages.dev/List GitHub:https://github.com/yoyodadada/haoruanfenxiang/blob/master/List.md -## TG频道及群组: +## TG频道及群组 Telegram频道:https://t.me/haoruanfenxiang Telegram群组:https://t.me/haoruanfenxianggroup -## 说明: +## 说明 2021年3月19日:酷安账号被封,已卸载酷安,日后更新内容和下载地址将不会在酷安上通知。 @@ -40,7 +38,7 @@ Telegram群组:https://t.me/haoruanfenxianggroup 注3:因受蓝奏限制,2023年9月19日以后分享的apk和ipa文件需要将手机浏览器UA调成电脑模式后才能下载,电脑浏览器下载不受影响。 -## 版权声明: +## 版权声明 ①根据二〇〇二年一月一日《计算机软件保护条例》规定:为了学习和研究软件内含的设计思想和原理,通过安装、显示、传输或者存储软件等方式使用软件的,可以不经软件著作权人许可,不向其支付报酬! From b2f5425713701c869e9a5d82a0a5f508846cc42c Mon Sep 17 00:00:00 2001 From: "ZGQ Inc." Date: Wed, 25 Dec 2024 17:37:50 +0800 Subject: [PATCH 10/12] improve CSS --- assets/css/styles.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/assets/css/styles.css b/assets/css/styles.css index 3193abf1..e225258e 100644 --- a/assets/css/styles.css +++ b/assets/css/styles.css @@ -35,8 +35,7 @@ ul { } li { - padding: 10px 15px; - border-bottom: 1px solid #eee; + padding: 0px 20px; transition: background-color 0.2s ease-in-out; } @@ -46,7 +45,7 @@ li:last-child { /* 鼠标悬停效果 */ li:hover { - background-color: #f5f5f5; + background-color: #f3f4f5; } /* 链接样式 */ From 33ac684b7fc96b6f14f32c27c5337e461ded2b78 Mon Sep 17 00:00:00 2001 From: "ZGQ Inc." Date: Wed, 25 Dec 2024 17:38:50 +0800 Subject: [PATCH 11/12] improve --- List.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/List.md b/List.md index 177ee54c..a03b836f 100644 --- a/List.md +++ b/List.md @@ -108,7 +108,8 @@ AfuseKtV-TV版:https://yoyodadada.lanzn.com/b0mb4d71e#3e2r 密码:3e2r 百度网盘:https://yoyodadada.lanzouw.com/b07pspid -- 超过100MB文件下载地址::https://zijieyunpan.com/6No033RJMU1 +- 超过100MB文件下载地址: ++ https://zijieyunpan.com/6No033RJMU1 + https://www.123pan.com/s/JceA-LhBi.html 哔哩哔哩:https://yoyodadada.lanzouw.com/b07pspyj From 94a9a0c9ff8b013a8b75f8bd51c8c7014dd1d953 Mon Sep 17 00:00:00 2001 From: "ZGQ Inc." Date: Sun, 29 Dec 2024 14:03:04 +0800 Subject: [PATCH 12/12] fix workflow --- .github/workflows/sync.yml | 6 ++++++ .github/workflows/sync_manual.yml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index c156c400..97987360 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -28,6 +28,12 @@ jobs: echo "SKIP_SYNC=false" >> $GITHUB_ENV fi + - name: Configure Git User + if: env.SKIP_SYNC != 'true' + run: | + git config user.name "GitHub Action" + git config user.email "action@github.com" + - name: Fetch and Merge Upstream if: env.SKIP_SYNC != 'true' run: | diff --git a/.github/workflows/sync_manual.yml b/.github/workflows/sync_manual.yml index 4f3929bb..3c0a20d0 100644 --- a/.github/workflows/sync_manual.yml +++ b/.github/workflows/sync_manual.yml @@ -27,6 +27,12 @@ jobs: echo "SKIP_SYNC=false" >> $GITHUB_ENV fi + - name: Configure Git User + if: env.SKIP_SYNC != 'true' + run: | + git config user.name "GitHub Action" + git config user.email "action@github.com" + - name: Fetch and Merge Upstream if: env.SKIP_SYNC != 'true' run: |