Merge pull request #174 from jeak01/patch-2

Update readme-zh-cn.md

README.md

@@ -210,7 +210,7 @@ APIPark uses the Apache 2.0 License. For more details, please refer to the LICEN
 For enterprise-level features and professional technical support, contact our pre-sales experts for personalized demos, customized solutions, and pricing.
 
 - Website: https://apipark.com
-- Email: dev@apipark.com
+- Email: contact@apipark.com
 
 <br>
 

app/ai-event-handler/nsq.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"log"
 	"strings"
 	"time"
@@ -27,8 +28,8 @@ func init() {
 }
 
 type NSQConfig struct {
-	Addr        string `json:"addr"`
-	TopicPrefix string `json:"topic_prefix"`
+	Addr        string `json:"addr" yaml:"addr"`
+	TopicPrefix string `json:"topic_prefix" yaml:"topic_prefix"`
 }
 
 // 定义 NSQ 消息结构
@@ -78,6 +79,11 @@ func convertInt(value interface{}) int {
 	}
 }
 
+func genAIKey(key string, provider string) string {
+	keys := strings.Split(key, "@")
+	return strings.TrimSuffix(keys[0], fmt.Sprintf("-%s", provider))
+}
+
 // HandleMessage 处理从 NSQ 读取的消息
 func (h *NSQHandler) HandleMessage(message *nsq.Message) error {
 	log.Printf("Received message: %s", string(message.Body))
@@ -87,14 +93,14 @@ func (h *NSQHandler) HandleMessage(message *nsq.Message) error {
 	err := json.Unmarshal(message.Body, &data)
 	if err != nil {
 		log.Printf("Failed to unmarshal message: %v", err)
-		return err
+		return nil
 	}
 
 	// 将时间字符串转换为 time.Time
 	timestamp, err := time.Parse(time.RFC3339, data.TimeISO8601)
 	if err != nil {
 		log.Printf("Failed to parse timestamp: %v", err)
-		return err
+		return nil
 	}
 
 	day := time.Date(timestamp.Year(), timestamp.Month(), timestamp.Day(), 0, 0, 0, 0, timestamp.Location())
@@ -104,14 +110,13 @@ func (h *NSQHandler) HandleMessage(message *nsq.Message) error {
 		finalStatus := &AIProviderStatus{}
 		for _, s := range data.AI.ProviderStats {
 			status := ToKeyStatus(s.Status).Int()
-			keys := strings.Split(s.Key, "@")
-			key := keys[0]
+			key := genAIKey(s.Key, s.Provider)
 			err = h.aiKeyService.Save(ctx, key, &ai_key.Edit{
 				Status: &status,
 			})
 			if err != nil {
 				log.Printf("Failed to save AI key: %v", err)
-				return err
+				return nil
 			}
 			if s.Provider != data.AI.Provider {
 
@@ -128,11 +133,12 @@ func (h *NSQHandler) HandleMessage(message *nsq.Message) error {
 			finalStatus = &s
 		}
 		if finalStatus != nil {
-			keys := strings.Split(finalStatus.Key, "@")
-			err = h.aiKeyService.IncrUseToken(ctx, keys[0], convertInt(data.AI.TotalToken))
+			//keys := strings.Split(finalStatus.Key, "@")
+			key := genAIKey(finalStatus.Key, finalStatus.Provider)
+			err = h.aiKeyService.IncrUseToken(ctx, key, convertInt(data.AI.TotalToken))
 			if err != nil {
 				log.Printf("Failed to increment AI key token: %v", err)
-				return err
+				return nil
 			}
 		}
 
@@ -151,7 +157,7 @@ func (h *NSQHandler) HandleMessage(message *nsq.Message) error {
 		})
 		if err != nil {
 			log.Printf("Failed to call AI API: %v", err)
-			return err
+			return nil
 		}
 
 		log.Printf("Message processed and saved to MySQL: %+v", data)

gateway/apinto/plugin/apinto_plugin.yml

@@ -28,7 +28,7 @@
         b: "subscription_service:#{application}"
     response:
       status_code: 403
-      content_typ: "text/plan"
+      content_type: "text/plan"
       charset: "utf-8"
       body: "Forbidden"
 

readme/readme-jp.md

@@ -211,7 +211,7 @@ APIParkはApache 2.0ライセンスの下で提供されています。詳細に
 エンタープライズ機能や専門的な技術サポートについては、プリセールスの専門家に連絡し、個別デモ、カスタムソリューション、価格情報を入手してください。
 
 - ウェブサイト: https://apipark.com
-- メール: dev@apipark.com
+- メール: contact@apipark.com
 
 <br>
 

readme/readme-zh-cn.md

@@ -215,7 +215,7 @@ APIPark 使用 Apache 2.0 许可证。更多详情请查看 LICENSE 文件。
 对于企业级功能和专业技术支持，请联系售前专家进行个性化演示、定制方案和获取报价。
 
 - 网站: https://apipark.com
-- 电子邮件: dev@apipark.com
+- 电子邮件: contact@apipark.com
 
 <br>
 

readme/readme-zh-tw.md

@@ -212,7 +212,7 @@ APIPark 使用 Apache 2.0 授權條款。更多詳情請參閱 LICENSE 文件。
 如需企業級功能與專業技術支援，請聯絡我們的售前專家，獲取個性化演示、定制方案和報價。
 
 - 網站: https://apipark.com
-- 電子郵件: dev@apipark.com
+- 電子郵件: contact@apipark.com
 
 <br>
 

resources/plugin/plugin.yml

@@ -1,4 +1,4 @@
-version: v7
+version: v8
 sort:
   - "access_log"
   - "monitor"
@@ -41,7 +41,7 @@ plugin:
           b: "subscription_service:#{application}"
       response:
         status_code: 403
-        content_typ: "text/plan"
+        content_type: "text/plan"
         charset: "utf-8"
         body: "Forbidden"
 

scripts/Dockerfile

@@ -8,8 +8,8 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ARG APP
 
-ENV NSQ_ADDR=nsq:4150
-ENV NSQ_TOPIC_PREFIX=apipark
+ENV NSQ_ADDR=${APP}-nsq:4150
+ENV NSQ_TOPIC_PREFIX=${APP}
 
 RUN mkdir -p /${APP}
 

scripts/docker_build.sh

@@ -17,7 +17,7 @@ source ./scripts/common.sh
 APP="apipark"
 
 
-mkdir -p scripts/cmd/ && cp cmd/${APP} scripts/cmd/
+mkdir -p scripts/cmd/ && cp cmd/${APP} scripts/cmd/ && cp cmd/apipark_ai_event_listen scripts/cmd/
 
 VERSION=$(gen_version)
 

scripts/resource/docker_run.sh

@@ -27,7 +27,7 @@ echo -e "    - $s" >> config.yml
 done
 echo -e "nsq:" >> config.yml
 echo -e "  addr: ${NSQ_ADDR}" >> config.yml
-echo -e "  topic: ${NSQ_TOPIC}" >> config.yml
+echo -e "  topic_prefix: ${NSQ_TOPIC_PREFIX}" >> config.yml
 echo -e "port: 8288" >> config.yml
 echo -e "error_log:" >> config.yml
 echo -e "  dir: ${ERROR_DIR}" >> config.yml

stores/ai/model.go

@@ -8,7 +8,7 @@ type Provider struct {
 	Name       string    `gorm:"type:varchar(100);not null;column:name;comment:name"`
 	DefaultLLM string    `gorm:"type:varchar(255);not null;column:default_llm;comment:默认模型ID"`
 	Config     string    `gorm:"type:text;not null;column:config;comment:配置信息"`
-	Status     int       `gorm:"type:tinyint(1);not null;column:status;comment:状态，0：停用；1：启用，2：异常"`
+	Status     int       `gorm:"type:tinyint(1);not null;column:status;comment:状态，0：停用；1：启用，2：异常;default:1"`
 	Priority   int       `gorm:"type:int;not null;column:priority;comment:优先级，值越小优先级越高"`
 	Creator    string    `gorm:"size:36;not null;column:creator;comment:创建人;index:creator" aovalue:"creator"` // 创建人
 	Updater    string    `gorm:"size:36;not null;column:updater;comment:更新人;index:updater" aovalue:"updater"` // 更新人