mirror of
https://github.com/whyour/qinglong.git
synced 2025-05-22 22:36:06 +08:00
修复任务详情日志访问,修复新建订阅粘贴repo命令
This commit is contained in:
parent
b3ed824b2e
commit
31ff0476a6
|
@ -31,7 +31,7 @@ export default (app: Router) => {
|
|||
try {
|
||||
const filePath = join(
|
||||
config.logPath,
|
||||
req.query.path as string,
|
||||
(req.query.path || '') as string,
|
||||
req.params.file,
|
||||
);
|
||||
const content = getFileContentByName(filePath);
|
||||
|
|
|
@ -181,8 +181,9 @@ export default class SubscriptionService {
|
|||
if (doc.sub_before) {
|
||||
beforeStr = execSync(doc.sub_before).toString();
|
||||
}
|
||||
} catch (error) {
|
||||
beforeStr = JSON.stringify(error);
|
||||
} catch (error: any) {
|
||||
beforeStr =
|
||||
(error.stderr && error.stderr.toString()) || JSON.stringify(error);
|
||||
}
|
||||
if (beforeStr) {
|
||||
beforeStr += '\n';
|
||||
|
@ -225,8 +226,9 @@ export default class SubscriptionService {
|
|||
if (sub.sub_after) {
|
||||
afterStr = execSync(sub.sub_after).toString();
|
||||
}
|
||||
} catch (error) {
|
||||
afterStr = JSON.stringify(error);
|
||||
} catch (error: any) {
|
||||
afterStr =
|
||||
(error.stderr && error.stderr.toString()) || JSON.stringify(error);
|
||||
}
|
||||
if (afterStr) {
|
||||
afterStr = `\n\n${afterStr}`;
|
||||
|
|
|
@ -115,9 +115,13 @@ const CronDetailModal = ({
|
|||
|
||||
const onClickItem = (item: LogItem) => {
|
||||
localStorage.setItem('logCron', currentCron.id);
|
||||
setLogUrl(`${config.apiPrefix}logs/${item.directory}/${item.filename}`);
|
||||
setLogUrl(
|
||||
`${config.apiPrefix}logs/${item.filename}?path=${item.directory || ''}`,
|
||||
);
|
||||
request
|
||||
.get(`${config.apiPrefix}logs/${item.directory}/${item.filename}`)
|
||||
.get(
|
||||
`${config.apiPrefix}logs/${item.filename}?path=${item.directory || ''}`,
|
||||
)
|
||||
.then((data) => {
|
||||
setLog(data.data);
|
||||
setIsLogModalVisible(true);
|
||||
|
|
|
@ -195,7 +195,9 @@ const SubscriptionModal = ({
|
|||
dependences,
|
||||
branch,
|
||||
extensions,
|
||||
] = text.split(' ').map((x) => x.trim());
|
||||
] = text
|
||||
.split(' ')
|
||||
.map((x) => x.trim().replace(/\"/g, '').replace(/\'/, ''));
|
||||
form.setFieldsValue({
|
||||
type:
|
||||
type === 'raw'
|
||||
|
@ -210,6 +212,7 @@ const SubscriptionModal = ({
|
|||
branch,
|
||||
extensions,
|
||||
});
|
||||
form.validateFields(['url']);
|
||||
}
|
||||
}, []);
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user