diff --git a/configs/config.yaml b/configs/config.yaml index b60501e..12e9c93 100644 --- a/configs/config.yaml +++ b/configs/config.yaml @@ -25,3 +25,5 @@ tts: onyx: "zh-CN-YunjianNeural" # 成熟男声 nova: "zh-CN-XiaohanNeural" # 活力女声 shimmer: "zh-CN-XiaomoNeural" # 温柔女声 +openai: + api_key: '' diff --git a/go.mod b/go.mod index a78185a..2c9a495 100644 --- a/go.mod +++ b/go.mod @@ -5,10 +5,27 @@ go 1.22 require ( github.com/google/uuid v1.6.0 github.com/sirupsen/logrus v1.9.3 - gopkg.in/yaml.v3 v3.0.1 + github.com/spf13/viper v1.19.0 ) require ( - github.com/stretchr/testify v1.9.0 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/magiconair/properties v1.8.7 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/pelletier/go-toml/v2 v2.2.2 // indirect + github.com/sagikazarmark/locafero v0.4.0 // indirect + github.com/sagikazarmark/slog-shim v0.1.0 // indirect + github.com/sourcegraph/conc v0.3.0 // indirect + github.com/spf13/afero v1.11.0 // indirect + github.com/spf13/cast v1.6.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/subosito/gotenv v1.6.0 // indirect + go.uber.org/atomic v1.9.0 // indirect + go.uber.org/multierr v1.9.0 // indirect + golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect golang.org/x/sys v0.20.0 // indirect + golang.org/x/text v0.14.0 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 57c0620..44606e4 100644 --- a/go.sum +++ b/go.sum @@ -1,21 +1,77 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= 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/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +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/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= +github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= +github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= +github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= +github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= +github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= +github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= +github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= +github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= +github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= +github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI= +github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= +github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= +go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= +go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= +go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= +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/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= +gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/config/config.go b/internal/config/config.go index d062940..7725bbe 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -2,41 +2,46 @@ package config import ( "fmt" - "os" + "strings" "sync" - "gopkg.in/yaml.v3" + "github.com/spf13/viper" ) // Config 包含应用程序的所有配置 type Config struct { - Server ServerConfig `yaml:"server"` - TTS TTSConfig `yaml:"tts"` + Server ServerConfig `mapstructure:"server"` + TTS TTSConfig `mapstructure:"tts"` + OpenAI OpenAIConfig `mapstructure:"openai"` +} + +// OpenAIConfig 包含OpenAI API配置 +type OpenAIConfig struct { + ApiKey string `mapstructure:"api_key"` } // ServerConfig 包含HTTP服务器配置 type ServerConfig struct { - Port int `yaml:"port"` - ReadTimeout int `yaml:"read_timeout"` // 单位：秒 - WriteTimeout int `yaml:"write_timeout"` // 单位：秒 - BasePath string `yaml:"base_path"` + Port int `mapstructure:"port"` + ReadTimeout int `mapstructure:"read_timeout"` + WriteTimeout int `mapstructure:"write_timeout"` + BasePath string `mapstructure:"base_path"` } // TTSConfig 包含Microsoft TTS API配置 type TTSConfig struct { - APIKey string `yaml:"api_key"` - Region string `yaml:"region"` - DefaultVoice string `yaml:"default_voice"` - DefaultRate string `yaml:"default_rate"` - DefaultPitch string `yaml:"default_pitch"` - DefaultFormat string `yaml:"default_format"` - MaxTextLength int `yaml:"max_text_length"` - RequestTimeout int `yaml:"request_timeout"` // 单位：秒 - MaxConcurrent int `yaml:"max_concurrent"` - SegmentThreshold int `yaml:"segment_threshold"` - MinSentenceLength int `yaml:"min_sentence_length"` - MaxSentenceLength int `yaml:"max_sentence_length"` - VoiceMapping map[string]string `yaml:"voice_mapping"` // OpenAI声音到Azure声音的映射 + Region string `mapstructure:"region"` + DefaultVoice string `mapstructure:"default_voice"` + DefaultRate string `mapstructure:"default_rate"` + DefaultPitch string `mapstructure:"default_pitch"` + DefaultFormat string `mapstructure:"default_format"` + MaxTextLength int `mapstructure:"max_text_length"` + RequestTimeout int `mapstructure:"request_timeout"` + MaxConcurrent int `mapstructure:"max_concurrent"` + SegmentThreshold int `mapstructure:"segment_threshold"` + MinSentenceLength int `mapstructure:"min_sentence_length"` + MaxSentenceLength int `mapstructure:"max_sentence_length"` + VoiceMapping map[string]string `mapstructure:"voice_mapping"` } var ( @@ -48,20 +53,28 @@ var ( func Load(configPath string) (*Config, error) { var err error once.Do(func() { - // 设置默认配置 - setDefaults() + v := viper.New() + + // 配置 Viper + v.SetConfigName("config") + v.SetConfigType("yaml") + v.SetEnvKeyReplacer(strings.NewReplacer(".", "_")) + v.AutomaticEnv() // 自动绑定环境变量 // 从配置文件加载 if configPath != "" { - err = loadFromFile(configPath) - if err != nil { + v.SetConfigFile(configPath) + if err = v.ReadInConfig(); err != nil { err = fmt.Errorf("加载配置文件失败: %w", err) return } } - // 从环境变量覆盖 - overrideFromEnv() + // 将配置绑定到结构体 + if err = v.Unmarshal(&config); err != nil { + err = fmt.Errorf("解析配置失败: %w", err) + return + } }) if err != nil { @@ -71,58 +84,6 @@ func Load(configPath string) (*Config, error) { return &config, nil } -// 设置默认配置值 -func setDefaults() { - config = Config{ - Server: ServerConfig{ - Port: 8080, - ReadTimeout: 30, - WriteTimeout: 30, - BasePath: "", - }, - TTS: TTSConfig{ - DefaultVoice: "zh-CN-XiaoxiaoNeural", - DefaultRate: "0%", - DefaultPitch: "0%", - DefaultFormat: "audio-24khz-48kbitrate-mono-mp3", - MaxTextLength: 5000, - RequestTimeout: 30, - MaxConcurrent: 10, - SegmentThreshold: 500, - MinSentenceLength: 200, - MaxSentenceLength: 300, - VoiceMapping: make(map[string]string), - }, - } -} - -// 从配置文件加载配置 -func loadFromFile(path string) error { - data, err := os.ReadFile(path) - if err != nil { - return err - } - - return yaml.Unmarshal(data, &config) -} - -// 从环境变量中覆盖配置 -func overrideFromEnv() { - if port := os.Getenv("TTS_SERVER_PORT"); port != "" { - fmt.Sscanf(port, "%d", &config.Server.Port) - } - - if apiKey := os.Getenv("TTS_API_KEY"); apiKey != "" { - config.TTS.APIKey = apiKey - } - - if region := os.Getenv("TTS_API_REGION"); region != "" { - config.TTS.Region = region - } - - // 可以添加更多环境变量覆盖 -} - // Get 返回已加载的配置 func Get() *Config { return &config diff --git a/internal/http/middleware/auth.go b/internal/http/middleware/auth.go new file mode 100644 index 0000000..5f43d59 --- /dev/null +++ b/internal/http/middleware/auth.go @@ -0,0 +1,40 @@ +package middleware + +import ( + "net/http" + "strings" +) + +// OpenAIAuth 中间件验证 OpenAI API 请求的令牌 +func OpenAIAuth(apiToken string, next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + // 如果没有配置令牌，跳过验证 + if apiToken == "" { + next.ServeHTTP(w, r) + return + } + + // 获取请求头中的 Authorization + authHeader := r.Header.Get("Authorization") + if authHeader == "" { + http.Error(w, "未提供授权令牌", http.StatusUnauthorized) + return + } + + // 验证格式是否为 "Bearer {token}" + parts := strings.SplitN(authHeader, " ", 2) + if len(parts) != 2 || parts[0] != "Bearer" { + http.Error(w, "授权格式无效", http.StatusUnauthorized) + return + } + + // 验证令牌是否正确 + if parts[1] != apiToken { + http.Error(w, "令牌无效", http.StatusUnauthorized) + return + } + + // 令牌验证通过，继续处理请求 + next.ServeHTTP(w, r) + }) +} diff --git a/internal/http/server/routes.go b/internal/http/server/routes.go index 9a602f6..0bad8ff 100644 --- a/internal/http/server/routes.go +++ b/internal/http/server/routes.go @@ -36,8 +36,13 @@ func SetupRoutes(cfg *config.Config, ttsService tts.Service) (http.Handler, erro // 设置语音列表API路由 mux.HandleFunc("/voices", voicesHandler.HandleVoices) - mux.HandleFunc("/v1/audio/speech", ttsHandler.HandleOpenAITTS) - mux.HandleFunc("/audio/speech", ttsHandler.HandleOpenAITTS) + // 创建OpenAI兼容接口的处理器，添加验证中间件 + openAIHandler := http.HandlerFunc(ttsHandler.HandleOpenAITTS) + authenticatedHandler := middleware.OpenAIAuth(cfg.OpenAI.ApiKey, openAIHandler) + + // 应用OpenAI兼容的路由 + mux.Handle("/v1/audio/speech", authenticatedHandler) + mux.Handle("/audio/speech", authenticatedHandler) // 设置静态文件服务 fs := http.FileServer(http.Dir("./web/static"))