From b7cb687ec3b9d764aa72c5f13c28ec589eefbd32 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:57:14 +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 | 90 ++++++++----------------
public/react/src/modules/wxcode/index.js | 44 ++++++------
2 files changed, 50 insertions(+), 84 deletions(-)
diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index ad59807b2..310c35ef3 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -38,14 +38,6 @@ function setCookier(){
}
}
-function setCookie(key, value) {
- const d = new Date();
- d.setTime(d.getTime() + (30 * 24 * 60 * 60 * 1000));
- const expires = "expires=" + d.toGMTString();
- document.cookie = `_educoder_session=${key}; domain=.educoder.net; path=/; expires=${expires}`;
-}
-
-
// TODO 开发期多个身份切换
let debugType =""
if (isDev) {
@@ -108,30 +100,34 @@ 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 {
+ 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");
+ 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: '/' });
+ }
+ });
+ }
+ }
+ }
+ }catch (e) {
+
+ }
// 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
// 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制
@@ -203,37 +199,7 @@ 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) {
diff --git a/public/react/src/modules/wxcode/index.js b/public/react/src/modules/wxcode/index.js
index 37241660a..0eff75030 100644
--- a/public/react/src/modules/wxcode/index.js
+++ b/public/react/src/modules/wxcode/index.js
@@ -46,26 +46,26 @@ const App = (props) => {
// 获取路径参数
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'
- // });
- // });
- // }
- // }
+ 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'
+ });
+ });
+ }
+ }
}
setCookier();
@@ -247,12 +247,12 @@ const App = (props) => {
测试集{i + 1}
{
- is_public
+ is_public
? compile_success > 0
? result ?
:
: ''
- :
+ :
隐藏测试集，暂不支持解锁和查看
// is_public
// ? result ?