diff --git a/src/AppConfig.js b/src/AppConfig.js index fb45f2300..981208f5f 100644 --- a/src/AppConfig.js +++ b/src/AppConfig.js @@ -32,9 +32,9 @@ export function initAxiosInterceptors(props) { // 判断网络是否连接 initOnlineOfflineListener(); - var proxy = "https://testforgeplus.trustie.net"; + // var proxy = "https://testforgeplus.trustie.net"; // var proxy = "http://172.20.32.201:4000"; - // var proxy = "https://www.gitlink.org.cn"; + var proxy = "https://www.gitlink.org.cn"; //响应前的设置 axios.interceptors.request.use( diff --git a/src/forge/Information/Component/publicBanner.jsx b/src/forge/Information/Component/publicBanner.jsx index 2b02fc3e8..dd22273ba 100644 --- a/src/forge/Information/Component/publicBanner.jsx +++ b/src/forge/Information/Component/publicBanner.jsx @@ -103,6 +103,15 @@ function PublicBanner(props) { } } + function toLessonsFunc(){ + if (checkIfLogin() === false) { + showLoginDialog() + return false; + } else{ + window.location.href = `/zone/${deptId}/lessons`; + } + } + return (
@@ -157,7 +166,7 @@ function PublicBanner(props) { {sectionResourceShow && {sectionResourceTitle}} {sectionCmsShow && {sectionCmsTitle}} {/* Sig小组 */} - {isNSCC && 课程实训} + {isNSCC && 课程实训} {sectionMemberShow && {sectionMemberTitle}} {sectionHelperShow && {data.sectionHelperTitle}} {adminUrl && { window.location.href = adminUrl }}>后台管理} diff --git a/src/forge/Information/Pages/lessons.jsx b/src/forge/Information/Pages/lessons.jsx index 16bc9e30b..a56db0dce 100644 --- a/src/forge/Information/Pages/lessons.jsx +++ b/src/forge/Information/Pages/lessons.jsx @@ -1,14 +1,31 @@ -import React from 'react'; +import React, { useEffect , useState } from 'react'; +import { Base64 } from 'js-base64'; -function Lessons({src="https://gitlink.educoder.net/"}){ - +function Lessons(props,{src="https://gitlink.educoder.net/"}){ + const { checkIfLogin , showLoginDialog , current_user } = props; + const [ params , setParams] = useState(""); + useEffect(()=>{ + if(!checkIfLogin()){ + showLoginDialog && showLoginDialog(); + } + }) + + useEffect(()=>{ + if(current_user && current_user.login){ + let p =`?websiteName=gitlink&openkey=`+Base64.encode("05e9081ede2e7425db064df44b5fb1897234f44f922443b89597d17b60dc8f3e")+`&sign=cdf0f69b4d5b4293f7914cc1f1f31742 +&login=`+current_user.login+`&lastname=`+current_user.real_name+`&nickname=`+current_user.nickname+`&mail=`+current_user.email+`&school_name=`+current_user.custom_department+` +&phone=`+current_user.phone+``; + setParams(p); + console.log(p); + } + },[current_user]) return(