Merge branch 'main' into feat/base-service-delivery

This commit is contained in:
ztkkOip
2026-07-28 18:03:04 +08:00
committed by GitHub
8 changed files with 443 additions and 55 deletions
+1
View File
@@ -22,6 +22,7 @@ declare module 'vue' {
ElOption: typeof import('element-plus/es')['ElOption'] ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination'] ElPagination: typeof import('element-plus/es')['ElPagination']
ElSelect: typeof import('element-plus/es')['ElSelect'] ElSelect: typeof import('element-plus/es')['ElSelect']
ElSwitch: typeof import('element-plus/es')['ElSwitch']
ElTable: typeof import('element-plus/es')['ElTable'] ElTable: typeof import('element-plus/es')['ElTable']
ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
RouterLink: typeof import('vue-router')['RouterLink'] RouterLink: typeof import('vue-router')['RouterLink']
+27 -39
View File
@@ -9,6 +9,7 @@
"version": "0.1.0", "version": "0.1.0",
"dependencies": { "dependencies": {
"@element-plus/icons-vue": "^2.1.0", "@element-plus/icons-vue": "^2.1.0",
"@tanstack/vue-virtual": "^3.13.34",
"axios": "^1.5.0", "axios": "^1.5.0",
"element-plus": "^2.3.12", "element-plus": "^2.3.12",
"pinia": "^2.1.4", "pinia": "^2.1.4",
@@ -735,9 +736,6 @@
"arm" "arm"
], ],
"dev": true, "dev": true,
"libc": [
"glibc"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -752,9 +750,6 @@
"arm" "arm"
], ],
"dev": true, "dev": true,
"libc": [
"musl"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -769,9 +764,6 @@
"arm64" "arm64"
], ],
"dev": true, "dev": true,
"libc": [
"glibc"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -786,9 +778,6 @@
"arm64" "arm64"
], ],
"dev": true, "dev": true,
"libc": [
"musl"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -803,9 +792,6 @@
"loong64" "loong64"
], ],
"dev": true, "dev": true,
"libc": [
"glibc"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -820,9 +806,6 @@
"loong64" "loong64"
], ],
"dev": true, "dev": true,
"libc": [
"musl"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -837,9 +820,6 @@
"ppc64" "ppc64"
], ],
"dev": true, "dev": true,
"libc": [
"glibc"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -854,9 +834,6 @@
"ppc64" "ppc64"
], ],
"dev": true, "dev": true,
"libc": [
"musl"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -871,9 +848,6 @@
"riscv64" "riscv64"
], ],
"dev": true, "dev": true,
"libc": [
"glibc"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -888,9 +862,6 @@
"riscv64" "riscv64"
], ],
"dev": true, "dev": true,
"libc": [
"musl"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -905,9 +876,6 @@
"s390x" "s390x"
], ],
"dev": true, "dev": true,
"libc": [
"glibc"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -922,9 +890,6 @@
"x64" "x64"
], ],
"dev": true, "dev": true,
"libc": [
"glibc"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -939,9 +904,6 @@
"x64" "x64"
], ],
"dev": true, "dev": true,
"libc": [
"musl"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -1032,6 +994,32 @@
"win32" "win32"
] ]
}, },
"node_modules/@tanstack/virtual-core": {
"version": "3.17.6",
"resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.17.6.tgz",
"integrity": "sha512-h0/Ebo18CkOrChlQIhNtQkM5ySUnh/GumQ/D1st3hG2HWUPEF+ILUc2k29UtivCi/9G7w7G3/f7Xyd5cCFbKBw==",
"license": "MIT",
"funding": {
"type": "github",
"url": "https://github.com/sponsors/tannerlinsley"
}
},
"node_modules/@tanstack/vue-virtual": {
"version": "3.13.34",
"resolved": "https://registry.npmjs.org/@tanstack/vue-virtual/-/vue-virtual-3.13.34.tgz",
"integrity": "sha512-CBqbCcnVsKpl9IJ7frPnbBmAqmc7JttSySg04kgLYJ4yYuC8JsAbtUHP0yLtWGLyByjihN3SwaDCgHQ+Z4iPoA==",
"license": "MIT",
"dependencies": {
"@tanstack/virtual-core": "3.17.6"
},
"funding": {
"type": "github",
"url": "https://github.com/sponsors/tannerlinsley"
},
"peerDependencies": {
"vue": "^2.7.0 || ^3.0.0"
}
},
"node_modules/@types/estree": { "node_modules/@types/estree": {
"version": "1.0.9", "version": "1.0.9",
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz",
+9 -8
View File
@@ -9,19 +9,20 @@
"preview": "vite preview" "preview": "vite preview"
}, },
"dependencies": { "dependencies": {
"vue": "^3.3.4",
"vue-router": "^4.2.4",
"pinia": "^2.1.4",
"element-plus": "^2.3.12",
"@element-plus/icons-vue": "^2.1.0", "@element-plus/icons-vue": "^2.1.0",
"axios": "^1.5.0" "@tanstack/vue-virtual": "^3.13.34",
"axios": "^1.5.0",
"element-plus": "^2.3.12",
"pinia": "^2.1.4",
"vue": "^3.3.4",
"vue-router": "^4.2.4"
}, },
"devDependencies": { "devDependencies": {
"@vitejs/plugin-vue": "^5.2.4", "@vitejs/plugin-vue": "^5.2.4",
"typescript": "^5.2.2", "typescript": "^5.2.2",
"vite": "^6.4.3",
"vue-tsc": "^2.2.12",
"unplugin-auto-import": "^0.16.6", "unplugin-auto-import": "^0.16.6",
"unplugin-vue-components": "^0.25.2" "unplugin-vue-components": "^0.25.2",
"vite": "^6.4.3",
"vue-tsc": "^2.2.12"
} }
} }
+46
View File
@@ -79,3 +79,49 @@ function parseResponseBody(text: string) {
return { error: text } return { error: text }
} }
} }
export interface TaskLogStreamCallbacks {
onInit?: (lines: TaskLogLine[]) => void
onUpdate?: (lines: TaskLogLine[]) => void
onFinished?: () => void
onError?: (error: string) => void
}
export function createTaskLogStream(taskId: string, callbacks: TaskLogStreamCallbacks): EventSource {
const token = getToken()
const url = `/auth/api/v1/task-logs/stream?task_id=${encodeURIComponent(taskId)}&access_token=${encodeURIComponent(token || '')}`
const es = new EventSource(url)
es.onmessage = (event) => {
try {
const data = JSON.parse(event.data)
switch (data.type) {
case 'init':
callbacks.onInit?.(Array.isArray(data.lines) ? data.lines : [])
break
case 'update':
callbacks.onUpdate?.(Array.isArray(data.lines) ? data.lines : [])
break
case 'finished':
callbacks.onFinished?.()
es.close()
break
case 'error':
callbacks.onError?.(data.error || 'Unknown error')
break
}
} catch {
// ignore parse errors for heartbeat etc.
}
}
es.onerror = () => {
// EventSource will auto-reconnect, but we report connection errors
if (es.readyState === EventSource.CLOSED) {
callbacks.onError?.('Connection closed')
}
}
return es
}
+163 -5
View File
@@ -52,12 +52,40 @@
<h3> <h3>
<span>任务日志</span> <span>任务日志</span>
<span class="selected-name">{{ selectedTaskName }}</span> <span class="selected-name">{{ selectedTaskName }}</span>
<span v-if="isStreaming" class="streaming-indicator">● 实时更新中</span>
</h3> </h3>
<div class="panel-actions">
<el-switch
v-model="autoScroll"
active-text="自动滚动"
class="auto-scroll-switch"
/>
<span class="meta">{{ selectedTaskMeta }}</span> <span class="meta">{{ selectedTaskMeta }}</span>
</div> </div>
<div class="panel-body log-stream"> </div>
<div v-for="(log, index) in logs" :key="index" :class="['task-log-line', log.class]"> <div
<span class="t">{{ log.time }}</span>{{ log.message }} ref="logContainerRef"
class="panel-body log-stream"
@scroll="handleScroll"
>
<!-- 虚拟滚动容器 -->
<div
:style="{ height: `${virtualizer.getTotalSize()}px`, position: 'relative' }"
>
<div
v-for="virtualRow in virtualizer.getVirtualItems()"
:key="String(virtualRow.key)"
:class="['task-log-line', logs[virtualRow.index].class]"
:style="{
position: 'absolute',
top: 0,
left: 0,
width: '100%',
transform: `translateY(${virtualRow.start}px)`,
}"
>
<span class="t">{{ logs[virtualRow.index].time }}</span>{{ logs[virtualRow.index].message }}
</div>
</div> </div>
<div v-if="loadingLogs" class="task-log-line"> <div v-if="loadingLogs" class="task-log-line">
<span class="t">...</span>加载中 <span class="t">...</span>加载中
@@ -72,10 +100,11 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { computed, onMounted, ref, watch } from 'vue' import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
import { taskLogApi, type TaskLogLine, type TaskLogSummary } from '@/api/taskLog' import { taskLogApi, createTaskLogStream, type TaskLogLine, type TaskLogSummary } from '@/api/taskLog'
import { useBusinessLineStore } from '@/stores/businessLine' import { useBusinessLineStore } from '@/stores/businessLine'
import { useBusinessLineMockProfile } from '@/utils/businessLineMock' import { useBusinessLineMockProfile } from '@/utils/businessLineMock'
import { useVirtualizer } from '@tanstack/vue-virtual'
const { currentName } = useBusinessLineMockProfile() const { currentName } = useBusinessLineMockProfile()
const businessLineStore = useBusinessLineStore() const businessLineStore = useBusinessLineStore()
@@ -87,6 +116,18 @@ const logs = ref<TaskLogLine[]>([])
const loadingTasks = ref(false) const loadingTasks = ref(false)
const loadingLogs = ref(false) const loadingLogs = ref(false)
const lastLoadedAt = ref<Date | null>(null) const lastLoadedAt = ref<Date | null>(null)
const isStreaming = ref(false)
let eventSource: EventSource | null = null
const autoScroll = ref(true)
const logContainerRef = ref<HTMLDivElement | null>(null)
// 虚拟滚动配置
const virtualizer = useVirtualizer({
count: logs.value.length,
getScrollElement: () => logContainerRef.value,
estimateSize: () => 20,
overscan: 5,
})
const selectedTask = computed(() => tasks.value.find((task) => task.id === selectedTaskId.value)) const selectedTask = computed(() => tasks.value.find((task) => task.id === selectedTaskId.value))
const selectedTaskName = computed(() => selectedTask.value?.name || '未选择') const selectedTaskName = computed(() => selectedTask.value?.name || '未选择')
@@ -122,6 +163,8 @@ async function loadLogs(taskId: string) {
const data = await taskLogApi.get(taskId) const data = await taskLogApi.get(taskId)
logs.value = data.lines logs.value = data.lines
lastLoadedAt.value = new Date() lastLoadedAt.value = new Date()
// 启动 SSE 流式更新
startStream(taskId)
} catch (error) { } catch (error) {
logs.value = [{ time: formatTime(new Date()), message: error instanceof Error ? error.message : '任务日志加载失败', class: 'err' }] logs.value = [{ time: formatTime(new Date()), message: error instanceof Error ? error.message : '任务日志加载失败', class: 'err' }]
} finally { } finally {
@@ -129,14 +172,99 @@ async function loadLogs(taskId: string) {
} }
} }
function startStream(taskId: string) {
stopStream() // 关闭之前的连接
eventSource = createTaskLogStream(taskId, {
onInit: (lines) => {
logs.value = lines
lastLoadedAt.value = new Date()
scrollToBottom()
},
onUpdate: (newLines) => {
logs.value = [...logs.value, ...newLines]
lastLoadedAt.value = new Date()
scrollToBottom()
},
onFinished: () => {
isStreaming.value = false
},
onError: (error) => {
console.error('SSE error:', error)
isStreaming.value = false
},
})
isStreaming.value = true
}
function stopStream() {
if (eventSource) {
eventSource.close()
eventSource = null
isStreaming.value = false
}
}
function scrollToBottom() {
if (!autoScroll.value) return
nextTick(() => {
if (logContainerRef.value) {
logContainerRef.value.scrollTop = logContainerRef.value.scrollHeight
}
})
}
function handleScroll() {
if (!logContainerRef.value) return
const { scrollTop, scrollHeight, clientHeight } = logContainerRef.value
const distanceFromBottom = scrollHeight - scrollTop - clientHeight
// 距离底部小于 50px 时认为在底部,恢复自动滚动
if (distanceFromBottom < 50) {
autoScroll.value = true
} else if (distanceFromBottom > 100) {
// 用户向上滚动超过 100px 时暂停自动滚动
autoScroll.value = false
}
}
function selectTask(taskId: string) { function selectTask(taskId: string) {
if (selectedTaskId.value === taskId) { if (selectedTaskId.value === taskId) {
return return
} }
stopStream() // 停止之前的流
selectedTaskId.value = taskId selectedTaskId.value = taskId
void loadLogs(taskId) void loadLogs(taskId)
} }
function scrollToBottom() {
if (!autoScroll.value) return
nextTick(() => {
if (logContainerRef.value) {
logContainerRef.value.scrollTop = logContainerRef.value.scrollHeight
}
})
}
function handleScroll() {
if (!logContainerRef.value) return
const { scrollTop, scrollHeight, clientHeight } = logContainerRef.value
const distanceFromBottom = scrollHeight - scrollTop - clientHeight
// 距离底部小于 50px 时认为在底部,恢复自动滚动
if (distanceFromBottom < 50) {
autoScroll.value = true
} else if (distanceFromBottom > 100) {
// 用户向上滚动超过 100px 时暂停自动滚动
autoScroll.value = false
}
}
function refreshCurrent() { function refreshCurrent() {
void loadTasks() void loadTasks()
} }
@@ -155,6 +283,10 @@ watch(
onMounted(() => { onMounted(() => {
void loadTasks() void loadTasks()
}) })
onUnmounted(() => {
stopStream()
})
</script> </script>
<style scoped> <style scoped>
@@ -248,6 +380,7 @@ onMounted(() => {
.task-log-panel .panel-head { .task-log-panel .panel-head {
gap: 14px; gap: 14px;
flex-wrap: wrap;
} }
.task-log-panel .panel-head h3 { .task-log-panel .panel-head h3 {
@@ -257,11 +390,36 @@ onMounted(() => {
gap: 10px; gap: 10px;
} }
.task-log-panel .panel-head .panel-actions {
margin-left: auto;
}
.selected-name { .selected-name {
color: var(--text-dim); color: var(--text-dim);
font-weight: 500; font-weight: 500;
} }
.streaming-indicator {
font-size: 11px;
color: var(--accent);
animation: pulse 2s ease-in-out infinite;
}
@keyframes pulse {
0%, 100% { opacity: 1; }
50% { opacity: 0.5; }
}
.panel-actions {
display: flex;
align-items: center;
gap: 12px;
}
.auto-scroll-switch {
--el-switch-on-color: var(--accent);
}
.log-stream { .log-stream {
max-height: calc(100vh - 210px); max-height: calc(100vh - 210px);
min-height: 520px; min-height: 520px;
-2
View File
@@ -18,8 +18,6 @@ func AuthMiddleware(cfg config.Config) gin.HandlerFunc {
tokenValue := "" tokenValue := ""
if strings.HasPrefix(value, "Bearer ") { if strings.HasPrefix(value, "Bearer ") {
tokenValue = strings.TrimPrefix(value, "Bearer ") tokenValue = strings.TrimPrefix(value, "Bearer ")
} else {
tokenValue = strings.TrimSpace(c.Query("access_token"))
} }
if tokenValue == "" { if tokenValue == "" {
c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "missing bearer token"}) c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "missing bearer token"})
+195
View File
@@ -1,6 +1,7 @@
package handler package handler
import ( import (
"context"
"errors" "errors"
"net/http" "net/http"
"strconv" "strconv"
@@ -350,6 +351,200 @@ func classForOutputLine(line string) string {
} }
} }
// Stream SSE 端点,用于实时推送任务日志。
func (h *TaskLogHandler) Stream(c *gin.Context) {
claims, ok := CurrentClaims(c)
if !ok {
c.JSON(http.StatusUnauthorized, gin.H{"error": "missing current user"})
return
}
taskID := c.Query("task_id")
if taskID == "" {
c.JSON(http.StatusBadRequest, gin.H{"error": "missing task_id parameter"})
return
}
// 设置 SSE 响应头
c.Header("Content-Type", "text/event-stream")
c.Header("Cache-Control", "no-cache")
c.Header("Connection", "keep-alive")
c.Header("X-Accel-Buffering", "no")
ctx := c.Request.Context()
// 发送初始日志
initialLines, taskStatus, err := h.fetchTaskLogLines(ctx, taskID, claims.UserID, claims.IsAdmin)
if err != nil {
c.SSEvent("message", gin.H{"type": "error", "error": err.Error()})
return
}
// 发送初始数据
c.SSEvent("message", gin.H{"type": "init", "lines": initialLines})
c.Writer.Flush()
// 如果任务已完成,直接发送结束事件
if isTerminalStatus(taskStatus) {
c.SSEvent("message", gin.H{"type": "finished"})
c.Writer.Flush()
return
}
// 轮询循环
ticker := time.NewTicker(2 * time.Second)
defer ticker.Stop()
heartbeatTicker := time.NewTicker(15 * time.Second)
defer heartbeatTicker.Stop()
lastLineCount := len(initialLines)
for {
select {
case <-ctx.Done():
return
case <-ticker.C:
lines, status, err := h.fetchTaskLogLines(ctx, taskID, claims.UserID, claims.IsAdmin)
if err != nil {
// 发送错误但不关闭连接
c.SSEvent("message", gin.H{"type": "error", "error": err.Error()})
c.Writer.Flush()
continue
}
// 发送增量日志
if len(lines) > lastLineCount {
newLines := lines[lastLineCount:]
c.SSEvent("message", gin.H{"type": "update", "lines": newLines})
c.Writer.Flush()
lastLineCount = len(lines)
}
// 如果任务完成,发送结束事件
if isTerminalStatus(status) {
c.SSEvent("message", gin.H{"type": "finished"})
c.Writer.Flush()
return
}
case <-heartbeatTicker.C:
// 发送心跳保持连接
c.SSEvent("heartbeat", nil)
c.Writer.Flush()
}
}
}
// fetchTaskLogLines 获取任务的日志行和状态。
func (h *TaskLogHandler) fetchTaskLogLines(ctx context.Context, taskID string, userID uint64, isAdmin bool) ([]taskLogLine, string, error) {
switch {
case strings.HasPrefix(taskID, "awx:"):
return h.fetchAWXLogLines(ctx, strings.TrimPrefix(taskID, "awx:"), userID, isAdmin)
case strings.HasPrefix(taskID, "wayne:publish:"):
return h.fetchWayneLogLines(ctx, taskID, userID, isAdmin)
default:
return nil, "", errors.New("unknown task log source")
}
}
// fetchAWXLogLines 获取 AWX 任务的日志行。
func (h *TaskLogHandler) fetchAWXLogLines(ctx context.Context, taskID string, userID uint64, isAdmin bool) ([]taskLogLine, string, error) {
task, events, err := h.delivery.GetTask(ctx, taskID, userID, isAdmin)
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, "", errors.New("task log not found")
}
if err != nil {
return nil, "", err
}
lines := make([]taskLogLine, 0, len(events)+16)
for _, event := range events {
lines = append(lines, taskLogLine{Time: formatTaskLogTime(event.CreatedAt), Message: "[" + event.ToState + "] " + event.Message, Class: classForTaskStatus(event.ToState)})
}
var execution model.ExecutionJob
if err := h.db.WithContext(ctx).Where("task_id = ?", task.ID).First(&execution).Error; err == nil && execution.ExecutorJobID != "" && execution.ExecutorJobID != "pending" && !strings.HasPrefix(execution.ExecutorJobID, "pending-") {
stdout, stdoutErr := h.delivery.AWXJobStdout(ctx, execution.ExecutorJobID)
if stdoutErr != nil {
lines = append(lines, taskLogLine{Time: formatTaskLogTime(time.Now()), Message: "[awx] stdout fetch failed: " + stdoutErr.Error(), Class: "err"})
} else {
lines = append(lines, splitStdoutLines(stdout)...)
}
}
var rollback model.RollbackJob
if err := h.db.WithContext(ctx).Where("task_id = ?", task.ID).First(&rollback).Error; err == nil && rollback.ExecutorJobID != "" && rollback.ExecutorJobID != "pending" && !strings.HasPrefix(rollback.ExecutorJobID, "pending-") {
stdout, stdoutErr := h.delivery.AWXJobStdout(ctx, rollback.ExecutorJobID)
if stdoutErr != nil {
lines = append(lines, taskLogLine{Time: formatTaskLogTime(time.Now()), Message: "[rollback awx] stdout fetch failed: " + stdoutErr.Error(), Class: "err"})
} else {
lines = append(lines, splitStdoutLines(stdout)...)
}
}
return lines, task.Status, nil
}
// fetchWayneLogLines 获取 Wayne 任务的日志行。
func (h *TaskLogHandler) fetchWayneLogLines(ctx context.Context, id string, userID uint64, isAdmin bool) ([]taskLogLine, string, error) {
resourceID, historyID, ok := parseWaynePublishTaskID(id)
if !ok {
return nil, "", errors.New("invalid Wayne task log id")
}
namespaces, err := h.visibleWayneNamespacesFromCtx(ctx, userID, isAdmin, 0)
if err != nil {
return nil, "", err
}
history, err := h.wayne.GetDeploymentHistory(ctx, namespaces, resourceID, historyID)
if err != nil {
return nil, "", err
}
lines := []taskLogLine{
{Time: formatTaskLogTime(history.CreatedAt), Message: "[wayne] publish history #" + strconv.FormatInt(history.ID, 10), Class: classForWaynePublishStatus(history.Status)},
{Time: formatTaskLogTime(history.CreatedAt), Message: "[deployment] " + history.ResourceName + " resource_id=" + strconv.FormatInt(history.ResourceID, 10), Class: ""},
{Time: formatTaskLogTime(history.CreatedAt), Message: "[cluster] " + history.Cluster + " template_id=" + strconv.FormatInt(history.TemplateID, 10), Class: ""},
{Time: formatTaskLogTime(history.CreatedAt), Message: "[user] " + history.User, Class: ""},
}
if strings.TrimSpace(history.Message) != "" {
lines = append(lines, taskLogLine{Time: formatTaskLogTime(history.CreatedAt), Message: "[message] " + history.Message, Class: classForWaynePublishStatus(history.Status)})
}
statusText := strconv.Itoa(history.Status)
return lines, statusText, nil
}
// visibleWayneNamespacesFromCtx 从 context 获取可见的 Wayne 命名空间。
func (h *TaskLogHandler) visibleWayneNamespacesFromCtx(ctx context.Context, userID uint64, isAdmin bool, businessLineID uint64) ([]model.BusinessLineWayneNamespace, error) {
query := h.db.WithContext(ctx).Order("business_line_id ASC, wayne_namespace_id ASC")
if businessLineID != 0 {
query = query.Where("business_line_id = ?", businessLineID)
}
if !isAdmin {
query = query.Where("business_line_id IN (?)", h.db.Model(&model.BusinessLineUser{}).Select("business_line_id").Where("user_id = ?", userID))
}
var namespaces []model.BusinessLineWayneNamespace
if err := query.Find(&namespaces).Error; err != nil {
return nil, err
}
return namespaces, nil
}
// isTerminalStatus 判断任务状态是否为终态。
func isTerminalStatus(status string) bool {
switch status {
case model.TaskFinished, model.TaskCanceled, model.TaskExecutionFailed,
model.TaskValidationFailed, model.TaskRegisterFailed,
model.TaskRolledBack, model.TaskRollbackFailed, model.TaskRollbackAck:
return true
default:
return false
}
}
func formatTaskLogTime(t time.Time) string { func formatTaskLogTime(t time.Time) string {
if t.IsZero() { if t.IsZero() {
return "" return ""
+1
View File
@@ -166,5 +166,6 @@ func registerAuthServerRoutes(r *gin.Engine, deps Dependencies) {
protected.GET("/machines/overview", machineHandler.Overview) protected.GET("/machines/overview", machineHandler.Overview)
protected.GET("/machines/resources", machineHandler.List) protected.GET("/machines/resources", machineHandler.List)
protected.POST("/machines/sync", machineHandler.Sync) protected.POST("/machines/sync", machineHandler.Sync)
protected.GET("/task-logs/stream", taskLogHandler.Stream)
} }
} }