From 22fa11bac6fb0adbd029a55c8cf1be12bd18e5d8 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 23 Feb 2023 14:03:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=AA=8C=E8=AF=81=E7=A0=81?= =?UTF-8?q?=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zscat/mallplus/enums/SmsEnum.java | 7 ++++++- .../com/zscat/mallplus/config/SmsConfig.java | 2 +- .../mallplus/single/SingelHomeController.java | 9 +++++---- .../mallplus/ums/service/RedisService.java | 10 ---------- .../ums/service/impl/RedisServiceImpl.java | 13 ------------ .../service/impl/UmsMemberServiceImpl.java | 20 ++++++++++++++----- .../src/main/resources/application.properties | 8 +++++--- 7 files changed, 32 insertions(+), 37 deletions(-) diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/SmsEnum.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/SmsEnum.java index d095a0e..9a630f2 100644 --- a/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/SmsEnum.java +++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/SmsEnum.java @@ -1,6 +1,7 @@ package com.zscat.mallplus.enums; import lombok.Getter; +import org.springframework.beans.factory.annotation.Value; /** * @Author dimengzhe @@ -13,6 +14,9 @@ public class SmsEnum { */ public static final Long APP_LOGIN_CODE_TIME_LIMIT = 300L; + @Value("${redis.key.prefix.loginCode}") + private static String REDIS_KEY_PREFIX_LOGIN_CODE; + /** * 发送验证码 @@ -22,9 +26,10 @@ public class SmsEnum { /** * 登录 */ - LOGIN("1", "loginCode","登录"), + LOGIN("1", REDIS_KEY_PREFIX_LOGIN_CODE,"登录"), ; + /** * code值 */ diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/config/SmsConfig.java b/mallplus-portal/src/main/java/com/zscat/mallplus/config/SmsConfig.java index 5885d48..68ccc68 100644 --- a/mallplus-portal/src/main/java/com/zscat/mallplus/config/SmsConfig.java +++ b/mallplus-portal/src/main/java/com/zscat/mallplus/config/SmsConfig.java @@ -13,7 +13,7 @@ import javax.xml.namespace.QName; */ public class SmsConfig { - static String msgSign="【汇融银链】"; + static String msgSign="【汇融云链】"; public static String SendWaitWorkMsg(String mobile, String pwd,String msg) { try { diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingelHomeController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingelHomeController.java index 116d6ff..8029c11 100644 --- a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingelHomeController.java +++ b/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingelHomeController.java @@ -65,6 +65,8 @@ import java.util.Map; @RequestMapping("/api/single/home") public class SingelHomeController { + @Value("${redis.key.prefix.loginCode}") + private String REDIS_KEY_PREFIX_LOGIN_CODE; @Autowired OssAliyunUtil aliyunOSSUtil; @Value("${jwt.tokenHeader}") @@ -341,8 +343,7 @@ public class SingelHomeController { @ApiOperation(value = "手机号 密码登录") @PostMapping(value = "/login") public Object login(@RequestParam("phone") String phone, - @RequestParam("password") String password, - @RequestParam(value = "type",required = false)String type) { + @RequestParam("password") String password) { if (phone == null || "".equals(phone)) { return new CommonResult().validateFailed("用户名或密码错误"); } @@ -378,7 +379,6 @@ public class SingelHomeController { return new CommonResult().validateFailed("手机验证码为空"); } try { - Map token = memberService.loginByCode(phone, authCode); if (token.get("token") == null) { return new CommonResult().validateFailed("用户名或密码错误"); @@ -454,7 +454,8 @@ public class SingelHomeController { //缓存识别码 String redisKey = ""; if(SmsEnum.SendEnum.LOGIN.getCode().equals(type)){ - redisKey = SmsEnum.SendEnum.LOGIN.getRedisKey(); + redisKey = REDIS_KEY_PREFIX_LOGIN_CODE; +// redisKey = SmsEnum.SendEnum.LOGIN.getRedisKey(); } Date date = new Date(); String codeRedis = redisService.get(redisKey + phone); diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/RedisService.java b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/RedisService.java index 6f4e4a9..95a7e24 100644 --- a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/RedisService.java +++ b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/RedisService.java @@ -33,14 +33,4 @@ public interface RedisService { */ Long increment(String key, long delta); - /** - * 写入缓存设置时效时间 - * @param key - * @param value - * @param expireTime - * @return - */ - boolean set(final String key, Object value, Long expireTime); - - } diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/RedisServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/RedisServiceImpl.java index 77c7eb0..7f47b48 100644 --- a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/RedisServiceImpl.java +++ b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/RedisServiceImpl.java @@ -48,17 +48,4 @@ public class RedisServiceImpl implements RedisService { return stringRedisTemplate.opsForValue().increment(key, delta); } - @Override - public boolean set(String key, Object value, Long expireTime) { - boolean result = false; - try { - ValueOperations operations = redisTemplate.opsForValue(); - operations.set(key, value); - stringRedisTemplate.expire(key, expireTime, TimeUnit.SECONDS); - result = true; - } catch (Exception e) { - e.printStackTrace(); - } - return result; - } } diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java index 7754c5c..7e7f37f 100644 --- a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java +++ b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java @@ -10,6 +10,7 @@ import com.zscat.mallplus.enums.SmsEnum; import com.zscat.mallplus.exception.ApiMallPlusException; import com.zscat.mallplus.oms.mapper.OmsOrderMapper; import com.zscat.mallplus.oms.vo.OrderStstic; +import com.zscat.mallplus.sys.entity.SysUserVo; import com.zscat.mallplus.sys.mapper.SysAreaMapper; import com.zscat.mallplus.ums.entity.*; import com.zscat.mallplus.ums.mapper.SysAppletSetMapper; @@ -110,6 +111,8 @@ public class UmsMemberServiceImpl extends ServiceImpl