Skip to content

phsl / new-api

Go to a project
Commit f73ecc57 by CaIon
Options

移除不必要的功能

parent e25bcce4
Showing with 261 additions and 334 deletions
common/constants.go
...@@ -13,6 +13,10 @@ var StartTime = time.Now().Unix() // unit: second ...@@ -13,6 +13,10 @@ var StartTime = time.Now().Unix() // unit: second
var Version = "v0.0.0" // this hard coding will be replaced automatically when building, no need to manually change var Version = "v0.0.0" // this hard coding will be replaced automatically when building, no need to manually change
var SystemName = "One API" var SystemName = "One API"
var ServerAddress = "http://localhost:3000" var ServerAddress = "http://localhost:3000"
var PayAddress = ""
var EpayId = ""
var EpayKey = ""
var Price = 7
var Footer = "" var Footer = ""
var Logo = "" var Logo = ""
var TopUpLink = "" var TopUpLink = ""
...@@ -94,10 +98,6 @@ var RequestInterval = time.Duration(requestInterval) * time.Second ...@@ -94,10 +98,6 @@ var RequestInterval = time.Duration(requestInterval) * time.Second
var SyncFrequency = 10 * 60 // unit is second, will be overwritten by SYNC_FREQUENCY var SyncFrequency = 10 * 60 // unit is second, will be overwritten by SYNC_FREQUENCY
var NormalPrice = 1.5
var StablePrice = 6.0
var BasePrice = 1.5
const ( const (
RoleGuestUser = 0 RoleGuestUser = 0
RoleCommonUser = 1 RoleCommonUser = 1
......
controller/midjourney.go
...@@ -19,66 +19,61 @@ func UpdateMidjourneyTask() { ...@@ -19,66 +19,61 @@ func UpdateMidjourneyTask() {
for { for {
defer func() { defer func() {
if err := recover(); err != nil { if err := recover(); err != nil {
log.Printf("UpdateMidjourneyTask: %v", err) log.Printf("UpdateMidjourneyTask panic: %v", err)
} }
}() }()
time.Sleep(time.Duration(15) * time.Second) time.Sleep(time.Duration(15) * time.Second)
tasks := model.GetAllUnFinishTasks() tasks := model.GetAllUnFinishTasks()
if len(tasks) != 0 { if len(tasks) != 0 {
//log.Printf("UpdateMidjourneyTask: %v", time.Now())
ids := make([]string, 0)
for _, task := range tasks { for _, task := range tasks {
ids = append(ids, task.MjId) midjourneyChannel, err := model.GetChannelById(task.ChannelId, true)
}
requestUrl := "http://107.173.171.147:8080/mj/task/list-by-condition"
requestBody := map[string]interface{}{
"ids": ids,
}
jsonStr, err := json.Marshal(requestBody)
if err != nil { if err != nil {
log.Printf("UpdateMidjourneyTask: %v", err) log.Printf("UpdateMidjourneyTask: %v", err)
task.FailReason = fmt.Sprintf("获取渠道信息失败，请联系管理员，渠道ID：%d", task.ChannelId)
task.Status = "FAILURE"
task.Progress = "100%"
err := task.Update()
if err != nil {
log.Printf("UpdateMidjourneyTask error: %v", err)
}
continue continue
} }
req, err := http.NewRequest("POST", requestUrl, bytes.NewBuffer(jsonStr)) requestUrl := fmt.Sprintf("%s/mj/task/%s/fetch", midjourneyChannel.BaseURL, task.MjId)
req, err := http.NewRequest("GET", requestUrl, bytes.NewBuffer([]byte("")))
if err != nil { if err != nil {
log.Printf("UpdateMidjourneyTask: %v", err) log.Printf("UpdateMidjourneyTask error: %v", err)
continue continue
} }
req.Header.Set("Content-Type", "application/json") req.Header.Set("Content-Type", "application/json")
req.Header.Set("mj-api-secret", "uhiftyuwadbkjshbiklahcuitguasguzhxliawodawdu") req.Header.Set("mj-api-secret", midjourneyChannel.Key)
resp, err := httpClient.Do(req) resp, err := httpClient.Do(req)
if err != nil { if err != nil {
log.Printf("UpdateMidjourneyTask: %v", err) log.Printf("UpdateMidjourneyTask error: %v", err)
continue continue
} }
defer resp.Body.Close() defer resp.Body.Close()
var response []Midjourney var responseItem Midjourney
err = json.NewDecoder(resp.Body).Decode(&response) err = json.NewDecoder(resp.Body).Decode(&responseItem)
if err != nil { if err != nil {
log.Printf("UpdateMidjourneyTask: %v", err) log.Printf("UpdateMidjourneyTask error: %v", err)
continue continue
} }
for _, responseItem := range response { task.Code = 1
var midjourneyTask *model.Midjourney task.Progress = responseItem.Progress
for _, mj := range tasks { task.PromptEn = responseItem.PromptEn
mj.MjId = responseItem.MjId task.State = responseItem.State
midjourneyTask = model.GetMjByuId(mj.Id) task.SubmitTime = responseItem.SubmitTime
} task.StartTime = responseItem.StartTime
if midjourneyTask != nil { task.FinishTime = responseItem.FinishTime
midjourneyTask.Code = 1 task.ImageUrl = responseItem.ImageUrl
midjourneyTask.Progress = responseItem.Progress task.Status = responseItem.Status
midjourneyTask.PromptEn = responseItem.PromptEn task.FailReason = responseItem.FailReason
midjourneyTask.State = responseItem.State if task.Progress != "100%" && responseItem.FailReason != "" {
midjourneyTask.SubmitTime = responseItem.SubmitTime log.Println(task.MjId + " 构建失败，" + task.FailReason)
midjourneyTask.StartTime = responseItem.StartTime task.Progress = "100%"
midjourneyTask.FinishTime = responseItem.FinishTime err = model.CacheUpdateUserQuota(task.UserId)
midjourneyTask.ImageUrl = responseItem.ImageUrl
midjourneyTask.Status = responseItem.Status
midjourneyTask.FailReason = responseItem.FailReason
if midjourneyTask.Progress != "100%" && responseItem.FailReason != "" {
log.Println(midjourneyTask.MjId + " 构建失败，" + midjourneyTask.FailReason)
midjourneyTask.Progress = "100%"
err = model.CacheUpdateUserQuota(midjourneyTask.UserId)
if err != nil { if err != nil {
log.Println("error update user quota cache: " + err.Error()) log.Println("error update user quota cache: " + err.Error())
} else { } else {
...@@ -87,22 +82,21 @@ func UpdateMidjourneyTask() { ...@@ -87,22 +82,21 @@ func UpdateMidjourneyTask() {
ratio := modelRatio * groupRatio ratio := modelRatio * groupRatio
quota := int(ratio * 1 * 1000) quota := int(ratio * 1 * 1000)
if quota != 0 { if quota != 0 {
err := model.IncreaseUserQuota(midjourneyTask.UserId, quota) err := model.IncreaseUserQuota(task.UserId, quota)
if err != nil { if err != nil {
log.Println("fail to increase user quota") log.Println("fail to increase user quota")
} }
logContent := fmt.Sprintf("%s 构图失败，补偿 %s", midjourneyTask.MjId, common.LogQuota(quota)) logContent := fmt.Sprintf("%s 构图失败，补偿 %s", task.MjId, common.LogQuota(quota))
model.RecordLog(midjourneyTask.UserId, 1, logContent) model.RecordLog(task.UserId, 1, logContent)
} }
} }
} }
err = midjourneyTask.Update() err = task.Update()
if err != nil { if err != nil {
log.Printf("UpdateMidjourneyTaskFail: %v", err) log.Printf("UpdateMidjourneyTask error: %v", err)
}
log.Printf("UpdateMidjourneyTask: %v", midjourneyTask)
} }
log.Printf("UpdateMidjourneyTask success: %v", task)
} }
} }
} }
......
controller/misc.go
...@@ -27,15 +27,16 @@ func GetStatus(c *gin.Context) { ...@@ -27,15 +27,16 @@ func GetStatus(c *gin.Context) {
"wechat_qrcode": common.WeChatAccountQRCodeImageURL, "wechat_qrcode": common.WeChatAccountQRCodeImageURL,
"wechat_login": common.WeChatAuthEnabled, "wechat_login": common.WeChatAuthEnabled,
"server_address": common.ServerAddress, "server_address": common.ServerAddress,
"pay_address": common.PayAddress,
"epay_id": common.EpayId,
"epay_key": common.EpayKey,
"price": common.Price,
"turnstile_check": common.TurnstileCheckEnabled, "turnstile_check": common.TurnstileCheckEnabled,
"turnstile_site_key": common.TurnstileSiteKey, "turnstile_site_key": common.TurnstileSiteKey,
"top_up_link": common.TopUpLink, "top_up_link": common.TopUpLink,
"chat_link": common.ChatLink, "chat_link": common.ChatLink,
"quota_per_unit": common.QuotaPerUnit, "quota_per_unit": common.QuotaPerUnit,
"display_in_currency": common.DisplayInCurrencyEnabled, "display_in_currency": common.DisplayInCurrencyEnabled,
"normal_price": common.NormalPrice,
"stable_price": common.StablePrice,
"base_price": common.BasePrice,
}, },
}) })
return return
......
controller/relay-mj.go
...@@ -356,6 +356,7 @@ func relayMidjourneySubmit(c *gin.Context, relayMode int) *MidjourneyResponse { ...@@ -356,6 +356,7 @@ func relayMidjourneySubmit(c *gin.Context, relayMode int) *MidjourneyResponse {
Status: "", Status: "",
Progress: "0%", Progress: "0%",
FailReason: "", FailReason: "",
ChannelId: c.GetInt("channel_id"),
} }
if midjResponse.Code == 4 || midjResponse.Code == 24 { if midjResponse.Code == 4 || midjResponse.Code == 24 {
midjourneyTask.FailReason = midjResponse.Description midjourneyTask.FailReason = midjResponse.Description
......
controller/relay-text.go
...@@ -105,7 +105,6 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode { ...@@ -105,7 +105,6 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
case common.ChannelTypeXunfei: case common.ChannelTypeXunfei:
apiType = APITypeXunfei apiType = APITypeXunfei
} }
isStable := c.GetBool("stable")
baseURL := common.ChannelBaseURLs[channelType] baseURL := common.ChannelBaseURLs[channelType]
requestURL := c.Request.URL.String() requestURL := c.Request.URL.String()
...@@ -189,15 +188,10 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode { ...@@ -189,15 +188,10 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
preConsumedTokens = promptTokens + textRequest.MaxTokens preConsumedTokens = promptTokens + textRequest.MaxTokens
} }
modelRatio := common.GetModelRatio(textRequest.Model) modelRatio := common.GetModelRatio(textRequest.Model)
stableRatio := modelRatio
groupRatio := common.GetGroupRatio(group) groupRatio := common.GetGroupRatio(group)
ratio := modelRatio * groupRatio ratio := modelRatio * groupRatio
preConsumedQuota := int(float64(preConsumedTokens) * ratio) preConsumedQuota := int(float64(preConsumedTokens) * ratio)
userQuota, err := model.CacheGetUserQuota(userId) userQuota, err := model.CacheGetUserQuota(userId)
if isStable {
stableRatio = (common.StablePrice / common.BasePrice) * modelRatio
ratio = stableRatio * groupRatio
}
if err != nil { if err != nil {
return errorWrapper(err, "get_user_quota_failed", http.StatusInternalServerError) return errorWrapper(err, "get_user_quota_failed", http.StatusInternalServerError)
} }
......
controller/topup.go
...@@ -24,31 +24,23 @@ type AmountRequest struct { ...@@ -24,31 +24,23 @@ type AmountRequest struct {
TopUpCode string `json:"top_up_code"` TopUpCode string `json:"top_up_code"`
} }
//var client, _ = epay.NewClientWithUrl(&epay.Config{ func GetEpayClient() *epay.Client {
// PartnerID: "1096", if common.PayAddress == "" || common.EpayId == "" || common.EpayKey == "" {
// Key: "n08V9LpE8JffA3NPP893689u8p39NV9J", return nil
//}, "https://api.lempay.org") }
withUrl, err := epay.NewClientWithUrl(&epay.Config{
var client, _ = epay.NewClientWithUrl(&epay.Config{ PartnerID: common.EpayId,
PartnerID: "1064", Key: common.EpayKey,
Key: "nqrrZ5RjR86mKP8rKkyrOY5Pg8NmYfKR", }, common.PayAddress)
}, "https://pay.yunjuw.cn") if err != nil {
return nil
func GetAmount(id int, count float64, topUpCode string) float64 {
amount := count * 1.5
if topUpCode != "" {
if topUpCode == "nekoapi" {
if id == 89 {
amount = count * 0.8
} else if id == 105 || id == 107 {
amount = count * 1.2
} else if id == 1 {
amount = count * 1
} else if id == 98 {
amount = count * 1.1
}
}
} }
return withUrl
}
func GetAmount(count float64) float64 {
// 别问为什么用float64，问就是这么点钱没必要
amount := count * float64(common.Price)
return amount return amount
} }
...@@ -60,38 +52,24 @@ func RequestEpay(c *gin.Context) { ...@@ -60,38 +52,24 @@ func RequestEpay(c *gin.Context) {
return return
} }
id := c.GetInt("id") id := c.GetInt("id")
amount := GetAmount(id, float64(req.Amount), req.TopUpCode) amount := GetAmount(float64(req.Amount))
if id != 1 {
if req.Amount < 10 {
c.JSON(200, gin.H{"message": "最小充值10元", "data": amount, "count": 10})
return
}
}
if req.PaymentMethod == "zfb" { if req.PaymentMethod == "zfb" {
if amount > 2000 {
c.JSON(200, gin.H{"message": "支付宝最大充值2000元", "data": amount, "count": 2000})
return
}
req.PaymentMethod = "alipay" req.PaymentMethod = "alipay"
} }
if req.PaymentMethod == "wx" { if req.PaymentMethod == "wx" {
if amount > 2000 {
c.JSON(200, gin.H{"message": "微信最大充值2000元", "data": amount, "count": 2000})
return
}
req.PaymentMethod = "wxpay" req.PaymentMethod = "wxpay"
} }
returnUrl, _ := url.Parse("https://nekoapi.com/log") returnUrl, _ := url.Parse(common.ServerAddress + "/log")
notifyUrl, _ := url.Parse("https://nekoapi.com/api/user/epay/notify") notifyUrl, _ := url.Parse(common.ServerAddress + "/api/user/epay/notify")
tradeNo := strconv.FormatInt(time.Now().Unix(), 10) tradeNo := strconv.FormatInt(time.Now().Unix(), 10)
payMoney := amount payMoney := amount
//if payMoney < 400 { client := GetEpayClient()
// payMoney = amount * 0.99 if client == nil {
// if amount-payMoney > 2 { c.JSON(200, gin.H{"message": "error", "data": "当前管理员未配置支付信息"})
// payMoney = amount - 2 return
// } }
//}
uri, params, err := client.Purchase(&epay.PurchaseArgs{ uri, params, err := client.Purchase(&epay.PurchaseArgs{
Type: epay.PurchaseType(req.PaymentMethod), Type: epay.PurchaseType(req.PaymentMethod),
ServiceTradeNo: "A" + tradeNo, ServiceTradeNo: "A" + tradeNo,
...@@ -126,6 +104,14 @@ func EpayNotify(c *gin.Context) { ...@@ -126,6 +104,14 @@ func EpayNotify(c *gin.Context) {
r[t] = c.Request.URL.Query().Get(t) r[t] = c.Request.URL.Query().Get(t)
return r return r
}, map[string]string{}) }, map[string]string{})
client := GetEpayClient()
if client == nil {
log.Println("易支付回调失败 未找到配置信息")
_, err := c.Writer.Write([]byte("fail"))
if err != nil {
log.Println("易支付回调写入失败")
}
}
verifyInfo, err := client.Verify(params) verifyInfo, err := client.Verify(params)
if err == nil && verifyInfo.VerifyStatus { if err == nil && verifyInfo.VerifyStatus {
_, err := c.Writer.Write([]byte("success")) _, err := c.Writer.Write([]byte("success"))
...@@ -168,20 +154,9 @@ func RequestAmount(c *gin.Context) { ...@@ -168,20 +154,9 @@ func RequestAmount(c *gin.Context) {
var req AmountRequest var req AmountRequest
err := c.ShouldBindJSON(&req) err := c.ShouldBindJSON(&req)
if err != nil { if err != nil {
c.JSON(200, gin.H{"message": err.Error(), "data": 10}) c.JSON(200, gin.H{"message": "error", "data": "参数错误"})
return
}
id := c.GetInt("id")
if id != 1 {
if req.Amount < 10 {
c.JSON(200, gin.H{"message": "最小充值10刀", "data": GetAmount(id, 10, req.TopUpCode), "count": 10})
return return
} }
//if req.Amount > 1500 {
// c.JSON(200, gin.H{"message": "最大充值1000刀", "data": GetAmount(id, 1000, req.TopUpCode), "count": 1500})
// return
//}
}
c.JSON(200, gin.H{"message": "success", "data": GetAmount(id, float64(req.Amount), req.TopUpCode)}) c.JSON(200, gin.H{"message": "success", "data": GetAmount(float64(req.Amount))})
} }
middleware/distributor.go
...@@ -95,43 +95,14 @@ func Distribute() func(c *gin.Context) { ...@@ -95,43 +95,14 @@ func Distribute() func(c *gin.Context) {
modelRequest.Model = "dall-e" modelRequest.Model = "dall-e"
} }
} }
isStable := false
channel, err = model.CacheGetRandomSatisfiedChannel(userGroup, modelRequest.Model) channel, err = model.CacheGetRandomSatisfiedChannel(userGroup, modelRequest.Model)
c.Set("stable", false)
if err != nil { if err != nil {
message := fmt.Sprintf("当前分组 %s 下对于模型 %s 无可用渠道", userGroup, modelRequest.Model) message := fmt.Sprintf("当前分组 %s 下对于模型 %s 无可用渠道", userGroup, modelRequest.Model)
if strings.HasPrefix(modelRequest.Model, "gpt-4") { if channel != nil {
common.SysLog("GPT-4低价渠道宕机，正在尝试转换") common.SysError(fmt.Sprintf("渠道不存在：%d", channel.Id))
nowUser, err := model.GetUserById(userId, false) message = "数据库一致性已被破坏，请联系管理员"
if err == nil {
if nowUser.StableMode {
userGroup = "svip"
//stableRatio = (common.StablePrice / common.BasePrice) * modelRatio
userMaxPrice, _ := strconv.ParseFloat(nowUser.MaxPrice, 64)
if userMaxPrice < common.StablePrice {
message = "当前低价通道不可用，稳定渠道价格为" + strconv.FormatFloat(common.StablePrice, 'f', -1, 64) + "R/刀"
} else {
//common.SysLog(fmt.Sprintf("用户 %s 使用稳定渠道", nowUser.Username))
channel, err = model.CacheGetRandomSatisfiedChannel(userGroup, modelRequest.Model)
if err != nil {
message = "稳定渠道已经宕机，请联系管理员"
}
isStable = true
common.SysLog(fmt.Sprintf("用户 %s 使用稳定渠道 %v", nowUser.Username, channel))
c.Set("stable", true)
}
} else {
message = "当前低价通道不可用，请稍后再试，或者在后台开启稳定渠道模式"
}
} }
} c.JSON(http.StatusServiceUnavailable, gin.H{
//if channel == nil {
// common.SysError(fmt.Sprintf("渠道不存在：%d", channel.Id))
// message = "数据库一致性已被破坏，请联系管理员"
//}
if !isStable {
c.JSON(http.StatusInternalServerError, gin.H{
"error": gin.H{ "error": gin.H{
"message": message, "message": message,
"type": "one_api_error", "type": "one_api_error",
...@@ -141,7 +112,6 @@ func Distribute() func(c *gin.Context) { ...@@ -141,7 +112,6 @@ func Distribute() func(c *gin.Context) {
return return
} }
} }
}
c.Set("channel", channel.Type) c.Set("channel", channel.Type)
c.Set("channel_id", channel.Id) c.Set("channel_id", channel.Id)
c.Set("channel_name", channel.Name) c.Set("channel_name", channel.Name)
......
model/midjourney.go
...@@ -17,6 +17,7 @@ type Midjourney struct { ...@@ -17,6 +17,7 @@ type Midjourney struct {
Status string `json:"status"` Status string `json:"status"`
Progress string `json:"progress"` Progress string `json:"progress"`
FailReason string `json:"fail_reason"` FailReason string `json:"fail_reason"`
ChannelId int `json:"channel_id"`
} }
func GetAllUserTask(userId int, startIdx int, num int) []*Midjourney { func GetAllUserTask(userId int, startIdx int, num int) []*Midjourney {
......
model/option.go
...@@ -53,6 +53,10 @@ func InitOptionMap() { ...@@ -53,6 +53,10 @@ func InitOptionMap() {
common.OptionMap["SystemName"] = common.SystemName common.OptionMap["SystemName"] = common.SystemName
common.OptionMap["Logo"] = common.Logo common.OptionMap["Logo"] = common.Logo
common.OptionMap["ServerAddress"] = "" common.OptionMap["ServerAddress"] = ""
common.OptionMap["PayAddress"] = ""
common.OptionMap["EpayId"] = ""
common.OptionMap["EpayKey"] = ""
common.OptionMap["Price"] = strconv.Itoa(common.Price)
common.OptionMap["GitHubClientId"] = "" common.OptionMap["GitHubClientId"] = ""
common.OptionMap["GitHubClientSecret"] = "" common.OptionMap["GitHubClientSecret"] = ""
common.OptionMap["WeChatServerAddress"] = "" common.OptionMap["WeChatServerAddress"] = ""
...@@ -71,9 +75,6 @@ func InitOptionMap() { ...@@ -71,9 +75,6 @@ func InitOptionMap() {
common.OptionMap["ChatLink"] = common.ChatLink common.OptionMap["ChatLink"] = common.ChatLink
common.OptionMap["QuotaPerUnit"] = strconv.FormatFloat(common.QuotaPerUnit, 'f', -1, 64) common.OptionMap["QuotaPerUnit"] = strconv.FormatFloat(common.QuotaPerUnit, 'f', -1, 64)
common.OptionMap["RetryTimes"] = strconv.Itoa(common.RetryTimes) common.OptionMap["RetryTimes"] = strconv.Itoa(common.RetryTimes)
common.OptionMap["NormalPrice"] = strconv.FormatFloat(common.NormalPrice, 'f', -1, 64)
common.OptionMap["StablePrice"] = strconv.FormatFloat(common.StablePrice, 'f', -1, 64)
common.OptionMap["BasePrice"] = strconv.FormatFloat(common.BasePrice, 'f', -1, 64)
common.OptionMapRWMutex.Unlock() common.OptionMapRWMutex.Unlock()
loadOptionsFromDatabase() loadOptionsFromDatabase()
...@@ -157,8 +158,6 @@ func updateOptionMap(key string, value string) (err error) { ...@@ -157,8 +158,6 @@ func updateOptionMap(key string, value string) (err error) {
common.LogConsumeEnabled = boolValue common.LogConsumeEnabled = boolValue
case "DisplayInCurrencyEnabled": case "DisplayInCurrencyEnabled":
common.DisplayInCurrencyEnabled = boolValue common.DisplayInCurrencyEnabled = boolValue
case "DisplayTokenStatEnabled":
common.DisplayTokenStatEnabled = boolValue
} }
} }
switch key { switch key {
...@@ -177,6 +176,14 @@ func updateOptionMap(key string, value string) (err error) { ...@@ -177,6 +176,14 @@ func updateOptionMap(key string, value string) (err error) {
common.SMTPToken = value common.SMTPToken = value
case "ServerAddress": case "ServerAddress":
common.ServerAddress = value common.ServerAddress = value
case "PayAddress":
common.PayAddress = value
case "EpayId":
common.EpayId = value
case "EpayKey":
common.EpayKey = value
case "Price":
common.Price, _ = strconv.Atoi(value)
case "GitHubClientId": case "GitHubClientId":
common.GitHubClientId = value common.GitHubClientId = value
case "GitHubClientSecret": case "GitHubClientSecret":
...@@ -217,12 +224,6 @@ func updateOptionMap(key string, value string) (err error) { ...@@ -217,12 +224,6 @@ func updateOptionMap(key string, value string) (err error) {
common.TopUpLink = value common.TopUpLink = value
case "ChatLink": case "ChatLink":
common.ChatLink = value common.ChatLink = value
case "NormalPrice":
common.NormalPrice, _ = strconv.ParseFloat(value, 64)
case "BasePrice":
common.BasePrice, _ = strconv.ParseFloat(value, 64)
case "StablePrice":
common.StablePrice, _ = strconv.ParseFloat(value, 64)
case "ChannelDisableThreshold": case "ChannelDisableThreshold":
common.ChannelDisableThreshold, _ = strconv.ParseFloat(value, 64) common.ChannelDisableThreshold, _ = strconv.ParseFloat(value, 64)
case "QuotaPerUnit": case "QuotaPerUnit":
......
web/src/components/SystemSetting.js
import React, { useEffect, useState } from 'react'; import React, {useEffect, useState} from 'react';
import { Button, Divider, Form, Grid, Header, Modal, Message } from 'semantic-ui-react'; import {Button, Divider, Form, Grid, Header, Modal, Message} from 'semantic-ui-react';
import { API, removeTrailingSlash, showError } from '../helpers'; import {API, removeTrailingSlash, showError} from '../helpers';
const SystemSetting = () => { const SystemSetting = () => {
let [inputs, setInputs] = useState({ let [inputs, setInputs] = useState({
...@@ -17,6 +17,10 @@ const SystemSetting = () => { ...@@ -17,6 +17,10 @@ const SystemSetting = () => {
SMTPFrom: '', SMTPFrom: '',
SMTPToken: '', SMTPToken: '',
ServerAddress: '', ServerAddress: '',
EpayId: '',
EpayKey: '',
Price: '',
PayAddress: '',
Footer: '', Footer: '',
WeChatAuthEnabled: '', WeChatAuthEnabled: '',
WeChatServerAddress: '', WeChatServerAddress: '',
...@@ -37,7 +41,7 @@ const SystemSetting = () => { ...@@ -37,7 +41,7 @@ const SystemSetting = () => {
const getOptions = async () => { const getOptions = async () => {
const res = await API.get('/api/option/'); const res = await API.get('/api/option/');
const { success, message, data } = res.data; const {success, message, data} = res.data;
if (success) { if (success) {
let newInputs = {}; let newInputs = {};
data.forEach((item) => { data.forEach((item) => {
...@@ -50,7 +54,7 @@ const SystemSetting = () => { ...@@ -50,7 +54,7 @@ const SystemSetting = () => {
setOriginInputs(newInputs); setOriginInputs(newInputs);
setEmailDomainWhitelist(newInputs.EmailDomainWhitelist.split(',').map((item) => { setEmailDomainWhitelist(newInputs.EmailDomainWhitelist.split(',').map((item) => {
return { key: item, text: item, value: item }; return {key: item, text: item, value: item};
})); }));
} else { } else {
showError(message); showError(message);
...@@ -81,7 +85,7 @@ const SystemSetting = () => { ...@@ -81,7 +85,7 @@ const SystemSetting = () => {
key, key,
value value
}); });
const { success, message } = res.data; const {success, message} = res.data;
if (success) { if (success) {
if (key === 'EmailDomainWhitelist') { if (key === 'EmailDomainWhitelist') {
value = value.split(','); value = value.split(',');
...@@ -95,7 +99,7 @@ const SystemSetting = () => { ...@@ -95,7 +99,7 @@ const SystemSetting = () => {
setLoading(false); setLoading(false);
}; };
const handleInputChange = async (e, { name, value }) => { const handleInputChange = async (e, {name, value}) => {
if (name === 'PasswordLoginEnabled' && inputs[name] === 'true') { if (name === 'PasswordLoginEnabled' && inputs[name] === 'true') {
// block disabling password login // block disabling password login
setShowPasswordWarningModal(true); setShowPasswordWarningModal(true);
...@@ -105,6 +109,10 @@ const SystemSetting = () => { ...@@ -105,6 +109,10 @@ const SystemSetting = () => {
name === 'Notice' || name === 'Notice' ||
name.startsWith('SMTP') || name.startsWith('SMTP') ||
name === 'ServerAddress' || name === 'ServerAddress' ||
name === 'EpayId' ||
name === 'EpayKey' ||
name === 'Price' ||
name === 'PayAddress' ||
name === 'GitHubClientId' || name === 'GitHubClientId' ||
name === 'GitHubClientSecret' || name === 'GitHubClientSecret' ||
name === 'WeChatServerAddress' || name === 'WeChatServerAddress' ||
...@@ -114,7 +122,7 @@ const SystemSetting = () => { ...@@ -114,7 +122,7 @@ const SystemSetting = () => {
name === 'TurnstileSecretKey' || name === 'TurnstileSecretKey' ||
name === 'EmailDomainWhitelist' name === 'EmailDomainWhitelist'
) { ) {
setInputs((inputs) => ({ ...inputs, [name]: value })); setInputs((inputs) => ({...inputs, [name]: value}));
} else { } else {
await updateOption(name, value); await updateOption(name, value);
} }
...@@ -125,6 +133,18 @@ const SystemSetting = () => { ...@@ -125,6 +133,18 @@ const SystemSetting = () => {
await updateOption('ServerAddress', ServerAddress); await updateOption('ServerAddress', ServerAddress);
}; };
const submitPayAddress = async () => {
if (inputs.ServerAddress === '') {
showError('请先填写服务器地址');
return
}
let PayAddress = removeTrailingSlash(inputs.PayAddress);
await updateOption('PayAddress', PayAddress);
await updateOption('EpayId', inputs.EpayId);
await updateOption('EpayKey', inputs.EpayKey);
await updateOption('Price', inputs.Price);
};
const submitSMTP = async () => { const submitSMTP = async () => {
if (originInputs['SMTPServer'] !== inputs.SMTPServer) { if (originInputs['SMTPServer'] !== inputs.SMTPServer) {
await updateOption('SMTPServer', inputs.SMTPServer); await updateOption('SMTPServer', inputs.SMTPServer);
...@@ -240,7 +260,44 @@ const SystemSetting = () => { ...@@ -240,7 +260,44 @@ const SystemSetting = () => {
<Form.Button onClick={submitServerAddress}> <Form.Button onClick={submitServerAddress}>
更新服务器地址 更新服务器地址
</Form.Button> </Form.Button>
<Divider /> <Divider/>
<Header as='h3'>支付设置（当前仅支持易支付接口，使用上方服务器地址作为回调地址！）</Header>
<Form.Group widths='equal'>
<Form.Input
label='支付地址，不填写则不启用在线支付'
placeholder='例如：https://yourdomain.com'
value={inputs.PayAddress}
name='PayAddress'
onChange={handleInputChange}
/>
<Form.Input
label='易支付商户ID'
placeholder='例如：0001'
value={inputs.EpayId}
name='EpayId'
onChange={handleInputChange}
/>
<Form.Input
label='易支付商户密钥'
placeholder='例如：dejhfueqhujasjmndbjkqaw'
value={inputs.EpayKey}
name='EpayKey'
onChange={handleInputChange}
/>
<Form.Input
label='充值价格（x元/美金）'
placeholder='例如：7，就是7元/美金'
value={inputs.Price}
name='Price'
type='number'
min={0}
onChange={handleInputChange}
/>
</Form.Group>
<Form.Button onClick={submitPayAddress}>
更新支付地址
</Form.Button>
<Divider/>
<Header as='h3'>配置登录注册</Header> <Header as='h3'>配置登录注册</Header>
<Form.Group inline> <Form.Group inline>
<Form.Checkbox <Form.Checkbox
...@@ -255,7 +312,7 @@ const SystemSetting = () => { ...@@ -255,7 +312,7 @@ const SystemSetting = () => {
open={showPasswordWarningModal} open={showPasswordWarningModal}
onClose={() => setShowPasswordWarningModal(false)} onClose={() => setShowPasswordWarningModal(false)}
size={'tiny'} size={'tiny'}
style={{ maxWidth: '450px' }} style={{maxWidth: '450px'}}
> >
<Modal.Header>警告</Modal.Header> <Modal.Header>警告</Modal.Header>
<Modal.Content> <Modal.Content>
...@@ -314,7 +371,7 @@ const SystemSetting = () => { ...@@ -314,7 +371,7 @@ const SystemSetting = () => {
onChange={handleInputChange} onChange={handleInputChange}
/> />
</Form.Group> </Form.Group>
<Divider /> <Divider/>
<Header as='h3'> <Header as='h3'>
配置邮箱域名白名单 配置邮箱域名白名单
<Header.Subheader>用以防止恶意用户利用临时邮箱批量注册</Header.Subheader> <Header.Subheader>用以防止恶意用户利用临时邮箱批量注册</Header.Subheader>
...@@ -356,13 +413,13 @@ const SystemSetting = () => { ...@@ -356,13 +413,13 @@ const SystemSetting = () => {
autoComplete='new-password' autoComplete='new-password'
placeholder='输入新的允许的邮箱域名' placeholder='输入新的允许的邮箱域名'
value={restrictedDomainInput} value={restrictedDomainInput}
onChange={(e, { value }) => { onChange={(e, {value}) => {
setRestrictedDomainInput(value); setRestrictedDomainInput(value);
}} }}
/> />
</Form.Group> </Form.Group>
<Form.Button onClick={submitEmailDomainWhitelist}>保存邮箱域名白名单设置</Form.Button> <Form.Button onClick={submitEmailDomainWhitelist}>保存邮箱域名白名单设置</Form.Button>
<Divider /> <Divider/>
<Header as='h3'> <Header as='h3'>
配置 SMTP 配置 SMTP
<Header.Subheader>用以支持系统的邮件发送</Header.Subheader> <Header.Subheader>用以支持系统的邮件发送</Header.Subheader>
...@@ -413,7 +470,7 @@ const SystemSetting = () => { ...@@ -413,7 +470,7 @@ const SystemSetting = () => {
/> />
</Form.Group> </Form.Group>
<Form.Button onClick={submitSMTP}>保存 SMTP 设置</Form.Button> <Form.Button onClick={submitSMTP}>保存 SMTP 设置</Form.Button>
<Divider /> <Divider/>
<Header as='h3'> <Header as='h3'>
配置 GitHub OAuth App 配置 GitHub OAuth App
<Header.Subheader> <Header.Subheader>
...@@ -451,7 +508,7 @@ const SystemSetting = () => { ...@@ -451,7 +508,7 @@ const SystemSetting = () => {
<Form.Button onClick={submitGitHubOAuth}> <Form.Button onClick={submitGitHubOAuth}>
保存 GitHub OAuth 设置 保存 GitHub OAuth 设置
</Form.Button> </Form.Button>
<Divider /> <Divider/>
<Header as='h3'> <Header as='h3'>
配置 WeChat Server 配置 WeChat Server
<Header.Subheader> <Header.Subheader>
...@@ -495,7 +552,7 @@ const SystemSetting = () => { ...@@ -495,7 +552,7 @@ const SystemSetting = () => {
<Form.Button onClick={submitWeChat}> <Form.Button onClick={submitWeChat}>
保存 WeChat Server 设置 保存 WeChat Server 设置
</Form.Button> </Form.Button>
<Divider /> <Divider/>
<Header as='h3'> <Header as='h3'>
配置 Turnstile 配置 Turnstile
<Header.Subheader> <Header.Subheader>
......
web/src/pages/Home/index.js
import React, {useContext, useEffect, useState} from 'react'; import React, { useContext, useEffect, useState } from 'react';
import {Card, Grid, Header, Segment} from 'semantic-ui-react'; import { Card, Grid, Header, Segment } from 'semantic-ui-react';
import {API, showError, showNotice, timestamp2string} from '../../helpers'; import { API, showError, showNotice, timestamp2string } from '../../helpers';
import {StatusContext} from '../../context/Status'; import { StatusContext } from '../../context/Status';
import {marked} from 'marked'; import { marked } from 'marked';
const Home = () => { const Home = () => {
const [statusState, statusDispatch] = useContext(StatusContext); const [statusState, statusDispatch] = useContext(StatusContext);
...@@ -11,11 +11,12 @@ const Home = () => { ...@@ -11,11 +11,12 @@ const Home = () => {
const displayNotice = async () => { const displayNotice = async () => {
const res = await API.get('/api/notice'); const res = await API.get('/api/notice');
const {success, message, data} = res.data; const { success, message, data } = res.data;
if (success) { if (success) {
let oldNotice = localStorage.getItem('notice'); let oldNotice = localStorage.getItem('notice');
if (data !== oldNotice && data !== '') { if (data !== oldNotice && data !== '') {
showNotice(data); const htmlNotice = marked(data);
showNotice(htmlNotice, true);
localStorage.setItem('notice', data); localStorage.setItem('notice', data);
} }
} else { } else {
...@@ -26,7 +27,7 @@ const Home = () => { ...@@ -26,7 +27,7 @@ const Home = () => {
const displayHomePageContent = async () => { const displayHomePageContent = async () => {
setHomePageContent(localStorage.getItem('home_page_content') || ''); setHomePageContent(localStorage.getItem('home_page_content') || '');
const res = await API.get('/api/home_page_content'); const res = await API.get('/api/home_page_content');
const {success, message, data} = res.data; const { success, message, data } = res.data;
if (success) { if (success) {
let content = data; let content = data;
if (!data.startsWith('https://')) { if (!data.startsWith('https://')) {
...@@ -53,20 +54,28 @@ const Home = () => { ...@@ -53,20 +54,28 @@ const Home = () => {
return ( return (
<> <>
{ {
// homePageContentLoaded && homePageContent === '' ? homePageContentLoaded && homePageContent === '' ? <>
<>
<Segment> <Segment>
<Header as='h3'>当前状态</Header> <Header as='h3'>系统状况</Header>
<Grid columns={2} stackable> <Grid columns={2} stackable>
<Grid.Column> <Grid.Column>
<Card fluid> <Card fluid>
<Card.Content> <Card.Content>
<Card.Header>GPT-3.5</Card.Header> <Card.Header>系统信息</Card.Header>
<Card.Meta>信息总览</Card.Meta> <Card.Meta>系统信息总览</Card.Meta>
<Card.Description> <Card.Description>
<p>通道：官方通道</p> <p>名称：{statusState?.status?.system_name}</p>
<p>状态：存活</p> <p>版本：{statusState?.status?.version ? statusState?.status?.version : "unknown"}</p>
<p>价格：{statusState?.status?.base_price}R&nbsp;/&nbsp;刀</p> <p>
源码：
<a
href='https://github.com/songquanpeng/one-api'
target='_blank'
>
https://github.com/songquanpeng/one-api
</a>
</p>
<p>启动时间：{getStartTimeString()}</p>
</Card.Description> </Card.Description>
</Card.Content> </Card.Content>
</Card> </Card>
...@@ -74,26 +83,32 @@ const Home = () => { ...@@ -74,26 +83,32 @@ const Home = () => {
<Grid.Column> <Grid.Column>
<Card fluid> <Card fluid>
<Card.Content> <Card.Content>
<Card.Header>GPT-4</Card.Header> <Card.Header>系统配置</Card.Header>
<Card.Meta>信息总览</Card.Meta> <Card.Meta>系统配置总览</Card.Meta>
<Card.Description> <Card.Description>
<p>通道：官方通道｜低价通道</p>
<p> <p>
状态： 邮箱验证：
{statusState?.status?.stable_price===-1? {statusState?.status?.email_verification === true
<span style={{color:'red'}}>不&nbsp;&nbsp;&nbsp;可&nbsp;&nbsp;&nbsp;用</span> ? '已启用'
: : '未启用'}
<span style={{color:'green'}}>可&emsp;&emsp;用</span>
}
｜
{statusState?.status?.normal_price===-1?
<span style={{color:'red'}}>不&nbsp;&nbsp;&nbsp;可&nbsp;&nbsp;&nbsp;用</span>
:
<span style={{color:'green'}}>可&emsp;&emsp;用</span>
}
</p> </p>
<p> <p>
价格：{statusState?.status?.stable_price}R&nbsp;/&nbsp;刀｜{statusState?.status?.normal_price}R&nbsp;/&nbsp;刀 GitHub 身份验证：
{statusState?.status?.github_oauth === true
? '已启用'
: '未启用'}
</p>
<p>
微信身份验证：
{statusState?.status?.wechat_login === true
? '已启用'
: '未启用'}
</p>
<p>
Turnstile 用户校验：
{statusState?.status?.turnstile_check === true
? '已启用'
: '未启用'}
</p> </p>
</Card.Description> </Card.Description>
</Card.Content> </Card.Content>
...@@ -101,6 +116,7 @@ const Home = () => { ...@@ -101,6 +116,7 @@ const Home = () => {
</Grid.Column> </Grid.Column>
</Grid> </Grid>
</Segment> </Segment>
</> : <>
{ {
homePageContent.startsWith('https://') ? <iframe homePageContent.startsWith('https://') ? <iframe
src={homePageContent} src={homePageContent}
...@@ -108,10 +124,6 @@ const Home = () => { ...@@ -108,10 +124,6 @@ const Home = () => {
/> : <div style={{ fontSize: 'larger' }} dangerouslySetInnerHTML={{ __html: homePageContent }}></div> /> : <div style={{ fontSize: 'larger' }} dangerouslySetInnerHTML={{ __html: homePageContent }}></div>
} }
</> </>
// :
// <>
// </>
} }
</> </>
......
web/src/pages/TopUp/index.js
...@@ -78,9 +78,9 @@ const TopUp = () => { ...@@ -78,9 +78,9 @@ const TopUp = () => {
form.submit() form.submit()
document.body.removeChild(form) document.body.removeChild(form)
} else { } else {
showError(message); showError(data);
// setTopUpCount(parseInt(res.data.count)); // setTopUpCount(parseInt(res.data.count));
setAmount(parseInt(data)); // setAmount(parseInt(data));
} }
} else { } else {
showError(res); showError(res);
...@@ -160,9 +160,9 @@ const TopUp = () => { ...@@ -160,9 +160,9 @@ const TopUp = () => {
setRedemptionCode(e.target.value); setRedemptionCode(e.target.value);
}} }}
/> />
{/*<Button color='green' onClick={openTopUpLink}>*/} <Button color='green' onClick={openTopUpLink}>
{/* 获取兑换码*/} 获取兑换码
{/*</Button>*/} </Button>
<Button color='yellow' onClick={topUp} disabled={isSubmitting}> <Button color='yellow' onClick={topUp} disabled={isSubmitting}>
{isSubmitting ? '兑换中...' : '兑换'} {isSubmitting ? '兑换中...' : '兑换'}
</Button> </Button>
...@@ -179,7 +179,7 @@ const TopUp = () => { ...@@ -179,7 +179,7 @@ const TopUp = () => {
</Grid> </Grid>
</Segment> </Segment>
<Segment> <Segment>
<Header as='h3'>在线充值（最小10刀）</Header> <Header as='h3'>在线充值</Header>
<Grid columns={2} stackable> <Grid columns={2} stackable>
<Grid.Column> <Grid.Column>
<Form> <Form>
...@@ -194,27 +194,27 @@ const TopUp = () => { ...@@ -194,27 +194,27 @@ const TopUp = () => {
await getAmount(e.target.value); await getAmount(e.target.value);
}} }}
/> />
<Form.Input {/*<Form.Input*/}
placeholder='充值码，如果你没有充值码，可不填写' {/* placeholder='充值码，如果你没有充值码，可不填写'*/}
name='redemptionCount' {/* name='redemptionCount'*/}
value={topUpCode} {/* value={topUpCode}*/}
onChange={(e) => { {/* onChange={(e) => {*/}
setTopUpCode(e.target.value); {/* setTopUpCode(e.target.value);*/}
}} {/* }}*/}
/> {/*/>*/}
<Button color='blue' onClick={ <Button color='blue' onClick={
async () => { async () => {
onlineTopUp('zfb') onlineTopUp('zfb')
} }
}> }>
支付宝（最大2000元） 支付宝
</Button> </Button>
<Button color='green' onClick={ <Button color='green' onClick={
async () => { async () => {
onlineTopUp('wx') onlineTopUp('wx')
} }
}> }>
微信（最大2000元） 微信
</Button> </Button>
</Form> </Form>
</Grid.Column> </Grid.Column>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment