|
@@ -52,6 +52,7 @@ import jakarta.annotation.Resource;
|
|
import jakarta.servlet.http.HttpServletResponse;
|
|
import jakarta.servlet.http.HttpServletResponse;
|
|
import org.apache.poi.ss.usermodel.*;
|
|
import org.apache.poi.ss.usermodel.*;
|
|
import org.apache.poi.xwpf.usermodel.XWPFDocument;
|
|
import org.apache.poi.xwpf.usermodel.XWPFDocument;
|
|
|
|
+import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
|
|
import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
|
|
@@ -127,7 +128,8 @@ public class BizUserServiceImpl extends ServiceImpl<BizUserMapper, BizUser> impl
|
|
private CommonCacheOperator commonCacheOperator;
|
|
private CommonCacheOperator commonCacheOperator;
|
|
@Resource
|
|
@Resource
|
|
private DevSmsApi devSmsApi;
|
|
private DevSmsApi devSmsApi;
|
|
-
|
|
|
|
|
|
+ @Value("${aliyun.templateCode}")
|
|
|
|
+ private String templateCode;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public Page<BizUser> page(BizUserPageParam bizUserPageParam) {
|
|
public Page<BizUser> page(BizUserPageParam bizUserPageParam) {
|
|
@@ -772,15 +774,13 @@ public class BizUserServiceImpl extends ServiceImpl<BizUserMapper, BizUser> impl
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
public void wxRegister(WxUserRegisterParam wxUserRegisterParam) {
|
|
public void wxRegister(WxUserRegisterParam wxUserRegisterParam) {
|
|
// 校验短信验证码
|
|
// 校验短信验证码
|
|
- String messageCode = commonCacheOperator.get(wxUserRegisterParam.getPhone()) + "";
|
|
|
|
|
|
+ Object messageCode = commonCacheOperator.get(wxUserRegisterParam.getPhone());
|
|
if (ObjectUtil.isEmpty(messageCode)) {
|
|
if (ObjectUtil.isEmpty(messageCode)) {
|
|
- throw new CommonException("验证码不存在");
|
|
|
|
|
|
+ throw new CommonException("短信验证码已过期");
|
|
}
|
|
}
|
|
if (ObjectUtil.notEqual(messageCode, wxUserRegisterParam.getMessageCode())) {
|
|
if (ObjectUtil.notEqual(messageCode, wxUserRegisterParam.getMessageCode())) {
|
|
- throw new CommonException("验证码错误");
|
|
|
|
|
|
+ throw new CommonException("短信验证码错误");
|
|
}
|
|
}
|
|
-// //校验通过删除缓存
|
|
|
|
-// commonCacheOperator.remove(wxUserRegisterParam.getPhone());
|
|
|
|
|
|
|
|
String roleId = "";
|
|
String roleId = "";
|
|
// 保存用户信息
|
|
// 保存用户信息
|
|
@@ -816,7 +816,7 @@ public class BizUserServiceImpl extends ServiceImpl<BizUserMapper, BizUser> impl
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// 校验openId或者手机号是否存在
|
|
// 校验openId或者手机号是否存在
|
|
- if (ObjectUtil.isNull(baseMapper.selectOne(new LambdaQueryWrapper<BizUser>()
|
|
|
|
|
|
+ if (ObjectUtil.isNotNull(baseMapper.selectOne(new LambdaQueryWrapper<BizUser>()
|
|
.eq(BizUser::getOpenId, wxUserRegisterParam.getOpenId())
|
|
.eq(BizUser::getOpenId, wxUserRegisterParam.getOpenId())
|
|
.or()
|
|
.or()
|
|
.eq(BizUser::getAccount, wxUserRegisterParam.getPhone())
|
|
.eq(BizUser::getAccount, wxUserRegisterParam.getPhone())
|
|
@@ -829,23 +829,27 @@ public class BizUserServiceImpl extends ServiceImpl<BizUserMapper, BizUser> impl
|
|
bizUser.setPassword(CommonCryptogramUtil.doHashValue(devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_PASSWORD_KEY)));
|
|
bizUser.setPassword(CommonCryptogramUtil.doHashValue(devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_PASSWORD_KEY)));
|
|
// 设置状态
|
|
// 设置状态
|
|
bizUser.setUserStatus("ENABLE");
|
|
bizUser.setUserStatus("ENABLE");
|
|
|
|
+ bizUser.setOpenId(wxUserRegisterParam.getOpenId());
|
|
//生成推荐码
|
|
//生成推荐码
|
|
bizUser.setUserReferralCode(DateUtil.format(DateUtil.date(), DatePattern.PURE_DATETIME_PATTERN) + RandomUtil.randomNumbers(4));
|
|
bizUser.setUserReferralCode(DateUtil.format(DateUtil.date(), DatePattern.PURE_DATETIME_PATTERN) + RandomUtil.randomNumbers(4));
|
|
bizUser.setName(wxUserRegisterParam.getName());
|
|
bizUser.setName(wxUserRegisterParam.getName());
|
|
this.save(bizUser);
|
|
this.save(bizUser);
|
|
sysRoleApi.grantUserRole(bizUser.getId(), roleId);
|
|
sysRoleApi.grantUserRole(bizUser.getId(), roleId);
|
|
|
|
+ //校验通过删除缓存
|
|
|
|
+ commonCacheOperator.remove(wxUserRegisterParam.getPhone());
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void smsSend(SmsSendParam smsSendParam) {
|
|
public void smsSend(SmsSendParam smsSendParam) {
|
|
// 查询缓存是否存在
|
|
// 查询缓存是否存在
|
|
- String messageCode = commonCacheOperator.get(smsSendParam.getPhone()) + "";
|
|
|
|
|
|
+ Object messageCode = commonCacheOperator.get(smsSendParam.getPhone());
|
|
if (ObjectUtil.isNotEmpty(messageCode)) {
|
|
if (ObjectUtil.isNotEmpty(messageCode)) {
|
|
throw new CommonException("请勿重复发送");
|
|
throw new CommonException("请勿重复发送");
|
|
}
|
|
}
|
|
String code = RandomUtil.randomNumbers(5);
|
|
String code = RandomUtil.randomNumbers(5);
|
|
//发送短信
|
|
//发送短信
|
|
- devSmsApi.sendSmsAliyun(smsSendParam.getPhone(), null, "SMS_465365543", "{\"code\":\"" + code + "\"}");
|
|
|
|
|
|
+ devSmsApi.sendSmsAliyun(smsSendParam.getPhone(), null, templateCode, "{\"code\":\"" + code + "\"}");
|
|
|
|
+ //保存5分钟
|
|
commonCacheOperator.put(smsSendParam.getPhone(), code, 300);
|
|
commonCacheOperator.put(smsSendParam.getPhone(), code, 300);
|
|
}
|
|
}
|
|
}
|
|
}
|