From f8eff25139e8cfa3d9ab2715be604e4b53fe83f4 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 18 Jul 2019 08:41:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B3=A8=E5=86=8C=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=BC=95=E6=B5=81=E7=9A=84=E8=A1=8C=E4=B8=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/account_controller.rb           |  8 ++++----
 app/controllers/competition_teams_controller.rb | 12 ++++--------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index cb556f8d..eb4f1a82 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -377,10 +377,10 @@ class AccountController < ApplicationController
       else
         us = UsersService.new
         @user = us.register user_params.merge(:should_confirmation_password => false)
-        # # 注册时，记录是否是引流用户
-        # ip = request.remote_ip
-        # ua = UserAgent.find_by_ip(ip)
-        # ua.update_column(:type, UserAgent::REGISTER) if ua
+        # 注册时，记录是否是引流用户
+        ip = request.remote_ip
+        ua = UserAgent.find_by_ip(ip)
+        ua.update_column(:type, UserAgent::REGISTER) if ua
         if !@user.new_record?
           self.logged_user = @user
           flash[:notice] = l(:notice_account_activated)
diff --git a/app/controllers/competition_teams_controller.rb b/app/controllers/competition_teams_controller.rb
index b23ec5d6..9159cf07 100644
--- a/app/controllers/competition_teams_controller.rb
+++ b/app/controllers/competition_teams_controller.rb
@@ -114,9 +114,7 @@ class CompetitionTeamsController < ApplicationController
         new_team.team_members.create!(user_id: user_id, role: 3, competition_id: @competition.id, is_teacher: 1)
       end
       # 创建时，记录是否是引流用户
-      # ip = request.remote_ip
-      # ua = UserAgent.find_by_ip(ip)
-      # ua.update_column(:type, UserAgent::COMPETITION) if ua
+      record_agent_user_action
     end
   end
 
@@ -230,10 +228,8 @@ class CompetitionTeamsController < ApplicationController
       end
 
       team.team_members.create!(user_id: User.current.id, role: 2, competition_id: @competition.id)
-      # # 创建时，记录是否是引流用户
-      # ip = request.remote_ip
-      # ua = UserAgent.find_by_ip(ip)
-      # ua.update_column(:type, UserAgent::COMPETITION) if ua
+      # 记录引流
+      record_agent_user_action
     end
   end
 
@@ -351,7 +347,7 @@ class CompetitionTeamsController < ApplicationController
   end
 
   def record_agent_user_action
-    # 注册时，记录是否是引流用户
+    # 记录是否是引流用户的行为
     ip = request.remote_ip
     ua = UserAgent.find_by_ip(ip)
     ua.update_column(:type, UserAgent::COMPETITION) if ua