Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_jupyter

public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js

@@ -382,6 +382,7 @@ class Challengesjupyter extends Component {
 				setTimeout(()=>{
 					this.setState({
 						jupyter_url :response.data.url,
+						jupyter_port:response.data.port,
 						booljupyterurls:true,
 					})
 				},500);

public/react/src/redux/actions/jupyter.js

@@ -204,7 +204,7 @@ export const saveJupyterTpi = () => {
         payload: false
       });
     });
-    }, 500)
+    }, 800)
 
   }
 }