Merge remote-tracking branch 'origin/main' into feature/1.4

fix:ai init bug

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"`
+	Addr        string `json:"addr" yaml:"addr"`
-	TopicPrefix string `json:"topic_prefix"`
+	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 := genAIKey(s.Key, s.Provider)
-			key := keys[0]
 			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, "@")
+			//keys := strings.Split(finalStatus.Key, "@")
-			err = h.aiKeyService.IncrUseToken(ctx, keys[0], convertInt(data.AI.TotalToken))
+			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)

frontend/packages/common/src/components/aoplatform/LanguageSetting.tsx

@@ -59,6 +59,7 @@ const LanguageSetting = ({ mode = 'light' }: { mode?: 'dark' | 'light' }) => {
       i18n.changeLanguage(supportedLang)
     }
   }, [])
+
   return (
     <Dropdown
       trigger={['hover']}

frontend/packages/core/src/pages/aiSetting/components/KeyStatusNode.tsx

@@ -27,6 +27,7 @@ export const KeyStatusNode: React.FC<{ data: KeyStatusNodeData }> = ({ data }) =
         <div
           className="flex gap-1 w-full"
           style={{
+            minWidth: keys.length > 5 ? '118px' : 'auto',
             maxWidth: `calc(${MAX_KEYS} * ${KEY_SIZE} + (${MAX_KEYS} - 1) * ${KEY_GAP})`,
             minHeight: KEY_SIZE
           }}

frontend/packages/core/src/pages/aiSetting/components/ModelCardNode.tsx

@@ -29,39 +29,41 @@ export const ModelCardNode: React.FC<{ data: ModelCardNodeData }> = ({ data }) =
   const statusConfig = getStatusIcon(status)
 
   return (
-    <div
+    <>
-      className="node-card bg-white rounded-lg shadow-sm p-4 min-w-[280px] group"
+      <div
-      style={{ border: '1px solid var(--border-color)' }}
+        className="node-card bg-white rounded-lg shadow-sm p-4 min-w-[280px] group"
-    >
+        style={{ border: '1px solid var(--border-color)' }}
-      <Handle type="target" position={Position.Left} />
+      >
-      <Handle type="source" position={Position.Right} />
+        <Handle type="target" position={Position.Left} />
-      <div>
+        <Handle type="source" position={Position.Right} />
-        <div className="flex justify-between items-center">
+        <div>
-          <div className="flex gap-2 items-center">
+          <div className="flex justify-between items-center">
-            <div className="flex flex-1 overflow-hidden items-center gap-[4px]">
+            <div className="flex gap-2 items-center">
-              <span
+              <div className="flex flex-1 overflow-hidden items-center gap-[4px]">
-                className="flex items-center h-[22px] ai-setting-svg-container"
+                <span
-                dangerouslySetInnerHTML={{ __html: logo }}
+                  className="flex items-center h-[22px] ai-setting-svg-container"
-              ></span>
+                  dangerouslySetInnerHTML={{ __html: logo }}
+                ></span>
+              </div>
+              <span className="text-base text-gray-900 max-w-[180px] truncate">{name}</span>
+              <Icon icon={statusConfig?.icon} className={`text-xl ${statusConfig?.color}`} />
             </div>
-            <span className="text-base text-gray-900 max-w-[180px] truncate">{name}</span>
-            <Icon icon={statusConfig?.icon} className={`text-xl ${statusConfig?.color}`} />
-          </div>
 
-          {/* Action buttons */}
+            {/* Action buttons */}
-          <div className="flex gap-2 transition-opacity duration-200">
+            <div className="flex gap-2 transition-opacity duration-200">
-            <Icon
+              <Icon
-              icon="mdi:cog"
+                icon="mdi:cog"
-              className="text-xl text-gray-400 cursor-pointer hover:text-[--primary-color]"
+                className="text-xl text-gray-400 cursor-pointer hover:text-[--primary-color]"
-              onClick={() => {
+                onClick={() => {
-                openConfigModal({ id: data.id, defaultLlm: defaultLlm } as AiSettingListItem)
+                  openConfigModal({ id: data.id, defaultLlm: defaultLlm } as AiSettingListItem)
-              }}
+                }}
-            />
+              />
+            </div>
+          </div>
+          <div className="mt-2 text-sm text-gray-500">
+            {$t('默认：')}
+            {defaultLlm}
           </div>
-        </div>
-        <div className="mt-2 text-sm text-gray-500">
-          {$t('默认：')}
-          {defaultLlm}
         </div>
         {status !== 'enabled' && alternativeModel && (
           <div className="mt-1 text-sm text-gray-500">
@@ -69,6 +71,11 @@ export const ModelCardNode: React.FC<{ data: ModelCardNodeData }> = ({ data }) =
           </div>
         )}
       </div>
-    </div>
+          {status !== 'enabled' && alternativeModel && (
+            <div className="ml-4 mt-1 text-sm text-gray-500">
+              {$t('关联 API 已转用')} {alternativeModel.name}/{alternativeModel.defaultLlm}
+            </div>
+          )}
+    </>
   )
 }

frontend/packages/core/src/pages/aiSetting/styles.css

@@ -18,11 +18,15 @@
 .react-flow__node {
   padding: 0;
   border-radius: 8px;
-  min-width: 150px;
   width: auto;
   max-width: 100%;
 }
 
+.react-flow__node-modelCard,
+.react-flow__node-serviceCard {
+  min-width: 150px;
+}
+
 /* Custom Node Styles */
 .custom-node {
   background: white;

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"
 

init.go

@@ -5,6 +5,7 @@ import (
 	_ "github.com/APIParkLab/APIPark/frontend"
 	_ "github.com/APIParkLab/APIPark/gateway/apinto"
 	_ "github.com/APIParkLab/APIPark/plugins/core"
+	_ "github.com/APIParkLab/APIPark/plugins/openapi"
 	_ "github.com/APIParkLab/APIPark/plugins/permit"
 	_ "github.com/APIParkLab/APIPark/plugins/publish_flow"
 	_ "github.com/APIParkLab/APIPark/resources/locale"

module/ai/iml.go

@@ -533,6 +533,7 @@ func (i *imlProviderModule) UpdateProviderConfig(ctx context.Context, id string,
 			DefaultLLM: &input.DefaultLLM,
 			Config:     &input.Config,
 			Priority:   input.Priority,
+			Status:     &status,
 		}
 		_, err = i.aiKeyService.DefaultKey(ctx, id)
 		if err != nil {
@@ -558,17 +559,18 @@ func (i *imlProviderModule) UpdateProviderConfig(ctx context.Context, id string,
 			return err
 		}
 
-		if input.Enable != nil {
+		//if input.Enable != nil {
-			status = 0
+		//	status = 0
-			if *input.Enable {
+		//	if *input.Enable {
-				status = 1
+		//		status = 1
-			}
+		//	}
-			pInfo.Status = &status
+		//	pInfo.Status = &status
-		}
+		//}
 		err = i.providerService.Save(ctx, id, pInfo)
 		if err != nil {
 			return err
 		}
+
 		if *pInfo.Status == 0 {
 			return i.syncGateway(ctx, cluster.DefaultClusterID, []*gateway.DynamicRelease{
 				{

plugins/openapi/authorization.go

@@ -0,0 +1,18 @@
+package openapi
+
+import (
+	"net/http"
+
+	"github.com/eolinker/go-common/pm3"
+)
+
+func (p *plugin) appAuthorizationApis() []pm3.Api {
+	return []pm3.Api{
+		pm3.CreateApiWidthDoc(http.MethodPost, "/openapi/v1/app/authorization", []string{"context", "query:app", "body"}, []string{"authorization"}, p.authorizationController.AddAuthorization),
+		pm3.CreateApiWidthDoc(http.MethodPut, "/openapi/v1/app/authorization", []string{"context", "query:app", "query:authorization", "body"}, []string{"authorization"}, p.authorizationController.EditAuthorization),
+		pm3.CreateApiWidthDoc(http.MethodDelete, "/openapi/v1/app/authorization", []string{"context", "query:app", "query:authorization"}, nil, p.authorizationController.DeleteAuthorization),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/openapi/v1/app/authorization", []string{"context", "query:app", "query:authorization"}, []string{"authorization"}, p.authorizationController.Info),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/openapi/v1/app/authorizations", []string{"context", "query:app"}, []string{"authorizations"}, p.authorizationController.Authorizations),
+		pm3.CreateApiWidthDoc(http.MethodGet, "/openapi/v1/app/authorization/details", []string{"context", "query:app", "query:authorization"}, []string{"details"}, p.authorizationController.Detail),
+	}
+}

plugins/openapi/check.go

@@ -0,0 +1,45 @@
+package openapi
+
+import (
+	"strings"
+
+	"github.com/eolinker/eosc/env"
+
+	"github.com/gin-gonic/gin"
+)
+
+var (
+	defaultAPIKey = "37eb0ebf"
+	openCheck     = newOpenapiCheck()
+)
+
+type openapiCheck struct {
+	apikey string
+}
+
+func newOpenapiCheck() *openapiCheck {
+	apikey, has := env.GetEnv("API_KEY")
+	if !has {
+		apikey = defaultAPIKey
+	}
+	return &openapiCheck{apikey: apikey}
+}
+
+func (o *openapiCheck) Check(method string, path string) (bool, []gin.HandlerFunc) {
+	if strings.HasPrefix(path, "/openapi/") {
+		return true, []gin.HandlerFunc{o.Handler}
+	}
+	return false, nil
+}
+
+func (o *openapiCheck) Sort() int {
+	return -1
+}
+
+func (o *openapiCheck) Handler(ginCtx *gin.Context) {
+	authorization := ginCtx.GetHeader("Authorization")
+	if authorization == "" {
+		ginCtx.AbortWithStatusJSON(403, gin.H{"code": -8, "msg": "invalid token", "success": "fail"})
+		return
+	}
+}

plugins/openapi/driver.go

@@ -0,0 +1,19 @@
+package openapi
+
+import (
+	"github.com/eolinker/go-common/autowire"
+	"github.com/eolinker/go-common/pm3"
+)
+
+func init() {
+	pm3.Register("openapi", new(Driver))
+}
+
+type Driver struct {
+}
+
+func (d *Driver) Create() (pm3.IPlugin, error) {
+	p := new(plugin)
+	autowire.Autowired(p)
+	return p, nil
+}

plugins/openapi/plugin.go

@@ -0,0 +1,33 @@
+package openapi
+
+import (
+	application_authorization "github.com/APIParkLab/APIPark/controller/application-authorization"
+	"github.com/eolinker/go-common/pm3"
+)
+
+var (
+	_ pm3.IPlugin           = (*plugin)(nil)
+	_ pm3.IPluginMiddleware = (*plugin)(nil)
+)
+
+type plugin struct {
+	apis                    []pm3.Api
+	authorizationController application_authorization.IAuthorizationController `autowired:""`
+}
+
+func (p *plugin) Middlewares() []pm3.IMiddleware {
+	return []pm3.IMiddleware{
+		openCheck,
+	}
+}
+
+func (p *plugin) APis() []pm3.Api {
+	return p.apis
+}
+
+func (p *plugin) Name() string {
+	return "openapi"
+}
+func (p *plugin) OnComplete() {
+	p.apis = p.appAuthorizationApis()
+}

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_ADDR=${APP}-nsq:4150
-ENV NSQ_TOPIC_PREFIX=apipark
+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"` // 更新人

stores/api/model.go

@@ -55,7 +55,7 @@ type Doc struct {
 	Id       int64     `gorm:"column:id;type:BIGINT(20);AUTO_INCREMENT;NOT NULL;comment:id;primary_key;comment:主键ID;"`
 	UUID     string    `gorm:"type:varchar(36);not null;column:uuid;uniqueIndex:uuid;comment:UUID;"`
 	Service  string    `gorm:"size:36;not null;column:service;comment:服务;index:service"`
-	Content  string    `gorm:"type:text;null;column:content;comment:文档内容"`
+	Content  string    `gorm:"type:longtext;null;column:content;comment:文档内容"`
 	Updater  string    `gorm:"size:36;not null;column:updater;comment:更新人;index:updater" aovalue:"updater"`
 	UpdateAt time.Time `gorm:"type:timestamp;NOT NULL;DEFAULT:CURRENT_TIMESTAMP;column:update_at;comment:更新时间"`
 	APICount int64     `gorm:"type:int(11);not null;column:api_count;comment:接口数量"`

stores/universally/commit/commit.go

@@ -7,7 +7,7 @@ type Commit[H any] struct {
 	UUID     string    `gorm:"size:36;not null;column:uuid;comment:uuid;uniqueIndex:uuid;"`
 	Target   string    `gorm:"column:target;type:varchar(36);NOT NULL;comment:目标id;index:target;"`
 	Key      string    `gorm:"size:50;not null;column:key;comment:类型;index:key;"`
-	Data     *H        `gorm:"type:text;not null;column:data;comment:数据;charset=utf8mb4;serializer:json"`
+	Data     *H        `gorm:"type:longtext;not null;column:data;comment:数据;charset=utf8mb4;serializer:json"`
 	CreateAt time.Time `gorm:"type:timestamp;NOT NULL;DEFAULT:CURRENT_TIMESTAMP;column:create_at;comment:创建时间"`
 	Operator string    `gorm:"size:36;not null;column:operator;comment:操作人;index:operator;"`
 }