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

app/controllers/accounts_controller.rb

@@ -78,12 +78,17 @@ class AccountsController < ApplicationController
     return normal_status(-2, "违反平台使用规范，账号已被锁定") if @user.locked?
 
     login_control = LimitForbidControl::UserLogin.new(@user)
-    return normal_status(-2, "登录密码出错已达上限，将锁定密码1小时") if login_control.forbid?
+    return normal_status(-2, "登录密码出错已达上限，账号已被锁定, 请#{login_control.forbid_expires/60}分钟后重新登录或找回登录密码,") if login_control.forbid?
 
     password_ok = @user.check_password?(params[:password].to_s)
     unless password_ok
+      if login_control.remain_times-1 == 0
+        normal_status(-2, "连续输错密码达到#{login_control.error_times+1}次，账号将被锁定")
+      else
+        normal_status(-2, "你已经输错密码#{login_control.error_times+1}次，还剩余#{login_control.remain_times-1}次机会")
+      end
       login_control.increment!
-      return normal_status(-2, "错误的账号或密码")
+      return
     end
 
     successful_authentication(@user)
@@ -111,9 +116,11 @@ class AccountsController < ApplicationController
       return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
 
       user.password, user.password_confirmation = params[:new_password], params[:new_password_confirmation]
-      if user.save!
-        sucess_status
+      ActiveRecord::Base.transaction do
+        user.save!
+        LimitForbidControl::UserLogin.new(user).clear
       end
+      sucess_status
     rescue Exception => e
       uid_logger_error(e.message)
       tip_exception("密码重置失败")

app/libs/limit_forbid_control/base.rb

@@ -40,6 +40,14 @@ class LimitForbidControl::Base
     end
   end
 
+  def error_times
+    Rails.cache.read(cache_key).to_i
+  end
+
+  def remain_times
+    allow_times - error_times
+  end
+
   def clear
     Rails.logger.info("[LimitForbidControl] Clear #{cache_key}")
     Rails.cache.delete(forbid_cache_key)

app/libs/limit_forbid_control/user_login.rb

@@ -12,7 +12,7 @@ class LimitForbidControl::UserLogin < LimitForbidControl::Base
 
   def forbid_expires
     num = EduSetting.get('daily_error_password_forbid_time').presence.to_i
-    num.zero? ? 1.hours : num.to_i.hours
+    num.zero? ? 1.hours : num.to_i.minutes
   end
 
   def cumulative_expires

public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css

@@ -400,3 +400,7 @@
 .color000{
     color: #000;
 }
+
+.cursorpointer{
+    cursor: pointer;
+}

public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js

@@ -224,6 +224,18 @@ class CompetitionCommon extends Component{
 			Competitionedittype:false
 		})
 
+	}
+	newgotocourse=(url)=>{
+		if(this.props.checkIfLogin()===false){
+			this.props.showLoginDialog()
+			return
+		}
+		if(this.props.checkIfProfileCompleted()===false){
+			this.props.showProfileCompleteDialog()
+			return
+		}
+		window.open(url);
+
 	}
 
 	gotocourse=(url)=>{
@@ -255,7 +267,9 @@ class CompetitionCommon extends Component{
 					).then((response) => {
 						if (response.data.status === 0) {
 							// this.props.history.replace();
-							this.Personalregistration(`/courses/${data.course_id}`)
+							this.getbannerdata()
+							window.open(`/courses/${data.course_id}`);
+
 						}
 					})
 
@@ -267,7 +281,7 @@ class CompetitionCommon extends Component{
 				let urls = `/competitions/${this.props.match.params.identifier}/enroll`;
 				this.Personalregistration(urls)
 			} else {
-				this.props.history.replace(url);
+				window.open(url);
 			}
 
 		}
@@ -293,6 +307,7 @@ class CompetitionCommon extends Component{
 				if (response.data) {
 					this.props.showNotification(`报名成功,预祝您夺得桂冠!`);
 					// this.props.history.replace(urls);
+					this.getbannerdata()
 					window.open(urls)
 				}
 			}
@@ -379,8 +394,24 @@ class CompetitionCommon extends Component{
 											className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">{data.competition_status === "nearly_published" ? "--" : data && data.visits_count}</div>
 									</Col>
 									<Col className="gutter-row rankbeicenter" span={6}>
+
+										{data.competition_status === "ended" ?
+												<div className={data.mode === 2 ?data.member_of_course==true?"gutter-box CompetitionsIndexbottomvalue Competitioncolor516 cursorpointer":"gutter-box CompetitionsIndexbottomvalue Competitioncolor516":"gutter-box CompetitionsIndexbottomvalue Competitioncolor516 cursorpointer"}
+													// 已结束onClick={data.competition_status === "nearly_published" ? "" : () => this.gotocourse(`/competitions/${this.props.match.params.identifier}/enroll`)}
+													onClick={	data.mode === 2 ?data.member_of_course==true?() => this.newgotocourse(`/courses/${data.course_id}`):"":() => this.newgotocourse(`/competitions/${this.props.match.params.identifier}/enroll`)}
+												>{data && data.member_count}</div>
+										 :data.competition_status === "nearly_published" ?
 												<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516"
-												 onClick={data.competition_status === "nearly_published" ? "" : () => this.gotocourse(`/competitions/${this.props.match.params.identifier}/enroll`)}>{data.competition_status === "nearly_published" ? "--" : data && data.member_count}</div>
+													// onClick={data.competition_status === "nearly_published" ? "" : () => this.gotocourse(`/competitions/${this.props.match.params.identifier}/enroll`)}
+												>{"--"}</div> :
+												data.competition_status === "progressing" ?
+												data.mode === 2 ?
+													<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516 cursorpointer" onClick={() => this.gotocourse()}>{data && data.member_count}</div> : signupdata && signupdata.personal === true ?
+														<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516 cursorpointer" onClick={() => this.gotocourse("personal")}>{data && data.member_count}</div> : <div
+															className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516 cursorpointer"
+															onClick={() => this.gotocourse(`/competitions/${this.props.match.params.identifier}/enroll`)}>{data && data.member_count}</div>
+											:""}
+
 									</Col>
 								</Row>
 							</Col>

public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfdownload.js

@@ -18,7 +18,18 @@ class CompetitionContentspdfdownload extends Component{
 	componentDidMount(){
 		window.document.title = '竞赛';
 		let url=`/competitions/${this.props.match.params.identifier}/prize.json`;
-		axios.get(url).then((response) => {
+		let query=this.props.location&&this.props.location.search;
+		const types = query.split('user_id=')
+		let userid;
+    if(types[1]===undefined){
+			userid=this.props.user&&this.props.user.user_id;
+		}else{
+			userid=types[1];
+		}
+		axios.get(url,{params:{
+				user_id:userid,
+			}
+		}).then((response) => {
 			if(response.status===200){
 
 				let datas=response.data.teams;
@@ -33,7 +44,6 @@ class CompetitionContentspdfdownload extends Component{
 						}
 					})
 				}
-
 				this.setState({
 					data:response.data,
 					teams:datas,

public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js

@@ -39,7 +39,18 @@ class CompetitionContentspdfpeopledata extends Component {
 
 	GetawardinformationAPI = () => {
 		let url = `/competitions/${this.props.match.params.identifier}/prize.json`;
-		axios.get(url).then((result) => {
+		let query=this.props.location&&this.props.location.search;
+		const types = query.split('user_id=')
+		let userid;
+		if(types[1]===undefined){
+			userid=this.props.user&&this.props.user.user_id;
+		}else{
+			userid=types[1];
+		}
+		axios.get(url,{params:{
+				user_id:userid,
+			}
+		}).then((result) => {
 			if (result.data) {
 				this.setState({
 					formationdata: result.data.formationdata,