Commit 802bde32 authored by alex yao's avatar alex yao

feat:用户信息添加邮箱字段

parent 2c689394
......@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@Component
public class EmailLoginChannel implements LoginChannelService{
public class EmailLoginChannel implements LoginChannelService {
@Resource
private BizMemberInfoService bizMemberInfoService;
@Resource
......@@ -27,7 +27,7 @@ public class EmailLoginChannel implements LoginChannelService{
Assert.notBlank(memberLoginRequest.getAccount(), "用户登录,登录账号不能为空");
Assert.notBlank(memberLoginRequest.getAuthCode(), "用户登录,验证码不能为空");
if(!judgeCodeService.judgeCode(memberLoginRequest.getAccount(), memberLoginRequest.getAuthCode())){
if (!judgeCodeService.judgeCode(memberLoginRequest.getAccount(), memberLoginRequest.getAuthCode())) {
throw new BusinessException("验证码有误,请重新输入");
}
......@@ -36,6 +36,7 @@ public class EmailLoginChannel implements LoginChannelService{
MemberInfoEntity memberInfoEntity = new MemberInfoEntity();
memberInfoEntity.setAccount(memberLoginRequest.getAccount());
memberInfoEntity.setNickName(memberLoginRequest.getAccount());
memberInfoEntity.setEmail(memberLoginRequest.getAccount());
String param = fmxParamConfigService.getParam("member.default.avatar");
if (StringUtils.isNoneBlank(param)) {
memberInfoEntity.setAvatarUrl(param);
......
......@@ -19,6 +19,7 @@ public class MemberInfoConvert {
bizMemberInfoModel.setNickName(memberInfoEntity.getNickName());
bizMemberInfoModel.setAvatarUrl(memberInfoEntity.getAvatarUrl());
bizMemberInfoModel.setMobilePhone(memberInfoEntity.getMobilePhone());
bizMemberInfoModel.setEmail(memberInfoEntity.getEmail());
bizMemberInfoModel.setLastLoginTime(memberInfoEntity.getLastLoginTime());
bizMemberInfoModel.setShareCode(memberInfoEntity.getShareCode());
bizMemberInfoModel.setRemark(memberInfoEntity.getRemark());
......@@ -35,6 +36,7 @@ public class MemberInfoConvert {
memberInfoEntity.setNickName(bizMemberInfoModel.getNickName());
memberInfoEntity.setAvatarUrl(bizMemberInfoModel.getAvatarUrl());
memberInfoEntity.setMobilePhone(bizMemberInfoModel.getMobilePhone());
memberInfoEntity.setEmail(bizMemberInfoModel.getEmail());
memberInfoEntity.setLastLoginTime(bizMemberInfoModel.getLastLoginTime());
memberInfoEntity.setRemark(bizMemberInfoModel.getRemark());
memberInfoEntity.setShareCode(bizMemberInfoModel.getShareCode());
......
......@@ -86,6 +86,20 @@ public class MemberInfoEntity extends BaseModelClass {
this.mobilePhone = mobilePhone;
}
/**
* email
* 用户邮箱
*/
private java.lang.String email;
public java.lang.String getEmail() {
return this.email;
}
public void setEmail(java.lang.String email) {
this.email = email;
}
/**
* remark
......
......@@ -4,12 +4,15 @@ import java.io.Serializable;
import java.util.Date;
import cn.com.yict.framemax.data.model.BaseModelClass;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Id;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Version;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
......@@ -25,31 +28,34 @@ import javax.persistence.GenerationType;
public class BizMemberInfoModel extends BaseModelClass implements Serializable {
private static final long serialVersionUID = 1L;
/** member_id
*会员id
*/
/**
* member_id
* 会员id
*/
private java.lang.Integer memberId;
@Column(name = "member_id",length = 10)
@Id
@Column(name = "member_id", length = 10)
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
public java.lang.Integer getMemberId(){
public java.lang.Integer getMemberId() {
return this.memberId;
}
public void setMemberId(java.lang.Integer memberId){
public void setMemberId(java.lang.Integer memberId) {
this.memberId = memberId;
super.addValidField("memberId");
}
/** account
*用户账号
*/
/**
* account
* 用户账号
*/
private java.lang.String account;
@Column(name = "account",length = 50)
@Column(name = "account", length = 50)
public String getAccount() {
return account;
}
......@@ -60,91 +66,113 @@ public class BizMemberInfoModel extends BaseModelClass implements Serializable {
}
/** nick_name
*用户昵称
*/
/**
* nick_name
* 用户昵称
*/
private java.lang.String nickName;
@Column(name = "nick_name",length = 50)
public java.lang.String getNickName(){
@Column(name = "nick_name", length = 50)
public java.lang.String getNickName() {
return this.nickName;
}
public void setNickName(java.lang.String nickName){
public void setNickName(java.lang.String nickName) {
this.nickName = nickName;
super.addValidField("nickName");
}
/** avatar_url
*用户头像图片的 URL
*/
/**
* avatar_url
* 用户头像图片的 URL
*/
private java.lang.String avatarUrl;
@Column(name = "avatar_url",length = 255)
public java.lang.String getAvatarUrl(){
@Column(name = "avatar_url", length = 255)
public java.lang.String getAvatarUrl() {
return this.avatarUrl;
}
public void setAvatarUrl(java.lang.String avatarUrl){
public void setAvatarUrl(java.lang.String avatarUrl) {
this.avatarUrl = avatarUrl;
super.addValidField("avatarUrl");
}
/** mobile_phone
*用户手机号
*/
/**
* mobile_phone
* 用户手机号
*/
private java.lang.String mobilePhone;
@Column(name = "mobile_phone",length = 50)
public java.lang.String getMobilePhone(){
@Column(name = "mobile_phone", length = 50)
public java.lang.String getMobilePhone() {
return this.mobilePhone;
}
public void setMobilePhone(java.lang.String mobilePhone){
public void setMobilePhone(java.lang.String mobilePhone) {
this.mobilePhone = mobilePhone;
super.addValidField("mobilePhone");
}
/** is_deleted
*是否删除 Y-是 N-否
*/
/**
* email
* 用户邮箱
*/
private java.lang.String email;
@Column(name = "email", length = 150)
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
super.addValidField("email");
}
/**
* is_deleted
* 是否删除 Y-是 N-否
*/
private java.lang.String isDeleted;
@Column(name = "is_deleted",length = 50)
public java.lang.String getIsDeleted(){
@Column(name = "is_deleted", length = 50)
public java.lang.String getIsDeleted() {
return this.isDeleted;
}
public void setIsDeleted(java.lang.String isDeleted){
public void setIsDeleted(java.lang.String isDeleted) {
this.isDeleted = isDeleted;
super.addValidField("isDeleted");
}
/** remark
*备注
*/
/**
* remark
* 备注
*/
private java.lang.String remark;
@Column(name = "remark",length = 255)
public java.lang.String getRemark(){
@Column(name = "remark", length = 255)
public java.lang.String getRemark() {
return this.remark;
}
public void setRemark(java.lang.String remark){
public void setRemark(java.lang.String remark) {
this.remark = remark;
super.addValidField("remark");
}
/** last_login_time
*用户账号
/**
* last_login_time
* 用户账号
*/
private java.util.Date lastLoginTime;
@Column(name = "last_login_time",length = 50)
@Column(name = "last_login_time", length = 50)
public Date getLastLoginTime() {
return lastLoginTime;
}
......@@ -155,11 +183,13 @@ public class BizMemberInfoModel extends BaseModelClass implements Serializable {
}
/** share_code
* 分享码
*/
/**
* share_code
* 分享码
*/
private java.lang.String shareCode;
@Column(name = "share_code",length = 50)
@Column(name = "share_code", length = 50)
public String getShareCode() {
return shareCode;
}
......@@ -170,85 +200,90 @@ public class BizMemberInfoModel extends BaseModelClass implements Serializable {
}
/** CREATOR
*创建人
*/
/**
* CREATOR
* 创建人
*/
private java.lang.String creator;
@Column(name = "CREATOR",length = 50)
public java.lang.String getCreator(){
@Column(name = "CREATOR", length = 50)
public java.lang.String getCreator() {
return this.creator;
}
public void setCreator(java.lang.String creator){
public void setCreator(java.lang.String creator) {
this.creator = creator;
super.addValidField("creator");
}
/** CREATED_TIME
*创建时间
*/
/**
* CREATED_TIME
* 创建时间
*/
private java.util.Date createdTime;
@Column(name = "CREATED_TIME",length = 19)
public java.util.Date getCreatedTime(){
@Column(name = "CREATED_TIME", length = 19)
public java.util.Date getCreatedTime() {
return this.createdTime;
}
public void setCreatedTime(java.util.Date createdTime){
public void setCreatedTime(java.util.Date createdTime) {
this.createdTime = createdTime;
super.addValidField("createdTime");
}
/** MODIFIER
*修改人
*/
/**
* MODIFIER
* 修改人
*/
private java.lang.String modifier;
@Column(name = "MODIFIER",length = 50)
public java.lang.String getModifier(){
@Column(name = "MODIFIER", length = 50)
public java.lang.String getModifier() {
return this.modifier;
}
public void setModifier(java.lang.String modifier){
public void setModifier(java.lang.String modifier) {
this.modifier = modifier;
super.addValidField("modifier");
}
/** MODIFIED_TIME
*修改时间
*/
/**
* MODIFIED_TIME
* 修改时间
*/
private java.util.Date modifiedTime;
@Column(name = "MODIFIED_TIME",length = 19)
public java.util.Date getModifiedTime(){
@Column(name = "MODIFIED_TIME", length = 19)
public java.util.Date getModifiedTime() {
return this.modifiedTime;
}
public void setModifiedTime(java.util.Date modifiedTime){
public void setModifiedTime(java.util.Date modifiedTime) {
this.modifiedTime = modifiedTime;
super.addValidField("modifiedTime");
}
/** SYS_VERSION
*乐观锁,版本号
*/
/**
* SYS_VERSION
* 乐观锁,版本号
*/
private java.lang.Integer sysVersion;
@Column(name = "SYS_VERSION",length = 10)
@Version
public java.lang.Integer getSysVersion(){
@Column(name = "SYS_VERSION", length = 10)
@Version
public java.lang.Integer getSysVersion() {
return this.sysVersion;
}
public void setSysVersion(java.lang.Integer sysVersion){
public void setSysVersion(java.lang.Integer sysVersion) {
this.sysVersion = sysVersion;
super.addValidField("sysVersion");
}
}
\ No newline at end of file
......@@ -63,6 +63,7 @@ public class BizMemberInfoServiceImpl extends BaseServiceImpl
model.setNickName(memberInfoEntity.getNickName());
model.setMobilePhone(memberInfoEntity.getMobilePhone());
model.setAvatarUrl(memberInfoEntity.getAvatarUrl());
model.setEmail(memberInfoEntity.getEmail());
if (checkVaildAccountExist(memberInfoEntity.getAccount())) {
throw new BusinessException("该账号已经被注册,请更换一个");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment