Selaa lähdekoodia

Merge branch 'feature/fastgpt'

* feature/fastgpt:
  优化?测试一下
boweniac 1 kuukausi sitten
vanhempi
commit
e905bd9b2a

+ 8 - 6
internal/logic/department/create_department_logic.go

@@ -57,7 +57,8 @@ func (l *CreateDepartmentLogic) CreateDepartment(req *types.DepartmentInfo) (res
 		PromotionRate: int32(15),
 		Timezone:      "Asia/Shanghai",
 	}
-	err = l.svcCtx.MongoModel.UsersModel.Insert(context.TODO(), user_info)
+	usersModel := users.NewUsersModel(l.svcCtx.Config.FastgptMongoConf.Url, l.svcCtx.Config.FastgptMongoConf.DBName, "users")
+	err = usersModel.Insert(context.TODO(), user_info)
 	if err != nil {
 		return nil, errorx.NewInvalidArgumentError("fastgpt create failed " + err.Error())
 	}
@@ -71,8 +72,8 @@ func (l *CreateDepartmentLogic) CreateDepartment(req *types.DepartmentInfo) (res
 		CreateTime:        time.Date(2024, 7, 10, 12, 0, 18, 197000000, time.UTC),
 		Balance:           int32(999900000),
 	}
-
-	err = l.svcCtx.MongoModel.TeamsModel.Insert(context.TODO(), teams_info)
+	teamsModel := teams.NewTeamsModel(l.svcCtx.Config.FastgptMongoConf.Url, l.svcCtx.Config.FastgptMongoConf.DBName, "teams")
+	err = teamsModel.Insert(context.TODO(), teams_info)
 	if err != nil {
 		return nil, errorx.NewInvalidArgumentError("fastgpt create failed " + err.Error())
 	}
@@ -88,8 +89,8 @@ func (l *CreateDepartmentLogic) CreateDepartment(req *types.DepartmentInfo) (res
 		DefaultTeam: true,
 		Version:     int32(0),
 	}
-
-	err = l.svcCtx.MongoModel.TeamMembersModel.Insert(context.TODO(), team_members_info)
+	teamMembersModel := team_members.NewTeamMembersModel(l.svcCtx.Config.FastgptMongoConf.Url, l.svcCtx.Config.FastgptMongoConf.DBName, "team_members")
+	err = teamMembersModel.Insert(context.TODO(), team_members_info)
 	if err != nil {
 		return nil, errorx.NewInvalidArgumentError("fastgpt create failed " + err.Error())
 	}
@@ -331,8 +332,9 @@ func (l *CreateDepartmentLogic) CreateDepartment(req *types.DepartmentInfo) (res
 		ScheduledTriggerConfig:   nil,
 		ScheduledTriggerNextTime: nil,
 	}
+	appsModel := apps.NewAppsModel(l.svcCtx.Config.FastgptMongoConf.Url, l.svcCtx.Config.FastgptMongoConf.DBName, "apps")
 
-	err = l.svcCtx.MongoModel.AppsModel.Insert(context.TODO(), apps_info)
+	err = appsModel.Insert(context.TODO(), apps_info)
 	if err != nil {
 		return nil, errorx.NewInvalidArgumentError("fastgpt create failed " + err.Error())
 	}

+ 8 - 4
internal/logic/fastgpt/create_app_logic.go

@@ -7,6 +7,8 @@ import (
 	"strconv"
 	"time"
 	apps "wechat-api/mongo_model/apps"
+	team_members "wechat-api/mongo_model/team_members"
+	users "wechat-api/mongo_model/users"
 
 	"wechat-api/internal/svc"
 	"wechat-api/internal/types"
@@ -31,13 +33,14 @@ func (l *CreateAppLogic) CreateApp(req *types.CreateAppsReq) (resp *types.BaseMs
 	organizationId := l.ctx.Value("organizationId").(uint64)
 
 	organizationIdStr := strconv.FormatUint(organizationId, 10)
-
-	user, err := l.svcCtx.MongoModel.UsersModel.FindOneByUsername(context.TODO(), organizationIdStr)
+	usersModel := users.NewUsersModel(l.svcCtx.Config.FastgptMongoConf.Url, l.svcCtx.Config.FastgptMongoConf.DBName, "users")
+	user, err := usersModel.FindOneByUsername(context.TODO(), organizationIdStr)
 	if err != nil {
 		return nil, errorx.NewInvalidArgumentError("fastgpt get list failed " + err.Error())
 	}
 
-	teamMember, err := l.svcCtx.MongoModel.TeamMembersModel.FindOneByUserId(context.TODO(), user.ID)
+	teamMembersModel := team_members.NewTeamMembersModel(l.svcCtx.Config.FastgptMongoConf.Url, l.svcCtx.Config.FastgptMongoConf.DBName, "team_members")
+	teamMember, err := teamMembersModel.FindOneByUserId(context.TODO(), user.ID)
 	if err != nil {
 		return nil, errorx.NewInvalidArgumentError("fastgpt get list failed " + err.Error())
 	}
@@ -398,7 +401,8 @@ func (l *CreateAppLogic) CreateApp(req *types.CreateAppsReq) (resp *types.BaseMs
 	}
 
 	if apps_info != nil {
-		err = l.svcCtx.MongoModel.AppsModel.Insert(context.TODO(), apps_info)
+		appsModel := apps.NewAppsModel(l.svcCtx.Config.FastgptMongoConf.Url, l.svcCtx.Config.FastgptMongoConf.DBName, "apps")
+		err = appsModel.Insert(context.TODO(), apps_info)
 		if err != nil {
 			return nil, errorx.NewInvalidArgumentError("fastgpt create failed " + err.Error())
 		}

+ 3 - 1
internal/logic/fastgpt/delete_app_logic.go

@@ -6,6 +6,7 @@ import (
 	"github.com/zeromicro/go-zero/core/errorx"
 	"wechat-api/internal/svc"
 	"wechat-api/internal/types"
+	apps "wechat-api/mongo_model/apps"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -24,8 +25,9 @@ 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")
 
-	_, err = l.svcCtx.MongoModel.AppsModel.Delete(context.TODO(), req.Id)
+	_, err = appsModel.Delete(context.TODO(), req.Id)
 	if err != nil {
 		return nil, errorx.NewInvalidArgumentError("fastgpt create failed " + err.Error())
 	}

+ 10 - 4
internal/logic/fastgpt/get_apps_list_logic.go

@@ -4,9 +4,11 @@ import (
 	"context"
 	"github.com/zeromicro/go-zero/core/errorx"
 	"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"
 )
@@ -25,21 +27,25 @@ 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)
 
-	user, err := l.svcCtx.MongoModel.UsersModel.FindOneByUsername(context.TODO(), organizationIdStr)
+	usersModel := users.NewUsersModel(l.svcCtx.Config.FastgptMongoConf.Url, l.svcCtx.Config.FastgptMongoConf.DBName, "users")
+	user, err := usersModel.FindOneByUsername(context.TODO(), organizationIdStr)
 	if err != nil {
 		return nil, errorx.NewInvalidArgumentError("fastgpt get list failed " + err.Error())
 	}
 
-	teamMember, err := l.svcCtx.MongoModel.TeamMembersModel.FindOneByUserId(context.TODO(), user.ID)
+	teamMembersModel := team_members.NewTeamMembersModel(l.svcCtx.Config.FastgptMongoConf.Url, l.svcCtx.Config.FastgptMongoConf.DBName, "team_members")
+	teamMember, err := teamMembersModel.FindOneByUserId(context.TODO(), user.ID)
 	if err != nil {
 		return nil, errorx.NewInvalidArgumentError("fastgpt get list failed " + err.Error())
 	}
 
-	data, err := l.svcCtx.MongoModel.AppsModel.FindAll(context.TODO(), teamMember.TeamID, req.Type, req.Keyword)
+	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)
 	if err != nil {
 		return nil, errorx.NewInvalidArgumentError("fastgpt get list failed " + err.Error())
 	}

+ 2 - 1
internal/logic/fastgpt/update_app_logic.go

@@ -34,7 +34,8 @@ func (l *UpdateAppLogic) UpdateApp(req *types.UpdateAppsReq) (resp *types.BaseMs
 		Name:  req.Name,
 		Intro: intro,
 	}
-	_, err = l.svcCtx.MongoModel.AppsModel.UpdateInfo(context.TODO(), apps_info)
+	appsModel := apps.NewAppsModel(l.svcCtx.Config.FastgptMongoConf.Url, l.svcCtx.Config.FastgptMongoConf.DBName, "apps")
+	_, err = appsModel.UpdateInfo(context.TODO(), apps_info)
 	if err != nil {
 		return nil, errorx.NewInvalidArgumentError("fastgpt create failed " + err.Error())
 	}