From 6743f9df7816c9d9a1d5e9628915bf035c94b076 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 18 Jan 2020 13:30:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/AppConfig.js | 78 ++++++++++++++++++++++++-----------
 1 file changed, 54 insertions(+), 24 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 8e2660a7f..ad59807b2 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -108,30 +108,30 @@ export function initAxiosInterceptors(props) {
       // proxy="https://test-newweb.educoder.net"
       // proxy="https://test-jupyterweb.educoder.net"
 	     //proxy="http://192.168.2.63:3001"
-	try {
-			const  str =window.location.pathname;
-			if(str.indexOf("/wxcode") !== -1){
-				// console.log("开始重写cookis");
-				const _params = window.location.search;
-				// console.log("1111");
-				if (_params) {
-					// console.log("22222");
-					let _search = _params.split('?')[1];
-					_search.split('&').forEach(item => {
-						const _arr = item.split('=');
-						if(_arr[0]==='_educoder_session'){
-							cookie.save('_educoder_session',_arr[1],{ path: '/' });
-							cookie.save('_educoder_session',_arr[1], { domain: '.educoder.net', path: '/'});
-						}else{
-							cookie.save('autologin_trustie',_arr[1],{ path: '/' });
-							cookie.save('autologin_trustie',_arr[1], { domain: '.educoder.net', path: '/'});
-						}
-					});
-				}
-			}
-	}catch (e) {
-
-	}
+	// try {
+	// 		const  str =window.location.pathname;
+	// 		if(str.indexOf("/wxcode") !== -1){
+	// 			// console.log("开始重写cookis");
+	// 			const _params = window.location.search;
+	// 			// console.log("1111");
+	// 			if (_params) {
+	// 				// console.log("22222");
+	// 				let _search = _params.split('?')[1];
+	// 				_search.split('&').forEach(item => {
+	// 					const _arr = item.split('=');
+	// 					if(_arr[0]==='_educoder_session'){
+	// 						cookie.save('_educoder_session',_arr[1],{ path: '/' });
+	// 						cookie.save('_educoder_session',_arr[1], { domain: '.educoder.net', path: '/'});
+	// 					}else{
+	// 						cookie.save('autologin_trustie',_arr[1],{ path: '/' });
+	// 						cookie.save('autologin_trustie',_arr[1], { domain: '.educoder.net', path: '/'});
+	// 					}
+	// 				});
+	// 			}
+	// 		}
+	// }catch (e) {
+	//
+	// }
 
     // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
     // 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制
@@ -203,7 +203,37 @@ export function initAxiosInterceptors(props) {
 					// }catch (e) {
 					//
 					// }
+					try {
+						const  str =window.location.pathname;
+						if(str.indexOf("/wxcode") !== -1){
+							// console.log("开始重写cookis");
+							const _params = window.location.search;
+							// console.log("1111");
+							if (_params) {
+								// console.log("22222");
+								let _search = _params.split('?')[1];
+								var _educoder_sessionmys="";
+								var autologin_trusties="";
+								_search.split('&').forEach(item => {
+									const _arr = item.split('=');
+									if(_arr[0]==='_educoder_session'){
+										cookie.save('_educoder_session',_arr[1],{ path: '/' });
+										cookie.save('_educoder_session',_arr[1], { domain: '.educoder.net', path: '/'});
+										_educoder_sessionmys=_arr[1];
+									}else{
+										cookie.save('autologin_trustie',_arr[1],{ path: '/' });
+										cookie.save('autologin_trustie',_arr[1], { domain: '.educoder.net', path: '/'});
+										autologin_trusties=_arr[1];
+									}
+								});
+								config.headers["Cookie"] = `_educoder_session=${_educoder_sessionmys}; autologin_trustie=${autologin_trusties} `;
+								config.headers.Authorization = `_educoder_session=${_educoder_sessionmys}; autologin_trustie=${autologin_trusties} `;
+								config.headers.Cookie =`_educoder_session=${_educoder_sessionmys}; autologin_trustie=${autologin_trusties} `;
+							}
+						}
+					}catch (e) {
 
+					}
 
 
             if (config.url.indexOf(proxy) != -1 || config.url.indexOf(':') != -1) {