From 6128af80d8068ed938b8135e462b9268117ea982 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Tue, 16 Apr 2024 09:48:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=A8=A1=E5=9D=97-=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=AF=84=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/peanut/config/ShiroConfig.java   |  6 +++
 .../common/controller/UserController.java     | 42 +++++++------------
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/peanut/config/ShiroConfig.java b/src/main/java/com/peanut/config/ShiroConfig.java
index 6daec7d6..86143832 100644
--- a/src/main/java/com/peanut/config/ShiroConfig.java
+++ b/src/main/java/com/peanut/config/ShiroConfig.java
@@ -50,6 +50,12 @@ public class ShiroConfig {
         shiroFilter.setFilters(filters);
 
         Map<String, String> filterMap = new LinkedHashMap<>();
+        filterMap.put("/common/user/sms/sendcode","anon");//发送手机验证码
+        filterMap.put("/common/user/getMailCaptcha","anon");//发送邮箱验证码
+        filterMap.put("/common/user/registerOrLogin","anon");//发送邮箱验证码
+        filterMap.put("/common/user/login","anon");//验证码注册或登录
+        filterMap.put("/common/user/setPasswordByCode","anon");//忘记密码
+
         filterMap.put("/oss/**","anon");
         filterMap.put("/image/**","anon");
         filterMap.put("/book/book/listForWebsite","anon");   // 网站接口
diff --git a/src/main/java/com/peanut/modules/common/controller/UserController.java b/src/main/java/com/peanut/modules/common/controller/UserController.java
index 255153c3..8562ca51 100644
--- a/src/main/java/com/peanut/modules/common/controller/UserController.java
+++ b/src/main/java/com/peanut/modules/common/controller/UserController.java
@@ -226,9 +226,9 @@ public class UserController {
     }
 
     /**
-     * 设置密码
+     * 设置密码带验证
      */
-    @RequestMapping("/setPassword")
+    @RequestMapping("/setPasswordByCode")
     public R setPassword(@RequestParam("phone") String phone,
                          @RequestParam("password") String password,
                          @RequestParam("code") String code)  {
@@ -259,33 +259,19 @@ public class UserController {
     }
 
     /**
-     * 手机号验证码密码注册 -未在apipost
+     * 设置密码不验证
      */
-//    @RequestMapping("/register")
-//    public R register(@RequestParam("tel") String tel,
-//                      @RequestParam("code") String code,
-//                      @RequestParam("password") String password){
-//        String redisCode = redisTemplate.opsForValue().get("RegistCode" + tel);
-//        if (StringUtils.isEmpty(redisCode)){
-//            return R.error(500,"短信验证码已过期，请重试");
-//        }
-//        String lcode = redisCode.split("_")[0];
-//        if (!lcode.equals(code)) {
-//            return R.error(500,"短信验证码不符！");
-//        }
-//        MyUserEntity user = userService.getBaseMapper().selectOne(new QueryWrapper<MyUserEntity>().eq("tel", tel));
-//        if(!ObjectUtil.isEmpty(user)){
-//            return R.error(500,"该手机号已经注册！");
-//        }
-//        String saltMD5 = MD5Utils.getSaltMD5(password);
-//        MyUserEntity myUserEntity = new MyUserEntity();
-//        myUserEntity.setTel(tel);
-//        myUserEntity.setPassword(saltMD5);
-//        userService.save(myUserEntity);
-//        R r = sysUserTokenService.createToken(myUserEntity.getId());
-//        return R.ok("注册成功").put("userInfo",myUserEntity).put("token",r);
-//    }
-
+    @RequestMapping("/setPasswordById")
+    public R setPassword(@RequestParam("id") String id,@RequestParam("password") String password)  {
+        MyUserEntity userEntity = userService.getById(id);
+        if (userEntity == null) {
+            return R.error(500,"当前用户不存在！");
+        }
+        String saltMD5 = MD5Utils.getSaltMD5(password);
+        userEntity.setPassword(saltMD5);
+        userService.updateById(userEntity);
+        return R.ok("成功");
+    }