找回密码1.0

base-system-common/src/main/java/com/health/system/common/domain/User.java

@@ -11,23 +11,77 @@ import lombok.Data;
 @Data
 public class User {
 
-
+    /*
+    邮箱验证码
+     */
+    private String code;
+    /*
+    用户id
+     */
     private Integer userId;
+    /*
+    用户名称
+     */
     private String userName;
+    /*
+    用户密码
+     */
     private String password;
+    /*
+    用户邮箱
+     */
     private String email;
+    /*
+    用户邀请码
+     */
     private String inviteCode;
+    /*
+    用户头像
+     */
     private String avatar;
+    /*
+    用户性别 1代表男性 2代表女性
+     */
     private Integer gender;
+    /*
+    用户身高
+     */
     private Integer height;
+    /*
+    用户体重
+     */
     private Integer weight;
+    /*
+    用户年龄
+     */
     private Integer age;
+    /*
+    患者微信号
+     */
     private String wechatNumber;
+    /*
+    医生所属医院
+     */
     private String hospital;
+    /*
+    医生所属科室id
+     */
     private Integer deptId;
+    /*
+    医生职位id
+     */
     private Integer titleId;
+    /*
+    医生简介
+     */
     private String introduce;
+    /*
+    医生擅长领域
+     */
     private String skilled;
+    /*
+    用户状态
+     */
     private Integer status;
 
 }

base-system-remote/pom.xml

@@ -8,7 +8,7 @@
         <artifactId>base-system</artifactId>
         <version>3.6.3</version>
     </parent>
-    <version>3.6.9</version>
+    <version>3.6.11</version>
     <artifactId>base-system-remote</artifactId>
     <repositories>
         <repository>

base-system-remote/src/main/java/com/health/system/remote/RemoteUserService.java

@@ -51,5 +51,6 @@ public interface RemoteUserService {
     public Result getEmailCode(@RequestParam("email") String email,@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
 
-
+    @PostMapping("/user/updPasswordByEmail")
+    public Result<?> updPasswordByEmail(@RequestBody User user,@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

base-system-remote/src/main/java/com/health/system/remote/factory/RemoteUserFallbackFactory.java

@@ -55,6 +55,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
                 return Result.error("获取邮箱验证码失败:" + throwable.getMessage());
             }
 
+            @Override
+            public Result<?> updPasswordByEmail(User user,String source) {
+                return Result.error("邮箱修改密码失败:" + throwable.getMessage());
+            }
+
         };
     }
 }

base-system-server/src/main/java/com/health/system/server/controller/SysUserController.java

@@ -161,7 +161,7 @@ public class SysUserController extends BaseController
 
     //-------------------------------------------------------------------
 
-    //----------------------------------------
+    //------------------------邮箱注册----------------
     //注册
     @PostMapping("/register/user")
     public Result<?> registerUser(@RequestBody User user){
@@ -170,6 +170,13 @@ public class SysUserController extends BaseController
         return i>0?Result.success("","注册成功"):Result.error("注册失败");
     }
 
+    //---------------邮箱修改密码------------------------------
+    @PostMapping("/updPasswordByEmail")
+    public Result<?> updPasswordByEmail(@RequestBody User user){
+        System.out.println(user);
+        int i=userService.updPasswordByEmail(user);
+        return i>0?Result.success("","修改成功"):Result.error("修改失败");
+    }
 
     /**
      * 获取用户信息

base-system-server/src/main/java/com/health/system/server/mapper/SysUserMapper.java

@@ -155,4 +155,5 @@ public interface SysUserMapper {
     User selectUserByUserId(@Param("userId1") int userId1);
 
 
+    int updPasswordByEmail(User user);
 }

base-system-server/src/main/java/com/health/system/server/service/ISysUserService.java

@@ -218,4 +218,6 @@ public interface ISysUserService
 
 
     User selectUserByUserId(Long userId);
+
+    int updPasswordByEmail(User user);
 }

base-system-server/src/main/java/com/health/system/server/service/impl/SysUserServiceImpl.java

@@ -596,4 +596,10 @@ public class SysUserServiceImpl implements ISysUserService
         return user;
     }
 
+    @Override
+    public int updPasswordByEmail(User user) {
+          return   userMapper.updPasswordByEmail(user);
+
+    }
+
 }

base-system-server/src/main/resources/mapper/system/SysUserMapper.xml

@@ -267,8 +267,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<update id="resetUserPwd" parameterType="SysUser">
  		update sys_user set password = #{password} where user_name = #{userName}
 	</update>
+    <update id="updPasswordByEmail">
+		update tb_user set passwrod=#{password} where email=#{email}
+	</update>
 
-	<delete id="deleteUserById" parameterType="Long">
+    <delete id="deleteUserById" parameterType="Long">
  		update sys_user set del_flag = '2' where user_id = #{userId}
  	</delete>