..

src/main/java/io/renren/common/validator/Assert.java

@@ -9,6 +9,9 @@
package io.renren.common.validator;
import io.renren.common.exception.RRException;
import java.util.regex.Pattern;
import org.apache.commons.lang.StringUtils;
/**
@@ -29,4 +32,12 @@ public abstract class Assert {
            throw new RRException(message);
        }
    }
    public static void isNotPhone(String phone) {
        String phone_regex = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(17[013678])|(18[0,5-9]))\\d{8}$";
        Pattern p = Pattern.compile(phone_regex);
        if (phone.length() != 11 || !p.matcher(phone).matches()) {
            throw new RRException("手机号格式不正确");
        }
    }
}

src/main/java/io/renren/modules/app/controller/AppRegisterController.java

@@ -9,13 +9,12 @@
package io.renren.modules.app.controller;
import io.renren.common.utils.R;
import io.renren.common.validator.Assert;
import io.renren.common.validator.ValidatorUtils;
import io.renren.modules.app.entity.UserEntity;
import io.renren.modules.app.form.RegisterForm;
import io.renren.modules.app.service.SmsCodeService;
import io.renren.modules.app.service.UserService;
import io.renren.common.utils.JsonUtils;
import io.renren.modules.app.entity.SmsStatusEntity;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,14 +40,19 @@ public class AppRegisterController {
    private SmsCodeService smsCodeService;
    /**
     * 短信验证码
     * 注册短信验证码
     */
    @PostMapping("/mobilecode")
    public R mobileCode(String uuid, String phone) {
        // 获取短信验证码
        String code = smsCodeService.getCode(uuid, phone);
        Assert.isNotPhone(phone);
        UserEntity user = userService.queryByUsername(phone);
        if (user != null) {
            return R.error("手机号已注册");
        }
        try {
            String result = smsCodeService.sendCode(code, phone);
            String result = smsCodeService.getCode(uuid, phone);
            return R.ok().put("result", result);
        } catch (Exception e) {
            e.printStackTrace();
@@ -59,7 +63,7 @@ public class AppRegisterController {
    @PostMapping("register")
    @ApiOperation("注册")
    public R register(@RequestBody RegisterForm form){
        boolean captcha = smsCodeService.validate(form.getUuid(), form.getCode());
        boolean captcha = smsCodeService.validate(form.getUuid(), form.getCode(), form.getPhone());
		if(!captcha){
			return R.error("验证码不正确");
        }
@@ -75,4 +79,46 @@ public class AppRegisterController {
        return R.ok();
    }
    
    /**
     * 找回密码短信验证码
     */
    @PostMapping("/phonecode")
    public R phoneCode(String uuid, String phone) {
        UserEntity user = userService.queryByUsername(phone);
        if (user == null) {
            return R.error("手机号未注册");
        }
        try {
            String result = smsCodeService.getCode(uuid, phone);
            return R.ok().put("result", result);
        } catch (Exception e) {
            e.printStackTrace();
            return R.error();
        }
    }
    /**
     * 通过手机验证码重置密码
     * @param form
     * @return
     */
    @PostMapping("repassword")
    @ApiOperation("通过手机验证码重置密码")
    public R rePassword(@RequestBody RegisterForm form){
        boolean captcha = smsCodeService.validate(form.getUuid(), form.getCode(), form.getPhone());
		if(!captcha){
			return R.error("验证码不正确");
        }
        
        //表单校验
        ValidatorUtils.validateEntity(form);
        UserEntity user = userService.queryByUsername(form.getPhone());
        Long userId = user.getUserId();
        userService.updatePassWord(userId, form.getPassword());
        return R.ok();
    }
}

src/main/java/io/renren/modules/app/entity/SmsStatusEntity.java

@@ -1,13 +0,0 @@
package io.renren.modules.app.entity;
import lombok.Data;
/**
 * 短信发送返回值实体类
 */
@Data
public class SmsStatusEntity {
    private String respCode;
    private String respDesc;
    private String smsId;
    private String[] failList;
}

src/main/java/io/renren/modules/app/service/SmsCodeService.java

@@ -1,11 +1,8 @@
package io.renren.modules.app.service;
import com.baomidou.mybatisplus.extension.service.IService;
import io.renren.common.utils.PageUtils;
import io.renren.modules.app.entity.SmsCodeEntity;
import java.util.Map;
/**
 * 短信验证码
 *
@@ -17,7 +14,7 @@ public interface SmsCodeService extends IService<SmsCodeEntity> {
    /**
     * 获取短信验证码
     */
    String getCode(String uuid, String phone);
    String getCode(String uuid, String phone) throws Exception;
    /**
     * 验证码效验
@@ -25,14 +22,5 @@ public interface SmsCodeService extends IService<SmsCodeEntity> {
     * @param code  验证码
     * @return  true：成功  false：失败
     */
    boolean validate(String uuid, String code);
    /**
     *  发送短信验证码
     * @param code
     * @param phone
     * @return
     * @throws Exception
     */
	String sendCode(String code, String phone) throws Exception;
    boolean validate(String uuid, String code, String phone);
}

src/main/java/io/renren/modules/app/service/impl/SmsCodeServiceImpl.java

@@ -21,7 +21,7 @@ import io.renren.modules.app.service.SmsCodeService;
public class SmsCodeServiceImpl extends ServiceImpl<SmsCodeDao, SmsCodeEntity> implements SmsCodeService {
    @Override
    public String getCode(String uuid, String phone){
    public String getCode(String uuid, String phone) throws Exception {
        if (StringUtils.isBlank(uuid)) {
            throw new RRException("uuid不能为空");
        }
@@ -32,13 +32,23 @@ public class SmsCodeServiceImpl extends ServiceImpl<SmsCodeDao, SmsCodeEntity> i
        smsCodeEntity.setPhone(phone);
        smsCodeEntity.setCode(code);
        smsCodeEntity.setExpireTime(DateUtils.addDateMinutes(new Date(), ConfigConstant.EXPIRE_TIME));
        
        // 发送验证码
        StringBuilder sb = new StringBuilder();
		sb.append("accountSid").append("=").append(ConfigConstant.ACCOUNT_SID);
		sb.append("&to").append("=").append(phone);
        sb.append("&param").append("=").append(URLEncoder.encode(code + "," + ConfigConstant.EXPIRE_TIME, "UTF-8"));
		sb.append("&templateid").append("=").append(ConfigConstant.TEMPLATE_ID);
		String body = sb.toString() + HttpRequestUtil.createCommonParam(ConfigConstant.ACCOUNT_SID, ConfigConstant.AUTH_TOKEN);
		String result = HttpRequestUtil.post(ConfigConstant.BASE_URL, body);
		System.out.println(result);
        
        this.save(smsCodeEntity);
        return code;
        return result;
    }
    @Override
    public boolean validate(String uuid, String code) {
    public boolean validate(String uuid, String code, String phone) {
        SmsCodeEntity smsCodeEntity = this.getOne(new QueryWrapper<SmsCodeEntity>().eq("uuid", uuid));
        if(smsCodeEntity == null){
            return false;
@@ -47,22 +57,9 @@ public class SmsCodeServiceImpl extends ServiceImpl<SmsCodeDao, SmsCodeEntity> i
        //删除验证码
        this.removeById(uuid);
        if(smsCodeEntity.getCode().equalsIgnoreCase(code) && smsCodeEntity.getExpireTime().getTime() >= System.currentTimeMillis()){
        if(smsCodeEntity.getCode().equalsIgnoreCase(code) && smsCodeEntity.getPhone().equalsIgnoreCase(phone) && smsCodeEntity.getExpireTime().getTime() >= System.currentTimeMillis()){
            return true;
        }
        return false;
    }
    @Override
    public String sendCode(String code, String phone) throws Exception {
        StringBuilder sb = new StringBuilder();
		sb.append("accountSid").append("=").append(ConfigConstant.ACCOUNT_SID);
		sb.append("&to").append("=").append(phone);
        sb.append("&param").append("=").append(URLEncoder.encode(code + "," + ConfigConstant.EXPIRE_TIME, "UTF-8"));
		sb.append("&templateid").append("=").append(ConfigConstant.TEMPLATE_ID);
		String body = sb.toString() + HttpRequestUtil.createCommonParam(ConfigConstant.ACCOUNT_SID, ConfigConstant.AUTH_TOKEN);
		String result = HttpRequestUtil.post(ConfigConstant.BASE_URL, body);
		System.out.println(result);
        return result;
    }
}

src/main/java/io/renren/modules/app/service/impl/UserServiceImpl.java

@@ -20,7 +20,6 @@ import io.renren.modules.app.dao.UserDao;
import io.renren.modules.app.entity.UserEntity;
import io.renren.modules.app.form.LoginForm;
import io.renren.modules.app.service.UserService;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.shiro.crypto.hash.Sha256Hash;
import org.springframework.stereotype.Service;
@@ -40,7 +39,6 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
		UserEntity user = queryByUsername(form.getUsername());
		Assert.isNull(user, "账号或密码错误");
		//密码错误
		// if(!user.getPassword().equals(DigestUtils.sha256Hex(form.getPassword()))){
		if(!user.getPassword().equals(new Sha256Hash(form.getPassword(), user.getSalt()).toHex())){
			throw new RRException("账号或密码错误");
		}
@@ -59,6 +57,14 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
		this.save(user); 
	}
	@Override
	public int updatePassWord(Long id, String password) {
		String salt = RandomStringUtils.randomAlphanumeric(20);
		password = new Sha256Hash(password, salt).toHex();
		
		return baseMapper.updatePassWord(id, password, salt);
	}
	
	@Override
	public List<Map<String, Object>> queryOrderList(Long memberId) {
		return baseMapper.queryOrderList(memberId);
@@ -68,12 +74,4 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
	public Map<String, Object> queryOrderInfoByAttendersId(Long attendersId) {
		return baseMapper.queryOrderInfoByAttendersId(attendersId);
	}
	@Override
	public int updatePassWord(Long id, String password) {
		String salt = RandomStringUtils.randomAlphanumeric(20);
		password = new Sha256Hash(password, salt).toHex();
		return baseMapper.updatePassWord(id, password, salt);
	}
}