From 1f1e57645cde2a2bba03ca6f47436fddff946de2 Mon Sep 17 00:00:00 2001 From: Chopper Date: Fri, 21 May 2021 10:44:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sms/impl/SmsUtilAliImplService.java | 48 ++++++++++++------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java b/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java index a592bcef5..ea3b91b7c 100644 --- a/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java +++ b/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java @@ -54,38 +54,54 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil { @Override public void sendSmsCode(String mobile, VerificationEnums verificationEnums, String uuid) { + //验证码 String code = CommonUtil.getRandomNum(); - switch (verificationEnums) { - //如果某个模版需要自定义，则在此处进行调整 - case LOGIN: - case REGISTER: - case FIND_USER: { + //准备发送短信参数 + Map params = new HashMap<>(); + // 验证码内容 + params.put("code", code); - //准备发送短信参数 - Map params = new HashMap<>(); - params.put("code", code); - cache.put(cacheKey(verificationEnums, mobile, uuid), code, 300L); - this.sendSmsCode("北京宏业汇成科技有限公司", mobile, params, "SMS_205755300"); + //模版 默认为登录验证 + String templateCode; + + //如果某个模版需要自定义，则在此处进行调整 + switch (verificationEnums) { + //登录 + case LOGIN: { + templateCode = "SMS_205755300"; break; } + //注册 + case REGISTER: { + templateCode = "SMS_205755298"; + break; + } + //找回密码 + case FIND_USER: { + templateCode = "SMS_205755301"; + break; + } + //修改密码 case UPDATE_PASSWORD: { Member member = memberService.getById(UserContext.getCurrentUser().getId()); if (member == null || StringUtil.isEmpty(member.getMobile())) { return; } - String memberMobile = member.getMobile(); - //准备发送短信参数 - Map params = new HashMap<>(); - params.put("code", code); - cache.put(cacheKey(verificationEnums, memberMobile, uuid), code, 300L); - this.sendSmsCode("北京宏业汇成科技有限公司", mobile, params, "SMS_205755297"); + //更新为用户最新手机号 + mobile = member.getMobile(); + templateCode = "SMS_205755297"; break; } //如果不是有效的验证码手段，则此处不进行短信操作 default: return; } + //缓存中写入要验证的信息 + cache.put(cacheKey(verificationEnums, mobile, uuid), code, 300L); + + this.sendSmsCode("北京宏业汇成科技有限公司", mobile, params, templateCode); + } @Override From 3b21fede61d2eb0ccfb1d7aeaac937c53d3a38b6 Mon Sep 17 00:00:00 2001 From: Chopper Date: Fri, 21 May 2021 11:11:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=BC=93=E5=AD=98=E4=BB=A3=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E7=9B=B4=E6=8E=A5=E8=AF=BB=E5=8F=96=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/lili/controller/common/UploadController.java | 2 +- .../java/cn/lili/common/sms/impl/SmsUtilAliImplService.java | 4 ++-- .../lili/modules/file/plugin/impl/AliFileManagerPlugin.java | 2 +- .../modules/goods/serviceimpl/GoodsGalleryServiceImpl.java | 3 +-- .../lili/modules/system/serviceimpl/LogisticsServiceImpl.java | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/common-api/src/main/java/cn/lili/controller/common/UploadController.java b/common-api/src/main/java/cn/lili/controller/common/UploadController.java index 83d868b4a..499e17874 100644 --- a/common-api/src/main/java/cn/lili/controller/common/UploadController.java +++ b/common-api/src/main/java/cn/lili/controller/common/UploadController.java @@ -63,7 +63,7 @@ public class UploadController { if (authUser == null) { throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR); } - Setting setting = settingService.getById(SettingEnum.OSS_SETTING.name()); + Setting setting = settingService.get(SettingEnum.OSS_SETTING.name()); if (setting == null || StrUtil.isBlank(setting.getSettingValue())) { throw new ServiceException(ResultCode.OSS_NOT_EXIST); } diff --git a/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java b/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java index fd78d5c4a..fead89fb3 100644 --- a/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java +++ b/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java @@ -54,7 +54,7 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil { @Override public void sendSmsCode(String mobile, VerificationEnums verificationEnums, String uuid) { //获取短信配置 - Setting setting = settingService.getById(SettingEnum.SMS_SETTING.name()); + Setting setting = settingService.get(SettingEnum.SMS_SETTING.name()); if (StrUtil.isBlank(setting.getSettingValue())) { throw new ServiceException("您还未配置阿里云短信"); } @@ -331,7 +331,7 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil { */ public com.aliyun.dysmsapi20170525.Client createClient() { try { - Setting setting = settingService.getById(SettingEnum.SMS_SETTING.name()); + Setting setting = settingService.get(SettingEnum.SMS_SETTING.name()); if (StrUtil.isBlank(setting.getSettingValue())) { throw new ServiceException("您还未配置阿里云短信"); } diff --git a/framework/src/main/java/cn/lili/modules/file/plugin/impl/AliFileManagerPlugin.java b/framework/src/main/java/cn/lili/modules/file/plugin/impl/AliFileManagerPlugin.java index cc189f176..731454caf 100644 --- a/framework/src/main/java/cn/lili/modules/file/plugin/impl/AliFileManagerPlugin.java +++ b/framework/src/main/java/cn/lili/modules/file/plugin/impl/AliFileManagerPlugin.java @@ -74,7 +74,7 @@ public class AliFileManagerPlugin implements FileManagerPlugin { private OssSetting getSetting() { //如果没有配置，或者没有下次刷新时间，或者下次刷新时间小于当前时间，则从redis 更新一次 if (ossSetting == null || nextInitSetting == null || nextInitSetting < System.currentTimeMillis()) { - Setting setting = settingService.getById(SettingEnum.OSS_SETTING.name()); + Setting setting = settingService.get(SettingEnum.OSS_SETTING.name()); if (setting == null || StrUtil.isBlank(setting.getSettingValue())) { throw new ServiceException("您还未配置阿里云OSS存储"); } diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java index d211d078a..d41a96be4 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java @@ -12,7 +12,6 @@ import cn.lili.modules.system.service.SettingService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -62,7 +61,7 @@ public class GoodsGalleryServiceImpl extends ServiceImpl