From 79810458e869450fcdfa96b92f79e5c78cb46c04 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Thu, 30 Jul 2020 16:37:55 +0800
Subject: [PATCH] 去掉 组织新增的按钮，修改添加医院的bug，添加Python 获取加密码的接口

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java |   37 ++++++++++++++++++++++++-------------
 1 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
index 2a05a44..124cbdd 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
@@ -75,7 +75,10 @@
      */
     @ApiOperation(value = "根据access_token当前登录用户")
     @GetMapping("/users/current")
-    public ResultBody<LoginAppUser> getLoginAppUser(@LoginUser(isFull = true) SysUser user) {
+    public ResultBody<LoginAppUser> getLoginAppUser(@LoginUser(isFull = true) SysUser user,HttpServletRequest request) {
+        if(user!=null){
+            loginLogs(user, request);
+        }
         return ResultBody.ok().data(appUserService.getLoginAppUser(user));
     }
 
@@ -94,12 +97,8 @@
      */
     @GetMapping(value = "/users-anon/login", params = "username")
     @ApiOperation(value = "根据用户名查询用户")
-    public LoginAppUser findByUsername(String username, HttpServletRequest request) {
-
+    public LoginAppUser findByUsername(String username) {
         LoginAppUser loginAppUser = appUserService.findByUsername(username);
-        if (loginAppUser != null) {
-            loginLogs(loginAppUser, request);
-        }
         return loginAppUser;
     }
 
@@ -109,7 +108,7 @@
      * @param sysUser
      * @return
      */
-    private int loginLogs(LoginAppUser sysUser, HttpServletRequest request) {
+    private int loginLogs(SysUser sysUser, HttpServletRequest request) {
         SysUserLogs sysUserLogs = new SysUserLogs();
         sysUserLogs.setClientId(ClientContextHolder.getClient());
         sysUserLogs.setLoginAgentSystem(request.getHeader(CommonConstant.USER_AGENT_SYSTEM));
@@ -248,7 +247,7 @@
      */
     @PutMapping(value = "/users/{id}/password")
     @AuditLog(operation = "'重置用户密码:' + #id")
-    public ResultBody resetPassword(@PathVariable Long id) {
+    public ResultBody resetPassword(@PathVariable Long id) throws Exception{
         if (checkAdmin(id)) {
             return ResultBody.failed(ADMIN_CHANGE_MSG);
         }
@@ -256,10 +255,22 @@
     }
 
     /**
+     * 返回给Python加密密码
+     */
+    @GetMapping(value = "/users/python")
+    public ResultBody jiaMipython(@RequestBody String password)  {
+        if (password==null||"".equals(password)) {
+            return ResultBody.failed().msg("请输入密码");
+        }
+        ResultBody resultBody = appUserService.jiaMipython(password);
+        return resultBody;
+    }
+
+    /**
      * 用户自己修改密码
      */
     @PutMapping(value = "/users/password")
-    public ResultBody resetPassword(@RequestBody SysUser sysUser) {
+    public ResultBody resetPassword(@RequestBody SysUser sysUser) throws Exception {
         if (checkAdmin(sysUser.getId())) {
             return ResultBody.failed().msg(ADMIN_CHANGE_MSG);
         }
@@ -271,7 +282,7 @@
      * 用户自己修改密码-后端以外
      */
     @PutMapping(value = "/users/resetpassword")
-    public ResultBody resetClientPassword(@RequestParam Map<String, Object> params) {
+    public ResultBody resetClientPassword(@RequestParam Map<String, Object> params) throws Exception {
         Long id = MapUtils.getLong(params, "id");
         String oldPassword = MapUtils.getString(params, "oldPassword");
         String newPassword = MapUtils.getString(params, "newPassword");
@@ -294,7 +305,7 @@
      * @return
      */
     @PutMapping(value = "/users/updateusertel")
-    public ResultBody updateUserTel(@RequestParam Map<String, Object> params,@LoginUser SysUser sysUser) {
+    public ResultBody updateUserTel(@RequestParam Map<String, Object> params,@LoginUser SysUser sysUser) throws Exception  {
         String oldTel = MapUtils.getString(params, "oldTel");
         if (oldTel==null){
             return ResultBody.failed("请输入原账号");
@@ -342,7 +353,7 @@
      */
     @PostMapping("/users/doctorUserReg")
     @AuditLog(operation = "'注册/添加用户:' + #userRegVo.mobile")
-    public ResultBody doctorUserReg(@RequestBody UserRegVo userRegVo,SysUser sysUser) {
+    public ResultBody doctorUserReg(@RequestBody UserRegVo userRegVo,SysUser sysUser) throws Exception {
         return appUserService.doctorUserReg(userRegVo,sysUser);
     }
 
@@ -430,7 +441,7 @@
      * 通过手机修改密码
      */
     @PutMapping(value = "/users/passwordByPhone")
-    public ResultBody passwordByPhone(@RequestBody Map<String, Object> map) {
+    public ResultBody passwordByPhone(@RequestBody Map<String, Object> map) throws Exception {
         return appUserService.passwordByPhone(map);
     }
 

--
Gitblit v1.8.0