open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2025-11-04 11:16:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复 data 目录判断逻辑

Browse Source
This commit is contained in:
whyour 2024-06-25 22:25:36 +08:00
parent 0d492e94f4
commit 7efe81df9e
5 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
back/config/index.ts
View File

@ -19,7 +19,12 @@ const lastVersionFile = `https://qn.whyour.cn/version.yaml`;
const rootPath = process.env.QL_DIR as string; const rootPath = process.env.QL_DIR as string;
const envFound = dotenv.config({ path: path.join(rootPath, '.env') }); const envFound = dotenv.config({ path: path.join(rootPath, '.env') });
const dataPath = path.join(rootPath, 'data/'); let dataPath = path.join(rootPath, 'data/');
if (process.env.QL_DATA_DIR) {
dataPath = process.env.QL_DATA_DIR.replace(/\/$/g, '');
}
const shellPath = path.join(rootPath, 'shell/'); const shellPath = path.join(rootPath, 'shell/');
const tmpPath = path.join(rootPath, '.tmp/'); const tmpPath = path.join(rootPath, '.tmp/');
const samplePath = path.join(rootPath, 'sample/'); const samplePath = path.join(rootPath, 'sample/');

6
back/loaders/initData.ts
View File

@ -125,7 +125,7 @@ export default async () => {
if (doc.command.includes(`${config.rootPath}/log/`)) { if (doc.command.includes(`${config.rootPath}/log/`)) {
await CrontabModel.update( await CrontabModel.update(
{ {
command: `${config.rootPath}/data/log/${doc.command.replace( command: `${config.dataPath}/log/${doc.command.replace(
`${config.rootPath}/log/`, `${config.rootPath}/log/`,
'', '',
)}`, )}`,
@ -136,7 +136,7 @@ export default async () => {
if (doc.command.includes(`${config.rootPath}/config/`)) { if (doc.command.includes(`${config.rootPath}/config/`)) {
await CrontabModel.update( await CrontabModel.update(
{ {
command: `${config.rootPath}/data/config/${doc.command.replace( command: `${config.dataPath}/config/${doc.command.replace(
`${config.rootPath}/config/`, `${config.rootPath}/config/`,
'', '',
)}`, )}`,
@ -147,7 +147,7 @@ export default async () => {
if (doc.command.includes(`${config.rootPath}/db/`)) { if (doc.command.includes(`${config.rootPath}/db/`)) {
await CrontabModel.update( await CrontabModel.update(
{ {
command: `${config.rootPath}/data/db/${doc.command.replace( command: `${config.dataPath}/db/${doc.command.replace(
`${config.rootPath}/db/`, `${config.rootPath}/db/`,
'', '',
)}`, )}`,

7
back/loaders/initFile.ts
View File

@ -5,7 +5,12 @@ import Logger from './logger';
import { fileExist } from '../config/util'; import { fileExist } from '../config/util';
const rootPath = process.env.QL_DIR as string; const rootPath = process.env.QL_DIR as string;
const dataPath = path.join(rootPath, 'data/'); let dataPath = path.join(rootPath, 'data/');
if (process.env.QL_DATA_DIR) {
dataPath = process.env.QL_DATA_DIR.replace(/\/$/g, '');
}
const configPath = path.join(dataPath, 'config/'); const configPath = path.join(dataPath, 'config/');
const scriptPath = path.join(dataPath, 'scripts/'); const scriptPath = path.join(dataPath, 'scripts/');
const logPath = path.join(dataPath, 'log/'); const logPath = path.join(dataPath, 'log/');

13
shell/share.sh
View File

@ -4,6 +4,11 @@
dir_root=$QL_DIR dir_root=$QL_DIR
dir_tmp=$dir_root/.tmp dir_tmp=$dir_root/.tmp
dir_data=$dir_root/data dir_data=$dir_root/data
if [[ $QL_DATA_DIR ]]; then
dir_data="${QL_DATA_DIR%/}"
fi
dir_shell=$dir_root/shell dir_shell=$dir_root/shell
dir_sample=$dir_root/sample dir_sample=$dir_root/sample
dir_static=$dir_root/static dir_static=$dir_root/static
@ -371,25 +376,25 @@ patch_version() {
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_data
echo echo
fi fi
if [[ -d "$dir_root/scripts" ]]; then if [[ -d "$dir_root/scripts" ]]; then
echo -e "检测到旧的scripts目录，拷贝到data目录...\n" echo -e "检测到旧的scripts目录，拷贝到data目录...\n"
cp -rf $dir_root/scripts $dir_root/data cp -rf $dir_root/scripts $dir_data
echo echo
fi fi
if [[ -d "$dir_root/log" ]]; then if [[ -d "$dir_root/log" ]]; then
echo -e "检测到旧的log目录，拷贝到data目录...\n" echo -e "检测到旧的log目录，拷贝到data目录...\n"
cp -rf $dir_root/log $dir_root/data cp -rf $dir_root/log $dir_data
echo echo
fi fi
if [[ -d "$dir_root/config" ]]; then if [[ -d "$dir_root/config" ]]; then
echo -e "检测到旧的config目录，拷贝到data目录...\n" echo -e "检测到旧的config目录，拷贝到data目录...\n"
cp -rf $dir_root/config $dir_root/data cp -rf $dir_root/config $dir_data
echo echo
fi fi
} }

4
shell/update.sh
View File

@ -242,8 +242,8 @@ reload_qinglong() {
fi fi
if [[ "$reload_target" == 'data' ]]; then if [[ "$reload_target" == 'data' ]]; then
rm -rf ${dir_root}/data/* rm -rf ${dir_data}/*
mv -f ${dir_tmp}/data/* ${dir_root}/data/ mv -f ${dir_tmp}/data/* ${dir_data}/
fi fi
reload_pm2 reload_pm2