xinyin025/geekai
1
0
Fork 0
mirror of https://github.com/yangjian102621/geekai.git synced 2025-11-04 16:23:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug for license synchronize

Browse Source
This commit is contained in:
RockYang
2024-05-04 21:30:29 +08:00
parent 8900e72e45
commit c2bf5e845a
5 changed files with 82 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/Makefile
View File

@@ -1,5 +1,5 @@
SHELL=/usr/bin/env bash
NAME := chatgpt-plus
NAME := geekai
all: amd64 arm64
amd64:

2
api/core/app_server.go
View File

@@ -200,8 +200,10 @@ func authorizeMiddleware(s *AppServer, client *redis.Client) gin.HandlerFunc {
func needLogin(c *gin.Context) bool {
if c.Request.URL.Path == "/api/user/login" ||
c.Request.URL.Path == "/api/user/logout" ||
c.Request.URL.Path == "/api/user/resetPass" ||
c.Request.URL.Path == "/api/admin/login" ||
c.Request.URL.Path == "/api/admin/logout" ||
c.Request.URL.Path == "/api/admin/login/captcha" ||
c.Request.URL.Path == "/api/user/register" ||
c.Request.URL.Path == "/api/user/session" ||

105
api/service/license_service.go
View File

@@ -16,7 +16,7 @@ import (
type LicenseService struct {
config types.ApiConfig
levelDB *store.LevelDB
license types.License
license *types.License
urlWhiteList []string
machineId string
}
@@ -29,18 +29,20 @@ func NewLicenseService(server *core.AppServer, levelDB *store.LevelDB) *LicenseS
if err == nil {
machineId = info.HostID
}
logger.Infof("License: %+v", license)
return &LicenseService{
config: server.Config.ApiConfig,
levelDB: levelDB,
license: license,
license: &license,
machineId: machineId,
}
}
type License struct {
Name string `json:"name"`
Value string `json:"license"`
License string `json:"license"`
Mid string `json:"mid"`
ActiveAt int64 `json:"active_at"`
ExpiredAt int64 `json:"expired_at"`
UserNum int `json:"user_num"`
}
@@ -68,7 +70,7 @@ func (s *LicenseService) ActiveLicense(license string, machineId string) error {
return fmt.Errorf("激活失败：%v", res.Message)
}
s.license = types.License{
s.license = &types.License{
Key: license,
MachineId: machineId,
UserNum: res.Data.UserNum,
@@ -85,50 +87,81 @@ func (s *LicenseService) ActiveLicense(license string, machineId string) error {
// SyncLicense 定期同步 License
func (s *LicenseService) SyncLicense() {
go func() {
retryCounter := 0
for {
var res struct {
Code types.BizCode `json:"code"`
Message string `json:"message"`
Data struct {
License License `json:"license"`
Urls []string `json:"urls"`
}
}
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)
license, err := s.fetchLicense()
if err != nil {
logger.Errorf("发送激活请求失败: %v", err)
goto next
}
if response.IsErrorState() {
logger.Errorf("激活失败：%v", response.Status)
goto next
}
if res.Code != types.Success {
logger.Errorf("激活失败：%v", res.Message)
retryCounter++
if retryCounter < 5 {
logger.Error(err)
}
s.license.IsActive = false
goto next
} else {
s.license = license
}
s.license = types.License{
Key: res.Data.License.Value,
MachineId: res.Data.License.Mid,
UserNum: res.Data.License.UserNum,
ExpiredAt: res.Data.License.ExpiredAt,
IsActive: true,
urls, err := s.fetchUrlWhiteList()
if err == nil {
s.urlWhiteList = urls
}
s.urlWhiteList = res.Data.Urls
//logger.Debugf("同步 License 成功：%v\n%v", s.license, s.urlWhiteList)
next:
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 {
func (s *LicenseService) GetLicense() *types.License {
return s.license
}

4
build/dockerfile-api-go
View File

@@ -4,9 +4,9 @@ FROM registry.cn-hangzhou.aliyuncs.com/geekmaster/alpine:3.18.2
MAINTAINER yangjian<yangjian102621@163.com>
WORKDIR /var/www/app
COPY ./api/bin/chatgpt-plus-linux /var/www/app
COPY ./api/bin/geekai-linux /var/www/app
EXPOSE 5678
# 容器启动时执行的命令
CMD ["./chatgpt-plus-linux"]
CMD ["./geekai-linux"]

11
web/src/utils/http.js
View File

@@ -1,5 +1,5 @@
import axios from 'axios'
import {getAdminToken, getSessionId, getUserToken} from "@/store/session";
import {getAdminToken, getSessionId, getUserToken, removeAdminToken, removeUserToken} from "@/store/session";
axios.defaults.timeout = 180000
axios.defaults.baseURL = process.env.VUE_APP_API_HOST
@@ -22,9 +22,14 @@ axios.interceptors.response.use(
let data = response.data;
if (data.code === 0) {
return response
} else {
return Promise.reject(response.data)
} else if (data.code === 400) {
if (response.request.responseURL.indexOf("/api/admin") !== -1) {
removeAdminToken()
} else {
removeUserToken()
}
}
return Promise.reject(response.data)
}, error => {
return Promise.reject(error)
})