update

check/check.go

@@ -44,25 +44,25 @@ func CheckEnvVariable() {
 		}
 	}
 
-	if config.SessionImageChatMapStr != "" {
-		pattern := `^([a-zA-Z0-9\-\/]+=([a-zA-Z0-9\-\.]+))(,[a-zA-Z0-9\-\/]+=([a-zA-Z0-9\-\.]+))*`
-		match, _ := regexp.MatchString(pattern, config.SessionImageChatMapStr)
-		if !match {
-			logger.FatalLog("环境变量 SESSION_IMAGE_CHAT_MAP 设置有误")
-		} else {
-			sessionImageChatMap := make(map[string]string)
-			pairs := strings.Split(config.SessionImageChatMapStr, ",")
-
-			for _, pair := range pairs {
-				kv := strings.Split(pair, "=")
-				sessionImageChatMap["session_id="+kv[0]] = kv[1]
-			}
-
-			config.SessionImageChatMap = sessionImageChatMap
-		}
-	} else {
-		logger.SysLog("环境变量 SESSION_IMAGE_CHAT_MAP 未设置，生图可能会异常")
-	}
+	//if config.SessionImageChatMapStr != "" {
+	//	pattern := `^([a-zA-Z0-9\-\/]+=([a-zA-Z0-9\-\.]+))(,[a-zA-Z0-9\-\/]+=([a-zA-Z0-9\-\.]+))*`
+	//	match, _ := regexp.MatchString(pattern, config.SessionImageChatMapStr)
+	//	if !match {
+	//		logger.FatalLog("环境变量 SESSION_IMAGE_CHAT_MAP 设置有误")
+	//	} else {
+	//		sessionImageChatMap := make(map[string]string)
+	//		pairs := strings.Split(config.SessionImageChatMapStr, ",")
+	//
+	//		for _, pair := range pairs {
+	//			kv := strings.Split(pair, "=")
+	//			sessionImageChatMap["session_id="+kv[0]] = kv[1]
+	//		}
+	//
+	//		config.SessionImageChatMap = sessionImageChatMap
+	//	}
+	//} else {
+	//	logger.SysLog("环境变量 SESSION_IMAGE_CHAT_MAP 未设置，生图可能会异常")
+	//}
 
 	logger.SysLog("environment variable check passed.")
 }

common/config/config.go

@@ -15,7 +15,8 @@ var ApiSecret = os.Getenv("API_SECRET")
 var ApiSecrets = strings.Split(os.Getenv("API_SECRET"), ",")
 
 var GSCookie = os.Getenv("GS_COOKIE")
-var GSCookies = strings.Split(os.Getenv("GS_COOKIE"), ",")
+
+//var GSCookies = strings.Split(os.Getenv("GS_COOKIE"), ",")
 
 // var IpBlackList = os.Getenv("IP_BLACK_LIST")
 var IpBlackList = strings.Split(os.Getenv("IP_BLACK_LIST"), ",")
@@ -26,13 +27,15 @@ var AutoModelChatMapType = env.Int("AUTO_MODEL_CHAT_MAP_TYPE", 1)
 var YesCaptchaClientKey = env.String("YES_CAPTCHA_CLIENT_KEY", "")
 var CheatUrl = env.String("CHEAT_URL", "https://gs-cheat.aytsao.cn/genspark/create/req/body")
 
+var RateLimitCookieLockDuration = env.Int("RATE_LIMIT_COOKIE_LOCK_DURATION", 10*60)
+
 // 路由前缀
 var RoutePrefix = env.String("ROUTE_PREFIX", "")
 var ModelChatMapStr = env.String("MODEL_CHAT_MAP", "")
 var ModelChatMap = make(map[string]string)
-var SessionImageChatMapStr = env.String("SESSION_IMAGE_CHAT_MAP", "")
 var SessionImageChatMap = make(map[string]string)
 var GlobalSessionManager *SessionManager
+var SessionImageChatMapStr = env.String("SESSION_IMAGE_CHAT_MAP", "")
 var YescaptchaClient *yescaptcha.Client
 
 var AllDialogRecordEnable = os.Getenv("ALL_DIALOG_RECORD_ENABLE")
@@ -52,26 +55,108 @@ var (
 	RequestRateLimitDuration int64 = 1 * 60
 )
 
+type RateLimitCookie struct {
+	ExpirationTime time.Time // 过期时间
+}
+
+var (
+	rateLimitCookies sync.Map // 使用 sync.Map 管理限速 Cookie
+)
+
+func AddRateLimitCookie(cookie string, expirationTime time.Time) {
+	rateLimitCookies.Store(cookie, RateLimitCookie{
+		ExpirationTime: expirationTime,
+	})
+	//fmt.Printf("Storing cookie: %s with value: %+v\n", cookie, RateLimitCookie{ExpirationTime: expirationTime})
+}
+
 type CookieManager struct {
 	Cookies      []string
 	currentIndex int
 	mu           sync.Mutex
 }
 
-func NewCookieManager() *CookieManager {
-	cookies := strings.Split(os.Getenv("GS_COOKIE"), ",")
-	// 过滤空字符串
-	var validCookies []string
-	for _, cookie := range cookies {
-		if strings.TrimSpace(cookie) != "" {
+var (
+	GSCookies    []string   // 存储所有的 cookies
+	cookiesMutex sync.Mutex // 保护 GSCookies 的互斥锁
+)
+
+// InitGSCookies 初始化 GSCookies
+func InitGSCookies() {
+	cookiesMutex.Lock()
+	defer cookiesMutex.Unlock()
 
+	GSCookies = []string{}
+
+	// 从环境变量中读取 GS_COOKIE 并拆分为切片
+	cookieStr := os.Getenv("GS_COOKIE")
+	if cookieStr != "" {
+
+		for _, cookie := range strings.Split(cookieStr, ",") {
+			// 如果 cookie 不包含 "session_id="，则添加前缀
 			if !strings.Contains(cookie, "session_id=") {
 				cookie = "session_id=" + cookie
-
 			}
+			GSCookies = append(GSCookies, cookie)
+		}
+	}
+}
+
+// RemoveCookie 删除指定的 cookie（支持并发）
+func RemoveCookie(cookieToRemove string) {
+	cookiesMutex.Lock()
+	defer cookiesMutex.Unlock()
+
+	// 创建一个新的切片，过滤掉需要删除的 cookie
+	var newCookies []string
+	for _, cookie := range GetGSCookies() {
+		if cookie != cookieToRemove {
+			newCookies = append(newCookies, cookie)
+		}
+	}
+
+	// 更新 GSCookies
+	GSCookies = newCookies
+}
+
+// GetGSCookies 获取 GSCookies 的副本
+func GetGSCookies() []string {
+	//cookiesMutex.Lock()
+	//defer cookiesMutex.Unlock()
+
+	// 返回 GSCookies 的副本，避免外部直接修改
+	cookiesCopy := make([]string, len(GSCookies))
+	copy(cookiesCopy, GSCookies)
+	return cookiesCopy
+}
 
-			validCookies = append(validCookies, cookie)
+// NewCookieManager 创建 CookieManager
+func NewCookieManager() *CookieManager {
+	var validCookies []string
+	// 遍历 GSCookies
+	for _, cookie := range GetGSCookies() {
+		cookie = strings.TrimSpace(cookie)
+		if cookie == "" {
+			continue // 忽略空字符串
+		}
+
+		// 检查是否在 RateLimitCookies 中
+		if value, ok := rateLimitCookies.Load(cookie); ok {
+			rateLimitCookie, ok := value.(RateLimitCookie) // 正确转换为 RateLimitCookie
+			if !ok {
+				continue
+			}
+			if rateLimitCookie.ExpirationTime.After(time.Now()) {
+				// 如果未过期，忽略该 cookie
+				continue
+			} else {
+				// 如果已过期，从 RateLimitCookies 中删除
+				rateLimitCookies.Delete(cookie)
+			}
 		}
+
+		// 添加到有效 cookie 列表
+		validCookies = append(validCookies, cookie)
 	}
 
 	return &CookieManager{
@@ -80,6 +165,14 @@ func NewCookieManager() *CookieManager {
 	}
 }
 
+func IsRateLimited(cookie string) bool {
+	if value, ok := rateLimitCookies.Load(cookie); ok {
+		rateLimitCookie := value.(RateLimitCookie)
+		return rateLimitCookie.ExpirationTime.After(time.Now())
+	}
+	return false
+}
+
 func (cm *CookieManager) RemoveCookie(cookieToRemove string) error {
 	cm.mu.Lock()
 	defer cm.mu.Unlock()

common/constants.go

@@ -3,7 +3,7 @@ package common
 import "time"
 
 var StartTime = time.Now().Unix() // unit: second
-var Version = "v1.10.0"           // this hard coding will be replaced automatically when building, no need to manually change
+var Version = "v1.10.10"          // this hard coding will be replaced automatically when building, no need to manually change
 
 var DefaultOpenaiModelList = []string{
 	"gpt-4o",
@@ -21,6 +21,7 @@ var DefaultOpenaiModelList = []string{
 	"ideogram",
 	"recraft-v3",
 	"dall-e-3",
+	"imagen3",
 }
 
 var TextModelList = []string{
@@ -47,4 +48,5 @@ var ImageModelList = []string{
 	"ideogram",
 	"recraft-v3",
 	"dall-e-3",
+	"imagen3",
 }

common/token.go

@@ -50,7 +50,7 @@ func getTokenEncoder(model string) *tiktoken.Tiktoken {
 	if ok {
 		tokenEncoder, err := tiktoken.EncodingForModel(model)
 		if err != nil {
-			logger.SysError(fmt.Sprintf("[IGNORE] | failed to get token encoder for model %s: %s, using encoder for gpt-3.5-turbo", model, err.Error()))
+			//logger.SysError(fmt.Sprintf("[IGNORE] | failed to get token encoder for model %s: %s, using encoder for gpt-3.5-turbo", model, err.Error()))
 			tokenEncoder = defaultTokenEncoder
 		}
 		tokenEncoderMap[model] = tokenEncoder

controller/chat.go

@@ -68,6 +68,7 @@ func ChatForOpenAI(c *gin.Context) {
 	}
 
 	// 初始化cookie
+
 	cookieManager := config.NewCookieManager()
 	cookie, err := cookieManager.GetRandomCookie()
 	if err != nil {
@@ -363,27 +364,6 @@ func createRequestBody(c *gin.Context, client cycletls.CycleTLS, cookie string,
 		models = common.MixtureModelList
 	}
 
-	//gRecaptchaToken := ""
-	//if config.YesCaptchaClientKey != "" {
-	//	// 创建上下文，设置超时
-	//	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
-	//	defer cancel()
-	//	// 准备请求参数
-	//	req := yescaptcha.RecaptchaV3Request{
-	//		WebsiteURL: "https://www.genspark.ai/",
-	//		WebsiteKey: "6Leq7KYqAAAAAGdd1NaUBJF9dHTPAKP7DcnaRc66",
-	//		PageAction: "copilot",
-	//	}
-	//
-	//	// 解决验证码
-	//	response, err := config.YescaptchaClient.SolveRecaptchaV3(ctx, req)
-	//	if err != nil {
-	//		return map[string]interface{}{}, err
-	//	}
-	//
-	//	gRecaptchaToken = response
-	//}
-
 	// 创建请求体
 	requestBody := map[string]interface{}{
 		"type":                 chatType,
@@ -396,7 +376,6 @@ func createRequestBody(c *gin.Context, client cycletls.CycleTLS, cookie string,
 			"writingContent":         nil,
 			"request_web_knowledge":  requestWebKnowledge,
 		},
-		//"g_recaptcha_token": gRecaptchaToken,
 	}
 
 	logger.Debug(c.Request.Context(), fmt.Sprintf("RequestBody: %v", requestBody))
@@ -406,7 +385,6 @@ func createRequestBody(c *gin.Context, client cycletls.CycleTLS, cookie string,
 			!strings.HasPrefix(config.CheatUrl, "https://")) {
 		return requestBody, nil
 	} else {
-		// 发送请求到本地测试接口
 		jsonData, err := json.Marshal(requestBody)
 		if err != nil {
 			return nil, fmt.Errorf("marshal request body error: %v", err)
@@ -430,26 +408,6 @@ func createRequestBody(c *gin.Context, client cycletls.CycleTLS, cookie string,
 }
 
 func createImageRequestBody(c *gin.Context, cookie string, openAIReq *model.OpenAIImagesGenerationRequest, chatId string) (map[string]interface{}, error) {
-	//gRecaptchaToken := ""
-	//if config.YesCaptchaClientKey != "" {
-	//	// 创建上下文，设置超时
-	//	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
-	//	defer cancel()
-	//	// 准备请求参数
-	//	req := yescaptcha.RecaptchaV3Request{
-	//		WebsiteURL: "https://www.genspark.ai/",
-	//		WebsiteKey: "6Leq7KYqAAAAAGdd1NaUBJF9dHTPAKP7DcnaRc66",
-	//		PageAction: "copilot",
-	//	}
-	//
-	//	// 解决验证码
-	//	response, err := config.YescaptchaClient.SolveRecaptchaV3(ctx, req)
-	//	if err != nil {
-	//		return map[string]interface{}{}, err
-	//	}
-	//
-	//	gRecaptchaToken = response
-	//}
 
 	if openAIReq.Model == "dall-e-3" {
 		openAIReq.Model = "dalle-3"
@@ -528,13 +486,13 @@ func createImageRequestBody(c *gin.Context, cookie string, openAIReq *model.Open
 	}
 	var currentQueryString string
 	if len(chatId) != 0 {
-		currentQueryString = fmt.Sprintf("id=%s&type=%s", chatId, chatType)
+		currentQueryString = fmt.Sprintf("id=%s&type=%s", chatId, imageType)
 	} else {
-		currentQueryString = fmt.Sprintf("type=%s", chatId, chatType)
+		currentQueryString = fmt.Sprintf("type=%s", imageType)
 	}
 
 	// 创建请求体
-	return map[string]interface{}{
+	requestBody := map[string]interface{}{
 		"type": "COPILOT_MOA_IMAGE",
 		//"current_query_string": "type=COPILOT_MOA_IMAGE",
 		"current_query_string": currentQueryString,
@@ -547,8 +505,35 @@ func createImageRequestBody(c *gin.Context, cookie string, openAIReq *model.Open
 			"imageModelMap":  map[string]interface{}{},
 			"writingContent": nil,
 		},
-		//"g_recaptcha_token": gRecaptchaToken,
-	}, nil
+	}
+
+	logger.Debug(c.Request.Context(), fmt.Sprintf("RequestBody: %v", requestBody))
+
+	if strings.TrimSpace(config.CheatUrl) == "" ||
+		(!strings.HasPrefix(config.CheatUrl, "http://") &&
+			!strings.HasPrefix(config.CheatUrl, "https://")) {
+		return requestBody, nil
+	} else {
+		jsonData, err := json.Marshal(requestBody)
+		if err != nil {
+			return nil, fmt.Errorf("marshal request body error: %v", err)
+		}
+
+		resp, err := http.Post(config.CheatUrl, "application/json", bytes.NewBuffer(jsonData))
+		if err != nil {
+			return nil, fmt.Errorf("send request to test api error: %v", err)
+		}
+		defer resp.Body.Close()
+
+		// 读取响应
+		var response map[string]interface{}
+		if err := json.NewDecoder(resp.Body).Decode(&response); err != nil {
+			return nil, fmt.Errorf("decode response error: %v", err)
+		}
+		logger.Debugf(c.Request.Context(), fmt.Sprintf("Cheat success!"))
+		return response, nil
+	}
+
 }
 
 // createStreamResponse 创建流式响应
@@ -873,10 +858,14 @@ func handleStreamRequest(c *gin.Context, client cycletls.CycleTLS, cookie string
 				case common.IsRateLimit(data):
 					isRateLimit = true
 					logger.Warnf(ctx, "Cookie rate limited, switching to next cookie, attempt %d/%d, COOKIE:%s", attempt+1, maxRetries, cookie)
+					config.AddRateLimitCookie(cookie, time.Now().Add(time.Duration(config.RateLimitCookieLockDuration)*time.Second))
 					break SSELoop // 使用 label 跳出 SSE 循环
 				case common.IsFreeLimit(data):
 					isRateLimit = true
 					logger.Warnf(ctx, "Cookie free rate limited, switching to next cookie, attempt %d/%d, COOKIE:%s", attempt+1, maxRetries, cookie)
+					//config.AddRateLimitCookie(cookie, time.Now().Add(24*60*60*time.Second))
+					// 删除cookie
+					config.RemoveCookie(cookie)
 					break SSELoop // 使用 label 跳出 SSE 循环
 				case common.IsNotLogin(data):
 					isRateLimit = true
@@ -1086,7 +1075,6 @@ func makeStreamRequest(c *gin.Context, client cycletls.CycleTLS, jsonData []byte
 //	}
 func handleNonStreamRequest(c *gin.Context, client cycletls.CycleTLS, cookie string, cookieManager *config.CookieManager, requestBody map[string]interface{}, modelName string, searchModel bool) {
 	const (
-		errNoValidCookies         = "No valid cookies available"
 		errCloudflareChallengeMsg = "Detected Cloudflare Challenge Page"
 		errCloudflareBlock        = "CloudFlare: Sorry, you have been blocked"
 		errServerErrMsg           = "An error occurred with the current request, please try again."
@@ -1138,10 +1126,14 @@ func handleNonStreamRequest(c *gin.Context, client cycletls.CycleTLS, cookie str
 			case common.IsRateLimit(line):
 				isRateLimit = true
 				logger.Warnf(ctx, "Cookie rate limited, switching to next cookie, attempt %d/%d, COOKIE:%s", attempt+1, maxRetries, cookie)
+				config.AddRateLimitCookie(cookie, time.Now().Add(time.Duration(config.RateLimitCookieLockDuration)*time.Second))
 				break
 			case common.IsFreeLimit(line):
 				isRateLimit = true
 				logger.Warnf(ctx, "Cookie free rate limited, switching to next cookie, attempt %d/%d, COOKIE:%s", attempt+1, maxRetries, cookie)
+				//config.AddRateLimitCookie(cookie, time.Now().Add(24*60*60*time.Second))
+				// 删除cookie
+				config.RemoveCookie(cookie)
 				break
 			case common.IsNotLogin(line):
 				isRateLimit = true
@@ -1319,31 +1311,31 @@ func ImageProcess(c *gin.Context, client cycletls.CycleTLS, openAIReq model.Open
 	)
 
 	var (
-		sessionImageChatManager *config.SessionMapManager
-		maxRetries              int
-		cookie                  string
-		chatId                  string
+		//sessionImageChatManager *config.SessionMapManager
+		maxRetries int
+		cookie     string
+		chatId     string
 	)
 
 	cookieManager := config.NewCookieManager()
-	sessionImageChatManager = config.NewSessionMapManager()
+	//sessionImageChatManager = config.NewSessionMapManager()
 	ctx := c.Request.Context()
 
 	// Initialize session manager and get initial cookie
-	if len(config.SessionImageChatMap) == 0 {
-		logger.Warnf(ctx, "未配置环境变量 SESSION_IMAGE_CHAT_MAP, 可能会生图失败!")
-		maxRetries = len(cookieManager.Cookies)
+	//if len(config.SessionImageChatMap) == 0 {
+	//logger.Warnf(ctx, "未配置环境变量 SESSION_IMAGE_CHAT_MAP, 可能会生图失败!")
+	maxRetries = len(cookieManager.Cookies)
 
-		var err error
-		cookie, err = cookieManager.GetRandomCookie()
-		if err != nil {
-			logger.Errorf(ctx, "Failed to get initial cookie: %v", err)
-			return nil, fmt.Errorf(errNoValidCookies)
-		}
-	} else {
-		maxRetries = sessionImageChatManager.GetSize()
-		cookie, chatId, _ = sessionImageChatManager.GetRandomKeyValue()
+	var err error
+	cookie, err = cookieManager.GetRandomCookie()
+	if err != nil {
+		logger.Errorf(ctx, "Failed to get initial cookie: %v", err)
+		return nil, fmt.Errorf(errNoValidCookies)
 	}
+	//} else {
+	//	maxRetries = sessionImageChatManager.GetSize()
+	//	cookie, chatId, _ = sessionImageChatManager.GetRandomKeyValue()
+	//}
 
 	for attempt := 0; attempt < maxRetries; attempt++ {
 		// Create request body
@@ -1373,64 +1365,68 @@ func ImageProcess(c *gin.Context, client cycletls.CycleTLS, openAIReq model.Open
 		switch {
 		case common.IsRateLimit(body):
 			logger.Warnf(ctx, "Cookie rate limited, switching to next cookie, attempt %d/%d, COOKIE:%s", attempt+1, maxRetries, cookie)
-			if sessionImageChatManager != nil {
-				cookie, chatId, err = sessionImageChatManager.GetNextKeyValue()
-				if err != nil {
-					logger.Errorf(ctx, "No more valid cookies available after attempt %d", attempt+1)
-					c.JSON(http.StatusInternalServerError, gin.H{"error": errNoValidCookies})
-					return nil, fmt.Errorf(errNoValidCookies)
-				}
-			} else {
-				//cookieManager := config.NewCookieManager()
-				cookie, err = cookieManager.GetNextCookie()
-				if err != nil {
-					logger.Errorf(ctx, "No more valid cookies available after attempt %d", attempt+1)
-					c.JSON(http.StatusInternalServerError, gin.H{"error": errNoValidCookies})
-					return nil, fmt.Errorf(errNoValidCookies)
-				}
+			//if sessionImageChatManager != nil {
+			//	cookie, chatId, err = sessionImageChatManager.GetNextKeyValue()
+			//	if err != nil {
+			//		logger.Errorf(ctx, "No more valid cookies available after attempt %d", attempt+1)
+			//		c.JSON(http.StatusInternalServerError, gin.H{"error": errNoValidCookies})
+			//		return nil, fmt.Errorf(errNoValidCookies)
+			//	}
+			//} else {
+			//cookieManager := config.NewCookieManager()
+			config.AddRateLimitCookie(cookie, time.Now().Add(time.Duration(config.RateLimitCookieLockDuration)*time.Second))
+			cookie, err = cookieManager.GetNextCookie()
+			if err != nil {
+				logger.Errorf(ctx, "No more valid cookies available after attempt %d", attempt+1)
+				c.JSON(http.StatusInternalServerError, gin.H{"error": errNoValidCookies})
+				return nil, fmt.Errorf(errNoValidCookies)
+				//}
 			}
 			continue
 		case common.IsFreeLimit(body):
 			logger.Warnf(ctx, "Cookie free rate limited, switching to next cookie, attempt %d/%d, COOKIE:%s", attempt+1, maxRetries, cookie)
-			if sessionImageChatManager != nil {
-				cookie, chatId, err = sessionImageChatManager.GetNextKeyValue()
-				if err != nil {
-					logger.Errorf(ctx, "No more valid cookies available after attempt %d", attempt+1)
-					c.JSON(http.StatusInternalServerError, gin.H{"error": errNoValidCookies})
-					return nil, fmt.Errorf(errNoValidCookies)
-				}
-			} else {
-				//cookieManager := config.NewCookieManager()
-				cookie, err = cookieManager.GetNextCookie()
-				if err != nil {
-					logger.Errorf(ctx, "No more valid cookies available after attempt %d", attempt+1)
-					c.JSON(http.StatusInternalServerError, gin.H{"error": errNoValidCookies})
-					return nil, fmt.Errorf(errNoValidCookies)
-				}
+			//if sessionImageChatManager != nil {
+			//	cookie, chatId, err = sessionImageChatManager.GetNextKeyValue()
+			//	if err != nil {
+			//		logger.Errorf(ctx, "No more valid cookies available after attempt %d", attempt+1)
+			//		c.JSON(http.StatusInternalServerError, gin.H{"error": errNoValidCookies})
+			//		return nil, fmt.Errorf(errNoValidCookies)
+			//	}
+			//} else {
+			//cookieManager := config.NewCookieManager()
+			//config.AddRateLimitCookie(cookie, time.Now().Add(24*60*60*time.Second))
+			// 删除cookie
+			config.RemoveCookie(cookie)
+			cookie, err = cookieManager.GetNextCookie()
+			if err != nil {
+				logger.Errorf(ctx, "No more valid cookies available after attempt %d", attempt+1)
+				c.JSON(http.StatusInternalServerError, gin.H{"error": errNoValidCookies})
+				return nil, fmt.Errorf(errNoValidCookies)
+				//}
 			}
 			continue
 		case common.IsNotLogin(body):
-			logger.Warnf(ctx, "Cookie free rate limited, switching to next cookie, attempt %d/%d, COOKIE:%s", attempt+1, maxRetries, cookie)
-			if sessionImageChatManager != nil {
-				//sessionImageChatManager.RemoveKey(cookie)
-				cookie, chatId, err = sessionImageChatManager.GetNextKeyValue()
-				if err != nil {
-					logger.Errorf(ctx, "No more valid cookies available after attempt %d", attempt+1)
-					c.JSON(http.StatusInternalServerError, gin.H{"error": errNoValidCookies})
-					return nil, fmt.Errorf(errNoValidCookies)
-				}
-			} else {
-				//cookieManager := config.NewCookieManager()
-				//err := cookieManager.RemoveCookie(cookie)
-				//if err != nil {
-				//	logger.Errorf(ctx, "Failed to remove cookie: %v", err)
+			logger.Warnf(ctx, "Cookie Not Login, switching to next cookie, attempt %d/%d, COOKIE:%s", attempt+1, maxRetries, cookie)
+			//if sessionImageChatManager != nil {
+			//	//sessionImageChatManager.RemoveKey(cookie)
+			//	cookie, chatId, err = sessionImageChatManager.GetNextKeyValue()
+			//	if err != nil {
+			//		logger.Errorf(ctx, "No more valid cookies available after attempt %d", attempt+1)
+			//		c.JSON(http.StatusInternalServerError, gin.H{"error": errNoValidCookies})
+			//		return nil, fmt.Errorf(errNoValidCookies)
+			//	}
+			//} else {
+			//cookieManager := config.NewCookieManager()
+			//err := cookieManager.RemoveCookie(cookie)
+			//if err != nil {
+			//	logger.Errorf(ctx, "Failed to remove cookie: %v", err)
+			//}
+			cookie, err = cookieManager.GetNextCookie()
+			if err != nil {
+				logger.Errorf(ctx, "No more valid cookies available after attempt %d", attempt+1)
+				c.JSON(http.StatusInternalServerError, gin.H{"error": errNoValidCookies})
+				return nil, fmt.Errorf(errNoValidCookies)
 				//}
-				cookie, err = cookieManager.GetNextCookie()
-				if err != nil {
-					logger.Errorf(ctx, "No more valid cookies available after attempt %d", attempt+1)
-					c.JSON(http.StatusInternalServerError, gin.H{"error": errNoValidCookies})
-					return nil, fmt.Errorf(errNoValidCookies)
-				}
 
 			}
 			continue
@@ -1582,6 +1578,7 @@ func pollTaskStatus(c *gin.Context, client cycletls.CycleTLS, taskIDs []string,
 
 			var result struct {
 				Data struct {
+					ImageURLs            []string `json:"image_urls"`
 					ImageURLsNowatermark []string `json:"image_urls_nowatermark"`
 					Status               string   `json:"status"`
 				}
@@ -1592,9 +1589,15 @@ func pollTaskStatus(c *gin.Context, client cycletls.CycleTLS, taskIDs []string,
 			}
 
 			// 如果状态成功且有图片URL
-			if result.Data.Status == "SUCCESS" && len(result.Data.ImageURLsNowatermark) > 0 {
-				imageURLs = append(imageURLs, result.Data.ImageURLsNowatermark...)
-				break
+			if result.Data.Status == "SUCCESS" {
+				if len(result.Data.ImageURLsNowatermark) > 0 {
+					imageURLs = append(imageURLs, result.Data.ImageURLsNowatermark...)
+					break
+				}
+				if len(result.Data.ImageURLs) > 0 {
+					imageURLs = append(imageURLs, result.Data.ImageURLs...)
+					break
+				}
 			}
 
 			// 等待1秒后重试

job/cookie.go

@@ -0,0 +1,35 @@
+package job
+
+import (
+	"genspark2api/common/config"
+	logger "genspark2api/common/loggger"
+	"math/rand"
+	"time"
+)
+
+func LoadCookieTask() {
+	for {
+		source := rand.NewSource(time.Now().UnixNano())
+		randomNumber := rand.New(source).Intn(60) // 生成0到60之间的随机整数
+
+		// 计算距离下一个时间间隔
+		now := time.Now()
+		next := time.Date(now.Year(), now.Month(), now.Day(), 17, 5, 0, 0, now.Location())
+
+		// 如果当前时间已经超过9点，那么等待到第二天的9点
+		if now.After(next) {
+			next = next.Add(24 * time.Hour)
+		}
+
+		delay := next.Sub(now)
+
+		// 等待直到下一个间隔
+		time.Sleep(delay + time.Duration(randomNumber)*time.Second)
+
+		logger.SysLog("genspark2api Scheduled LoadCookieTask Task Job Start!")
+
+		config.InitGSCookies()
+
+		logger.SysLog("genspark2api Scheduled LoadCookieTask Task Job  End!")
+	}
+}

main.go

@@ -6,6 +6,7 @@ import (
 	"genspark2api/common"
 	"genspark2api/common/config"
 	logger "genspark2api/common/loggger"
+	"genspark2api/job"
 	"genspark2api/middleware"
 	"genspark2api/router"
 	"genspark2api/yescaptcha"
@@ -27,10 +28,14 @@ func main() {
 	var err error
 
 	common.InitTokenEncoders()
+	config.InitGSCookies()
 	config.YescaptchaClient = yescaptcha.NewClient(config.YesCaptchaClientKey, nil)
 
 	config.GlobalSessionManager = config.NewSessionManager()
 
+	// 定时任务 每天9点整重载GS_COOKIES
+	go job.LoadCookieTask()
+
 	server := gin.New()
 	server.Use(gin.Recovery())
 	server.Use(middleware.RequestId())