短信相关接口

wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserLoginVo.java

@@ -44,6 +44,6 @@ public class UserLoginVo implements Serializable {
     /**
      * 来源： PC/APP
      */
-    @ApiModelProperty(value = "来源： PC/APP", name = "type")
-    private String type;
+    @ApiModelProperty(value = "来源： PC/APP", name = "source")
+    private String source;
 }

wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserRegisterVo.java

@@ -7,10 +7,11 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
-*@ Description: 用户注册Vo
-*@ Author     : 86187
-*@ Date       : 2021/1/14 11:39
-*/
+ * @author 86187
+ * @ Description: 用户注册Vo
+ * @ Author     : 86187
+ * @ Date       : 2021/1/14 11:39
+ */
 @Data
 @ApiModel(value = "UserRegisterVo")
 public class UserRegisterVo implements Serializable {
@@ -20,18 +21,30 @@ public class UserRegisterVo implements Serializable {
     /**
      * 手机号码
      */
-    @ApiModelProperty(value = "手机号码",name = "phone")
+    @ApiModelProperty(value = "手机号码", name = "phone")
     private String phone;
 
     /**
      * 密码
      */
-    @ApiModelProperty(value = "密码",name = "password")
+    @ApiModelProperty(value = "密码", name = "password")
     private String password;
 
     /**
      * 验证码
      */
-    @ApiModelProperty(value = "验证码",name = "smCode")
+    @ApiModelProperty(value = "验证码", name = "smCode")
     private String smCode;
+
+    /**
+     * 来源 PC/APP
+     */
+    @ApiModelProperty(value = "来源 PC/APP", name = "source")
+    private String source;
+
+    /**
+     * 场景 1：登录 2：注册 3：修改密码 4：找回密码 5：重置密码
+     */
+    @ApiModelProperty(value = "场景 1：登录 2：注册 3：修改密码 4：找回密码 5：重置密码", name = "scene")
+    private Integer scene;
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/SendSmsSerVice.java

@@ -13,6 +13,7 @@ public interface SendSmsSerVice {
 
     /**
      * 发送短信验证码
+     *
      * @param sendSmsVo 入参信息
      * @return true 成功 false 失败
      * @throws Exception 异常
@@ -22,20 +23,11 @@ public interface SendSmsSerVice {
     /**
      * 验证手机验证码：外部调用
      *
-     * @param phone 手机号码
-     * @param code  手机验证码
-     * @param type  场景类型 1:验证码登录 2:手机注册 3:修改密码 4：找回密码
-     * @return 是否通过校验 true通过，false不通过
-     */
-    R<Boolean> valid(String phone, String code, Integer type);
-
-    /**
-     * 验证手机验证码 :内部调用
-     *
-     * @param phone 手机号码
-     * @param code  手机验证码
-     * @param type  场景类型 1:验证码登录 2:手机注册 3:修改密码 4：找回密码
+     * @param phone  手机号码
+     * @param code   手机验证码
+     * @param type   场景类型 1:验证码登录 2:手机注册 3:修改密码 4：找回密码
+     * @param source 来源 PC/APP
      * @return 是否通过校验 true通过，false不通过
      */
-    boolean validCode(String phone, String code, Integer type);
+    R<Boolean> valid(String phone, String code, Integer type, String source);
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SendSmsSerViceImpl.java

@@ -4,7 +4,6 @@ import cn.wisenergy.common.utils.R;
 import cn.wisenergy.model.enums.SceneType;
 import cn.wisenergy.model.vo.SendSmsVo;
 import cn.wisenergy.service.app.SendSmsSerVice;
-import cn.wisenergy.service.cache.Cache;
 import cn.wisenergy.service.cache.RedisService;
 import cn.wisenergy.service.common.CachePrefix;
 import cn.wisenergy.service.common.Common;
@@ -22,11 +21,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.logging.SimpleFormatter;
 
 /**
  * @author 86187
@@ -37,8 +33,6 @@ import java.util.logging.SimpleFormatter;
 @Service
 @Slf4j
 public class SendSmsSerViceImpl implements SendSmsSerVice {
-    @Autowired
-    private Cache cache;
 
     @Autowired
     private RedisService redisService;
@@ -82,18 +76,17 @@ public class SendSmsSerViceImpl implements SendSmsSerVice {
         }
 
         //保存验证到缓存，以便做验证
-        String value = SceneType.getNameByCode(sendSmsVo.getScene());
-        boolean bool = redisService.set(CachePrefix.SMS_CODE.getPrefix() + value + "_" + sendSmsVo.getPhone(), code, Common.SMS_TIMEOUT);
-        log.info("短信缓存前缀：" + CachePrefix.SMS_CODE.getPrefix());
-        log.info("场景名字：" + value);
+        String scene = SceneType.getNameByCode(sendSmsVo.getScene());
+        boolean bool = redisService.set(CachePrefix.SMS_CODE.getPrefix() + scene + "_" +
+                sendSmsVo.getSource() + "_" + sendSmsVo.getPhone(), code, Common.SMS_TIMEOUT);
         return R.ok(bool);
     }
 
     @Override
-    public R<Boolean> valid(String phone, String code, Integer type) {
+    public R<Boolean> valid(String phone, String code, Integer type, String source) {
         String value = SceneType.getNameByCode(type);
         //获取短信验证码key
-        String key = CachePrefix.SMS_CODE.getPrefix() + value + "_" + phone;
+        String key = CachePrefix.SMS_CODE.getPrefix() + value + "_" + source + "_" + phone;
 
         //判断缓存是否过期
         long time = redisService.getExpire(key);
@@ -113,19 +106,4 @@ public class SendSmsSerViceImpl implements SendSmsSerVice {
         }
         return R.ok(1, false);
     }
-
-    @Override
-    public boolean validCode(String phone, String code, Integer type) {
-        return true;
-//        //获取短信验证码key
-//        String valCode = CachePrefix.SMS_CODE.getPrefix() + type + "_" + phone;
-//        //redis中获取验证码
-//        Object obj = cache.get(valCode);
-//        if (obj != null && obj.equals(code)) {
-//            //验证码存在，校验通过，清除验证码缓存
-//            cache.remove(valCode);
-//            return true;
-//        }
-//        return false;
-    }
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLoginServiceImpl.java

@@ -13,7 +13,6 @@ import cn.wisenergy.model.vo.UserLoginVo;
 import cn.wisenergy.model.vo.UserRegisterVo;
 import cn.wisenergy.service.app.SendSmsSerVice;
 import cn.wisenergy.service.app.UserLoginService;
-import cn.wisenergy.service.cache.Cache;
 import cn.wisenergy.service.common.Common;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -41,8 +40,7 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
     @Autowired
     private SendSmsSerVice sendSmsSerVice;
 
-    @Autowired
-    private Cache cache;
+    private static final int ERROR_CODE = 500;
 
     @Override
     public R<UserInfoVo> register(UserRegisterVo userVo) {
@@ -96,7 +94,7 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
     public R<UserInfoVo> loginCode(UserLoginVo userVo) {
         log.info("volunteer-service[]UserLoginServiceImpl[]loginCode[]input.param.userVo:" + userVo);
         if (null == userVo || StringUtils.isBlank(userVo.getPhone()) || StringUtils.isBlank(userVo.getCode()) ||
-                StringUtils.isBlank(userVo.getType()) || null == userVo.getScene()) {
+                StringUtils.isBlank(userVo.getSource()) || null == userVo.getScene()) {
             return R.error("入参为空!");
         }
 
@@ -110,7 +108,12 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
         }
 
         //2、判断验证码是否正确
-        boolean bool = sendSmsSerVice.validCode(userVo.getPhone(), userVo.getCode(), userVo.getScene());
+        R<Boolean> result = sendSmsSerVice.valid(userVo.getPhone(), userVo.getCode(),
+                userVo.getScene(), userVo.getSource());
+        if (null != result && result.getCode() == ERROR_CODE) {
+            return R.error(result.getMessage());
+        }
+
         UserInfoVo userInfoVo = new UserInfoVo();
         userInfoVo.setUserId(user.getId());
         userInfoVo.setUserName(user.getUserName());
@@ -250,8 +253,8 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
         }
 
         //验证验证码
-        boolean bool = sendSmsSerVice.validCode(userVo.getPhone(), userVo.getCode(), userVo.getScene());
-        if (!bool) {
+        R<Boolean> bool = sendSmsSerVice.valid(userVo.getPhone(), userVo.getCode(), userVo.getScene(), userVo.getSource());
+        if (null != bool && bool.getCode() == ERROR_CODE) {
             return R.ok(1, false);
         }
 

wisenergy-service/src/main/java/cn/wisenergy/service/cache/Cache.java

-package cn.wisenergy.service.cache;
-
-import java.util.Collection;
-import java.util.Map;
-
-/**
- * @author 86187
- */
-public interface Cache<T> {
-    /**
-     * Get an item from the cache, nontransactionally
-     * @param key
-     * @return the cached object or <tt>null</tt>
-     */
-    Object get(Object key);
-
-    /**
-     * 批量set
-     * @param map
-     */
-    void multiSet(Map map);
-
-
-    /**
-     * 批量删除
-     * @param keys 要删除的key集合
-     */
-    void multiDel(Collection keys);
-
-    /**
-     * Add an item to the cache, nontransactionally, with
-     * failfast semantics
-     * @param key
-     * @param value
-     */
-    void put(Object key, T value);
-
-    /**
-     * 往缓存中写入内容
-     * @param key
-     * @param value
-     * @param exp 超时时间，单位为秒
-     */
-    void put(Object key, T value, long exp);
-    /**
-     * 删除
-     * @param key
-     */
-    void remove(Object key);
-
-    /**
-     * 删除
-     * @param key
-     */
-    void vagueDel(Object key);
-
-    /**
-     * Clear the cache
-     */
-    void clear();
-
-}

wisenergy-service/src/main/java/cn/wisenergy/service/cache/RedisCacheImpl.java

-package cn.wisenergy.service.cache;
-
-import org.apache.poi.ss.formula.functions.T;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author 86187
- * @ Description: redis的cache实现
- * @ Author     : 86187
- * @ Date       : 2021/1/18 11:03
- */
-@Component
-public class RedisCacheImpl implements Cache<T> {
-
-    @Autowired
-    private RedisTemplate redisTemplate;
-
-
-    public RedisCacheImpl() {
-
-    }
-
-
-    @Override
-    public Object get(Object key) {
-        return redisTemplate.opsForValue().get(key);
-    }
-
-    @Override
-    public void multiSet(Map map) {
-        redisTemplate.opsForValue().multiSet(map);
-    }
-
-    @Override
-    public void multiDel(Collection keys) {
-        redisTemplate.delete(keys);
-    }
-
-    @Override
-    public void put(Object key, T value) {
-        redisTemplate.opsForValue().set(key, value);
-    }
-
-    @Override
-    public void put(Object key, T value, long exp) {
-        redisTemplate.opsForValue().set(key, value, exp, TimeUnit.SECONDS);
-    }
-
-
-    @Override
-    public void remove(Object key) {
-
-        redisTemplate.delete(key);
-    }
-
-    /**
-     * 删除
-     *
-     * @param key
-     */
-    @Override
-    public void vagueDel(Object key) {
-        Set<String> keys = redisTemplate.keys(key + "*");
-        redisTemplate.delete(keys);
-    }
-
-    @Override
-    public void clear() {
-
-        Set keys = redisTemplate.keys("*");
-        redisTemplate.delete(keys);
-    }
-
-}

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SendSmsController.java

 package cn.wisenergy.web.admin.controller.app;
 
 import cn.wisenergy.common.utils.R;
-import cn.wisenergy.common.utils.StringUtil;
 import cn.wisenergy.model.vo.SendSmsVo;
 import cn.wisenergy.service.app.SendSmsSerVice;
 import io.swagger.annotations.Api;
@@ -14,10 +13,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 /**
+ * @author 86187
  * @ Description: 短信管理
  * @ Author     : 86187
  * @ Date       : 2021/1/15 15:40
- * @author 86187
  */
 @RestController
 @Api(tags = "短信管理")
@@ -44,15 +43,17 @@ public class SendSmsController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "phone", value = "手机号码", dataType = "String", required = true),
             @ApiImplicitParam(name = "code", value = "短信验证码", dataType = "String", required = true),
-            @ApiImplicitParam(name = "scene", value = "场景类型 1:验证码登录 2:手机注册 3:修改密码 4：找回密码", dataType = "int", required = true)
+            @ApiImplicitParam(name = "scene", value = "场景类型 1:验证码登录 2:手机注册 3:修改密码 4：找回密码", dataType = "int", required = true),
+            @ApiImplicitParam(name = "source", value = "来源 PC/APP", dataType = "String", required = true)
     })
     @GetMapping("/valid")
-    public R<Boolean> valid(String phone, String code, Integer scene) {
+    public R<Boolean> valid(String phone, String code, Integer scene, String source) {
         log.info("SendSmsController[]valid[]input.param:phone,code,type" + phone, code, scene);
-        if (StringUtils.isBlank(phone) || StringUtils.isBlank(code) || null == scene) {
+        if (StringUtils.isBlank(phone) || StringUtils.isBlank(code) || StringUtils.isBlank(source) ||
+                null == scene) {
             return R.error("入参为空!");
         }
 
-        return sendSmsSerVice.valid(phone, code, scene);
+        return sendSmsSerVice.valid(phone, code, scene, source);
     }
 }

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserLoginController.java

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
+ * @author 86187
  * @ Description: PC-用户登录
  * @ Author     : 86187
  * @ Date       : 2021/1/14 10:50
@@ -36,17 +37,15 @@ public class UserLoginController {
     @ApiOperation(value = "用户注册", notes = "用户注册", httpMethod = "POST")
     @ApiImplicitParam(name = "userVo", value = "用户信息", dataType = "UserRegisterVo")
     @PostMapping("/register")
-    public R<UserInfoVo> resetPassword(@RequestBody UserRegisterVo userVo) {
+    public R<UserInfoVo> register(@RequestBody UserRegisterVo userVo) {
         log.info("volunteer-service[]UserLongController[]resetPassword[]input.param.userVo:" + userVo);
 
-        if (null == userVo) {
+        if (null == userVo || StringUtils.isBlank(userVo.getPhone()) ||
+                StringUtils.isBlank(userVo.getPassword()) || StringUtils.isBlank(userVo.getSmCode()) ||
+                StringUtils.isBlank(userVo.getSource()) || null == userVo.getScene()) {
             return R.error("入参为空!");
         }
 
-        if (StringUtils.isBlank(userVo.getPhone()) || StringUtils.isBlank(userVo.getPassword())) {
-            return R.error("入参不能为空!");
-        }
-
         return userLoginService.register(userVo);
     }
 
@@ -57,7 +56,7 @@ public class UserLoginController {
         log.info("volunteer-service[]UserLongController[]loginCode[]input.param.userVo:" + userVo);
 
         if (null == userVo || StringUtils.isBlank(userVo.getPhone()) || StringUtils.isBlank(userVo.getCode()) ||
-                StringUtils.isBlank(userVo.getType()) || null == userVo.getScene()) {
+                StringUtils.isBlank(userVo.getSource()) || null == userVo.getScene()) {
             return R.error("入参为空!");
         }