mirror of
https://gitee.com/wanwujie/sub2api
synced 2026-04-05 07:52:13 +08:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
67d028cf50 | ||
|
|
66ba487697 | ||
|
|
8c7875aa4d | ||
|
|
145171464f | ||
|
|
e5aa676853 |
@@ -16,6 +16,14 @@ English | [中文](README_CN.md)
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## Demo
|
||||||
|
|
||||||
|
Try Sub2API online: **https://v2.pincc.ai/**
|
||||||
|
|
||||||
|
| Email | Password |
|
||||||
|
|-------|----------|
|
||||||
|
| admin@sub2api.com | admin123 |
|
||||||
|
|
||||||
## Overview
|
## Overview
|
||||||
|
|
||||||
Sub2API is an AI API gateway platform designed to distribute and manage API quotas from AI product subscriptions (like Claude Code $200/month). Users can access upstream AI services through platform-generated API Keys, while the platform handles authentication, billing, load balancing, and request forwarding.
|
Sub2API is an AI API gateway platform designed to distribute and manage API quotas from AI product subscriptions (like Claude Code $200/month). Users can access upstream AI services through platform-generated API Keys, while the platform handles authentication, billing, load balancing, and request forwarding.
|
||||||
|
|||||||
@@ -16,6 +16,14 @@
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## 在线体验
|
||||||
|
|
||||||
|
体验地址:**https://v2.pincc.ai/**
|
||||||
|
|
||||||
|
| 邮箱 | 密码 |
|
||||||
|
|------|------|
|
||||||
|
| admin@sub2api.com | admin123 |
|
||||||
|
|
||||||
## 项目概述
|
## 项目概述
|
||||||
|
|
||||||
Sub2API 是一个 AI API 网关平台,用于分发和管理 AI 产品订阅(如 Claude Code $200/月)的 API 配额。用户通过平台生成的 API Key 调用上游 AI 服务,平台负责鉴权、计费、负载均衡和请求转发。
|
Sub2API 是一个 AI API 网关平台,用于分发和管理 AI 产品订阅(如 Claude Code $200/月)的 API 配额。用户通过平台生成的 API Key 调用上游 AI 服务,平台负责鉴权、计费、负载均衡和请求转发。
|
||||||
|
|||||||
6
backend/Makefile
Normal file
6
backend/Makefile
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
.PHONY: wire
|
||||||
|
|
||||||
|
wire:
|
||||||
|
@echo "生成 Wire 代码..."
|
||||||
|
@cd cmd/server && go generate
|
||||||
|
@echo "Wire 代码生成完成"
|
||||||
@@ -1,8 +1,11 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
|
//go:generate go run github.com/google/wire/cmd/wire
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
_ "embed"
|
_ "embed"
|
||||||
|
"errors"
|
||||||
"flag"
|
"flag"
|
||||||
"log"
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
@@ -110,78 +113,25 @@ func runSetupServer() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func runMainServer() {
|
func runMainServer() {
|
||||||
// 加载配置
|
|
||||||
cfg, err := config.Load()
|
|
||||||
if err != nil {
|
|
||||||
log.Fatalf("Failed to load config: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// 初始化时区(类似 PHP 的 date_default_timezone_set)
|
|
||||||
if err := timezone.Init(cfg.Timezone); err != nil {
|
|
||||||
log.Fatalf("Failed to initialize timezone: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// 初始化数据库
|
|
||||||
db, err := initDB(cfg)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatalf("Failed to connect to database: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// 初始化Redis
|
|
||||||
rdb := initRedis(cfg)
|
|
||||||
|
|
||||||
// 初始化Repository
|
|
||||||
repos := repository.NewRepositories(db)
|
|
||||||
|
|
||||||
// 初始化Service
|
|
||||||
services := service.NewServices(repos, rdb, cfg)
|
|
||||||
|
|
||||||
// 初始化Handler
|
|
||||||
buildInfo := handler.BuildInfo{
|
buildInfo := handler.BuildInfo{
|
||||||
Version: Version,
|
Version: Version,
|
||||||
BuildType: BuildType,
|
BuildType: BuildType,
|
||||||
}
|
}
|
||||||
handlers := handler.NewHandlers(services, repos, rdb, buildInfo)
|
|
||||||
|
|
||||||
// 设置Gin模式
|
app, err := initializeApplication(buildInfo)
|
||||||
if cfg.Server.Mode == "release" {
|
if err != nil {
|
||||||
gin.SetMode(gin.ReleaseMode)
|
log.Fatalf("Failed to initialize application: %v", err)
|
||||||
}
|
|
||||||
|
|
||||||
// 创建路由
|
|
||||||
r := gin.New()
|
|
||||||
r.Use(gin.Recovery())
|
|
||||||
r.Use(middleware.Logger())
|
|
||||||
r.Use(middleware.CORS())
|
|
||||||
|
|
||||||
// 注册路由
|
|
||||||
registerRoutes(r, handlers, services, repos)
|
|
||||||
|
|
||||||
// Serve embedded frontend if available
|
|
||||||
if web.HasEmbeddedFrontend() {
|
|
||||||
r.Use(web.ServeEmbeddedFrontend())
|
|
||||||
}
|
}
|
||||||
|
defer app.Cleanup()
|
||||||
|
|
||||||
// 启动服务器
|
// 启动服务器
|
||||||
srv := &http.Server{
|
|
||||||
Addr: cfg.Server.Address(),
|
|
||||||
Handler: r,
|
|
||||||
// ReadHeaderTimeout: 读取请求头的超时时间,防止慢速请求头攻击
|
|
||||||
ReadHeaderTimeout: time.Duration(cfg.Server.ReadHeaderTimeout) * time.Second,
|
|
||||||
// IdleTimeout: 空闲连接超时时间,释放不活跃的连接资源
|
|
||||||
IdleTimeout: time.Duration(cfg.Server.IdleTimeout) * time.Second,
|
|
||||||
// 注意:不设置 WriteTimeout,因为流式响应可能持续十几分钟
|
|
||||||
// 不设置 ReadTimeout,因为大请求体可能需要较长时间读取
|
|
||||||
}
|
|
||||||
|
|
||||||
// 优雅关闭
|
|
||||||
go func() {
|
go func() {
|
||||||
if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
|
if err := app.Server.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
|
||||||
log.Fatalf("Failed to start server: %v", err)
|
log.Fatalf("Failed to start server: %v", err)
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
log.Printf("Server started on %s", cfg.Server.Address())
|
log.Printf("Server started on %s", app.Server.Addr)
|
||||||
|
|
||||||
// 等待中断信号
|
// 等待中断信号
|
||||||
quit := make(chan os.Signal, 1)
|
quit := make(chan os.Signal, 1)
|
||||||
@@ -193,7 +143,7 @@ func runMainServer() {
|
|||||||
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
if err := srv.Shutdown(ctx); err != nil {
|
if err := app.Server.Shutdown(ctx); err != nil {
|
||||||
log.Fatalf("Server forced to shutdown: %v", err)
|
log.Fatalf("Server forced to shutdown: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -201,6 +151,11 @@ func runMainServer() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func initDB(cfg *config.Config) (*gorm.DB, error) {
|
func initDB(cfg *config.Config) (*gorm.DB, error) {
|
||||||
|
// 初始化时区(在数据库连接之前,确保时区设置正确)
|
||||||
|
if err := timezone.Init(cfg.Timezone); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
gormConfig := &gorm.Config{}
|
gormConfig := &gorm.Config{}
|
||||||
if cfg.Server.Mode == "debug" {
|
if cfg.Server.Mode == "debug" {
|
||||||
gormConfig.Logger = logger.Default.LogMode(logger.Info)
|
gormConfig.Logger = logger.Default.LogMode(logger.Info)
|
||||||
@@ -272,10 +227,10 @@ func registerRoutes(r *gin.Engine, h *handler.Handlers, s *service.Services, rep
|
|||||||
authenticated.GET("/auth/me", h.Auth.GetCurrentUser)
|
authenticated.GET("/auth/me", h.Auth.GetCurrentUser)
|
||||||
|
|
||||||
// 用户接口
|
// 用户接口
|
||||||
user := authenticated.Group("/user")
|
user := authenticated.Group("/users/me")
|
||||||
{
|
{
|
||||||
user.GET("/profile", h.User.GetProfile)
|
user.GET("", h.User.GetProfile)
|
||||||
user.PUT("/password", h.User.ChangePassword)
|
user.POST("/password", h.User.ChangePassword)
|
||||||
}
|
}
|
||||||
|
|
||||||
// API Key管理
|
// API Key管理
|
||||||
@@ -479,3 +434,34 @@ func registerRoutes(r *gin.Engine, h *handler.Handlers, s *service.Services, rep
|
|||||||
gateway.GET("/usage", h.Gateway.Usage)
|
gateway.GET("/usage", h.Gateway.Usage)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// setupRouter 配置路由器中间件和路由
|
||||||
|
func setupRouter(r *gin.Engine, cfg *config.Config, handlers *handler.Handlers, services *service.Services, repos *repository.Repositories) *gin.Engine {
|
||||||
|
// 应用中间件
|
||||||
|
r.Use(middleware.Logger())
|
||||||
|
r.Use(middleware.CORS())
|
||||||
|
|
||||||
|
// 注册路由
|
||||||
|
registerRoutes(r, handlers, services, repos)
|
||||||
|
|
||||||
|
// Serve embedded frontend if available
|
||||||
|
if web.HasEmbeddedFrontend() {
|
||||||
|
r.Use(web.ServeEmbeddedFrontend())
|
||||||
|
}
|
||||||
|
|
||||||
|
return r
|
||||||
|
}
|
||||||
|
|
||||||
|
// createHTTPServer 创建HTTP服务器
|
||||||
|
func createHTTPServer(cfg *config.Config, router *gin.Engine) *http.Server {
|
||||||
|
return &http.Server{
|
||||||
|
Addr: cfg.Server.Address(),
|
||||||
|
Handler: router,
|
||||||
|
// ReadHeaderTimeout: 读取请求头的超时时间,防止慢速请求头攻击
|
||||||
|
ReadHeaderTimeout: time.Duration(cfg.Server.ReadHeaderTimeout) * time.Second,
|
||||||
|
// IdleTimeout: 空闲连接超时时间,释放不活跃的连接资源
|
||||||
|
IdleTimeout: time.Duration(cfg.Server.IdleTimeout) * time.Second,
|
||||||
|
// 注意:不设置 WriteTimeout,因为流式响应可能持续十几分钟
|
||||||
|
// 不设置 ReadTimeout,因为大请求体可能需要较长时间读取
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
103
backend/cmd/server/wire.go
Normal file
103
backend/cmd/server/wire.go
Normal file
@@ -0,0 +1,103 @@
|
|||||||
|
//go:build wireinject
|
||||||
|
// +build wireinject
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"sub2api/internal/config"
|
||||||
|
"sub2api/internal/handler"
|
||||||
|
"sub2api/internal/repository"
|
||||||
|
"sub2api/internal/service"
|
||||||
|
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/google/wire"
|
||||||
|
"github.com/redis/go-redis/v9"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Application struct {
|
||||||
|
Server *http.Server
|
||||||
|
Cleanup func()
|
||||||
|
}
|
||||||
|
|
||||||
|
func initializeApplication(buildInfo handler.BuildInfo) (*Application, error) {
|
||||||
|
wire.Build(
|
||||||
|
// Config provider
|
||||||
|
provideConfig,
|
||||||
|
|
||||||
|
// Database provider
|
||||||
|
provideDB,
|
||||||
|
|
||||||
|
// Redis provider
|
||||||
|
provideRedis,
|
||||||
|
|
||||||
|
// Repository provider
|
||||||
|
provideRepositories,
|
||||||
|
|
||||||
|
// Service provider
|
||||||
|
provideServices,
|
||||||
|
|
||||||
|
// Handler provider
|
||||||
|
provideHandlers,
|
||||||
|
|
||||||
|
// Router provider
|
||||||
|
provideRouter,
|
||||||
|
|
||||||
|
// HTTP Server provider
|
||||||
|
provideHTTPServer,
|
||||||
|
|
||||||
|
// Cleanup provider
|
||||||
|
provideCleanup,
|
||||||
|
|
||||||
|
// Application provider
|
||||||
|
wire.Struct(new(Application), "Server", "Cleanup"),
|
||||||
|
)
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func provideConfig() (*config.Config, error) {
|
||||||
|
return config.Load()
|
||||||
|
}
|
||||||
|
|
||||||
|
func provideDB(cfg *config.Config) (*gorm.DB, error) {
|
||||||
|
return initDB(cfg)
|
||||||
|
}
|
||||||
|
|
||||||
|
func provideRedis(cfg *config.Config) *redis.Client {
|
||||||
|
return initRedis(cfg)
|
||||||
|
}
|
||||||
|
|
||||||
|
func provideRepositories(db *gorm.DB) *repository.Repositories {
|
||||||
|
return repository.NewRepositories(db)
|
||||||
|
}
|
||||||
|
|
||||||
|
func provideServices(repos *repository.Repositories, rdb *redis.Client, cfg *config.Config) *service.Services {
|
||||||
|
return service.NewServices(repos, rdb, cfg)
|
||||||
|
}
|
||||||
|
|
||||||
|
func provideHandlers(services *service.Services, repos *repository.Repositories, rdb *redis.Client, buildInfo handler.BuildInfo) *handler.Handlers {
|
||||||
|
return handler.NewHandlers(services, repos, rdb, buildInfo)
|
||||||
|
}
|
||||||
|
|
||||||
|
func provideRouter(cfg *config.Config, handlers *handler.Handlers, services *service.Services, repos *repository.Repositories) *gin.Engine {
|
||||||
|
if cfg.Server.Mode == "release" {
|
||||||
|
gin.SetMode(gin.ReleaseMode)
|
||||||
|
}
|
||||||
|
|
||||||
|
r := gin.New()
|
||||||
|
r.Use(gin.Recovery())
|
||||||
|
|
||||||
|
return setupRouter(r, cfg, handlers, services, repos)
|
||||||
|
}
|
||||||
|
|
||||||
|
func provideHTTPServer(cfg *config.Config, router *gin.Engine) *http.Server {
|
||||||
|
return createHTTPServer(cfg, router)
|
||||||
|
}
|
||||||
|
|
||||||
|
func provideCleanup() func() {
|
||||||
|
return func() {
|
||||||
|
// @todo
|
||||||
|
}
|
||||||
|
}
|
||||||
99
backend/cmd/server/wire_gen.go
Normal file
99
backend/cmd/server/wire_gen.go
Normal file
@@ -0,0 +1,99 @@
|
|||||||
|
// Code generated by Wire. DO NOT EDIT.
|
||||||
|
|
||||||
|
//go:generate go run -mod=mod github.com/google/wire/cmd/wire
|
||||||
|
//go:build !wireinject
|
||||||
|
// +build !wireinject
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/redis/go-redis/v9"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
"net/http"
|
||||||
|
"sub2api/internal/config"
|
||||||
|
"sub2api/internal/handler"
|
||||||
|
"sub2api/internal/repository"
|
||||||
|
"sub2api/internal/service"
|
||||||
|
)
|
||||||
|
|
||||||
|
import (
|
||||||
|
_ "embed"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Injectors from wire.go:
|
||||||
|
|
||||||
|
func initializeApplication(buildInfo handler.BuildInfo) (*Application, error) {
|
||||||
|
config, err := provideConfig()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
db, err := provideDB(config)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
repositories := provideRepositories(db)
|
||||||
|
client := provideRedis(config)
|
||||||
|
services := provideServices(repositories, client, config)
|
||||||
|
handlers := provideHandlers(services, repositories, client, buildInfo)
|
||||||
|
engine := provideRouter(config, handlers, services, repositories)
|
||||||
|
server := provideHTTPServer(config, engine)
|
||||||
|
v := provideCleanup()
|
||||||
|
application := &Application{
|
||||||
|
Server: server,
|
||||||
|
Cleanup: v,
|
||||||
|
}
|
||||||
|
return application, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// wire.go:
|
||||||
|
|
||||||
|
type Application struct {
|
||||||
|
Server *http.Server
|
||||||
|
Cleanup func()
|
||||||
|
}
|
||||||
|
|
||||||
|
func provideConfig() (*config.Config, error) {
|
||||||
|
return config.Load()
|
||||||
|
}
|
||||||
|
|
||||||
|
func provideDB(cfg *config.Config) (*gorm.DB, error) {
|
||||||
|
return initDB(cfg)
|
||||||
|
}
|
||||||
|
|
||||||
|
func provideRedis(cfg *config.Config) *redis.Client {
|
||||||
|
return initRedis(cfg)
|
||||||
|
}
|
||||||
|
|
||||||
|
func provideRepositories(db *gorm.DB) *repository.Repositories {
|
||||||
|
return repository.NewRepositories(db)
|
||||||
|
}
|
||||||
|
|
||||||
|
func provideServices(repos *repository.Repositories, rdb *redis.Client, cfg *config.Config) *service.Services {
|
||||||
|
return service.NewServices(repos, rdb, cfg)
|
||||||
|
}
|
||||||
|
|
||||||
|
func provideHandlers(services *service.Services, repos *repository.Repositories, rdb *redis.Client, buildInfo handler.BuildInfo) *handler.Handlers {
|
||||||
|
return handler.NewHandlers(services, repos, rdb, buildInfo)
|
||||||
|
}
|
||||||
|
|
||||||
|
func provideRouter(cfg *config.Config, handlers *handler.Handlers, services *service.Services, repos *repository.Repositories) *gin.Engine {
|
||||||
|
if cfg.Server.Mode == "release" {
|
||||||
|
gin.SetMode(gin.ReleaseMode)
|
||||||
|
}
|
||||||
|
|
||||||
|
r := gin.New()
|
||||||
|
r.Use(gin.Recovery())
|
||||||
|
|
||||||
|
return setupRouter(r, cfg, handlers, services, repos)
|
||||||
|
}
|
||||||
|
|
||||||
|
func provideHTTPServer(cfg *config.Config, router *gin.Engine) *http.Server {
|
||||||
|
return createHTTPServer(cfg, router)
|
||||||
|
}
|
||||||
|
|
||||||
|
func provideCleanup() func() {
|
||||||
|
return func() {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,6 +13,7 @@ require (
|
|||||||
github.com/redis/go-redis/v9 v9.3.0
|
github.com/redis/go-redis/v9 v9.3.0
|
||||||
github.com/spf13/viper v1.18.2
|
github.com/spf13/viper v1.18.2
|
||||||
golang.org/x/crypto v0.44.0
|
golang.org/x/crypto v0.44.0
|
||||||
|
golang.org/x/net v0.47.0
|
||||||
golang.org/x/term v0.37.0
|
golang.org/x/term v0.37.0
|
||||||
gopkg.in/yaml.v3 v3.0.1
|
gopkg.in/yaml.v3 v3.0.1
|
||||||
gorm.io/driver/postgres v1.5.4
|
gorm.io/driver/postgres v1.5.4
|
||||||
@@ -33,6 +34,8 @@ require (
|
|||||||
github.com/go-playground/validator/v10 v10.14.0 // indirect
|
github.com/go-playground/validator/v10 v10.14.0 // indirect
|
||||||
github.com/goccy/go-json v0.10.2 // indirect
|
github.com/goccy/go-json v0.10.2 // indirect
|
||||||
github.com/google/go-querystring v1.1.0 // indirect
|
github.com/google/go-querystring v1.1.0 // indirect
|
||||||
|
github.com/google/subcommands v1.2.0 // indirect
|
||||||
|
github.com/google/wire v0.7.0 // indirect
|
||||||
github.com/hashicorp/hcl v1.0.0 // indirect
|
github.com/hashicorp/hcl v1.0.0 // indirect
|
||||||
github.com/icholy/digest v1.1.0 // indirect
|
github.com/icholy/digest v1.1.0 // indirect
|
||||||
github.com/jackc/pgpassfile v1.0.0 // indirect
|
github.com/jackc/pgpassfile v1.0.0 // indirect
|
||||||
@@ -50,6 +53,7 @@ require (
|
|||||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
||||||
github.com/modern-go/reflect2 v1.0.2 // indirect
|
github.com/modern-go/reflect2 v1.0.2 // indirect
|
||||||
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
|
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
|
||||||
|
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
|
||||||
github.com/quic-go/qpack v0.5.1 // indirect
|
github.com/quic-go/qpack v0.5.1 // indirect
|
||||||
github.com/quic-go/quic-go v0.56.0 // indirect
|
github.com/quic-go/quic-go v0.56.0 // indirect
|
||||||
github.com/refraction-networking/utls v1.8.1 // indirect
|
github.com/refraction-networking/utls v1.8.1 // indirect
|
||||||
@@ -66,9 +70,11 @@ require (
|
|||||||
go.uber.org/multierr v1.9.0 // indirect
|
go.uber.org/multierr v1.9.0 // indirect
|
||||||
golang.org/x/arch v0.3.0 // indirect
|
golang.org/x/arch v0.3.0 // indirect
|
||||||
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
|
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
|
||||||
golang.org/x/net v0.47.0 // indirect
|
golang.org/x/mod v0.29.0 // indirect
|
||||||
|
golang.org/x/sync v0.18.0 // indirect
|
||||||
golang.org/x/sys v0.38.0 // indirect
|
golang.org/x/sys v0.38.0 // indirect
|
||||||
golang.org/x/text v0.31.0 // indirect
|
golang.org/x/text v0.31.0 // indirect
|
||||||
|
golang.org/x/tools v0.38.0 // indirect
|
||||||
google.golang.org/protobuf v1.31.0 // indirect
|
google.golang.org/protobuf v1.31.0 // indirect
|
||||||
gopkg.in/ini.v1 v1.67.0 // indirect
|
gopkg.in/ini.v1 v1.67.0 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -48,8 +48,12 @@ github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX
|
|||||||
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
|
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
|
||||||
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
|
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
|
||||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||||
|
github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN9oE=
|
||||||
|
github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
|
||||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
|
github.com/google/wire v0.7.0 h1:JxUKI6+CVBgCO2WToKy/nQk0sS+amI9z9EjVmdaocj4=
|
||||||
|
github.com/google/wire v0.7.0/go.mod h1:n6YbUQD9cPKTnHXEBN2DXlOp/mVADhVErcMFb0v3J18=
|
||||||
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
|
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
|
||||||
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
|
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
|
||||||
github.com/icholy/digest v1.1.0 h1:HfGg9Irj7i+IX1o1QAmPfIBNu/Q5A5Tu3n/MED9k9H4=
|
github.com/icholy/digest v1.1.0 h1:HfGg9Irj7i+IX1o1QAmPfIBNu/Q5A5Tu3n/MED9k9H4=
|
||||||
@@ -154,8 +158,12 @@ golang.org/x/crypto v0.44.0 h1:A97SsFvM3AIwEEmTBiaxPPTYpDC47w720rdiiUvgoAU=
|
|||||||
golang.org/x/crypto v0.44.0/go.mod h1:013i+Nw79BMiQiMsOPcVCB5ZIJbYkerPrGnOa00tvmc=
|
golang.org/x/crypto v0.44.0/go.mod h1:013i+Nw79BMiQiMsOPcVCB5ZIJbYkerPrGnOa00tvmc=
|
||||||
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
|
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
|
||||||
golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
|
golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
|
||||||
|
golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
|
||||||
|
golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
|
||||||
golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
|
golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
|
||||||
golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
|
golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
|
||||||
|
golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
|
||||||
|
golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
|
||||||
golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
|
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
|
||||||
@@ -166,6 +174,8 @@ golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
|
|||||||
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
|
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
|
||||||
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
|
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
|
||||||
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
|
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
|
||||||
|
golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
|
||||||
|
golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
|
||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
||||||
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
|
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
|
||||||
|
|||||||
8
backend/tools.go
Normal file
8
backend/tools.go
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
//go:build tools
|
||||||
|
// +build tools
|
||||||
|
|
||||||
|
package tools
|
||||||
|
|
||||||
|
import (
|
||||||
|
_ "github.com/google/wire/cmd/wire"
|
||||||
|
)
|
||||||
@@ -12,7 +12,8 @@
|
|||||||
]"
|
]"
|
||||||
:title="hasUpdate ? 'New version available' : 'Up to date'"
|
:title="hasUpdate ? 'New version available' : 'Up to date'"
|
||||||
>
|
>
|
||||||
<span class="font-medium">v{{ currentVersion }}</span>
|
<span v-if="currentVersion" class="font-medium">v{{ currentVersion }}</span>
|
||||||
|
<span v-else class="font-medium w-12 h-3 bg-gray-200 dark:bg-dark-600 rounded animate-pulse"></span>
|
||||||
<!-- Update indicator -->
|
<!-- Update indicator -->
|
||||||
<span v-if="hasUpdate" class="relative flex h-2 w-2">
|
<span v-if="hasUpdate" class="relative flex h-2 w-2">
|
||||||
<span class="animate-ping absolute inline-flex h-full w-full rounded-full bg-amber-400 opacity-75"></span>
|
<span class="animate-ping absolute inline-flex h-full w-full rounded-full bg-amber-400 opacity-75"></span>
|
||||||
@@ -56,7 +57,8 @@
|
|||||||
<!-- Version display - centered and prominent -->
|
<!-- Version display - centered and prominent -->
|
||||||
<div class="text-center mb-4">
|
<div class="text-center mb-4">
|
||||||
<div class="inline-flex items-center gap-2">
|
<div class="inline-flex items-center gap-2">
|
||||||
<span class="text-2xl font-bold text-gray-900 dark:text-white">v{{ currentVersion }}</span>
|
<span v-if="currentVersion" class="text-2xl font-bold text-gray-900 dark:text-white">v{{ currentVersion }}</span>
|
||||||
|
<span v-else class="text-2xl font-bold text-gray-400 dark:text-dark-500">--</span>
|
||||||
<!-- Show check mark when up to date -->
|
<!-- Show check mark when up to date -->
|
||||||
<span v-if="!hasUpdate" class="flex items-center justify-center w-5 h-5 rounded-full bg-green-100 dark:bg-green-900/30">
|
<span v-if="!hasUpdate" class="flex items-center justify-center w-5 h-5 rounded-full bg-green-100 dark:bg-green-900/30">
|
||||||
<svg class="w-3 h-3 text-green-600 dark:text-green-400" fill="currentColor" viewBox="0 0 20 20">
|
<svg class="w-3 h-3 text-green-600 dark:text-green-400" fill="currentColor" viewBox="0 0 20 20">
|
||||||
@@ -233,8 +235,8 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, computed, onMounted, onBeforeUnmount } from 'vue';
|
import { ref, computed, onMounted, onBeforeUnmount } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useAuthStore } from '@/stores';
|
import { useAuthStore, useAppStore } from '@/stores';
|
||||||
import { checkUpdates, performUpdate, restartService, type VersionInfo, type ReleaseInfo } from '@/api/admin/system';
|
import { performUpdate, restartService } from '@/api/admin/system';
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
||||||
@@ -243,20 +245,22 @@ const props = defineProps<{
|
|||||||
}>();
|
}>();
|
||||||
|
|
||||||
const authStore = useAuthStore();
|
const authStore = useAuthStore();
|
||||||
|
const appStore = useAppStore();
|
||||||
|
|
||||||
const isAdmin = computed(() => authStore.isAdmin);
|
const isAdmin = computed(() => authStore.isAdmin);
|
||||||
|
|
||||||
const loading = ref(false);
|
|
||||||
const dropdownOpen = ref(false);
|
const dropdownOpen = ref(false);
|
||||||
const dropdownRef = ref<HTMLElement | null>(null);
|
const dropdownRef = ref<HTMLElement | null>(null);
|
||||||
|
|
||||||
const currentVersion = ref('0.1.0');
|
// Use store's cached version state
|
||||||
const latestVersion = ref('0.1.0');
|
const loading = computed(() => appStore.versionLoading);
|
||||||
const hasUpdate = ref(false);
|
const currentVersion = computed(() => appStore.currentVersion || props.version || '');
|
||||||
const releaseInfo = ref<ReleaseInfo | null>(null);
|
const latestVersion = computed(() => appStore.latestVersion);
|
||||||
const buildType = ref('source'); // "source" or "release"
|
const hasUpdate = computed(() => appStore.hasUpdate);
|
||||||
|
const releaseInfo = computed(() => appStore.releaseInfo);
|
||||||
|
const buildType = computed(() => appStore.buildType);
|
||||||
|
|
||||||
// Update process states
|
// Update process states (local to this component)
|
||||||
const updating = ref(false);
|
const updating = ref(false);
|
||||||
const restarting = ref(false);
|
const restarting = ref(false);
|
||||||
const needRestart = ref(false);
|
const needRestart = ref(false);
|
||||||
@@ -277,24 +281,12 @@ function closeDropdown() {
|
|||||||
async function refreshVersion(force = true) {
|
async function refreshVersion(force = true) {
|
||||||
if (!isAdmin.value) return;
|
if (!isAdmin.value) return;
|
||||||
|
|
||||||
loading.value = true;
|
// Reset update states when refreshing
|
||||||
try {
|
updateError.value = '';
|
||||||
const data: VersionInfo = await checkUpdates(force);
|
updateSuccess.value = false;
|
||||||
currentVersion.value = data.current_version;
|
needRestart.value = false;
|
||||||
latestVersion.value = data.latest_version;
|
|
||||||
buildType.value = data.build_type || 'source';
|
await appStore.fetchVersion(force);
|
||||||
// Show update indicator for all build types
|
|
||||||
hasUpdate.value = data.has_update;
|
|
||||||
releaseInfo.value = data.release_info || null;
|
|
||||||
// Reset update states when refreshing
|
|
||||||
updateError.value = '';
|
|
||||||
updateSuccess.value = false;
|
|
||||||
needRestart.value = false;
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to check updates:', error);
|
|
||||||
} finally {
|
|
||||||
loading.value = false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function handleUpdate() {
|
async function handleUpdate() {
|
||||||
@@ -308,7 +300,8 @@ async function handleUpdate() {
|
|||||||
const result = await performUpdate();
|
const result = await performUpdate();
|
||||||
updateSuccess.value = true;
|
updateSuccess.value = true;
|
||||||
needRestart.value = result.need_restart;
|
needRestart.value = result.need_restart;
|
||||||
hasUpdate.value = false;
|
// Clear version cache to reflect update completed
|
||||||
|
appStore.clearVersionCache();
|
||||||
} catch (error: unknown) {
|
} catch (error: unknown) {
|
||||||
const err = error as { response?: { data?: { message?: string } }; message?: string };
|
const err = error as { response?: { data?: { message?: string } }; message?: string };
|
||||||
updateError.value = err.response?.data?.message || err.message || t('version.updateFailed');
|
updateError.value = err.response?.data?.message || err.message || t('version.updateFailed');
|
||||||
@@ -346,9 +339,8 @@ function handleClickOutside(event: MouseEvent) {
|
|||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
if (isAdmin.value) {
|
if (isAdmin.value) {
|
||||||
refreshVersion(false);
|
// Use cached version if available, otherwise fetch
|
||||||
} else if (props.version) {
|
appStore.fetchVersion(false);
|
||||||
currentVersion.value = props.version;
|
|
||||||
}
|
}
|
||||||
document.addEventListener('click', handleClickOutside);
|
document.addEventListener('click', handleClickOutside);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -108,7 +108,7 @@
|
|||||||
</router-link>
|
</router-link>
|
||||||
|
|
||||||
<a
|
<a
|
||||||
href="https://github.com/fangyuan99/sub2api"
|
href="https://github.com/Wei-Shaw/sub2api"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
rel="noopener noreferrer"
|
rel="noopener noreferrer"
|
||||||
@click="closeDropdown"
|
@click="closeDropdown"
|
||||||
|
|||||||
@@ -305,9 +305,10 @@ router.beforeEach((to, _from, next) => {
|
|||||||
|
|
||||||
// If route doesn't require auth, allow access
|
// If route doesn't require auth, allow access
|
||||||
if (!requiresAuth) {
|
if (!requiresAuth) {
|
||||||
// If already authenticated and trying to access login/register, redirect to dashboard
|
// If already authenticated and trying to access login/register, redirect to appropriate dashboard
|
||||||
if (authStore.isAuthenticated && (to.path === '/login' || to.path === '/register')) {
|
if (authStore.isAuthenticated && (to.path === '/login' || to.path === '/register')) {
|
||||||
next('/dashboard');
|
// Admin users go to admin dashboard, regular users go to user dashboard
|
||||||
|
next(authStore.isAdmin ? '/admin/dashboard' : '/dashboard');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
next();
|
next();
|
||||||
|
|||||||
@@ -6,14 +6,24 @@
|
|||||||
import { defineStore } from 'pinia';
|
import { defineStore } from 'pinia';
|
||||||
import { ref, computed } from 'vue';
|
import { ref, computed } from 'vue';
|
||||||
import type { Toast, ToastType } from '@/types';
|
import type { Toast, ToastType } from '@/types';
|
||||||
|
import { checkUpdates as checkUpdatesAPI, type VersionInfo, type ReleaseInfo } from '@/api/admin/system';
|
||||||
|
|
||||||
export const useAppStore = defineStore('app', () => {
|
export const useAppStore = defineStore('app', () => {
|
||||||
// ==================== State ====================
|
// ==================== State ====================
|
||||||
|
|
||||||
const sidebarCollapsed = ref<boolean>(false);
|
const sidebarCollapsed = ref<boolean>(false);
|
||||||
const loading = ref<boolean>(false);
|
const loading = ref<boolean>(false);
|
||||||
const toasts = ref<Toast[]>([]);
|
const toasts = ref<Toast[]>([]);
|
||||||
|
|
||||||
|
// Version cache state
|
||||||
|
const versionLoaded = ref<boolean>(false);
|
||||||
|
const versionLoading = ref<boolean>(false);
|
||||||
|
const currentVersion = ref<string>('');
|
||||||
|
const latestVersion = ref<string>('');
|
||||||
|
const hasUpdate = ref<boolean>(false);
|
||||||
|
const buildType = ref<string>('source');
|
||||||
|
const releaseInfo = ref<ReleaseInfo | null>(null);
|
||||||
|
|
||||||
// Auto-incrementing ID for toasts
|
// Auto-incrementing ID for toasts
|
||||||
let toastIdCounter = 0;
|
let toastIdCounter = 0;
|
||||||
|
|
||||||
@@ -192,6 +202,56 @@ export const useAppStore = defineStore('app', () => {
|
|||||||
toasts.value = [];
|
toasts.value = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ==================== Version Management ====================
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fetch version info (uses cache unless force=true)
|
||||||
|
* @param force - Force refresh from API
|
||||||
|
*/
|
||||||
|
async function fetchVersion(force = false): Promise<VersionInfo | null> {
|
||||||
|
// Return cached data if available and not forcing refresh
|
||||||
|
if (versionLoaded.value && !force) {
|
||||||
|
return {
|
||||||
|
current_version: currentVersion.value,
|
||||||
|
latest_version: latestVersion.value,
|
||||||
|
has_update: hasUpdate.value,
|
||||||
|
build_type: buildType.value,
|
||||||
|
release_info: releaseInfo.value || undefined,
|
||||||
|
cached: true,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Prevent duplicate requests
|
||||||
|
if (versionLoading.value) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
versionLoading.value = true;
|
||||||
|
try {
|
||||||
|
const data = await checkUpdatesAPI(force);
|
||||||
|
currentVersion.value = data.current_version;
|
||||||
|
latestVersion.value = data.latest_version;
|
||||||
|
hasUpdate.value = data.has_update;
|
||||||
|
buildType.value = data.build_type || 'source';
|
||||||
|
releaseInfo.value = data.release_info || null;
|
||||||
|
versionLoaded.value = true;
|
||||||
|
return data;
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to fetch version:', error);
|
||||||
|
return null;
|
||||||
|
} finally {
|
||||||
|
versionLoading.value = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clear version cache (e.g., after update)
|
||||||
|
*/
|
||||||
|
function clearVersionCache(): void {
|
||||||
|
versionLoaded.value = false;
|
||||||
|
hasUpdate.value = false;
|
||||||
|
}
|
||||||
|
|
||||||
// ==================== Return Store API ====================
|
// ==================== Return Store API ====================
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -199,10 +259,19 @@ export const useAppStore = defineStore('app', () => {
|
|||||||
sidebarCollapsed,
|
sidebarCollapsed,
|
||||||
loading,
|
loading,
|
||||||
toasts,
|
toasts,
|
||||||
|
|
||||||
|
// Version state
|
||||||
|
versionLoaded,
|
||||||
|
versionLoading,
|
||||||
|
currentVersion,
|
||||||
|
latestVersion,
|
||||||
|
hasUpdate,
|
||||||
|
buildType,
|
||||||
|
releaseInfo,
|
||||||
|
|
||||||
// Computed
|
// Computed
|
||||||
hasActiveToasts,
|
hasActiveToasts,
|
||||||
|
|
||||||
// Actions
|
// Actions
|
||||||
toggleSidebar,
|
toggleSidebar,
|
||||||
setSidebarCollapsed,
|
setSidebarCollapsed,
|
||||||
@@ -217,5 +286,9 @@ export const useAppStore = defineStore('app', () => {
|
|||||||
withLoading,
|
withLoading,
|
||||||
withLoadingAndError,
|
withLoadingAndError,
|
||||||
reset,
|
reset,
|
||||||
|
|
||||||
|
// Version actions
|
||||||
|
fetchVersion,
|
||||||
|
clearVersionCache,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -282,7 +282,7 @@ const siteSubtitle = ref('AI API Gateway Platform');
|
|||||||
const isDark = ref(document.documentElement.classList.contains('dark'));
|
const isDark = ref(document.documentElement.classList.contains('dark'));
|
||||||
|
|
||||||
// GitHub URL
|
// GitHub URL
|
||||||
const githubUrl = 'https://github.com/fangyuan99/sub2api';
|
const githubUrl = 'https://github.com/Wei-Shaw/sub2api';
|
||||||
|
|
||||||
// Auth state
|
// Auth state
|
||||||
const isAuthenticated = computed(() => authStore.isAuthenticated);
|
const isAuthenticated = computed(() => authStore.isAuthenticated);
|
||||||
|
|||||||
@@ -406,7 +406,7 @@ const lineOptions = computed(() => ({
|
|||||||
|
|
||||||
// Model chart data
|
// Model chart data
|
||||||
const modelChartData = computed(() => {
|
const modelChartData = computed(() => {
|
||||||
if (!modelStats.value.length) return null
|
if (!modelStats.value?.length) return null
|
||||||
|
|
||||||
const colors = [
|
const colors = [
|
||||||
'#3b82f6', '#10b981', '#f59e0b', '#ef4444', '#8b5cf6',
|
'#3b82f6', '#10b981', '#f59e0b', '#ef4444', '#8b5cf6',
|
||||||
@@ -425,7 +425,7 @@ const modelChartData = computed(() => {
|
|||||||
|
|
||||||
// Trend chart data
|
// Trend chart data
|
||||||
const trendChartData = computed(() => {
|
const trendChartData = computed(() => {
|
||||||
if (!trendData.value.length) return null
|
if (!trendData.value?.length) return null
|
||||||
|
|
||||||
return {
|
return {
|
||||||
labels: trendData.value.map(d => d.date),
|
labels: trendData.value.map(d => d.date),
|
||||||
@@ -460,7 +460,7 @@ const trendChartData = computed(() => {
|
|||||||
|
|
||||||
// User trend chart data
|
// User trend chart data
|
||||||
const userTrendChartData = computed(() => {
|
const userTrendChartData = computed(() => {
|
||||||
if (!userTrend.value.length) return null
|
if (!userTrend.value?.length) return null
|
||||||
|
|
||||||
// Group by user
|
// Group by user
|
||||||
const userGroups = new Map<string, { name: string; data: Map<string, number> }>()
|
const userGroups = new Map<string, { name: string; data: Map<string, number> }>()
|
||||||
|
|||||||
@@ -531,7 +531,7 @@ const lineOptions = computed(() => ({
|
|||||||
|
|
||||||
// Model chart data
|
// Model chart data
|
||||||
const modelChartData = computed(() => {
|
const modelChartData = computed(() => {
|
||||||
if (!modelStats.value.length) return null
|
if (!modelStats.value?.length) return null
|
||||||
|
|
||||||
const colors = [
|
const colors = [
|
||||||
'#3b82f6', '#10b981', '#f59e0b', '#ef4444', '#8b5cf6',
|
'#3b82f6', '#10b981', '#f59e0b', '#ef4444', '#8b5cf6',
|
||||||
@@ -550,7 +550,7 @@ const modelChartData = computed(() => {
|
|||||||
|
|
||||||
// Trend chart data
|
// Trend chart data
|
||||||
const trendChartData = computed(() => {
|
const trendChartData = computed(() => {
|
||||||
if (!trendData.value.length) return null
|
if (!trendData.value?.length) return null
|
||||||
|
|
||||||
return {
|
return {
|
||||||
labels: trendData.value.map(d => d.date),
|
labels: trendData.value.map(d => d.date),
|
||||||
@@ -688,8 +688,9 @@ const loadChartData = async () => {
|
|||||||
usageAPI.getDashboardModels({ start_date: startDate.value, end_date: endDate.value }),
|
usageAPI.getDashboardModels({ start_date: startDate.value, end_date: endDate.value }),
|
||||||
])
|
])
|
||||||
|
|
||||||
trendData.value = trendResponse.trend
|
// Ensure we always have arrays, even if API returns null
|
||||||
modelStats.value = modelResponse.models
|
trendData.value = trendResponse.trend || []
|
||||||
|
modelStats.value = modelResponse.models || []
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Error loading chart data:', error)
|
console.error('Error loading chart data:', error)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user