소스 검색

Merge branch 'lcd250411' into debug

# Conflicts:
#	internal/logic/chat/chat_completions_logic.go
lichangdong 1 주 전
부모
커밋
bdcab19079
2개의 변경된 파일8개의 추가작업 그리고 5개의 파일을 삭제
  1. 5 4
      internal/logic/auth/login_logic.go
  2. 3 1
      internal/utils/compapi/config.go

+ 5 - 4
internal/logic/auth/login_logic.go

@@ -82,10 +82,11 @@ func (l *LoginLogic) Login(req *types.LoginReq) (resp *types.LoginResp, err erro
 	//set_cookie.NewFastGpt(l.svcCtx, fastgptLogic)
 	fastgptLogic := fastgpt.NewSetTokenLogic(l.ctx, l.svcCtx, l.rw)
 	//userId := *user.Id
-	_, err = fastgptLogic.SetTokenByUserId(*user.Id)
-	if err != nil {
-		return nil, err
-	}
+	//静默执行
+	_, _ = fastgptLogic.SetTokenByUserId(*user.Id)
+	//if err != nil {
+	//	return nil, err
+	//}
 	resp = &types.LoginResp{
 		BaseDataInfo: types.BaseDataInfo{Msg: errormsg.Success},
 		Data: types.LoginInfo{

+ 3 - 1
internal/utils/compapi/config.go

@@ -22,5 +22,7 @@ var fastgptWorkIdMap = map[string]workIdInfo{
 	"TEST_DOUYIN":          {"fastgpt-bwt6oSGcjwJ1qBgT276oeFD34IAhfjEQBCZWJfJR1oj3WqJl7751ljSrc", 2},
 	"GENERALIZED_KEYWORDS": {"fastgpt-yefNCWpNtzY2Qn0xtJvKuvepOP9DR7BiXQwv5BiVP5JseP2IS92gE", 3},
 	"TEST_DOUYIN_CN":       {"fastgpt-jsMmQKEM5uX7tDimT1zHlZHkBhMHRT2k61YaxyDJRZTUHehID7sG8BKXADNIU", 4},
-	"travel":       {"fastgpt-bcnfFtw1lXWdmYGOv165UVD5R1kY28tyXX8SJv8MHhrSMOgVJsuU", 5},
+	"travel":               {"fastgpt-bcnfFtw1lXWdmYGOv165UVD5R1kY28tyXX8SJv8MHhrSMOgVJsuU", 5},
+	"loreal":               {"fastgpt-qqJeBEkwhgx7wR9fvGToQygmOb7FVjAbGBTFjOAMbd95InEtndke", 6},
+	"xiulike-dc":           {"fastgpt-ir9RgnKHMT9HIOnPsUCFChN15ZbW9kt1lbd5Y0ohfLw9gOz3KcPrfaZWHRB", 7},
 }