Merge branch 'feature/fastgpt'

* feature/fastgpt:
  重写，改为直接调用接口

internal/logic/fastgpt/delete_app_logic.go

@@ -2,13 +2,13 @@ package fastgpt
 
 import (
 	"context"
+	"fmt"
 	"github.com/suyuan32/simple-admin-common/msg/errormsg"
-	"github.com/zeromicro/go-zero/core/errorx"
+	"github.com/zeromicro/go-zero/core/logx"
+	"net/http"
+	"strconv"
 	"wechat-api/internal/svc"
 	"wechat-api/internal/types"
-	apps "wechat-api/mongo_model/apps"
-
-	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type DeleteAppLogic struct {
@@ -25,12 +25,41 @@ func NewDeleteAppLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DeleteA
 }
 
 func (l *DeleteAppLogic) DeleteApp(req *types.DeleteAppsReq) (resp *types.BaseMsgResp, err error) {
-	appsModel := apps.NewAppsModel(l.svcCtx.Config.FastgptMongoConf.Url, l.svcCtx.Config.FastgptMongoConf.DBName, "apps")
+	organizationId := l.ctx.Value("organizationId").(uint64)
 
-	_, err = appsModel.Delete(context.TODO(), req.Id)
+	organizationIdStr := strconv.FormatUint(organizationId, 10)
+	token, err := getToken(organizationIdStr)
 	if err != nil {
-		return nil, errorx.NewInvalidArgumentError("fastgpt create failed " + err.Error())
+		return nil, fmt.Errorf("invalid token")
 	}
 
+	AppDelete(req.Id, token)
+
 	return &types.BaseMsgResp{Msg: errormsg.Success}, nil
 }
+
+func AppDelete(id string, token string) {
+	url := fmt.Sprintf("https://fastgpt.gkscrm.com/api/core/app/del?appId=%s", id)
+
+	// 创建一个新的请求
+	req1, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		fmt.Printf("Error creating request: %v\n", err)
+		return
+	}
+
+	// 设置请求头
+	req1.Header.Set("Content-Type", "application/json")
+	req1.Header.Set("Cookie", fmt.Sprintf("fastgpt_token=%s", token))
+
+	// 使用 http.Client 发送请求
+	client := &http.Client{}
+	resp1, err := client.Do(req1)
+	if err != nil {
+		fmt.Printf("Error sending request: %v\n", err)
+		return
+	}
+	defer resp1.Body.Close()
+
+	return
+}

internal/logic/fastgpt/get_apps_list_logic.go

@@ -1,16 +1,16 @@
 package fastgpt
 
 import (
+	"bytes"
 	"context"
-	"github.com/zeromicro/go-zero/core/errorx"
+	"encoding/json"
+	"fmt"
+	"github.com/zeromicro/go-zero/core/logx"
+	"io/ioutil"
+	"net/http"
 	"strconv"
 	"wechat-api/internal/svc"
 	"wechat-api/internal/types"
-	apps "wechat-api/mongo_model/apps"
-	team_members "wechat-api/mongo_model/team_members"
-	users "wechat-api/mongo_model/users"
-
-	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type GetAppsListLogic struct {
@@ -27,43 +27,80 @@ func NewGetAppsListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetAp
 }
 
 func (l *GetAppsListLogic) GetAppsList(req *types.AppsListReq) (resp *types.AppsListResp, err error) {
-
 	organizationId := l.ctx.Value("organizationId").(uint64)
 
 	organizationIdStr := strconv.FormatUint(organizationId, 10)
+	token, err := getToken(organizationIdStr)
+	if err != nil {
+		return nil, fmt.Errorf("invalid token")
+	}
+
+	keyword := ""
+	if req.Keyword != nil {
+		keyword = *req.Keyword
+	}
+	response := CoreAppList(req.Type, keyword, token)
+
+	return &types.AppsListResp{Data: response}, nil
+}
 
-	usersModel := users.NewUsersModel(l.svcCtx.Config.FastgptMongoConf.Url, l.svcCtx.Config.FastgptMongoConf.DBName, "users")
-	user, err := usersModel.FindOneByUsername(context.TODO(), organizationIdStr)
+// 定义一个结构体用于表示整个 JSON 响应
+type Response struct {
+	Status string                    `json:"status"`
+	Data   []*types.AppsListRespInfo `json:"data"`
+}
+
+type AppListRequest struct {
+	Type      []string `json:"type"`
+	SearchKey string   `json:"searchKey"`
+}
+
+func CoreAppList(apps_type string, searchKey string, token string) []*types.AppsListRespInfo {
+	url := "https://fastgpt.gkscrm.com/api/core/app/list"
+	requestBodyData := AppListRequest{
+		Type:      []string{"folder", apps_type},
+		SearchKey: searchKey,
+	}
+
+	// 将结构体转换为 JSON 字节切片
+	requestBody, err := json.Marshal(requestBodyData)
 	if err != nil {
-		return nil, errorx.NewInvalidArgumentError("fastgpt get list failed " + err.Error())
+		fmt.Printf("Error marshalling request body: %v\n", err)
+		return nil
 	}
 
-	teamMembersModel := team_members.NewTeamMembersModel(l.svcCtx.Config.FastgptMongoConf.Url, l.svcCtx.Config.FastgptMongoConf.DBName, "team_members")
-	teamMember, err := teamMembersModel.FindOneByUserId(context.TODO(), user.ID)
+	// 创建一个新的请求
+	req1, err := http.NewRequest("POST", url, bytes.NewBuffer(requestBody))
 	if err != nil {
-		return nil, errorx.NewInvalidArgumentError("fastgpt get list failed " + err.Error())
+		fmt.Printf("Error creating request: %v\n", err)
+		return nil
 	}
 
-	appsModel := apps.NewAppsModel(l.svcCtx.Config.FastgptMongoConf.Url, l.svcCtx.Config.FastgptMongoConf.DBName, "apps")
-	data, err := appsModel.FindAll(context.TODO(), teamMember.TeamID, req.Type, req.Keyword)
+	// 设置请求头
+	req1.Header.Set("Content-Type", "application/json")
+	req1.Header.Set("Cookie", fmt.Sprintf("fastgpt_token=%s", token))
+
+	// 使用 http.Client 发送请求
+	client := &http.Client{}
+	resp1, err := client.Do(req1)
 	if err != nil {
-		return nil, errorx.NewInvalidArgumentError("fastgpt get list failed " + err.Error())
+		fmt.Printf("Error sending request: %v\n", err)
+		return nil
 	}
+	defer resp1.Body.Close()
 
-	var appList []*types.AppsListRespInfo
-
-	if data != nil {
-		for _, app := range data {
-			appList = append(appList, &types.AppsListRespInfo{
-				Id:     app.ID.Hex(),
-				TeamId: app.TeamID.Hex(),
-				TmbId:  app.TmbID.Hex(),
-				Avatar: app.Avatar,
-				Name:   app.Name,
-				Intro:  app.Intro,
-			})
-		}
+	// 读取响应
+	body, err := ioutil.ReadAll(resp1.Body)
+	if err != nil {
+		fmt.Printf("Error reading response: %v\n", err)
+		return nil
 	}
 
-	return &types.AppsListResp{Data: appList}, nil
+	var response Response
+	err = json.Unmarshal(body, &response)
+	if err != nil {
+		fmt.Printf("Error unmarshalling JSON: %v\n", err)
+		return nil
+	}
+	return response.Data
 }

internal/logic/fastgpt/set_token_logic.go

@@ -37,7 +37,7 @@ func (l *SetTokenLogic) SetToken(username string) (resp *types.BaseMsgResp, err
 		return nil, fmt.Errorf("invalid token")
 	}
 	data, err := l.svcCtx.CoreRpc.GetUserById(context.TODO(), &core.UUIDReq{Id: claims.UserId})
-	token, err := l.getToken(strconv.FormatUint(*data.DepartmentId, 10))
+	token, err := getToken(strconv.FormatUint(*data.DepartmentId, 10))
 	if err != nil {
 		return nil, fmt.Errorf("invalid token")
 	}
@@ -67,7 +67,7 @@ func (l *SetTokenLogic) SetToken(username string) (resp *types.BaseMsgResp, err
 	return
 }
 
-func (l *SetTokenLogic) getToken(username string) (string, error) {
+func getToken(username string) (string, error) {
 	// 设置请求的 URL 和请求体
 	url := "https://agent.gkscrm.com/api/support/user/account/loginByPassword"
 	payload := map[string]string{

internal/logic/fastgpt/update_app_logic.go

@@ -1,14 +1,15 @@
 package fastgpt
 
 import (
+	"bytes"
 	"context"
+	"fmt"
 	"github.com/suyuan32/simple-admin-common/msg/errormsg"
-	"github.com/zeromicro/go-zero/core/errorx"
+	"github.com/zeromicro/go-zero/core/logx"
+	"net/http"
+	"strconv"
 	"wechat-api/internal/svc"
 	"wechat-api/internal/types"
-	apps "wechat-api/mongo_model/apps"
-
-	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type UpdateAppLogic struct {
@@ -29,16 +30,43 @@ func (l *UpdateAppLogic) UpdateApp(req *types.UpdateAppsReq) (resp *types.BaseMs
 	if req.Intro != nil {
 		intro = *req.Intro
 	}
-	apps_info := &apps.Apps{
-		ID:    mustParseObjectID(req.Id),
-		Name:  req.Name,
-		Intro: intro,
-	}
-	appsModel := apps.NewAppsModel(l.svcCtx.Config.FastgptMongoConf.Url, l.svcCtx.Config.FastgptMongoConf.DBName, "apps")
-	_, err = appsModel.UpdateInfo(context.TODO(), apps_info)
+	organizationId := l.ctx.Value("organizationId").(uint64)
+
+	organizationIdStr := strconv.FormatUint(organizationId, 10)
+	token, err := getToken(organizationIdStr)
 	if err != nil {
-		return nil, errorx.NewInvalidArgumentError("fastgpt create failed " + err.Error())
+		return nil, fmt.Errorf("invalid token")
 	}
 
+	AppUpdate(req.Id, req.Name, intro, token)
+
 	return &types.BaseMsgResp{Msg: errormsg.Success}, nil
 }
+
+func AppUpdate(id string, name string, intro string, token string) {
+	url := fmt.Sprintf("https://fastgpt.gkscrm.com/api/core/app/update?appId=%s", id)
+	jsonStr := fmt.Sprintf(`{"name":"%s","intro":"%s"}`, name, intro)
+	requestBody := []byte(jsonStr)
+
+	// 创建一个新的请求
+	req1, err := http.NewRequest("PUT", url, bytes.NewBuffer(requestBody))
+	if err != nil {
+		fmt.Printf("Error creating request: %v\n", err)
+		return
+	}
+
+	// 设置请求头
+	req1.Header.Set("Content-Type", "application/json")
+	req1.Header.Set("Cookie", fmt.Sprintf("fastgpt_token=%s", token))
+
+	// 使用 http.Client 发送请求
+	client := &http.Client{}
+	resp1, err := client.Do(req1)
+	if err != nil {
+		fmt.Printf("Error sending request: %v\n", err)
+		return
+	}
+	defer resp1.Body.Close()
+
+	return
+}