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

app/controllers/gits_controller.rb

@@ -8,7 +8,11 @@ class GitsController < ApplicationController
   # 供 git-workhorse反向调用认证
   def auth
     # HTTP_AUTHORIZATION: "Basic 这里base64编码的的密码(user:passwd)"
+    decodes = %W(2 3 4 5 6 7 8 9 a b c f e f g h i j k l m n o p q r s t u v w x y z)
+    rand_code = decodes.sample(10).join
     logger.info("11111112222223333 HTTP_AUTHORIZATION: #{request.env["HTTP_AUTHORIZATION"]}")
+    logger.info("1111111 git auth start: code is #{rand_code}, time is #{Time.now}")
+
     # logger.info("#########-----request_env: #{request.env}")
     # {"service"=>"git-receive-pack", "controller"=>"gits", "action"=>"auth",
     # "url"=>"forge01/cermyt39.git/info/refs"}
@@ -68,6 +72,7 @@ class GitsController < ApplicationController
 
     authenticate_or_request_with_http_basic do |username, password|
       result
+      logger.info("1111111 git auth end: code is #{rand_code}, time is #{Time.now}")
     end
   end
 

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -2643,7 +2643,7 @@ class Listofworksstudentone extends Component {
 			//学号
 			//学号排序是从大到小
 			this.setState({
-				order: "student_id",
+				orders: "student_id",
 				loadingstate: true,
 			})
 			this.Startsortingt("student_id", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
@@ -3047,32 +3047,9 @@ class Listofworksstudentone extends Component {
 		let {columns,course_groupysls,datajs,isAdmin,homework_status, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible,visibles, game_list,columnsstu,columnsstu2, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state;
 
 		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
-		// console.log(this.state.student_works);
-		// console.log("841");
-		// console.log(this.state.columns);
-		// console.log(datajs);
-		// console.log("2202");
-		// console.log(this.props.isAdmin());
-	  // console.log("2498");
-		// console.log(data);
-		// console.log(datas);
-		// console.log(this.props.isAdmin());
-
 	 let course_is_end = this.props.current_user&&this.props.current_user.course_is_end;
-	 // try {
-		//  if(this.props.isAdmin() === false){
-		// 	 if(teacherdata&&teacherdata.student_works){
-		// 		 if(teacherdata&&teacherdata.student_works.length>0){
-		// 			 console.log("这是双层页面。。。。");
-	 //
-		// 		 }
-		// 	 }
-	 //
-		//  }
-	 // }catch (e) {
-	 // 	console.log("Listofworksstudentone123");
-   //  console.log(e);
-	 // }
+	 // console.log("Listofworksstudentone.js");
+	 // console.log(orders);
 
 		return (