Compare commits

...

7 Commits

Author SHA1 Message Date
becomer 7a9b49794c chore: retry with correct clone URL
ci/woodpecker/push/build Pipeline was successful
ci/woodpecker/tag/build Pipeline is running
2026-07-01 00:56:01 +08:00
becomer e3f8dc8aac fix: set GOPROXY to goproxy.cn for Go module downloads
ci/woodpecker/push/build Pipeline was successful
ci/woodpecker/tag/build Pipeline is running
proxy.golang.org is not reachable from this server; use goproxy.cn mirror.
2026-07-01 00:39:04 +08:00
becomer 1228c30a75 chore: trigger ci with new forge url config
ci/woodpecker/push/build Pipeline failed
2026-07-01 00:30:25 +08:00
becomer 4762e71308 fix: replace tags filter with branch filter in when clause
ci/woodpecker/push/build Pipeline is running
ci/woodpecker/tag/build Pipeline was canceled
Woodpecker v3 does not support `tags` in the when clause; use `branch`
with glob patterns instead for matching tag events.
2026-07-01 00:02:44 +08:00
becomer 2082ee3e68 ci: support tag-triggered pipelines with versioned Docker images
- Allow triggering on v* tags in addition to pushes to main/master
- Tag Docker images with CI_COMMIT_TAG when triggered by a tag
2026-07-01 00:01:56 +08:00
becomer 10cb7d7ac6 ci: 添加 Woodpecker CI/CD 流水线
- 构建 Docker 镜像并推送
- 自动部署到本地 Docker
- 配置文件和网络管理
2026-06-30 23:51:01 +08:00
sugarBecomer 261153067c ✨ 后端支持统计返回任务ID + 列表按ID筛选
1. TaskStatisticsV2Item 新增 successTaskIds/failTaskIds/pendingTaskIds 字段
2. GetTaskStatisticsV2 返回每日对应的任务ID列表
3. CpTaskListReq 新增 ids 参数,List 方法支持按ID列表筛选
2026-04-24 12:32:54 +08:00
6 changed files with 89 additions and 10 deletions
+38
View File
@@ -0,0 +1,38 @@
when:
- event: push
branch: [main, master]
- event: tag
branch: [v*]
steps:
build-image:
image: docker
commands:
- docker build -t likedream-go:latest .
- docker tag likedream-go:latest likedream-go:${CI_COMMIT_TAG:-${CI_COMMIT_SHA:0:8}}
volumes:
- /var/run/docker.sock:/var/run/docker.sock
deploy:
image: docker
commands: |
# 确保网络存在
docker network create likedream-net 2>/dev/null || true
# 停止并删除旧容器
docker stop likedream-go 2>/dev/null || true
docker rm likedream-go 2>/dev/null || true
# 启动新容器
docker run -d \
--name likedream-go \
--restart unless-stopped \
--network likedream-net \
-p 8091:8091 \
-v /opt/likedream-go/config.toml:/app/config.toml:ro \
likedream-go:latest
# 连接到 captcha 服务所在网络
docker network connect ocr-go_default likedream-go 2>/dev/null || true
volumes:
- /var/run/docker.sock:/var/run/docker.sock
+1
View File
@@ -1,5 +1,6 @@
FROM golang:1.25-alpine AS backend-builder
WORKDIR /build
ENV GOPROXY=https://goproxy.cn,direct
COPY . .
RUN go build -ldflags="-s -w" -o bin/server
+18
View File
@@ -0,0 +1,18 @@
services:
likedream-go:
image: likedream-go:latest
container_name: likedream-go
restart: unless-stopped
ports:
- "8091:8091"
volumes:
- /opt/likedream-go/config.toml:/app/config.toml:ro
networks:
- likedream-net
- ocr-go_default
networks:
likedream-net:
external: true
ocr-go_default:
external: true
+7 -4
View File
@@ -9,10 +9,13 @@ type TaskStatisticsItem struct {
// TaskStatisticsV2Item 每日任务统计项(新版:从日志表按任务id去重)
type TaskStatisticsV2Item struct {
Date string `json:"date"` // 日期 格式:2006-01-02
SuccessTask int `json:"successTask"` // 成功任务数(任务id去重)
FailTask int `json:"failTask"` // 失败任务数(任务id去重)
PendingTask int `json:"pendingTask"` // 待执行任务数(仅当天)
Date string `json:"date"` // 日期 格式:2006-01-02
SuccessTask int `json:"successTask"` // 成功任务数(任务id去重)
FailTask int `json:"failTask"` // 失败任务数(任务id去重)
PendingTask int `json:"pendingTask"` // 待执行任务数(仅当天)
SuccessTaskIds []int64 `json:"successTaskIds,omitempty"` // 成功任务ID列表
FailTaskIds []int64 `json:"failTaskIds,omitempty"` // 失败任务ID列表
PendingTaskIds []int64 `json:"pendingTaskIds,omitempty"` // 待执行任务ID列表(仅当天)
}
// DashboardSummary 首页概览数据(新版)
+1
View File
@@ -24,6 +24,7 @@ type CpTaskListReq struct {
TaskType cptask.TaskType `json:"type"`
Username string `json:"username"`
TaskStatus cptask.TaskStatus `json:"task_status"`
Ids string `json:"ids"`
Page int `json:"page" d:"1"`
Size int `json:"size" d:"10"`
}
+24 -6
View File
@@ -22,6 +22,8 @@ import (
"likedream-goframe/internal/framework/schedule"
"likedream-goframe/internal/service/balance"
"likedream-goframe/internal/utils"
"strconv"
"strings"
"time"
"entgo.io/ent/dialect/sql"
@@ -88,6 +90,18 @@ func (v CpTaskServiceV1) List(ctx context.Context, req *v1.CpTaskListReq) *utils
if req.TaskStatus != "" {
query.Where(cptask.TaskStatusEQ(req.TaskStatus))
}
if req.Ids != "" {
var ids []int64
for _, s := range strings.Split(req.Ids, ",") {
s = strings.TrimSpace(s)
if id, err := strconv.ParseInt(s, 10, 64); err == nil {
ids = append(ids, id)
}
}
if len(ids) > 0 {
query.Where(cptask.IDIn(ids...))
}
}
total := query.CountX(ctx)
var data []*ent.CpTask
if total > 0 {
@@ -409,14 +423,16 @@ func (v CpTaskServiceV1) GetTaskStatisticsV2(ctx context.Context, _ *v1.GetTaskS
ScanX(ctx, &failIds)
item := &v1.TaskStatisticsV2Item{
Date: dateStr,
SuccessTask: len(successIds),
FailTask: len(failIds),
Date: dateStr,
SuccessTask: len(successIds),
FailTask: len(failIds),
SuccessTaskIds: successIds,
FailTaskIds: failIds,
}
// 仅当天查待执行任务数
// 仅当天查待执行任务数及ID列表
if startOfDay.Equal(today) {
item.PendingTask = db2.Global.CpTask.Query().
pendingIds := db2.Global.CpTask.Query().
Where(
cptask.HasSysUserWith(sysuser.ID(user.ID)),
cptask.TaskStatusNEQ(cptask.TaskStatusPause),
@@ -425,7 +441,9 @@ func (v CpTaskServiceV1) GetTaskStatisticsV2(ctx context.Context, _ *v1.GetTaskS
Where(func(s *sql.Selector) {
s.Where(sql.ExprP("frequency > success_count"))
}).
CountX(ctx)
IDsX(ctx)
item.PendingTask = len(pendingIds)
item.PendingTaskIds = pendingIds
}
statistics[6-i] = item