From 496b26252fef77a82c6513e55e6de862c1122847 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Wed, 15 Apr 2020 17:35:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81/=E9=80=80?=
 =?UTF-8?q?=E5=87=BA=E7=9A=84=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/accounts_controller.rb   | 12 +++++++++++-
 app/controllers/concerns/login_helper.rb |  2 +-
 config/routes.rb                         |  1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 682c5f2e3..8d9108bbb 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -52,7 +52,6 @@ class AccountsController < ApplicationController
         u.login = user_params["login"] if user_params["login"]
         u.mail = user_params["mail"] if user_params["mail"]
         u.lastname = user_params["lastname"] if user_params["lastname"]
-        u.password = user_params["password"] if user_params["password"]
 
         ue.gender = user_extension_params["gender"]
         ue.school_id = user_extension_params["school_id"]
@@ -96,6 +95,17 @@ class AccountsController < ApplicationController
     end
   end
 
+  #修改密码
+  def remote_password
+    @user = User.find_by(login: params[:login])
+    if @user && @user.update_attribute(:password, params[:new_password])
+
+      render_ok({})
+    else
+      render_error("更新是不")
+    end
+  end
+
 
 
   # 用户注册
diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb
index a389fa72d..df7591d03 100644
--- a/app/controllers/concerns/login_helper.rb
+++ b/app/controllers/concerns/login_helper.rb
@@ -44,7 +44,7 @@ module LoginHelper
   end
 
   def logout_user
-    Rails.logger.info("####################__11111______######")
+    Rails.logger.info("####################_1111_User.current_id______######{User.current.try(:id)}###___#{User.current.logged?}")
 
     if User.current.logged?
       Rails.logger.info("####################__2222_______######")
diff --git a/config/routes.rb b/config/routes.rb
index 42b8f85e1..74b44f039 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -124,6 +124,7 @@ Rails.application.routes.draw do
         post :remote_register
         post :remote_update
         post :remote_login
+        post :remote_password
       end
     end