Merge remote-tracking branch 'gitee/myself'

docmirror · Nov 21, 2024 · 818def5 · 818def5
2 parents d8acae8 + 25f7c49
commit 818def5
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 44 deletions.
diff --git a/.github/workflows/npm-run-electron.yml b/.github/workflows/npm-run-electron.yml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - run
+    tags:
+      - '*'
 
 jobs:
   npm-run-electron:

diff --git a/.github/workflows/test-and-upload.yml b/.github/workflows/test-and-upload.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - master
       - 1.x
+      - test
   pull_request:
     branches:
       - master

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 开发者边车，命名取自service-mesh的service-sidecar，意为为开发者打辅助的边车工具（以下简称ds）
 通过本地代理的方式将https请求代理到一些国内的加速通道上
 
-`<a href='https://github.com/docmirror/dev-sidecar'><img alt="GitHub stars" src="https://img.shields.io/github/stars/docmirror/dev-sidecar?logo=github">``</a>`
+<a href='https://github.com/docmirror/dev-sidecar'><img alt="GitHub stars" src="https://img.shields.io/github/stars/docmirror/dev-sidecar?logo=github"></a>
 
 > Gitee上的同步项目已被封禁，此项目将不再更新与维护 【狗头保命】
 >
@@ -21,8 +21,9 @@
 >
 > 注意：由于electron无法监听windows的关机事件，开着ds情况下直接重启电脑，会导致无法上网，你可以手动启动ds即可恢复网络，你也可以将ds设置为开机自启。
 >
-> 关于此问题的更多讨论请前往：
-> [https://github.com/docmirror/dev-sidecar/issues/109](https://github.com/docmirror/dev-sidecar/issues/109)
+> 关于此问题的更多讨论请前往：[https://github.com/docmirror/dev-sidecar/issues/109](https://github.com/docmirror/dev-sidecar/issues/109)
+>
+> 注：此问题已在 `1.8.9` 版本中得到解决。
 
 > ------------------------------重要提醒2---------------------------------
 >

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -18,7 +18,7 @@
   "dependencies": {
     "fix-path": "^3.0.0",
     "iconv-lite": "^0.6.3",
-    "lodash": "^4.17.20",
+    "lodash": "^4.17.21",
     "log4js": "^6.9.1",
     "node-powershell": "^4.0.0",
     "spawn-sync": "^2.0.0",

diff --git a/packages/core/src/modules/plugin/git/index.js b/packages/core/src/modules/plugin/git/index.js
@@ -29,7 +29,7 @@ const Plugin = function (context) {
 
     async setProxy (ip, port) {
       const cmds = [
-        `git config --global http.proxy  http://${ip}:${port} `,
+        `git config --global http.proxy  http://${ip}:${port - 1} `,
         `git config --global https.proxy http://${ip}:${port} `,
       ]
 
@@ -56,21 +56,21 @@ const Plugin = function (context) {
 
       try {
         await shell.exec(['git config --global --unset https.proxy '], { type: 'cmd' })
-      } catch (ignore) {
+      } catch {
       }
 
       if (config.get().plugin.git.setting.sslVerify === true) {
         try {
           await shell.exec(['git config --global --unset http.sslVerify '], { type: 'cmd' })
-        } catch (ignore) {
+        } catch {
         }
       }
 
       if (config.get().plugin.git.setting.noProxyUrls != null) {
         for (const url in config.get().plugin.git.setting.noProxyUrls) {
           try {
             await shell.exec([`git config --global --unset http."${url}".proxy `], { type: 'cmd' })
-          } catch (ignore) {
+          } catch {
           }
         }
       }

diff --git a/packages/core/src/shell/scripts/set-system-proxy/index.js b/packages/core/src/shell/scripts/set-system-proxy/index.js
@@ -97,7 +97,7 @@ function loadLastModifiedTimeFromTxt (fileTxt) {
   if (matched && matched.length > 0) {
     try {
       return new Date(matched[0])
-    } catch (ignore) {
+    } catch {
       return null
     }
   }

diff --git a/packages/gui/package.json b/packages/gui/package.json
@@ -30,7 +30,7 @@
     "electron-sudo": "^4.0.12",
     "electron-updater": "^6.3.9",
     "json5": "^2.2.3",
-    "lodash": "^4.17.20",
+    "lodash": "^4.17.21",
     "request-progress": "^3.0.0",
     "sass": "^1.81.0",
     "sass-loader": "^16.0.3",
@@ -45,7 +45,7 @@
     "@vue/cli-plugin-babel": "^5.0.8",
     "@vue/cli-service": "^5.0.8",
     "electron": "^19.1.9",
-    "electron-builder": "^25.0.6",
+    "electron-builder": "^25.1.8",
     "electron-icon-builder": "^2.0.1",
     "json5-loader": "^4.0.1",
     "vue-cli-plugin-electron-builder": "^3.0.0-alpha.4"

diff --git a/packages/gui/public/pay.jpg b/packages/gui/public/pay.jpg
diff --git a/packages/gui/src/view/pages/index.vue b/packages/gui/src/view/pages/index.vue
@@ -11,7 +11,6 @@ export default {
   },
   data () {
     return {
-      donateModal: false,
       status: undefined,
       startup: {
         loading: false,
@@ -346,30 +345,6 @@ export default {
         </div>
         <div class="right" />
       </div>
-      <div v-if="setting.development == null || !setting.development" class="star">
-        <div class="donate" @click="donateModal = true">
-          <a-icon type="like" theme="outlined" />
-          捐赠
-        </div>
-        <div class="right">
-          <div>
-            如果它解决了你的问题，请不要吝啬你的star哟！点这里
-            <a-icon style="margin-right:10px;" type="arrow-right" theme="outlined" />
-          </div>
-          <a @click="openExternal('https://github.com/docmirror/dev-sidecar')"><img
-            alt="GitHub stars"
-            src="https://img.shields.io/github/stars/docmirror/dev-sidecar?logo=github"
-          ></a>
-        </div>
-      </div>
-
-      <a-modal v-if="setting.development == null || !setting.development" v-model="donateModal" title="捐赠" width="550px" cancel-text="不了" ok-text="果断支持" @ok="goDonate">
-        <div>* 本应用完全免费，如果觉得好用，可以给予捐赠。</div>
-        <div>* 开源项目持续发展离不开您的支持，感谢</div>
-        <div class="payQrcode">
-          <img height="200px" src="/pay.jpg">
-        </div>
-      </a-modal>
     </div>
   </DsContainer>
 </template>

diff --git a/packages/mitmproxy/package.json b/packages/mitmproxy/package.json
@@ -19,14 +19,11 @@
     "dns-over-tls": "^0.0.9",
     "is-browser": "^2.1.0",
     "json5": "^2.2.3",
-    "lodash": "^4.17.20",
+    "lodash": "^4.17.21",
     "lru-cache": "^7.15.0",
     "node-forge": "^1.3.1",
     "stream-throttle": "^0.1.3",
     "through2": "^4.0.2",
     "tunnel-agent": "^0.6.0"
-  },
-  "devDependencies": {
-    "crypto-js": "^4.2.0"
   }
 }
diff --git a/packages/mitmproxy/test/sha256Test.js b/packages/mitmproxy/test/sha256Test.js
@@ -1,5 +1,10 @@
-const CryptoJs = require('crypto-js')
+// 需要时，在 package.json 中添加以下依赖:
+// "devDependencies": {
+//     "crypto-js": "^4.2.0"
+// }
 
-const ret = CryptoJs.SHA256('111111111111')
-console.log(ret.toString(CryptoJs.enc.Base64))
-console.log(1 / 2)
+// const CryptoJs = require('crypto-js')
+//
+// const ret = CryptoJs.SHA256('111111111111')
+// console.log(ret.toString(CryptoJs.enc.Base64))
+// console.log(1 / 2)
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,8 @@ on: @@
       push:
         branches:
           - run
+        tags:
+          - '*'
     jobs:
       npm-run-electron:
@@ Expand Down @@