diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index c6430bd1d..b33935b13 100644 --- a/public/react/src/AppConfig.js +++ b/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; - 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: '/'}); - setCookie(_arr[1]); - }else{ - cookie.save('autologin_trustie',_arr[1],{ path: '/' }); - cookie.save('autologin_trustie',_arr[1], { domain: '.educoder.net', path: '/'}); - } - }); + var u = navigator.userAgent; + var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; + if(isAndroid){ + }else{ + //苹果走 + 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: '/'}); + // setCookie(_arr[1]); + }else{ + cookie.save('autologin_trustie',_arr[1],{ path: '/' }); + cookie.save('autologin_trustie',_arr[1], { domain: '.educoder.net', path: '/'}); + } + }); + } } + } + }catch (e) { } diff --git a/public/react/src/modules/wxcode/index.js b/public/react/src/modules/wxcode/index.js index 7e5c9362b..f026e3b85 100644 --- a/public/react/src/modules/wxcode/index.js +++ b/public/react/src/modules/wxcode/index.js @@ -46,22 +46,20 @@ const App = (props) => { // 获取路径参数 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' - // }); - // }); - // } + var u = navigator.userAgent; + var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; + if(isAndroid){ + const _params = window.location.search; + if (_params) { + let _search = _params.split('?')[1]; + _search.split('&').forEach(item => { + const _arr = item.split('='); + cookie.save(_arr[0], _arr[1], { domain: '.educoder.net', path: '/'}); + }); + } + }else{ + + } } setCookier(); const [isActive, setIsActive] = useState(-1); diff --git a/public/react/src/services/wxcodeService.js b/public/react/src/services/wxcodeService.js index 1d8acd4e3..0f2df8ce6 100644 --- a/public/react/src/services/wxcodeService.js +++ b/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) { - // 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: '/'}); - // }); - // } + + var u = navigator.userAgent; + var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; + if(isAndroid){ + const _params = window.location.search; + if (_params) { + let _search = _params.split('?')[1]; + _search.split('&').forEach(item => { + const _arr = item.split('='); + cookie.save(_arr[0], _arr[1], { domain: '.educoder.net', path: '/'}); + }); + } + }else{ + + } + } // 获取代码块