From 4498449eea374ee936d2f1fefda3bb49d216e6f1 Mon Sep 17 00:00:00 2001 From: whyour Date: Tue, 11 Apr 2023 14:15:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=B9=E5=99=A8=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/docker-entrypoint.sh | 4 +--- sample/package.json | 5 ----- shell/check.sh | 2 ++ shell/share.sh | 13 +++++-------- src/pages/initialization/index.tsx | 7 ++++++- 5 files changed, 14 insertions(+), 17 deletions(-) diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 50bd21ee..53699883 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -13,10 +13,8 @@ init_nginx pm2 l &>/dev/null -patch_version &>/dev/null -echo - echo -e "======================2. 安装依赖========================\n" +patch_version update_depend echo diff --git a/sample/package.json b/sample/package.json index 82ac9225..b928b56e 100644 --- a/sample/package.json +++ b/sample/package.json @@ -3,13 +3,8 @@ "author": "", "license": "ISC", "dependencies": { - "crypto-js": "^4.0.0", - "download": "^8.0.0", "got": "^11.5.1", - "http-server": "^0.12.3", "nodemailer": "^6.8.0", - "qrcode-terminal": "^0.12.0", - "request": "^2.88.2", "tough-cookie": "^4.0.0", "tunnel": "0.0.6", "ws": "^7.4.3" diff --git a/shell/check.sh b/shell/check.sh index 09325928..7c377413 100755 --- a/shell/check.sh +++ b/shell/check.sh @@ -90,6 +90,8 @@ main() { echo -e "=====> 开始检测" npm i -g pnpm patch_version + pnpm add -g pm2 tsx + update_depend start_public copy_dep check_ql diff --git a/shell/share.sh b/shell/share.sh index 7dce7724..c1e64115 100755 --- a/shell/share.sh +++ b/shell/share.sh @@ -439,10 +439,13 @@ patch_version() { pip3 config set global.index-url $PipMirror fi if [[ $NpmMirror ]]; then - pnpm config set registry $NpmMirror + cd && pnpm config set registry $NpmMirror + pnpm install -g fi - pnpm install -g &>/dev/null + git config --global pull.rebase false + + cp -f $dir_root/.env.example $dir_root/.env if [[ -f "$dir_root/db/cookie.db" ]]; then echo -e "检测到旧的db文件,拷贝为新db...\n" @@ -451,12 +454,6 @@ patch_version() { echo fi - pnpm add -g pm2 tsx - - git config --global pull.rebase false - - cp -f $dir_root/.env.example $dir_root/.env - if [[ -d "$dir_root/db" ]]; then echo -e "检测到旧的db目录,拷贝到data目录...\n" cp -rf $dir_root/config $dir_root/data diff --git a/src/pages/initialization/index.tsx b/src/pages/initialization/index.tsx index 052d7ef5..2f1270fc 100644 --- a/src/pages/initialization/index.tsx +++ b/src/pages/initialization/index.tsx @@ -78,9 +78,14 @@ const Initialization = () => { { title: '欢迎使用', content: ( -
+
欢迎使用青龙 + + 支持python3、javaScript、shell、typescript 的定时任务管理面板(A + timed task management panel that supports typescript, javaScript, + python3, and shell.) +