Merge branch 'master' into pre

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

@@ -272,6 +272,12 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
                 }
                 atDto.setAccessToken(accessToken);
                 return atDto;
+            }
+            try {
+                String email = jsonObject.getJSONObject("user").getStr("email");
+                atDto.setEmail(email);
+            } catch (Exception e) {
+
             }
             String payload = jsonObject.getStr("payload");
             if (StrUtil.isNotBlank(payload)) {

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

@@ -432,6 +432,12 @@ public class GptRechargeServiceImpl implements GptRechargeService {
                 }
                 atDto.setAccessToken(accessToken);
                 return atDto;
+            }
+            try {
+                String email = jsonObject.getJSONObject("user").getStr("email");
+                atDto.setEmail(email);
+            } catch (Exception e) {
+
             }
             String payload = jsonObject.getStr("payload");
             if (StrUtil.isNotBlank(payload)) {