diff --git a/admin/admin-application/pom.xml b/admin/admin-application/pom.xml index 0a52ffe9d..78b019b24 100644 --- a/admin/admin-application/pom.xml +++ b/admin/admin-application/pom.xml @@ -11,17 +11,17 @@ admin-application - - 1.3.0.Final - - cn.iocoder.mall admin-service-impl 1.0-SNAPSHOT - + + cn.iocoder.mall + admin-sdk + 1.0-SNAPSHOT + cn.iocoder.mall common-framework @@ -42,42 +42,24 @@ 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 - - - - org.mapstruct - mapstruct - ${org.mapstruct.version} @@ -86,12 +68,6 @@ true - - cn.iocoder.mall - admin-sdk - 1.0-SNAPSHOT - - @@ -121,31 +97,16 @@ 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/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminInfoVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminInfoVO.java index 25cf0e545..676ea0c55 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminInfoVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminInfoVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Set; @ApiModel("管理员信息 VO") +@Data +@Accessors(chain = true) public class AdminInfoVO { @ApiModelProperty(value = "管理员比那好", required = true, example = "1") @@ -13,22 +17,4 @@ public class AdminInfoVO { @ApiModelProperty(value = "角色编号的数组", required = true, example = "[1, 2]") private Set roleIds; - public Integer getAdminId() { - return adminId; - } - - public AdminInfoVO setAdminId(Integer adminId) { - this.adminId = adminId; - return this; - } - - public Set getRoleIds() { - return roleIds; - } - - public AdminInfoVO setRoleIds(Set roleIds) { - this.roleIds = roleIds; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminMenuTreeNodeVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminMenuTreeNodeVO.java index d61304377..277777fa0 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminMenuTreeNodeVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminMenuTreeNodeVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; 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 AdminMenuTreeNodeVO { @ApiModelProperty(value = "菜单编号", required = true, example = "1") @@ -23,58 +27,4 @@ public class AdminMenuTreeNodeVO { @ApiModelProperty(value = "子节点数组") private List children; - public Integer getId() { - return id; - } - - public AdminMenuTreeNodeVO setId(Integer id) { - this.id = id; - return this; - } - - public String getHandler() { - return handler; - } - - public AdminMenuTreeNodeVO setHandler(String handler) { - this.handler = handler; - return this; - } - - public Integer getPid() { - return pid; - } - - public AdminMenuTreeNodeVO setPid(Integer pid) { - this.pid = pid; - return this; - } - - public Integer getSort() { - return sort; - } - - public AdminMenuTreeNodeVO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public AdminMenuTreeNodeVO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public List getChildren() { - return children; - } - - public AdminMenuTreeNodeVO setChildren(List children) { - this.children = children; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminPageVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminPageVO.java index 04dbd89e6..f446bc6fb 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminPageVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminPageVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; 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 AdminPageVO { @ApiModelProperty(value = "管理员数组") @@ -13,22 +17,4 @@ public class AdminPageVO { @ApiModelProperty(value = "管理员总数") private Integer total; - public List getList() { - return list; - } - - public AdminPageVO setList(List list) { - this.list = list; - return this; - } - - public Integer getTotal() { - return total; - } - - public AdminPageVO setTotal(Integer total) { - this.total = total; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminRoleVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminRoleVO.java index a29ce2dcd..4e4b1ae3a 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminRoleVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminRoleVO.java @@ -2,8 +2,12 @@ package cn.iocoder.mall.admin.application.vo; 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 AdminRoleVO { @ApiModelProperty(value = "角色编号", required = true, example = "1") @@ -13,31 +17,4 @@ public class AdminRoleVO { @ApiModelProperty(value = "是否授权", required = true, example = "true") private Boolean assigned; - public Integer getId() { - return id; - } - - public AdminRoleVO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public AdminRoleVO setName(String name) { - this.name = name; - return this; - } - - public Boolean getAssigned() { - return assigned; - } - - public AdminRoleVO setAssigned(Boolean assigned) { - this.assigned = assigned; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminVO.java index a82a69fae..4a9df5b4c 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; 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 AdminVO { @ApiModelProperty(value = "管理员编号", required = true, example = "1") @@ -19,49 +23,4 @@ public class AdminVO { @ApiModelProperty(value = "创建时间", required = true, example = "时间戳格式") private Date createTime; - public Integer getId() { - return id; - } - - public AdminVO setId(Integer id) { - this.id = id; - return this; - } - - public String getUsername() { - return username; - } - - public AdminVO setUsername(String username) { - this.username = username; - return this; - } - - public String getNickname() { - return nickname; - } - - public AdminVO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - - public Integer getStatus() { - return status; - } - - public AdminVO setStatus(Integer status) { - this.status = status; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public AdminVO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictEnumVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictEnumVO.java index 8075d4770..1ac524c91 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictEnumVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictEnumVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; 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 DataDictEnumVO { @ApiModelProperty(value = "大类枚举值", required = true, example = "gender") @@ -13,22 +17,4 @@ public class DataDictEnumVO { @ApiModelProperty(value = "小类数值数组", required = true) private List values; - public String getEnumValue() { - return enumValue; - } - - public DataDictEnumVO setEnumValue(String enumValue) { - this.enumValue = enumValue; - return this; - } - - public List getValues() { - return values; - } - - public DataDictEnumVO setValues(List values) { - this.values = values; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictVO.java index c64d1d493..9ebdbb854 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictVO.java @@ -2,8 +2,12 @@ package cn.iocoder.mall.admin.application.vo; 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 DataDictVO { @ApiModelProperty(value = "编号", required = true, example = "1") @@ -19,58 +23,4 @@ public class DataDictVO { @ApiModelProperty(value = "备注", example = "你猜") private String memo; - public Integer getId() { - return id; - } - - public DataDictVO setId(Integer id) { - this.id = id; - return this; - } - - public String getEnumValue() { - return enumValue; - } - - public DataDictVO setEnumValue(String enumValue) { - this.enumValue = enumValue; - return this; - } - - public String getValue() { - return value; - } - - public DataDictVO setValue(String value) { - this.value = value; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public DataDictVO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public Integer getSort() { - return sort; - } - - public DataDictVO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getMemo() { - return memo; - } - - public DataDictVO setMemo(String memo) { - this.memo = memo; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictValueVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictValueVO.java index 2602d3359..917ad493f 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictValueVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictValueVO.java @@ -2,8 +2,12 @@ package cn.iocoder.mall.admin.application.vo; 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 DataDictValueVO { @ApiModelProperty(value = "小类数值", required = true, example = "1") @@ -11,22 +15,4 @@ public class DataDictValueVO { @ApiModelProperty(value = "展示名", required = true, example = "男") private String displayName; - public String getValue() { - return value; - } - - public DataDictValueVO setValue(String value) { - this.value = value; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public DataDictValueVO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/PassportLoginVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/PassportLoginVO.java index 7913f4c3f..7bfd92ecb 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/PassportLoginVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/PassportLoginVO.java @@ -2,8 +2,12 @@ package cn.iocoder.mall.admin.application.vo; 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 PassportLoginVO { @ApiModelProperty(value = "访问令牌", required = true, example = "2e3d7635c15e47e997611707a237859f") @@ -12,32 +16,4 @@ public class PassportLoginVO { private String refreshToken; @ApiModelProperty(value = "过期时间，单位：秒", required = true, example = "2879") private Integer expiresIn; - - public String getAccessToken() { - return accessToken; - } - - public PassportLoginVO setAccessToken(String accessToken) { - this.accessToken = accessToken; - return this; - } - - public String getRefreshToken() { - return refreshToken; - } - - public PassportLoginVO setRefreshToken(String refreshToken) { - this.refreshToken = refreshToken; - return this; - } - - public Integer getExpiresIn() { - return expiresIn; - } - - public PassportLoginVO setExpiresIn(Integer expiresIn) { - this.expiresIn = expiresIn; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceTreeNodeVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceTreeNodeVO.java index a9499f87f..bba3696ae 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceTreeNodeVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceTreeNodeVO.java @@ -2,11 +2,15 @@ package cn.iocoder.mall.admin.application.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; import java.util.List; @ApiModel("资源树结构 VO") +@Data +@Accessors(chain = true) public class ResourceTreeNodeVO { @ApiModelProperty(value = "资源编号", required = true, example = "1") @@ -28,85 +32,4 @@ public class ResourceTreeNodeVO { @ApiModelProperty(value = "子节点数组") private List children; - public Integer getId() { - return id; - } - - public ResourceTreeNodeVO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public ResourceTreeNodeVO setName(String name) { - this.name = name; - return this; - } - - public Integer getType() { - return type; - } - - public ResourceTreeNodeVO setType(Integer type) { - this.type = type; - return this; - } - - public Integer getSort() { - return sort; - } - - public ResourceTreeNodeVO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public ResourceTreeNodeVO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public ResourceTreeNodeVO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - - public Integer getPid() { - return pid; - } - - public ResourceTreeNodeVO setPid(Integer pid) { - this.pid = pid; - return this; - } - - public String getHandler() { - return handler; - } - - public ResourceTreeNodeVO setHandler(String handler) { - this.handler = handler; - return this; - } - - public List getChildren() { - return children; - } - - public ResourceTreeNodeVO setChildren(List children) { - this.children = children; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceVO.java index cf056e2e3..e16cb4208 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; 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 ResourceVO { @ApiModelProperty(value = "资源编号", required = true, example = "1") @@ -25,76 +29,4 @@ public class ResourceVO { @ApiModelProperty(value = "操作", required = true, example = "/order/list") private String handler; - public Integer getId() { - return id; - } - - public ResourceVO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public ResourceVO setName(String name) { - this.name = name; - return this; - } - - public Integer getType() { - return type; - } - - public ResourceVO setType(Integer type) { - this.type = type; - return this; - } - - public Integer getSort() { - return sort; - } - - public ResourceVO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public ResourceVO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public ResourceVO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - - public Integer getPid() { - return pid; - } - - public ResourceVO setPid(Integer pid) { - this.pid = pid; - return this; - } - - public String getHandler() { - return handler; - } - - public ResourceVO setHandler(String handler) { - this.handler = handler; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RolePageVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RolePageVO.java index 12946c504..c1f574496 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RolePageVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RolePageVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; 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 RolePageVO { @ApiModelProperty(value = "角色数组") @@ -13,22 +17,4 @@ public class RolePageVO { @ApiModelProperty(value = "角色总数") private Integer count; - public List getRoles() { - return roles; - } - - public RolePageVO setRoles(List roles) { - this.roles = roles; - return this; - } - - public Integer getCount() { - return count; - } - - public RolePageVO setCount(Integer count) { - this.count = count; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleResourceTreeNodeVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleResourceTreeNodeVO.java index afdd46a53..fed45cac6 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleResourceTreeNodeVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleResourceTreeNodeVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; 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 RoleResourceTreeNodeVO { @ApiModelProperty(value = "菜单编号", required = true, example = "1") @@ -25,66 +29,4 @@ public class RoleResourceTreeNodeVO { @ApiModelProperty(value = "是否授权", required = true, example = "true") private Boolean assigned; - public Integer getId() { - return id; - } - - public RoleResourceTreeNodeVO setId(Integer id) { - this.id = id; - return this; - } - - public String getHandler() { - return handler; - } - - public RoleResourceTreeNodeVO setHandler(String handler) { - this.handler = handler; - return this; - } - - public Integer getPid() { - return pid; - } - - public RoleResourceTreeNodeVO setPid(Integer pid) { - this.pid = pid; - return this; - } - - public Integer getSort() { - return sort; - } - - public RoleResourceTreeNodeVO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public RoleResourceTreeNodeVO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public List getChildren() { - return children; - } - - public RoleResourceTreeNodeVO setChildren(List children) { - this.children = children; - return this; - } - - public Boolean getAssigned() { - return assigned; - } - - public RoleResourceTreeNodeVO setAssigned(Boolean assigned) { - this.assigned = assigned; - return this; - } -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleVO.java index 8d3251146..517dd80d4 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; 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 RoleVO { @ApiModelProperty(value = "角色编号", required = true, example = "1") @@ -15,31 +19,4 @@ public class RoleVO { @ApiModelProperty(value = "创建时间", required = true, example = "时间戳格式") private Date createTime; - public Integer getId() { - return id; - } - - public RoleVO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public RoleVO setName(String name) { - this.name = name; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public RoleVO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-sdk/pom.xml b/admin/admin-sdk/pom.xml index 0b2d8aaf1..376cb059b 100644 --- a/admin/admin-sdk/pom.xml +++ b/admin/admin-sdk/pom.xml @@ -25,29 +25,29 @@ 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 admin-service-api 1.0-SNAPSHOT - compile diff --git a/admin/admin-service-api/pom.xml b/admin/admin-service-api/pom.xml index b683c2b0f..fc2d3d383 100644 --- a/admin/admin-service-api/pom.xml +++ b/admin/admin-service-api/pom.xml @@ -17,11 +17,25 @@ common-framework 1.0-SNAPSHOT + - org.hibernate.validator - hibernate-validator + javax.validation + validation-api + + + + org.mapstruct + mapstruct + + + org.mapstruct + mapstruct-jdk8 + + + org.projectlombok + lombok - \ No newline at end of file + diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminBO.java index f983c8050..5291f40aa 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminBO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminBO.java @@ -1,7 +1,15 @@ package cn.iocoder.mall.admin.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; +/** + * 管理员 BO + */ +@Data +@Accessors(chain = true) public class AdminBO { /** @@ -25,48 +33,4 @@ public class AdminBO { */ private Date createTime; - public Integer getId() { - return id; - } - - public AdminBO setId(Integer id) { - this.id = id; - return this; - } - - public String getUsername() { - return username; - } - - public AdminBO setUsername(String username) { - this.username = username; - return this; - } - - public String getNickname() { - return nickname; - } - - public AdminBO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - - public Integer getStatus() { - return status; - } - - public AdminBO setStatus(Integer status) { - this.status = status; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public AdminBO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } } diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminPageBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminPageBO.java index 02c855460..21501ebbf 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminPageBO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminPageBO.java @@ -1,7 +1,15 @@ package cn.iocoder.mall.admin.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.List; +/** + * 管理员分页 BO + */ +@Data +@Accessors(chain = true) public class AdminPageBO { /** @@ -13,22 +21,4 @@ public class AdminPageBO { */ private Integer total; - public List getList() { - return list; - } - - public AdminPageBO setList(List list) { - this.list = list; - return this; - } - - public Integer getTotal() { - return total; - } - - public AdminPageBO setTotal(Integer total) { - this.total = total; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/DataDictBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/DataDictBO.java index 2c404c22d..7ca34c7cc 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/DataDictBO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/DataDictBO.java @@ -1,10 +1,15 @@ package cn.iocoder.mall.admin.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; /** * 数据字典 BO */ +@Data +@Accessors(chain = true) public class DataDictBO { /** @@ -36,67 +41,4 @@ public class DataDictBO { */ private Date createTime; - public Integer getId() { - return id; - } - - public DataDictBO setId(Integer id) { - this.id = id; - return this; - } - - public String getEnumValue() { - return enumValue; - } - - public DataDictBO setEnumValue(String enumValue) { - this.enumValue = enumValue; - return this; - } - - public String getValue() { - return value; - } - - public DataDictBO setValue(String value) { - this.value = value; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public DataDictBO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public Integer getSort() { - return sort; - } - - public DataDictBO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getMemo() { - return memo; - } - - public DataDictBO setMemo(String memo) { - this.memo = memo; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public DataDictBO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AccessTokenBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AccessTokenBO.java index 3d66558d2..59c70e5f0 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AccessTokenBO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AccessTokenBO.java @@ -1,7 +1,15 @@ package cn.iocoder.mall.admin.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; +/** + * OAUTH2 AccessToken BO + */ +@Data +@Accessors(chain = true) public class OAuth2AccessTokenBO implements Serializable { /** @@ -17,31 +25,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/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AuthenticationBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AuthenticationBO.java index f499e25ca..fc3769474 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AuthenticationBO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AuthenticationBO.java @@ -1,8 +1,16 @@ package cn.iocoder.mall.admin.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.util.Set; +/** + * OAUTH2 认证 BO + */ +@Data +@Accessors(chain = true) public class OAuth2AuthenticationBO implements Serializable { /** @@ -14,22 +22,4 @@ public class OAuth2AuthenticationBO implements Serializable { */ private Set roleIds; - public Integer getAdminId() { - return adminId; - } - - public OAuth2AuthenticationBO setAdminId(Integer adminId) { - this.adminId = adminId; - return this; - } - - public Set getRoleIds() { - return roleIds; - } - - public OAuth2AuthenticationBO setRoleIds(Set roleIds) { - this.roleIds = roleIds; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/ResourceBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/ResourceBO.java index ca6d79bc9..533d7f424 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/ResourceBO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/ResourceBO.java @@ -1,10 +1,15 @@ package cn.iocoder.mall.admin.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; /** * 资源 BO */ +@Data +@Accessors(chain = true) public class ResourceBO { /** @@ -40,76 +45,4 @@ public class ResourceBO { */ private String handler; - public Integer getId() { - return id; - } - - public ResourceBO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public ResourceBO setName(String name) { - this.name = name; - return this; - } - - public Integer getType() { - return type; - } - - public ResourceBO setType(Integer type) { - this.type = type; - return this; - } - - public Integer getSort() { - return sort; - } - - public ResourceBO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public ResourceBO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public ResourceBO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - - public Integer getPid() { - return pid; - } - - public ResourceBO setPid(Integer pid) { - this.pid = pid; - return this; - } - - public String getHandler() { - return handler; - } - - public ResourceBO setHandler(String handler) { - this.handler = handler; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RoleBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RoleBO.java index c8458034e..ee82360d8 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RoleBO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RoleBO.java @@ -1,10 +1,15 @@ package cn.iocoder.mall.admin.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; /** * 角色 BO */ +@Data +@Accessors(chain = true) public class RoleBO { /** @@ -20,31 +25,4 @@ public class RoleBO { */ private Date createTime; - public Integer getId() { - return id; - } - - public RoleBO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public RoleBO setName(String name) { - this.name = name; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public RoleBO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RolePageBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RolePageBO.java index ce92e8eed..13957afa7 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RolePageBO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RolePageBO.java @@ -1,7 +1,15 @@ package cn.iocoder.mall.admin.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.List; +/** + * 角色分页 BO + */ +@Data +@Accessors(chain = true) public class RolePageBO { /** @@ -13,22 +21,4 @@ public class RolePageBO { */ private Integer count; - public List getRoles() { - return roles; - } - - public RolePageBO setRoles(List roles) { - this.roles = roles; - return this; - } - - public Integer getCount() { - return count; - } - - public RolePageBO setCount(Integer count) { - this.count = count; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAccessLogAddDTO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAccessLogAddDTO.java index fe259c718..1155404ed 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAccessLogAddDTO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAccessLogAddDTO.java @@ -1,12 +1,17 @@ package cn.iocoder.mall.admin.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 AdminAccessLogAddDTO { /** @@ -57,76 +62,4 @@ public class AdminAccessLogAddDTO { @NotNull(message = "响应时长不能为空") private Integer responseTime; - public Integer getAdminId() { - return adminId; - } - - public AdminAccessLogAddDTO setAdminId(Integer adminId) { - this.adminId = adminId; - return this; - } - - public String getUri() { - return uri; - } - - public AdminAccessLogAddDTO setUri(String uri) { - this.uri = uri; - return this; - } - - public String getQueryString() { - return queryString; - } - - public AdminAccessLogAddDTO setQueryString(String queryString) { - this.queryString = queryString; - return this; - } - - public String getMethod() { - return method; - } - - public AdminAccessLogAddDTO setMethod(String method) { - this.method = method; - return this; - } - - public String getUserAgent() { - return userAgent; - } - - public AdminAccessLogAddDTO setUserAgent(String userAgent) { - this.userAgent = userAgent; - return this; - } - - public String getIp() { - return ip; - } - - public AdminAccessLogAddDTO setIp(String ip) { - this.ip = ip; - return this; - } - - public Date getStartTime() { - return startTime; - } - - public AdminAccessLogAddDTO setStartTime(Date startTime) { - this.startTime = startTime; - return this; - } - - public Integer getResponseTime() { - return responseTime; - } - - public AdminAccessLogAddDTO setResponseTime(Integer responseTime) { - this.responseTime = responseTime; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAddDTO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAddDTO.java index 9d619655c..da242b6bc 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAddDTO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAddDTO.java @@ -1,5 +1,7 @@ package cn.iocoder.mall.admin.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotEmpty; @@ -8,6 +10,8 @@ import javax.validation.constraints.Pattern; /** * 管理员添加 DTO */ +@Data +@Accessors(chain = true) public class AdminAddDTO { /** @@ -30,30 +34,4 @@ public class AdminAddDTO { @Length(min = 6, max = 16, message = "密码长度为 6-16 位") private String password; - public String getUsername() { - return username; - } - - public AdminAddDTO setUsername(String username) { - this.username = username; - return this; - } - - public String getNickname() { - return nickname; - } - - public AdminAddDTO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - - public String getPassword() { - return password; - } - - public AdminAddDTO setPassword(String password) { - this.password = password; - return this; - } -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminPageDTO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminPageDTO.java index 1a66f733e..9f32e9d25 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminPageDTO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminPageDTO.java @@ -1,7 +1,15 @@ package cn.iocoder.mall.admin.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotNull; +/** + * 管理员分页 DTO + */ +@Data +@Accessors(chain = true) public class AdminPageDTO { /** @@ -14,31 +22,4 @@ public class AdminPageDTO { @NotNull(message = "每页条数不能为空") private Integer pageSize; - public Integer getPageNo() { - return pageNo; - } - - public AdminPageDTO setPageNo(Integer pageNo) { - this.pageNo = pageNo; - return this; - } - - public Integer getPageSize() { - return pageSize; - } - - public AdminPageDTO setPageSize(Integer pageSize) { - this.pageSize = pageSize; - return this; - } - - public String getNickname() { - return nickname; - } - - public AdminPageDTO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - } diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminUpdateDTO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminUpdateDTO.java index 0530563c3..6700b708f 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminUpdateDTO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminUpdateDTO.java @@ -1,5 +1,7 @@ package cn.iocoder.mall.admin.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotEmpty; @@ -9,6 +11,8 @@ import javax.validation.constraints.Pattern; /** * 管理员更新 DTO */ +@Data +@Accessors(chain = true) public class AdminUpdateDTO { /** @@ -35,39 +39,4 @@ public class AdminUpdateDTO { @Length(min = 6, max = 16, message = "密码长度为 6-16 位") private String password; - public String getUsername() { - return username; - } - - public AdminUpdateDTO setUsername(String username) { - this.username = username; - return this; - } - - public String getNickname() { - return nickname; - } - - public AdminUpdateDTO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - - public String getPassword() { - return password; - } - - public AdminUpdateDTO setPassword(String password) { - this.password = password; - return this; - } - - public Integer getId() { - return id; - } - - public AdminUpdateDTO setId(Integer id) { - this.id = id; - return this; - } -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictAddDTO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictAddDTO.java index db44b6e8c..e8728ca12 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictAddDTO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictAddDTO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.admin.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; /** * 数据字典添加 DTO */ +@Data +@Accessors(chain = true) public class DataDictAddDTO { /** @@ -33,49 +38,4 @@ public class DataDictAddDTO { */ private String memo; - public String getEnumValue() { - return enumValue; - } - - public DataDictAddDTO setEnumValue(String enumValue) { - this.enumValue = enumValue; - return this; - } - - public String getValue() { - return value; - } - - public DataDictAddDTO setValue(String value) { - this.value = value; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public DataDictAddDTO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public Integer getSort() { - return sort; - } - - public DataDictAddDTO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getMemo() { - return memo; - } - - public DataDictAddDTO setMemo(String memo) { - this.memo = memo; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictUpdateDTO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictUpdateDTO.java index 4bc3dc643..02735be66 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictUpdateDTO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictUpdateDTO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.admin.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; /** * 数据字典更新 DTO */ +@Data +@Accessors(chain = true) public class DataDictUpdateDTO { /** @@ -33,49 +38,4 @@ public class DataDictUpdateDTO { */ private String memo; - public Integer getId() { - return id; - } - - public DataDictUpdateDTO setId(Integer id) { - this.id = id; - return this; - } - - public String getValue() { - return value; - } - - public DataDictUpdateDTO setValue(String value) { - this.value = value; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public DataDictUpdateDTO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public Integer getSort() { - return sort; - } - - public DataDictUpdateDTO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getMemo() { - return memo; - } - - public DataDictUpdateDTO setMemo(String memo) { - this.memo = memo; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceAddDTO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceAddDTO.java index 9c6966960..ae413a55b 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceAddDTO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceAddDTO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.admin.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; /** * 资源添加 DTO */ +@Data +@Accessors(chain = true) public class ResourceAddDTO { /** @@ -37,58 +42,4 @@ public class ResourceAddDTO { */ private String handler; - public String getName() { - return name; - } - - public ResourceAddDTO setName(String name) { - this.name = name; - return this; - } - - public Integer getType() { - return type; - } - - public ResourceAddDTO setType(Integer type) { - this.type = type; - return this; - } - - public Integer getSort() { - return sort; - } - - public ResourceAddDTO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public ResourceAddDTO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public Integer getPid() { - return pid; - } - - public ResourceAddDTO setPid(Integer pid) { - this.pid = pid; - return this; - } - - public String getHandler() { - return handler; - } - - public ResourceAddDTO setHandler(String handler) { - this.handler = handler; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceUpdateDTO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceUpdateDTO.java index b77aeefda..279a4a822 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceUpdateDTO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceUpdateDTO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.admin.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; /** * 资源更新 DTO */ +@Data +@Accessors(chain = true) public class ResourceUpdateDTO { /** @@ -37,58 +42,4 @@ public class ResourceUpdateDTO { */ private String handler; - public Integer getId() { - return id; - } - - public ResourceUpdateDTO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public ResourceUpdateDTO setName(String name) { - this.name = name; - return this; - } - - public Integer getSort() { - return sort; - } - - public ResourceUpdateDTO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public ResourceUpdateDTO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public Integer getPid() { - return pid; - } - - public ResourceUpdateDTO setPid(Integer pid) { - this.pid = pid; - return this; - } - - public String getHandler() { - return handler; - } - - public ResourceUpdateDTO setHandler(String handler) { - this.handler = handler; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleAddDTO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleAddDTO.java index f7ea73b0f..56bcc8804 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleAddDTO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleAddDTO.java @@ -1,10 +1,15 @@ package cn.iocoder.mall.admin.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotEmpty; /** * 角色添加 DTO */ +@Data +@Accessors(chain = true) public class RoleAddDTO { /** @@ -13,13 +18,4 @@ public class RoleAddDTO { @NotEmpty(message = "角色名字不能为空") private String name; - public String getName() { - return name; - } - - public RoleAddDTO setName(String name) { - this.name = name; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RolePageDTO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RolePageDTO.java index 7b1fbd743..bd53f34af 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RolePageDTO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RolePageDTO.java @@ -1,5 +1,13 @@ package cn.iocoder.mall.admin.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 角色分页 DTO + */ +@Data +@Accessors(chain = true) public class RolePageDTO { private Integer pageNo; diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleUpdateDTO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleUpdateDTO.java index e69dc295e..7d97e6e17 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleUpdateDTO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleUpdateDTO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.admin.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; /** * 角色添加 DTO */ +@Data +@Accessors(chain = true) public class RoleUpdateDTO { /** @@ -19,22 +24,4 @@ public class RoleUpdateDTO { @NotEmpty(message = "角色名字不能为空") private String name; - public Integer getId() { - return id; - } - - public RoleUpdateDTO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public RoleUpdateDTO setName(String name) { - this.name = name; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-impl/pom.xml b/admin/admin-service-impl/pom.xml index 8345ba7b1..7897c833a 100644 --- a/admin/admin-service-impl/pom.xml +++ b/admin/admin-service-impl/pom.xml @@ -11,21 +11,12 @@ admin-service-impl - - 1.3.0.Final - - - - com.alibaba - dubbo - compile - + cn.iocoder.mall admin-service-api 1.0-SNAPSHOT - compile @@ -37,21 +28,19 @@ spring-boot-starter-jdbc + + com.alibaba + dubbo + + org.mybatis.spring.boot mybatis-spring-boot-starter - 2.0.0 - - - org.mapstruct - mapstruct - ${org.mapstruct.version} com.google.guava guava - 27.0.1-jre @@ -62,21 +51,9 @@ 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/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminAccessLogDO.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminAccessLogDO.java index 8c84f9702..96ab67b7a 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminAccessLogDO.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminAccessLogDO.java @@ -1,12 +1,16 @@ package cn.iocoder.mall.admin.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 AdminAccessLogDO extends DeletableDO { /** @@ -48,85 +52,4 @@ public class AdminAccessLogDO extends DeletableDO { */ private Integer responseTime; - public Integer getId() { - return id; - } - - public AdminAccessLogDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getAdminId() { - return adminId; - } - - public AdminAccessLogDO setAdminId(Integer adminId) { - this.adminId = adminId; - return this; - } - - public String getUri() { - return uri; - } - - public AdminAccessLogDO setUri(String uri) { - this.uri = uri; - return this; - } - - public String getQueryString() { - return queryString; - } - - public AdminAccessLogDO setQueryString(String queryString) { - this.queryString = queryString; - return this; - } - - public String getMethod() { - return method; - } - - public AdminAccessLogDO setMethod(String method) { - this.method = method; - return this; - } - - public String getUserAgent() { - return userAgent; - } - - public AdminAccessLogDO setUserAgent(String userAgent) { - this.userAgent = userAgent; - return this; - } - - public String getIp() { - return ip; - } - - public AdminAccessLogDO setIp(String ip) { - this.ip = ip; - return this; - } - - public Date getStartTime() { - return startTime; - } - - public AdminAccessLogDO setStartTime(Date startTime) { - this.startTime = startTime; - return this; - } - - public Integer getResponseTime() { - return responseTime; - } - - public AdminAccessLogDO setResponseTime(Integer responseTime) { - this.responseTime = responseTime; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminDO.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminDO.java index 8cfc41400..32ed645c6 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminDO.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminDO.java @@ -1,10 +1,14 @@ package cn.iocoder.mall.admin.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * 管理员实体 */ +@Data +@Accessors(chain = true) public class AdminDO extends DeletableDO { /** @@ -30,49 +34,4 @@ public class AdminDO extends DeletableDO { */ private Integer status; - public Integer getId() { - return id; - } - - public AdminDO setId(Integer id) { - this.id = id; - return this; - } - - public String getUsername() { - return username; - } - - public AdminDO setUsername(String username) { - this.username = username; - return this; - } - - public String getNickname() { - return nickname; - } - - public AdminDO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - - public String getPassword() { - return password; - } - - public AdminDO setPassword(String password) { - this.password = password; - return this; - } - - public Integer getStatus() { - return status; - } - - public AdminDO setStatus(Integer status) { - this.status = status; - return this; - } - } diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminRoleDO.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminRoleDO.java index c7aa3342a..5b0a32e8f 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminRoleDO.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminRoleDO.java @@ -1,10 +1,14 @@ package cn.iocoder.mall.admin.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * {@link AdminDO} 和 {@link RoleDO} 的关联表 */ +@Data +@Accessors(chain = true) public class AdminRoleDO extends DeletableDO { /** @@ -20,31 +24,4 @@ public class AdminRoleDO extends DeletableDO { */ private Integer roleId; - public Integer getId() { - return id; - } - - public AdminRoleDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getAdminId() { - return adminId; - } - - public AdminRoleDO setAdminId(Integer adminId) { - this.adminId = adminId; - return this; - } - - public Integer getRoleId() { - return roleId; - } - - public AdminRoleDO setRoleId(Integer roleId) { - this.roleId = roleId; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/DataDictDO.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/DataDictDO.java index fa0002bd8..b65a853c0 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/DataDictDO.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/DataDictDO.java @@ -1,6 +1,8 @@ package cn.iocoder.mall.admin.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * 数据字典 @@ -11,6 +13,8 @@ import cn.iocoder.common.framework.dataobject.DeletableDO; * value：1 男 * value：2 女 */ +@Data +@Accessors(chain = true) public class DataDictDO extends DeletableDO { /** @@ -38,57 +42,4 @@ public class DataDictDO extends DeletableDO { */ private String memo; - public String getEnumValue() { - return enumValue; - } - - public DataDictDO setEnumValue(String enumValue) { - this.enumValue = enumValue; - return this; - } - - public String getValue() { - return value; - } - - public DataDictDO setValue(String value) { - this.value = value; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public DataDictDO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public Integer getSort() { - return sort; - } - - public DataDictDO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getMemo() { - return memo; - } - - public DataDictDO setMemo(String memo) { - this.memo = memo; - return this; - } - - public Integer getId() { - return id; - } - - public DataDictDO setId(Integer id) { - this.id = id; - return this; - } -} \ No newline at end of file +} diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2AccessTokenDO.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2AccessTokenDO.java index 373fad188..5ef79d8ee 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2AccessTokenDO.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2AccessTokenDO.java @@ -1,7 +1,15 @@ package cn.iocoder.mall.admin.dataobject; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; +/** + * OAUTH2 AccessToken + */ +@Data +@Accessors(chain = true) public class OAuth2AccessTokenDO { /** @@ -83,4 +91,4 @@ public class OAuth2AccessTokenDO { return this; } -} \ No newline at end of file +} diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2RefreshTokenDO.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2RefreshTokenDO.java index 271d60cb5..8baddfab5 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2RefreshTokenDO.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2RefreshTokenDO.java @@ -1,5 +1,8 @@ package cn.iocoder.mall.admin.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 getAdminId() { - return adminId; - } - - public OAuth2RefreshTokenDO setAdminId(Integer adminId) { - this.adminId = adminId; - 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/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/ResourceDO.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/ResourceDO.java index 2875e9a81..795338ccb 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/ResourceDO.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/ResourceDO.java @@ -1,12 +1,16 @@ package cn.iocoder.mall.admin.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; /** * 资源实体 */ +@Data +@Accessors(chain = true) public class ResourceDO extends DeletableDO { /** @@ -58,76 +62,4 @@ public class ResourceDO extends DeletableDO { */ private String handler; - public Integer getId() { - return id; - } - - public ResourceDO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public ResourceDO setName(String name) { - this.name = name; - return this; - } - - public Integer getType() { - return type; - } - - public ResourceDO setType(Integer type) { - this.type = type; - return this; - } - - public Integer getSort() { - return sort; - } - - public ResourceDO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public ResourceDO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public ResourceDO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - - public Integer getPid() { - return pid; - } - - public ResourceDO setPid(Integer pid) { - this.pid = pid; - return this; - } - - public String getHandler() { - return handler; - } - - public ResourceDO setHandler(String handler) { - this.handler = handler; - return this; - } - } diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleDO.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleDO.java index c35392184..d84fdf303 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleDO.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleDO.java @@ -1,10 +1,14 @@ package cn.iocoder.mall.admin.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * 角色实体 */ +@Data +@Accessors(chain = true) public class RoleDO extends DeletableDO { /** @@ -16,22 +20,4 @@ public class RoleDO extends DeletableDO { */ private String name; - public Integer getId() { - return id; - } - - public RoleDO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public RoleDO setName(String name) { - this.name = name; - return this; - } - } diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleResourceDO.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleResourceDO.java index 584664193..998c45b49 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleResourceDO.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleResourceDO.java @@ -1,10 +1,14 @@ package cn.iocoder.mall.admin.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * {@link RoleDO} 和 {@link ResourceDO} 的关联表 */ +@Data +@Accessors(chain = true) public class RoleResourceDO extends DeletableDO { /** @@ -20,31 +24,4 @@ public class RoleResourceDO extends DeletableDO { */ private Integer resourceId; - public Integer getId() { - return id; - } - - public RoleResourceDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getRoleId() { - return roleId; - } - - public RoleResourceDO setRoleId(Integer roleId) { - this.roleId = roleId; - return this; - } - - public Integer getResourceId() { - return resourceId; - } - - public RoleResourceDO setResourceId(Integer resourceId) { - this.resourceId = resourceId; - return this; - } - -} \ No newline at end of file +} diff --git a/promotion/promotion-application/pom.xml b/promotion/promotion-application/pom.xml index e1a169a40..1aa044d42 100644 --- a/promotion/promotion-application/pom.xml +++ b/promotion/promotion-application/pom.xml @@ -79,11 +79,6 @@ springfox-swagger-ui - - org.projectlombok - lombok - - diff --git a/promotion/promotion-service-api/pom.xml b/promotion/promotion-service-api/pom.xml index 54d51beda..2aae54544 100644 --- a/promotion/promotion-service-api/pom.xml +++ b/promotion/promotion-service-api/pom.xml @@ -12,16 +12,17 @@ promotion-service-api - - javax.validation - validation-api - cn.iocoder.mall common-framework 1.0-SNAPSHOT + + javax.validation + validation-api + + org.mapstruct mapstruct @@ -30,7 +31,6 @@ org.mapstruct mapstruct-jdk8 - org.projectlombok lombok diff --git a/promotion/promotion-service-impl/pom.xml b/promotion/promotion-service-impl/pom.xml index ddee2b94d..ea0ca6110 100644 --- a/promotion/promotion-service-impl/pom.xml +++ b/promotion/promotion-service-impl/pom.xml @@ -47,11 +47,6 @@ mybatis-spring-boot-starter - - org.projectlombok - lombok - - com.google.guava guava