diff --git a/api/handler/admin/config_handler.go b/api/handler/admin/config_handler.go index 303632a0..abf895f7 100644 --- a/api/handler/admin/config_handler.go +++ b/api/handler/admin/config_handler.go @@ -11,24 +11,21 @@ import ( "geekai/core" "geekai/core/types" "geekai/handler" - "geekai/service" "geekai/store" "geekai/store/model" "geekai/utils" "geekai/utils/resp" "github.com/gin-gonic/gin" - "github.com/shirou/gopsutil/host" "gorm.io/gorm" ) type ConfigHandler struct { handler.BaseHandler - levelDB *store.LevelDB - licenseService *service.LicenseService + levelDB *store.LevelDB } -func NewConfigHandler(app *core.AppServer, db *gorm.DB, levelDB *store.LevelDB, licenseService *service.LicenseService) *ConfigHandler { - return &ConfigHandler{BaseHandler: handler.BaseHandler{App: app, DB: db}, levelDB: levelDB, licenseService: licenseService} +func NewConfigHandler(app *core.AppServer, db *gorm.DB, levelDB *store.LevelDB) *ConfigHandler { + return &ConfigHandler{BaseHandler: handler.BaseHandler{App: app, DB: db}, levelDB: levelDB} } func (h *ConfigHandler) Update(c *gin.Context) { @@ -98,33 +95,3 @@ func (h *ConfigHandler) Get(c *gin.Context) { resp.SUCCESS(c, value) } - -// Active 激活系统 -func (h *ConfigHandler) Active(c *gin.Context) { - var data struct { - License string `json:"license"` - } - if err := c.ShouldBindJSON(&data); err != nil { - resp.ERROR(c, types.InvalidArgs) - return - } - info, err := host.Info() - if err != nil { - resp.ERROR(c, err.Error()) - return - } - - err = h.licenseService.ActiveLicense(data.License, info.HostID) - if err != nil { - resp.ERROR(c, err.Error()) - return - } - - resp.SUCCESS(c, info.HostID) -} - -// GetLicense 获取 License 信息 -func (h *ConfigHandler) GetLicense(c *gin.Context) { - license := h.licenseService.GetLicense() - resp.SUCCESS(c, license) -} diff --git a/api/handler/admin/user_handler.go b/api/handler/admin/user_handler.go index 4148edd8..d11078e1 100644 --- a/api/handler/admin/user_handler.go +++ b/api/handler/admin/user_handler.go @@ -8,15 +8,14 @@ package admin // * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ import ( + "fmt" "geekai/core" "geekai/core/types" "geekai/handler" - "geekai/service" "geekai/store/model" "geekai/store/vo" "geekai/utils" "geekai/utils/resp" - "fmt" "time" "github.com/gin-gonic/gin" @@ -25,11 +24,10 @@ import ( type UserHandler struct { handler.BaseHandler - licenseService *service.LicenseService } -func NewUserHandler(app *core.AppServer, db *gorm.DB, licenseService *service.LicenseService) *UserHandler { - return &UserHandler{BaseHandler: handler.BaseHandler{App: app, DB: db}, licenseService: licenseService} +func NewUserHandler(app *core.AppServer, db *gorm.DB) *UserHandler { + return &UserHandler{BaseHandler: handler.BaseHandler{App: app, DB: db}} } // List 用户列表 @@ -84,13 +82,7 @@ func (h *UserHandler) Save(c *gin.Context) { resp.ERROR(c, types.InvalidArgs) return } - // 检测最大注册人数 - var totalUser int64 - h.DB.Model(&model.User{}).Count(&totalUser) - if int(totalUser) >= h.licenseService.GetLicense().UserNum { - resp.ERROR(c, "当前注册用户数已达上限，请请升级 License") - return - } + var user = model.User{} var res *gorm.DB var userVo vo.User diff --git a/api/handler/chatimpl/chat_handler.go b/api/handler/chatimpl/chat_handler.go index e6ec7b81..8244bde6 100644 --- a/api/handler/chatimpl/chat_handler.go +++ b/api/handler/chatimpl/chat_handler.go @@ -17,7 +17,6 @@ import ( "geekai/core/types" "geekai/handler" logger2 "geekai/logger" - "geekai/service" "geekai/service/oss" "geekai/store/model" "geekai/store/vo" @@ -43,17 +42,15 @@ var logger = logger2.GetLogger() type ChatHandler struct { handler.BaseHandler - redis *redis.Client - uploadManager *oss.UploaderManager - licenseService *service.LicenseService + redis *redis.Client + uploadManager *oss.UploaderManager } -func NewChatHandler(app *core.AppServer, db *gorm.DB, redis *redis.Client, manager *oss.UploaderManager, licenseService *service.LicenseService) *ChatHandler { +func NewChatHandler(app *core.AppServer, db *gorm.DB, redis *redis.Client, manager *oss.UploaderManager) *ChatHandler { return &ChatHandler{ - BaseHandler: handler.BaseHandler{App: app, DB: db}, - redis: redis, - uploadManager: manager, - licenseService: licenseService, + BaseHandler: handler.BaseHandler{App: app, DB: db}, + redis: redis, + uploadManager: manager, } } @@ -491,14 +488,6 @@ func (h *ChatHandler) doRequest(ctx context.Context, req types.ApiRequest, sessi return nil, errors.New("no available key, please import key") } - // ONLY allow apiURL in blank list - if session.Model.Platform == types.OpenAI { - err := h.licenseService.IsValidApiURL(apiKey.ApiURL) - if err != nil { - return nil, err - } - } - var apiURL string switch session.Model.Platform { case types.Azure: diff --git a/api/handler/user_handler.go b/api/handler/user_handler.go index 6068f565..fa966047 100644 --- a/api/handler/user_handler.go +++ b/api/handler/user_handler.go @@ -8,14 +8,13 @@ package handler // * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ import ( + "fmt" "geekai/core" "geekai/core/types" - "geekai/service" "geekai/store/model" "geekai/store/vo" "geekai/utils" "geekai/utils/resp" - "fmt" "strings" "time" @@ -29,22 +28,19 @@ import ( type UserHandler struct { BaseHandler - searcher *xdb.Searcher - redis *redis.Client - licenseService *service.LicenseService + searcher *xdb.Searcher + redis *redis.Client } func NewUserHandler( app *core.AppServer, db *gorm.DB, searcher *xdb.Searcher, - client *redis.Client, - licenseService *service.LicenseService) *UserHandler { + client *redis.Client) *UserHandler { return &UserHandler{ - BaseHandler: BaseHandler{DB: db, App: app}, - searcher: searcher, - redis: client, - licenseService: licenseService, + BaseHandler: BaseHandler{DB: db, App: app}, + searcher: searcher, + redis: client, } } @@ -68,14 +64,6 @@ func (h *UserHandler) Register(c *gin.Context) { return } - // 检测最大注册人数 - var totalUser int64 - h.DB.Model(&model.User{}).Count(&totalUser) - if int(totalUser) >= h.licenseService.GetLicense().UserNum { - resp.ERROR(c, "当前注册用户数已达上限，请请升级 License") - return - } - // 检查验证码 var key string if data.RegWay == "email" || data.RegWay == "mobile" { diff --git a/api/main.go b/api/main.go index 12a3192c..77578cf1 100644 --- a/api/main.go +++ b/api/main.go @@ -172,10 +172,6 @@ func main() { // 邮件服务 fx.Provide(service.NewSmtpService), // License 服务 - fx.Provide(service.NewLicenseService), - fx.Invoke(func(licenseService *service.LicenseService) { - licenseService.SyncLicense() - }), // 微信机器人服务 fx.Provide(wx.NewWeChatBot), @@ -300,8 +296,6 @@ func main() { group := s.Engine.Group("/api/admin/") group.POST("config/update", h.Update) group.GET("config/get", h.Get) - group.POST("active", h.Active) - group.GET("config/get/license", h.GetLicense) }), fx.Invoke(func(s *core.AppServer, h *admin.ManagerHandler) { group := s.Engine.Group("/api/admin/") diff --git a/api/service/license_service.go b/api/service/license_service.go deleted file mode 100644 index d31eaaf7..00000000 --- a/api/service/license_service.go +++ /dev/null @@ -1,195 +0,0 @@ -package service - -// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// * Copyright 2023 The Geek-AI Authors. All rights reserved. -// * Use of this source code is governed by a Apache-2.0 license -// * that can be found in the LICENSE file. -// * @Author yangjian102621@163.com -// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -import ( - "errors" - "fmt" - "geekai/core" - "geekai/core/types" - "geekai/store" - "strings" - "time" - - "github.com/imroc/req/v3" - "github.com/shirou/gopsutil/host" -) - -type LicenseService struct { - config types.ApiConfig - levelDB *store.LevelDB - license *types.License - urlWhiteList []string - machineId string -} - -func NewLicenseService(server *core.AppServer, levelDB *store.LevelDB) *LicenseService { - var license types.License - var machineId string - _ = levelDB.Get(types.LicenseKey, &license) - info, err := host.Info() - if err == nil { - machineId = info.HostID - } - logger.Infof("License: %+v", license) - return &LicenseService{ - config: server.Config.ApiConfig, - levelDB: levelDB, - license: &license, - machineId: machineId, - } -} - -type License struct { - Name string `json:"name"` - License string `json:"license"` - Mid string `json:"mid"` - ActiveAt int64 `json:"active_at"` - ExpiredAt int64 `json:"expired_at"` - UserNum int `json:"user_num"` -} - -// ActiveLicense 激活 License -func (s *LicenseService) ActiveLicense(license string, machineId string) error { - var res struct { - Code types.BizCode `json:"code"` - Message string `json:"message"` - Data License `json:"data"` - } - apiURL := fmt.Sprintf("%s/%s", s.config.ApiURL, "api/license/active") - response, err := req.C().R(). - SetBody(map[string]string{"license": license, "machine_id": machineId}). - SetSuccessResult(&res).Post(apiURL) - if err != nil { - return fmt.Errorf("发送激活请求失败: %v", err) - } - - if response.IsErrorState() { - return fmt.Errorf("发送激活请求失败：%v", response.Status) - } - - if res.Code != types.Success { - return fmt.Errorf("激活失败：%v", res.Message) - } - - s.license = &types.License{ - Key: license, - MachineId: machineId, - UserNum: res.Data.UserNum, - ExpiredAt: res.Data.ExpiredAt, - IsActive: true, - } - err = s.levelDB.Put(types.LicenseKey, s.license) - if err != nil { - return fmt.Errorf("保存许可证书失败：%v", err) - } - return nil -} - -// SyncLicense 定期同步 License -func (s *LicenseService) SyncLicense() { - go func() { - retryCounter := 0 - for { - license, err := s.fetchLicense() - if err != nil { - retryCounter++ - if retryCounter < 5 { - logger.Error(err) - } - s.license.IsActive = false - } else { - s.license = license - } - - urls, err := s.fetchUrlWhiteList() - if err == nil { - s.urlWhiteList = urls - } - - time.Sleep(time.Second * 10) - } - }() -} - -func (s *LicenseService) fetchLicense() (*types.License, error) { - var res struct { - Code types.BizCode `json:"code"` - Message string `json:"message"` - Data License `json:"data"` - } - apiURL := fmt.Sprintf("%s/%s", s.config.ApiURL, "api/license/check") - response, err := req.C().R(). - SetBody(map[string]string{"license": s.license.Key, "machine_id": s.machineId}). - SetSuccessResult(&res).Post(apiURL) - if err != nil { - return nil, fmt.Errorf("发送激活请求失败: %v", err) - } - if response.IsErrorState() { - return nil, fmt.Errorf("激活失败：%v", response.Status) - } - if res.Code != types.Success { - return nil, fmt.Errorf("激活失败：%v", res.Message) - } - - return &types.License{ - Key: res.Data.License, - MachineId: res.Data.Mid, - UserNum: res.Data.UserNum, - ExpiredAt: res.Data.ExpiredAt, - IsActive: true, - }, nil -} - -func (s *LicenseService) fetchUrlWhiteList() ([]string, error) { - var res struct { - Code types.BizCode `json:"code"` - Message string `json:"message"` - Data []string `json:"data"` - } - apiURL := fmt.Sprintf("%s/%s", s.config.ApiURL, "api/license/urls") - response, err := req.C().R().SetSuccessResult(&res).Get(apiURL) - if err != nil { - return nil, fmt.Errorf("发送请求失败: %v", err) - } - if response.IsErrorState() { - return nil, fmt.Errorf("发送请求失败：%v", response.Status) - } - if res.Code != types.Success { - return nil, fmt.Errorf("获取白名单失败：%v", res.Message) - } - - return res.Data, nil -} - -// GetLicense 获取许可信息 -func (s *LicenseService) GetLicense() *types.License { - return s.license -} - -// IsValidApiURL 判断是否合法的中转 URL -func (s *LicenseService) IsValidApiURL(uri string) error { - // 获得许可授权的直接放行 - if s.license.IsActive { - if s.license.MachineId != s.machineId { - return errors.New("系统使用了盗版的许可证书") - } - - if time.Now().Unix() > s.license.ExpiredAt { - return errors.New("系统许可证书已经过期") - } - return nil - } - - for _, v := range s.urlWhiteList { - if strings.HasPrefix(uri, v) { - return nil - } - } - return fmt.Errorf("当前 API 地址 %s 不在白名单列表当中。", uri) -} diff --git a/api/service/mj/pool.go b/api/service/mj/pool.go index 993d5c32..659ba46b 100644 --- a/api/service/mj/pool.go +++ b/api/service/mj/pool.go @@ -11,7 +11,6 @@ import ( "fmt" "geekai/core/types" logger2 "geekai/logger" - "geekai/service" "geekai/service/oss" "geekai/service/sd" "geekai/store" @@ -34,7 +33,7 @@ type ServicePool struct { var logger = logger2.GetLogger() -func NewServicePool(db *gorm.DB, redisCli *redis.Client, manager *oss.UploaderManager, appConfig *types.AppConfig, licenseService *service.LicenseService) *ServicePool { +func NewServicePool(db *gorm.DB, redisCli *redis.Client, manager *oss.UploaderManager, appConfig *types.AppConfig) *ServicePool { services := make([]*Service, 0) taskQueue := store.NewRedisQueue("MidJourney_Task_Queue", redisCli) notifyQueue := store.NewRedisQueue("MidJourney_Notify_Queue", redisCli) @@ -43,12 +42,7 @@ func NewServicePool(db *gorm.DB, redisCli *redis.Client, manager *oss.UploaderMa if config.Enabled == false { continue } - err := licenseService.IsValidApiURL(config.ApiURL) - if err != nil { - logger.Error(err) - continue - } - + cli := NewPlusClient(config) name := fmt.Sprintf("mj-plus-service-%d", k) plusService := NewService(name, taskQueue, notifyQueue, db, cli)