diff --git a/user/user-application/pom.xml b/user/user-application/pom.xml index 625d36667..5ed01743a 100644 --- a/user/user-application/pom.xml +++ b/user/user-application/pom.xml @@ -26,13 +26,27 @@ user-service-impl 1.0-SNAPSHOT - + + cn.iocoder.mall + user-service-api + 1.0-SNAPSHOT + cn.iocoder.mall common-framework 1.0-SNAPSHOT + + cn.iocoder.mall + user-sdk + 1.0-SNAPSHOT + + + cn.iocoder.mall + admin-sdk + + org.springframework.boot spring-boot-starter-web @@ -47,62 +61,26 @@ com.alibaba dubbo - 2.6.5 - com.alibaba.boot dubbo-spring-boot-starter - 0.2.1.RELEASE org.apache.curator curator-framework - 2.12.0 - - - - org.mapstruct - mapstruct - ${org.mapstruct.version} io.springfox springfox-swagger2 - 2.9.2 io.springfox springfox-swagger-ui - 2.9.2 - - cn.iocoder.mall - user-service-api - 1.0-SNAPSHOT - compile - - - cn.iocoder.mall - user-sdk - 1.0-SNAPSHOT - compile - - - - cn.iocoder.mall - admin-sdk - 1.0-SNAPSHOT - - - - org.mapstruct - mapstruct - ${org.mapstruct.version} - @@ -112,30 +90,14 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - org.mapstruct - mapstruct-processor - ${org.mapstruct.version} - - - org.springframework.boot spring-boot-maven-plugin - - true - - - \ No newline at end of file + diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/po/UserAddressAddPO.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/po/UserAddressAddPO.java index bc31804ee..0109e6bb9 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/po/UserAddressAddPO.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/po/UserAddressAddPO.java @@ -2,6 +2,8 @@ package cn.iocoder.mall.user.application.po; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; @@ -14,6 +16,8 @@ import java.io.Serializable; * @time 2019-04-06 14:13 */ @ApiModel("用户地址") +@Data +@Accessors(chain = true) public class UserAddressAddPO implements Serializable { /** @@ -43,49 +47,4 @@ public class UserAddressAddPO implements Serializable { @Size(min = 10, max = 100, message = "地址在 10 ~ 100 字之间!") private String address; - @Override - public String toString() { - return "UserAddressAddPO{" + - "areaNo='" + areaNo + '\'' + - ", name='" + name + '\'' + - ", mobile='" + mobile + '\'' + - ", address='" + address + '\'' + - '}'; - } - - public String getAreaNo() { - return areaNo; - } - - public UserAddressAddPO setAreaNo(String areaNo) { - this.areaNo = areaNo; - return this; - } - - public String getName() { - return name; - } - - public UserAddressAddPO setName(String name) { - this.name = name; - return this; - } - - public String getMobile() { - return mobile; - } - - public UserAddressAddPO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getAddress() { - return address; - } - - public UserAddressAddPO setAddress(String address) { - this.address = address; - return this; - } } diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/po/UserAddressUpdatePO.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/po/UserAddressUpdatePO.java index 551607482..634f93a7b 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/po/UserAddressUpdatePO.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/po/UserAddressUpdatePO.java @@ -2,6 +2,8 @@ package cn.iocoder.mall.user.application.po; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; @@ -14,6 +16,8 @@ import java.io.Serializable; * @time 2019-04-06 14:13 */ @ApiModel("用户地址-更新") +@Data +@Accessors(chain = true) public class UserAddressUpdatePO implements Serializable { @@ -50,59 +54,4 @@ public class UserAddressUpdatePO implements Serializable { @Size(min = 10, max = 100, message = "地址在 10 ~ 100 字之间!") private String address; - @Override - public String toString() { - return "UserAddressUpdatePO{" + - "id=" + id + - ", areaNo='" + areaNo + '\'' + - ", name='" + name + '\'' + - ", mobile='" + mobile + '\'' + - ", address='" + address + '\'' + - '}'; - } - - public Integer getId() { - return id; - } - - public UserAddressUpdatePO setId(Integer id) { - this.id = id; - return this; - } - - public String getAreaNo() { - return areaNo; - } - - public UserAddressUpdatePO setAreaNo(String areaNo) { - this.areaNo = areaNo; - return this; - } - - public String getName() { - return name; - } - - public UserAddressUpdatePO setName(String name) { - this.name = name; - return this; - } - - public String getMobile() { - return mobile; - } - - public UserAddressUpdatePO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getAddress() { - return address; - } - - public UserAddressUpdatePO setAddress(String address) { - this.address = address; - return this; - } } diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/admins/AdminsUserPageVO.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/admins/AdminsUserPageVO.java index 07b0e57f7..0d0365304 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/admins/AdminsUserPageVO.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/admins/AdminsUserPageVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.user.application.vo.admins; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.List; @ApiModel("用户分页 VO") +@Data +@Accessors(chain = true) public class AdminsUserPageVO { @ApiModelProperty(value = "用户数组") @@ -13,22 +17,4 @@ public class AdminsUserPageVO { @ApiModelProperty(value = "用户总数") private Integer count; - public List getUsers() { - return users; - } - - public AdminsUserPageVO setUsers(List users) { - this.users = users; - return this; - } - - public Integer getCount() { - return count; - } - - public AdminsUserPageVO setCount(Integer count) { - this.count = count; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/admins/AdminsUserVO.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/admins/AdminsUserVO.java index f1f550790..04f1af62c 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/admins/AdminsUserVO.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/admins/AdminsUserVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.user.application.vo.admins; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; @ApiModel("用户 VO") +@Data +@Accessors(chain = true) public class AdminsUserVO { @ApiModelProperty(value = "用户编号", required = true, example = "1") @@ -21,58 +25,4 @@ public class AdminsUserVO { @ApiModelProperty(value = "创建时间", required = true, example = "时间戳格式") private Date createTime; - public Integer getId() { - return id; - } - - public AdminsUserVO setId(Integer id) { - this.id = id; - return this; - } - - public String getMobile() { - return mobile; - } - - public AdminsUserVO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getNickname() { - return nickname; - } - - public AdminsUserVO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - - public String getAvatar() { - return avatar; - } - - public AdminsUserVO setAvatar(String avatar) { - this.avatar = avatar; - return this; - } - - public Integer getStatus() { - return status; - } - - public AdminsUserVO setStatus(Integer status) { - this.status = status; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public AdminsUserVO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/MobileRegisterVO.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/MobileRegisterVO.java index fa5ba739f..04c8debff 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/MobileRegisterVO.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/MobileRegisterVO.java @@ -2,8 +2,12 @@ package cn.iocoder.mall.user.application.vo.users; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; @ApiModel("手机注册结果 VO") +@Data +@Accessors(chain = true) public class MobileRegisterVO { @ApiModelProperty(value = "访问令牌", required = true, example = "2e3d7635c15e47e997611707a237859f") @@ -13,31 +17,4 @@ public class MobileRegisterVO { @ApiModelProperty(value = "过期时间，单位：秒", required = true, example = "2879") private Integer expiresIn; - public String getAccessToken() { - return accessToken; - } - - public MobileRegisterVO setAccessToken(String accessToken) { - this.accessToken = accessToken; - return this; - } - - public String getRefreshToken() { - return refreshToken; - } - - public MobileRegisterVO setRefreshToken(String refreshToken) { - this.refreshToken = refreshToken; - return this; - } - - public Integer getExpiresIn() { - return expiresIn; - } - - public MobileRegisterVO setExpiresIn(Integer expiresIn) { - this.expiresIn = expiresIn; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/UsersUserVO.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/UsersUserVO.java index cb8171251..ca03b2d48 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/UsersUserVO.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/UsersUserVO.java @@ -2,8 +2,12 @@ package cn.iocoder.mall.user.application.vo.users; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; @ApiModel("用户信息 VO") +@Data +@Accessors(chain = true) public class UsersUserVO { @ApiModelProperty(value = "用户编号", required = true, example = "123") @@ -15,40 +19,4 @@ public class UsersUserVO { @ApiModelProperty(value = "头像", required = true, example = "http://www.iocoder.cn/xxx.jpg") private String avatar; - public Integer getId() { - return id; - } - - public UsersUserVO setId(Integer id) { - this.id = id; - return this; - } - - public String getMobile() { - return mobile; - } - - public UsersUserVO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getNickname() { - return nickname; - } - - public UsersUserVO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - - public String getAvatar() { - return avatar; - } - - public UsersUserVO setAvatar(String avatar) { - this.avatar = avatar; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-sdk/pom.xml b/user/user-sdk/pom.xml index 9aa1e6d7f..f595da36f 100644 --- a/user/user-sdk/pom.xml +++ b/user/user-sdk/pom.xml @@ -11,6 +11,19 @@ user-sdk + + cn.iocoder.mall + common-framework + 1.0-SNAPSHOT + compile + + + cn.iocoder.mall + user-service-api + 1.0-SNAPSHOT + compile + + org.springframework spring-context @@ -29,31 +42,20 @@ 5.1.5.RELEASE compile + com.alibaba dubbo - 2.6.5 - compile + javax.servlet servlet-api 2.5 provided - - cn.iocoder.mall - common-framework - 1.0-SNAPSHOT - compile - - - cn.iocoder.mall - user-service-api - 1.0-SNAPSHOT - compile - + - \ No newline at end of file + diff --git a/user/user-service-api/pom.xml b/user/user-service-api/pom.xml index 563b020b7..5220c770d 100644 --- a/user/user-service-api/pom.xml +++ b/user/user-service-api/pom.xml @@ -16,7 +16,21 @@ common-framework 1.0-SNAPSHOT + + + org.mapstruct + mapstruct + + + org.mapstruct + mapstruct-jdk8 + + + org.projectlombok + lombok + + - \ No newline at end of file + diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AccessTokenBO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AccessTokenBO.java index 1b7883149..5a88f334f 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AccessTokenBO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AccessTokenBO.java @@ -1,7 +1,12 @@ package cn.iocoder.mall.user.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; +@Data +@Accessors(chain = true) public class OAuth2AccessTokenBO implements Serializable { /** @@ -17,31 +22,4 @@ public class OAuth2AccessTokenBO implements Serializable { */ private Integer expiresIn; - public String getAccessToken() { - return accessToken; - } - - public OAuth2AccessTokenBO setAccessToken(String accessToken) { - this.accessToken = accessToken; - return this; - } - - public String getRefreshToken() { - return refreshToken; - } - - public OAuth2AccessTokenBO setRefreshToken(String refreshToken) { - this.refreshToken = refreshToken; - return this; - } - - public Integer getExpiresIn() { - return expiresIn; - } - - public OAuth2AccessTokenBO setExpiresIn(Integer expiresIn) { - this.expiresIn = expiresIn; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AuthenticationBO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AuthenticationBO.java index 424de512a..1de2d1c80 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AuthenticationBO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AuthenticationBO.java @@ -1,7 +1,12 @@ package cn.iocoder.mall.user.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; +@Data +@Accessors(chain = true) public class OAuth2AuthenticationBO implements Serializable { /** @@ -9,13 +14,4 @@ public class OAuth2AuthenticationBO implements Serializable { */ private Integer userId; - public Integer getUserId() { - return userId; - } - - public OAuth2AuthenticationBO setUserId(Integer userId) { - this.userId = userId; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserAddressBO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserAddressBO.java index 3c9ff30d1..484e2faa5 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserAddressBO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserAddressBO.java @@ -1,9 +1,14 @@ package cn.iocoder.mall.user.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + /** * @author Sin * @time 2019-04-06 13:28 */ +@Data +@Accessors(chain = true) public class UserAddressBO { @@ -32,69 +37,4 @@ public class UserAddressBO { */ private String address; - @Override - public String toString() { - return "UserAddressBO{" + - "id=" + id + - ", userId=" + userId + - ", areaNo='" + areaNo + '\'' + - ", name='" + name + '\'' + - ", mobile='" + mobile + '\'' + - ", address='" + address + '\'' + - '}'; - } - - public Integer getId() { - return id; - } - - public UserAddressBO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getUserId() { - return userId; - } - - public UserAddressBO setUserId(Integer userId) { - this.userId = userId; - return this; - } - - public String getAreaNo() { - return areaNo; - } - - public UserAddressBO setAreaNo(String areaNo) { - this.areaNo = areaNo; - return this; - } - - public String getName() { - return name; - } - - public UserAddressBO setName(String name) { - this.name = name; - return this; - } - - public String getMobile() { - return mobile; - } - - public UserAddressBO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getAddress() { - return address; - } - - public UserAddressBO setAddress(String address) { - this.address = address; - return this; - } } diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserAddressPageBO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserAddressPageBO.java index 4efe04158..c729b5fb1 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserAddressPageBO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserAddressPageBO.java @@ -1,5 +1,8 @@ package cn.iocoder.mall.user.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.util.List; @@ -9,6 +12,8 @@ import java.util.List; * @author Sin * @time 2019-04-06 13:56 */ +@Data +@Accessors(chain = true) public class UserAddressPageBO implements Serializable { /** @@ -20,29 +25,4 @@ public class UserAddressPageBO implements Serializable { */ private List list; - @Override - public String toString() { - return "UserAddressPageBO{" + - "total=" + total + - ", list=" + list + - '}'; - } - - public Integer getTotal() { - return total; - } - - public UserAddressPageBO setTotal(Integer total) { - this.total = total; - return this; - } - - public List getList() { - return list; - } - - public UserAddressPageBO setList(List list) { - this.list = list; - return this; - } } diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserBO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserBO.java index c22cc735c..3a2f7f139 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserBO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserBO.java @@ -1,7 +1,12 @@ package cn.iocoder.mall.user.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; +@Data +@Accessors(chain = true) public class UserBO { /** @@ -32,57 +37,4 @@ public class UserBO { */ private Date createTime; - public Integer getId() { - return id; - } - - public UserBO setId(Integer id) { - this.id = id; - return this; - } - - public String getMobile() { - return mobile; - } - - public UserBO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getNickname() { - return nickname; - } - - public UserBO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - - public String getAvatar() { - return avatar; - } - - public UserBO setAvatar(String avatar) { - this.avatar = avatar; - return this; - } - - public Integer getStatus() { - return status; - } - - public UserBO setStatus(Integer status) { - this.status = status; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public UserBO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } -} \ No newline at end of file +} diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserPageBO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserPageBO.java index 648ac3e85..19aae5b65 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserPageBO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserPageBO.java @@ -1,7 +1,12 @@ package cn.iocoder.mall.user.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.List; +@Data +@Accessors(chain = true) public class UserPageBO { /** @@ -13,22 +18,4 @@ public class UserPageBO { */ private Integer count; - public List getUsers() { - return users; - } - - public UserPageBO setUsers(List users) { - this.users = users; - return this; - } - - public Integer getCount() { - return count; - } - - public UserPageBO setCount(Integer count) { - this.count = count; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAccessLogAddDTO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAccessLogAddDTO.java index 2dcbf155c..1b50edb8a 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAccessLogAddDTO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAccessLogAddDTO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.user.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotNull; import java.util.Date; /** * 用户访问日志添加 DTO */ +@Data +@Accessors(chain = true) public class UserAccessLogAddDTO { /** @@ -56,76 +61,4 @@ public class UserAccessLogAddDTO { @NotNull(message = "响应时长不能为空") private Integer responseTime; - public Integer getUserId() { - return userId; - } - - public UserAccessLogAddDTO setUserId(Integer userId) { - this.userId = userId; - return this; - } - - public String getUri() { - return uri; - } - - public UserAccessLogAddDTO setUri(String uri) { - this.uri = uri; - return this; - } - - public String getQueryString() { - return queryString; - } - - public UserAccessLogAddDTO setQueryString(String queryString) { - this.queryString = queryString; - return this; - } - - public String getMethod() { - return method; - } - - public UserAccessLogAddDTO setMethod(String method) { - this.method = method; - return this; - } - - public String getUserAgent() { - return userAgent; - } - - public UserAccessLogAddDTO setUserAgent(String userAgent) { - this.userAgent = userAgent; - return this; - } - - public String getIp() { - return ip; - } - - public UserAccessLogAddDTO setIp(String ip) { - this.ip = ip; - return this; - } - - public Date getStartTime() { - return startTime; - } - - public UserAccessLogAddDTO setStartTime(Date startTime) { - this.startTime = startTime; - return this; - } - - public Integer getResponseTime() { - return responseTime; - } - - public UserAccessLogAddDTO setResponseTime(Integer responseTime) { - this.responseTime = responseTime; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAddressAddDTO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAddressAddDTO.java index 29e5112ce..d85c7bd98 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAddressAddDTO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAddressAddDTO.java @@ -1,5 +1,8 @@ package cn.iocoder.mall.user.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; /** @@ -8,6 +11,8 @@ import java.io.Serializable; * @author Sin * @time 2019-04-06 13:25 */ +@Data +@Accessors(chain = true) public class UserAddressAddDTO implements Serializable { /** @@ -31,59 +36,4 @@ public class UserAddressAddDTO implements Serializable { */ private String address; - @Override - public String toString() { - return "UserAddressAddDTO{" + - "userId=" + userId + - ", areaNo='" + areaNo + '\'' + - ", name='" + name + '\'' + - ", mobile='" + mobile + '\'' + - ", address='" + address + '\'' + - '}'; - } - - public Integer getUserId() { - return userId; - } - - public UserAddressAddDTO setUserId(Integer userId) { - this.userId = userId; - return this; - } - - public String getAreaNo() { - return areaNo; - } - - public UserAddressAddDTO setAreaNo(String areaNo) { - this.areaNo = areaNo; - return this; - } - - public String getName() { - return name; - } - - public UserAddressAddDTO setName(String name) { - this.name = name; - return this; - } - - public String getMobile() { - return mobile; - } - - public UserAddressAddDTO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getAddress() { - return address; - } - - public UserAddressAddDTO setAddress(String address) { - this.address = address; - return this; - } } diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAddressUpdateDTO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAddressUpdateDTO.java index af4363237..00f58eece 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAddressUpdateDTO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAddressUpdateDTO.java @@ -1,5 +1,8 @@ package cn.iocoder.mall.user.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; /** @@ -8,6 +11,8 @@ import java.io.Serializable; * @author Sin * @time 2019-04-06 13:28 */ +@Data +@Accessors(chain = true) public class UserAddressUpdateDTO implements Serializable { /** @@ -35,69 +40,4 @@ public class UserAddressUpdateDTO implements Serializable { */ private String address; - @Override - public String toString() { - return "UserAddressUpdateDTO{" + - "id=" + id + - ", userId=" + userId + - ", areaNo='" + areaNo + '\'' + - ", name='" + name + '\'' + - ", mobile='" + mobile + '\'' + - ", address='" + address + '\'' + - '}'; - } - - public Integer getId() { - return id; - } - - public UserAddressUpdateDTO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getUserId() { - return userId; - } - - public UserAddressUpdateDTO setUserId(Integer userId) { - this.userId = userId; - return this; - } - - public String getAreaNo() { - return areaNo; - } - - public UserAddressUpdateDTO setAreaNo(String areaNo) { - this.areaNo = areaNo; - return this; - } - - public String getName() { - return name; - } - - public UserAddressUpdateDTO setName(String name) { - this.name = name; - return this; - } - - public String getMobile() { - return mobile; - } - - public UserAddressUpdateDTO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getAddress() { - return address; - } - - public UserAddressUpdateDTO setAddress(String address) { - this.address = address; - return this; - } } diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserPageDTO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserPageDTO.java index 3be215353..afceb4095 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserPageDTO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserPageDTO.java @@ -1,7 +1,12 @@ package cn.iocoder.mall.user.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotNull; +@Data +@Accessors(chain = true) public class UserPageDTO { /** @@ -16,31 +21,4 @@ public class UserPageDTO { @NotNull(message = "每页条数不能为空") private Integer pageSize; - public Integer getPageNo() { - return pageNo; - } - - public String getNickname() { - return nickname; - } - - public UserPageDTO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - - public UserPageDTO setPageNo(Integer pageNo) { - this.pageNo = pageNo; - return this; - } - - public Integer getPageSize() { - return pageSize; - } - - public UserPageDTO setPageSize(Integer pageSize) { - this.pageSize = pageSize; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserUpdateDTO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserUpdateDTO.java index b4def8cf2..83dea3ff3 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserUpdateDTO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserUpdateDTO.java @@ -1,8 +1,13 @@ package cn.iocoder.mall.user.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + /** * 用户更新 DTO */ +@Data +@Accessors(chain = true) public class UserUpdateDTO { /** @@ -18,31 +23,4 @@ public class UserUpdateDTO { */ private String avatar; - public Integer getId() { - return id; - } - - public UserUpdateDTO setId(Integer id) { - this.id = id; - return this; - } - - public String getNickname() { - return nickname; - } - - public UserUpdateDTO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - - public String getAvatar() { - return avatar; - } - - public UserUpdateDTO setAvatar(String avatar) { - this.avatar = avatar; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-service-impl/pom.xml b/user/user-service-impl/pom.xml index 78bc287de..7c93c432c 100644 --- a/user/user-service-impl/pom.xml +++ b/user/user-service-impl/pom.xml @@ -15,12 +15,7 @@ user-service-impl - - com.alibaba - dubbo - 2.6.5 - compile - + cn.iocoder.mall user-service-api @@ -40,12 +35,11 @@ org.mybatis.spring.boot mybatis-spring-boot-starter - 2.0.0 + - org.mapstruct - mapstruct - ${org.mapstruct.version} + com.alibaba + dubbo @@ -56,20 +50,8 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - org.mapstruct - mapstruct-processor - ${org.mapstruct.version} - - - - \ No newline at end of file + diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/MobileCodeDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/MobileCodeDO.java index 749d614dd..aec91c673 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/MobileCodeDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/MobileCodeDO.java @@ -1,8 +1,13 @@ package cn.iocoder.mall.user.biz.dataobject; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; // TODO 优化，IP +@Data +@Accessors(chain = true) public class MobileCodeDO { /** @@ -38,76 +43,4 @@ public class MobileCodeDO { */ private Date usedTime; - public Integer getId() { - return id; - } - - public MobileCodeDO setId(Integer id) { - this.id = id; - return this; - } - - public String getMobile() { - return mobile; - } - - public MobileCodeDO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getCode() { - return code; - } - - public MobileCodeDO setCode(String code) { - this.code = code; - return this; - } - - public Integer getTodayIndex() { - return todayIndex; - } - - public MobileCodeDO setTodayIndex(Integer todayIndex) { - this.todayIndex = todayIndex; - return this; - } - - public Boolean getUsed() { - return used; - } - - public MobileCodeDO setUsed(Boolean used) { - this.used = used; - return this; - } - - public Integer getUsedUserId() { - return usedUserId; - } - - public MobileCodeDO setUsedUserId(Integer usedUserId) { - this.usedUserId = usedUserId; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public MobileCodeDO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - - public Date getUsedTime() { - return usedTime; - } - - public MobileCodeDO setUsedTime(Date usedTime) { - this.usedTime = usedTime; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/OAuth2AccessTokenDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/OAuth2AccessTokenDO.java index e56922fd7..79875d7fc 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/OAuth2AccessTokenDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/OAuth2AccessTokenDO.java @@ -1,7 +1,12 @@ package cn.iocoder.mall.user.biz.dataobject; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; +@Data +@Accessors(chain = true) public class OAuth2AccessTokenDO { /** @@ -29,57 +34,4 @@ public class OAuth2AccessTokenDO { */ private Date createTime; - public String getId() { - return id; - } - - public OAuth2AccessTokenDO setId(String id) { - this.id = id; - return this; - } - - public String getRefreshToken() { - return refreshToken; - } - - public OAuth2AccessTokenDO setRefreshToken(String refreshToken) { - this.refreshToken = refreshToken; - return this; - } - - public Integer getUserId() { - return userId; - } - - public OAuth2AccessTokenDO setUserId(Integer userId) { - this.userId = userId; - return this; - } - - public Date getExpiresTime() { - return expiresTime; - } - - public OAuth2AccessTokenDO setExpiresTime(Date expiresTime) { - this.expiresTime = expiresTime; - return this; - } - - public Boolean getValid() { - return valid; - } - - public OAuth2AccessTokenDO setValid(Boolean valid) { - this.valid = valid; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public OAuth2AccessTokenDO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } -} \ No newline at end of file +} diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/OAuth2RefreshTokenDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/OAuth2RefreshTokenDO.java index 3fbedfdd2..a9232cf6a 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/OAuth2RefreshTokenDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/OAuth2RefreshTokenDO.java @@ -1,5 +1,8 @@ package cn.iocoder.mall.user.biz.dataobject; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; /** @@ -7,6 +10,8 @@ import java.util.Date; * * idx_uid */ +@Data +@Accessors(chain = true) public class OAuth2RefreshTokenDO { /** @@ -30,49 +35,4 @@ public class OAuth2RefreshTokenDO { */ private Date createTime; - public String getId() { - return id; - } - - public OAuth2RefreshTokenDO setId(String id) { - this.id = id; - return this; - } - - public Integer getUserId() { - return userId; - } - - public OAuth2RefreshTokenDO setUserId(Integer userId) { - this.userId = userId; - return this; - } - - public Boolean getValid() { - return valid; - } - - public OAuth2RefreshTokenDO setValid(Boolean valid) { - this.valid = valid; - return this; - } - - public Date getExpiresTime() { - return expiresTime; - } - - public OAuth2RefreshTokenDO setExpiresTime(Date expiresTime) { - this.expiresTime = expiresTime; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public OAuth2RefreshTokenDO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - } diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserAccessLogDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserAccessLogDO.java index 3ebde3bfb..e91f70bc2 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserAccessLogDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserAccessLogDO.java @@ -1,12 +1,16 @@ package cn.iocoder.mall.user.biz.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; /** * 用户访问日志 DO */ +@Data +@Accessors(chain = true) public class UserAccessLogDO extends DeletableDO { /** @@ -48,85 +52,4 @@ public class UserAccessLogDO extends DeletableDO { */ private Integer responseTime; - public Integer getId() { - return id; - } - - public UserAccessLogDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getUserId() { - return userId; - } - - public UserAccessLogDO setUserId(Integer userId) { - this.userId = userId; - return this; - } - - public String getUri() { - return uri; - } - - public UserAccessLogDO setUri(String uri) { - this.uri = uri; - return this; - } - - public String getQueryString() { - return queryString; - } - - public UserAccessLogDO setQueryString(String queryString) { - this.queryString = queryString; - return this; - } - - public String getMethod() { - return method; - } - - public UserAccessLogDO setMethod(String method) { - this.method = method; - return this; - } - - public String getUserAgent() { - return userAgent; - } - - public UserAccessLogDO setUserAgent(String userAgent) { - this.userAgent = userAgent; - return this; - } - - public String getIp() { - return ip; - } - - public UserAccessLogDO setIp(String ip) { - this.ip = ip; - return this; - } - - public Date getStartTime() { - return startTime; - } - - public UserAccessLogDO setStartTime(Date startTime) { - this.startTime = startTime; - return this; - } - - public Integer getResponseTime() { - return responseTime; - } - - public UserAccessLogDO setResponseTime(Integer responseTime) { - this.responseTime = responseTime; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserAddressDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserAddressDO.java index c57dab881..7d5a05efc 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserAddressDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserAddressDO.java @@ -1,6 +1,8 @@ package cn.iocoder.mall.user.biz.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * 用户地址信息 @@ -8,6 +10,8 @@ import cn.iocoder.common.framework.dataobject.DeletableDO; * @author Sin * @time 2019-04-06 13:22 */ +@Data +@Accessors(chain = true) public class UserAddressDO extends DeletableDO { /** @@ -35,69 +39,4 @@ public class UserAddressDO extends DeletableDO { */ private String address; - @Override - public String toString() { - return "UserAddressDO{" + - "id=" + id + - ", userId=" + userId + - ", areaNo='" + areaNo + '\'' + - ", name='" + name + '\'' + - ", mobile='" + mobile + '\'' + - ", address='" + address + '\'' + - '}'; - } - - public Integer getId() { - return id; - } - - public UserAddressDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getUserId() { - return userId; - } - - public UserAddressDO setUserId(Integer userId) { - this.userId = userId; - return this; - } - - public String getAreaNo() { - return areaNo; - } - - public UserAddressDO setAreaNo(String areaNo) { - this.areaNo = areaNo; - return this; - } - - public String getName() { - return name; - } - - public UserAddressDO setName(String name) { - this.name = name; - return this; - } - - public String getMobile() { - return mobile; - } - - public UserAddressDO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getAddress() { - return address; - } - - public UserAddressDO setAddress(String address) { - this.address = address; - return this; - } } diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserDO.java index d43dfd6ca..d6d13f203 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserDO.java @@ -1,12 +1,16 @@ package cn.iocoder.mall.user.biz.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * 用户实体，存储用户基本数据。 * * idx_mobile 唯一索引 */ +@Data +@Accessors(chain = true) public class UserDO extends DeletableDO { /** @@ -33,49 +37,5 @@ public class UserDO extends DeletableDO { */ private Integer status; - public Integer getId() { - return id; - } - public UserDO setId(Integer id) { - this.id = id; - return this; - } - - public String getMobile() { - return mobile; - } - - public UserDO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getNickname() { - return nickname; - } - - public UserDO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - - public String getAvatar() { - return avatar; - } - - public UserDO setAvatar(String avatar) { - this.avatar = avatar; - return this; - } - - public Integer getStatus() { - return status; - } - - public UserDO setStatus(Integer status) { - this.status = status; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserLoginLogDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserLoginLogDO.java index 8d5491e74..14c287de0 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserLoginLogDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserLoginLogDO.java @@ -1,4 +1,9 @@ package cn.iocoder.mall.user.biz.dataobject; +import lombok.Data; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) public class UserLoginLogDO { } diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserRegisterDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserRegisterDO.java index 0437051e9..920cbfbba 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserRegisterDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserRegisterDO.java @@ -1,10 +1,15 @@ package cn.iocoder.mall.user.biz.dataobject; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; /** * 用户注册信息 */ +@Data +@Accessors(chain = true) public class UserRegisterDO { /** @@ -20,23 +25,4 @@ public class UserRegisterDO { // TODO 芋艿 ua // TODO 芋艿 方式，手机注册、qq 等等 - - public Integer getId() { - return id; - } - - public UserRegisterDO setId(Integer id) { - this.id = id; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public UserRegisterDO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserThirdAuthDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserThirdAuthDO.java index ce363119c..dc6d42407 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserThirdAuthDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserThirdAuthDO.java @@ -1,10 +1,15 @@ package cn.iocoder.mall.user.biz.dataobject; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; /** * 用户三方开放平台授权，例如：QQ / 微博 / 微信等等。 */ +@Data +@Accessors(chain = true) public class UserThirdAuthDO { /** @@ -63,4 +68,4 @@ public class UserThirdAuthDO { */ private String extras; -} \ No newline at end of file +}