mirror of
https://github.com/whyour/qinglong.git
synced 2025-05-22 22:36:06 +08:00
修复容器启动逻辑
This commit is contained in:
parent
ebb9676a51
commit
4498449eea
|
@ -13,10 +13,8 @@ init_nginx
|
||||||
|
|
||||||
pm2 l &>/dev/null
|
pm2 l &>/dev/null
|
||||||
|
|
||||||
patch_version &>/dev/null
|
|
||||||
echo
|
|
||||||
|
|
||||||
echo -e "======================2. 安装依赖========================\n"
|
echo -e "======================2. 安装依赖========================\n"
|
||||||
|
patch_version
|
||||||
update_depend
|
update_depend
|
||||||
echo
|
echo
|
||||||
|
|
||||||
|
|
|
@ -3,13 +3,8 @@
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"crypto-js": "^4.0.0",
|
|
||||||
"download": "^8.0.0",
|
|
||||||
"got": "^11.5.1",
|
"got": "^11.5.1",
|
||||||
"http-server": "^0.12.3",
|
|
||||||
"nodemailer": "^6.8.0",
|
"nodemailer": "^6.8.0",
|
||||||
"qrcode-terminal": "^0.12.0",
|
|
||||||
"request": "^2.88.2",
|
|
||||||
"tough-cookie": "^4.0.0",
|
"tough-cookie": "^4.0.0",
|
||||||
"tunnel": "0.0.6",
|
"tunnel": "0.0.6",
|
||||||
"ws": "^7.4.3"
|
"ws": "^7.4.3"
|
||||||
|
|
|
@ -90,6 +90,8 @@ main() {
|
||||||
echo -e "=====> 开始检测"
|
echo -e "=====> 开始检测"
|
||||||
npm i -g pnpm
|
npm i -g pnpm
|
||||||
patch_version
|
patch_version
|
||||||
|
pnpm add -g pm2 tsx
|
||||||
|
update_depend
|
||||||
start_public
|
start_public
|
||||||
copy_dep
|
copy_dep
|
||||||
check_ql
|
check_ql
|
||||||
|
|
|
@ -439,10 +439,13 @@ patch_version() {
|
||||||
pip3 config set global.index-url $PipMirror
|
pip3 config set global.index-url $PipMirror
|
||||||
fi
|
fi
|
||||||
if [[ $NpmMirror ]]; then
|
if [[ $NpmMirror ]]; then
|
||||||
pnpm config set registry $NpmMirror
|
cd && pnpm config set registry $NpmMirror
|
||||||
|
pnpm install -g
|
||||||
fi
|
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
|
if [[ -f "$dir_root/db/cookie.db" ]]; then
|
||||||
echo -e "检测到旧的db文件,拷贝为新db...\n"
|
echo -e "检测到旧的db文件,拷贝为新db...\n"
|
||||||
|
@ -451,12 +454,6 @@ patch_version() {
|
||||||
echo
|
echo
|
||||||
fi
|
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
|
if [[ -d "$dir_root/db" ]]; then
|
||||||
echo -e "检测到旧的db目录,拷贝到data目录...\n"
|
echo -e "检测到旧的db目录,拷贝到data目录...\n"
|
||||||
cp -rf $dir_root/config $dir_root/data
|
cp -rf $dir_root/config $dir_root/data
|
||||||
|
|
|
@ -78,9 +78,14 @@ const Initialization = () => {
|
||||||
{
|
{
|
||||||
title: '欢迎使用',
|
title: '欢迎使用',
|
||||||
content: (
|
content: (
|
||||||
<div className={styles.top} style={{ marginTop: 100 }}>
|
<div className={styles.top} style={{ marginTop: 30 }}>
|
||||||
<div className={styles.header}>
|
<div className={styles.header}>
|
||||||
<span className={styles.title}>欢迎使用青龙</span>
|
<span className={styles.title}>欢迎使用青龙</span>
|
||||||
|
<span className={styles.desc}>
|
||||||
|
支持python3、javaScript、shell、typescript 的定时任务管理面板(A
|
||||||
|
timed task management panel that supports typescript, javaScript,
|
||||||
|
python3, and shell.)
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div className={styles.action}>
|
<div className={styles.action}>
|
||||||
<Button
|
<Button
|
||||||
|
|
Loading…
Reference in New Issue
Block a user