From 707c9aab6cabfdbf69f6982b88138ddccae8689d Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 15 Jan 2026 10:14:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E7=99=BB=E5=BD=95-?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=B7=B3=E8=BD=ACcookie=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/AppConfig.js                                   | 4 ++--
 src/modules/login/LoginDialog.js                   | 2 +-
 src/modules/loginRegister/Login.jsx                | 2 +-
 src/modules/loginRegister/Register.jsx             | 4 ++--
 src/modules/loginRegister/component/otherLogin.jsx | 9 +++++----
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/AppConfig.js b/src/AppConfig.js
index df3388a28..185f98cbc 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -32,9 +32,9 @@ export function initAxiosInterceptors(props) {
   // 判断网络是否连接
   initOnlineOfflineListener();
 
-  // var proxy = "https://testforgeplus.trustie.net";
+  var proxy = "https://testforgeplus.trustie.net";
   // var proxy = "http://172.20.32.201:4000";
-  var proxy = "https://www.gitlink.org.cn";
+  // var proxy = "https://www.gitlink.org.cn";
 
   //响应前的设置
   axios.interceptors.request.use(
diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js
index 7315fc0a6..08c0f1286 100644
--- a/src/modules/login/LoginDialog.js
+++ b/src/modules/login/LoginDialog.js
@@ -539,7 +539,7 @@ class LoginDialog extends Component {
                       <a href="/register" className="color-grey-9">注册</a>
                     </span>
                   </p>
-                  <OtherLogin />
+                  <OtherLogin location={this.props.location} main_site_url={settings.common.main_site_url}/>
                 </form>
               </div>
             </div>
diff --git a/src/modules/loginRegister/Login.jsx b/src/modules/loginRegister/Login.jsx
index 30fcf35ff..711bab83e 100644
--- a/src/modules/loginRegister/Login.jsx
+++ b/src/modules/loginRegister/Login.jsx
@@ -139,7 +139,7 @@ function Login(props){
           //   })
           //   }
           // </p>
-          <OtherLogin />
+          <OtherLogin location={location} main_site_url={mygetHelmetapi && mygetHelmetapi.common && mygetHelmetapi.common.main_site_url}/>
         }
       </div>
     </div>
diff --git a/src/modules/loginRegister/Register.jsx b/src/modules/loginRegister/Register.jsx
index e9ba19a62..171c03c9c 100644
--- a/src/modules/loginRegister/Register.jsx
+++ b/src/modules/loginRegister/Register.jsx
@@ -8,7 +8,7 @@ import OtherLogin from "./component/otherLogin";
 import { Encrypt } from "../../common/Env";
 
 function Register(props){
-  const {form, mygetHelmetapi} = props;
+  const {form, mygetHelmetapi,location} = props;
   const {getFieldDecorator, setFieldsValue } = form;
   //用户输入的符合规则的邮箱（用于获取验证码）
   const [emailStr, setEmailStr] = useState(undefined);
@@ -344,7 +344,7 @@ function Register(props){
           </Form.Item>
           <Button type="primary" htmlType="submit" className="login_register_cofBut" onClick={handleSubmit}>注册</Button>
         </Form>
-        <OtherLogin />
+        <OtherLogin location={location} main_site_url={mygetHelmetapi && mygetHelmetapi.common && mygetHelmetapi.common.main_site_url}/>
       </div>
     </div>
   )
diff --git a/src/modules/loginRegister/component/otherLogin.jsx b/src/modules/loginRegister/component/otherLogin.jsx
index bd5f80817..cbdd25acb 100644
--- a/src/modules/loginRegister/component/otherLogin.jsx
+++ b/src/modules/loginRegister/component/otherLogin.jsx
@@ -8,11 +8,12 @@ import githublogo from '../../login/github.png';
 import CCFlogo from '../../login/CCF.png';
 import OpenI from '../../login/OpenI.svg';
 import defaultlog from '../../login/default.png';
+import cookie from 'react-cookies';
 import "../LoginRegisterPage.scss"
 
-function OtherLogin(){
+function OtherLogin({location,main_site_url}){
   const [setting, setSetting] = useState(undefined);
-
+  
   useEffect(()=>{
     //获取第三方登录平台信息
     setSetting(JSON.parse(localStorage.getItem("chromesetting")));
@@ -48,7 +49,7 @@ function OtherLogin(){
       <div className='dfpanel'>
         {setting.third_party_new.map((item,key)=>{
           return(
-          key < 4 && <a href={`${item.url}`} className="ml15 mr15">
+          key < 4 && <a href={`${item.url}`} onClick={()=>{cookie.save("go_page",`${main_site_url}${location.pathname}`);window.location.href=`${item.url}`;}} className="ml15 mr15">
             <Tooltip overlayClassName='theTop' title={`使用${item.name === "qq" ? "QQ":item.name === "wechat" ? "微信" : item.name}账号登录`}>
               <img src={renderLogo(item.name)} width={item.name==="ccf"?"50px":"40px"} alt={`${item.name}登录`}/>
             </Tooltip>
@@ -61,7 +62,7 @@ function OtherLogin(){
           <Popover placement="left" content={<div className='thirdPanel'>
             {
               setting.third_party_new.map((i,k)=>{
-                return k>=4 &&<a href={`${i.url}` }>
+                return k>=4 &&<a href={`${i.url}`} onClick={()=>{cookie.save("go_page",`${main_site_url}${location.pathname}`);window.location.href=`${i.url}`;}}>
                   <Tooltip overlayClassName='theTop' title={`使用${i.name === "qq" ? "QQ":i.name === "wechat" ? "微信" : i.name}账号登录`}>
                     <img src={renderLogo(i.name)} height={35}/>
                   </Tooltip>