|
|
@ -1,13 +1,11 @@ |
|
|
|
package com.ccsens.tall.service; |
|
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil; |
|
|
|
import cn.hutool.core.collection.CollUtil; |
|
|
|
import cn.hutool.core.collection.CollectionUtil; |
|
|
|
import cn.hutool.core.lang.Snowflake; |
|
|
|
import cn.hutool.core.util.ObjectUtil; |
|
|
|
import cn.hutool.core.util.RandomUtil; |
|
|
|
import cn.hutool.core.util.StrUtil; |
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
import com.ccsens.cloudutil.feign.HealthFeignClient; |
|
|
|
import com.ccsens.tall.bean.dto.ProjectDto; |
|
|
@ -23,16 +21,13 @@ import com.ccsens.util.enterprisewx.vo.WeiXinVo; |
|
|
|
import com.ccsens.util.exception.BaseException; |
|
|
|
import com.ccsens.util.wx.WxGzhUtil; |
|
|
|
import com.ccsens.util.wx.WxXcxUtil; |
|
|
|
import io.swagger.annotations.ApiModelProperty; |
|
|
|
import lombok.Data; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.apache.commons.lang3.RandomStringUtils; |
|
|
|
import org.eclipse.jetty.http.HttpStatus; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Propagation; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
import org.xhtmlrenderer.css.parser.property.PrimitivePropertyBuilders; |
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.HashMap; |
|
|
@ -623,8 +618,8 @@ public class UserService implements IUserService { |
|
|
|
} |
|
|
|
|
|
|
|
//2.生成随机验证码
|
|
|
|
// String verifyCode = RandomUtil.randomNumbers(4);
|
|
|
|
String verifyCode = "1111"; |
|
|
|
String verifyCode = RandomUtil.randomNumbers(4); |
|
|
|
// String verifyCode = "1111";
|
|
|
|
|
|
|
|
//3.保存到redis中
|
|
|
|
Integer codeValidInSeconds = WebConstant.Expired_Verify_Code_In_Seconds; |
|
|
@ -633,7 +628,7 @@ public class UserService implements IUserService { |
|
|
|
redisUtil.set(RedisKeyManager.getSigninSmsExistKey(phone), verifyCode, codeExistINSeconds); |
|
|
|
|
|
|
|
//5.发送验证码
|
|
|
|
// SmsUtil.sendSms(phone, verifyCode, client_type.phase, codeValidInSeconds);
|
|
|
|
SmsUtil.sendSms(phone, verifyCode, client_type.phase, codeValidInSeconds); |
|
|
|
|
|
|
|
//6.返回
|
|
|
|
smsCodeVo = new UserVo.SmsCode(); |
|
|
|