Dev

.github/workflows/cd.yaml

@@ -3,9 +3,15 @@ name: CD
 on:
   push:
     tags: ['v*']
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Image tag (e.g. dev, v0.1.0)'
+        required: true
+        default: 'dev'
 
 env:
-  REGISTRY: ghcr.io/layfz/maas-cloud-api
+  REGISTRY: ghcr.io/maas-cloud-api
 
 jobs:
   build-push:
@@ -15,12 +21,17 @@ jobs:
       packages: write
     strategy:
       matrix:
-        service: [auth, core, billing, syncer, adapter]
+        service: [auth, core]
     steps:
     - uses: actions/checkout@v4
 
     - name: Set version
-      run: echo "VERSION=${GITHUB_REF_NAME}" >> $GITHUB_ENV
+      run: |
+        if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+          echo "VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV
+        else
+          echo "VERSION=${GITHUB_REF_NAME}" >> $GITHUB_ENV
+        fi
 
     - name: Login to GHCR
       uses: docker/login-action@v3
@@ -51,7 +62,12 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set version
-      run: echo "VERSION=${GITHUB_REF_NAME}" >> $GITHUB_ENV
+      run: |
+        if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+          echo "VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV
+        else
+          echo "VERSION=${GITHUB_REF_NAME}" >> $GITHUB_ENV
+        fi
 
     - name: Login to GHCR
       uses: docker/login-action@v3

.gitignore

@@ -41,3 +41,11 @@ docker-compose.dev.yaml
 
 # Generated / temporary
 logo-philosophy.md
+syncer
+/auth
+/billing
+/core
+web/tsconfig.tsbuildinfo
+.agents/status/
+.agents/issues.md
+.agents

Makefile

@@ -6,7 +6,7 @@
 VERSION      ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo "dev")
 COMMIT       ?= $(shell git rev-parse --short HEAD 2>/dev/null || echo "unknown")
 BUILD_TIME   ?= $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
-REGISTRY     ?= ghcr.io/layfz/maas-cloud-api
+REGISTRY     ?= ghcr.io/maas-cloud-api
 SERVICES     := auth core billing syncer adapter
 LDFLAGS      := -X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.buildTime=$(BUILD_TIME)
 

cmd/billing/main.go

@@ -2,16 +2,22 @@ package main
 
 import (
 	"context"
+	"fmt"
 	"log"
+	"net/http"
 	"os"
 	"os/signal"
 	"syscall"
 
 	"github.com/LayFz/maas-cloud-api/internal/billing/consumer"
+	"github.com/LayFz/maas-cloud-api/internal/billing/handler"
+	"github.com/LayFz/maas-cloud-api/internal/billing/server"
 	"github.com/LayFz/maas-cloud-api/internal/pkg/config"
 	"github.com/LayFz/maas-cloud-api/internal/pkg/database"
+	"github.com/LayFz/maas-cloud-api/internal/pkg/middleware"
 	"github.com/LayFz/maas-cloud-api/internal/pkg/mq"
 	appOtel "github.com/LayFz/maas-cloud-api/internal/pkg/otel"
+	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
 )
 
@@ -46,7 +52,19 @@ func main() {
 		log.Fatalf("init redis: %v", err)
 	}
 
-	// 消费用量事件
+	producer := mq.NewProducer(cfg.Kafka.Brokers)
+	defer producer.Close()
+
+	rdb := database.Redis()
+	billingSrv := server.NewBillingServer(cfg, producer, rdb, logger)
+
+	// 启动额度持久化协程
+	go billingSrv.QuotaPersister.Run(ctx)
+
+	// 启动 ClickHouse 批量写入
+	go billingSrv.CHWriter.Run(ctx)
+
+	// 启动 Kafka 消费者
 	usageConsumer := consumer.NewUsageConsumer(cfg, logger)
 	go func() {
 		logger.Info("billing consumer started",
@@ -58,10 +76,37 @@ func main() {
 		}
 	}()
 
+	// 启动 HTTP 服务
+	r := gin.Default()
+	r.Use(middleware.CORS())
+	handler.RegisterRoutes(r, billingSrv)
+	handler.RegisterInternalRoutes(r, billingSrv)
+
+	port := cfg.Server.HTTPPort
+	if port == 0 {
+		port = 8083
+	}
+
+	httpServer := &http.Server{
+		Addr:    fmt.Sprintf(":%d", port),
+		Handler: r,
+	}
+	go func() {
+		logger.Info("billing HTTP server started",
+			zap.Int("port", port),
+			zap.String("version", version),
+		)
+		if err := httpServer.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+			logger.Fatal("serve http", zap.Error(err))
+		}
+	}()
+
 	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
 	<-quit
 
 	logger.Info("shutting down billing service...")
 	cancel()
+	httpServer.Shutdown(context.Background())
+	billingSrv.CHWriter.Close()
 }

cmd/syncer/main.go

@@ -44,7 +44,7 @@ func main() {
 	}
 
 	// Config Syncer: 消费 tenant.events → 同步到 Higress
-	s := syncer.NewSyncer(cfg, logger)
+	s := syncer.NewSyncer(cfg, database.RawDB(), logger)
 	go func() {
 		logger.Info("config syncer started",
 			zap.String("topic", mq.TopicTenantEvents),

configs/config.yaml

@@ -43,6 +43,13 @@ oauth:
     client_id: ""
     client_secret: ""
 
+smtp:
+  host: ""                     # SMTP server, e.g. smtp.gmail.com (empty = dev mode, logs code to stdout)
+  port: 587
+  username: ""
+  password: ""
+  from: "noreply@anyfast.com"
+
 otel:
   endpoint: ""               # 本地开发可不开 OTel
   insecure: true

deploy/docker/Dockerfile

@@ -2,7 +2,7 @@
 # Usage: docker build --build-arg SERVICE=auth -t anyfast/auth:v1.0.0 .
 
 # ============ Build Stage ============
-FROM golang:1.22-alpine AS builder
+FROM golang:1.25-alpine AS builder
 
 ARG SERVICE
 ARG LDFLAGS

deploy/k8s/base/adapter/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: adapter
-        image: ghcr.io/layfz/maas-cloud-api/adapter:latest
+        image: ghcr.io/maas-cloud-api/adapter:latest
         ports:
         - name: http
           containerPort: 8080

deploy/k8s/base/auth/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: auth
-        image: ghcr.io/layfz/maas-cloud-api/auth:latest
+        image: ghcr.io/maas-cloud-api/auth:latest
         ports:
         - name: http
           containerPort: 8080

deploy/k8s/base/billing/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: billing
-        image: ghcr.io/layfz/maas-cloud-api/billing:latest
+        image: ghcr.io/maas-cloud-api/billing:latest
         envFrom:
         - configMapRef:
             name: anyfast-common

deploy/k8s/base/core/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: core
-        image: ghcr.io/layfz/maas-cloud-api/core:latest
+        image: ghcr.io/maas-cloud-api/core:latest
         ports:
         - name: http
           containerPort: 8080

deploy/k8s/base/syncer/deployment.yaml

@@ -18,7 +18,7 @@ spec:
       serviceAccountName: config-syncer  # 需要 K8s API 权限写 CRD
       containers:
       - name: syncer
-        image: ghcr.io/layfz/maas-cloud-api/syncer:latest
+        image: ghcr.io/maas-cloud-api/syncer:latest
         envFrom:
         - configMapRef:
             name: anyfast-common