Merge branch 'master' of http://118.190.145.217:3000/xiaojincai/gzyunapi

src/account/control_user.py

@@ -97,8 +97,9 @@ def reset_password(request):
     """
     @attention: 重置密码
     """
+    uid = request.user.id
     qdata = request.json
-    need_params = ["password","repassword","phone","phcode"]
+    need_params = ["password","repassword"]
     mse = ccf.check_params(*need_params,**qdata)
     if mse:
         raise ce.TipException(mse)
@@ -111,7 +112,7 @@ def reset_password(request):
     if password != repassword:
         raise ce.TipException(u"两次输入的密码不一致!")
     pwd = ph.make_password(password)
-    cm.UserInfo.objects.filter(phone=phone).update(password=pwd)
+    cm.UserInfo.objects.filter(id=uid).update(password=pwd)
 
 
 def reset_user_password(request):

src/account/urls_backstage.py

@@ -14,5 +14,6 @@ urlpatterns = [
     url(r'^user$', views_backstage.UserView.as_view()),
     url(r'^user/info$', views_backstage.UserInfoView.as_view()),
     url(r'^user/list$', views_backstage.UserListView.as_view()),
+    url(r'^pwd/reset$', views_backstage.ResetPwdView.as_view()),
 ]
 

src/account/views_backstage.py

@@ -117,3 +117,17 @@ class UserListView(cv.AuthView):
             return cv.to_fail(e)
 
 
+class ResetPwdView(cv.AuthView):
+    def put(self, request):
+        """
+        #重置密码(忘记密码)
+        @phone:"15982456282",手机号
+        @password:"",新密码
+        @repassword:"",确认密码
+        @phcode:"123",验证码
+        """
+        try:
+            cu.reset_password(request)
+            return cv.to_suc()
+        except Exception as e:
+            return cv.to_fail(e)