..

src/main/java/io/renren/common/utils/AliyunSmsUtils.java

@@ -0,0 +1,38 @@
package io.renren.common.utils;
import com.aliyuncs.CommonRequest;
import com.aliyuncs.CommonResponse;
import com.aliyuncs.DefaultAcsClient;
import com.aliyuncs.IAcsClient;
import com.aliyuncs.exceptions.ClientException;
import com.aliyuncs.exceptions.ServerException;
import com.aliyuncs.http.MethodType;
import com.aliyuncs.profile.DefaultProfile;
public class AliyunSmsUtils {
        public static String sendSms(String...params) {
        DefaultProfile profile = DefaultProfile.getProfile("cn-hangzhou", "LTAI4G9gC4LEJaFNU6eSaB8W", "42mTm89pNQMVHALMWmIuFMfjf5GJFV");
        IAcsClient client = new DefaultAcsClient(profile);
        CommonRequest request = new CommonRequest();
        request.setSysMethod(MethodType.POST);
        request.setSysDomain("dysmsapi.aliyuncs.com");
        request.setSysVersion("2017-05-25");
        request.setSysAction("SendSms");
        request.putQueryParameter("RegionId", "cn-hangzhou");
        request.putQueryParameter("PhoneNumbers", params[0]);
        request.putQueryParameter("SignName", params[1]);
        request.putQueryParameter("TemplateCode", params[2]);
        request.putQueryParameter("TemplateParam", params[3]);
        CommonResponse response = new CommonResponse();
        try {
            response = client.getCommonResponse(request);
            // System.out.println(response.getData());
        } catch (ServerException e) {
            e.printStackTrace();
        } catch (ClientException e) {
            e.printStackTrace();
        }
        return response.getData();
    }
}

src/main/java/io/renren/common/utils/ConfigConstant.java

@@ -19,4 +19,17 @@ public class ConfigConstant {
     */
    public final static String CLOUD_STORAGE_CONFIG_KEY = "CLOUD_STORAGE_CONFIG_KEY";
    /**
     * 验证码过期时间
     */
    public final static int EXPIRE_TIME = 5;
    /**
     * 阿里云短信签名
     */
    public final static String SignName = "中国腐蚀与防护学会";
    /**
     * 阿里云短信模板id
     */
    public final static String TemplateCode = "SMS_202813596";
}

src/main/java/io/renren/modules/admin/controller/PaperController.java

@@ -14,17 +14,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import io.renren.common.utils.MyUtils;
import io.renren.common.utils.PageUtils;
import io.renren.common.utils.R;
import io.renren.modules.admin.entity.PaperEntity;
import io.renren.modules.admin.entity.PaperviewEntity;
import io.renren.modules.admin.entity.AttendersEntity;
import io.renren.modules.admin.entity.AttendersviewEntity;
import io.renren.modules.admin.entity.MemberEntity;
import io.renren.modules.admin.service.AttendersService;
import io.renren.modules.admin.service.AttendersviewService;
import io.renren.modules.admin.service.MemberService;
import io.renren.modules.admin.service.PaperService;
import io.renren.modules.admin.service.PaperviewService;
@@ -41,12 +34,6 @@ public class PaperController {
    @Autowired
    private PaperService paperService;
    @Autowired
    private AttendersService attendersService;
    @Autowired
    private AttendersviewService attendersviewService;
    @Autowired
    private MemberService memberService;
    @Autowired
    private PaperviewService paperviewService;
    /**
@@ -79,46 +66,15 @@ public class PaperController {
     */
    @PostMapping("/save")
    @RequiresPermissions("admin:paper:save")
    public R save(@RequestBody PaperviewEntity paperForm){
        Long meetingId = paperForm.getMeetingId();
        if (meetingId == null || meetingId == 0L) {
    public R save(@RequestBody PaperEntity paper){
        if (paper.getAttendersId() == null || paper.getAttendersId() == 0L) {
            return R.error("会议id不可为空");
        }
        if (paperForm.getAttendersId()==null || paperForm.getAttendersId()==0L) {
            String symbol = MyUtils.md5(paperForm.getTruename() + paperForm.getPhone());
            AttendersviewEntity attendersview = attendersviewService.getBySymbolAndMid(symbol, meetingId);
            
            if (attendersview==null) {
                MemberEntity member = memberService.saveMember(paperForm.getTruename(), paperForm.getPhone(), paperForm.getOrganization(), null);
                Long memberId = member.getId();
                // 存参会信息
                AttendersEntity attenders = new AttendersEntity();
                attenders.setMemberId(memberId);
                attenders.setMeetingId(meetingId);
                attendersService.save(attenders);
                paperForm.setAttendersId(attenders.getId());
            } else {
                paperForm.setAttendersId(attendersview.getId());
            }
        }
        PaperEntity paper = new PaperEntity();
        paper.setAttendersId(paperForm.getAttendersId());
        paper.setTitle(paperForm.getTitle());
        paper.setUrl(paperForm.getUrl());
        paper.setType(paperForm.getType());
        paper.setStatus(0);
        paper.setMoney(paperForm.getMoney());
        paper.setTax(paperForm.getTax());
        paper.setMail(paperForm.getMail());
        paper.setRemark(paperForm.getRemark());
        paper.setCreateTime(new Date());
        paperService.save(paper);
        
        boolean res = paperService.save(paper);
        if (!res) {
            return R.error("保存失败");
        }
        return R.ok();
    }
@@ -127,27 +83,14 @@ public class PaperController {
     */
    @RequestMapping("/update")
    @RequiresPermissions("admin:paper:update")
    public R update(@RequestBody PaperviewEntity paperForm){
        Long meetingId = paperForm.getMeetingId();
        Long aid = paperForm.getAttendersId();
        if (meetingId == 0L || aid==0L) {
            return R.error("会议id不可为空, 参会名单id不能为空");
    public R update(@RequestBody PaperEntity paper){
        if (paper.getAttendersId() == null || paper.getAttendersId() == 0L) {
            return R.error("参会名单id不能为空");
        }
        boolean res = paperService.updateById(paper);
        if (!res) {
            return R.error("保存失败");
        }
        PaperEntity paper = new PaperEntity();
        paper.setId(paperForm.getId());
        paper.setAttendersId(paperForm.getAttendersId());
        paper.setTitle(paperForm.getTitle());
        paper.setUrl(paperForm.getUrl());
        paper.setType(paperForm.getType());
        paper.setStatus(paperForm.getStatus());
        paper.setMoney(paperForm.getMoney());
        paper.setTax(paperForm.getTax());
        paper.setMail(paperForm.getMail());
        paper.setRemark(paperForm.getRemark());
		paperService.updateById(paper);
        return R.ok();
    }

src/main/java/io/renren/modules/admin/controller/ReportController.java

@@ -94,7 +94,6 @@ public class ReportController {
            scheduleService.updateById(schedule);
        }
        
        return R.ok();
    }

src/main/java/io/renren/modules/admin/entity/MemberEntity.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
import io.renren.common.validator.group.AddGroup;
import io.renren.common.validator.group.UpdateGroup;
import io.renren.common.validator.Assert;
import java.io.Serializable;
import java.util.Date;
@@ -29,12 +28,12 @@ public class MemberEntity implements Serializable {
    /**
     * 
     */
    @TableId
    @TableId(value = "id")
    private Long id;
    /**
     * 名字
     */
    @NotBlank(message="姓名不能为空", groups = {AddGroup.class, UpdateGroup.class})
    @NotBlank(message="姓名不能为空", groups = AddGroup.class)
    private String truename;
    /**
     * 性别 1,男; 2,女
@@ -51,7 +50,7 @@ public class MemberEntity implements Serializable {
    /**
     * 电话
     */
    @NotBlank(message="电话不能为空", groups = {AddGroup.class, UpdateGroup.class})
    @NotBlank(message="电话不能为空", groups = AddGroup.class)
    private String phone;
    /**
     * 邮箱

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

@@ -8,10 +8,11 @@
package io.renren.modules.app.controller;
import io.renren.common.utils.R;
import io.renren.common.validator.ValidatorUtils;
import io.renren.modules.app.entity.UserEntity;
import io.renren.modules.app.form.LoginForm;
import io.renren.modules.app.service.SmsCodeService;
import io.renren.modules.app.service.UserService;
import io.renren.modules.app.utils.JwtUtils;
import io.swagger.annotations.Api;
@@ -34,6 +35,8 @@ import java.util.Map;
@RequestMapping("/app")
@Api("APP登录接口")
public class AppLoginController {
    @Autowired
    private SmsCodeService smsCodeService;
    @Autowired
    private UserService userService;
    @Autowired
@@ -61,4 +64,24 @@ public class AppLoginController {
        return R.ok(map);
    }
    @PostMapping("mobilecode")
    public R mobileCode(@RequestBody Map<String, Object> params) {
        String uuid = (String) params.get("uuid");
        String phone = (String) params.get("phone");
        UserEntity user = userService.queryByPhone(phone);
        if (user == null) {
            return R.error("手机号未注册");
        }
        String res = "";
        try {
            res = smsCodeService.getCode(uuid, phone);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return R.ok(res);
    }
    
}

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

@@ -14,14 +14,15 @@ 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.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
// import io.swagger.annotations.Api;
// import io.swagger.annotations.ApiOperation;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
// import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
// import org.springframework.web.bind.annotation.RequestMapping;
// import org.springframework.web.bind.annotation.RestController;
// import io.renren.modules.app.service.SmsCodeService;
import java.util.Date;
@@ -30,15 +31,15 @@ import java.util.Date;
 *
 * @author Mark sunlightcs@gmail.com
 */
@RestController
@RequestMapping("/app")
@Api("APP注册接口")
// @RestController
// @RequestMapping("/app")
// @Api("APP注册接口")
public class AppRegisterController {
    @Autowired
    private UserService userService;
    @PostMapping("register")
    @ApiOperation("注册")
    // @PostMapping("register")
    // @ApiOperation("注册")
    public R register(@RequestBody RegisterForm form){
        //表单校验
        ValidatorUtils.validateEntity(form);

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

@@ -8,17 +8,23 @@
package io.renren.modules.app.controller;
import io.renren.common.utils.R;
import io.renren.common.utils.AliyunSmsUtils;
import io.renren.modules.app.annotation.Login;
import io.renren.modules.app.annotation.LoginUser;
import io.renren.modules.app.entity.UserEntity;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.UUID;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.renren.modules.app.service.SmsCodeService;
/**
 * APP测试接口
@@ -29,25 +35,67 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/app")
@Api("APP测试接口")
public class AppTestController {
    @Autowired
    private SmsCodeService smsCodeService;
    @Login
    @GetMapping("userInfo")
    @ApiOperation("获取用户信息")
    public R userInfo(@LoginUser UserEntity user){
    public R userInfo(@LoginUser UserEntity user) {
        return R.ok().put("user", user);
    }
    @Login
    @GetMapping("userId")
    @ApiOperation("获取用户ID")
    public R userInfo(@RequestAttribute("userId") Integer userId){
    public R userInfo(@RequestAttribute("userId") Integer userId) {
        return R.ok().put("userId", userId);
    }
    @GetMapping("notToken")
    @ApiOperation("忽略Token验证测试")
    public R notToken(){
    public R notToken() {
        return R.ok().put("msg", "无需token也能访问。。。");
    }
    @PostMapping("sendSmsTest")
    public R sendTest() {
        String[] params = new String[3];
        params[0] = "17611467373"; //
        params[1] = "中国腐蚀与防护学会"; // SignName (签名名称)
        params[2] = "SMS_196640221"; // TemplateCode(模板code)
        AliyunSmsUtils.sendSms(params);
        return R.ok();
    }
    @PostMapping("mobileCodeTest")
    public R mobileCodeTest() {
        String phone = "17611467373";
        String uuid = UUID.randomUUID().toString();
        String res = "";
        try {
            res = smsCodeService.getCode(uuid, phone);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return R.ok(res);
    }
    @PostMapping("valmobileCodeTest")
    public R valMobileCodeTest() {
        String phone = "17611467373";
        String uuid = "2aada6ef-8cf8-4932-bc76-198cff8c8809";
        String code = "437964";
        try {
            smsCodeService.validate(uuid, code, phone);
            return R.ok();
        } catch (Exception e) {
            e.printStackTrace();
            return R.error();
        }
    }
}

src/main/java/io/renren/modules/app/dao/SmsCodeDao.java

@@ -0,0 +1,17 @@
package io.renren.modules.app.dao;
import io.renren.modules.app.entity.SmsCodeEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
 * 短信平台验证码
 * 
 * @author chenshun
 * @email sunlightcs@gmail.com
 * @date 2020-05-20 09:54:35
 */
@Mapper
public interface SmsCodeDao extends BaseMapper<SmsCodeEntity> {
	
}

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

@@ -0,0 +1,41 @@
package io.renren.modules.app.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
 * 短信平台验证码
 * 
 * @author chenshun
 * @email sunlightcs@gmail.com
 * @date 2020-05-20 09:54:35
 */
@Data
@TableName("sms_code")
public class SmsCodeEntity implements Serializable {
	private static final long serialVersionUID = 1L;
	/**
	 * uuid
	 */
	@TableId(type = IdType.INPUT)
	private String uuid;
	/**
	 * phone
	 */
	private String phone;
	/**
	 * code
	 */
	private String code;
	/**
	 * 过期时间
	 */
	private Date expireTime;
}

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

@@ -13,8 +13,10 @@ import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import javax.validation.constraints.NotBlank;
import io.renren.common.validator.group.AddGroup;
import io.renren.common.validator.group.UpdateGroup;
/**
 * 用户
@@ -22,7 +24,7 @@ import java.util.Date;
 * @author Mark sunlightcs@gmail.com
 */
@Data
@TableName("tb_user")
@TableName("member")
public class UserEntity implements Serializable {
	private static final long serialVersionUID = 1L;
@@ -32,20 +34,29 @@ public class UserEntity implements Serializable {
	@TableId
	private Long userId;
	/**
	 * 用户名
	 */
	private String username;
	/**
	 * 手机号
	 */
	private String mobile;
	/**
	 * 密码
	 */
	private String password;
	/**
	 * 创建时间
	 */
	private Date createTime;
     * 名字
     */
    @NotBlank(message="姓名不能为空", groups = {AddGroup.class, UpdateGroup.class})
    private String truename;
    /**
     * 性别 1,男; 2,女
     */
    private Integer sex;
    /**
     * 电话
     */
    @NotBlank(message="电话不能为空", groups = {AddGroup.class, UpdateGroup.class})
    private String phone;
    /**
     * 邮箱
     */
    private String email;
    /**
     * 备注
     */
    private String remark;
    /**
     * 
     */
    private String symbol;
}

src/main/java/io/renren/modules/app/form/LoginForm.java

@@ -8,8 +8,6 @@
package io.renren.modules.app.form;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@@ -20,14 +18,21 @@ import javax.validation.constraints.NotBlank;
 * @author Mark sunlightcs@gmail.com
 */
@Data
@ApiModel(value = "登录表单")
public class LoginForm {
    @ApiModelProperty(value = "手机号")
    @NotBlank(message="手机号不能为空")
    private String mobile;
    // @ApiModelProperty(value = "手机号")
    // @NotBlank(message="手机号不能为空")
    // private String mobile;
    // @ApiModelProperty(value = "密码")
    // @NotBlank(message="密码不能为空")
    // private String password;
    @ApiModelProperty(value = "密码")
    @NotBlank(message="手机号不能为空")
    private String phone;
    @NotBlank(message="密码不能为空")
    private String password;
    @NotBlank(message="短信验证码不能为空")
    private String code;
    private String uuid;
}

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

@@ -0,0 +1,26 @@
package io.renren.modules.app.service;
import com.baomidou.mybatisplus.extension.service.IService;
import io.renren.modules.app.entity.SmsCodeEntity;
/**
 * 短信验证码
 *
 * @author chenshun
 * @email sunlightcs@gmail.com
 * @date 2020-05-20 09:54:35
 */
public interface SmsCodeService extends IService<SmsCodeEntity> {
    /**
     * 获取短信验证码
     */
    String getCode(String uuid, String phone) throws Exception;
    /**
     * 验证码效验
     * @param uuid  uuid
     * @param code  验证码
     * @return  true：成功  false：失败
     */
    boolean validate(String uuid, String code, String phone);
}

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

@@ -11,7 +11,7 @@ package io.renren.modules.app.service;
import com.baomidou.mybatisplus.extension.service.IService;
import io.renren.modules.app.entity.UserEntity;
import io.renren.modules.app.form.LoginForm;
// import io.renren.modules.app.form.LoginForm;
/**
 * 用户
@@ -20,12 +20,12 @@ import io.renren.modules.app.form.LoginForm;
 */
public interface UserService extends IService<UserEntity> {
	UserEntity queryByMobile(String mobile);
	UserEntity queryByPhone(String phone);
	/**
	 * 用户登录
	 * @param form    登录表单
	 * @return        返回用户ID
	 */
	long login(LoginForm form);
	// long login(LoginForm form);
}

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

@@ -0,0 +1,62 @@
package io.renren.modules.app.service.impl;
import org.springframework.stereotype.Service;
import java.util.Date;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.renren.common.exception.RRException;
import org.apache.commons.lang.StringUtils;
import io.renren.common.utils.ConfigConstant;
import io.renren.common.utils.DateUtils;
import io.renren.modules.app.dao.SmsCodeDao;
import io.renren.modules.app.entity.SmsCodeEntity;
import io.renren.modules.app.service.SmsCodeService;
import io.renren.common.utils.AliyunSmsUtils;
@Service("smsCodeService")
public class SmsCodeServiceImpl extends ServiceImpl<SmsCodeDao, SmsCodeEntity> implements SmsCodeService {
    @Override
    public String getCode(String uuid, String phone) {
        if (StringUtils.isBlank(uuid)) {
            throw new RRException("uuid不能为空");
        }
        // 生成数字验证码
        String code = String.valueOf((int) ((Math.random() * 9 + 1) * 100000));
        SmsCodeEntity smsCodeEntity = new SmsCodeEntity();
        smsCodeEntity.setUuid(uuid);
        smsCodeEntity.setPhone(phone);
        smsCodeEntity.setCode(code);
        smsCodeEntity.setExpireTime(DateUtils.addDateMinutes(new Date(), ConfigConstant.EXPIRE_TIME));
        String result = "";
        try {
            this.save(smsCodeEntity);
            // 发送验证码
            result = AliyunSmsUtils.sendSms(phone, ConfigConstant.SignName, ConfigConstant.TemplateCode,
                    "{\"code\":" + code + "}");
            System.out.println(result);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return result;
    }
    @Override
    public boolean validate(String uuid, String code, String phone) {
        SmsCodeEntity smsCodeEntity = this.getOne(new QueryWrapper<SmsCodeEntity>().eq("uuid", uuid));
        if (smsCodeEntity == null) {
            return false;
        }
        if (smsCodeEntity.getCode().equalsIgnoreCase(code) && smsCodeEntity.getPhone().equalsIgnoreCase(phone)
                && smsCodeEntity.getExpireTime().getTime() >= System.currentTimeMillis()) {
            // 删除验证码
            this.removeById(uuid);
            return true;
        }
        return false;
    }
}

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

@@ -11,13 +11,13 @@ package io.renren.modules.app.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.renren.common.exception.RRException;
import io.renren.common.validator.Assert;
// import io.renren.common.exception.RRException;
// import io.renren.common.validator.Assert;
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.form.LoginForm;
import io.renren.modules.app.service.UserService;
import org.apache.commons.codec.digest.DigestUtils;
// import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.stereotype.Service;
@@ -25,20 +25,20 @@ import org.springframework.stereotype.Service;
public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements UserService {
	@Override
	public UserEntity queryByMobile(String mobile) {
		return baseMapper.selectOne(new QueryWrapper<UserEntity>().eq("mobile", mobile));
	public UserEntity queryByPhone(String phone) {
		return baseMapper.selectOne(new QueryWrapper<UserEntity>().eq("phone", phone));
	}
	@Override
	public long login(LoginForm form) {
		UserEntity user = queryByMobile(form.getMobile());
		Assert.isNull(user, "手机号或密码错误");
	// @Override
	// public long login(LoginForm form) {
	// 	UserEntity user = queryByPhone(form.getMobile());
	// 	Assert.isNull(user, "手机号或密码错误");
		//密码错误
		if(!user.getPassword().equals(DigestUtils.sha256Hex(form.getPassword()))){
			throw new RRException("手机号或密码错误");
		}
	// 	//密码错误
	// 	if(!user.getPassword().equals(DigestUtils.sha256Hex(form.getPassword()))){
	// 		throw new RRException("手机号或密码错误");
	// 	}
		return user.getUserId();
	}
	// 	return user.getUserId();
	// }
}