diff --git a/src/AppConfig.js b/src/AppConfig.js index c42dcbf4..6283109c 100644 --- a/src/AppConfig.js +++ b/src/AppConfig.js @@ -29,9 +29,10 @@ if (isDev) { } window._debugType = debugType; export function initAxiosInterceptors(props) { + // 判断网络是否连接 initOnlineOfflineListener(); - var proxy = "https://testforgeplus.trustie.net"; + var proxy = "https://testforgeplus.trustie.net"; //响应前的设置 axios.interceptors.request.use( config => { @@ -39,7 +40,6 @@ export function initAxiosInterceptors(props) { return config } requestProxy(config); - let url = `/api${config.url}`; if (`${config[0]}` !== `true`) { diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx index 1361acb0..8897b7b7 100644 --- a/src/forge/Main/sub/DetailBanner.jsx +++ b/src/forge/Main/sub/DetailBanner.jsx @@ -39,10 +39,10 @@ function DetailBanner({ list , owner , projectsId , isManager , url , pathname , { item.menu_name === "issues" &&
  • - + - 易修 + 易修 {projectDetail && projectDetail.issues_count ? {projectDetail.issues_count} : ""} diff --git a/src/forge/Source/Index.jsx b/src/forge/Source/Index.jsx index b01e3907..9f1c81c1 100644 --- a/src/forge/Source/Index.jsx +++ b/src/forge/Source/Index.jsx @@ -13,6 +13,7 @@ const sort = [ "按引用排序" ] const limit = 15; +const https = 'http://117.50.100.12:8001'; function Index(props){ const [ sortValue , setSortValue ] = useState(1); const [ page , setPage ] = useState(1); @@ -20,20 +21,20 @@ function Index(props){ const [ search , setSearch ] = useState(undefined); const [ visible , setVisible ] = useState(false); - const projectsId = props.match.params.projectsId; + const repo_id = props.projectDetail && props.projectDetail.repo_id; const owner = props.match.params.owner; useEffect(()=>{ - if(owner && projectsId){ + if(owner && repo_id){ getData(); } - },[projectsId,owner,search,sort,page]) + },[repo_id,owner,search,sort,page]) function getData(){ - const url = `http://117.50.100.12:8001/api/project/achievement/`; + const url = https +`/api/project/achievement/`; axios.get(url,{ params:{ - projectId:projectsId, + projectId:repo_id, curPage:page, pageSize:limit, name:search, diff --git a/src/indexEduplus2RequestProxy.js b/src/indexEduplus2RequestProxy.js index 81cfba0e..21e02dc4 100644 --- a/src/indexEduplus2RequestProxy.js +++ b/src/indexEduplus2RequestProxy.js @@ -17,21 +17,6 @@ const paramRequestOldUrlArray = [ ] const paramRequestNewUrlArray = [ - // 获取代码内容 - // (matchResult) => { - // const stageId = matchResult[1] - // return `/tasks/${stageId}/rep_content.json` - // }, - - // 获取版本库目录、文件 - // http://testeduplus2.educoder.net/tasks/se79x25pzfwo/git_entries.json?path=&dev=master&gpid=3441 - // (matchResult) => { - // const stageId = matchResult[1] - // // return `/tasks/${stageId}/git_entries.json` - // return `/myshixuns/${stageId}/repository.json` - // }, - - // `/tasks/tonblikwzj78/choose_build.json` (matchResult) => { const stageId = matchResult[1] return `/tasks/${stageId}/choose_build.json` @@ -65,20 +50,4 @@ export function requestProxy(config) { }); } return config; -} - -/** - ('/api/v1/careers/qweqw/edit/').match(/\/api\/v1\/careers\/(\w*)\/edit/i) - 0: "/api/v1/careers/qweqw/edit" - 1: "qweqw" - - example: - `/api/v1/games/${this.props.game.identifier}/answer_grade` -> - `/tasks/${this.props.game.identifier}/answer_grade.json` - - - https://testeduplus2.educoder.net/api/v1/games/feguz4tiqpvx/rep_content - ?path=src/step2/CLnkQueue.cpp&shixun_gpid=2791&status=0&retry=0 -> - http://testeduplus2.educoder.net/tasks/tonblikwzj78/rep_content.json - ?path=1-4.py&shixun_gpid=2448&status=0 - */ \ No newline at end of file +} \ No newline at end of file diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js index 43bd9f09..6311a5cd 100644 --- a/src/modules/login/LoginDialog.js +++ b/src/modules/login/LoginDialog.js @@ -302,12 +302,9 @@ class LoginDialog extends Component { } componentWillReceiveProps(nextProps) { - this.setState({ isRender: nextProps.isRender }) - // console.log(nextProps.isRender); - } IsPC = () => { var userAgentInfo = navigator.userAgent; @@ -324,8 +321,8 @@ class LoginDialog extends Component { return flag; } componentDidMount() { - - let flag = this.IsPC(); //true为PC端，false为手机端 + //true为PC端，false为手机端 + let flag = this.IsPC(); this.setState({ isphone: flag }) @@ -357,7 +354,6 @@ class LoginDialog extends Component { } loginEDU = () => { - let { loginValue, passValue, regular, isGoingValue } = this.state; if (regular === 1) { return @@ -379,15 +375,8 @@ class LoginDialog extends Component { if (response.data.message === "登录密码出错已达上限，账号已被锁定, 请10分钟后重新登录或找回密码") { const messge = (
    -

    - 登录密码出错已达上限，账号已被锁定； -

    -

    - 请10分钟后重新登录或找回密码 -

    +

    登录密码出错已达上限，账号已被锁定；

    +

    请10分钟后重新登录或找回密码

    ) this.openNotifications(messge); @@ -466,10 +455,9 @@ class LoginDialog extends Component { } render() { - let { login, isGoing, isGoingValue, disabled, Phonenumberisnotco, - dialogBox, isRender, weixinlogin } = this.state; - + let { login, isGoing, isGoingValue, disabled , Phonenumberisnotco , dialogBox, isRender, weixinlogin } = this.state; let { settings } = this.props; + if (isRender === undefined) { isRender = false } @@ -532,9 +520,10 @@ class LoginDialog extends Component {

    {Phonenumberisnotco}

    -
    - { } } - placeholder="密码" > - + placeholder="密码" + />

    请输入密码 @@ -594,17 +583,7 @@ class LoginDialog extends Component { :"" } - {/* {weixinlogin === true ? : ""} - {weixinlogin === true ?

    - this.hideweixinlogin()}>返回账号登录 -

    : ""} */}
    - {/*快捷登录*/}
    : ""}