From 22e4e56029597c8e9ca7e391a5877dc3be89d1fc Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Sun, 14 Aug 2016 13:24:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E8=87=AA=E5=8A=A8=E6=BF=80?=
 =?UTF-8?q?=E6=B4=BB=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/new_comment.rb | 10 ++++++++--
 app/api/mobile/apis/users.rb       | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/api/mobile/apis/new_comment.rb b/app/api/mobile/apis/new_comment.rb
index d4a156271..228fee157 100644
--- a/app/api/mobile/apis/new_comment.rb
+++ b/app/api/mobile/apis/new_comment.rb
@@ -5,7 +5,6 @@ module Mobile
     class NewComment< Grape::API
       include ApplicationHelper
       include ApiHelper
-      include AccountHelper
       resources :new_comment do
 
         desc "add a new comment"
@@ -17,6 +16,7 @@ module Mobile
           unless current_user
             #如果当前用户不存在 则需要根据微信昵称注册一个帐号
             openid = session[:wechat_openid]
+            openid = "asfsdf"
             raise "无法获取到openid,请在微信中打开本页面" unless openid
             us = UsersService.new
 
@@ -60,7 +60,13 @@ module Mobile
             raise user.errors.full_messages.first if user.new_record?
             user.update_attributes(:lastname=>name)
             #自动激活
-            user = AccountHelper.automatically_register(user)
+            if Setting.self_registration != '3'
+              user.activate
+              user.last_login_on = Time.now
+              if user.save
+                UserStatus.create(:user_id => user.id, :changsets_count => 0, :watchers_count => 0)
+              end
+            end
             UserWechat.create!(
                 openid: openid,
                 user: user,
diff --git a/app/api/mobile/apis/users.rb b/app/api/mobile/apis/users.rb
index 08f037588..53884f779 100644
--- a/app/api/mobile/apis/users.rb
+++ b/app/api/mobile/apis/users.rb
@@ -2,7 +2,6 @@
 module Mobile
   module Apis
     class Users < Grape::API
-      include AccountHelper
       resource :users do
 
         desc "查询是否已绑定"
@@ -70,7 +69,14 @@ module Mobile
                                           :should_confirmation_password => true)
           raise user.errors.full_messages.first if user.new_record?
           #自动激活
-          user = automatically_register(user)
+          if Setting.self_registration != '3'
+            # user = automatically_register(user)
+            user.activate
+            user.last_login_on = Time.now
+            if user.save
+              UserStatus.create(:user_id => user.id, :changsets_count => 0, :watchers_count => 0)
+            end
+          end
 
           if uw && !uw.real?
             user.update_attributes(:lastname=>uw.user[:lastname])