Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

src/main/java/com/dsideal/QingLong/LoginPerson/Controller/LoginPersonController.java

@@ -2,9 +2,11 @@ package com.dsideal.QingLong.LoginPerson.Controller;
 
 import cn.hutool.captcha.CaptchaUtil;
 import cn.hutool.captcha.LineCaptcha;
+import cn.hutool.http.HttpUtil;
 import com.YunXiao.Util.SyncUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.dsideal.QingLong.Base.Model.BaseModel;
+import com.dsideal.QingLong.Collect.Model.CollectModel;
 import com.dsideal.QingLong.Interceptor.*;
 import com.dsideal.QingLong.LoginPerson.Model.LoginPersonModel;
 import com.dsideal.QingLong.Util.*;
@@ -214,9 +216,13 @@ public class LoginPersonController extends Controller {
     @Before({GET.class})
     public void logout() {
         SessionKit.clear(getRequest(), getResponse());
-        Kv kv = Kv.create();
-        kv.set("success", true);
-        renderJson(kv);
+        CollectModel cm = new CollectModel();
+        if (cm.THIRD_PARTY_BASE_DATA == 1) {
+            String url = "https://space.ccsjy.cn/manage/account/logout";
+            redirect(url);
+            return;
+        }
+        redirect("plogin.html");
     }
 
     /**