Merge branch 'master' into pre

netflix-dao/src/main/java/com/cyksj/model/dto/AtDto.java

@@ -0,0 +1,12 @@
+package com.cyksj.model.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class AtDto {
+    String accessToken;
+
+    private String email;
+}

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

@@ -13,6 +13,7 @@ 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.dto.AtDto;
 import com.cyksj.model.dto.GptCardTokenDto;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.request.GroupsRelationRechargeReq;
@@ -254,7 +255,8 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
         }
     }
 
-    private String getAccessTokenFromRechargePayload(String saveTokenJson) {
+    private AtDto getAccessTokenFromRechargePayload(String saveTokenJson) {
+        AtDto atDto = new AtDto();
         try {
             JSONObject jsonObject = JSONUtil.parseObj(saveTokenJson);
             String accessToken = jsonObject.getStr("accessToken");
@@ -263,23 +265,33 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
                     JSONObject sessionObject = JSONUtil.parseObj(accessToken);
                     String sessionAccessToken = sessionObject.getStr("accessToken");
                     if (StrUtil.isNotBlank(sessionAccessToken)) {
-                        return sessionAccessToken;
+                        atDto.setAccessToken(sessionAccessToken);
+                        return atDto;
                     }
                 } catch (Exception ignored) {
                 }
-                return accessToken;
+                atDto.setAccessToken(accessToken);
+                return atDto;
             }
             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();
+                    try {
+                        String email = gptCardTokenDto.getUser().getEmail();
+                        atDto.setAccessToken(email);
+                    } catch (Exception e) {
+
+                    }
+                    atDto.setAccessToken(gptCardTokenDto.getAccessToken());
+                    return atDto;
                 }
             }
         } catch (Exception e) {
-            return saveTokenJson;
+            atDto.setAccessToken(saveTokenJson);
         }
-        return saveTokenJson;
+        atDto.setAccessToken(saveTokenJson);
+        return atDto;
     }
 
 	@Override
@@ -367,13 +379,14 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
 			}
 			//入库token json
 			String saveTokenJson = req.getAccessToken();
-			String accessToken = getAccessTokenFromRechargePayload(saveTokenJson);
-			//验证用户token是否正确
-			TokenParseResult tokenParseResult = parseToken(accessToken);
-			if (!tokenParseResult.getSuccess()) {
-				throw BusinessRuntimeException.getInstance("您输入的凭证有误，请重新输入");
-			}
-			String rechargeAccount = tokenParseResult.getMessage();
+            AtDto atDto = getAccessTokenFromRechargePayload(saveTokenJson);
+//			//验证用户token是否正确
+//			TokenParseResult tokenParseResult = parseToken(accessToken);
+//			if (!tokenParseResult.getSuccess()) {
+//				throw BusinessRuntimeException.getInstance("您输入的凭证有误，请重新输入");
+//			}
+            String accessToken = atDto.getAccessToken();
+            String rechargeAccount = atDto.getEmail();
 			//月付校验前后账号是否一致
 			if (sku.getMonths() == 1 && !StrUtil.equals(rechargeAccount, userAccount)) {
 				throw BusinessRuntimeException.getInstance("请填入绑定账号的token");

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

@@ -16,6 +16,7 @@ import com.cyksj.common.task.GlobalThreadPoolTaskExecutor;
 import com.cyksj.common.util.Jsons;
 import com.cyksj.mapper.*;
 import com.cyksj.mapper.manage.cms.CmsUserMapper;
+import com.cyksj.model.dto.AtDto;
 import com.cyksj.model.dto.GptCardTokenDto;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.request.BatchRechargeRemainNumReq;
@@ -143,7 +144,7 @@ public class GptRechargeServiceImpl implements GptRechargeService {
 		}
 	}
 
-	@Override
+    @Override
 	@Transactional(rollbackFor = Throwable.class)
 	public String confirmRecharge(long adminId, GroupsRelationRechargeReq req) {
 		CmsUser cmsUser = cmsUserMapper.selectById(adminId);
@@ -210,13 +211,15 @@ public class GptRechargeServiceImpl implements GptRechargeService {
 			}
 			//入库token json
 			String saveTokenJson = req.getAccessToken();
-			String accessToken = getAccessTokenFromRechargePayload(saveTokenJson);
-			//验证用户token是否正确
-			TokenParseResult tokenParseResult = parseToken(accessToken);
-			if (!tokenParseResult.getSuccess()) {
-				throw BusinessRuntimeException.getInstance("您输入的凭证有误，请重新输入");
-			}
-			String rechargeAccount = tokenParseResult.getMessage();
+            AtDto atDto = getAccessTokenFromRechargePayload(saveTokenJson);
+            String email = atDto.getEmail();
+//            //验证用户token是否正确
+//			TokenParseResult tokenParseResult = parseToken(accessToken);
+//			if (!tokenParseResult.getSuccess()) {
+//				throw BusinessRuntimeException.getInstance("您输入的凭证有误，请重新输入");
+//			}
+            String accessToken = atDto.getAccessToken();
+            String rechargeAccount = email;
 			//记录代充账号 token
 			relation.setGptToken(saveTokenJson);
 			relation.setAccount(rechargeAccount);
@@ -412,7 +415,8 @@ public class GptRechargeServiceImpl implements GptRechargeService {
 		}
 	}
 
-    private String getAccessTokenFromRechargePayload(String saveTokenJson) {
+    private AtDto getAccessTokenFromRechargePayload(String saveTokenJson) {
+        AtDto atDto = new AtDto();
         try {
             JSONObject jsonObject = JSONUtil.parseObj(saveTokenJson);
             String accessToken = jsonObject.getStr("accessToken");
@@ -421,23 +425,33 @@ public class GptRechargeServiceImpl implements GptRechargeService {
                     JSONObject sessionObject = JSONUtil.parseObj(accessToken);
                     String sessionAccessToken = sessionObject.getStr("accessToken");
                     if (StrUtil.isNotBlank(sessionAccessToken)) {
-                        return sessionAccessToken;
+                        atDto.setAccessToken(sessionAccessToken);
+                        return atDto;
                     }
                 } catch (Exception ignored) {
                 }
-                return accessToken;
+                atDto.setAccessToken(accessToken);
+                return atDto;
             }
             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();
+                    try {
+                        String email = gptCardTokenDto.getUser().getEmail();
+                        atDto.setAccessToken(email);
+                    } catch (Exception e) {
+
+                    }
+                    atDto.setAccessToken(gptCardTokenDto.getAccessToken());
+                    return atDto;
                 }
             }
         } catch (Exception e) {
-            return saveTokenJson;
+            atDto.setAccessToken(saveTokenJson);
         }
-        return saveTokenJson;
+        atDto.setAccessToken(saveTokenJson);
+        return atDto;
     }
 
 	@Override