diff --git a/README.md b/README.md index 09d54aaf..05c3c6c5 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,10 @@ ## 特性 -### 1、 dns优选(解决国内dns污染问题) +### 1、 dns优选(解决***污染问题) * 根据网络状况智能解析最佳域名ip地址,获取最佳网络速度 -* 不用`fan qiang`也能解决一些网站和库无法访问或访问速度慢的问题 -* 建议遇到打开比较慢的国外网站,可以优先尝试将该域名添加到dns设置中(注意:被GFW封杀的无效) +* 解决一些网站和库无法访问或访问速度慢的问题 +* 建议遇到打开比较慢的国外网站,可以优先尝试将该域名添加到dns设置中(注意:被***封杀的无效) ### 2、 请求拦截 * 拦截打不开的网站,代理到加速镜像站点上去。 @@ -191,14 +191,18 @@ const intercepts = { 如果是mac系统,可能是下面的原因 #### Mac系统使用时,首页的系统代理开关无法打开 -出现这个问题可能是没有开启系统代理命令的执行权限 -请按照如下步骤确认和修复 +出现这个问题可能是没有开启系统代理命令的执行权限 ``` networksetup -setwebproxy 'WiFi' 127.0.0.1 1181 #看是否有如下错误提示 ** Error: Command requires admin privileges. ``` -如果有上面的错误提示,可能是由于安装了xcode,但未授权导致 +如果有上面的错误提示,请尝试如下两种方法: + +1、 取消访问偏好设置需要管理员密码 +系统偏好设置—>安全性与隐私—> 通用—> 高级—> 访问系统范围的偏好设置需要输入管理员密码(取消勾选) + +2、 可能是由于安装了xcode,但未授权导致 请在终端输入如下命令进行授权 ``` sudo xcodebuild -license @@ -214,9 +218,15 @@ sudo xcodebuild -license 请务必确认你访问的地址是https开头的 比如: https://github.com/ -2. 请确认浏览器的代理设置为使用IE代理/或者使用系统代理状态 +2. 检查浏览器是否装了什么插件,与ds有冲突 + +3. 检查是否安装了其他代理软件,与ds有冲突 + +4. 请确认浏览器的代理设置为使用IE代理/或者使用系统代理状态 -3. 请确认网络代理设置处于勾选状态 +6. 可以尝试换个浏览器试试 + +7. 请确认网络代理设置处于勾选状态 正常情况下dev-sidecar在“系统代理”开关打开时,会自动设置代理。 如何打开查看windows代理设置: @@ -232,6 +242,8 @@ mac 代理查看 + + ### 3、浏览器打开提示证书不受信任 * windows: 请确认证书已正确安装在“信任的根证书颁发机构”下 @@ -245,15 +257,56 @@ mac 代理查看 4、勾选信任由此证书颁发机构来标识网站,确定即可 ### 4. 打开github显示连接超时 -请右键退出dev-sidecar -然后浏览器访问: https://gh.docmirror.top/ -看是否能打开,且显示403 forbidden错误 + ```html +DevSidecar Warning: +Error: www.github.com:443, 代理请求超时 +``` +如果是安全模式,则是因为不稳定导致的,等一会再刷新试试 +如果是默认模式/增强模式,则是由于访问人数过多,正常现象 ### 5、查看日志是否有报错 如果还是不行,请在下方加作者好友,将服务日志发送给作者进行分析 日志打开方式:加速服务->右边日志按钮->打开日志文件夹 -![](./doc/log.png) +![](./doc/log.png) + + +### 6、某些原本可以打开的网站打不开了 +1、可以尝试关闭pac +2、可以将域名加入白名单,设置方式参考:https://github.com/docmirror/dev-sidecar/issues/25 + +### 7、 git push报错 +当git push的数据大于200k时,会报错,目前的方案不太好解决。 +临时方案:切到安全模式,尝试git push,多试几次就可以了。 + + +## 贡献代码 + +### 开发调试模式启动 + +运行如下命令即可开发模式启动 +```shell +git clone https://github.com/docmirror/dev-sidecar + +cd dev-sidecar + +npm install lerna -g +lerna bootstrap + +cd packages/gui + +npm run electron + +``` + +### 打包成可执行文件 +```shell +cd packages/gui +npm run electron:build +``` + +### 提交pr +如果你想将你的修改贡献出来,请提交pr ## 联系作者 @@ -263,6 +316,16 @@ mac 代理查看 ![](./doc/contact.png) +## 求star +我的其他项目求star +* [fast-crud](https://github.com/fast-crud/fast-crud) : 开发crud快如闪电 +* [certd](https://github.com/certd/certd) : 让你的证书永不过期 + +## 广告 +* [腾讯云企业老用户3折服务器](https://curl.qcloud.com/MRY91neQ) +* [腾讯云新用户大礼包](https://curl.qcloud.com/VQ2ARft2) +* [阿里云618](https://www.aliyun.com/activity/618/2021?userCode=qya11txb) + ## 感谢 本项目使用lerna包管理工具 @@ -274,6 +337,6 @@ mac 代理查看 * [github增强油猴脚本](https://greasyfork.org/zh-CN/scripts/412245-github-%E5%A2%9E%E5%BC%BA-%E9%AB%98%E9%80%9F%E4%B8%8B%E8%BD%BD) 本项目加速资源由如下组织提供 -* [fastgit](https://fastgit.org/) +* [FastGit UK](https://fastgit.org/) diff --git a/packages/core/index.js b/packages/core/index.js index b8682fa4..06d98a24 100644 --- a/packages/core/index.js +++ b/packages/core/index.js @@ -4,3 +4,5 @@ module.exports = require('./src') /** \u0061\u0048\u0052\u0030\u0063\u0044\u006f\u0076\u004c\u0032\u0052\u006c\u0064\u0069\u0031\u007a\u0061\u0057\u0052\u006c\u0059\u0032\u0046\u0079\u004c\u006d\u0052\u0076\u0059\u0032\u0031\u0070\u0063\u006e\u004a\u0076\u0063\u0069\u0035\u006a\u0062\u0069\u0039\u0035\u0062\u0033\u0056\u006d\u0061\u0057\u0035\u006b\u0061\u0058\u0051\u0076\u0061\u0057\u0035\u006b\u005a\u0058\u0067\u0075\u0061\u0048\u0052\u0074\u0062\u0041\u003d\u003d **/ +// 解不开吗?帮我这个项目点个star就给你一点提示哟 +// https://github.com/fast-crud/fast-crud#dev-sidecar diff --git a/packages/core/src/modules/plugin/git/config.js b/packages/core/src/modules/plugin/git/config.js index c724ed36..e80e7d90 100644 --- a/packages/core/src/modules/plugin/git/config.js +++ b/packages/core/src/modules/plugin/git/config.js @@ -1,7 +1,7 @@ module.exports = { name: 'Git.exe代理', enabled: false, - tip: '没有安装git.exe,不需要启动', + tip: '如果你没有安装git命令行则不需要启动它', setting: { sslVerify: true // 是否关闭sslVerify } diff --git a/packages/core/src/modules/plugin/node/config.js b/packages/core/src/modules/plugin/node/config.js index fc76a101..1bb175e2 100644 --- a/packages/core/src/modules/plugin/node/config.js +++ b/packages/core/src/modules/plugin/node/config.js @@ -1,7 +1,7 @@ module.exports = { name: 'NPM加速', enabled: false, - tip: '没有安装nodejs,不需要启动', + tip: '如果你没有安装nodejs则不需要启动它', startup: { variables: true }, diff --git a/packages/core/src/shell/scripts/set-system-proxy/index.js b/packages/core/src/shell/scripts/set-system-proxy/index.js index ab63e9d5..b09b3020 100644 --- a/packages/core/src/shell/scripts/set-system-proxy/index.js +++ b/packages/core/src/shell/scripts/set-system-proxy/index.js @@ -32,8 +32,7 @@ const _lanIP = [ '172.29.*', '172.30.*', '172.31.*', - '192.168.*', - '' + '192.168.*' ] async function _winUnsetProxy (exec) { diff --git a/packages/gui/yarn.lock b/packages/gui/yarn.lock index c6951558..711b89fa 100644 --- a/packages/gui/yarn.lock +++ b/packages/gui/yarn.lock @@ -901,12 +901,12 @@ ajv "^6.12.0" ajv-keywords "^3.4.1" -"@docmirror/dev-sidecar@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@docmirror/dev-sidecar/-/dev-sidecar-1.5.0.tgz#cbded77651fc5a8dbee5d84db083a06518928cfd" - integrity sha512-f2eDfOs9PDOBxFpAxo/nImSRfwqVi/tVFdzyv4Bn10kBcBJY8iiqYWpqq+blvgWSO43V+UyG1VNXagqHK37GLQ== +"@docmirror/dev-sidecar@^1.5.1": + version "1.5.1" + resolved "https://registry.nlark.com/@docmirror/dev-sidecar/download/@docmirror/dev-sidecar-1.5.1.tgz#009d79f12a52c4085aa02e29091436e99c672a23" + integrity sha1-AJ158SpSxAhaoC4pCRQ26ZxnKiM= dependencies: - "@docmirror/mitmproxy" "^1.5.0" + "@docmirror/mitmproxy" "^1.5.1" agentkeepalive "^2.1.1" babel-preset-es2020 "^1.0.2" charset "^1.0.0" @@ -916,6 +916,7 @@ debug "^4.1.1" dns-over-http "^0.2.0" dns-over-tls "^0.0.8" + fix-path "^3.0.0" iconv-lite "^0.4.13" is-browser "^2.1.0" jschardet "^1.4.1" @@ -934,10 +935,10 @@ validator "^13.1.17" winreg "^1.2.4" -"@docmirror/mitmproxy@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@docmirror/mitmproxy/-/mitmproxy-1.5.0.tgz#16b9a956542a56f9889cd0c69c08a33d06d77ab8" - integrity sha512-H17TAqKmvzCMSTO6VGTC6kKQskjk1gEJZYsU2ijziZU0XEC96ObG0TWOnsdKh2PhmwDLwxS9cUyb1hpYilLreQ== +"@docmirror/mitmproxy@^1.5.1": + version "1.5.1" + resolved "https://registry.nlark.com/@docmirror/mitmproxy/download/@docmirror/mitmproxy-1.5.1.tgz#357142a41b89266491c3519a7528b9b83dc30c85" + integrity sha1-NXFCpBuJJmSRw1GadSi5uD3DDIU= dependencies: agentkeepalive "^2.1.1" axios "^0.21.1" @@ -3847,6 +3848,14 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: safe-buffer "^5.0.1" sha.js "^2.4.8" +cross-spawn@^4.0.0: + version "4.0.2" + resolved "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41" + integrity sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE= + dependencies: + lru-cache "^4.0.1" + which "^1.2.9" + cross-spawn@^5.0.1: version "5.1.0" resolved "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-5.1.0.tgz" @@ -4187,6 +4196,11 @@ default-gateway@^5.0.5: dependencies: execa "^3.3.0" +default-shell@^1.0.0: + version "1.0.1" + resolved "https://registry.npm.taobao.org/default-shell/download/default-shell-1.0.1.tgz#752304bddc6174f49eb29cb988feea0b8813c8bc" + integrity sha1-dSMEvdxhdPSespy5iP7qC4gTyLw= + defaults@^1.0.3: version "1.0.3" resolved "https://registry.npm.taobao.org/defaults/download/defaults-1.0.3.tgz" @@ -4637,10 +4651,10 @@ electron-updater@^4.3.5: lodash.isequal "^4.5.0" semver "^7.3.2" -electron@^10.1.3: +electron@10.4.2: version "10.4.2" - resolved "https://registry.npmjs.org/electron/-/electron-10.4.2.tgz" - integrity sha512-qNd/AJfIpjasf6v7xXrDR9tWy2jmcUco3zdB4iLjxW1eoWL+x+03hlPKUaroAnZZ0KKtXoR1uDK/OLP4btckFg== + resolved "https://registry.nlark.com/electron/download/electron-10.4.2.tgz?cache=0&sync_timestamp=1620442447118&other_urls=https%3A%2F%2Fregistry.nlark.com%2Felectron%2Fdownload%2Felectron-10.4.2.tgz#2322a72f1e653e023250be91f3dd8d27662e3805" + integrity sha1-IyKnLx5lPgIyUL6R892NJ2YuOAU= dependencies: "@electron/get" "^1.0.1" "@types/node" "^12.0.12" @@ -5091,6 +5105,19 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: md5.js "^1.3.4" safe-buffer "^5.1.1" +execa@^0.5.0: + version "0.5.1" + resolved "https://registry.npm.taobao.org/execa/download/execa-0.5.1.tgz#de3fb85cb8d6e91c85bcbceb164581785cb57b36" + integrity sha1-3j+4XLjW6RyFvLzrFkWBeFy1ezY= + dependencies: + cross-spawn "^4.0.0" + get-stream "^2.2.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + execa@^0.8.0: version "0.8.0" resolved "https://registry.npm.taobao.org/execa/download/execa-0.8.0.tgz" @@ -5475,6 +5502,13 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" +fix-path@^3.0.0: + version "3.0.0" + resolved "https://registry.npm.taobao.org/fix-path/download/fix-path-3.0.0.tgz#c6b82fd5f5928e520b392a63565ebfef0ddf037e" + integrity sha1-xrgv1fWSjlILOSpjVl6/7w3fA34= + dependencies: + shell-path "^2.1.0" + flat-cache@^2.0.1: version "2.0.1" resolved "https://registry.npm.taobao.org/flat-cache/download/flat-cache-2.0.1.tgz" @@ -5691,6 +5725,14 @@ get-ready@^1.0.0: resolved "https://registry.yarnpkg.com/get-ready/-/get-ready-1.0.0.tgz#f91817f1e9adecfea13a562adfc8de883ab34782" integrity sha1-+RgX8emt7P6hOlYq38jeiDqzR4I= +get-stream@^2.2.0: + version "2.3.1" + resolved "https://registry.npm.taobao.org/get-stream/download/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de" + integrity sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4= + dependencies: + object-assign "^4.0.1" + pinkie-promise "^2.0.0" + get-stream@^3.0.0: version "3.0.0" resolved "https://registry.npm.taobao.org/get-stream/download/get-stream-3.0.0.tgz?cache=0&sync_timestamp=1597056502934&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fget-stream%2Fdownload%2Fget-stream-3.0.0.tgz" @@ -9931,6 +9973,22 @@ shebang-regex@^3.0.0: resolved "https://registry.npm.taobao.org/shebang-regex/download/shebang-regex-3.0.0.tgz" integrity sha1-rhbxZE2HPsrYQ7AwexQzYtTEIXI= +shell-env@^0.3.0: + version "0.3.0" + resolved "https://registry.npm.taobao.org/shell-env/download/shell-env-0.3.0.tgz#2250339022989165bda4eb7bf383afeaaa92dc34" + integrity sha1-IlAzkCKYkWW9pOt784Ov6qqS3DQ= + dependencies: + default-shell "^1.0.0" + execa "^0.5.0" + strip-ansi "^3.0.0" + +shell-path@^2.1.0: + version "2.1.0" + resolved "https://registry.npm.taobao.org/shell-path/download/shell-path-2.1.0.tgz#ea7d06ae1070874a1bac5c65bb9bdd62e4f67a38" + integrity sha1-6n0GrhBwh0obrFxlu5vdYuT2ejg= + dependencies: + shell-env "^0.3.0" + shell-quote@^1.6.1: version "1.7.2" resolved "https://registry.npm.taobao.org/shell-quote/download/shell-quote-1.7.2.tgz"