调整

public/react/src/AppConfig.js

@@ -109,30 +109,38 @@ export function initAxiosInterceptors(props) {
       // proxy="https://test-jupyterweb.educoder.net"
 	     //proxy="http://192.168.2.63:3001"
 	try {
-		const  str =window.location.pathname;
+		var u = navigator.userAgent;
-		if(str.indexOf("/wxcode") !== -1){
+		var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1;
-			// console.log("开始重写cookis");
+		if(isAndroid){
-			const _params = window.location.search;
+		}else{
-			// console.log("1111");
+			//苹果走
-			if (_params) {
+			const  str =window.location.pathname;
-				// console.log("22222");
+			if(str.indexOf("/wxcode") !== -1){
-				let _search = _params.split('?')[1];
+				// console.log("开始重写cookis");
-				_search.split('&').forEach(item => {
+				const _params = window.location.search;
-					const _arr = item.split('=');
+				// console.log("1111");
-					if(_arr[0]==='_educoder_session'){
+				if (_params) {
-						cookie.save('_educoder_session',_arr[1],{ path: '/' });
+					// console.log("22222");
-						cookie.save('_educoder_session',_arr[1], { domain: '.educoder.net', path: '/'});
+					let _search = _params.split('?')[1];
-						setCookie(_arr[1]);
+					_search.split('&').forEach(item => {
-					}else{
+						const _arr = item.split('=');
-						cookie.save('autologin_trustie',_arr[1],{ path: '/' });
+						if(_arr[0]==='_educoder_session'){
-						cookie.save('autologin_trustie',_arr[1], { domain: '.educoder.net', path: '/'});
+							cookie.save('_educoder_session',_arr[1],{ path: '/' });
-					}
+							cookie.save('_educoder_session',_arr[1], { domain: '.educoder.net', path: '/'});
-				});
+							// setCookie(_arr[1]);
+						}else{
+							cookie.save('autologin_trustie',_arr[1],{ path: '/' });
+							cookie.save('autologin_trustie',_arr[1], { domain: '.educoder.net', path: '/'});
+						}
+					});
+				}
 			}
+
 		}
 
 
 
+
 	}catch (e) {
 
 	}

public/react/src/modules/wxcode/index.js

@@ -46,22 +46,20 @@ const App = (props) => {
   // 获取路径参数
 
   const setCookier = () => {
-    // const _params = window.location.search;
+		var u = navigator.userAgent;
-    // if (_params) {
+		var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1;
-    //   let _search = _params.split('?')[1];
+		if(isAndroid){
-    //   _search.split('&').forEach(item => {
+			const _params = window.location.search;
-    //     // console.log(item);
+			if (_params) {
-    //     const _arr = item.split('=');
+				let _search = _params.split('?')[1];
-    //     cookie.remove(_arr[0], {
+				_search.split('&').forEach(item => {
-    //       path: '/',
+					const _arr = item.split('=');
-    //       domain: '.educoder.net'
+					cookie.save(_arr[0], _arr[1], { domain: '.educoder.net', path: '/'});
-    //     });
+				});
-    //     cookie.save(_arr[0], _arr[1], {
+			}
-    //       path: '/',
+		}else{
-    //       domain: '.educoder.net'
+
-    //     });
+		}
-    //   });
-    // }
   }
   setCookier();
   const [isActive, setIsActive] = useState(-1);

public/react/src/services/wxcodeService.js

@@ -11,19 +11,22 @@ import cookie from 'react-cookies'
 // axios.defaults.withCredentials = true;
 
 const setCookier = () => {
-  // const _params = window.location.search;
+
-  // if (_params) {
+	var u = navigator.userAgent;
-  //   let _search = _params.split('?')[1];
+	var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1;
-  //   _search.split('&').forEach(item => {
+	if(isAndroid){
-  //     // console.log(item);
+		const _params = window.location.search;
-  //     const _arr = item.split('=');
+		if (_params) {
-  //     cookie.remove(_arr[0], {
+		  let _search = _params.split('?')[1];
-  //       path: '/',
+		  _search.split('&').forEach(item => {
-  //       domain: '.educoder.net'
+		    const _arr = item.split('=');
-  //     });
+		    cookie.save(_arr[0], _arr[1], { domain: '.educoder.net', path: '/'});
-  //     cookie.save(_arr[0], _arr[1], { domain: '.educoder.net', path: '/'});
+		  });
-  //   });
+		}
-  // }
+	}else{
+
+	}
+
 }
 
 // 获取代码块