From 6e6649aa096921a994bed0119eafc288d5ac5a29 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 13 Feb 2020 17:40:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B3=A8=E9=87=8Aget=5Fuser=5Finfo?= =?UTF-8?q?=E9=87=8C=E7=9A=84current=5Flaboratory?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/get_navigation_info.json.jbuilder | 2 +- app/views/users/get_user_info.json.jbuilder | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/get_navigation_info.json.jbuilder b/app/views/users/get_navigation_info.json.jbuilder index 86223cb68..670892ba7 100644 --- a/app/views/users/get_navigation_info.json.jbuilder +++ b/app/views/users/get_navigation_info.json.jbuilder @@ -41,7 +41,7 @@ json.top do json.old_url @old_domain # 云上实验室管理权限 - json.laboratory_user current_laboratory&.laboratory_users.exists?(user_id: @user&.id) || @user&.admin_or_business? + # json.laboratory_user current_laboratory&.laboratory_users.exists?(user_id: @user&.id) || @user&.admin_or_business? end json.down do diff --git a/app/views/users/get_user_info.json.jbuilder b/app/views/users/get_user_info.json.jbuilder index 436e8e29b..865fc4f62 100644 --- a/app/views/users/get_user_info.json.jbuilder +++ b/app/views/users/get_user_info.json.jbuilder @@ -13,7 +13,7 @@ json.phone @user.phone json.email @user.mail json.profile_completed @user.profile_completed? json.professional_certification @user.professional_certification -json.main_site current_laboratory&.main_site? +# json.main_site current_laboratory&.main_site? if @course json.course_identity @course_identity json.course_name @course.name From adc7da1a3c541ed263daf8793bdb9af1e736900c Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 13 Feb 2020 17:47:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9appconfig.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/get_navigation_info.json.jbuilder | 2 +- app/views/users/get_user_info.json.jbuilder | 2 +- public/react/src/AppConfig.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/users/get_navigation_info.json.jbuilder b/app/views/users/get_navigation_info.json.jbuilder index 670892ba7..86223cb68 100644 --- a/app/views/users/get_navigation_info.json.jbuilder +++ b/app/views/users/get_navigation_info.json.jbuilder @@ -41,7 +41,7 @@ json.top do json.old_url @old_domain # 云上实验室管理权限 - # json.laboratory_user current_laboratory&.laboratory_users.exists?(user_id: @user&.id) || @user&.admin_or_business? + json.laboratory_user current_laboratory&.laboratory_users.exists?(user_id: @user&.id) || @user&.admin_or_business? end json.down do diff --git a/app/views/users/get_user_info.json.jbuilder b/app/views/users/get_user_info.json.jbuilder index 865fc4f62..436e8e29b 100644 --- a/app/views/users/get_user_info.json.jbuilder +++ b/app/views/users/get_user_info.json.jbuilder @@ -13,7 +13,7 @@ json.phone @user.phone json.email @user.mail json.profile_completed @user.profile_completed? json.professional_certification @user.professional_certification -# json.main_site current_laboratory&.main_site? +json.main_site current_laboratory&.main_site? if @course json.course_identity @course_identity json.course_name @course.name diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index 6bbb78c60..3f459f089 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -45,7 +45,7 @@ export function initAxiosInterceptors(props) { // https://github.com/axios/axios/issues/1497 // TODO 读取到package.json中的配置？ - var //proxy = "http://localhost:3000" + var proxy = "http://localhost:3000" //proxy = "http://testbdweb.trustie.net" //proxy = "http://testbdweb.educoder.net" // proxy = "https://testeduplus2.educoder.net" @@ -54,7 +54,7 @@ export function initAxiosInterceptors(props) { // proxy="https://test-newweb.educoder.net" //proxy="https://test-jupyterweb.educoder.net" //proxy="http://192.168.2.63:3001" - proxy="http://123.59.135.93:56666" + // proxy="http://123.59.135.93:56666" // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求； // 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制 From 36ccf249bf68542b4b9324d89c478789db12887b Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 13 Feb 2020 17:53:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B3=A8=E9=87=8Acurrent=5Flaboratory?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/get_navigation_info.json.jbuilder | 2 +- app/views/users/get_user_info.json.jbuilder | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/get_navigation_info.json.jbuilder b/app/views/users/get_navigation_info.json.jbuilder index 86223cb68..670892ba7 100644 --- a/app/views/users/get_navigation_info.json.jbuilder +++ b/app/views/users/get_navigation_info.json.jbuilder @@ -41,7 +41,7 @@ json.top do json.old_url @old_domain # 云上实验室管理权限 - json.laboratory_user current_laboratory&.laboratory_users.exists?(user_id: @user&.id) || @user&.admin_or_business? + # json.laboratory_user current_laboratory&.laboratory_users.exists?(user_id: @user&.id) || @user&.admin_or_business? end json.down do diff --git a/app/views/users/get_user_info.json.jbuilder b/app/views/users/get_user_info.json.jbuilder index 436e8e29b..865fc4f62 100644 --- a/app/views/users/get_user_info.json.jbuilder +++ b/app/views/users/get_user_info.json.jbuilder @@ -13,7 +13,7 @@ json.phone @user.phone json.email @user.mail json.profile_completed @user.profile_completed? json.professional_certification @user.professional_certification -json.main_site current_laboratory&.main_site? +# json.main_site current_laboratory&.main_site? if @course json.course_identity @course_identity json.course_name @course.name