mirror of
				https://github.com/songquanpeng/one-api.git
				synced 2025-10-31 13:53:41 +08:00 
			
		
		
		
	Compare commits
	
		
			47 Commits
		
	
	
		
			v0.3.3-alp
			...
			v0.4.3-alp
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 47ca449e32 | ||
|  | 39481eb6c0 | ||
|  | 69153e7231 | ||
|  | cdef10cad8 | ||
|  | 077853416d | ||
|  | 596446dba4 | ||
|  | 9d0bec83df | ||
|  | f97a9ce597 | ||
|  | 4339f45f74 | ||
|  | e398e0756b | ||
|  | 64db39320a | ||
|  | 0b4bf30908 | ||
|  | d29c273073 | ||
|  | 74f508e847 | ||
|  | 145bb14cb2 | ||
|  | 8901f03864 | ||
|  | 813bf0bd66 | ||
|  | 45e9fd66e7 | ||
|  | e0d0674f81 | ||
|  | 4b6adaec0b | ||
|  | 9301b3fed3 | ||
|  | c6edb78ac9 | ||
|  | 521ede2469 | ||
|  | 2c53424db8 | ||
|  | 2ad22e1425 | ||
|  | 502515bbbd | ||
|  | 1e1c6a828f | ||
|  | 2847a08852 | ||
|  | 98f1a627f0 | ||
|  | 333e4216d2 | ||
|  | 7e80e2da3a | ||
|  | 139624b8a4 | ||
|  | 2f44aaa645 | ||
|  | 0f6958c57a | ||
|  | 5f045f8cf5 | ||
|  | f19ee05351 | ||
|  | fa71daa8a7 | ||
|  | 54215dc303 | ||
|  | f9f42997b2 | ||
|  | 25eab0b224 | ||
|  | 34bce5b464 | ||
|  | d4794fc051 | ||
|  | 8b43e0dd3f | ||
|  | 92c88fa273 | ||
|  | 38191d55be | ||
|  | d9e39f5906 | ||
|  | 17b7646c12 | 
							
								
								
									
										36
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										36
									
								
								README.md
									
									
									
									
									
								
							| @@ -40,14 +40,17 @@ _✨ All in one 的 OpenAI 接口,整合各种 API 访问方式,开箱即用 | |||||||
|   <a href="https://openai.justsong.cn/">在线演示</a> |   <a href="https://openai.justsong.cn/">在线演示</a> | ||||||
|   · |   · | ||||||
|   <a href="https://github.com/songquanpeng/one-api#常见问题">常见问题</a> |   <a href="https://github.com/songquanpeng/one-api#常见问题">常见问题</a> | ||||||
|  |   · | ||||||
|  |   <a href="https://iamazing.cn/page/reward">赞赏支持</a> | ||||||
| </p> | </p> | ||||||
|  |  | ||||||
| > **Warning**:从 `v0.2` 版本升级到 `v0.3` 版本需要手动迁移数据库,请手动执行[数据库迁移脚本](./bin/migration_v0.2-v0.3.sql)。 | > **Note**:使用 Docker 拉取的最新镜像可能是 `alpha` 版本,如果追求稳定性请手动指定版本。 | ||||||
|  |  | ||||||
|  | > **Warning**:从 `v0.3` 版本升级到 `v0.4` 版本需要手动迁移数据库,请手动执行[数据库迁移脚本](./bin/migration_v0.3-v0.4.sql)。 | ||||||
|  |  | ||||||
| ## 功能 | ## 功能 | ||||||
| 1. 支持多种 API 访问渠道,欢迎 PR 或提 issue 添加更多渠道: | 1. 支持多种 API 访问渠道,欢迎 PR 或提 issue 添加更多渠道: | ||||||
|    + [x] OpenAI 官方通道 |    + [x] OpenAI 官方通道(支持配置代理) | ||||||
|    + [x] **Azure OpenAI API** |    + [x] **Azure OpenAI API** | ||||||
|    + [x] [API2D](https://api2d.com/r/197971) |    + [x] [API2D](https://api2d.com/r/197971) | ||||||
|    + [x] [OhMyGPT](https://aigptx.top?aff=uFpUl2Kf) |    + [x] [OhMyGPT](https://aigptx.top?aff=uFpUl2Kf) | ||||||
| @@ -56,23 +59,26 @@ _✨ All in one 的 OpenAI 接口,整合各种 API 访问方式,开箱即用 | |||||||
|    + [x] [OpenAI Max](https://openaimax.com) |    + [x] [OpenAI Max](https://openaimax.com) | ||||||
|    + [x] [OpenAI-SB](https://openai-sb.com) |    + [x] [OpenAI-SB](https://openai-sb.com) | ||||||
|    + [x] [CloseAI](https://console.openai-asia.com/r/2412) |    + [x] [CloseAI](https://console.openai-asia.com/r/2412) | ||||||
|    + [x] 自定义渠道:例如使用自行搭建的 OpenAI 代理 |    + [x] 自定义渠道:例如各种未收录的第三方代理服务 | ||||||
| 2. 支持通过**负载均衡**的方式访问多个渠道。 | 2. 支持通过**负载均衡**的方式访问多个渠道。 | ||||||
| 3. 支持 **stream 模式**,可以通过流式传输实现打字机效果。 | 3. 支持 **stream 模式**,可以通过流式传输实现打字机效果。 | ||||||
| 4. 支持**多机部署**,[详见此处](#多机部署)。 | 4. 支持**多机部署**,[详见此处](#多机部署)。 | ||||||
| 5. 支持**令牌管理**,设置令牌的过期时间和使用次数。 | 5. 支持**令牌管理**,设置令牌的过期时间和使用次数。 | ||||||
| 6. 支持**兑换码管理**,支持批量生成和导出兑换码,可使用兑换码为账户进行充值。 | 6. 支持**兑换码管理**,支持批量生成和导出兑换码,可使用兑换码为账户进行充值。 | ||||||
| 7. 支持**通道管理**,批量创建通道。 | 7. 支持**通道管理**,批量创建通道。 | ||||||
| 8. 支持发布公告,设置充值链接,设置新用户初始额度。 | 8. 支持**用户分组**以及**渠道分组**,支持为不同分组设置不同的倍率。 | ||||||
| 9. 支持丰富的**自定义**设置, | 9. 支持渠道**设置模型列表**。 | ||||||
|    1. 支持自定义系统名称,logo 以及页脚。 | 10. 支持**查看额度明细**。 | ||||||
|    2. 支持自定义首页和关于页面,可以选择使用 HTML & Markdown 代码进行自定义,或者使用一个单独的网页通过 iframe 嵌入。 | 11. 支持发布公告,设置充值链接,设置新用户初始额度。 | ||||||
| 10. 支持通过系统访问令牌访问管理 API。 | 12. 支持丰富的**自定义**设置, | ||||||
| 11. 支持用户管理,支持**多种用户登录注册方式**: |     1. 支持自定义系统名称,logo 以及页脚。 | ||||||
|  |     2. 支持自定义首页和关于页面,可以选择使用 HTML & Markdown 代码进行自定义,或者使用一个单独的网页通过 iframe 嵌入。 | ||||||
|  | 13. 支持通过系统访问令牌访问管理 API。 | ||||||
|  | 14. 支持用户管理,支持**多种用户登录注册方式**: | ||||||
|     + 邮箱登录注册以及通过邮箱进行密码重置。 |     + 邮箱登录注册以及通过邮箱进行密码重置。 | ||||||
|     + [GitHub 开放授权](https://github.com/settings/applications/new)。 |     + [GitHub 开放授权](https://github.com/settings/applications/new)。 | ||||||
|     + 微信公众号授权(需要额外部署 [WeChat Server](https://github.com/songquanpeng/wechat-server))。 |     + 微信公众号授权(需要额外部署 [WeChat Server](https://github.com/songquanpeng/wechat-server))。 | ||||||
| 12. 未来其他大模型开放 API 后,将第一时间支持,并将其封装成同样的 API 访问方式。 | 15. 未来其他大模型开放 API 后,将第一时间支持,并将其封装成同样的 API 访问方式。 | ||||||
|  |  | ||||||
| ## 部署 | ## 部署 | ||||||
| ### 基于 Docker 进行部署 | ### 基于 Docker 进行部署 | ||||||
| @@ -194,4 +200,12 @@ https://openai.justsong.cn | |||||||
|    + 请检查你的令牌额度是否足够,这个和账户额度是分开的。 |    + 请检查你的令牌额度是否足够,这个和账户额度是分开的。 | ||||||
|    + 令牌额度仅供用户设置最大使用量,用户可自由设置。 |    + 令牌额度仅供用户设置最大使用量,用户可自由设置。 | ||||||
| 2. 宝塔部署后访问出现空白页面? | 2. 宝塔部署后访问出现空白页面? | ||||||
|    + 自动配置的问题,详见[#97](https://github.com/songquanpeng/one-api/issues/97)。 |    + 自动配置的问题,详见[#97](https://github.com/songquanpeng/one-api/issues/97)。 | ||||||
|  | 3. 提示无可用渠道? | ||||||
|  |    + 请检查的用户分组和渠道分组设置。 | ||||||
|  |    + 以及渠道的模型设置。 | ||||||
|  |  | ||||||
|  | ## 注意 | ||||||
|  | 本项目为开源项目,请在遵循 OpenAI 的[使用条款](https://openai.com/policies/terms-of-use)以及法律法规的情况下使用,不得用于非法用途。 | ||||||
|  |  | ||||||
|  | 本项目依据 MIT 协议开源,请以某种方式保留 One API 的版权信息。 | ||||||
|   | |||||||
							
								
								
									
										17
									
								
								bin/migration_v0.3-v0.4.sql
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								bin/migration_v0.3-v0.4.sql
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,17 @@ | |||||||
|  | INSERT INTO abilities (`group`, model, channel_id, enabled) | ||||||
|  | SELECT c.`group`, m.model, c.id, 1 | ||||||
|  | FROM channels c | ||||||
|  | CROSS JOIN ( | ||||||
|  |     SELECT 'gpt-3.5-turbo' AS model UNION ALL | ||||||
|  |     SELECT 'gpt-3.5-turbo-0301' AS model UNION ALL | ||||||
|  |     SELECT 'gpt-4' AS model UNION ALL | ||||||
|  |     SELECT 'gpt-4-0314' AS model | ||||||
|  | ) AS m | ||||||
|  | WHERE c.status = 1 | ||||||
|  |   AND NOT EXISTS ( | ||||||
|  |     SELECT 1 | ||||||
|  |     FROM abilities a | ||||||
|  |     WHERE a.`group` = c.`group` | ||||||
|  |       AND a.model = m.model | ||||||
|  |       AND a.channel_id = c.id | ||||||
|  | ); | ||||||
| @@ -25,6 +25,7 @@ var OptionMap map[string]string | |||||||
| var OptionMapRWMutex sync.RWMutex | var OptionMapRWMutex sync.RWMutex | ||||||
|  |  | ||||||
| var ItemsPerPage = 10 | var ItemsPerPage = 10 | ||||||
|  | var MaxRecentItems = 100 | ||||||
|  |  | ||||||
| var PasswordLoginEnabled = true | var PasswordLoginEnabled = true | ||||||
| var PasswordRegisterEnabled = true | var PasswordRegisterEnabled = true | ||||||
|   | |||||||
							
								
								
									
										26
									
								
								common/gin.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								common/gin.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,26 @@ | |||||||
|  | package common | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"bytes" | ||||||
|  | 	"encoding/json" | ||||||
|  | 	"github.com/gin-gonic/gin" | ||||||
|  | 	"io" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | func UnmarshalBodyReusable(c *gin.Context, v any) error { | ||||||
|  | 	requestBody, err := io.ReadAll(c.Request.Body) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  | 	err = c.Request.Body.Close() | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  | 	err = json.Unmarshal(requestBody, &v) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  | 	// Reset request body | ||||||
|  | 	c.Request.Body = io.NopCloser(bytes.NewBuffer(requestBody)) | ||||||
|  | 	return nil | ||||||
|  | } | ||||||
							
								
								
									
										30
									
								
								common/group-ratio.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										30
									
								
								common/group-ratio.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,30 @@ | |||||||
|  | package common | ||||||
|  |  | ||||||
|  | import "encoding/json" | ||||||
|  |  | ||||||
|  | var GroupRatio = map[string]float64{ | ||||||
|  | 	"default": 1, | ||||||
|  | 	"vip":     1, | ||||||
|  | 	"svip":    1, | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func GroupRatio2JSONString() string { | ||||||
|  | 	jsonBytes, err := json.Marshal(GroupRatio) | ||||||
|  | 	if err != nil { | ||||||
|  | 		SysError("Error marshalling model ratio: " + err.Error()) | ||||||
|  | 	} | ||||||
|  | 	return string(jsonBytes) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func UpdateGroupRatioByJSONString(jsonStr string) error { | ||||||
|  | 	return json.Unmarshal([]byte(jsonStr), &GroupRatio) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func GetGroupRatio(name string) float64 { | ||||||
|  | 	ratio, ok := GroupRatio[name] | ||||||
|  | 	if !ok { | ||||||
|  | 		SysError("Group ratio not found: " + name) | ||||||
|  | 		return 1 | ||||||
|  | 	} | ||||||
|  | 	return ratio | ||||||
|  | } | ||||||
| @@ -10,7 +10,7 @@ var ModelRatio = map[string]float64{ | |||||||
| 	"gpt-4-0314":              15, | 	"gpt-4-0314":              15, | ||||||
| 	"gpt-4-32k":               30, | 	"gpt-4-32k":               30, | ||||||
| 	"gpt-4-32k-0314":          30, | 	"gpt-4-32k-0314":          30, | ||||||
| 	"gpt-3.5-turbo":           1, | 	"gpt-3.5-turbo":           1, // $0.002 / 1K tokens | ||||||
| 	"gpt-3.5-turbo-0301":      1, | 	"gpt-3.5-turbo-0301":      1, | ||||||
| 	"text-ada-001":            0.2, | 	"text-ada-001":            0.2, | ||||||
| 	"text-babbage-001":        0.25, | 	"text-babbage-001":        0.25, | ||||||
| @@ -26,8 +26,8 @@ var ModelRatio = map[string]float64{ | |||||||
| 	"ada":                     10, | 	"ada":                     10, | ||||||
| 	"text-embedding-ada-002":  0.2, | 	"text-embedding-ada-002":  0.2, | ||||||
| 	"text-search-ada-doc-001": 10, | 	"text-search-ada-doc-001": 10, | ||||||
| 	"text-moderation-stable":  10, | 	"text-moderation-stable":  0.1, | ||||||
| 	"text-moderation-latest":  10, | 	"text-moderation-latest":  0.1, | ||||||
| } | } | ||||||
|  |  | ||||||
| func ModelRatio2JSONString() string { | func ModelRatio2JSONString() string { | ||||||
|   | |||||||
| @@ -5,6 +5,7 @@ import ( | |||||||
| 	"github.com/google/uuid" | 	"github.com/google/uuid" | ||||||
| 	"html/template" | 	"html/template" | ||||||
| 	"log" | 	"log" | ||||||
|  | 	"math/rand" | ||||||
| 	"net" | 	"net" | ||||||
| 	"os/exec" | 	"os/exec" | ||||||
| 	"runtime" | 	"runtime" | ||||||
| @@ -133,6 +134,29 @@ func GetUUID() string { | |||||||
| 	return code | 	return code | ||||||
| } | } | ||||||
|  |  | ||||||
|  | const keyChars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" | ||||||
|  |  | ||||||
|  | func init() { | ||||||
|  | 	rand.Seed(time.Now().UnixNano()) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func GenerateKey() string { | ||||||
|  | 	rand.Seed(time.Now().UnixNano()) | ||||||
|  | 	key := make([]byte, 48) | ||||||
|  | 	for i := 0; i < 16; i++ { | ||||||
|  | 		key[i] = keyChars[rand.Intn(len(keyChars))] | ||||||
|  | 	} | ||||||
|  | 	uuid_ := GetUUID() | ||||||
|  | 	for i := 0; i < 32; i++ { | ||||||
|  | 		c := uuid_[i] | ||||||
|  | 		if i%2 == 0 && c >= 'a' && c <= 'z' { | ||||||
|  | 			c = c - 'a' + 'A' | ||||||
|  | 		} | ||||||
|  | 		key[i+16] = c | ||||||
|  | 	} | ||||||
|  | 	return string(key) | ||||||
|  | } | ||||||
|  |  | ||||||
| func GetTimestamp() int64 { | func GetTimestamp() int64 { | ||||||
| 	return time.Now().Unix() | 	return time.Now().Unix() | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										41
									
								
								controller/billing.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										41
									
								
								controller/billing.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,41 @@ | |||||||
|  | package controller | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"github.com/gin-gonic/gin" | ||||||
|  | 	"one-api/model" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | func GetSubscription(c *gin.Context) { | ||||||
|  | 	userId := c.GetInt("id") | ||||||
|  | 	quota, err := model.GetUserQuota(userId) | ||||||
|  | 	if err != nil { | ||||||
|  | 		openAIError := OpenAIError{ | ||||||
|  | 			Message: err.Error(), | ||||||
|  | 			Type:    "one_api_error", | ||||||
|  | 		} | ||||||
|  | 		c.JSON(200, gin.H{ | ||||||
|  | 			"error": openAIError, | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  | 	subscription := OpenAISubscriptionResponse{ | ||||||
|  | 		Object:             "billing_subscription", | ||||||
|  | 		HasPaymentMethod:   true, | ||||||
|  | 		SoftLimitUSD:       float64(quota), | ||||||
|  | 		HardLimitUSD:       float64(quota), | ||||||
|  | 		SystemHardLimitUSD: float64(quota), | ||||||
|  | 	} | ||||||
|  | 	c.JSON(200, subscription) | ||||||
|  | 	return | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func GetUsage(c *gin.Context) { | ||||||
|  | 	//userId := c.GetInt("id") | ||||||
|  | 	// TODO: get usage from database | ||||||
|  | 	usage := OpenAIUsageResponse{ | ||||||
|  | 		Object:     "list", | ||||||
|  | 		TotalUsage: 0, | ||||||
|  | 	} | ||||||
|  | 	c.JSON(200, usage) | ||||||
|  | 	return | ||||||
|  | } | ||||||
| @@ -13,39 +13,101 @@ import ( | |||||||
| 	"time" | 	"time" | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  | // https://github.com/songquanpeng/one-api/issues/79 | ||||||
|  |  | ||||||
| type OpenAISubscriptionResponse struct { | type OpenAISubscriptionResponse struct { | ||||||
| 	HasPaymentMethod bool    `json:"has_payment_method"` | 	Object             string  `json:"object"` | ||||||
| 	HardLimitUSD     float64 `json:"hard_limit_usd"` | 	HasPaymentMethod   bool    `json:"has_payment_method"` | ||||||
|  | 	SoftLimitUSD       float64 `json:"soft_limit_usd"` | ||||||
|  | 	HardLimitUSD       float64 `json:"hard_limit_usd"` | ||||||
|  | 	SystemHardLimitUSD float64 `json:"system_hard_limit_usd"` | ||||||
|  | } | ||||||
|  |  | ||||||
|  | type OpenAIUsageDailyCost struct { | ||||||
|  | 	Timestamp float64 `json:"timestamp"` | ||||||
|  | 	LineItems []struct { | ||||||
|  | 		Name string  `json:"name"` | ||||||
|  | 		Cost float64 `json:"cost"` | ||||||
|  | 	} | ||||||
| } | } | ||||||
|  |  | ||||||
| type OpenAIUsageResponse struct { | type OpenAIUsageResponse struct { | ||||||
|  | 	Object string `json:"object"` | ||||||
|  | 	//DailyCosts []OpenAIUsageDailyCost `json:"daily_costs"` | ||||||
| 	TotalUsage float64 `json:"total_usage"` // unit: 0.01 dollar | 	TotalUsage float64 `json:"total_usage"` // unit: 0.01 dollar | ||||||
| } | } | ||||||
|  |  | ||||||
| func updateChannelBalance(channel *model.Channel) (float64, error) { | type OpenAISBUsageResponse struct { | ||||||
| 	baseURL := common.ChannelBaseURLs[channel.Type] | 	Msg  string `json:"msg"` | ||||||
| 	switch channel.Type { | 	Data *struct { | ||||||
| 	case common.ChannelTypeAzure: | 		Credit string `json:"credit"` | ||||||
| 		return 0, errors.New("尚未实现") | 	} `json:"data"` | ||||||
| 	} | } | ||||||
| 	url := fmt.Sprintf("%s/v1/dashboard/billing/subscription", baseURL) |  | ||||||
|  |  | ||||||
|  | func GetResponseBody(method, url string, channel *model.Channel) ([]byte, error) { | ||||||
| 	client := &http.Client{} | 	client := &http.Client{} | ||||||
| 	req, err := http.NewRequest("GET", url, nil) | 	req, err := http.NewRequest(method, url, nil) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		return 0, err | 		return nil, err | ||||||
| 	} | 	} | ||||||
| 	auth := fmt.Sprintf("Bearer %s", channel.Key) | 	auth := fmt.Sprintf("Bearer %s", channel.Key) | ||||||
| 	req.Header.Add("Authorization", auth) | 	req.Header.Add("Authorization", auth) | ||||||
| 	res, err := client.Do(req) | 	res, err := client.Do(req) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		return 0, err | 		return nil, err | ||||||
| 	} | 	} | ||||||
| 	body, err := io.ReadAll(res.Body) | 	body, err := io.ReadAll(res.Body) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		return 0, err | 		return nil, err | ||||||
| 	} | 	} | ||||||
| 	err = res.Body.Close() | 	err = res.Body.Close() | ||||||
|  | 	if err != nil { | ||||||
|  | 		return nil, err | ||||||
|  | 	} | ||||||
|  | 	return body, nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func updateChannelOpenAISBBalance(channel *model.Channel) (float64, error) { | ||||||
|  | 	url := fmt.Sprintf("https://api.openai-sb.com/sb-api/user/status?api_key=%s", channel.Key) | ||||||
|  | 	body, err := GetResponseBody("GET", url, channel) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return 0, err | ||||||
|  | 	} | ||||||
|  | 	response := OpenAISBUsageResponse{} | ||||||
|  | 	err = json.Unmarshal(body, &response) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return 0, err | ||||||
|  | 	} | ||||||
|  | 	if response.Data == nil { | ||||||
|  | 		return 0, errors.New(response.Msg) | ||||||
|  | 	} | ||||||
|  | 	balance, err := strconv.ParseFloat(response.Data.Credit, 64) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return 0, err | ||||||
|  | 	} | ||||||
|  | 	channel.UpdateBalance(balance) | ||||||
|  | 	return balance, nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func updateChannelBalance(channel *model.Channel) (float64, error) { | ||||||
|  | 	baseURL := common.ChannelBaseURLs[channel.Type] | ||||||
|  | 	switch channel.Type { | ||||||
|  | 	case common.ChannelTypeOpenAI: | ||||||
|  | 		if channel.BaseURL != "" { | ||||||
|  | 			baseURL = channel.BaseURL | ||||||
|  | 		} | ||||||
|  | 	case common.ChannelTypeAzure: | ||||||
|  | 		return 0, errors.New("尚未实现") | ||||||
|  | 	case common.ChannelTypeCustom: | ||||||
|  | 		baseURL = channel.BaseURL | ||||||
|  | 	case common.ChannelTypeOpenAISB: | ||||||
|  | 		return updateChannelOpenAISBBalance(channel) | ||||||
|  | 	default: | ||||||
|  | 		return 0, errors.New("尚未实现") | ||||||
|  | 	} | ||||||
|  | 	url := fmt.Sprintf("%s/v1/dashboard/billing/subscription", baseURL) | ||||||
|  |  | ||||||
|  | 	body, err := GetResponseBody("GET", url, channel) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		return 0, err | 		return 0, err | ||||||
| 	} | 	} | ||||||
| @@ -56,22 +118,12 @@ func updateChannelBalance(channel *model.Channel) (float64, error) { | |||||||
| 	} | 	} | ||||||
| 	now := time.Now() | 	now := time.Now() | ||||||
| 	startDate := fmt.Sprintf("%s-01", now.Format("2006-01")) | 	startDate := fmt.Sprintf("%s-01", now.Format("2006-01")) | ||||||
| 	//endDate := now.Format("2006-01-02") | 	endDate := now.Format("2006-01-02") | ||||||
| 	url = fmt.Sprintf("%s/v1/dashboard/billing/usage?start_date=%s&end_date=%s", baseURL, startDate, "2023-06-01") | 	if !subscription.HasPaymentMethod { | ||||||
| 	req, err = http.NewRequest("GET", url, nil) | 		startDate = now.AddDate(0, 0, -100).Format("2006-01-02") | ||||||
| 	if err != nil { |  | ||||||
| 		return 0, err |  | ||||||
| 	} | 	} | ||||||
| 	req.Header.Add("Authorization", auth) | 	url = fmt.Sprintf("%s/v1/dashboard/billing/usage?start_date=%s&end_date=%s", baseURL, startDate, endDate) | ||||||
| 	res, err = client.Do(req) | 	body, err = GetResponseBody("GET", url, channel) | ||||||
| 	if err != nil { |  | ||||||
| 		return 0, err |  | ||||||
| 	} |  | ||||||
| 	body, err = io.ReadAll(res.Body) |  | ||||||
| 	if err != nil { |  | ||||||
| 		return 0, err |  | ||||||
| 	} |  | ||||||
| 	err = res.Body.Close() |  | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		return 0, err | 		return 0, err | ||||||
| 	} | 	} | ||||||
| @@ -127,6 +179,10 @@ func updateAllChannelsBalance() error { | |||||||
| 		if channel.Status != common.ChannelStatusEnabled { | 		if channel.Status != common.ChannelStatusEnabled { | ||||||
| 			continue | 			continue | ||||||
| 		} | 		} | ||||||
|  | 		// TODO: support Azure | ||||||
|  | 		if channel.Type != common.ChannelTypeOpenAI && channel.Type != common.ChannelTypeCustom { | ||||||
|  | 			continue | ||||||
|  | 		} | ||||||
| 		balance, err := updateChannelBalance(channel) | 		balance, err := updateChannelBalance(channel) | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			continue | 			continue | ||||||
|   | |||||||
							
								
								
									
										204
									
								
								controller/channel-test.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										204
									
								
								controller/channel-test.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,204 @@ | |||||||
|  | package controller | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"bytes" | ||||||
|  | 	"encoding/json" | ||||||
|  | 	"errors" | ||||||
|  | 	"fmt" | ||||||
|  | 	"github.com/gin-gonic/gin" | ||||||
|  | 	"net/http" | ||||||
|  | 	"one-api/common" | ||||||
|  | 	"one-api/model" | ||||||
|  | 	"strconv" | ||||||
|  | 	"sync" | ||||||
|  | 	"time" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | func testChannel(channel *model.Channel, request *ChatRequest) error { | ||||||
|  | 	if request.Model == "" { | ||||||
|  | 		request.Model = "gpt-3.5-turbo" | ||||||
|  | 		if channel.Type == common.ChannelTypeAzure { | ||||||
|  | 			request.Model = "gpt-35-turbo" | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  | 	requestURL := common.ChannelBaseURLs[channel.Type] | ||||||
|  | 	if channel.Type == common.ChannelTypeAzure { | ||||||
|  | 		requestURL = fmt.Sprintf("%s/openai/deployments/%s/chat/completions?api-version=2023-03-15-preview", channel.BaseURL, request.Model) | ||||||
|  | 	} else { | ||||||
|  | 		if channel.Type == common.ChannelTypeCustom { | ||||||
|  | 			requestURL = channel.BaseURL | ||||||
|  | 		} else if channel.Type == common.ChannelTypeOpenAI && channel.BaseURL != "" { | ||||||
|  | 			requestURL = channel.BaseURL | ||||||
|  | 		} | ||||||
|  | 		requestURL += "/v1/chat/completions" | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	jsonData, err := json.Marshal(request) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  | 	req, err := http.NewRequest("POST", requestURL, bytes.NewBuffer(jsonData)) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  | 	if channel.Type == common.ChannelTypeAzure { | ||||||
|  | 		req.Header.Set("api-key", channel.Key) | ||||||
|  | 	} else { | ||||||
|  | 		req.Header.Set("Authorization", "Bearer "+channel.Key) | ||||||
|  | 	} | ||||||
|  | 	req.Header.Set("Content-Type", "application/json") | ||||||
|  | 	client := &http.Client{} | ||||||
|  | 	resp, err := client.Do(req) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  | 	defer resp.Body.Close() | ||||||
|  | 	var response TextResponse | ||||||
|  | 	err = json.NewDecoder(resp.Body).Decode(&response) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  | 	if response.Usage.CompletionTokens == 0 { | ||||||
|  | 		return errors.New(fmt.Sprintf("type %s, code %v, message %s", response.Error.Type, response.Error.Code, response.Error.Message)) | ||||||
|  | 	} | ||||||
|  | 	return nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func buildTestRequest(c *gin.Context) *ChatRequest { | ||||||
|  | 	model_ := c.Query("model") | ||||||
|  | 	testRequest := &ChatRequest{ | ||||||
|  | 		Model:     model_, | ||||||
|  | 		MaxTokens: 1, | ||||||
|  | 	} | ||||||
|  | 	testMessage := Message{ | ||||||
|  | 		Role:    "user", | ||||||
|  | 		Content: "hi", | ||||||
|  | 	} | ||||||
|  | 	testRequest.Messages = append(testRequest.Messages, testMessage) | ||||||
|  | 	return testRequest | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func TestChannel(c *gin.Context) { | ||||||
|  | 	id, err := strconv.Atoi(c.Param("id")) | ||||||
|  | 	if err != nil { | ||||||
|  | 		c.JSON(http.StatusOK, gin.H{ | ||||||
|  | 			"success": false, | ||||||
|  | 			"message": err.Error(), | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  | 	channel, err := model.GetChannelById(id, true) | ||||||
|  | 	if err != nil { | ||||||
|  | 		c.JSON(http.StatusOK, gin.H{ | ||||||
|  | 			"success": false, | ||||||
|  | 			"message": err.Error(), | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  | 	testRequest := buildTestRequest(c) | ||||||
|  | 	tik := time.Now() | ||||||
|  | 	err = testChannel(channel, testRequest) | ||||||
|  | 	tok := time.Now() | ||||||
|  | 	milliseconds := tok.Sub(tik).Milliseconds() | ||||||
|  | 	go channel.UpdateResponseTime(milliseconds) | ||||||
|  | 	consumedTime := float64(milliseconds) / 1000.0 | ||||||
|  | 	if err != nil { | ||||||
|  | 		c.JSON(http.StatusOK, gin.H{ | ||||||
|  | 			"success": false, | ||||||
|  | 			"message": err.Error(), | ||||||
|  | 			"time":    consumedTime, | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  | 	c.JSON(http.StatusOK, gin.H{ | ||||||
|  | 		"success": true, | ||||||
|  | 		"message": "", | ||||||
|  | 		"time":    consumedTime, | ||||||
|  | 	}) | ||||||
|  | 	return | ||||||
|  | } | ||||||
|  |  | ||||||
|  | var testAllChannelsLock sync.Mutex | ||||||
|  | var testAllChannelsRunning bool = false | ||||||
|  |  | ||||||
|  | // disable & notify | ||||||
|  | func disableChannel(channelId int, channelName string, reason string) { | ||||||
|  | 	if common.RootUserEmail == "" { | ||||||
|  | 		common.RootUserEmail = model.GetRootUserEmail() | ||||||
|  | 	} | ||||||
|  | 	model.UpdateChannelStatusById(channelId, common.ChannelStatusDisabled) | ||||||
|  | 	subject := fmt.Sprintf("通道「%s」(#%d)已被禁用", channelName, channelId) | ||||||
|  | 	content := fmt.Sprintf("通道「%s」(#%d)已被禁用,原因:%s", channelName, channelId, reason) | ||||||
|  | 	err := common.SendEmail(subject, common.RootUserEmail, content) | ||||||
|  | 	if err != nil { | ||||||
|  | 		common.SysError(fmt.Sprintf("发送邮件失败:%s", err.Error())) | ||||||
|  | 	} | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func testAllChannels(c *gin.Context) error { | ||||||
|  | 	if common.RootUserEmail == "" { | ||||||
|  | 		common.RootUserEmail = model.GetRootUserEmail() | ||||||
|  | 	} | ||||||
|  | 	testAllChannelsLock.Lock() | ||||||
|  | 	if testAllChannelsRunning { | ||||||
|  | 		testAllChannelsLock.Unlock() | ||||||
|  | 		return errors.New("测试已在运行中") | ||||||
|  | 	} | ||||||
|  | 	testAllChannelsRunning = true | ||||||
|  | 	testAllChannelsLock.Unlock() | ||||||
|  | 	channels, err := model.GetAllChannels(0, 0, true) | ||||||
|  | 	if err != nil { | ||||||
|  | 		c.JSON(http.StatusOK, gin.H{ | ||||||
|  | 			"success": false, | ||||||
|  | 			"message": err.Error(), | ||||||
|  | 		}) | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  | 	testRequest := buildTestRequest(c) | ||||||
|  | 	var disableThreshold = int64(common.ChannelDisableThreshold * 1000) | ||||||
|  | 	if disableThreshold == 0 { | ||||||
|  | 		disableThreshold = 10000000 // a impossible value | ||||||
|  | 	} | ||||||
|  | 	go func() { | ||||||
|  | 		for _, channel := range channels { | ||||||
|  | 			if channel.Status != common.ChannelStatusEnabled { | ||||||
|  | 				continue | ||||||
|  | 			} | ||||||
|  | 			tik := time.Now() | ||||||
|  | 			err := testChannel(channel, testRequest) | ||||||
|  | 			tok := time.Now() | ||||||
|  | 			milliseconds := tok.Sub(tik).Milliseconds() | ||||||
|  | 			if err != nil || milliseconds > disableThreshold { | ||||||
|  | 				if milliseconds > disableThreshold { | ||||||
|  | 					err = errors.New(fmt.Sprintf("响应时间 %.2fs 超过阈值 %.2fs", float64(milliseconds)/1000.0, float64(disableThreshold)/1000.0)) | ||||||
|  | 				} | ||||||
|  | 				disableChannel(channel.Id, channel.Name, err.Error()) | ||||||
|  | 			} | ||||||
|  | 			channel.UpdateResponseTime(milliseconds) | ||||||
|  | 		} | ||||||
|  | 		err := common.SendEmail("通道测试完成", common.RootUserEmail, "通道测试完成,如果没有收到禁用通知,说明所有通道都正常") | ||||||
|  | 		if err != nil { | ||||||
|  | 			common.SysError(fmt.Sprintf("发送邮件失败:%s", err.Error())) | ||||||
|  | 		} | ||||||
|  | 		testAllChannelsLock.Lock() | ||||||
|  | 		testAllChannelsRunning = false | ||||||
|  | 		testAllChannelsLock.Unlock() | ||||||
|  | 	}() | ||||||
|  | 	return nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func TestAllChannels(c *gin.Context) { | ||||||
|  | 	err := testAllChannels(c) | ||||||
|  | 	if err != nil { | ||||||
|  | 		c.JSON(http.StatusOK, gin.H{ | ||||||
|  | 			"success": false, | ||||||
|  | 			"message": err.Error(), | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  | 	c.JSON(http.StatusOK, gin.H{ | ||||||
|  | 		"success": true, | ||||||
|  | 		"message": "", | ||||||
|  | 	}) | ||||||
|  | 	return | ||||||
|  | } | ||||||
| @@ -1,18 +1,12 @@ | |||||||
| package controller | package controller | ||||||
|  |  | ||||||
| import ( | import ( | ||||||
| 	"bytes" |  | ||||||
| 	"encoding/json" |  | ||||||
| 	"errors" |  | ||||||
| 	"fmt" |  | ||||||
| 	"github.com/gin-gonic/gin" | 	"github.com/gin-gonic/gin" | ||||||
| 	"net/http" | 	"net/http" | ||||||
| 	"one-api/common" | 	"one-api/common" | ||||||
| 	"one-api/model" | 	"one-api/model" | ||||||
| 	"strconv" | 	"strconv" | ||||||
| 	"strings" | 	"strings" | ||||||
| 	"sync" |  | ||||||
| 	"time" |  | ||||||
| ) | ) | ||||||
|  |  | ||||||
| func GetAllChannels(c *gin.Context) { | func GetAllChannels(c *gin.Context) { | ||||||
| @@ -158,187 +152,3 @@ func UpdateChannel(c *gin.Context) { | |||||||
| 	}) | 	}) | ||||||
| 	return | 	return | ||||||
| } | } | ||||||
|  |  | ||||||
| func testChannel(channel *model.Channel, request *ChatRequest) error { |  | ||||||
| 	if request.Model == "" { |  | ||||||
| 		request.Model = "gpt-3.5-turbo" |  | ||||||
| 		if channel.Type == common.ChannelTypeAzure { |  | ||||||
| 			request.Model = "gpt-35-turbo" |  | ||||||
| 		} |  | ||||||
| 	} |  | ||||||
| 	requestURL := common.ChannelBaseURLs[channel.Type] |  | ||||||
| 	if channel.Type == common.ChannelTypeAzure { |  | ||||||
| 		requestURL = fmt.Sprintf("%s/openai/deployments/%s/chat/completions?api-version=2023-03-15-preview", channel.BaseURL, request.Model) |  | ||||||
| 	} else { |  | ||||||
| 		if channel.Type == common.ChannelTypeCustom { |  | ||||||
| 			requestURL = channel.BaseURL |  | ||||||
| 		} |  | ||||||
| 		requestURL += "/v1/chat/completions" |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	jsonData, err := json.Marshal(request) |  | ||||||
| 	if err != nil { |  | ||||||
| 		return err |  | ||||||
| 	} |  | ||||||
| 	req, err := http.NewRequest("POST", requestURL, bytes.NewBuffer(jsonData)) |  | ||||||
| 	if err != nil { |  | ||||||
| 		return err |  | ||||||
| 	} |  | ||||||
| 	if channel.Type == common.ChannelTypeAzure { |  | ||||||
| 		req.Header.Set("api-key", channel.Key) |  | ||||||
| 	} else { |  | ||||||
| 		req.Header.Set("Authorization", "Bearer "+channel.Key) |  | ||||||
| 	} |  | ||||||
| 	req.Header.Set("Content-Type", "application/json") |  | ||||||
| 	client := &http.Client{} |  | ||||||
| 	resp, err := client.Do(req) |  | ||||||
| 	if err != nil { |  | ||||||
| 		return err |  | ||||||
| 	} |  | ||||||
| 	defer resp.Body.Close() |  | ||||||
| 	var response TextResponse |  | ||||||
| 	err = json.NewDecoder(resp.Body).Decode(&response) |  | ||||||
| 	if err != nil { |  | ||||||
| 		return err |  | ||||||
| 	} |  | ||||||
| 	if response.Error.Message != "" { |  | ||||||
| 		return errors.New(fmt.Sprintf("type %s, code %s, message %s", response.Error.Type, response.Error.Code, response.Error.Message)) |  | ||||||
| 	} |  | ||||||
| 	return nil |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func buildTestRequest(c *gin.Context) *ChatRequest { |  | ||||||
| 	model_ := c.Query("model") |  | ||||||
| 	testRequest := &ChatRequest{ |  | ||||||
| 		Model:     model_, |  | ||||||
| 		MaxTokens: 1, |  | ||||||
| 	} |  | ||||||
| 	testMessage := Message{ |  | ||||||
| 		Role:    "user", |  | ||||||
| 		Content: "hi", |  | ||||||
| 	} |  | ||||||
| 	testRequest.Messages = append(testRequest.Messages, testMessage) |  | ||||||
| 	return testRequest |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func TestChannel(c *gin.Context) { |  | ||||||
| 	id, err := strconv.Atoi(c.Param("id")) |  | ||||||
| 	if err != nil { |  | ||||||
| 		c.JSON(http.StatusOK, gin.H{ |  | ||||||
| 			"success": false, |  | ||||||
| 			"message": err.Error(), |  | ||||||
| 		}) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
| 	channel, err := model.GetChannelById(id, true) |  | ||||||
| 	if err != nil { |  | ||||||
| 		c.JSON(http.StatusOK, gin.H{ |  | ||||||
| 			"success": false, |  | ||||||
| 			"message": err.Error(), |  | ||||||
| 		}) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
| 	testRequest := buildTestRequest(c) |  | ||||||
| 	tik := time.Now() |  | ||||||
| 	err = testChannel(channel, testRequest) |  | ||||||
| 	tok := time.Now() |  | ||||||
| 	milliseconds := tok.Sub(tik).Milliseconds() |  | ||||||
| 	go channel.UpdateResponseTime(milliseconds) |  | ||||||
| 	consumedTime := float64(milliseconds) / 1000.0 |  | ||||||
| 	if err != nil { |  | ||||||
| 		c.JSON(http.StatusOK, gin.H{ |  | ||||||
| 			"success": false, |  | ||||||
| 			"message": err.Error(), |  | ||||||
| 			"time":    consumedTime, |  | ||||||
| 		}) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
| 	c.JSON(http.StatusOK, gin.H{ |  | ||||||
| 		"success": true, |  | ||||||
| 		"message": "", |  | ||||||
| 		"time":    consumedTime, |  | ||||||
| 	}) |  | ||||||
| 	return |  | ||||||
| } |  | ||||||
|  |  | ||||||
| var testAllChannelsLock sync.Mutex |  | ||||||
| var testAllChannelsRunning bool = false |  | ||||||
|  |  | ||||||
| // disable & notify |  | ||||||
| func disableChannel(channelId int, channelName string, reason string) { |  | ||||||
| 	if common.RootUserEmail == "" { |  | ||||||
| 		common.RootUserEmail = model.GetRootUserEmail() |  | ||||||
| 	} |  | ||||||
| 	model.UpdateChannelStatusById(channelId, common.ChannelStatusDisabled) |  | ||||||
| 	subject := fmt.Sprintf("通道「%s」(#%d)已被禁用", channelName, channelId) |  | ||||||
| 	content := fmt.Sprintf("通道「%s」(#%d)已被禁用,原因:%s", channelName, channelId, reason) |  | ||||||
| 	err := common.SendEmail(subject, common.RootUserEmail, content) |  | ||||||
| 	if err != nil { |  | ||||||
| 		common.SysError(fmt.Sprintf("发送邮件失败:%s", err.Error())) |  | ||||||
| 	} |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func testAllChannels(c *gin.Context) error { |  | ||||||
| 	testAllChannelsLock.Lock() |  | ||||||
| 	if testAllChannelsRunning { |  | ||||||
| 		testAllChannelsLock.Unlock() |  | ||||||
| 		return errors.New("测试已在运行中") |  | ||||||
| 	} |  | ||||||
| 	testAllChannelsRunning = true |  | ||||||
| 	testAllChannelsLock.Unlock() |  | ||||||
| 	channels, err := model.GetAllChannels(0, 0, true) |  | ||||||
| 	if err != nil { |  | ||||||
| 		c.JSON(http.StatusOK, gin.H{ |  | ||||||
| 			"success": false, |  | ||||||
| 			"message": err.Error(), |  | ||||||
| 		}) |  | ||||||
| 		return err |  | ||||||
| 	} |  | ||||||
| 	testRequest := buildTestRequest(c) |  | ||||||
| 	var disableThreshold = int64(common.ChannelDisableThreshold * 1000) |  | ||||||
| 	if disableThreshold == 0 { |  | ||||||
| 		disableThreshold = 10000000 // a impossible value |  | ||||||
| 	} |  | ||||||
| 	go func() { |  | ||||||
| 		for _, channel := range channels { |  | ||||||
| 			if channel.Status != common.ChannelStatusEnabled { |  | ||||||
| 				continue |  | ||||||
| 			} |  | ||||||
| 			tik := time.Now() |  | ||||||
| 			err := testChannel(channel, testRequest) |  | ||||||
| 			tok := time.Now() |  | ||||||
| 			milliseconds := tok.Sub(tik).Milliseconds() |  | ||||||
| 			if err != nil || milliseconds > disableThreshold { |  | ||||||
| 				if milliseconds > disableThreshold { |  | ||||||
| 					err = errors.New(fmt.Sprintf("响应时间 %.2fs 超过阈值 %.2fs", float64(milliseconds)/1000.0, float64(disableThreshold)/1000.0)) |  | ||||||
| 				} |  | ||||||
| 				disableChannel(channel.Id, channel.Name, err.Error()) |  | ||||||
| 			} |  | ||||||
| 			channel.UpdateResponseTime(milliseconds) |  | ||||||
| 		} |  | ||||||
| 		err := common.SendEmail("通道测试完成", common.RootUserEmail, "通道测试完成,如果没有收到禁用通知,说明所有通道都正常") |  | ||||||
| 		if err != nil { |  | ||||||
| 			common.SysError(fmt.Sprintf("发送邮件失败:%s", err.Error())) |  | ||||||
| 		} |  | ||||||
| 		testAllChannelsLock.Lock() |  | ||||||
| 		testAllChannelsRunning = false |  | ||||||
| 		testAllChannelsLock.Unlock() |  | ||||||
| 	}() |  | ||||||
| 	return nil |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func TestAllChannels(c *gin.Context) { |  | ||||||
| 	err := testAllChannels(c) |  | ||||||
| 	if err != nil { |  | ||||||
| 		c.JSON(http.StatusOK, gin.H{ |  | ||||||
| 			"success": false, |  | ||||||
| 			"message": err.Error(), |  | ||||||
| 		}) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
| 	c.JSON(http.StatusOK, gin.H{ |  | ||||||
| 		"success": true, |  | ||||||
| 		"message": "", |  | ||||||
| 	}) |  | ||||||
| 	return |  | ||||||
| } |  | ||||||
|   | |||||||
							
								
								
									
										19
									
								
								controller/group.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										19
									
								
								controller/group.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,19 @@ | |||||||
|  | package controller | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"github.com/gin-gonic/gin" | ||||||
|  | 	"net/http" | ||||||
|  | 	"one-api/common" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | func GetGroups(c *gin.Context) { | ||||||
|  | 	groupNames := make([]string, 0) | ||||||
|  | 	for groupName, _ := range common.GroupRatio { | ||||||
|  | 		groupNames = append(groupNames, groupName) | ||||||
|  | 	} | ||||||
|  | 	c.JSON(http.StatusOK, gin.H{ | ||||||
|  | 		"success": true, | ||||||
|  | 		"message": "", | ||||||
|  | 		"data":    groupNames, | ||||||
|  | 	}) | ||||||
|  | } | ||||||
							
								
								
									
										86
									
								
								controller/log.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										86
									
								
								controller/log.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,86 @@ | |||||||
|  | package controller | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"github.com/gin-gonic/gin" | ||||||
|  | 	"one-api/common" | ||||||
|  | 	"one-api/model" | ||||||
|  | 	"strconv" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | func GetAllLogs(c *gin.Context) { | ||||||
|  | 	p, _ := strconv.Atoi(c.Query("p")) | ||||||
|  | 	if p < 0 { | ||||||
|  | 		p = 0 | ||||||
|  | 	} | ||||||
|  | 	logType, _ := strconv.Atoi(c.Query("type")) | ||||||
|  | 	logs, err := model.GetAllLogs(logType, p*common.ItemsPerPage, common.ItemsPerPage) | ||||||
|  | 	if err != nil { | ||||||
|  | 		c.JSON(200, gin.H{ | ||||||
|  | 			"success": false, | ||||||
|  | 			"message": err.Error(), | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  | 	c.JSON(200, gin.H{ | ||||||
|  | 		"success": true, | ||||||
|  | 		"message": "", | ||||||
|  | 		"data":    logs, | ||||||
|  | 	}) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func GetUserLogs(c *gin.Context) { | ||||||
|  | 	p, _ := strconv.Atoi(c.Query("p")) | ||||||
|  | 	if p < 0 { | ||||||
|  | 		p = 0 | ||||||
|  | 	} | ||||||
|  | 	userId := c.GetInt("id") | ||||||
|  | 	logType, _ := strconv.Atoi(c.Query("type")) | ||||||
|  | 	logs, err := model.GetUserLogs(userId, logType, p*common.ItemsPerPage, common.ItemsPerPage) | ||||||
|  | 	if err != nil { | ||||||
|  | 		c.JSON(200, gin.H{ | ||||||
|  | 			"success": false, | ||||||
|  | 			"message": err.Error(), | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  | 	c.JSON(200, gin.H{ | ||||||
|  | 		"success": true, | ||||||
|  | 		"message": "", | ||||||
|  | 		"data":    logs, | ||||||
|  | 	}) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func SearchAllLogs(c *gin.Context) { | ||||||
|  | 	keyword := c.Query("keyword") | ||||||
|  | 	logs, err := model.SearchAllLogs(keyword) | ||||||
|  | 	if err != nil { | ||||||
|  | 		c.JSON(200, gin.H{ | ||||||
|  | 			"success": false, | ||||||
|  | 			"message": err.Error(), | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  | 	c.JSON(200, gin.H{ | ||||||
|  | 		"success": true, | ||||||
|  | 		"message": "", | ||||||
|  | 		"data":    logs, | ||||||
|  | 	}) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func SearchUserLogs(c *gin.Context) { | ||||||
|  | 	keyword := c.Query("keyword") | ||||||
|  | 	userId := c.GetInt("id") | ||||||
|  | 	logs, err := model.SearchUserLogs(userId, keyword) | ||||||
|  | 	if err != nil { | ||||||
|  | 		c.JSON(200, gin.H{ | ||||||
|  | 			"success": false, | ||||||
|  | 			"message": err.Error(), | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  | 	c.JSON(200, gin.H{ | ||||||
|  | 		"success": true, | ||||||
|  | 		"message": "", | ||||||
|  | 		"data":    logs, | ||||||
|  | 	}) | ||||||
|  | } | ||||||
| @@ -23,20 +23,21 @@ type OpenAIModelPermission struct { | |||||||
| } | } | ||||||
|  |  | ||||||
| type OpenAIModels struct { | type OpenAIModels struct { | ||||||
| 	Id         string                `json:"id"` | 	Id         string                  `json:"id"` | ||||||
| 	Object     string                `json:"object"` | 	Object     string                  `json:"object"` | ||||||
| 	Created    int                   `json:"created"` | 	Created    int                     `json:"created"` | ||||||
| 	OwnedBy    string                `json:"owned_by"` | 	OwnedBy    string                  `json:"owned_by"` | ||||||
| 	Permission OpenAIModelPermission `json:"permission"` | 	Permission []OpenAIModelPermission `json:"permission"` | ||||||
| 	Root       string                `json:"root"` | 	Root       string                  `json:"root"` | ||||||
| 	Parent     *string               `json:"parent"` | 	Parent     *string                 `json:"parent"` | ||||||
| } | } | ||||||
|  |  | ||||||
| var openAIModels []OpenAIModels | var openAIModels []OpenAIModels | ||||||
| var openAIModelsMap map[string]OpenAIModels | var openAIModelsMap map[string]OpenAIModels | ||||||
|  |  | ||||||
| func init() { | func init() { | ||||||
| 	permission := OpenAIModelPermission{ | 	var permission []OpenAIModelPermission | ||||||
|  | 	permission = append(permission, OpenAIModelPermission{ | ||||||
| 		Id:                 "modelperm-LwHkVFn8AcMItP432fKKDIKJ", | 		Id:                 "modelperm-LwHkVFn8AcMItP432fKKDIKJ", | ||||||
| 		Object:             "model_permission", | 		Object:             "model_permission", | ||||||
| 		Created:            1626777600, | 		Created:            1626777600, | ||||||
| @@ -49,7 +50,7 @@ func init() { | |||||||
| 		Organization:       "*", | 		Organization:       "*", | ||||||
| 		Group:              nil, | 		Group:              nil, | ||||||
| 		IsBlocking:         false, | 		IsBlocking:         false, | ||||||
| 	} | 	}) | ||||||
| 	// https://platform.openai.com/docs/models/model-endpoint-compatibility | 	// https://platform.openai.com/docs/models/model-endpoint-compatibility | ||||||
| 	openAIModels = []OpenAIModels{ | 	openAIModels = []OpenAIModels{ | ||||||
| 		{ | 		{ | ||||||
| @@ -106,15 +107,6 @@ func init() { | |||||||
| 			Root:       "gpt-4-32k-0314", | 			Root:       "gpt-4-32k-0314", | ||||||
| 			Parent:     nil, | 			Parent:     nil, | ||||||
| 		}, | 		}, | ||||||
| 		{ |  | ||||||
| 			Id:         "gpt-3.5-turbo", |  | ||||||
| 			Object:     "model", |  | ||||||
| 			Created:    1677649963, |  | ||||||
| 			OwnedBy:    "openai", |  | ||||||
| 			Permission: permission, |  | ||||||
| 			Root:       "gpt-3.5-turbo", |  | ||||||
| 			Parent:     nil, |  | ||||||
| 		}, |  | ||||||
| 		{ | 		{ | ||||||
| 			Id:         "text-embedding-ada-002", | 			Id:         "text-embedding-ada-002", | ||||||
| 			Object:     "model", | 			Object:     "model", | ||||||
| @@ -124,6 +116,69 @@ func init() { | |||||||
| 			Root:       "text-embedding-ada-002", | 			Root:       "text-embedding-ada-002", | ||||||
| 			Parent:     nil, | 			Parent:     nil, | ||||||
| 		}, | 		}, | ||||||
|  | 		{ | ||||||
|  | 			Id:         "text-davinci-003", | ||||||
|  | 			Object:     "model", | ||||||
|  | 			Created:    1677649963, | ||||||
|  | 			OwnedBy:    "openai", | ||||||
|  | 			Permission: permission, | ||||||
|  | 			Root:       "text-davinci-003", | ||||||
|  | 			Parent:     nil, | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			Id:         "text-davinci-002", | ||||||
|  | 			Object:     "model", | ||||||
|  | 			Created:    1677649963, | ||||||
|  | 			OwnedBy:    "openai", | ||||||
|  | 			Permission: permission, | ||||||
|  | 			Root:       "text-davinci-002", | ||||||
|  | 			Parent:     nil, | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			Id:         "text-curie-001", | ||||||
|  | 			Object:     "model", | ||||||
|  | 			Created:    1677649963, | ||||||
|  | 			OwnedBy:    "openai", | ||||||
|  | 			Permission: permission, | ||||||
|  | 			Root:       "text-curie-001", | ||||||
|  | 			Parent:     nil, | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			Id:         "text-babbage-001", | ||||||
|  | 			Object:     "model", | ||||||
|  | 			Created:    1677649963, | ||||||
|  | 			OwnedBy:    "openai", | ||||||
|  | 			Permission: permission, | ||||||
|  | 			Root:       "text-babbage-001", | ||||||
|  | 			Parent:     nil, | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			Id:         "text-ada-001", | ||||||
|  | 			Object:     "model", | ||||||
|  | 			Created:    1677649963, | ||||||
|  | 			OwnedBy:    "openai", | ||||||
|  | 			Permission: permission, | ||||||
|  | 			Root:       "text-ada-001", | ||||||
|  | 			Parent:     nil, | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			Id:         "text-moderation-latest", | ||||||
|  | 			Object:     "model", | ||||||
|  | 			Created:    1677649963, | ||||||
|  | 			OwnedBy:    "openai", | ||||||
|  | 			Permission: permission, | ||||||
|  | 			Root:       "text-moderation-latest", | ||||||
|  | 			Parent:     nil, | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			Id:         "text-moderation-stable", | ||||||
|  | 			Object:     "model", | ||||||
|  | 			Created:    1677649963, | ||||||
|  | 			OwnedBy:    "openai", | ||||||
|  | 			Permission: permission, | ||||||
|  | 			Root:       "text-moderation-stable", | ||||||
|  | 			Parent:     nil, | ||||||
|  | 		}, | ||||||
| 	} | 	} | ||||||
| 	openAIModelsMap = make(map[string]OpenAIModels) | 	openAIModelsMap = make(map[string]OpenAIModels) | ||||||
| 	for _, model := range openAIModels { | 	for _, model := range openAIModels { | ||||||
| @@ -132,7 +187,10 @@ func init() { | |||||||
| } | } | ||||||
|  |  | ||||||
| func ListModels(c *gin.Context) { | func ListModels(c *gin.Context) { | ||||||
| 	c.JSON(200, openAIModels) | 	c.JSON(200, gin.H{ | ||||||
|  | 		"object": "list", | ||||||
|  | 		"data":   openAIModels, | ||||||
|  | 	}) | ||||||
| } | } | ||||||
|  |  | ||||||
| func RetrieveModel(c *gin.Context) { | func RetrieveModel(c *gin.Context) { | ||||||
|   | |||||||
| @@ -19,6 +19,14 @@ type Message struct { | |||||||
| 	Name    *string `json:"name,omitempty"` | 	Name    *string `json:"name,omitempty"` | ||||||
| } | } | ||||||
|  |  | ||||||
|  | const ( | ||||||
|  | 	RelayModeUnknown = iota | ||||||
|  | 	RelayModeChatCompletions | ||||||
|  | 	RelayModeCompletions | ||||||
|  | 	RelayModeEmbeddings | ||||||
|  | 	RelayModeModeration | ||||||
|  | ) | ||||||
|  |  | ||||||
| // https://platform.openai.com/docs/api-reference/chat | // https://platform.openai.com/docs/api-reference/chat | ||||||
|  |  | ||||||
| type GeneralOpenAIRequest struct { | type GeneralOpenAIRequest struct { | ||||||
| @@ -30,6 +38,7 @@ type GeneralOpenAIRequest struct { | |||||||
| 	Temperature float64   `json:"temperature"` | 	Temperature float64   `json:"temperature"` | ||||||
| 	TopP        float64   `json:"top_p"` | 	TopP        float64   `json:"top_p"` | ||||||
| 	N           int       `json:"n"` | 	N           int       `json:"n"` | ||||||
|  | 	Input       string    `json:"input"` | ||||||
| } | } | ||||||
|  |  | ||||||
| type ChatRequest struct { | type ChatRequest struct { | ||||||
| @@ -56,7 +65,7 @@ type OpenAIError struct { | |||||||
| 	Message string `json:"message"` | 	Message string `json:"message"` | ||||||
| 	Type    string `json:"type"` | 	Type    string `json:"type"` | ||||||
| 	Param   string `json:"param"` | 	Param   string `json:"param"` | ||||||
| 	Code    string `json:"code"` | 	Code    any    `json:"code"` | ||||||
| } | } | ||||||
|  |  | ||||||
| type OpenAIErrorWithStatusCode struct { | type OpenAIErrorWithStatusCode struct { | ||||||
| @@ -69,7 +78,7 @@ type TextResponse struct { | |||||||
| 	Error OpenAIError `json:"error"` | 	Error OpenAIError `json:"error"` | ||||||
| } | } | ||||||
|  |  | ||||||
| type StreamResponse struct { | type ChatCompletionsStreamResponse struct { | ||||||
| 	Choices []struct { | 	Choices []struct { | ||||||
| 		Delta struct { | 		Delta struct { | ||||||
| 			Content string `json:"content"` | 			Content string `json:"content"` | ||||||
| @@ -78,19 +87,36 @@ type StreamResponse struct { | |||||||
| 	} `json:"choices"` | 	} `json:"choices"` | ||||||
| } | } | ||||||
|  |  | ||||||
|  | type CompletionsStreamResponse struct { | ||||||
|  | 	Choices []struct { | ||||||
|  | 		Text         string `json:"text"` | ||||||
|  | 		FinishReason string `json:"finish_reason"` | ||||||
|  | 	} `json:"choices"` | ||||||
|  | } | ||||||
|  |  | ||||||
| func Relay(c *gin.Context) { | func Relay(c *gin.Context) { | ||||||
| 	err := relayHelper(c) | 	relayMode := RelayModeUnknown | ||||||
|  | 	if strings.HasPrefix(c.Request.URL.Path, "/v1/chat/completions") { | ||||||
|  | 		relayMode = RelayModeChatCompletions | ||||||
|  | 	} else if strings.HasPrefix(c.Request.URL.Path, "/v1/completions") { | ||||||
|  | 		relayMode = RelayModeCompletions | ||||||
|  | 	} else if strings.HasPrefix(c.Request.URL.Path, "/v1/embeddings") { | ||||||
|  | 		relayMode = RelayModeEmbeddings | ||||||
|  | 	} else if strings.HasPrefix(c.Request.URL.Path, "/v1/moderations") { | ||||||
|  | 		relayMode = RelayModeModeration | ||||||
|  | 	} | ||||||
|  | 	err := relayHelper(c, relayMode) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		if err.StatusCode == http.StatusTooManyRequests { | 		if err.StatusCode == http.StatusTooManyRequests { | ||||||
| 			err.OpenAIError.Message = "负载已满,请稍后再试,或升级账户以提升服务质量。" | 			err.OpenAIError.Message = "当前分组负载已饱和,请稍后再试,或升级账户以提升服务质量。" | ||||||
| 		} | 		} | ||||||
| 		c.JSON(err.StatusCode, gin.H{ | 		c.JSON(err.StatusCode, gin.H{ | ||||||
| 			"error": err.OpenAIError, | 			"error": err.OpenAIError, | ||||||
| 		}) | 		}) | ||||||
| 		channelId := c.GetInt("channel_id") | 		channelId := c.GetInt("channel_id") | ||||||
| 		common.SysError(fmt.Sprintf("Relay error (channel #%d): %s", channelId, err.Message)) | 		common.SysError(fmt.Sprintf("Relay error (channel #%d): %s", channelId, err.Message)) | ||||||
| 		if err.Type != "invalid_request_error" && err.StatusCode != http.StatusTooManyRequests && | 		// https://platform.openai.com/docs/guides/error-codes/api-errors | ||||||
| 			common.AutomaticDisableChannelEnabled { | 		if common.AutomaticDisableChannelEnabled && (err.Type == "insufficient_quota" || err.Code == "invalid_api_key") { | ||||||
| 			channelId := c.GetInt("channel_id") | 			channelId := c.GetInt("channel_id") | ||||||
| 			channelName := c.GetString("channel_name") | 			channelName := c.GetString("channel_name") | ||||||
| 			disableChannel(channelId, channelName, err.Message) | 			disableChannel(channelId, channelName, err.Message) | ||||||
| @@ -110,31 +136,29 @@ func errorWrapper(err error, code string, statusCode int) *OpenAIErrorWithStatus | |||||||
| 	} | 	} | ||||||
| } | } | ||||||
|  |  | ||||||
| func relayHelper(c *gin.Context) *OpenAIErrorWithStatusCode { | func relayHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode { | ||||||
| 	channelType := c.GetInt("channel") | 	channelType := c.GetInt("channel") | ||||||
| 	tokenId := c.GetInt("token_id") | 	tokenId := c.GetInt("token_id") | ||||||
| 	consumeQuota := c.GetBool("consume_quota") | 	consumeQuota := c.GetBool("consume_quota") | ||||||
|  | 	group := c.GetString("group") | ||||||
| 	var textRequest GeneralOpenAIRequest | 	var textRequest GeneralOpenAIRequest | ||||||
| 	if consumeQuota || channelType == common.ChannelTypeAzure || channelType == common.ChannelTypePaLM { | 	if consumeQuota || channelType == common.ChannelTypeAzure || channelType == common.ChannelTypePaLM { | ||||||
| 		requestBody, err := io.ReadAll(c.Request.Body) | 		err := common.UnmarshalBodyReusable(c, &textRequest) | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			return errorWrapper(err, "read_request_body_failed", http.StatusBadRequest) | 			return errorWrapper(err, "bind_request_body_failed", http.StatusBadRequest) | ||||||
| 		} | 		} | ||||||
| 		err = c.Request.Body.Close() | 	} | ||||||
| 		if err != nil { | 	if relayMode == RelayModeModeration && textRequest.Model == "" { | ||||||
| 			return errorWrapper(err, "close_request_body_failed", http.StatusBadRequest) | 		textRequest.Model = "text-moderation-latest" | ||||||
| 		} |  | ||||||
| 		err = json.Unmarshal(requestBody, &textRequest) |  | ||||||
| 		if err != nil { |  | ||||||
| 			return errorWrapper(err, "unmarshal_request_body_failed", http.StatusBadRequest) |  | ||||||
| 		} |  | ||||||
| 		// Reset request body |  | ||||||
| 		c.Request.Body = io.NopCloser(bytes.NewBuffer(requestBody)) |  | ||||||
| 	} | 	} | ||||||
| 	baseURL := common.ChannelBaseURLs[channelType] | 	baseURL := common.ChannelBaseURLs[channelType] | ||||||
| 	requestURL := c.Request.URL.String() | 	requestURL := c.Request.URL.String() | ||||||
| 	if channelType == common.ChannelTypeCustom { | 	if channelType == common.ChannelTypeCustom { | ||||||
| 		baseURL = c.GetString("base_url") | 		baseURL = c.GetString("base_url") | ||||||
|  | 	} else if channelType == common.ChannelTypeOpenAI { | ||||||
|  | 		if c.GetString("base_url") != "" { | ||||||
|  | 			baseURL = c.GetString("base_url") | ||||||
|  | 		} | ||||||
| 	} | 	} | ||||||
| 	fullRequestURL := fmt.Sprintf("%s%s", baseURL, requestURL) | 	fullRequestURL := fmt.Sprintf("%s%s", baseURL, requestURL) | ||||||
| 	if channelType == common.ChannelTypeAzure { | 	if channelType == common.ChannelTypeAzure { | ||||||
| @@ -158,13 +182,22 @@ func relayHelper(c *gin.Context) *OpenAIErrorWithStatusCode { | |||||||
| 		err := relayPaLM(textRequest, c) | 		err := relayPaLM(textRequest, c) | ||||||
| 		return err | 		return err | ||||||
| 	} | 	} | ||||||
|  | 	var promptTokens int | ||||||
| 	promptTokens := countTokenMessages(textRequest.Messages, textRequest.Model) | 	switch relayMode { | ||||||
|  | 	case RelayModeChatCompletions: | ||||||
|  | 		promptTokens = countTokenMessages(textRequest.Messages, textRequest.Model) | ||||||
|  | 	case RelayModeCompletions: | ||||||
|  | 		promptTokens = countTokenText(textRequest.Prompt, textRequest.Model) | ||||||
|  | 	case RelayModeModeration: | ||||||
|  | 		promptTokens = countTokenText(textRequest.Input, textRequest.Model) | ||||||
|  | 	} | ||||||
| 	preConsumedTokens := common.PreConsumedQuota | 	preConsumedTokens := common.PreConsumedQuota | ||||||
| 	if textRequest.MaxTokens != 0 { | 	if textRequest.MaxTokens != 0 { | ||||||
| 		preConsumedTokens = promptTokens + textRequest.MaxTokens | 		preConsumedTokens = promptTokens + textRequest.MaxTokens | ||||||
| 	} | 	} | ||||||
| 	ratio := common.GetModelRatio(textRequest.Model) | 	modelRatio := common.GetModelRatio(textRequest.Model) | ||||||
|  | 	groupRatio := common.GetGroupRatio(group) | ||||||
|  | 	ratio := modelRatio * groupRatio | ||||||
| 	preConsumedQuota := int(float64(preConsumedTokens) * ratio) | 	preConsumedQuota := int(float64(preConsumedTokens) * ratio) | ||||||
| 	if consumeQuota { | 	if consumeQuota { | ||||||
| 		err := model.PreConsumeTokenQuota(tokenId, preConsumedQuota) | 		err := model.PreConsumeTokenQuota(tokenId, preConsumedQuota) | ||||||
| @@ -218,11 +251,16 @@ func relayHelper(c *gin.Context) *OpenAIErrorWithStatusCode { | |||||||
| 				quota = textResponse.Usage.PromptTokens + textResponse.Usage.CompletionTokens*completionRatio | 				quota = textResponse.Usage.PromptTokens + textResponse.Usage.CompletionTokens*completionRatio | ||||||
| 			} | 			} | ||||||
| 			quota = int(float64(quota) * ratio) | 			quota = int(float64(quota) * ratio) | ||||||
|  | 			if ratio != 0 && quota <= 0 { | ||||||
|  | 				quota = 1 | ||||||
|  | 			} | ||||||
| 			quotaDelta := quota - preConsumedQuota | 			quotaDelta := quota - preConsumedQuota | ||||||
| 			err := model.PostConsumeTokenQuota(tokenId, quotaDelta) | 			err := model.PostConsumeTokenQuota(tokenId, quotaDelta) | ||||||
| 			if err != nil { | 			if err != nil { | ||||||
| 				common.SysError("Error consuming token remain quota: " + err.Error()) | 				common.SysError("Error consuming token remain quota: " + err.Error()) | ||||||
| 			} | 			} | ||||||
|  | 			userId := c.GetInt("id") | ||||||
|  | 			model.RecordLog(userId, model.LogTypeConsume, fmt.Sprintf("使用模型 %s 消耗 %d 点额度(模型倍率 %.2f,分组倍率 %.2f)", textRequest.Model, quota, modelRatio, groupRatio)) | ||||||
| 		} | 		} | ||||||
| 	}() | 	}() | ||||||
|  |  | ||||||
| @@ -255,14 +293,27 @@ func relayHelper(c *gin.Context) *OpenAIErrorWithStatusCode { | |||||||
| 				dataChan <- data | 				dataChan <- data | ||||||
| 				data = data[6:] | 				data = data[6:] | ||||||
| 				if !strings.HasPrefix(data, "[DONE]") { | 				if !strings.HasPrefix(data, "[DONE]") { | ||||||
| 					var streamResponse StreamResponse | 					switch relayMode { | ||||||
| 					err = json.Unmarshal([]byte(data), &streamResponse) | 					case RelayModeChatCompletions: | ||||||
| 					if err != nil { | 						var streamResponse ChatCompletionsStreamResponse | ||||||
| 						common.SysError("Error unmarshalling stream response: " + err.Error()) | 						err = json.Unmarshal([]byte(data), &streamResponse) | ||||||
| 						return | 						if err != nil { | ||||||
| 					} | 							common.SysError("Error unmarshalling stream response: " + err.Error()) | ||||||
| 					for _, choice := range streamResponse.Choices { | 							return | ||||||
| 						streamResponseText += choice.Delta.Content | 						} | ||||||
|  | 						for _, choice := range streamResponse.Choices { | ||||||
|  | 							streamResponseText += choice.Delta.Content | ||||||
|  | 						} | ||||||
|  | 					case RelayModeCompletions: | ||||||
|  | 						var streamResponse CompletionsStreamResponse | ||||||
|  | 						err = json.Unmarshal([]byte(data), &streamResponse) | ||||||
|  | 						if err != nil { | ||||||
|  | 							common.SysError("Error unmarshalling stream response: " + err.Error()) | ||||||
|  | 							return | ||||||
|  | 						} | ||||||
|  | 						for _, choice := range streamResponse.Choices { | ||||||
|  | 							streamResponseText += choice.Text | ||||||
|  | 						} | ||||||
| 					} | 					} | ||||||
| 				} | 				} | ||||||
| 			} | 			} | ||||||
|   | |||||||
| @@ -119,7 +119,7 @@ func AddToken(c *gin.Context) { | |||||||
| 	cleanToken := model.Token{ | 	cleanToken := model.Token{ | ||||||
| 		UserId:         c.GetInt("id"), | 		UserId:         c.GetInt("id"), | ||||||
| 		Name:           token.Name, | 		Name:           token.Name, | ||||||
| 		Key:            common.GetUUID(), | 		Key:            common.GenerateKey(), | ||||||
| 		CreatedTime:    common.GetTimestamp(), | 		CreatedTime:    common.GetTimestamp(), | ||||||
| 		AccessedTime:   common.GetTimestamp(), | 		AccessedTime:   common.GetTimestamp(), | ||||||
| 		ExpiredTime:    token.ExpiredTime, | 		ExpiredTime:    token.ExpiredTime, | ||||||
|   | |||||||
| @@ -2,6 +2,7 @@ package controller | |||||||
|  |  | ||||||
| import ( | import ( | ||||||
| 	"encoding/json" | 	"encoding/json" | ||||||
|  | 	"fmt" | ||||||
| 	"github.com/gin-contrib/sessions" | 	"github.com/gin-contrib/sessions" | ||||||
| 	"github.com/gin-gonic/gin" | 	"github.com/gin-gonic/gin" | ||||||
| 	"net/http" | 	"net/http" | ||||||
| @@ -228,7 +229,7 @@ func GetUser(c *gin.Context) { | |||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 	myRole := c.GetInt("role") | 	myRole := c.GetInt("role") | ||||||
| 	if myRole <= user.Role { | 	if myRole <= user.Role && myRole != common.RoleRootUser { | ||||||
| 		c.JSON(http.StatusOK, gin.H{ | 		c.JSON(http.StatusOK, gin.H{ | ||||||
| 			"success": false, | 			"success": false, | ||||||
| 			"message": "无权获取同级或更高等级用户的信息", | 			"message": "无权获取同级或更高等级用户的信息", | ||||||
| @@ -326,14 +327,14 @@ func UpdateUser(c *gin.Context) { | |||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 	myRole := c.GetInt("role") | 	myRole := c.GetInt("role") | ||||||
| 	if myRole <= originUser.Role { | 	if myRole <= originUser.Role && myRole != common.RoleRootUser { | ||||||
| 		c.JSON(http.StatusOK, gin.H{ | 		c.JSON(http.StatusOK, gin.H{ | ||||||
| 			"success": false, | 			"success": false, | ||||||
| 			"message": "无权更新同权限等级或更高权限等级的用户信息", | 			"message": "无权更新同权限等级或更高权限等级的用户信息", | ||||||
| 		}) | 		}) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 	if myRole <= updatedUser.Role { | 	if myRole <= updatedUser.Role && myRole != common.RoleRootUser { | ||||||
| 		c.JSON(http.StatusOK, gin.H{ | 		c.JSON(http.StatusOK, gin.H{ | ||||||
| 			"success": false, | 			"success": false, | ||||||
| 			"message": "无权将其他用户权限等级提升到大于等于自己的权限等级", | 			"message": "无权将其他用户权限等级提升到大于等于自己的权限等级", | ||||||
| @@ -351,6 +352,9 @@ func UpdateUser(c *gin.Context) { | |||||||
| 		}) | 		}) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
|  | 	if originUser.Quota != updatedUser.Quota { | ||||||
|  | 		model.RecordLog(originUser.Id, model.LogTypeManage, fmt.Sprintf("管理员将用户额度从 %d 点修改为 %d 点", originUser.Quota, updatedUser.Quota)) | ||||||
|  | 	} | ||||||
| 	c.JSON(http.StatusOK, gin.H{ | 	c.JSON(http.StatusOK, gin.H{ | ||||||
| 		"success": true, | 		"success": true, | ||||||
| 		"message": "", | 		"message": "", | ||||||
| @@ -655,6 +659,9 @@ func EmailBind(c *gin.Context) { | |||||||
| 		}) | 		}) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
|  | 	if user.Role == common.RoleRootUser { | ||||||
|  | 		common.RootUserEmail = email | ||||||
|  | 	} | ||||||
| 	c.JSON(http.StatusOK, gin.H{ | 	c.JSON(http.StatusOK, gin.H{ | ||||||
| 		"success": true, | 		"success": true, | ||||||
| 		"message": "", | 		"message": "", | ||||||
|   | |||||||
| @@ -9,8 +9,8 @@ services: | |||||||
|     ports: |     ports: | ||||||
|       - "3000:3000" |       - "3000:3000" | ||||||
|     volumes: |     volumes: | ||||||
|       - /home/ubuntu/data/one-api:/data |       - ./data:/data | ||||||
|       - /home/ubuntu/data/one-api/logs:/app/logs |       - ./logs:/app/logs | ||||||
|     # environment: |     # environment: | ||||||
|     #   REDIS_CONN_STRING: redis://default:redispw@localhost:49153 |     #   REDIS_CONN_STRING: redis://default:redispw@localhost:49153 | ||||||
|     #   SESSION_SECRET: random_string |     #   SESSION_SECRET: random_string | ||||||
|   | |||||||
							
								
								
									
										19
									
								
								go.mod
									
									
									
									
									
								
							
							
						
						
									
										19
									
								
								go.mod
									
									
									
									
									
								
							| @@ -8,12 +8,12 @@ require ( | |||||||
| 	github.com/gin-contrib/gzip v0.0.6 | 	github.com/gin-contrib/gzip v0.0.6 | ||||||
| 	github.com/gin-contrib/sessions v0.0.5 | 	github.com/gin-contrib/sessions v0.0.5 | ||||||
| 	github.com/gin-contrib/static v0.0.1 | 	github.com/gin-contrib/static v0.0.1 | ||||||
| 	github.com/gin-gonic/gin v1.9.0 | 	github.com/gin-gonic/gin v1.9.1 | ||||||
| 	github.com/go-playground/validator/v10 v10.12.0 | 	github.com/go-playground/validator/v10 v10.14.0 | ||||||
| 	github.com/go-redis/redis/v8 v8.11.5 | 	github.com/go-redis/redis/v8 v8.11.5 | ||||||
| 	github.com/google/uuid v1.3.0 | 	github.com/google/uuid v1.3.0 | ||||||
| 	github.com/pkoukk/tiktoken-go v0.1.1 | 	github.com/pkoukk/tiktoken-go v0.1.1 | ||||||
| 	golang.org/x/crypto v0.8.0 | 	golang.org/x/crypto v0.9.0 | ||||||
| 	gorm.io/driver/mysql v1.4.3 | 	gorm.io/driver/mysql v1.4.3 | ||||||
| 	gorm.io/driver/sqlite v1.4.3 | 	gorm.io/driver/sqlite v1.4.3 | ||||||
| 	gorm.io/gorm v1.24.0 | 	gorm.io/gorm v1.24.0 | ||||||
| @@ -21,11 +21,12 @@ require ( | |||||||
|  |  | ||||||
| require ( | require ( | ||||||
| 	github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff // indirect | 	github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff // indirect | ||||||
| 	github.com/bytedance/sonic v1.8.8 // indirect | 	github.com/bytedance/sonic v1.9.1 // indirect | ||||||
| 	github.com/cespare/xxhash/v2 v2.1.2 // indirect | 	github.com/cespare/xxhash/v2 v2.1.2 // indirect | ||||||
| 	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect | 	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect | ||||||
| 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect | 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect | ||||||
| 	github.com/dlclark/regexp2 v1.8.1 // indirect | 	github.com/dlclark/regexp2 v1.8.1 // indirect | ||||||
|  | 	github.com/gabriel-vasile/mimetype v1.4.2 // indirect | ||||||
| 	github.com/gin-contrib/sse v0.1.0 // indirect | 	github.com/gin-contrib/sse v0.1.0 // indirect | ||||||
| 	github.com/go-playground/locales v0.14.1 // indirect | 	github.com/go-playground/locales v0.14.1 // indirect | ||||||
| 	github.com/go-playground/universal-translator v0.18.1 // indirect | 	github.com/go-playground/universal-translator v0.18.1 // indirect | ||||||
| @@ -39,17 +40,17 @@ require ( | |||||||
| 	github.com/jinzhu/now v1.1.5 // indirect | 	github.com/jinzhu/now v1.1.5 // indirect | ||||||
| 	github.com/json-iterator/go v1.1.12 // indirect | 	github.com/json-iterator/go v1.1.12 // indirect | ||||||
| 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect | 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect | ||||||
| 	github.com/leodido/go-urn v1.2.3 // indirect | 	github.com/leodido/go-urn v1.2.4 // indirect | ||||||
| 	github.com/mattn/go-isatty v0.0.18 // indirect | 	github.com/mattn/go-isatty v0.0.19 // indirect | ||||||
| 	github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect | 	github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect | ||||||
| 	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.0.7 // indirect | 	github.com/pelletier/go-toml/v2 v2.0.8 // indirect | ||||||
| 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect | 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect | ||||||
| 	github.com/ugorji/go/codec v1.2.11 // indirect | 	github.com/ugorji/go/codec v1.2.11 // indirect | ||||||
| 	golang.org/x/arch v0.3.0 // indirect | 	golang.org/x/arch v0.3.0 // indirect | ||||||
| 	golang.org/x/net v0.9.0 // indirect | 	golang.org/x/net v0.10.0 // indirect | ||||||
| 	golang.org/x/sys v0.7.0 // indirect | 	golang.org/x/sys v0.8.0 // indirect | ||||||
| 	golang.org/x/text v0.9.0 // indirect | 	golang.org/x/text v0.9.0 // indirect | ||||||
| 	google.golang.org/protobuf v1.30.0 // indirect | 	google.golang.org/protobuf v1.30.0 // indirect | ||||||
| 	gopkg.in/yaml.v3 v3.0.1 // indirect | 	gopkg.in/yaml.v3 v3.0.1 // indirect | ||||||
|   | |||||||
							
								
								
									
										41
									
								
								go.sum
									
									
									
									
									
								
							
							
						
						
									
										41
									
								
								go.sum
									
									
									
									
									
								
							| @@ -1,8 +1,8 @@ | |||||||
| github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff h1:RmdPFa+slIr4SCBg4st/l/vZWVe9QJKMXGO60Bxbe04= | github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff h1:RmdPFa+slIr4SCBg4st/l/vZWVe9QJKMXGO60Bxbe04= | ||||||
| github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff/go.mod h1:+RTT1BOk5P97fT2CiHkbFQwkK3mjsFAP6zCYV2aXtjw= | github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff/go.mod h1:+RTT1BOk5P97fT2CiHkbFQwkK3mjsFAP6zCYV2aXtjw= | ||||||
| github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= | github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= | ||||||
| github.com/bytedance/sonic v1.8.8 h1:Kj4AYbZSeENfyXicsYppYKO0K2YWab+i2UTSY7Ukz9Q= | github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s= | ||||||
| github.com/bytedance/sonic v1.8.8/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= | github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= | ||||||
| github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= | github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= | ||||||
| github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= | github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= | ||||||
| github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= | github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= | ||||||
| @@ -17,6 +17,8 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cu | |||||||
| github.com/dlclark/regexp2 v1.8.1 h1:6Lcdwya6GjPUNsBct8Lg/yRPwMhABj269AAzdGSiR+0= | github.com/dlclark/regexp2 v1.8.1 h1:6Lcdwya6GjPUNsBct8Lg/yRPwMhABj269AAzdGSiR+0= | ||||||
| github.com/dlclark/regexp2 v1.8.1/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= | github.com/dlclark/regexp2 v1.8.1/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= | ||||||
| github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= | github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= | ||||||
|  | github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= | ||||||
|  | github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= | ||||||
| github.com/gin-contrib/cors v1.4.0 h1:oJ6gwtUl3lqV0WEIwM/LxPF1QZ5qe2lGWdY2+bz7y0g= | github.com/gin-contrib/cors v1.4.0 h1:oJ6gwtUl3lqV0WEIwM/LxPF1QZ5qe2lGWdY2+bz7y0g= | ||||||
| github.com/gin-contrib/cors v1.4.0/go.mod h1:bs9pNM0x/UsmHPBWT2xZz9ROh8xYjYkiURUfmBoMlcs= | github.com/gin-contrib/cors v1.4.0/go.mod h1:bs9pNM0x/UsmHPBWT2xZz9ROh8xYjYkiURUfmBoMlcs= | ||||||
| github.com/gin-contrib/gzip v0.0.6 h1:NjcunTcGAj5CO1gn4N8jHOSIeRFHIbn51z6K+xaN4d4= | github.com/gin-contrib/gzip v0.0.6 h1:NjcunTcGAj5CO1gn4N8jHOSIeRFHIbn51z6K+xaN4d4= | ||||||
| @@ -29,8 +31,8 @@ github.com/gin-contrib/static v0.0.1 h1:JVxuvHPuUfkoul12N7dtQw7KRn/pSMq7Ue1Va9Sw | |||||||
| github.com/gin-contrib/static v0.0.1/go.mod h1:CSxeF+wep05e0kCOsqWdAWbSszmc31zTIbD8TvWl7Hs= | github.com/gin-contrib/static v0.0.1/go.mod h1:CSxeF+wep05e0kCOsqWdAWbSszmc31zTIbD8TvWl7Hs= | ||||||
| github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= | github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= | ||||||
| github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= | github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= | ||||||
| github.com/gin-gonic/gin v1.9.0 h1:OjyFBKICoexlu99ctXNR2gg+c5pKrKMuyjgARg9qeY8= | github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= | ||||||
| github.com/gin-gonic/gin v1.9.0/go.mod h1:W1Me9+hsUSyj3CePGrd1/QrKJMSJ1Tu/0hFEH89961k= | github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= | ||||||
| github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= | github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= | ||||||
| github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= | github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= | ||||||
| github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= | github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= | ||||||
| @@ -43,8 +45,8 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn | |||||||
| github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= | github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= | ||||||
| github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= | github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= | ||||||
| github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos= | github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos= | ||||||
| github.com/go-playground/validator/v10 v10.12.0 h1:E4gtWgxWxp8YSxExrQFv5BpCahla0PVF2oTTEYaWQGI= | github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js= | ||||||
| github.com/go-playground/validator/v10 v10.12.0/go.mod h1:hCAPuzYvKdP33pxWa+2+6AIKXEKqjIUyqsNCtbsSJrA= | github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= | ||||||
| github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= | github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= | ||||||
| github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= | github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= | ||||||
| github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= | github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= | ||||||
| @@ -89,12 +91,12 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= | |||||||
| github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= | github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= | ||||||
| github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= | github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= | ||||||
| github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= | github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= | ||||||
| github.com/leodido/go-urn v1.2.3 h1:6BE2vPT0lqoz3fmOesHZiaiFh7889ssCo2GMvLCfiuA= | github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= | ||||||
| github.com/leodido/go-urn v1.2.3/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= | github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= | ||||||
| github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= | github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= | ||||||
| github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= | github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= | ||||||
| github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= | github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= | ||||||
| github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= | github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= | ||||||
| github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= | github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= | ||||||
| github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U= | github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U= | ||||||
| github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= | github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= | ||||||
| @@ -108,8 +110,8 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= | |||||||
| github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= | github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= | ||||||
| github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= | github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= | ||||||
| github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= | github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= | ||||||
| github.com/pelletier/go-toml/v2 v2.0.7 h1:muncTPStnKRos5dpVKULv2FVd4bMOhNePj9CjgDb8Us= | github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= | ||||||
| github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= | github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= | ||||||
| github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= | github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= | ||||||
| github.com/pkoukk/tiktoken-go v0.1.1 h1:jtkYlIECjyM9OW1w4rjPmTohK4arORP9V25y6TM6nXo= | github.com/pkoukk/tiktoken-go v0.1.1 h1:jtkYlIECjyM9OW1w4rjPmTohK4arORP9V25y6TM6nXo= | ||||||
| github.com/pkoukk/tiktoken-go v0.1.1/go.mod h1:boMWvk9pQCOTx11pgu0DrIdrAKgQzzJKUP6vLXaz7Rw= | github.com/pkoukk/tiktoken-go v0.1.1/go.mod h1:boMWvk9pQCOTx11pgu0DrIdrAKgQzzJKUP6vLXaz7Rw= | ||||||
| @@ -128,8 +130,9 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ | |||||||
| github.com/stretchr/testify v1.7.1/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.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= | ||||||
| github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= | github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= | ||||||
| github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= |  | ||||||
| github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= | github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= | ||||||
|  | github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= | ||||||
|  | github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= | ||||||
| github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= | github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= | ||||||
| github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= | github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= | ||||||
| github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= | github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= | ||||||
| @@ -142,11 +145,11 @@ golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUu | |||||||
| golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k= | golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k= | ||||||
| golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= | golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= | ||||||
| golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= | golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= | ||||||
| golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ= | golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= | ||||||
| golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= | golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= | ||||||
| golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= | golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= | ||||||
| golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= | golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= | ||||||
| golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= | golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= | ||||||
| golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||||
| golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||||
| golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||||
| @@ -154,8 +157,8 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc | |||||||
| golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||||
| 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.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= | golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= | ||||||
| golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||||
| golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= | golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= | ||||||
| golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= | golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= | ||||||
| golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | ||||||
|   | |||||||
| @@ -6,7 +6,11 @@ import ( | |||||||
|  |  | ||||||
| func Cache() func(c *gin.Context) { | func Cache() func(c *gin.Context) { | ||||||
| 	return func(c *gin.Context) { | 	return func(c *gin.Context) { | ||||||
| 		c.Header("Cache-Control", "max-age=604800") // one week | 		if c.Request.RequestURI == "/" { | ||||||
|  | 			c.Header("Cache-Control", "no-cache") | ||||||
|  | 		} else { | ||||||
|  | 			c.Header("Cache-Control", "max-age=604800") // one week | ||||||
|  | 		} | ||||||
| 		c.Next() | 		c.Next() | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
|   | |||||||
| @@ -7,10 +7,18 @@ import ( | |||||||
| 	"one-api/common" | 	"one-api/common" | ||||||
| 	"one-api/model" | 	"one-api/model" | ||||||
| 	"strconv" | 	"strconv" | ||||||
|  | 	"strings" | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  | type ModelRequest struct { | ||||||
|  | 	Model string `json:"model"` | ||||||
|  | } | ||||||
|  |  | ||||||
| func Distribute() func(c *gin.Context) { | func Distribute() func(c *gin.Context) { | ||||||
| 	return func(c *gin.Context) { | 	return func(c *gin.Context) { | ||||||
|  | 		userId := c.GetInt("id") | ||||||
|  | 		userGroup, _ := model.GetUserGroup(userId) | ||||||
|  | 		c.Set("group", userGroup) | ||||||
| 		var channel *model.Channel | 		var channel *model.Channel | ||||||
| 		channelId, ok := c.Get("channelId") | 		channelId, ok := c.Get("channelId") | ||||||
| 		if ok { | 		if ok { | ||||||
| @@ -48,8 +56,24 @@ func Distribute() func(c *gin.Context) { | |||||||
| 			} | 			} | ||||||
| 		} else { | 		} else { | ||||||
| 			// Select a channel for the user | 			// Select a channel for the user | ||||||
| 			var err error | 			var modelRequest ModelRequest | ||||||
| 			channel, err = model.GetRandomChannel() | 			err := common.UnmarshalBodyReusable(c, &modelRequest) | ||||||
|  | 			if err != nil { | ||||||
|  | 				c.JSON(200, gin.H{ | ||||||
|  | 					"error": gin.H{ | ||||||
|  | 						"message": "无效的请求", | ||||||
|  | 						"type":    "one_api_error", | ||||||
|  | 					}, | ||||||
|  | 				}) | ||||||
|  | 				c.Abort() | ||||||
|  | 				return | ||||||
|  | 			} | ||||||
|  | 			if strings.HasPrefix(c.Request.URL.Path, "/v1/moderations") { | ||||||
|  | 				if modelRequest.Model == "" { | ||||||
|  | 					modelRequest.Model = "text-moderation-stable" | ||||||
|  | 				} | ||||||
|  | 			} | ||||||
|  | 			channel, err = model.GetRandomSatisfiedChannel(userGroup, modelRequest.Model) | ||||||
| 			if err != nil { | 			if err != nil { | ||||||
| 				c.JSON(200, gin.H{ | 				c.JSON(200, gin.H{ | ||||||
| 					"error": gin.H{ | 					"error": gin.H{ | ||||||
| @@ -65,11 +89,9 @@ func Distribute() func(c *gin.Context) { | |||||||
| 		c.Set("channel_id", channel.Id) | 		c.Set("channel_id", channel.Id) | ||||||
| 		c.Set("channel_name", channel.Name) | 		c.Set("channel_name", channel.Name) | ||||||
| 		c.Request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", channel.Key)) | 		c.Request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", channel.Key)) | ||||||
| 		if channel.Type == common.ChannelTypeCustom || channel.Type == common.ChannelTypeAzure { | 		c.Set("base_url", channel.BaseURL) | ||||||
| 			c.Set("base_url", channel.BaseURL) | 		if channel.Type == common.ChannelTypeAzure { | ||||||
| 			if channel.Type == common.ChannelTypeAzure { | 			c.Set("api_version", channel.Other) | ||||||
| 				c.Set("api_version", channel.Other) |  | ||||||
| 			} |  | ||||||
| 		} | 		} | ||||||
| 		c.Next() | 		c.Next() | ||||||
| 	} | 	} | ||||||
|   | |||||||
							
								
								
									
										69
									
								
								model/ability.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										69
									
								
								model/ability.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,69 @@ | |||||||
|  | package model | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"one-api/common" | ||||||
|  | 	"strings" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | type Ability struct { | ||||||
|  | 	Group     string `json:"group" gorm:"type:varchar(32);primaryKey;autoIncrement:false"` | ||||||
|  | 	Model     string `json:"model" gorm:"primaryKey;autoIncrement:false"` | ||||||
|  | 	ChannelId int    `json:"channel_id" gorm:"primaryKey;autoIncrement:false;index"` | ||||||
|  | 	Enabled   bool   `json:"enabled"` | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func GetRandomSatisfiedChannel(group string, model string) (*Channel, error) { | ||||||
|  | 	ability := Ability{} | ||||||
|  | 	var err error = nil | ||||||
|  | 	if common.UsingSQLite { | ||||||
|  | 		err = DB.Where("`group` = ? and model = ? and enabled = 1", group, model).Order("RANDOM()").Limit(1).First(&ability).Error | ||||||
|  | 	} else { | ||||||
|  | 		err = DB.Where("`group` = ? and model = ? and enabled = 1", group, model).Order("RAND()").Limit(1).First(&ability).Error | ||||||
|  | 	} | ||||||
|  | 	if err != nil { | ||||||
|  | 		return nil, err | ||||||
|  | 	} | ||||||
|  | 	channel := Channel{} | ||||||
|  | 	err = DB.First(&channel, "id = ?", ability.ChannelId).Error | ||||||
|  | 	return &channel, err | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (channel *Channel) AddAbilities() error { | ||||||
|  | 	models_ := strings.Split(channel.Models, ",") | ||||||
|  | 	abilities := make([]Ability, 0, len(models_)) | ||||||
|  | 	for _, model := range models_ { | ||||||
|  | 		ability := Ability{ | ||||||
|  | 			Group:     channel.Group, | ||||||
|  | 			Model:     model, | ||||||
|  | 			ChannelId: channel.Id, | ||||||
|  | 			Enabled:   channel.Status == common.ChannelStatusEnabled, | ||||||
|  | 		} | ||||||
|  | 		abilities = append(abilities, ability) | ||||||
|  | 	} | ||||||
|  | 	return DB.Create(&abilities).Error | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (channel *Channel) DeleteAbilities() error { | ||||||
|  | 	return DB.Where("channel_id = ?", channel.Id).Delete(&Ability{}).Error | ||||||
|  | } | ||||||
|  |  | ||||||
|  | // UpdateAbilities updates abilities of this channel. | ||||||
|  | // Make sure the channel is completed before calling this function. | ||||||
|  | func (channel *Channel) UpdateAbilities() error { | ||||||
|  | 	// A quick and dirty way to update abilities | ||||||
|  | 	// First delete all abilities of this channel | ||||||
|  | 	err := channel.DeleteAbilities() | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  | 	// Then add new abilities | ||||||
|  | 	err = channel.AddAbilities() | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  | 	return nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func UpdateAbilityStatus(channelId int, status bool) error { | ||||||
|  | 	return DB.Model(&Ability{}).Where("channel_id = ?", channelId).Select("enabled").Update("enabled", status).Error | ||||||
|  | } | ||||||
| @@ -1,7 +1,6 @@ | |||||||
| package model | package model | ||||||
|  |  | ||||||
| import ( | import ( | ||||||
| 	_ "gorm.io/driver/sqlite" |  | ||||||
| 	"one-api/common" | 	"one-api/common" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| @@ -19,6 +18,8 @@ type Channel struct { | |||||||
| 	Other              string  `json:"other"` | 	Other              string  `json:"other"` | ||||||
| 	Balance            float64 `json:"balance"` // in USD | 	Balance            float64 `json:"balance"` // in USD | ||||||
| 	BalanceUpdatedTime int64   `json:"balance_updated_time" gorm:"bigint"` | 	BalanceUpdatedTime int64   `json:"balance_updated_time" gorm:"bigint"` | ||||||
|  | 	Models             string  `json:"models"` | ||||||
|  | 	Group              string  `json:"group" gorm:"type:varchar(32);default:'default'"` | ||||||
| } | } | ||||||
|  |  | ||||||
| func GetAllChannels(startIdx int, num int, selectAll bool) ([]*Channel, error) { | func GetAllChannels(startIdx int, num int, selectAll bool) ([]*Channel, error) { | ||||||
| @@ -49,13 +50,12 @@ func GetChannelById(id int, selectAll bool) (*Channel, error) { | |||||||
| } | } | ||||||
|  |  | ||||||
| func GetRandomChannel() (*Channel, error) { | func GetRandomChannel() (*Channel, error) { | ||||||
| 	// TODO: consider weight |  | ||||||
| 	channel := Channel{} | 	channel := Channel{} | ||||||
| 	var err error = nil | 	var err error = nil | ||||||
| 	if common.UsingSQLite { | 	if common.UsingSQLite { | ||||||
| 		err = DB.Where("status = ?", common.ChannelStatusEnabled).Order("RANDOM()").Limit(1).First(&channel).Error | 		err = DB.Where("status = ? and `group` = ?", common.ChannelStatusEnabled, "default").Order("RANDOM()").Limit(1).First(&channel).Error | ||||||
| 	} else { | 	} else { | ||||||
| 		err = DB.Where("status = ?", common.ChannelStatusEnabled).Order("RAND()").Limit(1).First(&channel).Error | 		err = DB.Where("status = ? and `group` = ?", common.ChannelStatusEnabled, "default").Order("RAND()").Limit(1).First(&channel).Error | ||||||
| 	} | 	} | ||||||
| 	return &channel, err | 	return &channel, err | ||||||
| } | } | ||||||
| @@ -63,18 +63,36 @@ func GetRandomChannel() (*Channel, error) { | |||||||
| func BatchInsertChannels(channels []Channel) error { | func BatchInsertChannels(channels []Channel) error { | ||||||
| 	var err error | 	var err error | ||||||
| 	err = DB.Create(&channels).Error | 	err = DB.Create(&channels).Error | ||||||
| 	return err | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  | 	for _, channel_ := range channels { | ||||||
|  | 		err = channel_.AddAbilities() | ||||||
|  | 		if err != nil { | ||||||
|  | 			return err | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  | 	return nil | ||||||
| } | } | ||||||
|  |  | ||||||
| func (channel *Channel) Insert() error { | func (channel *Channel) Insert() error { | ||||||
| 	var err error | 	var err error | ||||||
| 	err = DB.Create(channel).Error | 	err = DB.Create(channel).Error | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  | 	err = channel.AddAbilities() | ||||||
| 	return err | 	return err | ||||||
| } | } | ||||||
|  |  | ||||||
| func (channel *Channel) Update() error { | func (channel *Channel) Update() error { | ||||||
| 	var err error | 	var err error | ||||||
| 	err = DB.Model(channel).Updates(channel).Error | 	err = DB.Model(channel).Updates(channel).Error | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  | 	DB.Model(channel).First(channel, "id = ?", channel.Id) | ||||||
|  | 	err = channel.UpdateAbilities() | ||||||
| 	return err | 	return err | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -101,11 +119,19 @@ func (channel *Channel) UpdateBalance(balance float64) { | |||||||
| func (channel *Channel) Delete() error { | func (channel *Channel) Delete() error { | ||||||
| 	var err error | 	var err error | ||||||
| 	err = DB.Delete(channel).Error | 	err = DB.Delete(channel).Error | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  | 	err = channel.DeleteAbilities() | ||||||
| 	return err | 	return err | ||||||
| } | } | ||||||
|  |  | ||||||
| func UpdateChannelStatusById(id int, status int) { | func UpdateChannelStatusById(id int, status int) { | ||||||
| 	err := DB.Model(&Channel{}).Where("id = ?", id).Update("status", status).Error | 	err := UpdateAbilityStatus(id, status == common.ChannelStatusEnabled) | ||||||
|  | 	if err != nil { | ||||||
|  | 		common.SysError("failed to update ability status: " + err.Error()) | ||||||
|  | 	} | ||||||
|  | 	err = DB.Model(&Channel{}).Where("id = ?", id).Update("status", status).Error | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		common.SysError("failed to update channel status: " + err.Error()) | 		common.SysError("failed to update channel status: " + err.Error()) | ||||||
| 	} | 	} | ||||||
|   | |||||||
							
								
								
									
										67
									
								
								model/log.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										67
									
								
								model/log.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,67 @@ | |||||||
|  | package model | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"gorm.io/gorm" | ||||||
|  | 	"one-api/common" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | type Log struct { | ||||||
|  | 	Id        int    `json:"id"` | ||||||
|  | 	UserId    int    `json:"user_id" gorm:"index"` | ||||||
|  | 	CreatedAt int64  `json:"created_at" gorm:"bigint"` | ||||||
|  | 	Type      int    `json:"type" gorm:"index"` | ||||||
|  | 	Content   string `json:"content"` | ||||||
|  | } | ||||||
|  |  | ||||||
|  | const ( | ||||||
|  | 	LogTypeUnknown = iota | ||||||
|  | 	LogTypeTopup | ||||||
|  | 	LogTypeConsume | ||||||
|  | 	LogTypeManage | ||||||
|  | 	LogTypeSystem | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | func RecordLog(userId int, logType int, content string) { | ||||||
|  | 	log := &Log{ | ||||||
|  | 		UserId:    userId, | ||||||
|  | 		CreatedAt: common.GetTimestamp(), | ||||||
|  | 		Type:      logType, | ||||||
|  | 		Content:   content, | ||||||
|  | 	} | ||||||
|  | 	err := DB.Create(log).Error | ||||||
|  | 	if err != nil { | ||||||
|  | 		common.SysError("failed to record log: " + err.Error()) | ||||||
|  | 	} | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func GetAllLogs(logType int, startIdx int, num int) (logs []*Log, err error) { | ||||||
|  | 	var tx *gorm.DB | ||||||
|  | 	if logType == LogTypeUnknown { | ||||||
|  | 		tx = DB | ||||||
|  | 	} else { | ||||||
|  | 		tx = DB.Where("type = ?", logType) | ||||||
|  | 	} | ||||||
|  | 	err = tx.Order("id desc").Limit(num).Offset(startIdx).Find(&logs).Error | ||||||
|  | 	return logs, err | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func GetUserLogs(userId int, logType int, startIdx int, num int) (logs []*Log, err error) { | ||||||
|  | 	var tx *gorm.DB | ||||||
|  | 	if logType == LogTypeUnknown { | ||||||
|  | 		tx = DB.Where("user_id = ?", userId) | ||||||
|  | 	} else { | ||||||
|  | 		tx = DB.Where("user_id = ? and type = ?", userId, logType) | ||||||
|  | 	} | ||||||
|  | 	err = tx.Order("id desc").Limit(num).Offset(startIdx).Omit("id").Find(&logs).Error | ||||||
|  | 	return logs, err | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func SearchAllLogs(keyword string) (logs []*Log, err error) { | ||||||
|  | 	err = DB.Where("type = ? or content LIKE ?", keyword, keyword+"%").Order("id desc").Limit(common.MaxRecentItems).Find(&logs).Error | ||||||
|  | 	return logs, err | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func SearchUserLogs(userId int, keyword string) (logs []*Log, err error) { | ||||||
|  | 	err = DB.Where("user_id = ? and type = ?", userId, keyword).Order("id desc").Limit(common.MaxRecentItems).Omit("id").Find(&logs).Error | ||||||
|  | 	return logs, err | ||||||
|  | } | ||||||
| @@ -75,6 +75,14 @@ func InitDB() (err error) { | |||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			return err | 			return err | ||||||
| 		} | 		} | ||||||
|  | 		err = db.AutoMigrate(&Ability{}) | ||||||
|  | 		if err != nil { | ||||||
|  | 			return err | ||||||
|  | 		} | ||||||
|  | 		err = db.AutoMigrate(&Log{}) | ||||||
|  | 		if err != nil { | ||||||
|  | 			return err | ||||||
|  | 		} | ||||||
| 		err = createRootAccountIfNeed() | 		err = createRootAccountIfNeed() | ||||||
| 		return err | 		return err | ||||||
| 	} else { | 	} else { | ||||||
|   | |||||||
| @@ -58,6 +58,7 @@ func InitOptionMap() { | |||||||
| 	common.OptionMap["QuotaRemindThreshold"] = strconv.Itoa(common.QuotaRemindThreshold) | 	common.OptionMap["QuotaRemindThreshold"] = strconv.Itoa(common.QuotaRemindThreshold) | ||||||
| 	common.OptionMap["PreConsumedQuota"] = strconv.Itoa(common.PreConsumedQuota) | 	common.OptionMap["PreConsumedQuota"] = strconv.Itoa(common.PreConsumedQuota) | ||||||
| 	common.OptionMap["ModelRatio"] = common.ModelRatio2JSONString() | 	common.OptionMap["ModelRatio"] = common.ModelRatio2JSONString() | ||||||
|  | 	common.OptionMap["GroupRatio"] = common.GroupRatio2JSONString() | ||||||
| 	common.OptionMap["TopUpLink"] = common.TopUpLink | 	common.OptionMap["TopUpLink"] = common.TopUpLink | ||||||
| 	common.OptionMapRWMutex.Unlock() | 	common.OptionMapRWMutex.Unlock() | ||||||
| 	loadOptionsFromDatabase() | 	loadOptionsFromDatabase() | ||||||
| @@ -177,6 +178,8 @@ func updateOptionMap(key string, value string) (err error) { | |||||||
| 		common.PreConsumedQuota, _ = strconv.Atoi(value) | 		common.PreConsumedQuota, _ = strconv.Atoi(value) | ||||||
| 	case "ModelRatio": | 	case "ModelRatio": | ||||||
| 		err = common.UpdateModelRatioByJSONString(value) | 		err = common.UpdateModelRatioByJSONString(value) | ||||||
|  | 	case "GroupRatio": | ||||||
|  | 		err = common.UpdateGroupRatioByJSONString(value) | ||||||
| 	case "TopUpLink": | 	case "TopUpLink": | ||||||
| 		common.TopUpLink = value | 		common.TopUpLink = value | ||||||
| 	case "ChannelDisableThreshold": | 	case "ChannelDisableThreshold": | ||||||
|   | |||||||
| @@ -2,7 +2,7 @@ package model | |||||||
|  |  | ||||||
| import ( | import ( | ||||||
| 	"errors" | 	"errors" | ||||||
| 	_ "gorm.io/driver/sqlite" | 	"fmt" | ||||||
| 	"one-api/common" | 	"one-api/common" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| @@ -66,6 +66,7 @@ func Redeem(key string, userId int) (quota int, err error) { | |||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			common.SysError("更新兑换码状态失败:" + err.Error()) | 			common.SysError("更新兑换码状态失败:" + err.Error()) | ||||||
| 		} | 		} | ||||||
|  | 		RecordLog(userId, LogTypeTopup, fmt.Sprintf("通过兑换码充值 %d 点额度", redemption.Quota)) | ||||||
| 	}() | 	}() | ||||||
| 	return redemption.Quota, nil | 	return redemption.Quota, nil | ||||||
| } | } | ||||||
| @@ -84,7 +85,7 @@ func (redemption *Redemption) SelectUpdate() error { | |||||||
| // Update Make sure your token's fields is completed, because this will update non-zero values | // Update Make sure your token's fields is completed, because this will update non-zero values | ||||||
| func (redemption *Redemption) Update() error { | func (redemption *Redemption) Update() error { | ||||||
| 	var err error | 	var err error | ||||||
| 	err = DB.Model(redemption).Select("name", "status", "redeemed_time").Updates(redemption).Error | 	err = DB.Model(redemption).Select("name", "status", "quota", "redeemed_time").Updates(redemption).Error | ||||||
| 	return err | 	return err | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -3,7 +3,6 @@ package model | |||||||
| import ( | import ( | ||||||
| 	"errors" | 	"errors" | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 	_ "gorm.io/driver/sqlite" |  | ||||||
| 	"gorm.io/gorm" | 	"gorm.io/gorm" | ||||||
| 	"one-api/common" | 	"one-api/common" | ||||||
| ) | ) | ||||||
| @@ -11,7 +10,7 @@ import ( | |||||||
| type Token struct { | type Token struct { | ||||||
| 	Id             int    `json:"id"` | 	Id             int    `json:"id"` | ||||||
| 	UserId         int    `json:"user_id"` | 	UserId         int    `json:"user_id"` | ||||||
| 	Key            string `json:"key" gorm:"type:char(32);uniqueIndex"` | 	Key            string `json:"key" gorm:"type:char(48);uniqueIndex"` | ||||||
| 	Status         int    `json:"status" gorm:"default:1"` | 	Status         int    `json:"status" gorm:"default:1"` | ||||||
| 	Name           string `json:"name" gorm:"index" ` | 	Name           string `json:"name" gorm:"index" ` | ||||||
| 	CreatedTime    int64  `json:"created_time" gorm:"bigint"` | 	CreatedTime    int64  `json:"created_time" gorm:"bigint"` | ||||||
|   | |||||||
| @@ -2,6 +2,7 @@ package model | |||||||
|  |  | ||||||
| import ( | import ( | ||||||
| 	"errors" | 	"errors" | ||||||
|  | 	"fmt" | ||||||
| 	"gorm.io/gorm" | 	"gorm.io/gorm" | ||||||
| 	"one-api/common" | 	"one-api/common" | ||||||
| 	"strings" | 	"strings" | ||||||
| @@ -22,6 +23,7 @@ type User struct { | |||||||
| 	VerificationCode string `json:"verification_code" gorm:"-:all"`                                    // this field is only for Email verification, don't save it to database! | 	VerificationCode string `json:"verification_code" gorm:"-:all"`                                    // this field is only for Email verification, don't save it to database! | ||||||
| 	AccessToken      string `json:"access_token" gorm:"type:char(32);column:access_token;uniqueIndex"` // this token is for system management | 	AccessToken      string `json:"access_token" gorm:"type:char(32);column:access_token;uniqueIndex"` // this token is for system management | ||||||
| 	Quota            int    `json:"quota" gorm:"type:int;default:0"` | 	Quota            int    `json:"quota" gorm:"type:int;default:0"` | ||||||
|  | 	Group            string `json:"group" gorm:"type:varchar(32);default:'default'"` | ||||||
| } | } | ||||||
|  |  | ||||||
| func GetMaxUserId() int { | func GetMaxUserId() int { | ||||||
| @@ -72,8 +74,14 @@ func (user *User) Insert() error { | |||||||
| 	} | 	} | ||||||
| 	user.Quota = common.QuotaForNewUser | 	user.Quota = common.QuotaForNewUser | ||||||
| 	user.AccessToken = common.GetUUID() | 	user.AccessToken = common.GetUUID() | ||||||
| 	err = DB.Create(user).Error | 	result := DB.Create(user) | ||||||
| 	return err | 	if result.Error != nil { | ||||||
|  | 		return result.Error | ||||||
|  | 	} | ||||||
|  | 	if common.QuotaForNewUser > 0 { | ||||||
|  | 		RecordLog(user.Id, LogTypeSystem, fmt.Sprintf("新用户注册赠送 %d 点额度", common.QuotaForNewUser)) | ||||||
|  | 	} | ||||||
|  | 	return nil | ||||||
| } | } | ||||||
|  |  | ||||||
| func (user *User) Update(updatePassword bool) error { | func (user *User) Update(updatePassword bool) error { | ||||||
| @@ -229,6 +237,11 @@ func GetUserEmail(id int) (email string, err error) { | |||||||
| 	return email, err | 	return email, err | ||||||
| } | } | ||||||
|  |  | ||||||
|  | func GetUserGroup(id int) (group string, err error) { | ||||||
|  | 	err = DB.Model(&User{}).Where("id = ?", id).Select("`group`").Find(&group).Error | ||||||
|  | 	return group, err | ||||||
|  | } | ||||||
|  |  | ||||||
| func IncreaseUserQuota(id int, quota int) (err error) { | func IncreaseUserQuota(id int, quota int) (err error) { | ||||||
| 	if quota < 0 { | 	if quota < 0 { | ||||||
| 		return errors.New("quota 不能为负数!") | 		return errors.New("quota 不能为负数!") | ||||||
|   | |||||||
| @@ -63,6 +63,7 @@ func SetApiRouter(router *gin.Engine) { | |||||||
| 		{ | 		{ | ||||||
| 			channelRoute.GET("/", controller.GetAllChannels) | 			channelRoute.GET("/", controller.GetAllChannels) | ||||||
| 			channelRoute.GET("/search", controller.SearchChannels) | 			channelRoute.GET("/search", controller.SearchChannels) | ||||||
|  | 			channelRoute.GET("/models", controller.ListModels) | ||||||
| 			channelRoute.GET("/:id", controller.GetChannel) | 			channelRoute.GET("/:id", controller.GetChannel) | ||||||
| 			channelRoute.GET("/test", controller.TestAllChannels) | 			channelRoute.GET("/test", controller.TestAllChannels) | ||||||
| 			channelRoute.GET("/test/:id", controller.TestChannel) | 			channelRoute.GET("/test/:id", controller.TestChannel) | ||||||
| @@ -92,5 +93,15 @@ func SetApiRouter(router *gin.Engine) { | |||||||
| 			redemptionRoute.PUT("/", controller.UpdateRedemption) | 			redemptionRoute.PUT("/", controller.UpdateRedemption) | ||||||
| 			redemptionRoute.DELETE("/:id", controller.DeleteRedemption) | 			redemptionRoute.DELETE("/:id", controller.DeleteRedemption) | ||||||
| 		} | 		} | ||||||
|  | 		logRoute := apiRouter.Group("/log") | ||||||
|  | 		logRoute.GET("/", middleware.AdminAuth(), controller.GetAllLogs) | ||||||
|  | 		logRoute.GET("/search", middleware.AdminAuth(), controller.SearchAllLogs) | ||||||
|  | 		logRoute.GET("/self", middleware.UserAuth(), controller.GetUserLogs) | ||||||
|  | 		logRoute.GET("/self/search", middleware.UserAuth(), controller.SearchUserLogs) | ||||||
|  | 		groupRoute := apiRouter.Group("/group") | ||||||
|  | 		groupRoute.Use(middleware.AdminAuth()) | ||||||
|  | 		{ | ||||||
|  | 			groupRoute.GET("/", controller.GetGroups) | ||||||
|  | 		} | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
|   | |||||||
| @@ -8,11 +8,14 @@ import ( | |||||||
| ) | ) | ||||||
|  |  | ||||||
| func SetDashboardRouter(router *gin.Engine) { | func SetDashboardRouter(router *gin.Engine) { | ||||||
| 	apiRouter := router.Group("/dashboard") | 	apiRouter := router.Group("/") | ||||||
| 	apiRouter.Use(gzip.Gzip(gzip.DefaultCompression)) | 	apiRouter.Use(gzip.Gzip(gzip.DefaultCompression)) | ||||||
| 	apiRouter.Use(middleware.GlobalAPIRateLimit()) | 	apiRouter.Use(middleware.GlobalAPIRateLimit()) | ||||||
| 	apiRouter.Use(middleware.TokenAuth()) | 	apiRouter.Use(middleware.TokenAuth()) | ||||||
| 	{ | 	{ | ||||||
| 		apiRouter.GET("/billing/credit_grants", controller.GetTokenStatus) | 		apiRouter.GET("/dashboard/billing/subscription", controller.GetSubscription) | ||||||
|  | 		apiRouter.GET("/v1/dashboard/billing/subscription", controller.GetSubscription) | ||||||
|  | 		apiRouter.GET("/dashboard/billing/usage", controller.GetUsage) | ||||||
|  | 		apiRouter.GET("/v1/dashboard/billing/usage", controller.GetUsage) | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
|   | |||||||
| @@ -8,12 +8,16 @@ import ( | |||||||
|  |  | ||||||
| func SetRelayRouter(router *gin.Engine) { | func SetRelayRouter(router *gin.Engine) { | ||||||
| 	// https://platform.openai.com/docs/api-reference/introduction | 	// https://platform.openai.com/docs/api-reference/introduction | ||||||
|  | 	modelsRouter := router.Group("/v1/models") | ||||||
|  | 	modelsRouter.Use(middleware.TokenAuth()) | ||||||
|  | 	{ | ||||||
|  | 		modelsRouter.GET("/", controller.ListModels) | ||||||
|  | 		modelsRouter.GET("/:model", controller.RetrieveModel) | ||||||
|  | 	} | ||||||
| 	relayV1Router := router.Group("/v1") | 	relayV1Router := router.Group("/v1") | ||||||
| 	relayV1Router.Use(middleware.TokenAuth(), middleware.Distribute()) | 	relayV1Router.Use(middleware.TokenAuth(), middleware.Distribute()) | ||||||
| 	{ | 	{ | ||||||
| 		relayV1Router.GET("/models", controller.ListModels) | 		relayV1Router.POST("/completions", controller.Relay) | ||||||
| 		relayV1Router.GET("/models/:model", controller.RetrieveModel) |  | ||||||
| 		relayV1Router.POST("/completions", controller.RelayNotImplemented) |  | ||||||
| 		relayV1Router.POST("/chat/completions", controller.Relay) | 		relayV1Router.POST("/chat/completions", controller.Relay) | ||||||
| 		relayV1Router.POST("/edits", controller.RelayNotImplemented) | 		relayV1Router.POST("/edits", controller.RelayNotImplemented) | ||||||
| 		relayV1Router.POST("/images/generations", controller.RelayNotImplemented) | 		relayV1Router.POST("/images/generations", controller.RelayNotImplemented) | ||||||
| @@ -33,6 +37,6 @@ func SetRelayRouter(router *gin.Engine) { | |||||||
| 		relayV1Router.POST("/fine-tunes/:id/cancel", controller.RelayNotImplemented) | 		relayV1Router.POST("/fine-tunes/:id/cancel", controller.RelayNotImplemented) | ||||||
| 		relayV1Router.GET("/fine-tunes/:id/events", controller.RelayNotImplemented) | 		relayV1Router.GET("/fine-tunes/:id/events", controller.RelayNotImplemented) | ||||||
| 		relayV1Router.DELETE("/models/:model", controller.RelayNotImplemented) | 		relayV1Router.DELETE("/models/:model", controller.RelayNotImplemented) | ||||||
| 		relayV1Router.POST("/moderations", controller.RelayNotImplemented) | 		relayV1Router.POST("/moderations", controller.Relay) | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
|   | |||||||
| @@ -16,6 +16,7 @@ func SetWebRouter(router *gin.Engine, buildFS embed.FS, indexPage []byte) { | |||||||
| 	router.Use(middleware.Cache()) | 	router.Use(middleware.Cache()) | ||||||
| 	router.Use(static.Serve("/", common.EmbedFolder(buildFS, "web/build"))) | 	router.Use(static.Serve("/", common.EmbedFolder(buildFS, "web/build"))) | ||||||
| 	router.NoRoute(func(c *gin.Context) { | 	router.NoRoute(func(c *gin.Context) { | ||||||
|  | 		c.Header("Cache-Control", "no-cache") | ||||||
| 		c.Data(http.StatusOK, "text/html; charset=utf-8", indexPage) | 		c.Data(http.StatusOK, "text/html; charset=utf-8", indexPage) | ||||||
| 	}) | 	}) | ||||||
| } | } | ||||||
|   | |||||||
| @@ -22,6 +22,7 @@ import EditChannel from './pages/Channel/EditChannel'; | |||||||
| import Redemption from './pages/Redemption'; | import Redemption from './pages/Redemption'; | ||||||
| import EditRedemption from './pages/Redemption/EditRedemption'; | import EditRedemption from './pages/Redemption/EditRedemption'; | ||||||
| import TopUp from './pages/TopUp'; | import TopUp from './pages/TopUp'; | ||||||
|  | import Log from './pages/Log'; | ||||||
|  |  | ||||||
| const Home = lazy(() => import('./pages/Home')); | const Home = lazy(() => import('./pages/Home')); | ||||||
| const About = lazy(() => import('./pages/About')); | const About = lazy(() => import('./pages/About')); | ||||||
| @@ -250,6 +251,14 @@ function App() { | |||||||
|         </PrivateRoute> |         </PrivateRoute> | ||||||
|         } |         } | ||||||
|       /> |       /> | ||||||
|  |       <Route | ||||||
|  |         path='/log' | ||||||
|  |         element={ | ||||||
|  |           <PrivateRoute> | ||||||
|  |             <Log /> | ||||||
|  |           </PrivateRoute> | ||||||
|  |         } | ||||||
|  |       /> | ||||||
|       <Route |       <Route | ||||||
|         path='/about' |         path='/about' | ||||||
|         element={ |         element={ | ||||||
|   | |||||||
| @@ -4,6 +4,7 @@ import { Link } from 'react-router-dom'; | |||||||
| import { API, showError, showInfo, showSuccess, timestamp2string } from '../helpers'; | import { API, showError, showInfo, showSuccess, timestamp2string } from '../helpers'; | ||||||
|  |  | ||||||
| import { CHANNEL_OPTIONS, ITEMS_PER_PAGE } from '../constants'; | import { CHANNEL_OPTIONS, ITEMS_PER_PAGE } from '../constants'; | ||||||
|  | import { renderGroup } from '../helpers/render'; | ||||||
|  |  | ||||||
| function renderTimestamp(timestamp) { | function renderTimestamp(timestamp) { | ||||||
|   return ( |   return ( | ||||||
| @@ -26,6 +27,13 @@ function renderType(type) { | |||||||
|   return <Label basic color={type2label[type].color}>{type2label[type].text}</Label>; |   return <Label basic color={type2label[type].color}>{type2label[type].text}</Label>; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | function renderBalance(type, balance) { | ||||||
|  |   if (type === 5) { | ||||||
|  |     return <span>{balance.toFixed(2)}</span> | ||||||
|  |   } | ||||||
|  |   return <span>${balance.toFixed(2)}</span> | ||||||
|  | } | ||||||
|  |  | ||||||
| const ChannelsTable = () => { | const ChannelsTable = () => { | ||||||
|   const [channels, setChannels] = useState([]); |   const [channels, setChannels] = useState([]); | ||||||
|   const [loading, setLoading] = useState(true); |   const [loading, setLoading] = useState(true); | ||||||
| @@ -264,6 +272,14 @@ const ChannelsTable = () => { | |||||||
|             > |             > | ||||||
|               名称 |               名称 | ||||||
|             </Table.HeaderCell> |             </Table.HeaderCell> | ||||||
|  |             <Table.HeaderCell | ||||||
|  |               style={{ cursor: 'pointer' }} | ||||||
|  |               onClick={() => { | ||||||
|  |                 sortChannel('group'); | ||||||
|  |               }} | ||||||
|  |             > | ||||||
|  |               分组 | ||||||
|  |             </Table.HeaderCell> | ||||||
|             <Table.HeaderCell |             <Table.HeaderCell | ||||||
|               style={{ cursor: 'pointer' }} |               style={{ cursor: 'pointer' }} | ||||||
|               onClick={() => { |               onClick={() => { | ||||||
| @@ -312,6 +328,7 @@ const ChannelsTable = () => { | |||||||
|                 <Table.Row key={channel.id}> |                 <Table.Row key={channel.id}> | ||||||
|                   <Table.Cell>{channel.id}</Table.Cell> |                   <Table.Cell>{channel.id}</Table.Cell> | ||||||
|                   <Table.Cell>{channel.name ? channel.name : '无'}</Table.Cell> |                   <Table.Cell>{channel.name ? channel.name : '无'}</Table.Cell> | ||||||
|  |                   <Table.Cell>{renderGroup(channel.group)}</Table.Cell> | ||||||
|                   <Table.Cell>{renderType(channel.type)}</Table.Cell> |                   <Table.Cell>{renderType(channel.type)}</Table.Cell> | ||||||
|                   <Table.Cell>{renderStatus(channel.status)}</Table.Cell> |                   <Table.Cell>{renderStatus(channel.status)}</Table.Cell> | ||||||
|                   <Table.Cell> |                   <Table.Cell> | ||||||
| @@ -326,7 +343,7 @@ const ChannelsTable = () => { | |||||||
|                     <Popup |                     <Popup | ||||||
|                       content={channel.balance_updated_time ? renderTimestamp(channel.balance_updated_time) : '未更新'} |                       content={channel.balance_updated_time ? renderTimestamp(channel.balance_updated_time) : '未更新'} | ||||||
|                       key={channel.id} |                       key={channel.id} | ||||||
|                       trigger={<span>${channel.balance.toFixed(2)}</span>} |                       trigger={renderBalance(channel.type, channel.balance)} | ||||||
|                       basic |                       basic | ||||||
|                     /> |                     /> | ||||||
|                   </Table.Cell> |                   </Table.Cell> | ||||||
| @@ -398,14 +415,14 @@ const ChannelsTable = () => { | |||||||
|  |  | ||||||
|         <Table.Footer> |         <Table.Footer> | ||||||
|           <Table.Row> |           <Table.Row> | ||||||
|             <Table.HeaderCell colSpan='7'> |             <Table.HeaderCell colSpan='8'> | ||||||
|               <Button size='small' as={Link} to='/channel/add' loading={loading}> |               <Button size='small' as={Link} to='/channel/add' loading={loading}> | ||||||
|                 添加新的渠道 |                 添加新的渠道 | ||||||
|               </Button> |               </Button> | ||||||
|               <Button size='small' loading={loading} onClick={testAllChannels}> |               <Button size='small' loading={loading} onClick={testAllChannels}> | ||||||
|                 测试所有已启用通道 |                 测试所有已启用通道 | ||||||
|               </Button> |               </Button> | ||||||
|               <Button size='small' onClick={updateAllChannelsBalance} loading={updatingBalance}>更新所有已启用通道余额</Button> |               <Button size='small' onClick={updateAllChannelsBalance} loading={loading || updatingBalance}>更新所有已启用通道余额</Button> | ||||||
|               <Pagination |               <Pagination | ||||||
|                 floated='right' |                 floated='right' | ||||||
|                 activePage={activePage} |                 activePage={activePage} | ||||||
|   | |||||||
| @@ -41,6 +41,11 @@ const headerButtons = [ | |||||||
|     icon: 'user', |     icon: 'user', | ||||||
|     admin: true, |     admin: true, | ||||||
|   }, |   }, | ||||||
|  |   { | ||||||
|  |     name: '日志', | ||||||
|  |     to: '/log', | ||||||
|  |     icon: 'book', | ||||||
|  |   }, | ||||||
|   { |   { | ||||||
|     name: '设置', |     name: '设置', | ||||||
|     to: '/setting', |     to: '/setting', | ||||||
|   | |||||||
							
								
								
									
										256
									
								
								web/src/components/LogsTable.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										256
									
								
								web/src/components/LogsTable.js
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,256 @@ | |||||||
|  | import React, { useEffect, useState } from 'react'; | ||||||
|  | import { Button, Label, Pagination, Select, Table } from 'semantic-ui-react'; | ||||||
|  | import { API, isAdmin, showError, timestamp2string } from '../helpers'; | ||||||
|  |  | ||||||
|  | import { ITEMS_PER_PAGE } from '../constants'; | ||||||
|  |  | ||||||
|  | function renderTimestamp(timestamp) { | ||||||
|  |   return ( | ||||||
|  |     <> | ||||||
|  |       {timestamp2string(timestamp)} | ||||||
|  |     </> | ||||||
|  |   ); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | const MODE_OPTIONS = [ | ||||||
|  |   { key: 'all', text: '全部用户', value: 'all' }, | ||||||
|  |   { key: 'self', text: '当前用户', value: 'self' }, | ||||||
|  | ]; | ||||||
|  |  | ||||||
|  | const LOG_OPTIONS = [ | ||||||
|  |   { key: '0', text: '全部', value: 0 }, | ||||||
|  |   { key: '1', text: '充值', value: 1 }, | ||||||
|  |   { key: '2', text: '消费', value: 2 }, | ||||||
|  |   { key: '3', text: '管理', value: 3 }, | ||||||
|  |   { key: '4', text: '系统', value: 4 } | ||||||
|  | ]; | ||||||
|  |  | ||||||
|  | function renderType(type) { | ||||||
|  |   switch (type) { | ||||||
|  |     case 1: | ||||||
|  |       return <Label basic color='green'> 充值 </Label>; | ||||||
|  |     case 2: | ||||||
|  |       return <Label basic color='olive'> 消费 </Label>; | ||||||
|  |     case 3: | ||||||
|  |       return <Label basic color='orange'> 管理 </Label>; | ||||||
|  |     case 4: | ||||||
|  |       return <Label basic color='purple'> 系统 </Label>; | ||||||
|  |     default: | ||||||
|  |       return <Label basic color='black'> 未知 </Label>; | ||||||
|  |   } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | const LogsTable = () => { | ||||||
|  |   const [logs, setLogs] = useState([]); | ||||||
|  |   const [loading, setLoading] = useState(true); | ||||||
|  |   const [activePage, setActivePage] = useState(1); | ||||||
|  |   const [searchKeyword, setSearchKeyword] = useState(''); | ||||||
|  |   const [searching, setSearching] = useState(false); | ||||||
|  |   const [logType, setLogType] = useState(0); | ||||||
|  |   const [mode, setMode] = useState('self'); // all, self | ||||||
|  |   const showModePanel = isAdmin(); | ||||||
|  |  | ||||||
|  |   const loadLogs = async (startIdx) => { | ||||||
|  |     let url = `/api/log/self/?p=${startIdx}&type=${logType}`; | ||||||
|  |     if (mode === 'all') { | ||||||
|  |       url = `/api/log/?p=${startIdx}&type=${logType}`; | ||||||
|  |     } | ||||||
|  |     const res = await API.get(url); | ||||||
|  |     const { success, message, data } = res.data; | ||||||
|  |     if (success) { | ||||||
|  |       if (startIdx === 0) { | ||||||
|  |         setLogs(data); | ||||||
|  |       } else { | ||||||
|  |         let newLogs = logs; | ||||||
|  |         newLogs.push(...data); | ||||||
|  |         setLogs(newLogs); | ||||||
|  |       } | ||||||
|  |     } else { | ||||||
|  |       showError(message); | ||||||
|  |     } | ||||||
|  |     setLoading(false); | ||||||
|  |   }; | ||||||
|  |  | ||||||
|  |   const onPaginationChange = (e, { activePage }) => { | ||||||
|  |     (async () => { | ||||||
|  |       if (activePage === Math.ceil(logs.length / ITEMS_PER_PAGE) + 1) { | ||||||
|  |         // In this case we have to load more data and then append them. | ||||||
|  |         await loadLogs(activePage - 1); | ||||||
|  |       } | ||||||
|  |       setActivePage(activePage); | ||||||
|  |     })(); | ||||||
|  |   }; | ||||||
|  |  | ||||||
|  |   const refresh = async () => { | ||||||
|  |     setLoading(true); | ||||||
|  |     await loadLogs(0); | ||||||
|  |   }; | ||||||
|  |  | ||||||
|  |   useEffect(() => { | ||||||
|  |     loadLogs(0) | ||||||
|  |       .then() | ||||||
|  |       .catch((reason) => { | ||||||
|  |         showError(reason); | ||||||
|  |       }); | ||||||
|  |   }, []); | ||||||
|  |  | ||||||
|  |   useEffect(() => { | ||||||
|  |     refresh().then(); | ||||||
|  |   }, [mode, logType]); | ||||||
|  |  | ||||||
|  |   const searchLogs = async () => { | ||||||
|  |     if (searchKeyword === '') { | ||||||
|  |       // if keyword is blank, load files instead. | ||||||
|  |       await loadLogs(0); | ||||||
|  |       setActivePage(1); | ||||||
|  |       return; | ||||||
|  |     } | ||||||
|  |     setSearching(true); | ||||||
|  |     const res = await API.get(`/api/log/self/search?keyword=${searchKeyword}`); | ||||||
|  |     const { success, message, data } = res.data; | ||||||
|  |     if (success) { | ||||||
|  |       setLogs(data); | ||||||
|  |       setActivePage(1); | ||||||
|  |     } else { | ||||||
|  |       showError(message); | ||||||
|  |     } | ||||||
|  |     setSearching(false); | ||||||
|  |   }; | ||||||
|  |  | ||||||
|  |   const handleKeywordChange = async (e, { value }) => { | ||||||
|  |     setSearchKeyword(value.trim()); | ||||||
|  |   }; | ||||||
|  |  | ||||||
|  |   const sortLog = (key) => { | ||||||
|  |     if (logs.length === 0) return; | ||||||
|  |     setLoading(true); | ||||||
|  |     let sortedLogs = [...logs]; | ||||||
|  |     sortedLogs.sort((a, b) => { | ||||||
|  |       return ('' + a[key]).localeCompare(b[key]); | ||||||
|  |     }); | ||||||
|  |     if (sortedLogs[0].id === logs[0].id) { | ||||||
|  |       sortedLogs.reverse(); | ||||||
|  |     } | ||||||
|  |     setLogs(sortedLogs); | ||||||
|  |     setLoading(false); | ||||||
|  |   }; | ||||||
|  |  | ||||||
|  |   return ( | ||||||
|  |     <> | ||||||
|  |       <Table basic> | ||||||
|  |         <Table.Header> | ||||||
|  |           <Table.Row> | ||||||
|  |             <Table.HeaderCell | ||||||
|  |               style={{ cursor: 'pointer' }} | ||||||
|  |               onClick={() => { | ||||||
|  |                 sortLog('created_time'); | ||||||
|  |               }} | ||||||
|  |               width={3} | ||||||
|  |             > | ||||||
|  |               时间 | ||||||
|  |             </Table.HeaderCell> | ||||||
|  |             { | ||||||
|  |               showModePanel && ( | ||||||
|  |                 <Table.HeaderCell | ||||||
|  |                   style={{ cursor: 'pointer' }} | ||||||
|  |                   onClick={() => { | ||||||
|  |                     sortLog('user_id'); | ||||||
|  |                   }} | ||||||
|  |                   width={1} | ||||||
|  |                 > | ||||||
|  |                   用户 | ||||||
|  |                 </Table.HeaderCell> | ||||||
|  |               ) | ||||||
|  |             } | ||||||
|  |             <Table.HeaderCell | ||||||
|  |               style={{ cursor: 'pointer' }} | ||||||
|  |               onClick={() => { | ||||||
|  |                 sortLog('type'); | ||||||
|  |               }} | ||||||
|  |               width={2} | ||||||
|  |             > | ||||||
|  |               类型 | ||||||
|  |             </Table.HeaderCell> | ||||||
|  |             <Table.HeaderCell | ||||||
|  |               style={{ cursor: 'pointer' }} | ||||||
|  |               onClick={() => { | ||||||
|  |                 sortLog('content'); | ||||||
|  |               }} | ||||||
|  |               width={showModePanel ? 10 : 11} | ||||||
|  |             > | ||||||
|  |               详情 | ||||||
|  |             </Table.HeaderCell> | ||||||
|  |           </Table.Row> | ||||||
|  |         </Table.Header> | ||||||
|  |  | ||||||
|  |         <Table.Body> | ||||||
|  |           {logs | ||||||
|  |             .slice( | ||||||
|  |               (activePage - 1) * ITEMS_PER_PAGE, | ||||||
|  |               activePage * ITEMS_PER_PAGE | ||||||
|  |             ) | ||||||
|  |             .map((log, idx) => { | ||||||
|  |               if (log.deleted) return <></>; | ||||||
|  |               return ( | ||||||
|  |                 <Table.Row key={log.created_at}> | ||||||
|  |                   <Table.Cell>{renderTimestamp(log.created_at)}</Table.Cell> | ||||||
|  |                   { | ||||||
|  |                     showModePanel && ( | ||||||
|  |                       <Table.Cell><Label>{log.user_id}</Label></Table.Cell> | ||||||
|  |                     ) | ||||||
|  |                   } | ||||||
|  |                   <Table.Cell>{renderType(log.type)}</Table.Cell> | ||||||
|  |                   <Table.Cell>{log.content}</Table.Cell> | ||||||
|  |                 </Table.Row> | ||||||
|  |               ); | ||||||
|  |             })} | ||||||
|  |         </Table.Body> | ||||||
|  |  | ||||||
|  |         <Table.Footer> | ||||||
|  |           <Table.Row> | ||||||
|  |             <Table.HeaderCell colSpan={showModePanel ? '5' : '4'}> | ||||||
|  |               { | ||||||
|  |                 showModePanel && ( | ||||||
|  |                   <Select | ||||||
|  |                     placeholder='选择模式' | ||||||
|  |                     options={MODE_OPTIONS} | ||||||
|  |                     style={{ marginRight: '8px' }} | ||||||
|  |                     name='mode' | ||||||
|  |                     value={mode} | ||||||
|  |                     onChange={(e, { name, value }) => { | ||||||
|  |                       setMode(value); | ||||||
|  |                     }} | ||||||
|  |                   /> | ||||||
|  |                 ) | ||||||
|  |               } | ||||||
|  |               <Select | ||||||
|  |                 placeholder='选择明细分类' | ||||||
|  |                 options={LOG_OPTIONS} | ||||||
|  |                 style={{ marginRight: '8px' }} | ||||||
|  |                 name='logType' | ||||||
|  |                 value={logType} | ||||||
|  |                 onChange={(e, { name, value }) => { | ||||||
|  |                   setLogType(value); | ||||||
|  |                 }} | ||||||
|  |               /> | ||||||
|  |               <Button size='small' onClick={refresh} loading={loading}>刷新</Button> | ||||||
|  |               <Pagination | ||||||
|  |                 floated='right' | ||||||
|  |                 activePage={activePage} | ||||||
|  |                 onPageChange={onPaginationChange} | ||||||
|  |                 size='small' | ||||||
|  |                 siblingRange={1} | ||||||
|  |                 totalPages={ | ||||||
|  |                   Math.ceil(logs.length / ITEMS_PER_PAGE) + | ||||||
|  |                   (logs.length % ITEMS_PER_PAGE === 0 ? 1 : 0) | ||||||
|  |                 } | ||||||
|  |               /> | ||||||
|  |             </Table.HeaderCell> | ||||||
|  |           </Table.Row> | ||||||
|  |         </Table.Footer> | ||||||
|  |       </Table> | ||||||
|  |     </> | ||||||
|  |   ); | ||||||
|  | }; | ||||||
|  |  | ||||||
|  | export default LogsTable; | ||||||
| @@ -30,6 +30,7 @@ const SystemSetting = () => { | |||||||
|     QuotaRemindThreshold: 0, |     QuotaRemindThreshold: 0, | ||||||
|     PreConsumedQuota: 0, |     PreConsumedQuota: 0, | ||||||
|     ModelRatio: '', |     ModelRatio: '', | ||||||
|  |     GroupRatio: '', | ||||||
|     TopUpLink: '', |     TopUpLink: '', | ||||||
|     AutomaticDisableChannelEnabled: '', |     AutomaticDisableChannelEnabled: '', | ||||||
|     ChannelDisableThreshold: 0, |     ChannelDisableThreshold: 0, | ||||||
| @@ -101,6 +102,7 @@ const SystemSetting = () => { | |||||||
|       name === 'QuotaRemindThreshold' || |       name === 'QuotaRemindThreshold' || | ||||||
|       name === 'PreConsumedQuota' || |       name === 'PreConsumedQuota' || | ||||||
|       name === 'ModelRatio' || |       name === 'ModelRatio' || | ||||||
|  |       name === 'GroupRatio' || | ||||||
|       name === 'TopUpLink' |       name === 'TopUpLink' | ||||||
|     ) { |     ) { | ||||||
|       setInputs((inputs) => ({ ...inputs, [name]: value })); |       setInputs((inputs) => ({ ...inputs, [name]: value })); | ||||||
| @@ -131,6 +133,13 @@ const SystemSetting = () => { | |||||||
|       } |       } | ||||||
|       await updateOption('ModelRatio', inputs.ModelRatio); |       await updateOption('ModelRatio', inputs.ModelRatio); | ||||||
|     } |     } | ||||||
|  |     if (originInputs['GroupRatio'] !== inputs.GroupRatio) { | ||||||
|  |       if (!verifyJSON(inputs.GroupRatio)) { | ||||||
|  |         showError('分组倍率不是合法的 JSON 字符串'); | ||||||
|  |         return; | ||||||
|  |       } | ||||||
|  |       await updateOption('GroupRatio', inputs.GroupRatio); | ||||||
|  |     } | ||||||
|     if (originInputs['TopUpLink'] !== inputs.TopUpLink) { |     if (originInputs['TopUpLink'] !== inputs.TopUpLink) { | ||||||
|       await updateOption('TopUpLink', inputs.TopUpLink); |       await updateOption('TopUpLink', inputs.TopUpLink); | ||||||
|     } |     } | ||||||
| @@ -329,6 +338,17 @@ const SystemSetting = () => { | |||||||
|               placeholder='为一个 JSON 文本,键为模型名称,值为倍率' |               placeholder='为一个 JSON 文本,键为模型名称,值为倍率' | ||||||
|             /> |             /> | ||||||
|           </Form.Group> |           </Form.Group> | ||||||
|  |           <Form.Group widths='equal'> | ||||||
|  |             <Form.TextArea | ||||||
|  |               label='分组倍率' | ||||||
|  |               name='GroupRatio' | ||||||
|  |               onChange={handleInputChange} | ||||||
|  |               style={{ minHeight: 250, fontFamily: 'JetBrains Mono, Consolas' }} | ||||||
|  |               autoComplete='new-password' | ||||||
|  |               value={inputs.GroupRatio} | ||||||
|  |               placeholder='为一个 JSON 文本,键为分组名称,值为倍率' | ||||||
|  |             /> | ||||||
|  |           </Form.Group> | ||||||
|           <Form.Button onClick={submitOperationConfig}>保存运营设置</Form.Button> |           <Form.Button onClick={submitOperationConfig}>保存运营设置</Form.Button> | ||||||
|           <Divider /> |           <Divider /> | ||||||
|           <Header as='h3'> |           <Header as='h3'> | ||||||
|   | |||||||
| @@ -238,11 +238,12 @@ const TokensTable = () => { | |||||||
|                         size={'small'} |                         size={'small'} | ||||||
|                         positive |                         positive | ||||||
|                         onClick={async () => { |                         onClick={async () => { | ||||||
|                           if (await copy(token.key)) { |                           let key = "sk-" + token.key; | ||||||
|  |                           if (await copy(key)) { | ||||||
|                             showSuccess('已复制到剪贴板!'); |                             showSuccess('已复制到剪贴板!'); | ||||||
|                           } else { |                           } else { | ||||||
|                             showWarning('无法复制到剪贴板,请手动复制,已将令牌填入搜索框。'); |                             showWarning('无法复制到剪贴板,请手动复制,已将令牌填入搜索框。'); | ||||||
|                             setSearchKeyword(token.key); |                             setSearchKeyword(key); | ||||||
|                           } |                           } | ||||||
|                         }} |                         }} | ||||||
|                       > |                       > | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ import { Link } from 'react-router-dom'; | |||||||
| import { API, showError, showSuccess } from '../helpers'; | import { API, showError, showSuccess } from '../helpers'; | ||||||
|  |  | ||||||
| import { ITEMS_PER_PAGE } from '../constants'; | import { ITEMS_PER_PAGE } from '../constants'; | ||||||
| import { renderText } from '../helpers/render'; | import { renderGroup, renderText } from '../helpers/render'; | ||||||
|  |  | ||||||
| function renderRole(role) { | function renderRole(role) { | ||||||
|   switch (role) { |   switch (role) { | ||||||
| @@ -175,6 +175,14 @@ const UsersTable = () => { | |||||||
|             > |             > | ||||||
|               用户名 |               用户名 | ||||||
|             </Table.HeaderCell> |             </Table.HeaderCell> | ||||||
|  |             <Table.HeaderCell | ||||||
|  |               style={{ cursor: 'pointer' }} | ||||||
|  |               onClick={() => { | ||||||
|  |                 sortUser('group'); | ||||||
|  |               }} | ||||||
|  |             > | ||||||
|  |               分组 | ||||||
|  |             </Table.HeaderCell> | ||||||
|             <Table.HeaderCell |             <Table.HeaderCell | ||||||
|               style={{ cursor: 'pointer' }} |               style={{ cursor: 'pointer' }} | ||||||
|               onClick={() => { |               onClick={() => { | ||||||
| @@ -231,6 +239,7 @@ const UsersTable = () => { | |||||||
|                       hoverable |                       hoverable | ||||||
|                     /> |                     /> | ||||||
|                   </Table.Cell> |                   </Table.Cell> | ||||||
|  |                   <Table.Cell>{renderGroup(user.group)}</Table.Cell> | ||||||
|                   <Table.Cell>{user.email ? renderText(user.email, 30) : '无'}</Table.Cell> |                   <Table.Cell>{user.email ? renderText(user.email, 30) : '无'}</Table.Cell> | ||||||
|                   <Table.Cell>{user.quota}</Table.Cell> |                   <Table.Cell>{user.quota}</Table.Cell> | ||||||
|                   <Table.Cell>{renderRole(user.role)}</Table.Cell> |                   <Table.Cell>{renderRole(user.role)}</Table.Cell> | ||||||
| @@ -293,7 +302,6 @@ const UsersTable = () => { | |||||||
|                         size={'small'} |                         size={'small'} | ||||||
|                         as={Link} |                         as={Link} | ||||||
|                         to={'/user/edit/' + user.id} |                         to={'/user/edit/' + user.id} | ||||||
|                         disabled={user.role === 100} |  | ||||||
|                       > |                       > | ||||||
|                         编辑 |                         编辑 | ||||||
|                       </Button> |                       </Button> | ||||||
| @@ -306,7 +314,7 @@ const UsersTable = () => { | |||||||
|  |  | ||||||
|         <Table.Footer> |         <Table.Footer> | ||||||
|           <Table.Row> |           <Table.Row> | ||||||
|             <Table.HeaderCell colSpan='7'> |             <Table.HeaderCell colSpan='8'> | ||||||
|               <Button size='small' as={Link} to='/user/add' loading={loading}> |               <Button size='small' as={Link} to='/user/add' loading={loading}> | ||||||
|                 添加新的用户 |                 添加新的用户 | ||||||
|               </Button> |               </Button> | ||||||
|   | |||||||
| @@ -1,6 +1,19 @@ | |||||||
|  | import { Label } from 'semantic-ui-react'; | ||||||
|  |  | ||||||
| export function renderText(text, limit) { | export function renderText(text, limit) { | ||||||
|   if (text.length > limit) { |   if (text.length > limit) { | ||||||
|     return text.slice(0, limit - 3) + '...'; |     return text.slice(0, limit - 3) + '...'; | ||||||
|   } |   } | ||||||
|   return text; |   return text; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | export function renderGroup(group) { | ||||||
|  |   if (group === "") { | ||||||
|  |     return <Label>default</Label> | ||||||
|  |   } else if (group === "vip" || group === "pro") { | ||||||
|  |     return <Label color='yellow'>{group}</Label> | ||||||
|  |   } else if (group === "svip" || group === "premium") { | ||||||
|  |     return <Label color='red'>{group}</Label> | ||||||
|  |   } | ||||||
|  |   return <Label>{group}</Label> | ||||||
| } | } | ||||||
| @@ -1,7 +1,7 @@ | |||||||
| import React, { useEffect, useState } from 'react'; | import React, { useEffect, useState } from 'react'; | ||||||
| import { Button, Form, Header, Message, Segment } from 'semantic-ui-react'; | import { Button, Form, Header, Message, Segment } from 'semantic-ui-react'; | ||||||
| import { useParams } from 'react-router-dom'; | import { useParams } from 'react-router-dom'; | ||||||
| import { API, showError, showSuccess } from '../../helpers'; | import { API, showError, showInfo, showSuccess } from '../../helpers'; | ||||||
| import { CHANNEL_OPTIONS } from '../../constants'; | import { CHANNEL_OPTIONS } from '../../constants'; | ||||||
|  |  | ||||||
| const EditChannel = () => { | const EditChannel = () => { | ||||||
| @@ -14,12 +14,17 @@ const EditChannel = () => { | |||||||
|     type: 1, |     type: 1, | ||||||
|     key: '', |     key: '', | ||||||
|     base_url: '', |     base_url: '', | ||||||
|     other: '' |     other: '', | ||||||
|  |     group: 'default', | ||||||
|  |     models: [], | ||||||
|   }; |   }; | ||||||
|   const [batch, setBatch] = useState(false); |   const [batch, setBatch] = useState(false); | ||||||
|   const [inputs, setInputs] = useState(originInputs); |   const [inputs, setInputs] = useState(originInputs); | ||||||
|  |   const [modelOptions, setModelOptions] = useState([]); | ||||||
|  |   const [groupOptions, setGroupOptions] = useState([]); | ||||||
|  |   const [basicModels, setBasicModels] = useState([]); | ||||||
|  |   const [fullModels, setFullModels] = useState([]); | ||||||
|   const handleInputChange = (e, { name, value }) => { |   const handleInputChange = (e, { name, value }) => { | ||||||
|     console.log(name, value); |  | ||||||
|     setInputs((inputs) => ({ ...inputs, [name]: value })); |     setInputs((inputs) => ({ ...inputs, [name]: value })); | ||||||
|   }; |   }; | ||||||
|  |  | ||||||
| @@ -27,21 +32,59 @@ const EditChannel = () => { | |||||||
|     let res = await API.get(`/api/channel/${channelId}`); |     let res = await API.get(`/api/channel/${channelId}`); | ||||||
|     const { success, message, data } = res.data; |     const { success, message, data } = res.data; | ||||||
|     if (success) { |     if (success) { | ||||||
|       data.password = ''; |       if (data.models === "") { | ||||||
|  |         data.models = [] | ||||||
|  |       } else { | ||||||
|  |         data.models = data.models.split(",") | ||||||
|  |       } | ||||||
|       setInputs(data); |       setInputs(data); | ||||||
|     } else { |     } else { | ||||||
|       showError(message); |       showError(message); | ||||||
|     } |     } | ||||||
|     setLoading(false); |     setLoading(false); | ||||||
|   }; |   }; | ||||||
|  |  | ||||||
|  |   const fetchModels = async () => { | ||||||
|  |     try { | ||||||
|  |       let res = await API.get(`/api/channel/models`); | ||||||
|  |       setModelOptions(res.data.data.map((model) => ({ | ||||||
|  |         key: model.id, | ||||||
|  |         text: model.id, | ||||||
|  |         value: model.id, | ||||||
|  |       }))); | ||||||
|  |       setFullModels(res.data.data.map((model) => model.id)); | ||||||
|  |       setBasicModels(res.data.data.filter((model) => !model.id.startsWith("gpt-4")).map((model) => model.id)); | ||||||
|  |     } catch (error) { | ||||||
|  |       showError(error.message); | ||||||
|  |     } | ||||||
|  |   }; | ||||||
|  |  | ||||||
|  |   const fetchGroups = async () => { | ||||||
|  |     try { | ||||||
|  |       let res = await API.get(`/api/group/`); | ||||||
|  |       setGroupOptions(res.data.data.map((group) => ({ | ||||||
|  |         key: group, | ||||||
|  |         text: group, | ||||||
|  |         value: group, | ||||||
|  |       }))); | ||||||
|  |     } catch (error) { | ||||||
|  |       showError(error.message); | ||||||
|  |     } | ||||||
|  |   }; | ||||||
|  |  | ||||||
|   useEffect(() => { |   useEffect(() => { | ||||||
|     if (isEdit) { |     if (isEdit) { | ||||||
|       loadChannel().then(); |       loadChannel().then(); | ||||||
|     } |     } | ||||||
|  |     fetchModels().then(); | ||||||
|  |     fetchGroups().then(); | ||||||
|   }, []); |   }, []); | ||||||
|  |  | ||||||
|   const submit = async () => { |   const submit = async () => { | ||||||
|     if (!isEdit && (inputs.name === '' || inputs.key === '')) return; |     if (!isEdit && (inputs.name === '' || inputs.key === '')) { | ||||||
|  |       showInfo('请填写渠道名称和渠道密钥!'); | ||||||
|  |       return; | ||||||
|  |     } | ||||||
|     let localInputs = inputs; |     let localInputs = inputs; | ||||||
|     if (localInputs.base_url.endsWith('/')) { |     if (localInputs.base_url.endsWith('/')) { | ||||||
|       localInputs.base_url = localInputs.base_url.slice(0, localInputs.base_url.length - 1); |       localInputs.base_url = localInputs.base_url.slice(0, localInputs.base_url.length - 1); | ||||||
| @@ -50,6 +93,7 @@ const EditChannel = () => { | |||||||
|       localInputs.other = '2023-03-15-preview'; |       localInputs.other = '2023-03-15-preview'; | ||||||
|     } |     } | ||||||
|     let res; |     let res; | ||||||
|  |     localInputs.models = localInputs.models.join(",") | ||||||
|     if (isEdit) { |     if (isEdit) { | ||||||
|       res = await API.put(`/api/channel/`, { ...localInputs, id: parseInt(channelId) }); |       res = await API.put(`/api/channel/`, { ...localInputs, id: parseInt(channelId) }); | ||||||
|     } else { |     } else { | ||||||
| @@ -86,7 +130,9 @@ const EditChannel = () => { | |||||||
|             inputs.type === 3 && ( |             inputs.type === 3 && ( | ||||||
|               <> |               <> | ||||||
|                 <Message> |                 <Message> | ||||||
|                   注意,<strong>模型部署名称必须和模型名称保持一致</strong>,因为 One API 会把请求体中的 model 参数替换为你的部署名称(模型名称中的点会被剔除)。 |                   注意,<strong>模型部署名称必须和模型名称保持一致</strong>,因为 One API 会把请求体中的 model | ||||||
|  |                   参数替换为你的部署名称(模型名称中的点会被剔除),<a target='_blank' | ||||||
|  |                                                                     href='https://github.com/songquanpeng/one-api/issues/133?notification_referrer_id=NT_kwDOAmJSYrM2NjIwMzI3NDgyOjM5OTk4MDUw#issuecomment-1571602271'>图片演示</a>。 | ||||||
|                 </Message> |                 </Message> | ||||||
|                 <Form.Field> |                 <Form.Field> | ||||||
|                   <Form.Input |                   <Form.Input | ||||||
| @@ -135,6 +181,58 @@ const EditChannel = () => { | |||||||
|               autoComplete='new-password' |               autoComplete='new-password' | ||||||
|             /> |             /> | ||||||
|           </Form.Field> |           </Form.Field> | ||||||
|  |           <Form.Field> | ||||||
|  |             <Form.Dropdown | ||||||
|  |               label='分组' | ||||||
|  |               placeholder={'请选择分组'} | ||||||
|  |               name='group' | ||||||
|  |               fluid | ||||||
|  |               search | ||||||
|  |               selection | ||||||
|  |               allowAdditions | ||||||
|  |               additionLabel={'请在系统设置页面编辑分组倍率以添加新的分组:'} | ||||||
|  |               onChange={handleInputChange} | ||||||
|  |               value={inputs.group} | ||||||
|  |               autoComplete='new-password' | ||||||
|  |               options={groupOptions} | ||||||
|  |             /> | ||||||
|  |           </Form.Field> | ||||||
|  |           <Form.Field> | ||||||
|  |             <Form.Dropdown | ||||||
|  |               label='模型' | ||||||
|  |               placeholder={'请选择该通道所支持的模型'} | ||||||
|  |               name='models' | ||||||
|  |               fluid | ||||||
|  |               multiple | ||||||
|  |               selection | ||||||
|  |               onChange={handleInputChange} | ||||||
|  |               value={inputs.models} | ||||||
|  |               autoComplete='new-password' | ||||||
|  |               options={modelOptions} | ||||||
|  |             /> | ||||||
|  |           </Form.Field> | ||||||
|  |           <div style={{ lineHeight: '40px', marginBottom: '12px'}}> | ||||||
|  |             <Button type={'button'} onClick={() => { | ||||||
|  |               handleInputChange(null, { name: 'models', value: basicModels }); | ||||||
|  |             }}>填入基础模型</Button> | ||||||
|  |             <Button type={'button'} onClick={() => { | ||||||
|  |               handleInputChange(null, { name: 'models', value: fullModels }); | ||||||
|  |             }}>填入所有模型</Button> | ||||||
|  |           </div> | ||||||
|  |           { | ||||||
|  |             inputs.type === 1 && ( | ||||||
|  |               <Form.Field> | ||||||
|  |                 <Form.Input | ||||||
|  |                   label='代理' | ||||||
|  |                   name='base_url' | ||||||
|  |                   placeholder={'请输入 OpenAI API 代理地址,如果不需要请留空,格式为:https://api.openai.com'} | ||||||
|  |                   onChange={handleInputChange} | ||||||
|  |                   value={inputs.base_url} | ||||||
|  |                   autoComplete='new-password' | ||||||
|  |                 /> | ||||||
|  |               </Form.Field> | ||||||
|  |             ) | ||||||
|  |           } | ||||||
|           { |           { | ||||||
|             batch ? <Form.Field> |             batch ? <Form.Field> | ||||||
|               <Form.TextArea |               <Form.TextArea | ||||||
| @@ -154,7 +252,7 @@ const EditChannel = () => { | |||||||
|                 onChange={handleInputChange} |                 onChange={handleInputChange} | ||||||
|                 value={inputs.key} |                 value={inputs.key} | ||||||
|                 autoComplete='new-password' |                 autoComplete='new-password' | ||||||
|                 /> |               /> | ||||||
|             </Form.Field> |             </Form.Field> | ||||||
|           } |           } | ||||||
|           { |           { | ||||||
| @@ -167,7 +265,7 @@ const EditChannel = () => { | |||||||
|               /> |               /> | ||||||
|             ) |             ) | ||||||
|           } |           } | ||||||
|           <Button onClick={submit}>提交</Button> |           <Button positive onClick={submit}>提交</Button> | ||||||
|         </Form> |         </Form> | ||||||
|       </Segment> |       </Segment> | ||||||
|     </> |     </> | ||||||
|   | |||||||
							
								
								
									
										14
									
								
								web/src/pages/Log/index.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								web/src/pages/Log/index.js
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,14 @@ | |||||||
|  | import React from 'react'; | ||||||
|  | import { Header, Segment } from 'semantic-ui-react'; | ||||||
|  | import LogsTable from '../../components/LogsTable'; | ||||||
|  |  | ||||||
|  | const Token = () => ( | ||||||
|  |   <> | ||||||
|  |     <Segment> | ||||||
|  |       <Header as='h3'>额度明细</Header> | ||||||
|  |       <LogsTable /> | ||||||
|  |     </Segment> | ||||||
|  |   </> | ||||||
|  | ); | ||||||
|  |  | ||||||
|  | export default Token; | ||||||
| @@ -111,7 +111,7 @@ const EditRedemption = () => { | |||||||
|               </Form.Field> |               </Form.Field> | ||||||
|             </> |             </> | ||||||
|           } |           } | ||||||
|           <Button onClick={submit}>提交</Button> |           <Button positive onClick={submit}>提交</Button> | ||||||
|         </Form> |         </Form> | ||||||
|       </Segment> |       </Segment> | ||||||
|     </> |     </> | ||||||
|   | |||||||
| @@ -106,6 +106,34 @@ const EditToken = () => { | |||||||
|               required={!isEdit} |               required={!isEdit} | ||||||
|             /> |             /> | ||||||
|           </Form.Field> |           </Form.Field> | ||||||
|  |           <Form.Field> | ||||||
|  |             <Form.Input | ||||||
|  |               label='过期时间' | ||||||
|  |               name='expired_time' | ||||||
|  |               placeholder={'请输入过期时间,格式为 yyyy-MM-dd HH:mm:ss,-1 表示无限制'} | ||||||
|  |               onChange={handleInputChange} | ||||||
|  |               value={expired_time} | ||||||
|  |               autoComplete='new-password' | ||||||
|  |               type='datetime-local' | ||||||
|  |             /> | ||||||
|  |           </Form.Field> | ||||||
|  |           <div style={{ lineHeight: '40px' }}> | ||||||
|  |             <Button type={'button'} onClick={() => { | ||||||
|  |               setExpiredTime(0, 0, 0, 0); | ||||||
|  |             }}>永不过期</Button> | ||||||
|  |             <Button type={'button'} onClick={() => { | ||||||
|  |               setExpiredTime(1, 0, 0, 0); | ||||||
|  |             }}>一个月后过期</Button> | ||||||
|  |             <Button type={'button'} onClick={() => { | ||||||
|  |               setExpiredTime(0, 1, 0, 0); | ||||||
|  |             }}>一天后过期</Button> | ||||||
|  |             <Button type={'button'} onClick={() => { | ||||||
|  |               setExpiredTime(0, 0, 1, 0); | ||||||
|  |             }}>一小时后过期</Button> | ||||||
|  |             <Button type={'button'} onClick={() => { | ||||||
|  |               setExpiredTime(0, 0, 0, 1); | ||||||
|  |             }}>一分钟后过期</Button> | ||||||
|  |           </div> | ||||||
|           <Message>注意,令牌的额度仅用于限制令牌本身的最大额度使用量,实际的使用受到账户的剩余额度限制。</Message> |           <Message>注意,令牌的额度仅用于限制令牌本身的最大额度使用量,实际的使用受到账户的剩余额度限制。</Message> | ||||||
|           <Form.Field> |           <Form.Field> | ||||||
|             <Form.Input |             <Form.Input | ||||||
| @@ -119,36 +147,10 @@ const EditToken = () => { | |||||||
|               disabled={unlimited_quota} |               disabled={unlimited_quota} | ||||||
|             /> |             /> | ||||||
|           </Form.Field> |           </Form.Field> | ||||||
|           <Button type={'button'} style={{ marginBottom: '14px' }} onClick={() => { |           <Button type={'button'} onClick={() => { | ||||||
|             setUnlimitedQuota(); |             setUnlimitedQuota(); | ||||||
|           }}>{unlimited_quota ? '取消无限额度' : '设置为无限额度'}</Button> |           }}>{unlimited_quota ? '取消无限额度' : '设置为无限额度'}</Button> | ||||||
|           <Form.Field> |           <Button positive onClick={submit}>提交</Button> | ||||||
|             <Form.Input |  | ||||||
|               label='过期时间' |  | ||||||
|               name='expired_time' |  | ||||||
|               placeholder={'请输入过期时间,格式为 yyyy-MM-dd HH:mm:ss,-1 表示无限制'} |  | ||||||
|               onChange={handleInputChange} |  | ||||||
|               value={expired_time} |  | ||||||
|               autoComplete='new-password' |  | ||||||
|               type='datetime-local' |  | ||||||
|             /> |  | ||||||
|           </Form.Field> |  | ||||||
|           <Button type={'button'} onClick={() => { |  | ||||||
|             setExpiredTime(0, 0, 0, 0); |  | ||||||
|           }}>永不过期</Button> |  | ||||||
|           <Button type={'button'} onClick={() => { |  | ||||||
|             setExpiredTime(1, 0, 0, 0); |  | ||||||
|           }}>一个月后过期</Button> |  | ||||||
|           <Button type={'button'} onClick={() => { |  | ||||||
|             setExpiredTime(0, 1, 0, 0); |  | ||||||
|           }}>一天后过期</Button> |  | ||||||
|           <Button type={'button'} onClick={() => { |  | ||||||
|             setExpiredTime(0, 0, 1, 0); |  | ||||||
|           }}>一小时后过期</Button> |  | ||||||
|           <Button type={'button'} onClick={() => { |  | ||||||
|             setExpiredTime(0, 0, 0, 1); |  | ||||||
|           }}>一分钟后过期</Button> |  | ||||||
|           <Button onClick={submit}>提交</Button> |  | ||||||
|         </Form> |         </Form> | ||||||
|       </Segment> |       </Segment> | ||||||
|     </> |     </> | ||||||
|   | |||||||
| @@ -65,7 +65,7 @@ const AddUser = () => { | |||||||
|               required |               required | ||||||
|             /> |             /> | ||||||
|           </Form.Field> |           </Form.Field> | ||||||
|           <Button type={'submit'} onClick={submit}> |           <Button positive type={'submit'} onClick={submit}> | ||||||
|             提交 |             提交 | ||||||
|           </Button> |           </Button> | ||||||
|         </Form> |         </Form> | ||||||
|   | |||||||
| @@ -15,12 +15,26 @@ const EditUser = () => { | |||||||
|     wechat_id: '', |     wechat_id: '', | ||||||
|     email: '', |     email: '', | ||||||
|     quota: 0, |     quota: 0, | ||||||
|  |     group: 'default' | ||||||
|   }); |   }); | ||||||
|   const { username, display_name, password, github_id, wechat_id, email, quota } = |   const [groupOptions, setGroupOptions] = useState([]); | ||||||
|  |   const { username, display_name, password, github_id, wechat_id, email, quota, group } = | ||||||
|     inputs; |     inputs; | ||||||
|   const handleInputChange = (e, { name, value }) => { |   const handleInputChange = (e, { name, value }) => { | ||||||
|     setInputs((inputs) => ({ ...inputs, [name]: value })); |     setInputs((inputs) => ({ ...inputs, [name]: value })); | ||||||
|   }; |   }; | ||||||
|  |   const fetchGroups = async () => { | ||||||
|  |     try { | ||||||
|  |       let res = await API.get(`/api/group/`); | ||||||
|  |       setGroupOptions(res.data.data.map((group) => ({ | ||||||
|  |         key: group, | ||||||
|  |         text: group, | ||||||
|  |         value: group, | ||||||
|  |       }))); | ||||||
|  |     } catch (error) { | ||||||
|  |       showError(error.message); | ||||||
|  |     } | ||||||
|  |   }; | ||||||
|  |  | ||||||
|   const loadUser = async () => { |   const loadUser = async () => { | ||||||
|     let res = undefined; |     let res = undefined; | ||||||
| @@ -40,6 +54,9 @@ const EditUser = () => { | |||||||
|   }; |   }; | ||||||
|   useEffect(() => { |   useEffect(() => { | ||||||
|     loadUser().then(); |     loadUser().then(); | ||||||
|  |     if (userId) { | ||||||
|  |       fetchGroups().then(); | ||||||
|  |     } | ||||||
|   }, []); |   }, []); | ||||||
|  |  | ||||||
|   const submit = async () => { |   const submit = async () => { | ||||||
| @@ -98,7 +115,23 @@ const EditUser = () => { | |||||||
|             /> |             /> | ||||||
|           </Form.Field> |           </Form.Field> | ||||||
|           { |           { | ||||||
|             userId && ( |             userId && <> | ||||||
|  |               <Form.Field> | ||||||
|  |                 <Form.Dropdown | ||||||
|  |                   label='分组' | ||||||
|  |                   placeholder={'请选择分组'} | ||||||
|  |                   name='group' | ||||||
|  |                   fluid | ||||||
|  |                   search | ||||||
|  |                   selection | ||||||
|  |                   allowAdditions | ||||||
|  |                   additionLabel={'请在系统设置页面编辑分组倍率以添加新的分组:'} | ||||||
|  |                   onChange={handleInputChange} | ||||||
|  |                   value={inputs.group} | ||||||
|  |                   autoComplete='new-password' | ||||||
|  |                   options={groupOptions} | ||||||
|  |                 /> | ||||||
|  |               </Form.Field> | ||||||
|               <Form.Field> |               <Form.Field> | ||||||
|                 <Form.Input |                 <Form.Input | ||||||
|                   label='剩余额度' |                   label='剩余额度' | ||||||
| @@ -110,7 +143,7 @@ const EditUser = () => { | |||||||
|                   autoComplete='new-password' |                   autoComplete='new-password' | ||||||
|                 /> |                 /> | ||||||
|               </Form.Field> |               </Form.Field> | ||||||
|             ) |             </> | ||||||
|           } |           } | ||||||
|           <Form.Field> |           <Form.Field> | ||||||
|             <Form.Input |             <Form.Input | ||||||
| @@ -142,7 +175,7 @@ const EditUser = () => { | |||||||
|               readOnly |               readOnly | ||||||
|             /> |             /> | ||||||
|           </Form.Field> |           </Form.Field> | ||||||
|           <Button onClick={submit}>提交</Button> |           <Button positive onClick={submit}>提交</Button> | ||||||
|         </Form> |         </Form> | ||||||
|       </Segment> |       </Segment> | ||||||
|     </> |     </> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user