From 526a6d47028efc07a9ff01743d8a7f9fb9dd45d8 Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Fri, 19 Jul 2019 16:54:36 +0800
Subject: [PATCH 1/2] change es highlight tag

---
 app/services/concerns/elasticsearch_able.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/concerns/elasticsearch_able.rb b/app/services/concerns/elasticsearch_able.rb
index e1c33ed4a..c08aab029 100644
--- a/app/services/concerns/elasticsearch_able.rb
+++ b/app/services/concerns/elasticsearch_able.rb
@@ -20,7 +20,7 @@ module ElasticsearchAble
   def highlight_options
     {
       fragment_size: EduSetting.get('es_highlight_fragment_size') || 30,
-      tag: '<span>'
+      tag: '<span class="highlight">'
     }
   end
 

From da8d3dc29cf00a7077de9603e846051e4ffa1976 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 19 Jul 2019 17:43:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=BC=95=E6=B5=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/accounts_controller.rb | 8 ++++++--
 app/models/user_agent.rb               | 6 ++++++
 spec/models/user_agent_spec.rb         | 5 +++++
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 app/models/user_agent.rb
 create mode 100644 spec/models/user_agent_spec.rb

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 6ac62f887..feaee7eae 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -55,6 +55,10 @@ class AccountsController < ApplicationController
           container_type: pre == 'p' ? 'Phone' : 'Mail',
           score: 500
         )
+        # 注册时，记录是否是引流用户
+        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("注册成功")
@@ -110,7 +114,7 @@ class AccountsController < ApplicationController
     # generate a key and set cookie if autologin
 
     set_autologin_cookie(user)
-    UserAction.create(:action_id => user.try(:id), :action_type => "Login", :user_id => user.try(:id))
+    UserAction.create(:action_id => user.try(:id), :action_type => "Login", :user_id => user.try(:id), :ip => request.remote_ip)
 
     # 注册完成后有一天的试用申请
     UserDayCertification.create(user_id: user.id, status: 1)
@@ -133,7 +137,7 @@ class AccountsController < ApplicationController
   end
 
   def logout
-    UserAction.create(action_id: User.current.id, action_type: "Logout", user_id: User.current.id)
+    UserAction.create(action_id: User.current.id, action_type: "Logout", user_id: User.current.id, :ip => request.remote_ip)
     session[:user_id] = nil
     logout_user
     render :json => {status: 1, message: "退出成功!"}
diff --git a/app/models/user_agent.rb b/app/models/user_agent.rb
new file mode 100644
index 000000000..538369f1a
--- /dev/null
+++ b/app/models/user_agent.rb
@@ -0,0 +1,6 @@
+class UserAgent < ApplicationRecord
+  has_many :user_actionss, :foreign_key => "ip", :primary_key => "ip"
+  USER_AD = 1  # 广告宣传的引流
+  USER_REGISTER = 2 # 引流注册
+  USER_COMPETITION = 3 # 引流参加竞赛
+end
diff --git a/spec/models/user_agent_spec.rb b/spec/models/user_agent_spec.rb
new file mode 100644
index 000000000..2bd0f7bbc
--- /dev/null
+++ b/spec/models/user_agent_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe UserAgent, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end