From cdc5d46dbe5e5384a9c2d12b1921826cfcc74683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=8C=8C?= Date: Mon, 28 Aug 2023 20:13:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- .npmrc | 2 ++ README.md | 25 +++++++++---------------- lib/plugins/loader.js | 4 ++-- package.json | 6 +++--- 5 files changed, 18 insertions(+), 22 deletions(-) create mode 100644 .npmrc diff --git a/.gitignore b/.gitignore index b94d123..666c10c 100644 --- a/.gitignore +++ b/.gitignore @@ -132,8 +132,9 @@ dist # Yunzai data dump.rdb -data/ +config/*.yaml config/test/* +data/ !config/test/default.yaml logs/ resources/ diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..ef1cf92 --- /dev/null +++ b/.npmrc @@ -0,0 +1,2 @@ +registry=https://registry.npmmirror.com +node_sqlite3_binary_host_mirror=https://npmmirror.com/mirrors/sqlite3 \ No newline at end of file diff --git a/README.md b/README.md index 6fbfe50..851bf11 100644 --- a/README.md +++ b/README.md @@ -38,43 +38,36 @@ Yunzai 应用端，支持多账号，支持协议端：go-cqhttp、ComWeChat、G > 环境准备： Windows or Linux，Node.js（ [版本至少 v18 以上](http://nodejs.cn/download) ）， [Redis](https://redis.io/docs/getting-started/installation) -1.克隆项目并安装 genshin miao-plugin +1.克隆项目并安装 genshin miao-plugin TRSS-Plugin(可选) -请根据网络情况选择 Github 安装或 Gitee 安装 +请根据网络情况选择使用 GitHub 或 Gitee 安装 ``` -# 使用 Github git clone --depth 1 https://github.com/TimeRainStarSky/Yunzai cd Yunzai git clone --depth 1 https://github.com/TimeRainStarSky/Yunzai-genshin plugins/genshin git clone --depth 1 https://github.com/yoimiya-kokomi/miao-plugin plugins/miao-plugin +git clone --depth 1 https://github.com/TimeRainStarSky/TRSS-Plugin plugins/TRSS-Plugin +``` -# 使用Gitee +``` git clone --depth 1 https://gitee.com/TimeRainStarSky/Yunzai cd Yunzai git clone --depth 1 https://gitee.com/TimeRainStarSky/Yunzai-genshin plugins/genshin git clone --depth 1 https://gitee.com/yoimiya-kokomi/miao-plugin plugins/miao-plugin +git clone --depth 1 https://Yunzai.TRSS.me plugins/TRSS-Plugin ``` -2.安装 [pnpm](https://pnpm.io/zh/installation)，已安装的可以跳过 +2.安装 [pnpm](https://pnpm.io/zh/installation) ``` -# 使用npmjs.org安装 -npm install pnpm -g - -# 指定国内源npmmirror.com安装 -npm --registry=https://registry.npmmirror.com install pnpm -g +npm install -g pnpm ``` 3.安装依赖 ``` -# 直接安装 -pnpm install -P - -# 如依赖安装缓慢或失败，可尝试更换国内npm源后再执行install命令 -pnpm config set registry https://registry.npmmirror.com -pnpm install -P +pnpm i ``` 4.运行 diff --git a/lib/plugins/loader.js b/lib/plugins/loader.js index c0ba16f..b37ed36 100644 --- a/lib/plugins/loader.js +++ b/lib/plugins/loader.js @@ -110,8 +110,8 @@ class PluginsLoader { packageErr.forEach(v => { let pack = v.error.stack.match(/'(.+?)'/g)[0].replace(/'/g, "") logger.mark(`${v.File.name} 缺少依赖：${logger.red(pack)}`) - logger.mark(`新增插件后请执行安装命令：${logger.red("pnpm install -P")} 安装依赖`) - logger.mark(`如安装后仍未解决可联系插件作者将 ${logger.red(pack)} 依赖添加至插件的package.json dependencies中，或手工安装依赖`) + logger.mark(`新增插件后请执行安装命令：${logger.red("pnpm i")} 安装依赖`) + logger.mark("如安装后仍未解决可联系插件作者解决") }) // logger.error("或者使用其他包管理工具安装依赖") logger.mark("---------------------") diff --git a/package.json b/package.json index d8e5b95..c38c6ca 100644 --- a/package.json +++ b/package.json @@ -32,15 +32,15 @@ "node-xlsx": "^0.23.0", "oicq": "link:lib/modules/oicq", "pm2": "^5.3.0", - "puppeteer": "^21.1.0", - "redis": "^4.6.7", + "puppeteer": "^21.1.1", + "redis": "^4.6.8", "sequelize": "^6.32.1", "sqlite3": "^5.1.6", "ws": "^8.13.0", "yaml": "^2.3.1" }, "devDependencies": { - "eslint": "^8.47.0", + "eslint": "^8.48.0", "eslint-config-standard": "^17.1.0", "eslint-plugin-import": "^2.28.1", "eslint-plugin-n": "^16.0.2",