+
+
{/**/}
@@ -687,7 +703,9 @@ submittojoinclass=(value)=>{
{/**/}
{/*搜索框*/}
- {showSearchOpentype===true?
this.hideshowSearchOpen(e)} onMouseLeave={()=>this.setevaluatinghides()}>
+ {showSearchOpentype===true?
Date: Wed, 24 Jul 2019 13:20:00 +0800
Subject: [PATCH 09/23] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=93=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/myshixuns_controller.rb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index 0a19f1c08..4382dff94 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -209,10 +209,10 @@ class MyshixunsController < ApplicationController
end
uid_logger("training_task_status start#4**#{game_id}**** #{Time.now.strftime("%Y-%m-%d %H:%M:%S.%L")}")
sucess_status
- rescue Exception => e
- tip_exception(e.message)
- uid_logger_error("training_task_status error: #{e}")
- raise ActiveRecord::Rollback
+ # rescue Exception => e
+ # tip_exception(e.message)
+ # uid_logger_error("training_task_status error: #{e}")
+ # raise ActiveRecord::Rollback
end
end
end
From b9e88f1d1c1073a8c9f9fbf4bd2d5fd7f12a2c88 Mon Sep 17 00:00:00 2001
From: jingquan huang
Date: Wed, 24 Jul 2019 13:27:11 +0800
Subject: [PATCH 10/23] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/myshixuns_controller.rb | 1 +
1 file changed, 1 insertion(+)
diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index 4382dff94..41b02f8ab 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -93,6 +93,7 @@ class MyshixunsController < ApplicationController
ActiveRecord::Base.transaction do
begin
t1 = Time.now
+ Rails.logger.info("@@@222222#{params[:jsonTestDetails]}")
jsonTestDetails = JSON.parse(params[:jsonTestDetails])
timeCost = JSON.parse(params[:timeCost])
brige_end_time = Time.parse(timeCost['evaluateEnd']) if timeCost['evaluateEnd'].present?
From 3ba0a4bc9523c210a97f18f9672de637c42f1bfc Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 24 Jul 2019 13:42:55 +0800
Subject: [PATCH 11/23] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/myshixuns_controller.rb | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index 0a19f1c08..237f4b350 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -93,7 +93,7 @@ class MyshixunsController < ApplicationController
ActiveRecord::Base.transaction do
begin
t1 = Time.now
- jsonTestDetails = JSON.parse(params[:jsonTestDetails])
+ jsonTestDetails = JSON.parse(params[:jsonTestDetails].to_json)
timeCost = JSON.parse(params[:timeCost])
brige_end_time = Time.parse(timeCost['evaluateEnd']) if timeCost['evaluateEnd'].present?
return_back_time = format("%.3f", ( t1.to_f - brige_end_time.to_f)).to_f
@@ -131,7 +131,10 @@ class MyshixunsController < ApplicationController
logger.info "actual_output:################################################# #{actual_output}"
ts_time = format("%.2f", j_test_set['testSetTime'].to_f/1000000000).to_f
ts_mem = format("%.2f", j_test_set['testSetMem'].to_f/1024/1024).to_f
-
+ sql = Output.create!(:code => status, :game_id => game_id, :out_put => outPut, :test_set_position => j_test_set['caseId'],
+ :actual_output => actual_output, :result => j_test_set['passed'].to_i, :query_index => max_query_index,
+ :compile_success => compile_success.to_i, :sec_key => sec_key, :ts_time => ts_time, :ts_mem => ts_mem).to_sql
+ logger.info("outputs_sql: #{sql}")
Output.create!(:code => status, :game_id => game_id, :out_put => outPut, :test_set_position => j_test_set['caseId'],
:actual_output => actual_output, :result => j_test_set['passed'].to_i, :query_index => max_query_index,
:compile_success => compile_success.to_i, :sec_key => sec_key, :ts_time => ts_time, :ts_mem => ts_mem)
From a00edf38ec600c4cb2ecd576203d5784cef905e3 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 24 Jul 2019 13:47:31 +0800
Subject: [PATCH 12/23] =?UTF-8?q?=E8=AF=84=E6=B5=8B=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/myshixuns_controller.rb | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index 262fbd50c..41b02f8ab 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -132,10 +132,7 @@ class MyshixunsController < ApplicationController
logger.info "actual_output:################################################# #{actual_output}"
ts_time = format("%.2f", j_test_set['testSetTime'].to_f/1000000000).to_f
ts_mem = format("%.2f", j_test_set['testSetMem'].to_f/1024/1024).to_f
- sql = Output.create!(:code => status, :game_id => game_id, :out_put => outPut, :test_set_position => j_test_set['caseId'],
- :actual_output => actual_output, :result => j_test_set['passed'].to_i, :query_index => max_query_index,
- :compile_success => compile_success.to_i, :sec_key => sec_key, :ts_time => ts_time, :ts_mem => ts_mem).to_sql
- logger.info("outputs_sql: #{sql}")
+
Output.create!(:code => status, :game_id => game_id, :out_put => outPut, :test_set_position => j_test_set['caseId'],
:actual_output => actual_output, :result => j_test_set['passed'].to_i, :query_index => max_query_index,
:compile_success => compile_success.to_i, :sec_key => sec_key, :ts_time => ts_time, :ts_mem => ts_mem)
From 78a31d1b4b9bdeed1a3525bed88688c97cb858ed Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 24 Jul 2019 13:52:46 +0800
Subject: [PATCH 13/23] =?UTF-8?q?=E8=AF=84=E6=B5=8B=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/myshixuns_controller.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index 41b02f8ab..649516a03 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -130,8 +130,8 @@ class MyshixunsController < ApplicationController
# is_public = test_sets.where(:position => j_test_set['caseId']).first.try(:is_public)
logger.info "actual_output:################################################# #{actual_output}"
- ts_time = format("%.2f", j_test_set['testSetTime'].to_f/1000000000).to_f
- ts_mem = format("%.2f", j_test_set['testSetMem'].to_f/1024/1024).to_f
+ ts_time = format("%.2f", j_test_set['testSetTime'].to_f/1000000000).to_f if j_test_set['testSetTime']
+ ts_mem = format("%.2f", j_test_set['testSetMem'].to_f/1024/1024).to_f if j_test_set['testSetMem']
Output.create!(:code => status, :game_id => game_id, :out_put => outPut, :test_set_position => j_test_set['caseId'],
:actual_output => actual_output, :result => j_test_set['passed'].to_i, :query_index => max_query_index,
From baa38da183b485bcfbfe335af788aafd12b7dd02 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 24 Jul 2019 13:57:39 +0800
Subject: [PATCH 14/23] =?UTF-8?q?=E6=B2=A1=E4=BB=A3=E7=A0=81=E7=9A=84?=
=?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=AF=84=E6=B5=8B=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/application_controller.rb | 1 +
1 file changed, 1 insertion(+)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index cf7ac6d2e..2ab0c6649 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -319,6 +319,7 @@ class ApplicationController < ActionController::Base
# 通关后，把最后一次成功的代码存到数据库
# type 0 创始内容， 1 最新内容
def game_passed_code(path, myshixun, game_id)
+ return if path.blank?
file_content = git_fle_content myshixun.repo_path, path
unless file_content.present?
raise("获取文件代码异常")
From b0171aef5dba65d5319e2535af0897168a51899e Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 24 Jul 2019 14:01:28 +0800
Subject: [PATCH 15/23] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?=E7=AA=97=E5=8F=A3=E7=9A=84=E5=AE=9E=E8=AE=AD=E3=80=82=E8=AF=84?=
=?UTF-8?q?=E6=B5=8B=E9=80=9A=E8=BF=87=E4=B8=8D=E4=BF=9D=E5=AD=98=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/application_controller.rb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2ab0c6649..5eca6ccf9 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -319,7 +319,8 @@ class ApplicationController < ActionController::Base
# 通关后，把最后一次成功的代码存到数据库
# type 0 创始内容， 1 最新内容
def game_passed_code(path, myshixun, game_id)
- return if path.blank?
+ # 如果代码窗口是隐藏的，则不用保存代码
+ return if myshixun.shixun.hide_code
file_content = git_fle_content myshixun.repo_path, path
unless file_content.present?
raise("获取文件代码异常")
From 21b8b3de95ee3c9771e2947e48ad5fabdb50cb1e Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 24 Jul 2019 14:04:13 +0800
Subject: [PATCH 16/23] =?UTF-8?q?=E8=AF=84=E6=B5=8B=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/application_controller.rb | 1 +
1 file changed, 1 insertion(+)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index cf7ac6d2e..9fd7dc0b5 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -319,6 +319,7 @@ class ApplicationController < ActionController::Base
# 通关后，把最后一次成功的代码存到数据库
# type 0 创始内容， 1 最新内容
def game_passed_code(path, myshixun, game_id)
+ return if myshixun.shixun.hide_code
file_content = git_fle_content myshixun.repo_path, path
unless file_content.present?
raise("获取文件代码异常")
From b23704a9660043ade4a4073c706cbc65ca9764c9 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Wed, 24 Jul 2019 14:08:07 +0800
Subject: [PATCH 17/23] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/models/department.rb | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/app/models/department.rb b/app/models/department.rb
index bf5c3a90e..c019862db 100644
--- a/app/models/department.rb
+++ b/app/models/department.rb
@@ -3,8 +3,7 @@ class Department < ApplicationRecord
has_many :department_members, dependent: :destroy
- after_create_commit :reset_data_cache
- after_update_commit :reset_data_cache
+ after_commit :reset_data_cache
def self.cached_names_data(school)
Rails.cache.fetch(names_data_cache_key(school.id), expires_in: 7.days) do
@@ -16,9 +15,7 @@ class Department < ApplicationRecord
def reset_data_cache
# 清除部门名称缓存
- if new_record? || name_previously_changed?
- Rails.cache.delete(self.class.names_data_cache_key(school_id))
- end
+ Rails.cache.delete(self.class.names_data_cache_key(school_id))
end
def self.names_data_cache_key(school_id)
From d3eee68c74f7fafe9bce2c033efefa0223a64772 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, 24 Jul 2019 14:08:18 +0800
Subject: [PATCH 18/23] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/user/Interestpage.js | 6 +++---
public/react/src/modules/user/InterestpageMax.js | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/public/react/src/modules/user/Interestpage.js b/public/react/src/modules/user/Interestpage.js
index 4c3c39406..b3abfe1a4 100644
--- a/public/react/src/modules/user/Interestpage.js
+++ b/public/react/src/modules/user/Interestpage.js
@@ -258,15 +258,15 @@ class InterestpageComponent extends Component {
+ ![]()
this.Clickteacher("teacher")} src={skzbdx} className="ysldivhomedivimg"/>
+ ![]()
this.Clickteacher("student")} src={mytc} className="ysldivhomedivimg"/>
+ ![]()
this.Clickteacher("professional")} src={zyrs1} className="ysldivhomedivimg"/>
+ ![]()
this.Clickteacher("teacher")} src={skzbdx} className="ysldivhomedivimg2"/>
+ ![]()
this.Clickteacher("student")} src={mytc} className="ysldivhomedivimg2"/>
+ ![]()
this.Clickteacher("professional")} src={zyrs1} className="ysldivhomedivimg2"/>
this.hideshowSearchOpen(e)} onMouseLeave={()=>this.setevaluatinghides()}>
{
export default NewHeader;
-
-
-//
-
-
-
-{/*{*/}
-{/**/}
-{/**/}
-{/*/!*{this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count > 99 ? '99+'*!/*/}
-{/*/!*: this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count}*!/*/}
-{/**/}
-{/**/}
-{/*}*/}
-{/*{ this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count>0 &&*/}
-{/**/}
-{/**/}
-{/*/!*{this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count > 99 ? '99+'*!/*/}
-{/*/!*: this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count}*!/*/}
-{/**/}
-{/*}*/}
-{/*{ this.props.Headertop===undefined?"":user && this.props.Headertop.unread_message_count>0 &&*/}
-{/**/}
-{/**/}
-{/**/}
-{/*}*/}
-
-
-
-{/*
- 需求：消息数量
- 设置 */}
- 设置
+ 设置
:""}
diff --git a/public/react/src/modules/login/LoginDialog.css b/public/react/src/modules/login/LoginDialog.css
index 34a711154..c7c357208 100644
--- a/public/react/src/modules/login/LoginDialog.css
+++ b/public/react/src/modules/login/LoginDialog.css
@@ -24,7 +24,7 @@
top: 0px !important;
}
#log_reg_content{
- width:400px !important;
+ width:405px !important;
border-radius:6px;
box-shadow:4px 8px 12px rgba(76,76,76,0.3);
}
diff --git a/public/react/src/modules/login/Trialapplication.js b/public/react/src/modules/login/Trialapplication.js
index ebb4b98c2..313d5bce3 100644
--- a/public/react/src/modules/login/Trialapplication.js
+++ b/public/react/src/modules/login/Trialapplication.js
@@ -406,7 +406,7 @@ class Trialapplication extends Component {
top: 0px !important;
}
#log_reg_content{
- width:400px !important;
+ width:405px !important;
border-radius:40px !important;
box-shadow:4px 8px 12px rgba(76,76,76,0.3);
}
diff --git a/public/react/src/modules/login/Trialapplicationysl.js b/public/react/src/modules/login/Trialapplicationysl.js
index e2afac010..dc9755fbe 100644
--- a/public/react/src/modules/login/Trialapplicationysl.js
+++ b/public/react/src/modules/login/Trialapplicationysl.js
@@ -424,7 +424,7 @@ class Trialapplicationysl extends Component {
top: 0px !important;
}
#log_reg_content{
- width:400px !important;
+ width:405px !important;
border-radius:40px !important;
box-shadow:4px 8px 12px rgba(76,76,76,0.3);
}
From 5e8cfed6cd8e19806a44267393c93b0f6d461715 Mon Sep 17 00:00:00 2001
From: jingquan huang
- 
-
-
-
-
-*/}
-
-
-// function loadHeader(){
-// //头部导航条的----------显示搜索框
-// $("#search-open").on("click",function(e){
-// $(this).hide();
-// // $("#header-nav").animate({opacity:"0"},1000);
-// $(".posi-search").show() // animate({opacity:"1"},1000);
-// $("#header-nav").css("z-index","2");
-// $(".posi-search").css("z-index","3");
-// $(".HeaderSearch").show();
-// $(".HeaderSearch").val("");
-// $(".search-input").focus();
-// $(".search-all .search-content").hide();
-// e.stopPropagation();//阻止冒泡
-// });
-// $(".HeaderSearch").on("click",function(e){
-// debugger
-// e.stopPropagation();//阻止冒泡
-// });
-//搜索框输入内容
-// $("#HeaderSearchs").blur(function(e){
-// closeSearch();
-// e.stopPropagation();//阻止冒泡
-// });
-//点击页面其它（与搜索框无关的地方）都会将搜索框隐藏，所以与搜索框有关的地方需要阻止冒泡
-// $("body").on("click",function(){
-// closeSearch();
-// });
-// $(".HeaderSearch").on("input",function(e){
-// $(".search-all .search-content").show();
-// e.stopPropagation();//阻止冒泡
-// });
-//搜索
-// $("#header_keyword_search").on("click", header_search);
-// $("input[name='search_keyword']").on("keydown", function(event){
-// var code;
-// if (!event) {
-// event = window.event; //针对ie浏览器
-// code = event.keyCode;
-// }
-// else {
-// code = event.keyCode;
-// }
-// if(code == 13) {
-// header_search();
-// return false;
-// }
-// });
-// $(".search-clear").click(function(e){e.stopPropagation();});
-// //切换搜索条件
-// $("#searchkey li").click(function(e){
-// var key=$($(this).children("a")[0]).html();
-// switch (key){
-// case '实训':
-// $("#search_type").val('1');
-// break;
-// case '课堂':
-// $("#search_type").val('2');
-// break;
-// case '用户':
-// $("#search_type").val('3');
-// break;
-// }
-// $("#searchkey").siblings(".searchkey").html(key);
-// $("#searchkey").hide();
-// e.stopPropagation();//阻止冒泡
-// });
-// //切换选择导航条
-// $("#header-nav li").click(function(){
-// $("#header-nav li").removeClass("active");
-// $(this).addClass("active");
-// });
-//
-//
-// $(".search_history").on("click", function(){
-// $("input[name='search_keyword']").val($(this).html());
-// header_search();
-// });
-// }
-//
-// function header_search(reactHeaderComponnet){
-// console.log(old_url)
-// var keyword = $("input[name='search_keyword']").val(); // 搜索关键字
-// window.location.href ="/search"+"?value="+keyword;
-// // if (!reactHeaderComponnet) {
-// // reactHeaderComponnet = window._header_componentHandler
-// // }
-// // if (!reactHeaderComponnet) {
-// // var index = $("#search_type").val(); // 搜索课程/项目
-// // keyword = encodeURIComponent(keyword);
-// // // $.get('/users/search_shixuns_or_course',
-// // // { search: keyword,
-// // // index: index});
-// // window.location.href = old_url+"/users/search_shixuns_or_courses" + "?search=" + keyword + "&index=" + index;
-// //e.stopPropagation();//阻止冒泡
-// // } else {
-// // window.__headSearchKeyword = keyword
-// // reactHeaderComponnet.props.history.push(`/shixuns`)
-// // trigger('searchKeywordChange', keyword)
-// // }
-// }
-// //头部导航条的隐藏
-// function closeSearch(){
-// $('#posi-search').hide();
-// $("#search-open").show();
-// // $(".posi-search").animate({opacity:"0"},800);
-// $(".HeaderSearch").hide();
-// $("#header-nav").animate({opacity:"1"},1000);
-// $(".posi-search").css("z-index","2");
-// $("#header-nav").css("z-index","3");
-// }
From 0144522d19fda2cf7835a234a80478bcc7e12b11 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, 24 Jul 2019 12:39:10 +0800
Subject: [PATCH 05/23] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/courses/new/CoursesNew.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js
index c5d0009c1..98b790659 100644
--- a/public/react/src/modules/courses/new/CoursesNew.js
+++ b/public/react/src/modules/courses/new/CoursesNew.js
@@ -88,11 +88,11 @@ class CoursesNew extends Component {
}
componentDidUpdate(prevProps){
- if(prevProps.current_user!=this.props.current_user){
- if(this.props.current_user.user_identity==="学生"){
- window.location.href ="/403"
- }
- }
+ // if(prevProps.current_user!=this.props.current_user){
+ // if(this.props.current_user.user_identity==="学生"){
+ // window.location.href ="/403"
+ // }
+ // }
}
onChangeTimepublishs = (date, dateString) => {
if(dateString===""){
From 2967988215dc15bfe1b0054ab2a4630cb7d9b949 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, 24 Jul 2019 12:50:52 +0800
Subject: [PATCH 06/23] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/login/LoginDialog.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/react/src/modules/login/LoginDialog.css b/public/react/src/modules/login/LoginDialog.css
index 34a711154..aba5596c5 100644
--- a/public/react/src/modules/login/LoginDialog.css
+++ b/public/react/src/modules/login/LoginDialog.css
@@ -9,7 +9,7 @@
/* z-index: 20000; */
}
#DialogID .dialogBox {
- width: 402px;
+ width: 400px;
}
.MuiPaper-elevation24-45{
box-shadow:none !important;
From 9204560e1fc5eb1132791c0ffd8d1ca04e79bb53 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, 24 Jul 2019 12:52:11 +0800
Subject: [PATCH 07/23] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/AppConfig.js | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index cf62730d7..02d8c2be5 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -2,7 +2,7 @@ import React from "react";
import axios from 'axios';
import { requestProxy } from "./indexEduplus2RequestProxy";
-import { broadcastChannelOnmessage ,SetAppModel, isDev, queryString} from 'educoder';
+import { broadcastChannelOnmessage ,SetAppModel} from 'educoder';
import { notification } from 'antd';
import './index.css'
broadcastChannelOnmessage('refreshPage', () => {
@@ -18,17 +18,10 @@ function locationurl(list){
}
// TODO 开发期多个身份切换
-let debugType = ""
-if (isDev) {
- const _search = window.location.search;
- let parsed = {};
- if (_search) {
- parsed = queryString.parse(_search);
- }
- debugType = window.location.search.indexOf('debug=t') != -1 ? "cxt" : ''
-}
-
-window._debugType = debugType;
+const debugType =""
+// window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
+// window.location.search.indexOf('debug=s') != -1 ? 'student' : 'admin'
+// window._debugType = debugType;
export function initAxiosInterceptors(props) {
// TODO 避免重复的请求 https://github.com/axios/axios#cancellation
@@ -119,7 +112,7 @@ export function initAxiosInterceptors(props) {
// https://github.com/axios/axios/issues/583
// message.info(response.data.message || '服务端返回status -1，请联系管理员。');
// props.showSnackbar( response.data.message || '服务器异常，请联系管理员。' )
- if (window.location.pathname.startsWith('/tasks/')) {
+ if (window.location.pathname.startsWith('/tasks/')) {
props.showSnackbar( response.data.message || '服务器异常，请联系管理员。' )
} else {
notification.open({
@@ -134,7 +127,7 @@ export function initAxiosInterceptors(props) {
// description: response.data.message || '服务器异常，请联系管理员。',
// });
}
-
+
throw new axios.Cancel('Operation canceled by the user.');
}
// if(response.data.status === 401){
@@ -142,7 +135,6 @@ export function initAxiosInterceptors(props) {
// }
if (response.data.status === 403) {
// props.history.replace('/403')
- debugger
// 这里会分2个情况，1、刚进入页面发请求返回的403；2、进入页面后，其他用户操作触发请求返回的403；
// TODO 这里做一个403弹框比较好？
locationurl('/403');
From 7e6d2290608560b5ec6c836391b42e3ecc03e2f8 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, 24 Jul 2019 12:52:55 +0800
Subject: [PATCH 08/23] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/courses/new/CoursesNew.js | 6 +++---
.../modules/courses/shixunHomework/ShixunhomeWorkItem.js | 2 +-
public/react/src/modules/login/LoginDialog.css | 2 +-
public/react/src/modules/login/Trialapplication.js | 2 +-
public/react/src/modules/login/Trialapplicationysl.js | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js
index 98b790659..1183b59e9 100644
--- a/public/react/src/modules/courses/new/CoursesNew.js
+++ b/public/react/src/modules/courses/new/CoursesNew.js
@@ -132,7 +132,7 @@ class CoursesNew extends Component {
e.preventDefault();
let coursesId = this.props.match.params.coursesId;
- let {is_public} = this.state
+ let {is_public,datatime} = this.state
// console.log(is_public)
if (coursesId != undefined) {
@@ -173,7 +173,7 @@ class CoursesNew extends Component {
// console.log('Received values of form: ', values);
- let {datatime} = this.state;
+
let url = "/courses/" + coursesId + ".json";
axios.put(url, {
course_list_name: values.course,
@@ -227,7 +227,7 @@ class CoursesNew extends Component {
// debugger
//新建
// console.log('Received values of form: ', values);
- let {datatime} = this.state;
+
let url = "/courses.json";
axios.post(url, {
course_list_name: values.course,
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index b4adea17f..61ed59d7b 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -382,7 +382,7 @@ class ShixunhomeWorkItem extends Component{
实训详情
{this.props.isAdminOrCreator()?this.editname(discussMessage.name,discussMessage.homework_id)} className={"btn colorblue ml20 font-16"}>重命名:""}
{/*
-
-
-
-this.Clickteacher("teacher")}>{gouxuans ==="teacher"? 
:
}老师
- this.Clickteacher("student")}>{gouxuans==="student"? :}学生
- this.Clickteacher("professional")}>{gouxuans==="professional"?:}专业人士
- 选择你可能感兴趣的内容
diff --git a/public/react/src/modules/user/InterestpageMax.js b/public/react/src/modules/user/InterestpageMax.js index 82b3e7e0f..a53c1bbe0 100644 --- a/public/react/src/modules/user/InterestpageMax.js +++ b/public/react/src/modules/user/InterestpageMax.js @@ -260,15 +260,15 @@ class InterestpageMax extends Component {this.Clickteacher("teacher")}>{gouxuans ==="teacher"? :}老师
- this.Clickteacher("student")}>{gouxuans==="student"? :}学生
- this.Clickteacher("professional")}>{gouxuans==="professional"?:}专业人士
- 选择你可能感兴趣的内容
From 3ad752994112c4903b8d9a75c885515b136b280b Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 24 Jul 2019 14:25:00 +0800
Subject: [PATCH 19/23] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=84=E6=B5=8B?=
=?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/myshixuns_controller.rb | 1 +
1 file changed, 1 insertion(+)
diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index 0a19f1c08..112b3352a 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -90,6 +90,7 @@ class MyshixunsController < ApplicationController
# params[:pics] = "a.png,b.png,c.png"
def training_task_status
+ logger.info("##################training_task_status_start#{jsonTestDetails['buildID']}")
ActiveRecord::Base.transaction do
begin
t1 = Time.now
From 88e839b48d754378b202482cf16c8785e75f0607 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Wed, 24 Jul 2019 14:28:18 +0800
Subject: [PATCH 20/23] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/departments_controller.rb | 2 +-
app/controllers/repertoires_controller.rb | 2 +-
app/controllers/schools_controller.rb | 2 +-
app/models/department.rb | 19 -------------------
app/models/repertoire.rb | 19 -------------------
app/models/school.rb | 22 ----------------------
6 files changed, 3 insertions(+), 63 deletions(-)
diff --git a/app/controllers/departments_controller.rb b/app/controllers/departments_controller.rb
index f0fa8fe2c..b6ebcb2ef 100644
--- a/app/controllers/departments_controller.rb
+++ b/app/controllers/departments_controller.rb
@@ -1,6 +1,6 @@
class DepartmentsController < ApplicationController
def for_option
- render_ok(departments: Department.cached_names_data(current_school))
+ render_ok(departments: current_school.departments.select(:id, :name).as_json)
end
private
diff --git a/app/controllers/repertoires_controller.rb b/app/controllers/repertoires_controller.rb
index 0ac78a15b..b62c94403 100644
--- a/app/controllers/repertoires_controller.rb
+++ b/app/controllers/repertoires_controller.rb
@@ -1,5 +1,5 @@
class RepertoiresController < ApplicationController
def index
- render_ok(repertoires: Repertoire.cache_data)
+ render_ok(repertoires: Repertoire.select(:id, :name).order(:created_at).as_json)
end
end
\ No newline at end of file
diff --git a/app/controllers/schools_controller.rb b/app/controllers/schools_controller.rb
index ea94f4c69..f0dd6dd75 100644
--- a/app/controllers/schools_controller.rb
+++ b/app/controllers/schools_controller.rb
@@ -11,6 +11,6 @@ class SchoolsController < ApplicationController
end
def for_option
- render_ok(schools: School.cached_names_data)
+ render_ok(schools: School.select(:id, :name).as_json)
end
end
diff --git a/app/models/department.rb b/app/models/department.rb
index c019862db..15a8a7c1b 100644
--- a/app/models/department.rb
+++ b/app/models/department.rb
@@ -2,23 +2,4 @@ class Department < ApplicationRecord
belongs_to :school
has_many :department_members, dependent: :destroy
-
- after_commit :reset_data_cache
-
- def self.cached_names_data(school)
- Rails.cache.fetch(names_data_cache_key(school.id), expires_in: 7.days) do
- school.departments.select(:id, :name).as_json
- end
- end
-
- private
-
- def reset_data_cache
- # 清除部门名称缓存
- Rails.cache.delete(self.class.names_data_cache_key(school_id))
- end
-
- def self.names_data_cache_key(school_id)
- "schools/#{school_id}/department_names_data"
- end
end
diff --git a/app/models/repertoire.rb b/app/models/repertoire.rb
index 140416658..72e1ebfff 100644
--- a/app/models/repertoire.rb
+++ b/app/models/repertoire.rb
@@ -3,23 +3,4 @@ class Repertoire < ApplicationRecord
has_many :tag_repertoires, through: :sub_repertoires
has_many :user_interests, dependent: :delete_all
-
- after_create_commit :reset_cache_data
- after_update_commit :reset_cache_data
-
- def self.cache_data
- Rails.cache.fetch(data_cache_key, expires_in: 1.days) do
- Repertoire.select(:id, :name).order(:created_at).as_json
- end
- end
-
- def self.data_cache_key
- 'repertoire/cache_data'
- end
-
- private
-
- def reset_cache_data
- Rails.cache.delete(self.class.data_cache_key)
- end
end
diff --git a/app/models/school.rb b/app/models/school.rb
index 983a93735..a0c829160 100644
--- a/app/models/school.rb
+++ b/app/models/school.rb
@@ -10,9 +10,6 @@ class School < ApplicationRecord
has_many :ec_major_schools, :dependent => :destroy
has_many :ec_majors, :through => :ec_major_schools
- after_create_commit :reset_data_cache
- after_update_commit :reset_data_cache
-
# 学校管理员
def manager?(user)
ec_school_users.exists?(user_id: user.id)
@@ -33,23 +30,4 @@ class School < ApplicationRecord
def manage_permission?(user)
manager?(user) || major_manager?(user) || course_manager?(user)
end
-
- def self.cached_names_data
- Rails.cache.fetch(names_data_cache_key, expires_in: 7.days) do
- School.select(:id, :name).as_json
- end
- end
-
- private
-
- def reset_data_cache
- # 清除学校名称缓存
- if new_record? || name_previously_changed?
- Rails.cache.delete(self.class.names_data_cache_key)
- end
- end
-
- def self.names_data_cache_key
- 'schools/names_data'
- end
end
From 9e331cba6da52bc17d3829bfe4aa939a25924f94 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Wed, 24 Jul 2019 14:42:40 +0800
Subject: [PATCH 21/23] =?UTF-8?q?=E8=AF=BE=E5=A0=82=E7=9A=84=E8=AE=BE?=
=?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/courses_controller.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 973e73dac..bb0737128 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -169,7 +169,7 @@ class CoursesController < ApplicationController
extra_params[:school_id] = @school.id
extra_params[:is_public] = params[:is_public].present? ? params[:is_public] : 0
- if @course.is_end && (course_params[:end_date].nil? || course_params[:end_date].to_date > Date.today)
+ if @course.is_end && (course_params[:end_date].blank? || course_params[:end_date].to_date > Date.today)
extra_params[:is_end] = 0
elsif !@course.is_end && !course_params[:end_date].blank? && course_params[:end_date].to_date < Date.today
extra_params[:is_end] = 1
From ce81fb2a3013ec2059ae703de3c8f0d783fa0df2 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 24 Jul 2019 14:46:31 +0800
Subject: [PATCH 22/23] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/myshixuns_controller.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index e1d6fe0cb..7403cfc4d 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -90,7 +90,7 @@ class MyshixunsController < ApplicationController
# params[:pics] = "a.png,b.png,c.png"
def training_task_status
- logger.info("##################training_task_status_start#{jsonTestDetails['buildID']}")
+ logger.info("##################training_task_status_start#{params[:jsonTestDetails]['buildID']}")
ActiveRecord::Base.transaction do
begin
t1 = Time.now
From 1bc1866b0fc9bb02c4dce07309824a7fd7586cf7 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 24 Jul 2019 14:49:48 +0800
Subject: [PATCH 23/23] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?=
=?UTF-8?q?=E5=AE=9A=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/myshixuns_controller.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index 7403cfc4d..169f689f6 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -90,7 +90,7 @@ class MyshixunsController < ApplicationController
# params[:pics] = "a.png,b.png,c.png"
def training_task_status
- logger.info("##################training_task_status_start#{params[:jsonTestDetails]['buildID']}")
+ logger.info("##################training_task_status_start#{params[:jsonTestDetails][:buildID]}")
ActiveRecord::Base.transaction do
begin
t1 = Time.now