Merge branch 'master' into codex/multi-quantity-orders

netflix-common/src/main/java/com/cyksj/common/constant/Constant.java

@@ -765,7 +765,7 @@ public interface Constant {
 	/**
 	 * cc api domain
 	 */
-    String CLAUDE_CODE_API_PREFIX = "http://ccby.apinebula.com:18080/";
+    String CLAUDE_CODE_API_PREFIX = "http://ccby.fapinebula.vip:18080/";
 
 	String CLAUDE_CODE_HEARD_KEY = "X-Admin-Key";
 
@@ -862,6 +862,11 @@ public interface Constant {
      */
     Long GUOFENZAIXIAN_CHANNEL_ID = 16L;
 
+    /**
+     * redeemcloud.com
+     */
+    Long REDEEM_CLOUD_CHANNEL_ID = 17L;
+
     /**
 	 * Adobe 全家桶
 	 */
@@ -875,7 +880,7 @@ public interface Constant {
     /**
      * AI API调度域名
      */
-    String AI_API_SVC_DOMAIN = "https://svc.apinebula.com";
+    String AI_API_SVC_DOMAIN = "https://svc.fapinebula.vip";
 
     /**
      * api auth

netflix-dao/src/main/java/com/cyksj/model/response/recharge/RedeemCloudCdkQueryResponse.java

@@ -0,0 +1,44 @@
+package com.cyksj.model.response.recharge;
+
+import lombok.Data;
+
+@Data
+public class RedeemCloudCdkQueryResponse {
+
+    private Integer code;
+
+    private String message;
+
+    private CdkData data;
+
+    private Long timestamp;
+
+    @Data
+    public static class CdkData {
+
+        private String productName;
+
+        private String productTag;
+
+        private String packageName;
+
+        /**
+         * 0: unused, other values are treated as unavailable.
+         */
+        private Integer useStatus;
+
+        private String exchangeTime;
+
+        private String email;
+
+        private String accountId;
+
+        private String taskId;
+
+        private Boolean channelEnabled;
+
+        private String productCode;
+
+        private String stockLevel;
+    }
+}

netflix-dao/src/main/java/com/cyksj/model/response/recharge/RedeemCloudExchangeResponse.java

@@ -0,0 +1,15 @@
+package com.cyksj.model.response.recharge;
+
+import lombok.Data;
+
+@Data
+public class RedeemCloudExchangeResponse {
+
+    private Integer code;
+
+    private String message;
+
+    private String data;
+
+    private Long timestamp;
+}

netflix-dao/src/main/java/com/cyksj/model/response/recharge/RedeemCloudTaskResultResponse.java

@@ -0,0 +1,33 @@
+package com.cyksj.model.response.recharge;
+
+import lombok.Data;
+
+@Data
+public class RedeemCloudTaskResultResponse {
+
+    private Integer code;
+
+    private String message;
+
+    private TaskData data;
+
+    private Long timestamp;
+
+    @Data
+    public static class TaskData {
+
+        private String status;
+
+        private String errorMessage;
+
+        private String productCode;
+
+        private Integer useStatus;
+
+        private String email;
+
+        private String accountId;
+
+        private String taskId;
+    }
+}

netflix-service/src/main/java/com/cyksj/server/recharge/impl/GptProxyRechargeServiceImpl.java

@@ -79,6 +79,8 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
 
     private final GuofenzaixianRechargeService guofenzaixianRechargeService;
 
+    private final RedeemCloudRechargeService redeemCloudRechargeService;
+
     private final GptUserRechargeNumRecordMapper gptUserRechargeNumRecordMapper;
 
 	private static final GlobalThreadPoolTaskExecutor TASK_EXECUTOR = GlobalThreadPoolTaskExecutor.getInstance();
@@ -220,6 +222,9 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
 			}
             if (gptRechargeCardKey.getChannelId() == Constant.SC_CHANNEL_ID) {
                 return sancRechargeService.getTaskResult(relation);
+            }
+            if (Constant.REDEEM_CLOUD_CHANNEL_ID.equals(gptRechargeCardKey.getChannelId())) {
+                return redeemCloudRechargeService.getTaskResult(relation);
             }
 	        String BASE_URL = gptRechargeCardKeyChannelService.getCardKeyDomain(cardKey);
 	        String url = BASE_URL + "/tasks/" + taskId;
@@ -246,6 +251,34 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
         }
     }
 
+    private String getAccessTokenFromRechargePayload(String saveTokenJson) {
+        try {
+            JSONObject jsonObject = JSONUtil.parseObj(saveTokenJson);
+            String accessToken = jsonObject.getStr("accessToken");
+            if (StrUtil.isNotBlank(accessToken)) {
+                try {
+                    JSONObject sessionObject = JSONUtil.parseObj(accessToken);
+                    String sessionAccessToken = sessionObject.getStr("accessToken");
+                    if (StrUtil.isNotBlank(sessionAccessToken)) {
+                        return sessionAccessToken;
+                    }
+                } catch (Exception ignored) {
+                }
+                return accessToken;
+            }
+            String payload = jsonObject.getStr("payload");
+            if (StrUtil.isNotBlank(payload)) {
+                GptCardTokenDto gptCardTokenDto = Jsons.parseObject(payload, GptCardTokenDto.class);
+                if (gptCardTokenDto != null && StrUtil.isNotBlank(gptCardTokenDto.getAccessToken())) {
+                    return gptCardTokenDto.getAccessToken();
+                }
+            }
+        } catch (Exception e) {
+            return saveTokenJson;
+        }
+        return saveTokenJson;
+    }
+
 	@Override
 	@Transactional(rollbackFor = Throwable.class)
 	public String confirmRecharge(GroupsRelationRechargeReq req) {
@@ -325,13 +358,7 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
 			}
 			//入库token json
 			String saveTokenJson = req.getAccessToken();
-			String accessToken;
-			try {
-				GptCardTokenDto gptCardTokenDto = Jsons.parseObject(saveTokenJson, GptCardTokenDto.class);
-				accessToken = gptCardTokenDto.getAccessToken();
-			} catch (Exception e) {
-				accessToken = saveTokenJson;
-			}
+			String accessToken = getAccessTokenFromRechargePayload(saveTokenJson);
 			//验证用户token是否正确
 			TokenParseResult tokenParseResult = parseToken(accessToken);
 			if (!tokenParseResult.getSuccess()) {
@@ -420,6 +447,10 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
             //guofenzai
             if (channelId == Constant.GUOFENZAIXIAN_CHANNEL_ID) {
                 return guofenzaixianRechargeService.confirmRecharge(relation, gptCardKey, null);
+            }
+            //redeemcloud
+            if (Constant.REDEEM_CLOUD_CHANNEL_ID.equals(channelId)) {
+                return redeemCloudRechargeService.confirmRecharge(relation, gptCardKey, null);
             }
 			//校验卡密是否可用
 			CardKeyValidationResult cardKeyValidationResult = validateCardKey(gptCardKey);

netflix-service/src/main/java/com/cyksj/service/chatgpt/impl/ChatGptAccountServiceImpl.java

@@ -873,7 +873,7 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
             throw BusinessRuntimeException.getInstance("车票不存在");
         }
         try {
-            String res = HttpUtil.get(String.format("https://image.yhlxj.com/api/getCount?usertoken=%s&limit=%s&time=%s&isVip=%s", userToken, chatgptUser.getLimitNum(), chatgptUser.getLimitTime(), relation.getIsVip()), 5000);
+            String res = HttpUtil.get(String.format("https://image2.yhlxj.com/api/getCount?usertoken=%s&limit=%s&time=%s&isVip=%s", userToken, chatgptUser.getLimitNum(), chatgptUser.getLimitTime(), relation.getIsVip()), 5000);
             return new JSONObject(res);
         }catch (Exception e){
             return new JSONObject("{\"count\": 0,\"o1_mini\": 0,\"o1_p\": 0}");

netflix-service/src/main/java/com/cyksj/service/mail/impl/CommonMailServiceImpl.java

@@ -7,11 +7,14 @@ import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.common.constant.Constant;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.util.Jsons;
 import com.cyksj.common.util.StringUtil;
 import com.cyksj.common.util.TicketCodeCommonUtil;
+import com.cyksj.mapper.sys.SysEmailMapper;
+import com.cyksj.model.entity.SysEmail;
 import com.cyksj.model.response.AdobeEmailResp;
 import com.cyksj.model.response.DisneyCodeResp;
 import com.cyksj.service.mail.CommonMailService;
@@ -43,10 +46,18 @@ public class CommonMailServiceImpl implements CommonMailService {
 
 	private final YhMailService yhMailService;
 
+    private final SysEmailMapper sysEmailMapper;
+
 	//GPT修改密码匹配
 	private final static String GPT_RESET_PWD_LINK_REGEX = "https://auth0.openai.com/u/reset-verify";
 	@Override
 	public String getTicketMailCode(Long goodsId, String account, String relateEmail, String emailPwd, Date emailCreatedTime, Integer type, Integer linkType, Boolean isReturnDeviceUrl) throws Exception {
+        if (StrUtil.isEmpty(emailPwd)) {
+            SysEmail sysEmail = sysEmailMapper.selectOne(Wrappers.lambdaQuery(SysEmail.class).eq(SysEmail::getEmail, account).last("limit 1"));
+            if (sysEmail != null) {
+                emailPwd = sysEmail.getPassword();
+            }
+        }
 		if (StrUtil.isEmpty(relateEmail)) {
 			//25年的GPT账号获取验证码 特殊处理
 			//获取失败走下一步
@@ -107,14 +118,18 @@ public class CommonMailServiceImpl implements CommonMailService {
 			}
 		}
 
-		//Netflix get verify code
-		if (Constant.NETFLIX_GID.equals(goodsId) && linkType == null && (type == null || type == 1) && StrUtil.isNotBlank(emailPwd)) {
+		//Netflix get verify code or household device link
+		if (Constant.NETFLIX_GID.equals(goodsId) && StrUtil.isNotBlank(emailPwd)
+				&& ((linkType == null && (type == null || type == 1))
+				|| (linkType == 1 && Boolean.TRUE.equals(isReturnDeviceUrl)))) {
 			try {
 				String url = "https://ms.lqqq.cc/web/" + account + "----" + emailPwd;
 				HttpRequest post = HttpUtil.createGet(url).timeout(Constant.CONNECT_MILLISECONDS);
 				HttpResponse execute = post.execute();
 				String body = execute.body();
-				String code = getNetflixVerifyCodeByLqqqMail(account, emailPwd, body);
+				String code = linkType != null && linkType == 1
+						? getNetflixHouseholdDeviceUrlByLqqqMail(account, body)
+						: getNetflixVerifyCodeByLqqqMail(account, body);
 				if (StrUtil.isNotBlank(code)) {
 					return code;
 				}
@@ -126,37 +141,41 @@ public class CommonMailServiceImpl implements CommonMailService {
 		String checkEmail = StrUtil.isNotEmpty(relateEmail) ? relateEmail : account;
 		//关联邮箱
 		if (cuiQiuMailService.isCuiQiuEmail(checkEmail)) {
-			return cuiQiuMailService.getVerifyCode(account, relateEmail, goodsId, type, linkType, false);
+			return cuiQiuMailService.getVerifyCode(account, relateEmail, goodsId, type, linkType, Boolean.TRUE.equals(isReturnDeviceUrl));
 		}
 		//是否是 mail lu邮箱
 		if (mailLuService.isMailLuEmail(checkEmail)) {
-			return mailLuService.getVerifyCode(account, relateEmail, goodsId, type, linkType, false);
+			return mailLuService.getVerifyCode(account, relateEmail, goodsId, type, linkType, Boolean.TRUE.equals(isReturnDeviceUrl));
 		}
 		//银河域名邮件
-		return yhMailService.getVerifyCode(account, relateEmail, goodsId, type, linkType, false);
+		return yhMailService.getVerifyCode(account, relateEmail, goodsId, type, linkType, Boolean.TRUE.equals(isReturnDeviceUrl));
 	}
 
-	private String getNetflixVerifyCodeByLqqqMail(String account, String emailPwd, String body) {
+	private String getNetflixVerifyCodeByLqqqMail(String account, String body) {
 		if (StrUtil.isBlank(body)) {
 			return StrUtil.EMPTY;
 		}
 		if (!body.contains("/show_email/")) {
 			return getNetflixVerifyCode(body);
 		}
-		Matcher matcher = Pattern.compile("href=\"([^\"]*/show_email/[^\"]+)\"", Pattern.CASE_INSENSITIVE).matcher(body);
+		Matcher matcher = Pattern.compile("<a\\b[^>]*href=\"([^\"]*/show_email/[^\"]+)\"[^>]*>", Pattern.CASE_INSENSITIVE).matcher(body);
 		while (matcher.find()) {
 			String href = matcher.group(1);
-			int start = Math.max(0, matcher.start() - 800);
-			int end = Math.min(body.length(), matcher.end() + 200);
-			String emailItem = body.substring(start, end);
+			String emailItem = getMailListItemHtml(body, matcher.start());
 			if (!emailItem.contains(Constant.NETFLIX) || !isNetflixLoginCodeMail(emailItem)) {
 				continue;
 			}
+			String code = getNetflixVerifyCodeFromListItem(emailItem);
+			if (StrUtil.isNotBlank(code)) {
+				log.info("Netflix {} get verify code from lqqq mail list: {}", account, code);
+				return code;
+			}
 			try {
 				String detailUrl = href.startsWith("http") ? href : "https://ms.lqqq.cc" + href;
 				HttpResponse detailResp = HttpUtil.createGet(detailUrl).timeout(Constant.CONNECT_MILLISECONDS).execute();
-				String code = getNetflixVerifyCode(detailResp.body());
+				code = getNetflixVerifyCode(detailResp.body());
 				if (StrUtil.isNotBlank(code)) {
+					log.info("Netflix {} get verify code from lqqq mail detail: {}", account, code);
 					return code;
 				}
 			} catch (Exception e) {
@@ -166,6 +185,106 @@ public class CommonMailServiceImpl implements CommonMailService {
 		return StrUtil.EMPTY;
 	}
 
+	private String getNetflixHouseholdDeviceUrlByLqqqMail(String account, String body) {
+		if (StrUtil.isBlank(body)) {
+			return StrUtil.EMPTY;
+		}
+		String url = getNetflixHouseholdDeviceUrl(body);
+		if (StrUtil.isNotBlank(url)) {
+			return url;
+		}
+		Matcher matcher = Pattern.compile("<a\\b[^>]*href=\"([^\"]*/show_email/[^\"]+)\"[^>]*>", Pattern.CASE_INSENSITIVE).matcher(body);
+		while (matcher.find()) {
+			String emailItem = getMailListItemHtml(body, matcher.start());
+			if (!isNetflixHouseholdDeviceMail(emailItem)) {
+				continue;
+			}
+			try {
+				String href = decodeHtmlUrl(matcher.group(1));
+				String detailUrl = href.startsWith("http") ? href : "https://ms.lqqq.cc" + href;
+				HttpResponse detailResp = HttpUtil.createGet(detailUrl).timeout(Constant.CONNECT_MILLISECONDS).execute();
+				url = getNetflixHouseholdDeviceUrl(detailResp.body());
+				if (StrUtil.isNotBlank(url)) {
+					log.info("Netflix {} get household device url from lqqq mail detail", account);
+					return url;
+				}
+			} catch (Exception e) {
+				log.error("Netflix {} read household device mail failed: {}", account, StringUtil.getErrorMsg(e));
+			}
+		}
+		return StrUtil.EMPTY;
+	}
+
+	private boolean isNetflixHouseholdDeviceMail(String body) {
+		if (StrUtil.isBlank(body) || !body.toLowerCase().contains("netflix")) {
+			return false;
+		}
+		String text = cleanMailHtml(body).toLowerCase();
+		return text.contains("update netflix household")
+				|| text.contains("netflix household device")
+				|| text.contains("update-primary-location")
+				|| text.contains("\u66f4\u65b0 netflix \u540c\u6237\u8bbe\u5907")
+				|| text.contains("\u66f4\u65b0 netflix \u540c\u6236\u88dd\u7f6e");
+	}
+
+	private String getNetflixHouseholdDeviceUrl(String body) {
+		if (StrUtil.isBlank(body)) {
+			return StrUtil.EMPTY;
+		}
+		Matcher matcher = Pattern.compile("https://www\\.netflix\\.com/account/update-primary-location[^\\s\\\"'<>]*", Pattern.CASE_INSENSITIVE).matcher(body);
+		if (matcher.find()) {
+			return decodeHtmlUrl(matcher.group());
+		}
+		return StrUtil.EMPTY;
+	}
+
+	private String decodeHtmlUrl(String url) {
+		return StrUtil.blankToDefault(url, StrUtil.EMPTY)
+				.replace("&amp;", "&")
+				.replace("&#38;", "&")
+				.replace("&#x26;", "&");
+	}
+
+	private String getMailListItemHtml(String body, int hrefStart) {
+		int cardStart = body.lastIndexOf("<article", hrefStart);
+		if (cardStart < 0) {
+			cardStart = body.lastIndexOf("<div class=\"email-card", hrefStart);
+		}
+		if (cardStart < 0) {
+			cardStart = Math.max(0, hrefStart - 1200);
+		}
+		int nextCardStart = body.indexOf("<article", hrefStart + 1);
+		int legacyNextCardStart = body.indexOf("<div class=\"email-card", hrefStart + 1);
+		int cardEnd = body.length();
+		if (nextCardStart > 0) {
+			cardEnd = Math.min(cardEnd, nextCardStart);
+		}
+		if (legacyNextCardStart > 0) {
+			cardEnd = Math.min(cardEnd, legacyNextCardStart);
+		}
+		cardEnd = Math.min(cardEnd, hrefStart + 1200);
+		return body.substring(cardStart, cardEnd);
+	}
+
+	private String getNetflixVerifyCodeFromListItem(String emailItem) {
+		String text = cleanMailHtml(emailItem);
+		String[] startStrs = new String[]{
+				"Enter this code to sign in",
+				"Informe este c\u00f3digo para entrar",
+				"\u8f38\u5165\u6b64\u4ee3\u78bc\u767b\u5165",
+				"\u8f93\u5165\u6b64\u4ee3\u7801\u767b\u5f55"
+		};
+		for (String startStr : startStrs) {
+			if (text.contains(startStr)) {
+				String verifyCode = getNetflixCodePattern(StrUtil.subAfter(text, startStr, false));
+				if (StrUtil.isNotBlank(verifyCode)) {
+					return verifyCode;
+				}
+			}
+		}
+		return StrUtil.EMPTY;
+	}
+
 	private boolean isNetflixLoginCodeMail(String body) {
 		return body.contains("\u767b\u5f55\u4ee3\u7801")
 				|| body.contains("\u767b\u9304\u4ee3\u78bc")

netflix-service/src/main/java/com/cyksj/service/mange/gpt/impl/GptRechargeServiceImpl.java

@@ -96,6 +96,8 @@ public class GptRechargeServiceImpl implements GptRechargeService {
 
     private final GuofenzaixianRechargeService guofenzaixianRechargeService;
 
+    private final RedeemCloudRechargeService redeemCloudRechargeService;
+
 	private HttpRequest createBaseRequest(String url) {
 		return HttpRequest.get(url)
 				.header("accept", "application/json, text/plain, */*")
@@ -199,13 +201,7 @@ public class GptRechargeServiceImpl implements GptRechargeService {
 			}
 			//入库token json
 			String saveTokenJson = req.getAccessToken();
-			String accessToken;
-			try {
-				GptCardTokenDto gptCardTokenDto = Jsons.parseObject(saveTokenJson, GptCardTokenDto.class);
-				accessToken = gptCardTokenDto.getAccessToken();
-			} catch (Exception e) {
-				accessToken = saveTokenJson;
-			}
+			String accessToken = getAccessTokenFromRechargePayload(saveTokenJson);
 			//验证用户token是否正确
 			TokenParseResult tokenParseResult = parseToken(accessToken);
 			if (!tokenParseResult.getSuccess()) {
@@ -301,6 +297,12 @@ public class GptRechargeServiceImpl implements GptRechargeService {
                 req.setCmsUser(cmsUser);
                 relation.setCardKey(gptCardKey);
                 return guofenzaixianRechargeService.confirmRecharge(relation, gptCardKey, cmsUser);
+            }
+            //redeemcloud
+            if (Constant.REDEEM_CLOUD_CHANNEL_ID.equals(gptRechargeCardKey.getChannelId())) {
+                req.setCmsUser(cmsUser);
+                relation.setCardKey(gptCardKey);
+                return redeemCloudRechargeService.confirmRecharge(relation, gptCardKey, cmsUser);
             }
 			//校验卡密是否可用
 			CardKeyValidationResult cardKeyValidationResult = validateCardKey(gptCardKey);
@@ -372,6 +374,9 @@ public class GptRechargeServiceImpl implements GptRechargeService {
 			}
             if (gptRechargeCardKey.getChannelId() == Constant.SC_CHANNEL_ID) {
                 return sancRechargeService.getTaskResult(relation);
+            }
+            if (Constant.REDEEM_CLOUD_CHANNEL_ID.equals(gptRechargeCardKey.getChannelId())) {
+                return redeemCloudRechargeService.getTaskResult(relation);
             }
 			String BASE_URL = gptRechargeCardKeyChannelService.getCardKeyDomain(cardKey);
 			String url = BASE_URL + "/tasks/" + taskId;
@@ -398,6 +403,34 @@ public class GptRechargeServiceImpl implements GptRechargeService {
 		}
 	}
 
+    private String getAccessTokenFromRechargePayload(String saveTokenJson) {
+        try {
+            JSONObject jsonObject = JSONUtil.parseObj(saveTokenJson);
+            String accessToken = jsonObject.getStr("accessToken");
+            if (StrUtil.isNotBlank(accessToken)) {
+                try {
+                    JSONObject sessionObject = JSONUtil.parseObj(accessToken);
+                    String sessionAccessToken = sessionObject.getStr("accessToken");
+                    if (StrUtil.isNotBlank(sessionAccessToken)) {
+                        return sessionAccessToken;
+                    }
+                } catch (Exception ignored) {
+                }
+                return accessToken;
+            }
+            String payload = jsonObject.getStr("payload");
+            if (StrUtil.isNotBlank(payload)) {
+                GptCardTokenDto gptCardTokenDto = Jsons.parseObject(payload, GptCardTokenDto.class);
+                if (gptCardTokenDto != null && StrUtil.isNotBlank(gptCardTokenDto.getAccessToken())) {
+                    return gptCardTokenDto.getAccessToken();
+                }
+            }
+        } catch (Exception e) {
+            return saveTokenJson;
+        }
+        return saveTokenJson;
+    }
+
 	@Override
 	public void gptIndependentExportRecharge(GptIndependentExportRechargeReq rechargeReq) {
 		String orderNo = rechargeReq.getOrderNo();

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -3775,8 +3775,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			returnGalaxyCoin(orderDon);
 		}
 
-		//GPT独立会员续费 若为代充类型 同步代充次数
-		if (orderDon.getGoodsId() == Constant.GPT_PLUS_GID && sku.getNum() == 1) {
+        //GPT独立会员续费，名称包含pro的规格不进入代充
+        if (orderDon.getGoodsId() == Constant.GPT_PLUS_GID && sku.getNum() == 1
+                && !StrUtil.containsIgnoreCase(sku.getSpecVal(), "pro")) {
 			incrGroupsRelationRechargeRemainIfRecharge(orderDon.getRelationId(), sku.getMonths(), orderDon.getOrderType());
 			
 			// GPT独立会员购买，赠送sora邀请码

netflix-service/src/main/java/com/cyksj/service/recharge/RedeemCloudRechargeService.java

@@ -0,0 +1,15 @@
+package com.cyksj.service.recharge;
+
+import com.cyksj.model.entity.CmsUser;
+import com.cyksj.model.entity.GroupsRelation;
+import com.cyksj.model.response.recharge.RedeemCloudCdkQueryResponse;
+import com.cyksj.server.recharge.dto.TaskResult;
+
+public interface RedeemCloudRechargeService {
+
+    RedeemCloudCdkQueryResponse validateCardKey(String cardKey) throws Exception;
+
+    String confirmRecharge(GroupsRelation relation, String cardKey, CmsUser user);
+
+    TaskResult getTaskResult(GroupsRelation relation);
+}

netflix-service/src/main/java/com/cyksj/service/recharge/impl/RedeemCloudRechargeServiceImpl.java

@@ -0,0 +1,487 @@
+package com.cyksj.service.recharge.impl;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cyksj.common.exception.BusinessRuntimeException;
+import com.cyksj.common.task.GlobalThreadPoolTaskExecutor;
+import com.cyksj.common.util.Jsons;
+import com.cyksj.mapper.*;
+import com.cyksj.model.entity.*;
+import com.cyksj.model.response.recharge.RedeemCloudCdkQueryResponse;
+import com.cyksj.model.response.recharge.RedeemCloudTaskResultResponse;
+import com.cyksj.redis.RedisService;
+import com.cyksj.server.recharge.dto.TaskResult;
+import com.cyksj.service.chatgpt.GptUserRechargeRecordService;
+import com.cyksj.service.recharge.GptRechargeCardKeyChannelService;
+import com.cyksj.service.recharge.RedeemCloudRechargeService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Date;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class RedeemCloudRechargeServiceImpl implements RedeemCloudRechargeService {
+
+    private final GptRechargeCardKeyChannelService gptRechargeCardKeyChannelService;
+
+    private final GroupsRelationMapper relationMapper;
+
+    private final GroupsMapper groupsMapper;
+
+    private final GoodsDonSkuMapper skuMapper;
+
+    private final RedisService redisService;
+
+    private final OrderDonMapper orderDonMapper;
+
+    private final GptRechargeCardKeyMapper gptRechargeCardKeyMapper;
+
+    private final GptUserRechargeRecordService gptUserRechargeRecordService;
+
+    private static final GlobalThreadPoolTaskExecutor TASK_EXECUTOR = GlobalThreadPoolTaskExecutor.getInstance();
+
+    private static final int SUCCESS_CODE = 200;
+
+    private static final int LEGACY_SUCCESS_CODE = 10000;
+
+    @Override
+    public RedeemCloudCdkQueryResponse validateCardKey(String cardKey) throws Exception {
+        String baseUrl = gptRechargeCardKeyChannelService.getCardKeyDomain(cardKey);
+        String url = baseUrl + "/sys-cdk/query?cdkCode=" + encode(cardKey);
+
+        HttpResponse response = HttpRequest.get(url)
+                .setConnectionTimeout(10000)
+                .execute();
+        String body = response.body();
+        RedeemCloudCdkQueryResponse result = Jsons.parseObject(body, RedeemCloudCdkQueryResponse.class);
+        log.info("redeemcloud validate card key response - code: {}, useStatus: {}, channelEnabled: {}",
+                result != null ? result.getCode() : null,
+                result != null && result.getData() != null ? result.getData().getUseStatus() : null,
+                result != null && result.getData() != null ? result.getData().getChannelEnabled() : null);
+        return result;
+    }
+
+    @Override
+    public String confirmRecharge(GroupsRelation relation, String gptCardKey, CmsUser cmsUser) {
+        Long relationId = relation.getId();
+        String rechargePayload = relation.getGptToken();
+        String rechargeAccount = relation.getAccount();
+        String taskId;
+        try {
+            taskId = submitTask(gptCardKey, rechargePayload);
+        } catch (Exception e) {
+            setRechargeRelationStatusAutoError(relation);
+            if (cmsUser == null) {
+                throw BusinessRuntimeException.getInstance("充值失败，请联系客服开通");
+            }
+            throw BusinessRuntimeException.getInstance("充值失败，{0}", e.getMessage());
+        }
+
+        String operator = cmsUser != null ? cmsUser.getNickname() : null;
+        String password = relation.getPassword();
+        relationMapper.update(null, Wrappers.lambdaUpdate(GroupsRelation.class)
+                .set(GroupsRelation::getAccount, rechargeAccount)
+                .set(GroupsRelation::getOperator, operator)
+                .set(StrUtil.isNotBlank(password), GroupsRelation::getPassword, password)
+                .set(GroupsRelation::getRechargeStatus, GroupsRelation.RechargeStatus.recharging)
+                .set(GroupsRelation::getCardKey, gptCardKey)
+                .set(GroupsRelation::getGptToken, rechargePayload)
+                .set(GroupsRelation::getGptTaskId, taskId)
+                .eq(GroupsRelation::getId, relationId));
+        relation.setRechargeStatus(GroupsRelation.RechargeStatus.recharging);
+        relation.setCardKey(gptCardKey);
+        relation.setOperator(operator);
+        return taskId;
+    }
+
+    private String submitTask(String cardKey, String rechargePayload) {
+        log.info("start submit redeemcloud task - cardKey: {}", cardKey);
+        try {
+            String baseUrl = gptRechargeCardKeyChannelService.getCardKeyDomain(cardKey);
+            String requestBody = buildExchangeBody(baseUrl, cardKey, rechargePayload);
+            String url = baseUrl + "/sys-cdk/exchange?cdkCode=" + encode(cardKey);
+
+            HttpResponse response = addBrowserHeaders(HttpRequest.post(url)
+                    .setConnectionTimeout(60000)
+                    .header("content-type", "application/json"))
+                    .body(requestBody)
+                    .execute();
+            String body = response.body();
+            log.info("redeemcloud submit response: {}", body);
+
+            String directTaskId = parseDirectTaskId(body);
+            if (StrUtil.isNotBlank(directTaskId)) {
+                return directTaskId;
+            }
+            JSONObject jsonResponse = parseResponseObject(body, "exchange");
+            Object data = jsonResponse.get("data");
+            if (isSuccessResponse(jsonResponse) && data instanceof CharSequence && StrUtil.isNotBlank(data.toString())) {
+                return data.toString();
+            }
+            if (data instanceof JSONObject) {
+                JSONObject dataObj = (JSONObject) data;
+                String status = dataObj.getStr("status");
+                if ("FAILED".equalsIgnoreCase(status)) {
+                    throw BusinessRuntimeException.getInstance(getErrorMessage(dataObj, jsonResponse));
+                }
+            }
+            throw BusinessRuntimeException.getInstance(getErrorMessage(null, jsonResponse));
+        } catch (Exception e) {
+            log.error("submit redeemcloud task failed: {}", e.getMessage(), e);
+            throw new RuntimeException("提交任务失败: " + e.getMessage(), e);
+        }
+    }
+
+    private String buildExchangeBody(String baseUrl, String cardKey, String rechargePayload) throws Exception {
+        rechargePayload = unwrapJsonString(rechargePayload);
+        if (StrUtil.isBlank(rechargePayload)) {
+            throw BusinessRuntimeException.getInstance("redeemcloud提交任务需要session");
+        }
+        if (StrUtil.startWith(rechargePayload.trim(), "[")) {
+            JSONArray array = JSONUtil.parseArray(rechargePayload);
+            if (array.isEmpty()) {
+                throw BusinessRuntimeException.getInstance("redeemcloud session is empty");
+            }
+            Object first = array.get(0);
+            rechargePayload = unwrapJsonString(first instanceof JSONObject ? first.toString() : String.valueOf(first));
+        }
+        if (!StrUtil.startWith(rechargePayload.trim(), "{")) {
+            JSONObject session = new JSONObject();
+            session.putOpt("accessToken", rechargePayload);
+            return verifyAccount(baseUrl, cardKey, session.toString()).toString();
+        }
+        JSONObject payload = JSONUtil.parseObj(rechargePayload);
+        if (isExchangeBody(payload)) {
+            return payload.toString();
+        }
+        if (isSessionPayload(payload)) {
+            return verifyAccount(baseUrl, cardKey, payload.toString()).toString();
+        }
+        String sessionContent = getSessionContent(payload);
+        return verifyAccount(baseUrl, cardKey, StrUtil.isNotBlank(sessionContent) ? sessionContent : rechargePayload).toString();
+    }
+
+    private boolean isExchangeBody(JSONObject payload) {
+        return payload.containsKey("cdkPackageName") && payload.containsKey("payload") && payload.containsKey("idp");
+    }
+
+    private boolean isSessionPayload(JSONObject payload) {
+        return payload.containsKey("accessToken") && (payload.containsKey("user") || payload.containsKey("account") || payload.containsKey("expires"));
+    }
+
+    private String getSessionContent(JSONObject payload) {
+        String accessToken = payload.getStr("accessToken");
+        if (StrUtil.isBlank(accessToken)) {
+            return null;
+        }
+        accessToken = unwrapJsonString(accessToken);
+        if (StrUtil.startWith(accessToken.trim(), "{")) {
+            return accessToken;
+        }
+        JSONObject session = new JSONObject();
+        session.putOpt("accessToken", accessToken);
+        return session.toString();
+    }
+
+    private JSONObject verifyAccount(String baseUrl, String cardKey, String content) {
+        String verifyContent = buildChatGptVerifyContent(content);
+        String url = baseUrl + "/account/verify";
+        JSONObject requestBody = new JSONObject();
+        requestBody.putOpt("cdkCode", cardKey);
+        requestBody.putOpt("content", verifyContent);
+        log.info("redeemcloud account verify request - contentLength: {}", verifyContent.length());
+        HttpResponse response = HttpRequest.post(url)
+                .header("Accept-Language", "zh-CN")
+                .header("Content-Type", "application/json")
+                .header("X-Product-Code", "GPT")
+                .setConnectionTimeout(60000)
+                .body(requestBody.toString())
+                .execute();
+        String body = response.body();
+
+        JSONObject jsonResponse = parseResponseObject(body, "account verify");
+        Object data = jsonResponse.get("data");
+        log.info("redeemcloud account verify response - code: {}, message: {}, hasData: {}",
+                jsonResponse.getInt("code"), jsonResponse.getStr("message"), data instanceof JSONObject);
+        if (isSuccessResponse(jsonResponse) && data instanceof JSONObject) {
+            return (JSONObject) data;
+        }
+        throw BusinessRuntimeException.getInstance(getErrorMessage(data instanceof JSONObject ? (JSONObject) data : null, jsonResponse));
+    }
+
+    private String buildChatGptVerifyContent(String content) {
+        String verifyContent = unwrapJsonString(content);
+        if (StrUtil.isBlank(verifyContent)) {
+            return verifyContent;
+        }
+        if (!StrUtil.startWith(verifyContent.trim(), "{")) {
+            JSONObject session = new JSONObject();
+            session.putOpt("accessToken", verifyContent);
+            return session.toString();
+        }
+        try {
+            JSONObject source = JSONUtil.parseObj(verifyContent);
+            String accessToken = source.getStr("accessToken");
+            if (StrUtil.isBlank(accessToken)) {
+                return verifyContent;
+            }
+            accessToken = unwrapJsonString(accessToken);
+            if (StrUtil.startWith(accessToken.trim(), "{")) {
+                return buildChatGptVerifyContent(accessToken);
+            }
+            if (isCompleteChatGptSession(source)) {
+                return verifyContent;
+            }
+            JSONObject session = new JSONObject();
+            session.putOpt("accessToken", accessToken);
+            return session.toString();
+        } catch (Exception e) {
+            return verifyContent;
+        }
+    }
+
+    private boolean isCompleteChatGptSession(JSONObject source) {
+        return source.get("user") instanceof JSONObject
+                || source.get("account") instanceof JSONObject
+                || source.containsKey("expires")
+                || source.containsKey("authProvider")
+                || source.containsKey("sessionToken");
+    }
+
+    private HttpRequest addBrowserHeaders(HttpRequest request) {
+        return request
+                .header("accept", "*/*")
+                .header("accept-language", "zh-CN")
+                .header("origin", "https://redeemcloud.com")
+                .header("referer", "https://redeemcloud.com/zh")
+                .header("sec-ch-ua", "\"Not;A=Brand\";v=\"8\", \"Chromium\";v=\"150\", \"Microsoft Edge\";v=\"150\"")
+                .header("sec-ch-ua-mobile", "?0")
+                .header("sec-ch-ua-platform", "\"Windows\"")
+                .header("sec-fetch-dest", "empty")
+                .header("sec-fetch-mode", "cors")
+                .header("sec-fetch-site", "same-origin")
+                .header("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/150.0.0.0 Safari/537.36 Edg/150.0.0.0")
+                .header("x-product-code", "GPT");
+    }
+
+    private boolean isSuccessResponse(JSONObject jsonResponse) {
+        Integer code = jsonResponse.getInt("code");
+        return code != null && (code == SUCCESS_CODE || code == LEGACY_SUCCESS_CODE) && !Boolean.FALSE.equals(jsonResponse.getBool("flag"));
+    }
+
+    private String parseDirectTaskId(String body) {
+        String responseBody = unwrapJsonString(body);
+        if (StrUtil.isBlank(responseBody) || StrUtil.startWith(responseBody.trim(), "{") || StrUtil.startWith(responseBody.trim(), "[")) {
+            return null;
+        }
+        return responseBody;
+    }
+
+    private JSONObject parseResponseObject(String body, String apiName) {
+        String responseBody = unwrapJsonString(body);
+        try {
+            if (StrUtil.startWith(responseBody.trim(), "[")) {
+                JSONArray array = JSONUtil.parseArray(responseBody);
+                if (!array.isEmpty() && array.get(0) instanceof JSONObject) {
+                    return (JSONObject) array.get(0);
+                }
+            }
+            return JSONUtil.parseObj(responseBody);
+        } catch (Exception e) {
+            throw BusinessRuntimeException.getInstance("redeemcloud {0} response is not json object: {1}", apiName, shortBody(responseBody));
+        }
+    }
+
+    private String unwrapJsonString(String value) {
+        String result = StrUtil.trim(value);
+        for (int i = 0; i < 3 && StrUtil.startWith(result, "\""); i++) {
+            try {
+                result = StrUtil.trim(Jsons.parseObject(result, String.class));
+            } catch (Exception e) {
+                return result;
+            }
+        }
+        return result;
+    }
+
+    private String shortBody(String body) {
+        if (StrUtil.isBlank(body)) {
+            return "";
+        }
+        String cleanBody = body.replaceAll("\\s+", " ");
+        return StrUtil.sub(cleanBody, 0, Math.min(cleanBody.length(), 200));
+    }
+
+    private String encode(String value) {
+        try {
+            return URLEncoder.encode(value, StandardCharsets.UTF_8.name());
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public TaskResult getTaskResult(GroupsRelation relation) {
+        String cardKey = relation.getCardKey();
+        String taskId = relation.getGptTaskId();
+        try {
+            RedeemCloudTaskResultResponse taskResultResponse = queryTaskResult(cardKey, taskId);
+            TaskResult taskResult = convertTaskResult(taskResultResponse);
+            resetGroupsRelationRechargeStatus(relation, taskResult.getStatus(), taskResult.getError());
+            return taskResult;
+        } catch (Exception e) {
+            log.error("query redeemcloud task result failed: {}", e.getMessage(), e);
+            throw new RuntimeException("获取任务结果失败: " + e.getMessage(), e);
+        }
+    }
+
+    private RedeemCloudTaskResultResponse queryTaskResult(String cardKey, String taskId) throws Exception {
+        String baseUrl = gptRechargeCardKeyChannelService.getCardKeyDomain(cardKey);
+        String url = baseUrl + "/sys-cdk/exchange/result?taskId=" + encode(taskId);
+
+        HttpResponse response = HttpRequest.get(url)
+                .setConnectionTimeout(10000)
+                .execute();
+        String body = response.body();
+        log.info("redeemcloud task result response: {}", body);
+        return Jsons.parseObject(body, RedeemCloudTaskResultResponse.class);
+    }
+
+    private TaskResult convertTaskResult(RedeemCloudTaskResultResponse taskResultResponse) {
+        TaskResult result = new TaskResult();
+        if (taskResultResponse == null || taskResultResponse.getCode() == null || taskResultResponse.getCode() != SUCCESS_CODE) {
+            result.setStatus("failed");
+            result.setError(taskResultResponse != null ? taskResultResponse.getMessage() : "任务查询失败");
+            return result;
+        }
+        if (taskResultResponse.getData() == null) {
+            result.setStatus("recharging");
+            result.setResult(taskResultResponse.getMessage());
+            return result;
+        }
+        String status = taskResultResponse.getData().getStatus();
+        if ("COMPLETED".equalsIgnoreCase(status)) {
+            result.setStatus("completed");
+        } else if ("FAILED".equalsIgnoreCase(status) || "ERROR".equalsIgnoreCase(status)) {
+            result.setStatus("failed");
+        } else {
+            result.setStatus("recharging");
+        }
+        result.setResult(status);
+        result.setError(taskResultResponse.getData().getErrorMessage());
+        return result;
+    }
+
+    private String getErrorMessage(JSONObject data, JSONObject response) {
+        if (data != null) {
+            String error = data.getStr("error");
+            if (StrUtil.isNotBlank(error)) {
+                return error;
+            }
+            String errorMessage = data.getStr("errorMessage");
+            if (StrUtil.isNotBlank(errorMessage)) {
+                return errorMessage;
+            }
+            String result = data.getStr("result");
+            if (StrUtil.isNotBlank(result)) {
+                return result;
+            }
+        }
+        String message = response.getStr("message");
+        if (StrUtil.isBlank(message)) {
+            message = response.getStr("msg");
+        }
+        return StrUtil.isNotBlank(message) ? message : "提交任务失败";
+    }
+
+    public void setRechargeRelationStatusAutoError(GroupsRelation relation) {
+        TASK_EXECUTOR.execute(() -> relationMapper.update(null, Wrappers.lambdaUpdate(GroupsRelation.class)
+                .set(GroupsRelation::getAccount, relation.getAccount())
+                .set(GroupsRelation::getGptToken, relation.getGptToken())
+                .set(GroupsRelation::getRechargeStatus, GroupsRelation.RechargeStatus.recharge_error)
+                .eq(GroupsRelation::getId, relation.getId())));
+    }
+
+    private void resetGroupsRelationRechargeStatus(GroupsRelation relation, String status, String result) {
+        if (!"completed".equals(status) && !"failed".equals(status) && !"unknown".equals(status)) {
+            return;
+        }
+        relation = relationMapper.selectById(relation.getId());
+        if (relation == null || relation.getRechargeStatus() != GroupsRelation.RechargeStatus.recharging) {
+            return;
+        }
+
+        String taskId = relation.getGptTaskId();
+        Integer rechargeRemainNum = relation.getRechargeRemainNum();
+        GroupsRelation.RechargeStatus rechargeStatus = "completed".equals(status) ? GroupsRelation.RechargeStatus.complete : GroupsRelation.RechargeStatus.recharge_error;
+        String cardKey = relation.getCardKey();
+        GptRechargeCardKey gptRechargeCardKey = gptRechargeCardKeyMapper.selectOne(Wrappers.lambdaQuery(GptRechargeCardKey.class)
+                .eq(GptRechargeCardKey::getCardKey, cardKey)
+                .last("limit 1"));
+        if (rechargeStatus == GroupsRelation.RechargeStatus.recharge_error && gptRechargeCardKey != null) {
+            gptRechargeCardKeyMapper.update(null, Wrappers.lambdaUpdate(GptRechargeCardKey.class)
+                    .set(GptRechargeCardKey::getStatus, Boolean.FALSE)
+                    .set(GptRechargeCardKey::getOrderId, null)
+                    .set(GptRechargeCardKey::getOrderNo, null)
+                    .eq(GptRechargeCardKey::getId, gptRechargeCardKey.getId())
+                    .eq(GptRechargeCardKey::getStatus, Boolean.TRUE));
+        }
+        if (rechargeStatus == GroupsRelation.RechargeStatus.recharge_error
+                && !redisService.setNx(RedisService.key.GPT_RECHARGE_RECOVER_KEY.getName() + taskId, taskId, RedisService.key.GPT_RECHARGE_RECOVER_KEY.getTimeout())) {
+            return;
+        }
+
+        Date startTime = relation.getStartTime();
+        DateTime expiryTime = null;
+        if (rechargeStatus == GroupsRelation.RechargeStatus.complete && startTime == null) {
+            GroupsTrips groupsTrips = groupsMapper.selectById(relation.getGroupsId());
+            if (groupsTrips != null) {
+                startTime = DateTime.now();
+                GoodsDonSku sku = skuMapper.selectById(groupsTrips.getSkuId());
+                if (sku.getDays() != null && sku.getDays() > 0) {
+                    expiryTime = DateUtil.offsetDay(startTime, sku.getDays());
+                } else {
+                    expiryTime = DateUtil.offsetMonth(startTime, sku.getMonths());
+                }
+            }
+        }
+        String rechargeErrorInfo = rechargeStatus == GroupsRelation.RechargeStatus.recharge_error ? result : null;
+        int update = relationMapper.update(null, Wrappers.lambdaUpdate(GroupsRelation.class)
+                .set(rechargeStatus == GroupsRelation.RechargeStatus.recharge_error, GroupsRelation::getRechargeRemainNum, rechargeRemainNum + 1)
+                .set(GroupsRelation::getRechargeStatus, rechargeStatus)
+                .set(expiryTime != null, GroupsRelation::getStartTime, startTime)
+                .set(expiryTime != null, GroupsRelation::getExpiryTime, expiryTime)
+                .set(StrUtil.isNotEmpty(rechargeErrorInfo), GroupsRelation::getRechargeErrorInfo, rechargeErrorInfo)
+                .eq(GroupsRelation::getId, relation.getId())
+                .le(GroupsRelation::getRechargeRemainNum, relation.getRechargeNum())
+                .eq(GroupsRelation::getRechargeStatus, GroupsRelation.RechargeStatus.recharging));
+        if (update == 0) {
+            return;
+        }
+        if (rechargeStatus == GroupsRelation.RechargeStatus.complete) {
+            String remark = StrUtil.isNotBlank(relation.getOperator()) ? "后台自动代充" : "自动代充";
+            gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getCardKey(), relation.getUserId(), relation.getId(), relation.getAccount(), -1, relation.getOperator(), remark);
+            if (gptRechargeCardKey != null) {
+                Long orderId = gptRechargeCardKey.getOrderId();
+                OrderDon orderDon = orderDonMapper.selectById(orderId);
+                if (orderDon != null && orderDon.getStatus() == OrderDon.Status.hasPayment) {
+                    orderDon.setStatus(OrderDon.Status.complete);
+                    orderDonMapper.updateById(orderDon);
+                }
+            }
+        }
+    }
+}