From 1bac1d6f0d6a36398f72774bd2af66bbd08b3429 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Fri, 16 Aug 2019 17:25:02 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/public_course.rake | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/lib/tasks/public_course.rake b/lib/tasks/public_course.rake index 13ef7b2e7..af94bf708 100644 --- a/lib/tasks/public_course.rake +++ b/lib/tasks/public_course.rake @@ -48,21 +48,11 @@ namespace :public_course do end end - # - task :message => :environment do - discusses = Discuss.find_by_sql("select content, user_id, created_on, updated_on from discusses where dis_id in (select shixun_id from stage_shixuns where - stage_id in (select id from stages where subject_id=#{subject_id})) and created_at > #{start_time} and - created_at<#{end_time}") - discusses.find_each do |discuss| - puts discuss.user_id - puts discuss.content - # 回复帖子 - # 讨论区发布帖子 - # Message.create!(board: @message.board, root_id: @message.root_id || @message.id, - # author: current_user, parent: @message, - # message_detail_attributes: { - # content: params[:content] - # }) + task :test_user => :environment do + users = User.where(is_test: true) + users.find_each do |user| + puts user.id + CourseMember.create!(course_id: course_id, user_id: user.id, role: 4) end end @@ -78,6 +68,11 @@ namespace :public_course do case type.to_i when 1 # 讨论区 + created_on = random_time start_time, end_time + messages = Message.where(board_id: course.boards) + message_details = MessageDetail.where(message_id: messages) + messages.update_columns(created_on: created_on, updated_on: created_on) + message_details.update_columns(created_at: created_at, updated_at: updated_at) when 2 # 作业 From d203a381099e54e749ff5a3eeb00db5a2eb833c9 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Mon, 19 Aug 2019 11:33:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/excellent_course_exercise.rake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/tasks/excellent_course_exercise.rake b/lib/tasks/excellent_course_exercise.rake index 964951003..d337fbd73 100644 --- a/lib/tasks/excellent_course_exercise.rake +++ b/lib/tasks/excellent_course_exercise.rake @@ -35,9 +35,9 @@ namespace :excellent_course_exercise do members.each_with_index do |member, index| exercise_user = exercise.exercise_users.where(user_id: member.user_id).take if exercise_question_ids.length == 20 - rand_num = index < pass_count - 1 ? 20 : rand(1..16) + rand_num = index < pass_count - 1 ? rand(15..20) : rand(1..10) elsif exercise_question_ids.length == 17 - rand_num = index < pass_count - 1 ? rand(13..17) : rand(1..11) + rand_num = index < pass_count - 1 ? rand(12..17) : rand(1..9) elsif exercise_question_ids.length == 39 rand_num = index < pass_count - 1 ? rand(30..39) : rand(1..18) else From 8dd91b036c2787681d75622f8615024d3a230739 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Mon, 19 Aug 2019 13:53:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/public_course.rake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/tasks/public_course.rake b/lib/tasks/public_course.rake index af94bf708..0f10b84ad 100644 --- a/lib/tasks/public_course.rake +++ b/lib/tasks/public_course.rake @@ -58,7 +58,7 @@ namespace :public_course do # 更新某个课程的某类时间 - # 执行示例 bundle exec rake public_course:student args=2903,1 + # 执行示例 bundle exec rake public_course:time args=-1,2932,1,1 task :time => :environment do # course_id = ENV['args'].split(",")[0] # 对应课堂的id # type = ENV['args'].split(",")[1] @@ -72,7 +72,7 @@ namespace :public_course do messages = Message.where(board_id: course.boards) message_details = MessageDetail.where(message_id: messages) messages.update_columns(created_on: created_on, updated_on: created_on) - message_details.update_columns(created_at: created_at, updated_at: updated_at) + message_details.update_columns(created_at: created_on, updated_at: created_on) when 2 # 作业 From f461ffe1ed063ac8c7a419e8d26519d86bc4f5ef Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Tue, 20 Aug 2019 09:32:03 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/public_course.rake | 12 ++--- lib/tasks/user.rake | 86 ++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 6 deletions(-) create mode 100644 lib/tasks/user.rake diff --git a/lib/tasks/public_course.rake b/lib/tasks/public_course.rake index 0f10b84ad..6a16fcd3b 100644 --- a/lib/tasks/public_course.rake +++ b/lib/tasks/public_course.rake @@ -58,7 +58,7 @@ namespace :public_course do # 更新某个课程的某类时间 - # 执行示例 bundle exec rake public_course:time args=-1,2932,1,1 + # 执行示例 RAILS_ENV=production bundle exec rake public_course:time args=-1,2932,1,1 task :time => :environment do # course_id = ENV['args'].split(",")[0] # 对应课堂的id # type = ENV['args'].split(",")[1] @@ -70,13 +70,13 @@ namespace :public_course do # 讨论区 created_on = random_time start_time, end_time messages = Message.where(board_id: course.boards) - message_details = MessageDetail.where(message_id: messages) - messages.update_columns(created_on: created_on, updated_on: created_on) - message_details.update_columns(created_at: created_on, updated_at: created_on) - + messages.each do |message| + message.update_columns(created_on: created_on, updated_on: created_on) + MessageDetail.where(message_id: message.id).update_all(created_at: created_on, updated_at: created_on) + end when 2 # 作业 - course.homework_commons.each do |homework| + course.homework_commons.each do |homework| created_at = random_time(start_time, end_time) publish_time = random_larger_time created_at, start_time, end_time end_time = random_larger_time publish_time, start_time, end_time diff --git a/lib/tasks/user.rake b/lib/tasks/user.rake new file mode 100644 index 000000000..8cd1d90ae --- /dev/null +++ b/lib/tasks/user.rake @@ -0,0 +1,86 @@ +# add test user +namespace :sync do + task :add_user => :environment do + DCODES = %W(2 3 4 5 6 7 8 9 a b c f e f g h i j k l m n o p q r s t u v w x y z) + user_count = ENV['args'].split(",")[0].to_i # 用户数 + rand_chart = ENV['args'].split(",")[1] # 手机号或者邮箱等前面的随机数 + + puts rand_chart + puts user_count + + (1..user_count).each do |i| + puts i + + no = sprintf("%04d", i) + phone = "#{rand_chart}160731#{no}" + mail = "#{rand_chart}#{no}@educoder.net" + code = generate_identifier User, 8 + login = "m" + code + + + l = "赵,钱,孙,李,周,吴,郑,王,冯,陈,褚,卫,蒋,沈,韩,杨,朱,秦,尤,许,何,吕,施,张,孔,曹,严,华,金,魏,陶,姜,黄".split(",") + f = "爱童,安妮,若婷,安煜,博,雷,梅,静,士红,大龙,冰波,慧娟,梅,婧婧,军,淋,真,维,涛,程程, + 谷南,慕儿,夏岚,友儿,小萱,紫青,妙菱,冬寒,曼柔,语蝶,青筠,夜安,觅海,问安,晓槐,雅山,访云,翠容,寒凡,晓绿,以菱, + 冬云,含玉,访枫,含卉,夜白,冷安,灵竹,醉薇,元珊,幻波,盼夏,元瑶,迎曼,水云,访琴,谷波,乐之,笑白,之山,妙海,紫霜, + 平夏,凌旋,孤丝,怜寒,向萍,凡松,青丝,翠安,如天,凌雪,绮菱,代云,南莲,寻南,春文,香薇,冬灵,凌珍,采绿,天春,沛文, + 紫槐,幻柏,采文,春梅,雪旋,盼海,映梦,安雁,映容,凝阳,访风,天亦,平绿,盼香,觅风,小霜,雪萍,半雪,山柳,谷雪,靖易, + 白薇,梦菡,飞绿,如波,又晴,友易,香菱,冬亦,问,妙春,海冬,半安,平春,幼柏,秋灵,凝芙,念烟,白山,从灵,尔芙,迎蓉, + 念寒,翠绿,翠芙,靖儿,妙柏,千凝,小珍,天巧,妙旋,雪枫,夏菡,元绿,痴灵,绮琴,雨双,听枫,觅荷,凡之,晓凡,雅彤,香薇, + 孤风,从安,绮彤,之玉,雨珍,幻丝,代梅,香波,青亦,元菱,海瑶,飞槐,听露,梦岚,幻竹,新冬,盼翠,谷云".split(",") + + lastname = l[rand(l.length)].strip + f[rand(f.length)].strip + + edit_params = { + login: login, + admin: false, + type: User, + phone: phone, + lastname: lastname, + mail: mail, + authentication: 1, + professional_certification: 1, + profile_completed: true, + is_test: true + } + User.create!(edit_params) + puts "aa" + UserExtension.create!(user_id: @user.id, school_id: 117) + puts i + end + + + user = User.new(admin: false, login: login, mail: email, phone: phone, type: "User") + user.password = "edu12345678" + # 现在因为是验证码，所以在注册的时候就可以激活 + user.status = 1 + # 必须要用save操作，密码的保存是在users中 + if user.save! + # todo user_extension + UserExtension.create!(user_id: @user.id) + + # 注册时，记录是否是引流用户 + ip = request.remote_ip + ua = UserAgent.find_by_ip(ip) + ua.update_column(:agent_type, UserAgent::USER_REGISTER) if ua + successful_authentication(@user) + session[:user_id] = @user.id + normal_status("注册成功") + end + end + + # 随机生成字符 + def generate_identifier(container, num) + code = DCODES.sample(num).join + if container == User + while container.exists?(login: code) do + code = DCODES.sample(num).join + end + else + while container.exists?(identifier: code) do + code = DCODES.sample(num).join + end + end + code + end + +end \ No newline at end of file From d6427285884987bf2f579437eb2d14d3060e0108 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Tue, 20 Aug 2019 10:19:01 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/user.rake | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/lib/tasks/user.rake b/lib/tasks/user.rake index 8cd1d90ae..7e2cd2c57 100644 --- a/lib/tasks/user.rake +++ b/lib/tasks/user.rake @@ -42,30 +42,11 @@ namespace :sync do profile_completed: true, is_test: true } - User.create!(edit_params) + user = User.create!(edit_params) puts "aa" - UserExtension.create!(user_id: @user.id, school_id: 117) + UserExtension.create!(user_id: user.id, school_id: 117) puts i end - - - user = User.new(admin: false, login: login, mail: email, phone: phone, type: "User") - user.password = "edu12345678" - # 现在因为是验证码，所以在注册的时候就可以激活 - user.status = 1 - # 必须要用save操作，密码的保存是在users中 - if user.save! - # todo user_extension - UserExtension.create!(user_id: @user.id) - - # 注册时，记录是否是引流用户 - ip = request.remote_ip - ua = UserAgent.find_by_ip(ip) - ua.update_column(:agent_type, UserAgent::USER_REGISTER) if ua - successful_authentication(@user) - session[:user_id] = @user.id - normal_status("注册成功") - end end # 随机生成字符