diff --git a/back/config/index.ts b/back/config/index.ts index 42e867a1..830e10bb 100644 --- a/back/config/index.ts +++ b/back/config/index.ts @@ -11,7 +11,7 @@ const sampleFile = path.join(rootPath, 'sample/config.sh.sample'); const crontabFile = path.join(rootPath, 'config/crontab.list'); const confBakDir = path.join(rootPath, 'config/bak/'); const authConfigFile = path.join(rootPath, 'config/auth.json'); -const shareCodeDir = path.join(rootPath, 'log/jd_get_share_code/'); +const shareCodeDir = path.join(rootPath, 'log/export_sharecodes/'); const diyFile = path.join(rootPath, 'config/diy.sh'); const logPath = path.join(rootPath, 'log/'); const authError = '错误的用户名密码,请重试'; diff --git a/sample/crontab.list.sample b/sample/crontab.list.sample index 6b608a3e..29c8028e 100644 --- a/sample/crontab.list.sample +++ b/sample/crontab.list.sample @@ -2,7 +2,9 @@ 55 2,13 * * * git_pull >> ${QL_DIR}/log/git_pull.log 2>&1 # 更新你需要的仓库的代码 # diy test作者 test仓库 test路径1|test路径2 黑名单1文件名|黑名单2文件名 -30 * * * * diy monk-coder dust i-chenzhe >> ${QL_DIR}/log/diy_pull.log 2>&1 +33 * * * * diy whyour hundun "quanx/jx|quanx/jd" tokens >> ${QL_DIR}/log/diy_pull.log 2>&1 +31 * * * * diy monk-coder dust i-chenzhe >> ${QL_DIR}/log/diy_pull.log 2>&1 + # 重新build面板 # 30 7 */7 * * rebuild >> ${QL_DIR}/log/rebuild.log 2>&1 diff --git a/src/pages/log/index.tsx b/src/pages/log/index.tsx index 2cd67963..2fee3db3 100644 --- a/src/pages/log/index.tsx +++ b/src/pages/log/index.tsx @@ -27,8 +27,7 @@ const Log = () => { x.disabled = x.isDir; x.children = x.files.map((y: string) => ({ title: y, - key: y, - value: y, + value: `${x.name}/${y}`, parent: x.name, })); return x; @@ -36,13 +35,10 @@ const Log = () => { }; const getLog = (node: any) => { + console.log(node); setLoading(true); - let url = `${node.parent}/${node.value}`; - if (!node.parent) { - url = node.value; - } request - .get(`${config.apiPrefix}logs/${url}`) + .get(`${config.apiPrefix}logs/${node.value}`) .then((data) => { setValue(data.data); }) @@ -80,7 +76,7 @@ const Log = () => { treeData={data} placeholder="请选择日志文件" showSearch - key="title" + key="value" onSelect={onSelect} />, ]}