m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
issues25489
杨树林 5 years ago
parent 1888c7f850 bcd390178d
commit 4b84d37825
36 changed files with 759 additions and 689 deletions
Show Stats Download Patch File Download Diff File

4
.gitignore vendored
Unescape View File

@ -7,6 +7,10 @@
# Ignore bundler config.
/.bundle
# Ignore lock config file
*.lock
*.log
# mac
*.DS_Store

10
app/controllers/accounts_controller.rb
Unescape View File

@ -78,12 +78,12 @@ 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
login_control.increment!
return normal_status(-2, "错误的账号或密码")
return normal_status(-2, "你已经输错密码#{login_control.error_times}次，还剩余#{login_control.remain_times}次机会")
end
successful_authentication(@user)
@ -111,9 +111,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("密码重置失败")

22
app/controllers/trustie_hacks_controller.rb
Unescape View File

@ -8,8 +8,13 @@ class TrustieHacksController < ApplicationController
## 分页参数
page = params[:page] || 1
limit = params[:limit] || 16
search = params[:search]
hacks = @hackathon.trustie_hacks
if search
hacks = hacks.where("name like ?", "%#{search}%")
end
@hackathon_users_count = hacks ? 0 : hacks.sum(:hack_users_count)
@hacks = hacks.page(page).per(limit)
@ -28,6 +33,11 @@ class TrustieHacksController < ApplicationController
render_ok
end
def destroy
@hack.destroy
render_ok
end
def edit_hackathon
end
@ -36,6 +46,16 @@ class TrustieHacksController < ApplicationController
render_ok
end
# 报名入口
def entry
if @hack.hack_users.exists?(user_id: current_user)
render_error('已经报名，请勿重复操作')
else
@hack.hack_users.create(user_id: current_user)
render_ok
end
end
private

8
app/libs/limit_forbid_control/base.rb
Unescape View File

@ -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)

2
app/libs/limit_forbid_control/user_login.rb
Unescape View File

@ -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

5
app/models/trustie_hack.rb
Unescape View File

@ -1,4 +1,9 @@
class TrustieHack < ApplicationRecord
has_many :hack_users, :dependent => :destroy
belongs_to :trustie_hackathon, counter_cache: true
def entry_info(user_id)
hack_users.exists?(user_id: user_id)
end
end

2
app/views/admins/myshixuns/shared/_list.html.erb
Unescape View File

@ -20,7 +20,7 @@
<td><%= myshixun.identifier %></td>
<td class="text-left">
<% current_task = myshixun.last_executable_task || myshixun.last_task %>
<%= link_to "/myshixuns/#{myshixun.identifier}/stages/#{current_task.identifier}", target: '_blank' do %>
<%= link_to "/tasks/#{current_task.identifier}", target: '_blank' do %>
<%= overflow_hidden_span myshixun.shixun.name, width: 280 %>
<% end %>
</td>

1
app/views/trustie_hacks/index.json.jbuilder
Unescape View File

@ -5,5 +5,6 @@ end
json.hacks @hacks do |hack|
json.(hack, :id, :name, :description, :hack_users_count)
json.entry_info hack.entry_info(current_user.id)
end

4
config/routes.rb
Unescape View File

@ -880,7 +880,9 @@ Rails.application.routes.draw do
get :edit_hackathon
post :update_hackathon
end
member do
post :entry
end
end
end

5
db/migrate/20191106061342_add_uniq_index_for_hack_users.rb
Unescape View File

@ -0,0 +1,5 @@
class AddUniqIndexForHackUsers < ActiveRecord::Migration[5.2]
def change
add_index :hack_users, [:user_id, :trustie_hack_id], unique: true
end
end

14
public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfdownload.js
Unescape View File

@ -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,

13
public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js
Unescape View File

@ -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,

2
public/react/src/modules/courses/busyWork/CommonWorkAnswer.js
Unescape View File

@ -1,4 +1,4 @@
import React,{Component} from "React";
import React,{Component} from "react";
import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip} from "antd";
import {Link} from 'react-router-dom';
import locale from 'antd/lib/date-picker/locale/zh_CN';

2
public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
Unescape View File

@ -1,4 +1,4 @@
import React,{Component} from "React";
import React,{Component} from "react";
import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip} from "antd";
import {Link} from 'react-router-dom';
import locale from 'antd/lib/date-picker/locale/zh_CN';

2
public/react/src/modules/courses/busyWork/CommonWorkList.js
Unescape View File

@ -1,4 +1,4 @@
import React,{Component} from "React";
import React,{Component} from "react";
import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip,Spin, Pagination} from "antd";
import {Link} from 'react-router-dom';
import locale from 'antd/lib/date-picker/locale/zh_CN';

2
public/react/src/modules/courses/busyWork/CommonWorkListTemplate.js
Unescape View File

@ -1,4 +1,4 @@
import React,{Component} from "React";
import React,{Component} from "react";
import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip} from "antd";
import {Link} from 'react-router-dom';
import locale from 'antd/lib/date-picker/locale/zh_CN';

2
public/react/src/modules/courses/busyWork/CommonWorkPost.js
Unescape View File

@ -1,4 +1,4 @@
import React,{Component} from "React";
import React,{Component} from "react";
import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal,Tooltip} from "antd";
import {Link} from 'react-router-dom';
import axios from 'axios';

2
public/react/src/modules/courses/busyWork/CommonWorkQuestion.js
Unescape View File

@ -1,4 +1,4 @@
import React,{Component} from "React";
import React,{Component} from "react";
import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip} from "antd";
import {Link} from 'react-router-dom';
import locale from 'antd/lib/date-picker/locale/zh_CN';

2
public/react/src/modules/courses/busyWork/CommonWorkSetting.js
Unescape View File

@ -1,4 +1,4 @@
import React,{Component} from "React";
import React,{Component} from "react";
import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip} from "antd";
import {Link} from 'react-router-dom';
import locale from 'antd/lib/date-picker/locale/zh_CN';

2
public/react/src/modules/courses/busyWork/common/LeaderIcon.js
Unescape View File

@ -1,4 +1,4 @@
import React,{Component} from "React";
import React,{Component} from "react";
export default function LeaderIcon(props = {}) {
let icon = null;

2
public/react/src/modules/courses/busyWork/common/TabRightComponents.js
Unescape View File

@ -1,4 +1,4 @@
import React,{Component} from "React";
import React,{Component} from "react";
import { Form, Select, Input, Button,Checkbox,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip} from "antd";
import {Link} from 'react-router-dom';
import { WordsBtn, MarkdownToHtml } from 'educoder';

2
public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
Unescape View File

@ -1,4 +1,4 @@
import React,{Component} from "React";
import React,{Component} from "react";
import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip} from "antd";
import {Link} from 'react-router-dom';
import locale from 'antd/lib/date-picker/locale/zh_CN';

2
public/react/src/modules/courses/exercise/Ecercisemount.js
Unescape View File

@ -1,4 +1,4 @@
import React,{Component} from "React";
import React,{Component} from "react";
import { Form, Select, Input, Button,Checkbox,DatePicker} from "antd";
import locale from 'antd/lib/date-picker/locale/zh_CN';

2
public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
Unescape View File

@ -1,4 +1,4 @@
import React,{Component} from "React";
import React,{Component} from "react";
import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal,Spin,Tooltip} from "antd";
import {Link} from 'react-router-dom';
import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';

3
public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
Unescape View File

@ -1,4 +1,5 @@
import React,{Component} from "React";
import React,{Component} from "react";
import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal,Tooltip,Spin} from "antd";
import {Link} from 'react-router-dom';
import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';

2
public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
Unescape View File

@ -1,4 +1,4 @@
import React,{Component} from "React";
import React,{Component} from "react";
import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag} from "antd";
import {Link} from 'react-router-dom';
import { WordsBtn,markdownToHTML } from 'educoder';

2
public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
Unescape View File

@ -1,4 +1,4 @@
import React,{Component} from "React";
import React,{Component} from "react";
import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal} from "antd";
import {Link} from 'react-router-dom';
import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';

2
public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
Unescape View File

@ -1,4 +1,4 @@
import React, {Component} from "React";
import React, {Component} from "react";
import {Form, Select, Input, Button, Checkbox, Upload, Icon, message, Modal} from "antd";
import {Link} from 'react-router-dom';
import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';

2
public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
Unescape View File

@ -1,4 +1,4 @@
import React,{Component} from "React";
import React,{Component} from "react";
import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip} from "antd";
import {Link} from 'react-router-dom';
import locale from 'antd/lib/date-picker/locale/zh_CN';

2
public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
Unescape View File

@ -1,4 +1,4 @@
import React,{Component} from "React";
import React,{Component} from "react";
import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal,Pagination, Table, Divider, Tag,Tooltip} from "antd";
import {Link} from 'react-router-dom';
import {getImageUrl, NoneData, sortDirections} from 'educoder';

2
public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
Unescape View File

@ -1,4 +1,4 @@
import React,{Component} from "React";
import React,{Component} from "react";
import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag} from "antd";
import {Link} from 'react-router-dom';
import { WordsBtn,markdownToHTML,AttachmentList} from 'educoder';

5
public/react/src/modules/courses/members/studentsList.js
Unescape View File

@ -26,7 +26,7 @@ const buildColumns = (that,isParent) => {
let showSorter = isParent==true
const courseId = that.props.match.params.coursesId
const columns=[{
title: '序号1',
title: '序号',
dataIndex: 'id',
key: 'id',
align:'center',
@ -106,8 +106,9 @@ const buildColumns = (that,isParent) => {
}
}
];
if (course_groups && course_groups.length) {
this.isStudentPage && columns.push({
that.isStudentPage && columns.push({
title: '分班',
dataIndex: 'course_group_name',
key: 'course_group_name',

2
public/react/src/modules/courses/new/CoursesNew.js
Unescape View File

@ -1,4 +1,4 @@
import React, {Component} from "React";
import React, {Component} from "react";
import {Form, Select, Input, Button, Checkbox, DatePicker,Spin,Icon,AutoComplete,InputNumber,Breadcrumb} from "antd";
import ApplyForAddOrgModal from '../../user/modal/ApplyForAddOrgModal';
import axios from 'axios';

2
public/react/src/modules/courses/new/Goldsubject.js
Unescape View File

@ -1,4 +1,4 @@
import React, {Component} from "React";
import React, {Component} from "react";
import {Form, Select, Input, Button, Checkbox, DatePicker,Spin,Icon,AutoComplete,InputNumber,Breadcrumb} from "antd";
import ApplyForAddOrgModal from '../../user/modal/ApplyForAddOrgModal';
import axios from 'axios';

2
public/react/src/modules/courses/studentWork/StudentHomework.js
Unescape View File

@ -1,4 +1,4 @@
import React,{Component} from "React";
import React,{Component} from "react";
import { Form, Select, Input, Button,Checkbox,DatePicker} from "antd";
import locale from 'antd/lib/date-picker/locale/zh_CN';

6
public/react/src/modules/user/modal/RealNameCertificationModal.js
Unescape View File

@ -2,7 +2,7 @@ import React, { Component } from "react";
import { message, Icon, Input, Form, Upload,Radio ,Tooltip} from "antd";
import axios from 'axios'
import ModalWrapper from "../../courses/common/ModalWrapper"
import { City, getUploadActionUrl, getImageUrl, ImageLayer2, getUploadActionUrlOfAuth ,ConditionToolTip } from 'educoder'
import { getUploadActionUrl, ImageLayer2 ,ConditionToolTip } from 'educoder'
import '../account/common.css'
import AccountBasicEditItem from '../account/AccountBasicEditItem'
import ApplyForAddOrgModal from './ApplyForAddOrgModal'
@ -469,12 +469,12 @@ class RealNameCertificationModal extends Component{
showApplyForAddChildOrgModal:this.showApplyForAddChildOrgModal
}
const uploadProps2 = {
name: 'image',
// name: 'image',
data: {type: certification == 1 ? "real_name" : "professional"},
multiple: true,
showUploadList: false,
// https://newweb.educoder.net
action: this.props.current_user ? `${getUploadActionUrlOfAuth(this.props.current_user.login)}` : '',
action: this.props.current_user ? `${getUploadActionUrl()}` : '',
className: 'idPic-uploader',
onChange: this.handleChange2,
};

Write Preview
Loading…
Cancel
Save