Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

merge

public/react/src/AppConfig.js

@@ -101,9 +101,6 @@ export function initAxiosInterceptors(props) {
       // proxy="https://test-jupyterweb.educoder.net"
 	     //proxy="http://192.168.2.63:3001"
 	try {
-		var u = navigator.userAgent;
-		var isIOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
-		if (isIOS) {
 		const  str =window.location.pathname;
 		if(str.indexOf("/wxcode") !== -1){
 			// console.log("开始重写cookis");
@@ -120,11 +117,11 @@ export function initAxiosInterceptors(props) {
 
 					}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

@@ -44,30 +44,24 @@ const App = (props) => {
 
   const {identifier} = props.match.params;
   // 获取路径参数
-	const _params = window.location.search;
-  const setCookier = () => {
-		var u = navigator.userAgent;
-		var isIOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
-		if (isIOS) {
-		}else{
-			if (_params) {
-				let _cookie = '';
-				let _search = _params.split('?')[1];
-				// if(_search.split('=')) {
-				// 	_cookie = _search.split('=')[1];
-				// 	cookie.save('_educoder_session', _cookie);
-				// }
-				_search.split('&').forEach(item => {
-					const _arr = item.split('=');
-					cookie.save(_arr[0], _arr[1], {
-						path: '/',
-						domain: '.educoder.net'
-					});
+	const setCookier = () => {
+		const _params = window.location.search;
+		if (_params) {
+			let _search = _params.split('?')[1];
+			_search.split('&').forEach(item => {
+				// console.log(item);
+				const _arr = item.split('=');
+				cookie.remove(_arr[0], {
+					path: '/',
+					domain: '.educoder.net'
 				});
-			}
+				cookie.save(_arr[0], _arr[1], {
+					path: '/',
+					domain: '.educoder.net'
+				});
+			});
 		}
-  }
-
+	}
   setCookier();
   const [isActive, setIsActive] = useState(-1);
   const [tip, setTip] = useState('');

public/react/src/services/wxcodeService.js

@@ -10,31 +10,21 @@ import axios from 'axios';
 import cookie from 'react-cookies'
 // axios.defaults.withCredentials = true;
 
+
 const setCookier = () => {
-	// var u = navigator.userAgent;
-	// var isIOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
-	// if (isIOS) {
-	//
-	// }else{
-	// 	const _params = window.location.search;
-	// 	if (_params) {
-	// 		let _search = _params.split('?')[1];
-	// 		_search.split('&').forEach(item => {
-	// 			// console.log(item);
-	// 			const _arr = item.split('=');
-	// 			cookie.remove(_arr[0], {
-	// 				domain: '.educoder.net',
-	// 				path: '/',
-	//
-	// 			});
-	// 			cookie.save(_arr[0], _arr[1], {
-	// 				path: '/',
-	// 				domain: '.educoder.net'
-	// 			});
-	// 		});
-	// 	}
-	//
-	// }
+	const _params = window.location.search;
+	if (_params) {
+		let _search = _params.split('?')[1];
+		_search.split('&').forEach(item => {
+			// console.log(item);
+			const _arr = item.split('=');
+			cookie.remove(_arr[0], {
+				path: '/',
+				domain: '.educoder.net'
+			});
+			cookie.save(_arr[0], _arr[1], { domain: '.educoder.net', path: '/'});
+		});
+	}
 }
 
 // 获取代码块