Merge branch 'master' into lcd250411

internal/logic/chat/chat_completions_logic.go

@@ -49,7 +49,7 @@ func (l *ChatCompletionsLogic) ChatCompletions(req *types.CompApiReq) (resp *typ
 	if !ok {
 		return nil, errors.New("content get token err")
 	}
-	if req.WorkId == "TEST_DOUYIN" || req.WorkId == "TEST_DOUYIN_CN" || req.WorkId == "travel" || req.WorkId == "loreal" || req.WorkId == "xiulike-dc" { //临时加
+	if req.WorkId == "TEST_DOUYIN" || req.WorkId == "TEST_DOUYIN_CN" || req.WorkId == "travel" || req.WorkId == "loreal" || req.WorkId == "xiulike-dc" || req.WorkId == "wuhanzhongxin" { //临时加
 		apiKeyObj.OpenaiBase = "http://cn-agent.gkscrm.com/api/v1/"
 		if req.WorkId == "TEST_DOUYIN" || req.WorkId == "TEST_DOUYIN_CN" {
 			workToken = "fastgpt-jsMmQKEM5uX7tDimT1zHlZHkBhMHRT2k61YaxyDJRZTUHehID7sG8BKXADNIU"
@@ -59,6 +59,8 @@ func (l *ChatCompletionsLogic) ChatCompletions(req *types.CompApiReq) (resp *typ
 			workToken = "fastgpt-qqJeBEkwhgx7wR9fvGToQygmOb7FVjAbGBTFjOAMbd95InEtndke"
 		} else if req.WorkId == "xiulike-dc" {
 			workToken = "fastgpt-ir9RgnKHMT9HIOnPsUCFChN15ZbW9kt1lbd5Y0ohfLw9gOz3KcPrfaZWHRB"
+		} else if req.WorkId == "wuhanzhongxin" {
+			workToken = "fastgpt-jX6Gl50Ivrc7vzyD4xNlahG11cgmJ4N63QHKrntt2gQ78g31haxuAsA"
 		}
 
 	}

internal/logic/contact/update_contact_logic.go

@@ -27,6 +27,10 @@ func NewUpdateContactLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Upd
 
 func (l *UpdateContactLogic) UpdateContact(req *types.ContactInfo) (*types.BaseMsgResp, error) {
 	organizationId := l.ctx.Value("organizationId").(uint64)
+	cage := 0
+	if req.Cage != nil && *req.Cage > 0 {
+		cage = *req.Cage
+	}
 	err := l.svcCtx.DB.Contact.UpdateOneID(*req.Id).
 		Where(contact.OrganizationID(organizationId)).
 		SetNotNilStatus(req.Status).
@@ -47,7 +51,7 @@ func (l *UpdateContactLogic) UpdateContact(req *types.ContactInfo) (*types.BaseM
 		SetNotNilV3(req.V3).
 		SetNotNilCname(req.Cname).
 		SetNotNilCarea(req.Carea).
-		SetNotNilCage(req.Cage).
+		SetNotNilCage(&cage).
 		SetNotNilCbirthday(req.Cbirthday).
 		SetNotNilCbirtharea(req.Cbirtharea).
 		SetNotNilCc(req.Cc).

internal/utils/compapi/config.go

@@ -25,4 +25,5 @@ var fastgptWorkIdMap = map[string]workIdInfo{
 	"travel":               {"fastgpt-bcnfFtw1lXWdmYGOv165UVD5R1kY28tyXX8SJv8MHhrSMOgVJsuU", 5},
 	"loreal":               {"fastgpt-qqJeBEkwhgx7wR9fvGToQygmOb7FVjAbGBTFjOAMbd95InEtndke", 6},
 	"xiulike-dc":           {"fastgpt-ir9RgnKHMT9HIOnPsUCFChN15ZbW9kt1lbd5Y0ohfLw9gOz3KcPrfaZWHRB", 7},
+	"wuhanzhongxin":        {"fastgpt-jX6Gl50Ivrc7vzyD4xNlahG11cgmJ4N63QHKrntt2gQ78g31haxuAsA", 8},
 }