Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

# Conflicts:
#	public/react/src/modules/courses/exercise/Testpapersettinghomepage.js

public/react/src/modules/courses/exercise/Testpapersettinghomepage.js

@@ -171,7 +171,8 @@ class Testpapersettinghomepage extends Component{
 					}
 					console.log("170");
 					console.log(params);
-            axios.get(url+`?${queryString.stringify(params)}`+ '&export=true').then((response) => {
+					const urll=url+`?${queryString.stringify(params)}`;
+					axios.get(urll+ '&export=true').then((response) => {
             	if(response===undefined){
             		return
 							}
@@ -195,13 +196,13 @@ class Testpapersettinghomepage extends Component{
             }else {
 							this.setState({ donwloading: true })
 							downloadFile({
-								url: url+`?${queryString.stringify(params)}`,
+								url: urll,
 								successCallback: (url) => {
-									this.setState({ donwloading: false });
+									this.setState({ donwloading: false })
 									console.log('successCallback')
 								},
 								failCallback: (responseHtml, url) => {
-									this.setState({ donwloading: false });
+									this.setState({ donwloading: false })
 									console.log('failCallback')
 								}
 							})