readme (en) some fix

1. fix blue line between badges in github
2. change badges tooltip

Signed-off-by: yangyangdaji <1504305527@qq.com>

README.md

@@ -1,36 +1,22 @@
 English | [简体中文](./README.zh-CN.md)
 
-
 <div align= "center">
 <img align="center" width=200 src="./public/logo.png" />
 </div>
 
-
+<div align="center">
-<div align= "center">
+    <h1>Rubick</h1>
- <h1>Rubick</h1>
+    <img alt="downloads" src="https://img.shields.io/github/downloads/rubickCenter/rubick/total" />
-
+    <a href="https://github.com/rubickCenter/rubick/releases"><img alt="latest release" src="https://img.shields.io/github/package-json/v/rubickCenter/rubick" /></a>
- <img alt="release" src="https://img.shields.io/github/downloads/rubickCenter/rubick/total" />
+    <a href="https://github.com/rubickCenter/rubick/actions"><img alt="github action building" src="https://img.shields.io/github/actions/workflow/status/rubickCenter/rubick/main.yml" /></a>
- <a href="https://github.com/rubickCenter/rubick/releases">
+    <a href="https://github.com/rubickCenter/rubick/blob/master/LICENSE"><img alt="license" src="https://img.shields.io/github/license/rubickCenter/rubick" /></a>
-    <img alt="release" src="https://img.shields.io/github/package-json/v/rubickCenter/rubick" />
+    <a href="https://github.com/rubickCenter/rubick/stargazers"><img alt="github stars" src="https://img.shields.io/github/stars/rubickCenter/rubick?style=social" /></a>
- </a>
+    <a href="https://gitee.com/monkeyWang/rubick"><img alt="gitee mirror" src="https://img.shields.io/badge/Gitee--yellow.svg?style=social&logo=data:image/svg+xml;base64,PHN2ZyB0PSIxNTc0ODM3MTM4ODM3IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjE3NzAiICAgICB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPiAgICA8cGF0aCBkPSJNODkxIDQyOC44SDQ2NS44Yy0yMC40IDAtMzcgMTYuNS0zNyAzN3Y5Mi40YzAgMjAuNCAxNi41IDM3IDM3IDM3aDI1OC45YzIwLjQgMCAzNyAxNi42IDM3IDM3djE4LjRjMCA2MS4zLTQ5LjcgMTEwLjktMTEwLjkgMTEwLjlIMjk5LjRjLTIwLjQgMC0zNy0xNi42LTM3LTM3VjM3My4yYzAtNjEuMyA0OS43LTExMC45IDExMC45LTExMC45aDUxNy42YzIwLjQgMCAzNy0xNi41IDM3LTM3bDAuMS05Mi4zYzAtMjAuNC0xNi41LTM3LTM3LTM3SDM3My4zQzIyMC4yIDk2IDk2IDIyMC4yIDk2IDM3My4zVjg5MWMwIDIwLjQgMTYuNiAzNyAzNyAzN2g1NDUuNEM4MTYuMiA5MjggOTI4IDgxNi4zIDkyOCA2NzguNFY0NjUuOGMwLTIwLjQtMTYuNi0zNy0zNy0zN3oiICAgICAgICAgIGZpbGw9IiNkODFlMDYiIHAtaWQ9IjE3NzEiPjwvcGF0aD48L3N2Zz4=" /></a>
- <a href="https://github.com/rubickCenter/rubick/actions">
-   <img alt=building src=https://img.shields.io/github/actions/workflow/status/rubickCenter/rubick/main.yml>
- </a>
- <a href="https://github.com/rubickCenter/rubick/blob/master/LICENSE">
-    <img alt="npm" src="https://img.shields.io/github/license/rubickCenter/rubick" />
- </a>
- <a href="https://github.com/rubickCenter/rubick/stargazers">
-    <img alt="star" src="https://img.shields.io/github/stars/rubickCenter/rubick?style=social">
-</a>
-<a href="https://gitee.com/monkeyWang/rubick">
-    <img alt="码云" src="https://img.shields.io/badge/Gitee--yellow.svg?style=social&logo=data:image/svg+xml;base64,PHN2ZyB0PSIxNTc0ODM3MTM4ODM3IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjE3NzAiICAgICB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPiAgICA8cGF0aCBkPSJNODkxIDQyOC44SDQ2NS44Yy0yMC40IDAtMzcgMTYuNS0zNyAzN3Y5Mi40YzAgMjAuNCAxNi41IDM3IDM3IDM3aDI1OC45YzIwLjQgMCAzNyAxNi42IDM3IDM3djE4LjRjMCA2MS4zLTQ5LjcgMTEwLjktMTEwLjkgMTEwLjlIMjk5LjRjLTIwLjQgMC0zNy0xNi42LTM3LTM3VjM3My4yYzAtNjEuMyA0OS43LTExMC45IDExMC45LTExMC45aDUxNy42YzIwLjQgMCAzNy0xNi41IDM3LTM3bDAuMS05Mi4zYzAtMjAuNC0xNi41LTM3LTM3LTM3SDM3My4zQzIyMC4yIDk2IDk2IDIyMC4yIDk2IDM3My4zVjg5MWMwIDIwLjQgMTYuNiAzNyAzNyAzN2g1NDUuNEM4MTYuMiA5MjggOTI4IDgxNi4zIDkyOCA2NzguNFY0NjUuOGMwLTIwLjQtMTYuNi0zNy0zNy0zN3oiICAgICAgICAgIGZpbGw9IiNkODFlMDYiIHAtaWQ9IjE3NzEiPjwvcGF0aD48L3N2Zz4="/>
-</a>
 </div>
 
 <div align= "center">
 <img align="center" src="https://picx.zhimg.com/80/v2-f8fe09ef125dac5fdcbef3fe00f92b21_720w.png" />
 </div>
-
 Open-source plugin-based desktop efficiency toolbox. The plugins are installed and uninstalled based on npm, which is very lightweight. The plugin data supports webdav multi-terminal synchronization, which is very secure. It supports internal network deployment and can be customized for further development, which is very flexible.
 
 ## Get Rubick
@@ -104,6 +90,13 @@ If the project is helpful to you, you can buy me a cup of coffee as a reward!
 <img width="180" src="https://picx.zhimg.com/80/v2-3160247d6099053405e6cd2cb6afb5e5_720w.png">
 </div>
 
+## 友情链接
+
+<a href="https://pro.kuaitu.cc/" target="_blank">
+<img width="100" src="https://github.com/user-attachments/assets/6127488e-466b-4e71-98ab-00fb3c76553e" />
+</a>
+
+
 ## Feedback
 Those who are interested in this project or want to exchange and learn can scan the QR code and add the following WeChat, with the comment rubick, to help us grow better.
 

README.zh-CN.md

@@ -5,25 +5,14 @@
 <img align="center" width=200 src="./public/logo.png" />
 </div>
 
-<div align= "center">
+<div align="center">
- <h1>Rubick</h1>
+    <h1>Rubick</h1>
-
+    <img alt="累计下载数" src="https://img.shields.io/github/downloads/rubickCenter/rubick/total" />
- <img alt="release" src="https://img.shields.io/github/downloads/rubickCenter/rubick/total" />
+    <a href="https://github.com/rubickCenter/rubick/releases"><img alt="最新发布版本" src="https://img.shields.io/github/package-json/v/rubickCenter/rubick" /></a>
- <a href="https://github.com/rubickCenter/rubick/releases">
+    <a href="https://github.com/rubickCenter/rubick/actions"><img alt="github action 构建" src="https://img.shields.io/github/actions/workflow/status/rubickCenter/rubick/main.yml" /></a>
-    <img alt="release" src="https://img.shields.io/github/package-json/v/rubickCenter/rubick" />
+    <a href="https://github.com/rubickCenter/rubick/blob/master/LICENSE"><img alt="许可证" src="https://img.shields.io/github/license/rubickCenter/rubick" /></a>
- </a>
+    <a href="https://github.com/rubickCenter/rubick/stargazers"><img alt="github 收藏数" src="https://img.shields.io/github/stars/rubickCenter/rubick?style=social" /></a>
- <a href="https://github.com/rubickCenter/rubick/actions">
+    <a href="https://gitee.com/monkeyWang/rubick"><img alt="gitee 镜像源" src="https://img.shields.io/badge/Gitee--yellow.svg?style=social&logo=data:image/svg+xml;base64,PHN2ZyB0PSIxNTc0ODM3MTM4ODM3IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjE3NzAiICAgICB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPiAgICA8cGF0aCBkPSJNODkxIDQyOC44SDQ2NS44Yy0yMC40IDAtMzcgMTYuNS0zNyAzN3Y5Mi40YzAgMjAuNCAxNi41IDM3IDM3IDM3aDI1OC45YzIwLjQgMCAzNyAxNi42IDM3IDM3djE4LjRjMCA2MS4zLTQ5LjcgMTEwLjktMTEwLjkgMTEwLjlIMjk5LjRjLTIwLjQgMC0zNy0xNi42LTM3LTM3VjM3My4yYzAtNjEuMyA0OS43LTExMC45IDExMC45LTExMC45aDUxNy42YzIwLjQgMCAzNy0xNi41IDM3LTM3bDAuMS05Mi4zYzAtMjAuNC0xNi41LTM3LTM3LTM3SDM3My4zQzIyMC4yIDk2IDk2IDIyMC4yIDk2IDM3My4zVjg5MWMwIDIwLjQgMTYuNiAzNyAzNyAzN2g1NDUuNEM4MTYuMiA5MjggOTI4IDgxNi4zIDkyOCA2NzguNFY0NjUuOGMwLTIwLjQtMTYuNi0zNy0zNy0zN3oiICAgICAgICAgIGZpbGw9IiNkODFlMDYiIHAtaWQ9IjE3NzEiPjwvcGF0aD48L3N2Zz4=" /></a>
-   <img alt=building src=https://img.shields.io/github/actions/workflow/status/rubickCenter/rubick/main.yml>
- </a>
- <a href="https://github.com/rubickCenter/rubick/blob/master/LICENSE">
-    <img alt="npm" src="https://img.shields.io/github/license/rubickCenter/rubick" />
- </a>
- <a href="https://github.com/rubickCenter/rubick/stargazers">
-    <img alt="star" src="https://img.shields.io/github/stars/rubickCenter/rubick?style=social">
-</a>
-<a href="https://gitee.com/monkeyWang/rubick">
-    <img alt="码云" src="https://img.shields.io/badge/Gitee--yellow.svg?style=social&logo=data:image/svg+xml;base64,PHN2ZyB0PSIxNTc0ODM3MTM4ODM3IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjE3NzAiICAgICB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPiAgICA8cGF0aCBkPSJNODkxIDQyOC44SDQ2NS44Yy0yMC40IDAtMzcgMTYuNS0zNyAzN3Y5Mi40YzAgMjAuNCAxNi41IDM3IDM3IDM3aDI1OC45YzIwLjQgMCAzNyAxNi42IDM3IDM3djE4LjRjMCA2MS4zLTQ5LjcgMTEwLjktMTEwLjkgMTEwLjlIMjk5LjRjLTIwLjQgMC0zNy0xNi42LTM3LTM3VjM3My4yYzAtNjEuMyA0OS43LTExMC45IDExMC45LTExMC45aDUxNy42YzIwLjQgMCAzNy0xNi41IDM3LTM3bDAuMS05Mi4zYzAtMjAuNC0xNi41LTM3LTM3LTM3SDM3My4zQzIyMC4yIDk2IDk2IDIyMC4yIDk2IDM3My4zVjg5MWMwIDIwLjQgMTYuNiAzNyAzNyAzN2g1NDUuNEM4MTYuMiA5MjggOTI4IDgxNi4zIDkyOCA2NzguNFY0NjUuOGMwLTIwLjQtMTYuNi0zNy0zNy0zN3oiICAgICAgICAgIGZpbGw9IiNkODFlMDYiIHAtaWQ9IjE3NzEiPjwvcGF0aD48L3N2Zz4="/>
-</a>
 </div>
 
 <div align= "center">

feature/src/views/settings/localhost.vue

@@ -17,7 +17,7 @@
       name="register"
     >
       <a-input
-        placeholder="https://registry.npm.taobao.org"
+        placeholder="https://registry.npmmirror.com"
         v-model:value="formState.register"
       />
     </a-form-item>
@@ -27,7 +27,7 @@
       name="database"
     >
       <a-input
-        placeholder="https://gitcode.net/rubickcenter/rubick-database/-/raw/master"
+        placeholder="https://gitee.com/monkeyWang/rubickdatabase/raw/master"
         v-model:value="formState.database"
       />
     </a-form-item>
@@ -54,8 +54,8 @@ import { message } from 'ant-design-vue';
 let _rev: any;
 
 let defaultConfig = {
-  register: 'https://registry.npm.taobao.org',
+  register: 'https://registry.npmmirror.com',
-  database: 'https://gitcode.net/rubickcenter/rubick-database/-/raw/master',
+  database: 'https://gitee.com/monkeyWang/rubickdatabase/raw/master',
   access_token: '',
 };
 
@@ -81,7 +81,7 @@ const layout = {
 const resetForm = () => {
   formState.value = {
     register: 'https://registry.npmmirror.com',
-    database: 'https://gitcode.net/rubickcenter/rubick-database/-/raw/master',
+    database: 'https://gitee.com/monkeyWang/rubickdatabase/raw/master',
     access_token: '',
   };
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rubick",
-  "version": "4.2.9",
+  "version": "4.3.2",
   "author": "muwoo <2424880409@qq.com>",
   "private": true,
   "scripts": {

src/core/plugin-handler/index.ts

@@ -7,11 +7,10 @@ import path from 'path';
 import got from 'got';
 import fixPath from 'fix-path';
 
+import spawn from 'cross-spawn';
 import { ipcRenderer } from 'electron';
 import axios from 'axios';
 
-import npm from 'npm';
-
 fixPath();
 
 /**
@@ -42,7 +41,7 @@ class AdapterHandler {
     }
     this.baseDir = options.baseDir;
 
-    let register = options.registry || 'https://registry.npmmirror.com/';
+    let register = options.registry || 'https://registry.npmmirror.com';
 
     try {
       const dbdata = ipcRenderer.sendSync('msg-trigger', {
@@ -61,7 +60,7 @@ class AdapterHandler {
     const packageJSON = JSON.parse(
       fs.readFileSync(`${this.baseDir}/package.json`, 'utf-8')
     );
-    const registryUrl = `${this.registry}${name}`;
+    const registryUrl = `https://registry.npmmirror.com/${name}`;
 
     // 从npm源中获取依赖包的最新版本
     try {
@@ -158,32 +157,43 @@ class AdapterHandler {
    */
   private async execCommand(cmd: string, modules: string[]): Promise<string> {
     return new Promise((resolve: any, reject: any) => {
-      const module =
+      let args: string[] = [cmd].concat(
         cmd !== 'uninstall' && cmd !== 'link'
           ? modules.map((m) => `${m}@latest`)
-          : modules;
+          : modules
-      const config: any = {
+      );
-        prefix: this.baseDir,
-        save: true,
-        cache: path.join(this.baseDir, 'cache'),
-      };
       if (cmd !== 'link') {
-        config.registry = this.registry;
+        args = args
+          .concat('--color=always')
+          .concat('--save')
+          .concat(`--registry=${this.registry}`);
       }
-      npm.load(config, function (err) {
-        npm.commands[cmd](module, function (er, data) {
-          if (!err) {
-            console.log(data);
-            resolve({ code: -1, data });
-          } else {
-            reject({ code: -1, data: err });
-          }
-        });
 
-        npm.on('log', function (message) {
+      const npm = spawn('npm', args, {
-          // log installation progress
+        cwd: this.baseDir,
-          console.log(message);
+      });
-        });
+
+      console.log(args);
+
+      let output = '';
+      npm.stdout
+        .on('data', (data: string) => {
+          output += data; // 获取输出日志
+        })
+        .pipe(process.stdout);
+
+      npm.stderr
+        .on('data', (data: string) => {
+          output += data; // 获取报错日志
+        })
+        .pipe(process.stderr);
+
+      npm.on('close', (code: number) => {
+        if (!code) {
+          resolve({ code: 0, data: output }); // 如果没有报错就输出正常日志
+        } else {
+          reject({ code: code, data: output }); // 如果报错就输出报错日志
+        }
       });
     });
   }

src/renderer/components/result.vue

@@ -1,8 +1,13 @@
 <template>
-  <div v-show="!currentPlugin.name && config.perf.common.history" class="options">
+  <div v-show="!currentPlugin.name" class="options">
     <div
       class="history-plugins"
-      v-if="!options.length || !(searchValue || !!clipboardFile.length)"
+      v-if="
+        !options.length &&
+        !searchValue &&
+        !clipboardFile.length &&
+        config.perf.common.history
+      "
     >
       <a-row>
         <a-col