zoujiajian 3 luni în urmă
părinte
comite
3476078328

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/model/entity/Account.java

@@ -151,5 +151,5 @@ public class Account extends BaseEntity {
     /**
     /**
      * 邮箱授权码
      * 邮箱授权码
      */
      */
-    private String emailAutoCode;
+    private String emailAuthCode;
 }
 }

+ 2 - 1
netflix-service/src/main/java/com/cyksj/service/mange/account/CmsAccountServiceImpl.java

@@ -415,7 +415,8 @@ public class CmsAccountServiceImpl extends ServiceImpl<AccountMapper, Account> i
                             if (goodsId == Constant.GPT_PLUS_GID) {
                             if (goodsId == Constant.GPT_PLUS_GID) {
                                 //邮箱授权码
                                 //邮箱授权码
                                 String emailAutoCode = part[2];
                                 String emailAutoCode = part[2];
-                                insert.setEmailAutoCode(emailAutoCode);
+                                insert.setEmailAuthCode(emailAutoCode);
+                                insert.setGptEmailPwd(null);
                             }
                             }
 						}
 						}
 					}
 					}

+ 11 - 4
netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -12,7 +12,6 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cyksj.common.constant.Constant;
 import com.cyksj.common.constant.Constant;
@@ -2706,10 +2705,18 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
                 .field(GroupsRelationView::getGoodsId, Constant.GPT_PLUS_GID)
                 .field(GroupsRelationView::getGoodsId, Constant.GPT_PLUS_GID)
                 .build());
                 .build());
         if (relationView != null && StrUtil.isNotEmpty(relationView.getEmailAuthCode())) {
         if (relationView != null && StrUtil.isNotEmpty(relationView.getEmailAuthCode())) {
-            String session_url = "https://mail.cpacc.us.ci/api/code";
+            String session_url = "https://mail.cpacc.us.ci/api/open";
 
 
-            JSONObject result = JSONUtil.parseObj(HttpUtil.post(session_url, Map.of("mailbox_token", relationView.getEmailAuthCode())));
-            String session = result.getStr("box_session");
+            JSONObject params = new JSONObject();
+            params.putOpt("mailbox_token", relationView.getEmailAuthCode());
+
+            HttpResponse result = HttpUtil.createPost(session_url)
+                    .header("sec-fetch-site", "same-origin")
+                    .setConnectionTimeout(Constant.CONNECT_MILLISECONDS)
+                    .body(params.toString())
+                    .execute();
+            JSONObject jsonObject = Jsons.parseObject(result.body(), JSONObject.class);
+            String session = jsonObject.getStr("box_session");
 
 
             String getCodeUrl = "https://mail.cpacc.us.ci/api/code";
             String getCodeUrl = "https://mail.cpacc.us.ci/api/code";
             HttpResponse execute = HttpUtil.createGet(getCodeUrl)
             HttpResponse execute = HttpUtil.createGet(getCodeUrl)