From d0f4aec03d462e2f429f938cc6adfc480693cd30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 4 Sep 2019 14:08:22 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=90=8D=E7=A7=B0?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../courses/graduation/tasks/GraduationTasksSubmitedit.js | 2 +-
.../courses/graduation/tasks/GraduationTasksSubmitnew.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
index e029ba644..c527824c5 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
@@ -619,7 +619,7 @@ class GraduationTasksSubmitedit extends Component{
{/*{workslist&&workslist.task_name}*/}
{/*>*/}
{/**/}
- {this.props.user&&this.props.user.username} 修改作品
+ {this.props.current_user&&this.props.current_user.real_name} 修改作品
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
index 1f08b1b5c..e383d4843 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
+++ b/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(){
{/*
{workslist&&workslist.task_name}*/}
{/*
>*/}
{/**/}
-
{this.props.user&&this.props.user.username} 提交作品
+
{this.props.current_user&&this.props.current_user.real_name} 提交作品
From e6a6635277b97661b41cc65465d2e8b5262ce9bc Mon Sep 17 00:00:00 2001
From: p31729568
Date: Wed, 4 Sep 2019 14:13:43 +0800
Subject: [PATCH 2/4] wechat js sdk api
---
config/routes.rb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/config/routes.rb b/config/routes.rb
index 5a1590afc..8085765b4 100644
--- a/config/routes.rb
+++ b/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
From a6154097832c14dd9ed2e3a182c40151bf2711e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 4 Sep 2019 14:38:10 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=8E=92=E8=A1=8C?=
=?UTF-8?q?=E6=A6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/home/shixunsHome.js | 296 +++++++++----------
1 file changed, 148 insertions(+), 148 deletions(-)
diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js
index 690baf28b..0d11fb369 100644
--- a/public/react/src/modules/home/shixunsHome.js
+++ b/public/react/src/modules/home/shixunsHome.js
@@ -389,156 +389,156 @@ class ShixunsHome extends Component {
{/*导师排行榜*/}
-
-
-
-
导师排行榜
-
MENTOR RANKING
-
-
-
-
-
-
-
+ {/**/}
+ {/*
*/}
+ {/*
*/}
+ {/*
导师排行榜
*/}
+ {/*
MENTOR RANKING
*/}
+ {/*
*/}
+
+ {/*
*/}
+
+
+ {/*
*/}
+ {/*
*/}
{/*程序员排行榜*/}
-
-
-
-
程序员排行榜
-
PROGRAMMER RANKING
-
-
-
-
+ {/**/}
+ {/*
*/}
+ {/*
*/}
+ {/*
程序员排行榜
*/}
+ {/*
PROGRAMMER RANKING
*/}
+ {/*
*/}
+ {/*
*/}
+ {/*
*/}
+ {/*
*/}
From 1d34f75cb8423b3b84e71924e354322cbe3ce2ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 4 Sep 2019 14:45:22 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/home/shixunsHome.js | 296 +++++++++----------
1 file changed, 148 insertions(+), 148 deletions(-)
diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js
index 0d11fb369..690baf28b 100644
--- a/public/react/src/modules/home/shixunsHome.js
+++ b/public/react/src/modules/home/shixunsHome.js
@@ -389,156 +389,156 @@ class ShixunsHome extends Component {
{/*导师排行榜*/}
- {/**/}
- {/*
*/}
- {/*
*/}
- {/*
导师排行榜
*/}
- {/*
MENTOR RANKING
*/}
- {/*
*/}
-
- {/*
*/}
-
-
- {/*
*/}
- {/*
*/}
+
+
+
+
导师排行榜
+
MENTOR RANKING
+
+
+
+
+
+
+
{/*程序员排行榜*/}
- {/**/}
- {/*
*/}
- {/*
*/}
- {/*
程序员排行榜
*/}
- {/*
PROGRAMMER RANKING
*/}
- {/*
*/}
- {/*
*/}
- {/*
*/}
- {/*
*/}
+
+
+
+
程序员排行榜
+
PROGRAMMER RANKING
+
+
+
+