diff --git a/back/config/util.ts b/back/config/util.ts index a97f77a1..92609cb0 100644 --- a/back/config/util.ts +++ b/back/config/util.ts @@ -278,6 +278,11 @@ export async function concurrentRun( return replyList; } +enum FileType { + 'directory', + 'file', +} + export function readDirs( dir: string, baseDir: string = '', @@ -298,7 +303,10 @@ export function readDirs( type: 'directory', disabled: true, parent: relativePath, - children: readDirs(subPath, baseDir), + children: readDirs(subPath, baseDir).sort( + (a: any, b: any) => + (FileType as any)[a.type] - (FileType as any)[b.type], + ), }; } return { @@ -308,7 +316,9 @@ export function readDirs( parent: relativePath, }; }); - return result; + return result.sort( + (a: any, b: any) => (FileType as any)[a.type] - (FileType as any)[b.type], + ); } export function readDir( diff --git a/shell/api.sh b/shell/api.sh index ffb59ad7..30f69120 100755 --- a/shell/api.sh +++ b/shell/api.sh @@ -154,7 +154,7 @@ update_cron() { code=$(echo $api | jq -r .code) message=$(echo $api | jq -r .message) if [[ $code != 200 ]]; then - echo -e "\n## 更新任务状态失败(${message})\n" >> $log_path + echo -e "\n## 更新任务状态失败(${message})\n" >> $dir_log/$log_path fi }