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

config/routes.rb

@@ -776,6 +776,10 @@ Rails.application.routes.draw do
     end
 
     post 'callbacks/aliyun_vod', to: 'callbacks/aliyun_vods#create'
+
+    namespace :wechats do
+      resource :js_sdk_signature, only: [:create]
+    end
   end
 
   namespace :admins do
@@ -884,10 +888,6 @@ Rails.application.routes.draw do
     end
   end
 
-  namespace :wechats do
-    resource :js_sdk_signature, only: [:create]
-  end
-
   #git 认证回调
   match 'gitauth/*url', to: 'gits#auth', via: :all
 

public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js

@@ -619,7 +619,7 @@ class GraduationTasksSubmitedit extends Component{
                 {/*<Link to={"/courses/"+courseId+"/graduation/graduation_tasks/"+category_id} className="color-grey-6">{workslist&&workslist.task_name}</Link>*/}
                 {/*<span className="color-grey-9 ml3 mr3">&gt;</span>*/}
                 {/*</WordsBtn>*/}
-                <span>{this.props.user&&this.props.user.username} 修改作品</span>
+                <span>{this.props.current_user&&this.props.current_user.real_name} 修改作品</span>
               </p>
 
               <div style={{ width:'100%',height:'75px'}} >

public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js

@@ -552,7 +552,7 @@ render(){
     },
   };
 
-  // console.log(this.props)
+  console.log(this.props)
 
 
 
@@ -601,7 +601,7 @@ render(){
           {/*<Link to={"/courses/"+courseId+"/graduation/graduation_tasks/"+category_id} className="color-grey-6">{workslist&&workslist.task_name}</Link>*/}
           {/*<span className="color-grey-9 ml3 mr3">&gt;</span>*/}
         {/*</WordsBtn>*/}
-        <span>{this.props.user&&this.props.user.username} 提交作品</span>
+        <span>{this.props.current_user&&this.props.current_user.real_name} 提交作品</span>
       </p>
 
       <div style={{ width:'100%',height:'75px'}} >