From 82d76ef70e085f984f93c6a4fb1a360a6fc195f4 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Mon, 22 Jul 2019 15:04:28 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E5=9F=9F?= =?UTF-8?q?=E5=90=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_unlogin_header.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb index 37f49dfe..3b9f6f1c 100644 --- a/app/views/layouts/_unlogin_header.html.erb +++ b/app/views/layouts/_unlogin_header.html.erb @@ -51,9 +51,10 @@ - <%= link_to '登录', signin_path, :class => "mr5 color-white" %> + 登录 - <%= link_to '注册', user_join_path, :class => "ml5 color-white" %> + 登录 + <%#= link_to '注册', user_join_path, :class => "ml5 color-white" %>
@@ -65,7 +66,6 @@
    -
  • <%= link_to '新建课堂', new_course_path() %>
  • <%= link_to '新建实训', new_shixun_path() %>
  • <%= link_to '新建实践课程', new_subject_path() %>
  • <%= link_to '新建项目', new_project_path() %>
    • From 7385ad200b69205462235f32afa2759dd12855c1 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Mon, 22 Jul 2019 15:45:21 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=8E=BB=E6=8E=89footer=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E5=8F=8A=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_footer.html.erb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 04bb288b..c1b5b575 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -1,10 +1,6 @@
    -
    - <%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台" , width: "70px"), home_path,:class => "fl",:style => "height:70px" %> - EduCoder.NET -
    • 网站首页
    • 关于我们
      • From 4d19ea1fde22276760a996d5f83ba44b2167defb Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 23 Jul 2019 15:31:16 +0800 Subject: [PATCH 3/7] =?UTF-8?q?codepedia=E9=82=AE=E7=AE=B1=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E6=97=B6=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/sources_service.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/services/sources_service.rb b/app/services/sources_service.rb index aa95d382..e5857b52 100644 --- a/app/services/sources_service.rb +++ b/app/services/sources_service.rb @@ -171,7 +171,8 @@ class SourcesService def get_user_info params user = User.find params[:id] - {username: user.show_real_name, user_id: user.id, email: user.mail, phone: user.phone, sex: user.sex, school_name: user.school_name} + mail = user.mail.presence || "login@educoder.net" + {username: user.show_real_name, user_id: user.id, email: mail, phone: user.phone, sex: user.sex, school_name: user.school_name} end # courses start ############################################ From 78ed0a44516d4efdad89b8d6a97f386f6d551bb8 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 23 Jul 2019 16:39:41 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E6=9B=B4=E6=94=B9=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=BF=90=E8=90=A5=E4=BA=BA=E5=91=98=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 98b58614..b1eee18d 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -3,7 +3,7 @@ class ManagementsController < ApplicationController before_filter :require_business before_filter :require_admin, :only => [:shixun_setting_list, :mirror_repository, :mirror_picture_shixuns, :editmd_template, :editmd_template, :subject_level_system, :subject_setting_list, - :shixun_authorization, :ec_template, :codemirror_template, + :shixun_authorization, :ec_template, :codemirror_template, :update_user, :course_guide_template, :shixun_quality_score, :tech_system, :update_notice, :setting_banner, :training_2018, :create_standard] layout 'base_management' From 7bb68f508b53c99e71abedf76a8e634955c49a78 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Tue, 23 Jul 2019 17:50:26 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=A0=A1=E5=9B=AD=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/user_agent.rake | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 lib/tasks/user_agent.rake diff --git a/lib/tasks/user_agent.rake b/lib/tasks/user_agent.rake new file mode 100644 index 00000000..e69de29b From e20628fcc223264539caf2a1d73b2ab897583fa4 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Tue, 23 Jul 2019 17:57:14 +0800 Subject: [PATCH 6/7] user agents rake --- app/controllers/welcome_controller.rb | 2 +- app/helpers/welcome_helper.rb | 51 ++++++++++++++------- app/models/user_agent.rb | 2 + app/views/welcome/_user_agent_list.html.erb | 2 +- lib/tasks/user_agent.rake | 37 +++++++++++++++ 5 files changed, 76 insertions(+), 18 deletions(-) diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index c0abee20..05f04630 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -42,7 +42,7 @@ class WelcomeController < ApplicationController # 运营引流个人数据展示 def user_agents - @user_agents = UserAgent.where(key: params[:edu]).includes(:user_actionss) + @user_agents = UserAgent.where(key: params[:edu]) @agents_count = @user_agents.count limit = 20 @agents_pages = Paginator.new @agents_count, limit, params['page'] || 1 diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index 395bb07a..1d4eb879 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -24,22 +24,41 @@ module WelcomeHelper # 引流注册情况 def register_info user_agent - if user_agent.agent_type.to_i == UserAgent::USER_AD - user_id = user_agent.user_actionss.first.try(:user_id) - if user_id && User.where("id = #{user_id} and created_on < '2019-07-15 00:00:00'").present? - "代理前注册" - else - "未转换" - end - elsif user_agent.agent_type.to_i == UserAgent::USER_REGISTER || UserActions.find_by_ip(user_agent.ip) - "代理后注册" - else - user_id = user_agent.user_actionss.first.try(:user_id) - if user_id && User.where("id = #{user_id} and created_on < '2019-07-15 00:00:00'").present? - "代理前注册" - else - "代理后注册" - end + case user_agent.register_status + when 0 + "改IP未登录" + when 1 + "代理之前注册" + when 2 + "代理之后注册" + end + # if user_agent.agent_type.to_i == UserAgent::USER_AD + # user_id = user_agent.user_actionss.first.try(:user_id) + # if user_id && User.where("id = #{user_id} and created_on < '2019-07-15 00:00:00'").present? + # "代理前注册" + # else + # "未转换" + # end + # elsif user_agent.agent_type.to_i == UserAgent::USER_REGISTER || UserActions.find_by_ip(user_agent.ip) + # "代理后注册" + # else + # user_id = user_agent.user_actionss.first.try(:user_id) + # if user_id && User.where("id = #{user_id} and created_on < '2019-07-15 00:00:00'").present? + # "代理前注册" + # else + # "代理后注册" + # end + # end + end + + def competion_info user_agent + case user_agent.action_status + when 0 + "未报名" + when 1 + "代理之前报名" + when 2 + "代理之后报名" end end diff --git a/app/models/user_agent.rb b/app/models/user_agent.rb index 3bb16582..0fabe469 100644 --- a/app/models/user_agent.rb +++ b/app/models/user_agent.rb @@ -1,3 +1,5 @@ +# register_status: 0：未注册；1: 代理之前注册；2：代理之后注册 +# action_status: 0：未注册；1: 代理之前报名；2：代理之后报名 class UserAgent < ActiveRecord::Base has_many :user_actionss, :foreign_key => "ip", :primary_key => "ip" USER_AD = 1 # 广告宣传的引流 diff --git a/app/views/welcome/_user_agent_list.html.erb b/app/views/welcome/_user_agent_list.html.erb index 34792244..607392bd 100644 --- a/app/views/welcome/_user_agent_list.html.erb +++ b/app/views/welcome/_user_agent_list.html.erb @@ -15,7 +15,7 @@ <%= link_to ua.key, user_path(ua.key), :target => "_blank" %> <%= link_to user.try(:show_real_name), user_path(user), target:'_blank' %> <%= register_info(ua) %> - <%= ua.agent_type.to_i == UserAgent::USER_COMPETITION ? "已报名" : "未报名" %> + <%= competion_info(ua) %> <%= ua.ip %> <% end %> diff --git a/lib/tasks/user_agent.rake b/lib/tasks/user_agent.rake index e69de29b..f3f4dd23 100644 --- a/lib/tasks/user_agent.rake +++ b/lib/tasks/user_agent.rake @@ -0,0 +1,37 @@ +# register_status: 0：未注册；1: 代理之前注册；2：代理之后注册 +# register_action: 0：未报名；1: 代理之前报名；2：代理之后报名 +desc "sync user_agents" +namespace :sync do + task :user_agent => :environment do + UserAgent.find_each do |ua| + puts ua.id + user_action = UserActions.find_by_ip(ua.ip) + params = {} + # 用户注册情况 + if user_action + user = User.find(user_action.try(:user_id)) + + # 即代理之前注册 + if user.created_on < ua.created_at + params = params.merge(:register_status => 1) + else + # 代理之后注册的 + params = params.merge(:register_status => 2) + end + end + + # 用户报名情况 + team_member = TeamMember.find_by_user_id(user_action.try(:user_id)) + if team_member + # 即代理之前报名的 + if team_member.created_on < ua.created_at + params = params.merge(:action_status => 1) + else + # 代理之后报名的 + params = params.merge(:action_status => 2) + end + end + ua.update_attributes(params) + end + end +end \ No newline at end of file From 5c306f9db1e24b79b694bc657f1a22b80a6b0bb3 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Tue, 23 Jul 2019 17:57:46 +0800 Subject: [PATCH 7/7] .. --- .../20190723024514_add_register_status_to_user_agents.rb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 db/migrate/20190723024514_add_register_status_to_user_agents.rb diff --git a/db/migrate/20190723024514_add_register_status_to_user_agents.rb b/db/migrate/20190723024514_add_register_status_to_user_agents.rb new file mode 100644 index 00000000..9c893d1f --- /dev/null +++ b/db/migrate/20190723024514_add_register_status_to_user_agents.rb @@ -0,0 +1,6 @@ +class AddRegisterStatusToUserAgents < ActiveRecord::Migration + def change + add_column :user_agents, :register_status, :integer, :default => 0 + add_column :user_agents, :action_status, :integer, :default => 0 + end +end