feat: 换到 Gin 主流栈并补齐运维能力

HTTP 用 Gin,配置用 Viper,日志用 zap,数据用 sqlx;保留原有接口与会商行为。
顺带补上就绪探活、请求号、滚动日志、systemd 与 Dockerfile。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
gozerosandCursor committed 2026-11-04 09:51:41 +08:00
1 parent 0c45b86d67
commit bd427b57a1
26 files changed
+1213 -302

No files matched your search

+33 -39
View File
@@ -5,15 +5,21 @@ import (
"encoding/json"
"time"
"github.com/jmoiron/sqlx"
"git.gozeros.com/wsk/eightbf-analysis-go/internal/domain"
)
// JobRepo 会商作业表读写(eba_analysis_job)。大字段整段 JSON 文本存。
// JobRepo 会商作业表读写(eba_analysis_job)。大字段整段 JSON 文本存,不拆列。
//
// 为什么用 sqlx:在标准库连接上多了按列名扫描,SELECT * 换列顺序也不会对错字段。
// 约定:SQL 与 Java 表结构对齐;空字符串写入 NULL,读回来再变成空串。
// 边界:本仓库没有领取锁。两个进程同时扫 queued 会抢同一行。
type JobRepo struct {
DB *sql.DB
DB *sqlx.DB
}
func NewJobRepo(db *sql.DB) *JobRepo {
func NewJobRepo(db *sqlx.DB) *JobRepo {
return &JobRepo{DB: db}
}
@@ -67,51 +73,54 @@ func (r *JobRepo) UpdateProgress(job *domain.AnalysisJob) error {
}
func (r *JobRepo) FindByID(id string) (*domain.AnalysisJob, error) {
rows, err := r.DB.Query(`SELECT * FROM eba_analysis_job WHERE id=?`, id)
rows, err := r.DB.Queryx(`SELECT * FROM eba_analysis_job WHERE id=?`, id)
if err != nil {
return nil, err
}
defer rows.Close()
if !rows.Next() {
return nil, nil
list, err := scanJobs(rows)
if err != nil || len(list) == 0 {
return nil, err
}
return scanJob(rows)
return list[0], nil
}
func (r *JobRepo) FindActiveByTaskID(taskID string) (*domain.AnalysisJob, error) {
if taskID == "" {
return nil, nil
}
rows, err := r.DB.Query(`SELECT * FROM eba_analysis_job WHERE task_id=? AND status IN (?,?,?)
rows, err := r.DB.Queryx(`SELECT * FROM eba_analysis_job WHERE task_id=? AND status IN (?,?,?)
ORDER BY created_at DESC LIMIT 1`,
taskID, domain.StatusQueued, domain.StatusRunning, domain.StatusAwaitingInput)
if err != nil {
return nil, err
}
defer rows.Close()
if !rows.Next() {
return nil, nil
list, err := scanJobs(rows)
if err != nil || len(list) == 0 {
return nil, err
}
return scanJob(rows)
return list[0], nil
}
func (r *JobRepo) FindLatestByTaskID(taskID string) (*domain.AnalysisJob, error) {
if taskID == "" {
return nil, nil
}
rows, err := r.DB.Query(`SELECT * FROM eba_analysis_job WHERE task_id=? ORDER BY created_at DESC LIMIT 1`, taskID)
rows, err := r.DB.Queryx(`SELECT * FROM eba_analysis_job WHERE task_id=? ORDER BY created_at DESC LIMIT 1`, taskID)
if err != nil {
return nil, err
}
defer rows.Close()
if !rows.Next() {
return nil, nil
list, err := scanJobs(rows)
if err != nil || len(list) == 0 {
return nil, err
}
return scanJob(rows)
return list[0], nil
}
func (r *JobRepo) FindActiveJobs() ([]*domain.AnalysisJob, error) {
rows, err := r.DB.Query(`SELECT * FROM eba_analysis_job WHERE status IN (?,?,?) ORDER BY created_at ASC`,
rows, err := r.DB.Queryx(`SELECT * FROM eba_analysis_job WHERE status IN (?,?,?) ORDER BY created_at ASC`,
domain.StatusQueued, domain.StatusRunning, domain.StatusAwaitingInput)
if err != nil {
return nil, err
@@ -121,7 +130,7 @@ func (r *JobRepo) FindActiveJobs() ([]*domain.AnalysisJob, error) {
}
func (r *JobRepo) FindQueuedJobs() ([]*domain.AnalysisJob, error) {
rows, err := r.DB.Query(`SELECT * FROM eba_analysis_job WHERE status=? ORDER BY created_at ASC`, domain.StatusQueued)
rows, err := r.DB.Queryx(`SELECT * FROM eba_analysis_job WHERE status=? ORDER BY created_at ASC`, domain.StatusQueued)
if err != nil {
return nil, err
}
@@ -151,35 +160,20 @@ func (r *JobRepo) IsCancelFlag(id string) (bool, error) {
return v.Valid && v.Int64 == 1, nil
}
func scanJobs(rows *sql.Rows) ([]*domain.AnalysisJob, error) {
func scanJobs(rows *sqlx.Rows) ([]*domain.AnalysisJob, error) {
var out []*domain.AnalysisJob
for rows.Next() {
j, err := scanJob(rows)
if err != nil {
m := map[string]interface{}{}
if err := rows.MapScan(m); err != nil {
return nil, err
}
out = append(out, j)
out = append(out, jobFromMap(m))
}
return out, rows.Err()
}
func scanJob(rows *sql.Rows) (*domain.AnalysisJob, error) {
cols, err := rows.Columns()
if err != nil {
return nil, err
}
vals := make([]interface{}, len(cols))
ptrs := make([]interface{}, len(cols))
for i := range vals {
ptrs[i] = &vals[i]
}
if err := rows.Scan(ptrs...); err != nil {
return nil, err
}
m := map[string]interface{}{}
for i, c := range cols {
m[c] = vals[i]
}
// jobFromMap 按列名组装作业。对话正文存在 chain_json,这是和 Java 表对齐的历史列名,不是链条配置。
func jobFromMap(m map[string]interface{}) *domain.AnalysisJob {
j := &domain.AnalysisJob{}
j.ID = asString(m["id"])
j.RequestID = asString(m["request_id"])
@@ -209,7 +203,7 @@ func scanJob(rows *sql.Rows) (*domain.AnalysisJob, error) {
if t := asTime(m["updated_at"]); t != nil {
j.UpdatedAt = t
}
return j, nil
return j
}
func mustJSON(v interface{}) interface{} {
+10 -2
View File
@@ -1,8 +1,9 @@
package repo
import (
"log"
"strings"
"git.gozeros.com/wsk/eightbf-analysis-go/internal/logging"
)
// ApplySchema 按语句拆开执行;重复索引等可忽略错误不阻断启动。
@@ -15,11 +16,18 @@ func (r *JobRepo) ApplySchema(schemaSQL string) {
strings.Contains(msg, "already exists") {
continue
}
log.Printf("schema 语句失败(已跳过): %v | sql=%.80s…", err, stmt)
logging.L.Warnw("schema 语句失败(已跳过)", "err", err, "sql", trunc(stmt, 80))
}
}
}
func trunc(s string, n int) string {
if len(s) <= n {
return s
}
return s[:n] + "…"
}
func splitSQL(s string) []string {
var out []string
var b strings.Builder