From 5fe8a43cfbf9eba1e5fb823efc85f5c8dd5074dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Mon, 18 Nov 2024 16:22:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 +- package.json | 2 +- packages/core/src/config/remote_config.json5 | 448 +++++++++---------- packages/gui/public/index.html | 22 +- 4 files changed, 242 insertions(+), 238 deletions(-) diff --git a/README.md b/README.md index a98bdfa..a07e636 100644 --- a/README.md +++ b/README.md @@ -282,10 +282,10 @@ networksetup -setwebproxy 'WiFi' 127.0.0.1 31181 #### 3)火狐浏览器:火狐浏览器不走系统的根证书,需要在选项中添加根证书 - > 1. 火狐浏览器->选项->隐私与安全->证书->查看证书 - > 2. 证书颁发机构->导入 - > 3. 选择证书文件`C:\Users(用户)\Administrator(你的账号)\.dev-sidecar\dev-sidecar.ca.crt`(Mac或linux为`~/.dev-sidecar`目录) - > 4. 勾选信任由此证书颁发机构来标识网站,确定即可 + - 1. 火狐浏览器->选项->隐私与安全->证书->查看证书 + - 2. 证书颁发机构->导入 + - 3. 选择证书文件`C:\Users(用户)\Administrator(你的账号)\.dev-sidecar\dev-sidecar.ca.crt`(Mac或linux为`~/.dev-sidecar`目录) + - 4. 勾选信任由此证书颁发机构来标识网站,确定即可 ### 6.4、打开github显示连接超时 diff --git a/package.json b/package.json index dbf8815..e98972b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "dev-sidecar-parent", - "packageManager": "pnpm@9.13.2", "private": false, + "packageManager": "pnpm@9.13.2", "author": "Greper", "license": "MPL-2.0" } diff --git a/packages/core/src/config/remote_config.json5 b/packages/core/src/config/remote_config.json5 index 88b6090..b487923 100644 --- a/packages/core/src/config/remote_config.json5 +++ b/packages/core/src/config/remote_config.json5 @@ -1,226 +1,226 @@ { - "server": { - "compatible": { - "connect": { - "218.18.106.132:443": { - "ssl": true - } - }, - "request": { - "218.18.106.132:443": { - "rejectUnauthorized": false - } - } - }, - "intercepts": { - "github.com": { - "^(/[\\w-.]+){2,}/?(\\?.*)?$": { - "tampermonkeyScript": "https://gitee.com/wangliang181230/dev-sidecar/raw/scripts/tampermonkey.js", - "script": "https://gitee.com/wangliang181230/dev-sidecar/raw/scripts/GithubEnhanced-High-Speed-Download.user.js" - }, - "^(/[^/]+){2}/releases/download/.*$": { - "redirect": "ghp.ci/https://github.com", - "desc": "release文件加速下载重定向地址" - }, - "^(/[^/]+){2}/archive/.*\\.(zip|tar.gz)$": { - "redirect": "ghp.ci/https://github.com", - "desc": "release源代码加速下载重定向地址" - }, - "^((/[^/]+){2,})/raw((/[^/]+)+\\.(jpg|jpeg|png|gif))(\\?.*)?$": { - "sni": "baidu.com" // proxy拦截器不会使用 .* 中的sni配置,故补充此配置 - }, - "^((/[^/]+){2,})/raw((/[^/]+)+\\.js)(\\?.*)?$": { - "sni": "baidu.com" // proxy拦截器不会使用 .* 中的sni配置,故补充此配置 - } - }, - "api.github.com": { - ".*": { - "sni": "baidu.com" - } - }, - "github.githubassets.com": { - ".*": { - "sni": "baidu.com" - } - }, - "avatars.githubusercontent.com": { - ".*": { - "sni": "baidu.com" - } - }, - "camo.githubusercontent.com": { - ".*": { - "sni": "baidu.com" - } - }, - "collector.github.com": { - ".*": { - "sni": "baidu.com" - } - }, - "www.gstatic.com": { - "/recaptcha/.*": { - "proxy": "www.recaptcha.net" - } - } - }, - "preSetIpList": { - "github.com": [ - "4.237.22.38", - "20.26.156.215", - "20.27.177.113", - "20.87.245.0", - "20.200.245.247", - "20.201.28.151", - "20.205.243.166", - "140.82.113.3", - "140.82.114.4", - "140.82.116.3", - "140.82.116.4", - "140.82.121.3", - "140.82.121.4" - ], - "hub.docker.com": null // 1.8.2版本中,该域名的预设IP有问题,现在远程配置中删除 - }, - "dns": { - "mapping": { - "*.jetbrains.com": "quad9", - "*.azureedge.net": "quad9", - "*.stackoverflow.com": "quad9" - }, - "speedTest": { - "interval": 300000 - } - }, - "whiteList": { - "*.icloud.com": true, - "*.lenovo.net": true - } - }, - "proxy": { - "remoteDomesticDomainAllowListFileUrl": "https://raw.kkgithub.com/pluwen/china-domain-allowlist/main/allow-list.sorl", - "excludeIpList": { - // Github文件上传所使用的域名,被DS代理会导致文件上传经常失败,从系统代理中排除掉 - "objects-origin.githubusercontent.com": true, - // Github通过Actions上传的文件,下载时所需的域名,从系统代理中排除掉,否则下载会失败 - "*.windows.net": true, - // Github下载release文件的高速镜像地址 - "*.ghproxy.net": true, - "*.ghp.ci": true, - "*.kkgithub.com": true, - - // Github建站域名 - "*.github.io": true, - - // bilibili相关 - "*.bilicomic.com": true, - - // 中国移动云盘登录API - "[2049:8c54:813:10c::140]": true, - "[2409:8a0c:a442:ff40:a51f:4b9c:8b41:25ea]": true, - "[2606:2800:147:120f:30c:1ba0:fc6:265a]": true, - // 移动云盘相关 - "*.cmicapm.com": true, - - // cloudflare:排除以下域名,cloudflare的人机校验会更快,成功率更高。 - "*.cloudflare.com": true, - "*.cloudflare-cn.com": true, - - // VS相关 - "*.microsoftonline.com": true, // 此域名不排除的话,部分功能将出现异常 - "*.msecnd.net": true, - "*.msedge.net": true, - - // 卡巴斯基升级域名 - "*kaspersky*.com": true, - "*.upd.kaspersky.com": true, - - // sandbox沙盒域名 - "*.sandboxie-plus.com": true, - - // 无忧论坛 - "*.wuyou.net": true, - - // python建图包域名(浏览器) - "*.pyecharts.org": true, - - // 教育网站 - "*.bcloudlink.com": true, - - // 奇迹秀(资源) - "*.qijishow.com": true, - - // Z-Library - "*.z-lib.fo": true, - - // Finalshell(Linux学习网) - "*.finalshell.com": true, - - // MineBBS(我的世界中文论坛) - "*.minebbs.com": true, - - // 我的世界插件网 - "*.spigotmc.org": true, - - // bd测试 - "*.virustotal.com": true, - - // 未知 - "*.youdemai.com": true, - "*.casualthink.com": true, - "44.239.165.12": true, - "3.164.110.117": true - } - }, - "plugin": { - "overwall": { - "targets": { - "*.github.com": true, - "*github*.com": true, - "*.nodejs.org": true, - "*.npmjs.com": true, - "*.wikimedia.org": true, - "*.v2ex.com": true, - "*.azureedge.net": true, - "*.cloudfront.net": true, - "*.bing.com": true, - "*.discourse-cdn.com": true, - "*.gravatar.com": true, - "*.docker.com": true, - "*.vueuse.org": true, - "*.elastic.co": true, - "*.optimizely.com": true, - "*.stackpathcdn.com": true, - "*.fastly.net": true, - "*.cloudflare.com": true, - "*.233v2.com": true, - "*.v2fly.org": true, - "*.telegram.org": true, - "*.amazon.com": true, - "*.googleapis.com": true, - "*.google-analytics.com": true, - "*.cloudflareinsights.com": true, - "*.intlify.dev": true, - "*.segment.io": true, - "*.shields.io": true, - "*.jsdelivr.net": true, - "*.z-library.sk": true, - "*.zlibrary*.se": true, - - // 维基百科 - "*.wikipedia-on-ipfs.org": true, - - // ChatGPT - "*.oaiusercontent.com": true, // 在ChatGPT中生成文件并下载所需的域名 - - // Pixiv相关 - "*.pixiv.org": true, - "*.fanbox.cc": true, - "*.onesignal.com": true // pixiv站点,会加载该域名下的js脚本 - }, - "pac": { - "pacFileUpdateUrl": "https://raw.kkgithub.com/gfwlist/gfwlist/master/gfwlist.txt" - } - } - } + "server": { + "compatible": { + "connect": { + "218.18.106.132:443": { + "ssl": true + } + }, + "request": { + "218.18.106.132:443": { + "rejectUnauthorized": false + } + } + }, + "intercepts": { + "github.com": { + "^(/[\\w-.]+){2,}/?(\\?.*)?$": { + "tampermonkeyScript": "https://gitee.com/wangliang181230/dev-sidecar/raw/scripts/tampermonkey.js", + "script": "https://gitee.com/wangliang181230/dev-sidecar/raw/scripts/GithubEnhanced-High-Speed-Download.user.js" + }, + "^(/[^/]+){2}/releases/download/.*$": { + "redirect": "ghp.ci/https://github.com", + "desc": "release文件加速下载重定向地址" + }, + "^(/[^/]+){2}/archive/.*\\.(zip|tar.gz)$": { + "redirect": "ghp.ci/https://github.com", + "desc": "release源代码加速下载重定向地址" + }, + "^((/[^/]+){2,})/raw((/[^/]+)+\\.(jpg|jpeg|png|gif))(\\?.*)?$": { + "sni": "baidu.com" // proxy拦截器不会使用 .* 中的sni配置,故补充此配置 + }, + "^((/[^/]+){2,})/raw((/[^/]+)+\\.js)(\\?.*)?$": { + "sni": "baidu.com" // proxy拦截器不会使用 .* 中的sni配置,故补充此配置 + } + }, + "api.github.com": { + ".*": { + "sni": "baidu.com" + } + }, + "github.githubassets.com": { + ".*": { + "sni": "baidu.com" + } + }, + "avatars.githubusercontent.com": { + ".*": { + "sni": "baidu.com" + } + }, + "camo.githubusercontent.com": { + ".*": { + "sni": "baidu.com" + } + }, + "collector.github.com": { + ".*": { + "sni": "baidu.com" + } + }, + "www.gstatic.com": { + "/recaptcha/.*": { + "proxy": "www.recaptcha.net" + } + } + }, + "preSetIpList": { + "github.com": [ + "4.237.22.38", + "20.26.156.215", + "20.27.177.113", + "20.87.245.0", + "20.200.245.247", + "20.201.28.151", + "20.205.243.166", + "140.82.113.3", + "140.82.114.4", + "140.82.116.3", + "140.82.116.4", + "140.82.121.3", + "140.82.121.4" + ], + "hub.docker.com": null // 1.8.2版本中,该域名的预设IP有问题,现在远程配置中删除 + }, + "dns": { + "mapping": { + "*.jetbrains.com": "quad9", + "*.azureedge.net": "quad9", + "*.stackoverflow.com": "quad9" + }, + "speedTest": { + "interval": 300000 + } + }, + "whiteList": { + "*.icloud.com": true, + "*.lenovo.net": true + } + }, + "proxy": { + "remoteDomesticDomainAllowListFileUrl": "https://raw.kkgithub.com/pluwen/china-domain-allowlist/main/allow-list.sorl", + "excludeIpList": { + // Github文件上传所使用的域名,被DS代理会导致文件上传经常失败,从系统代理中排除掉 + "objects-origin.githubusercontent.com": true, + // Github通过Actions上传的文件,下载时所需的域名,从系统代理中排除掉,否则下载会失败 + "*.windows.net": true, + // Github下载release文件的高速镜像地址 + "*.ghproxy.net": true, + "*.ghp.ci": true, + "*.kkgithub.com": true, + + // Github建站域名 + "*.github.io": true, + + // bilibili相关 + "*.bilicomic.com": true, + + // 中国移动云盘登录API + "[2049:8c54:813:10c::140]": true, + "[2409:8a0c:a442:ff40:a51f:4b9c:8b41:25ea]": true, + "[2606:2800:147:120f:30c:1ba0:fc6:265a]": true, + // 移动云盘相关 + "*.cmicapm.com": true, + + // cloudflare:排除以下域名,cloudflare的人机校验会更快,成功率更高。 + "*.cloudflare.com": true, + "*.cloudflare-cn.com": true, + + // VS相关 + "*.microsoftonline.com": true, // 此域名不排除的话,部分功能将出现异常 + "*.msecnd.net": true, + "*.msedge.net": true, + + // 卡巴斯基升级域名 + "*kaspersky*.com": true, + "*.upd.kaspersky.com": true, + + // sandbox沙盒域名 + "*.sandboxie-plus.com": true, + + // 无忧论坛 + "*.wuyou.net": true, + + // python建图包域名(浏览器) + "*.pyecharts.org": true, + + // 教育网站 + "*.bcloudlink.com": true, + + // 奇迹秀(资源) + "*.qijishow.com": true, + + // Z-Library + "*.z-lib.fo": true, + + // Finalshell(Linux学习网) + "*.finalshell.com": true, + + // MineBBS(我的世界中文论坛) + "*.minebbs.com": true, + + // 我的世界插件网 + "*.spigotmc.org": true, + + // bd测试 + "*.virustotal.com": true, + + // 未知 + "*.youdemai.com": true, + "*.casualthink.com": true, + "44.239.165.12": true, + "3.164.110.117": true + } + }, + "plugin": { + "overwall": { + "targets": { + "*.github.com": true, + "*github*.com": true, + "*.nodejs.org": true, + "*.npmjs.com": true, + "*.wikimedia.org": true, + "*.v2ex.com": true, + "*.azureedge.net": true, + "*.cloudfront.net": true, + "*.bing.com": true, + "*.discourse-cdn.com": true, + "*.gravatar.com": true, + "*.docker.com": true, + "*.vueuse.org": true, + "*.elastic.co": true, + "*.optimizely.com": true, + "*.stackpathcdn.com": true, + "*.fastly.net": true, + "*.cloudflare.com": true, + "*.233v2.com": true, + "*.v2fly.org": true, + "*.telegram.org": true, + "*.amazon.com": true, + "*.googleapis.com": true, + "*.google-analytics.com": true, + "*.cloudflareinsights.com": true, + "*.intlify.dev": true, + "*.segment.io": true, + "*.shields.io": true, + "*.jsdelivr.net": true, + "*.z-library.sk": true, + "*.zlibrary*.se": true, + + // 维基百科 + "*.wikipedia-on-ipfs.org": true, + + // ChatGPT + "*.oaiusercontent.com": true, // 在ChatGPT中生成文件并下载所需的域名 + + // Pixiv相关 + "*.pixiv.org": true, + "*.fanbox.cc": true, + "*.onesignal.com": true // pixiv站点,会加载该域名下的js脚本 + }, + "pac": { + "pacFileUpdateUrl": "https://raw.kkgithub.com/gfwlist/gfwlist/master/gfwlist.txt" + } + } + } } diff --git a/packages/gui/public/index.html b/packages/gui/public/index.html index 6dc2183..0e66115 100644 --- a/packages/gui/public/index.html +++ b/packages/gui/public/index.html @@ -1,16 +1,20 @@ - +
- - - - + + + +