Merge branches 'dev_aliyun', 'develop' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

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

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)

public/react/src/modules/user/Interestpage.js

@@ -258,15 +258,15 @@ class InterestpageComponent extends Component {
 					<div className="ysldivhome1" >
           <div className="ysldivhomediv" style={{marginLeft:"30px"}} >
 					<div className="ysldivhomedivtxt" onClick={()=>this.Clickteacher("teacher")}>{gouxuans ==="teacher"? <img src={gouxuan} className="gouxuanimg"/>:<img className="gouxuanimg" src={meigouxuan}/>}老师</div>
-						<div className="ysldivhomedivimgsy" ><img src={skzbdx} className="ysldivhomedivimg"/></div>
+						<div className="ysldivhomedivimgsy" ><img onClick={()=>this.Clickteacher("teacher")} src={skzbdx} className="ysldivhomedivimg"/></div>
           </div>
           <div className="ysldivhomediv" style={{ marginLeft:"101px",marginRight:"101px"}}>
 						<div className="ysldivhomedivtxt" onClick={()=>this.Clickteacher("student")}>{gouxuans==="student"? <img src={gouxuan} className="gouxuanimg"/>:<img className="gouxuanimg" src={meigouxuan}/>}学生</div>
-						<div className="ysldivhomedivimgsy"><img src={mytc} className="ysldivhomedivimg"/></div>
+						<div className="ysldivhomedivimgsy"><img onClick={()=>this.Clickteacher("student")} src={mytc} className="ysldivhomedivimg"/></div>
           </div>
           <div className="ysldivhomediv" >
 						<div className="ysldivhomedivtxt" onClick={()=>this.Clickteacher("professional")}>{gouxuans==="professional"?<img src={gouxuan} className="gouxuanimg"/>:<img className="gouxuanimg" src={meigouxuan}/>}专业人士</div>
-						<div className="ysldivhomedivimgsy"><img src={zyrs1} className="ysldivhomedivimg"/></div>
+						<div className="ysldivhomedivimgsy"><img  onClick={()=>this.Clickteacher("professional")} src={zyrs1} className="ysldivhomedivimg"/></div>
           </div>
 					</div>
 					 <p className="yslspans2">选择你可能感兴趣的内容</p>

public/react/src/modules/user/InterestpageMax.js

@@ -260,15 +260,15 @@ class InterestpageMax extends Component {
 					<div className="ysldivhome12" >
 						<div className="ysldivhomediv222" style={{marginLeft:"30px"}} >
 							<div className="ysldivhomedivtxt2" onClick={()=>this.Clickteacher("teacher")}>{gouxuans ==="teacher"? <img src={gouxuan} className="gouxuanimg2"/>:<img className="gouxuanimg2" src={meigouxuan}/>}老师</div>
-							<div className="ysldivhomedivimg2" ><img src={skzbdx} className="ysldivhomedivimg2"/></div>
+							<div className="ysldivhomedivimg2"  ><img  onClick={()=>this.Clickteacher("teacher")} src={skzbdx} className="ysldivhomedivimg2"/></div>
 						</div>
 						<div className="ysldivhomediv222" style={{ marginLeft:"101px",marginRight:"101px"}}>
 							<div className="ysldivhomedivtxt2" onClick={()=>this.Clickteacher("student")}>{gouxuans==="student"? <img src={gouxuan} className="gouxuanimg2"/>:<img className="gouxuanimg2" src={meigouxuan}/>}学生</div>
-							<div className="ysldivhomedivimg2"><img src={mytc} className="ysldivhomedivimg2"/></div>
+							<div className="ysldivhomedivimg2"><img onClick={()=>this.Clickteacher("student")} src={mytc} className="ysldivhomedivimg2"/></div>
 						</div>
 						<div className="ysldivhomediv222" >
 							<div className="ysldivhomedivtxt2" onClick={()=>this.Clickteacher("professional")}>{gouxuans==="professional"?<img src={gouxuan} className="gouxuanimg2"/>:<img className="gouxuanimg2" src={meigouxuan}/>}专业人士</div>
-							<div className="ysldivhomedivimg2"><img src={zyrs1} className="ysldivhomedivimg2"/></div>
+							<div className="ysldivhomedivimg2"><img onClick={()=>this.Clickteacher("professional")} src={zyrs1} className="ysldivhomedivimg2"/></div>
 						</div>
 					</div>
 					<div><span className="yslspans22">选择你可能感兴趣的内容</span></div>