Skip to content

Y
yudao-cloud
提交 1eb5fbdb authored 作者: sin's avatar sin
浏览文件
操作

Merge remote-tracking branch 'origin/master'

上级 93493761 1513ca33
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 575 行增加 和 3003 行删除
admin/admin-application/pom.xml
浏览文件 @ 1eb5fbdb
...@@ -11,17 +11,17 @@ ...@@ -11,17 +11,17 @@
<artifactId>admin-application</artifactId> <artifactId>admin-application</artifactId>
<properties>
<org.mapstruct.version>1.3.0.Final</org.mapstruct.version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>cn.iocoder.mall</groupId> <groupId>cn.iocoder.mall</groupId>
<artifactId>admin-service-impl</artifactId> <artifactId>admin-service-impl</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>admin-sdk</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency> <dependency>
<groupId>cn.iocoder.mall</groupId> <groupId>cn.iocoder.mall</groupId>
<artifactId>common-framework</artifactId> <artifactId>common-framework</artifactId>
...@@ -42,42 +42,24 @@ ...@@ -42,42 +42,24 @@
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>dubbo</artifactId> <artifactId>dubbo</artifactId>
<version>2.6.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba.boot</groupId> <groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId> <artifactId>dubbo-spring-boot-starter</artifactId>
<version>0.2.1.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.curator</groupId> <groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId> <artifactId>curator-framework</artifactId>
<version>2.12.0</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher -->
<version>${org.mapstruct.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>springfox-swagger2</artifactId>
<version>2.9.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId> <artifactId>springfox-swagger-ui</artifactId>
<version>2.9.2</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher -->
<version>${org.mapstruct.version}</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -86,12 +68,6 @@ ...@@ -86,12 +68,6 @@
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>admin-sdk</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!--<dependency>--> <!--<dependency>-->
<!--<groupId>de.codecentric</groupId>--> <!--<groupId>de.codecentric</groupId>-->
<!--<artifactId>spring-boot-admin-starter-server</artifactId>--> <!--<artifactId>spring-boot-admin-starter-server</artifactId>-->
...@@ -121,31 +97,16 @@ ...@@ -121,31 +97,16 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>1.8</source> <!-- or higher, depending on your project -->
<target>1.8</target> <!-- or higher, depending on your project -->
<annotationProcessorPaths>
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>${org.mapstruct.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin> </plugin>
<!-- 打包 --> <!-- 打包 -->
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<fork>true</fork>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminInfoVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; ...@@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Set; import java.util.Set;
@ApiModel("管理员信息 VO") @ApiModel("管理员信息 VO")
@Data
@Accessors(chain = true)
public class AdminInfoVO { public class AdminInfoVO {
@ApiModelProperty(value = "管理员比那好", required = true, example = "1") @ApiModelProperty(value = "管理员比那好", required = true, example = "1")
...@@ -13,22 +17,4 @@ public class AdminInfoVO { ...@@ -13,22 +17,4 @@ public class AdminInfoVO {
@ApiModelProperty(value = "角色编号的数组", required = true, example = "[1, 2]") @ApiModelProperty(value = "角色编号的数组", required = true, example = "[1, 2]")
private Set<Integer> roleIds; private Set<Integer> roleIds;
public Integer getAdminId() { }
return adminId;
}
public AdminInfoVO setAdminId(Integer adminId) {
this.adminId = adminId;
return this;
}
public Set<Integer> getRoleIds() {
return roleIds;
}
public AdminInfoVO setRoleIds(Set<Integer> roleIds) {
this.roleIds = roleIds;
return this;
}
}
\ No newline at end of file
admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminMenuTreeNodeVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; ...@@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.List; import java.util.List;
@ApiModel("管理员拥有的菜单 VO") @ApiModel("管理员拥有的菜单 VO")
@Data
@Accessors(chain = true)
public class AdminMenuTreeNodeVO { public class AdminMenuTreeNodeVO {
@ApiModelProperty(value = "菜单编号", required = true, example = "1") @ApiModelProperty(value = "菜单编号", required = true, example = "1")
...@@ -23,58 +27,4 @@ public class AdminMenuTreeNodeVO { ...@@ -23,58 +27,4 @@ public class AdminMenuTreeNodeVO {
@ApiModelProperty(value = "子节点数组") @ApiModelProperty(value = "子节点数组")
private List<AdminMenuTreeNodeVO> children; private List<AdminMenuTreeNodeVO> 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<AdminMenuTreeNodeVO> getChildren() {
return children;
}
public AdminMenuTreeNodeVO setChildren(List<AdminMenuTreeNodeVO> children) {
this.children = children;
return this;
}
}
\ No newline at end of file
admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminPageVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; ...@@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.List; import java.util.List;
@ApiModel("管理员分页 VO") @ApiModel("管理员分页 VO")
@Data
@Accessors(chain = true)
public class AdminPageVO { public class AdminPageVO {
@ApiModelProperty(value = "管理员数组") @ApiModelProperty(value = "管理员数组")
...@@ -13,22 +17,4 @@ public class AdminPageVO { ...@@ -13,22 +17,4 @@ public class AdminPageVO {
@ApiModelProperty(value = "管理员总数") @ApiModelProperty(value = "管理员总数")
private Integer total; private Integer total;
public List<AdminVO> getList() { }
return list;
}
public AdminPageVO setList(List<AdminVO> 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
admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminRoleVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,8 +2,12 @@ package cn.iocoder.mall.admin.application.vo; ...@@ -2,8 +2,12 @@ package cn.iocoder.mall.admin.application.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
@ApiModel("管理员拥有的角色 VO") @ApiModel("管理员拥有的角色 VO")
@Data
@Accessors(chain = true)
public class AdminRoleVO { public class AdminRoleVO {
@ApiModelProperty(value = "角色编号", required = true, example = "1") @ApiModelProperty(value = "角色编号", required = true, example = "1")
...@@ -13,31 +17,4 @@ public class AdminRoleVO { ...@@ -13,31 +17,4 @@ public class AdminRoleVO {
@ApiModelProperty(value = "是否授权", required = true, example = "true") @ApiModelProperty(value = "是否授权", required = true, example = "true")
private Boolean assigned; 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
admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; ...@@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
@ApiModel("管理员 VO") @ApiModel("管理员 VO")
@Data
@Accessors(chain = true)
public class AdminVO { public class AdminVO {
@ApiModelProperty(value = "管理员编号", required = true, example = "1") @ApiModelProperty(value = "管理员编号", required = true, example = "1")
...@@ -19,49 +23,4 @@ public class AdminVO { ...@@ -19,49 +23,4 @@ public class AdminVO {
@ApiModelProperty(value = "创建时间", required = true, example = "时间戳格式") @ApiModelProperty(value = "创建时间", required = true, example = "时间戳格式")
private Date createTime; 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
admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictEnumVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; ...@@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.List; import java.util.List;
@ApiModel("数据字典枚举 VO") @ApiModel("数据字典枚举 VO")
@Data
@Accessors(chain = true)
public class DataDictEnumVO { public class DataDictEnumVO {
@ApiModelProperty(value = "大类枚举值", required = true, example = "gender") @ApiModelProperty(value = "大类枚举值", required = true, example = "gender")
...@@ -13,22 +17,4 @@ public class DataDictEnumVO { ...@@ -13,22 +17,4 @@ public class DataDictEnumVO {
@ApiModelProperty(value = "小类数值数组", required = true) @ApiModelProperty(value = "小类数值数组", required = true)
private List<DataDictValueVO> values; private List<DataDictValueVO> values;
public String getEnumValue() { }
return enumValue;
}
public DataDictEnumVO setEnumValue(String enumValue) {
this.enumValue = enumValue;
return this;
}
public List<DataDictValueVO> getValues() {
return values;
}
public DataDictEnumVO setValues(List<DataDictValueVO> values) {
this.values = values;
return this;
}
}
\ No newline at end of file
admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,8 +2,12 @@ package cn.iocoder.mall.admin.application.vo; ...@@ -2,8 +2,12 @@ package cn.iocoder.mall.admin.application.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
@ApiModel("数据字典 VO") @ApiModel("数据字典 VO")
@Data
@Accessors(chain = true)
public class DataDictVO { public class DataDictVO {
@ApiModelProperty(value = "编号", required = true, example = "1") @ApiModelProperty(value = "编号", required = true, example = "1")
...@@ -19,58 +23,4 @@ public class DataDictVO { ...@@ -19,58 +23,4 @@ public class DataDictVO {
@ApiModelProperty(value = "备注", example = "你猜") @ApiModelProperty(value = "备注", example = "你猜")
private String memo; 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
admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictValueVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,8 +2,12 @@ package cn.iocoder.mall.admin.application.vo; ...@@ -2,8 +2,12 @@ package cn.iocoder.mall.admin.application.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
@ApiModel("数据字典枚举值 VO") @ApiModel("数据字典枚举值 VO")
@Data
@Accessors(chain = true)
public class DataDictValueVO { public class DataDictValueVO {
@ApiModelProperty(value = "小类数值", required = true, example = "1") @ApiModelProperty(value = "小类数值", required = true, example = "1")
...@@ -11,22 +15,4 @@ public class DataDictValueVO { ...@@ -11,22 +15,4 @@ public class DataDictValueVO {
@ApiModelProperty(value = "展示名", required = true, example = "男") @ApiModelProperty(value = "展示名", required = true, example = "男")
private String displayName; 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
admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/PassportLoginVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,8 +2,12 @@ package cn.iocoder.mall.admin.application.vo; ...@@ -2,8 +2,12 @@ package cn.iocoder.mall.admin.application.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
@ApiModel("登陆结果 VO") @ApiModel("登陆结果 VO")
@Data
@Accessors(chain = true)
public class PassportLoginVO { public class PassportLoginVO {
@ApiModelProperty(value = "访问令牌", required = true, example = "2e3d7635c15e47e997611707a237859f") @ApiModelProperty(value = "访问令牌", required = true, example = "2e3d7635c15e47e997611707a237859f")
...@@ -12,32 +16,4 @@ public class PassportLoginVO { ...@@ -12,32 +16,4 @@ public class PassportLoginVO {
private String refreshToken; private String refreshToken;
@ApiModelProperty(value = "过期时间，单位：秒", required = true, example = "2879") @ApiModelProperty(value = "过期时间，单位：秒", required = true, example = "2879")
private Integer expiresIn; 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
admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceTreeNodeVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,11 +2,15 @@ package cn.iocoder.mall.admin.application.vo; ...@@ -2,11 +2,15 @@ package cn.iocoder.mall.admin.application.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ApiModel("资源树结构 VO") @ApiModel("资源树结构 VO")
@Data
@Accessors(chain = true)
public class ResourceTreeNodeVO { public class ResourceTreeNodeVO {
@ApiModelProperty(value = "资源编号", required = true, example = "1") @ApiModelProperty(value = "资源编号", required = true, example = "1")
...@@ -28,85 +32,4 @@ public class ResourceTreeNodeVO { ...@@ -28,85 +32,4 @@ public class ResourceTreeNodeVO {
@ApiModelProperty(value = "子节点数组") @ApiModelProperty(value = "子节点数组")
private List<ResourceTreeNodeVO> children; private List<ResourceTreeNodeVO> 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<ResourceTreeNodeVO> getChildren() {
return children;
}
public ResourceTreeNodeVO setChildren(List<ResourceTreeNodeVO> children) {
this.children = children;
return this;
}
}
\ No newline at end of file
admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; ...@@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
@ApiModel("资源 VO") @ApiModel("资源 VO")
@Data
@Accessors(chain = true)
public class ResourceVO { public class ResourceVO {
@ApiModelProperty(value = "资源编号", required = true, example = "1") @ApiModelProperty(value = "资源编号", required = true, example = "1")
...@@ -25,76 +29,4 @@ public class ResourceVO { ...@@ -25,76 +29,4 @@ public class ResourceVO {
@ApiModelProperty(value = "操作", required = true, example = "/order/list") @ApiModelProperty(value = "操作", required = true, example = "/order/list")
private String handler; 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
admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RolePageVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; ...@@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.List; import java.util.List;
@ApiModel("角色分页 VO") @ApiModel("角色分页 VO")
@Data
@Accessors(chain = true)
public class RolePageVO { public class RolePageVO {
@ApiModelProperty(value = "角色数组") @ApiModelProperty(value = "角色数组")
...@@ -13,22 +17,4 @@ public class RolePageVO { ...@@ -13,22 +17,4 @@ public class RolePageVO {
@ApiModelProperty(value = "角色总数") @ApiModelProperty(value = "角色总数")
private Integer count; private Integer count;
public List<RoleVO> getRoles() { }
return roles;
}
public RolePageVO setRoles(List<RoleVO> 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
admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleResourceTreeNodeVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; ...@@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.List; import java.util.List;
@ApiModel("角色拥有的资源 VO") @ApiModel("角色拥有的资源 VO")
@Data
@Accessors(chain = true)
public class RoleResourceTreeNodeVO { public class RoleResourceTreeNodeVO {
@ApiModelProperty(value = "菜单编号", required = true, example = "1") @ApiModelProperty(value = "菜单编号", required = true, example = "1")
...@@ -25,66 +29,4 @@ public class RoleResourceTreeNodeVO { ...@@ -25,66 +29,4 @@ public class RoleResourceTreeNodeVO {
@ApiModelProperty(value = "是否授权", required = true, example = "true") @ApiModelProperty(value = "是否授权", required = true, example = "true")
private Boolean assigned; 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<RoleResourceTreeNodeVO> getChildren() {
return children;
}
public RoleResourceTreeNodeVO setChildren(List<RoleResourceTreeNodeVO> 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
admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; ...@@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
@ApiModel("角色 VO") @ApiModel("角色 VO")
@Data
@Accessors(chain = true)
public class RoleVO { public class RoleVO {
@ApiModelProperty(value = "角色编号", required = true, example = "1") @ApiModelProperty(value = "角色编号", required = true, example = "1")
...@@ -15,31 +19,4 @@ public class RoleVO { ...@@ -15,31 +19,4 @@ public class RoleVO {
@ApiModelProperty(value = "创建时间", required = true, example = "时间戳格式") @ApiModelProperty(value = "创建时间", required = true, example = "时间戳格式")
private Date createTime; 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
admin/admin-sdk/pom.xml
浏览文件 @ 1eb5fbdb
...@@ -25,31 +25,31 @@ ...@@ -25,31 +25,31 @@
<version>5.1.5.RELEASE</version> <version>5.1.5.RELEASE</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>dubbo</artifactId> <artifactId>dubbo</artifactId>
<version>2.6.5</version> <version>2.6.5</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>servlet-api</artifactId>
<version>2.5</version> <version>2.5</version>
<scope>compile</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.iocoder.mall</groupId> <groupId>cn.iocoder.mall</groupId>
<artifactId>common-framework</artifactId> <artifactId>common-framework</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.iocoder.mall</groupId> <groupId>cn.iocoder.mall</groupId>
<artifactId>admin-service-api</artifactId> <artifactId>admin-service-api</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
admin/admin-service-api/pom.xml
浏览文件 @ 1eb5fbdb
...@@ -17,11 +17,25 @@ ...@@ -17,11 +17,25 @@
<artifactId>common-framework</artifactId> <artifactId>common-framework</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher -->
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-jdk8</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.hibernate.validator</groupId> <groupId>org.projectlombok</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminBO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.api.bo; package cn.iocoder.mall.admin.api.bo;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
/**
* 管理员 BO
*/
@Data
@Accessors(chain = true)
public class AdminBO { public class AdminBO {
/** /**
...@@ -25,48 +33,4 @@ public class AdminBO { ...@@ -25,48 +33,4 @@ public class AdminBO {
*/ */
private Date createTime; 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;
}
} }
admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminPageBO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.api.bo; package cn.iocoder.mall.admin.api.bo;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.List; import java.util.List;
/**
* 管理员分页 BO
*/
@Data
@Accessors(chain = true)
public class AdminPageBO { public class AdminPageBO {
/** /**
...@@ -13,22 +21,4 @@ public class AdminPageBO { ...@@ -13,22 +21,4 @@ public class AdminPageBO {
*/ */
private Integer total; private Integer total;
public List<AdminBO> getList() { }
return list;
}
public AdminPageBO setList(List<AdminBO> 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
admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/DataDictBO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.api.bo; package cn.iocoder.mall.admin.api.bo;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
/** /**
* 数据字典 BO * 数据字典 BO
*/ */
@Data
@Accessors(chain = true)
public class DataDictBO { public class DataDictBO {
/** /**
...@@ -36,67 +41,4 @@ public class DataDictBO { ...@@ -36,67 +41,4 @@ public class DataDictBO {
*/ */
private Date createTime; 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
admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AccessTokenBO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.api.bo; package cn.iocoder.mall.admin.api.bo;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable; import java.io.Serializable;
/**
* OAUTH2 AccessToken BO
*/
@Data
@Accessors(chain = true)
public class OAuth2AccessTokenBO implements Serializable { public class OAuth2AccessTokenBO implements Serializable {
/** /**
...@@ -17,31 +25,4 @@ public class OAuth2AccessTokenBO implements Serializable { ...@@ -17,31 +25,4 @@ public class OAuth2AccessTokenBO implements Serializable {
*/ */
private Integer expiresIn; 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
admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AuthenticationBO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.api.bo; package cn.iocoder.mall.admin.api.bo;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable; import java.io.Serializable;
import java.util.Set; import java.util.Set;
/**
* OAUTH2 认证 BO
*/
@Data
@Accessors(chain = true)
public class OAuth2AuthenticationBO implements Serializable { public class OAuth2AuthenticationBO implements Serializable {
/** /**
...@@ -14,22 +22,4 @@ public class OAuth2AuthenticationBO implements Serializable { ...@@ -14,22 +22,4 @@ public class OAuth2AuthenticationBO implements Serializable {
*/ */
private Set<Integer> roleIds; private Set<Integer> roleIds;
public Integer getAdminId() { }
return adminId;
}
public OAuth2AuthenticationBO setAdminId(Integer adminId) {
this.adminId = adminId;
return this;
}
public Set<Integer> getRoleIds() {
return roleIds;
}
public OAuth2AuthenticationBO setRoleIds(Set<Integer> roleIds) {
this.roleIds = roleIds;
return this;
}
}
\ No newline at end of file
admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/ResourceBO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.api.bo; package cn.iocoder.mall.admin.api.bo;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
/** /**
* 资源 BO * 资源 BO
*/ */
@Data
@Accessors(chain = true)
public class ResourceBO { public class ResourceBO {
/** /**
...@@ -40,76 +45,4 @@ public class ResourceBO { ...@@ -40,76 +45,4 @@ public class ResourceBO {
*/ */
private String handler; 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
admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RoleBO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.api.bo; package cn.iocoder.mall.admin.api.bo;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
/** /**
* 角色 BO * 角色 BO
*/ */
@Data
@Accessors(chain = true)
public class RoleBO { public class RoleBO {
/** /**
...@@ -20,31 +25,4 @@ public class RoleBO { ...@@ -20,31 +25,4 @@ public class RoleBO {
*/ */
private Date createTime; 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
admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RolePageBO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.api.bo; package cn.iocoder.mall.admin.api.bo;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.List; import java.util.List;
/**
* 角色分页 BO
*/
@Data
@Accessors(chain = true)
public class RolePageBO { public class RolePageBO {
/** /**
...@@ -13,22 +21,4 @@ public class RolePageBO { ...@@ -13,22 +21,4 @@ public class RolePageBO {
*/ */
private Integer count; private Integer count;
public List<RoleBO> getRoles() { }
return roles;
}
public RolePageBO setRoles(List<RoleBO> 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
admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAccessLogAddDTO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.api.dto; package cn.iocoder.mall.admin.api.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.Date; import java.util.Date;
/** /**
* 管理员访问日志添加 DTO * 管理员访问日志添加 DTO
*/ */
@Data
@Accessors(chain = true)
public class AdminAccessLogAddDTO { public class AdminAccessLogAddDTO {
/** /**
...@@ -57,76 +62,4 @@ public class AdminAccessLogAddDTO { ...@@ -57,76 +62,4 @@ public class AdminAccessLogAddDTO {
@NotNull(message = "响应时长不能为空") @NotNull(message = "响应时长不能为空")
private Integer responseTime; 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
admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAddDTO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.api.dto; package cn.iocoder.mall.admin.api.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
...@@ -8,6 +10,8 @@ import javax.validation.constraints.Pattern; ...@@ -8,6 +10,8 @@ import javax.validation.constraints.Pattern;
/** /**
* 管理员添加 DTO * 管理员添加 DTO
*/ */
@Data
@Accessors(chain = true)
public class AdminAddDTO { public class AdminAddDTO {
/** /**
...@@ -30,30 +34,4 @@ public class AdminAddDTO { ...@@ -30,30 +34,4 @@ public class AdminAddDTO {
@Length(min = 6, max = 16, message = "密码长度为 6-16 位") @Length(min = 6, max = 16, message = "密码长度为 6-16 位")
private String password; 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
admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminPageDTO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.api.dto; package cn.iocoder.mall.admin.api.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
/**
* 管理员分页 DTO
*/
@Data
@Accessors(chain = true)
public class AdminPageDTO { public class AdminPageDTO {
/** /**
...@@ -14,31 +22,4 @@ public class AdminPageDTO { ...@@ -14,31 +22,4 @@ public class AdminPageDTO {
@NotNull(message = "每页条数不能为空") @NotNull(message = "每页条数不能为空")
private Integer pageSize; 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;
}
} }
admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminUpdateDTO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.api.dto; package cn.iocoder.mall.admin.api.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
...@@ -9,6 +11,8 @@ import javax.validation.constraints.Pattern; ...@@ -9,6 +11,8 @@ import javax.validation.constraints.Pattern;
/** /**
* 管理员更新 DTO * 管理员更新 DTO
*/ */
@Data
@Accessors(chain = true)
public class AdminUpdateDTO { public class AdminUpdateDTO {
/** /**
...@@ -35,39 +39,4 @@ public class AdminUpdateDTO { ...@@ -35,39 +39,4 @@ public class AdminUpdateDTO {
@Length(min = 6, max = 16, message = "密码长度为 6-16 位") @Length(min = 6, max = 16, message = "密码长度为 6-16 位")
private String password; 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
admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictAddDTO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.api.dto; package cn.iocoder.mall.admin.api.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
/** /**
* 数据字典添加 DTO * 数据字典添加 DTO
*/ */
@Data
@Accessors(chain = true)
public class DataDictAddDTO { public class DataDictAddDTO {
/** /**
...@@ -33,49 +38,4 @@ public class DataDictAddDTO { ...@@ -33,49 +38,4 @@ public class DataDictAddDTO {
*/ */
private String memo; 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
admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictUpdateDTO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.api.dto; package cn.iocoder.mall.admin.api.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
/** /**
* 数据字典更新 DTO * 数据字典更新 DTO
*/ */
@Data
@Accessors(chain = true)
public class DataDictUpdateDTO { public class DataDictUpdateDTO {
/** /**
...@@ -33,49 +38,4 @@ public class DataDictUpdateDTO { ...@@ -33,49 +38,4 @@ public class DataDictUpdateDTO {
*/ */
private String memo; 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
admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceAddDTO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.api.dto; package cn.iocoder.mall.admin.api.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
/** /**
* 资源添加 DTO * 资源添加 DTO
*/ */
@Data
@Accessors(chain = true)
public class ResourceAddDTO { public class ResourceAddDTO {
/** /**
...@@ -37,58 +42,4 @@ public class ResourceAddDTO { ...@@ -37,58 +42,4 @@ public class ResourceAddDTO {
*/ */
private String handler; 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
admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceUpdateDTO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.api.dto; package cn.iocoder.mall.admin.api.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
/** /**
* 资源更新 DTO * 资源更新 DTO
*/ */
@Data
@Accessors(chain = true)
public class ResourceUpdateDTO { public class ResourceUpdateDTO {
/** /**
...@@ -37,58 +42,4 @@ public class ResourceUpdateDTO { ...@@ -37,58 +42,4 @@ public class ResourceUpdateDTO {
*/ */
private String handler; 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
admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleAddDTO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.api.dto; package cn.iocoder.mall.admin.api.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
/** /**
* 角色添加 DTO * 角色添加 DTO
*/ */
@Data
@Accessors(chain = true)
public class RoleAddDTO { public class RoleAddDTO {
/** /**
...@@ -13,13 +18,4 @@ public class RoleAddDTO { ...@@ -13,13 +18,4 @@ public class RoleAddDTO {
@NotEmpty(message = "角色名字不能为空") @NotEmpty(message = "角色名字不能为空")
private String name; private String name;
public String getName() { }
return name;
}
public RoleAddDTO setName(String name) {
this.name = name;
return this;
}
}
\ No newline at end of file
admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RolePageDTO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.api.dto; package cn.iocoder.mall.admin.api.dto;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 角色分页 DTO
*/
@Data
@Accessors(chain = true)
public class RolePageDTO { public class RolePageDTO {
private Integer pageNo; private Integer pageNo;
......
admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleUpdateDTO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.api.dto; package cn.iocoder.mall.admin.api.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
/** /**
* 角色添加 DTO * 角色添加 DTO
*/ */
@Data
@Accessors(chain = true)
public class RoleUpdateDTO { public class RoleUpdateDTO {
/** /**
...@@ -19,22 +24,4 @@ public class RoleUpdateDTO { ...@@ -19,22 +24,4 @@ public class RoleUpdateDTO {
@NotEmpty(message = "角色名字不能为空") @NotEmpty(message = "角色名字不能为空")
private String name; 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
admin/admin-service-impl/pom.xml
浏览文件 @ 1eb5fbdb
...@@ -11,21 +11,12 @@ ...@@ -11,21 +11,12 @@
<artifactId>admin-service-impl</artifactId> <artifactId>admin-service-impl</artifactId>
<properties>
<org.mapstruct.version>1.3.0.Final</org.mapstruct.version>
</properties>
<dependencies> <dependencies>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo</artifactId>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>cn.iocoder.mall</groupId> <groupId>cn.iocoder.mall</groupId>
<artifactId>admin-service-api</artifactId> <artifactId>admin-service-api</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
...@@ -38,20 +29,18 @@ ...@@ -38,20 +29,18 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mybatis.spring.boot</groupId> <groupId>com.alibaba</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId> <artifactId>dubbo</artifactId>
<version>2.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mapstruct</groupId> <groupId>org.mybatis.spring.boot</groupId>
<artifactId>mapstruct</artifactId> <artifactId>mybatis-spring-boot-starter</artifactId>
<version>${org.mapstruct.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>27.0.1-jre</version>
</dependency> </dependency>
</dependencies> </dependencies>
...@@ -62,21 +51,9 @@ ...@@ -62,21 +51,9 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>1.8</source> <!-- or higher, depending on your project -->
<target>1.8</target> <!-- or higher, depending on your project -->
<annotationProcessorPaths>
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>${org.mapstruct.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminAccessLogDO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.dataobject; package cn.iocoder.mall.admin.dataobject;
import cn.iocoder.common.framework.dataobject.DeletableDO; import cn.iocoder.common.framework.dataobject.DeletableDO;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
/** /**
* 管理员访问日志 DO * 管理员访问日志 DO
*/ */
@Data
@Accessors(chain = true)
public class AdminAccessLogDO extends DeletableDO { public class AdminAccessLogDO extends DeletableDO {
/** /**
...@@ -48,85 +52,4 @@ public class AdminAccessLogDO extends DeletableDO { ...@@ -48,85 +52,4 @@ public class AdminAccessLogDO extends DeletableDO {
*/ */
private Integer responseTime; 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
admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminDO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.dataobject; package cn.iocoder.mall.admin.dataobject;
import cn.iocoder.common.framework.dataobject.DeletableDO; import cn.iocoder.common.framework.dataobject.DeletableDO;
import lombok.Data;
import lombok.experimental.Accessors;
/** /**
* 管理员实体 * 管理员实体
*/ */
@Data
@Accessors(chain = true)
public class AdminDO extends DeletableDO { public class AdminDO extends DeletableDO {
/** /**
...@@ -30,49 +34,4 @@ public class AdminDO extends DeletableDO { ...@@ -30,49 +34,4 @@ public class AdminDO extends DeletableDO {
*/ */
private Integer status; 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;
}
} }
admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminRoleDO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.dataobject; package cn.iocoder.mall.admin.dataobject;
import cn.iocoder.common.framework.dataobject.DeletableDO; import cn.iocoder.common.framework.dataobject.DeletableDO;
import lombok.Data;
import lombok.experimental.Accessors;
/** /**
* {@link AdminDO} 和 {@link RoleDO} 的关联表 * {@link AdminDO} 和 {@link RoleDO} 的关联表
*/ */
@Data
@Accessors(chain = true)
public class AdminRoleDO extends DeletableDO { public class AdminRoleDO extends DeletableDO {
/** /**
...@@ -20,31 +24,4 @@ public class AdminRoleDO extends DeletableDO { ...@@ -20,31 +24,4 @@ public class AdminRoleDO extends DeletableDO {
*/ */
private Integer roleId; 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
admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/DataDictDO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.dataobject; package cn.iocoder.mall.admin.dataobject;
import cn.iocoder.common.framework.dataobject.DeletableDO; 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; ...@@ -11,6 +13,8 @@ import cn.iocoder.common.framework.dataobject.DeletableDO;
* value：1 男 * value：1 男
* value：2 女 * value：2 女
*/ */
@Data
@Accessors(chain = true)
public class DataDictDO extends DeletableDO { public class DataDictDO extends DeletableDO {
/** /**
...@@ -38,57 +42,4 @@ public class DataDictDO extends DeletableDO { ...@@ -38,57 +42,4 @@ public class DataDictDO extends DeletableDO {
*/ */
private String memo; 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
admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2AccessTokenDO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.dataobject; package cn.iocoder.mall.admin.dataobject;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
/**
* OAUTH2 AccessToken
*/
@Data
@Accessors(chain = true)
public class OAuth2AccessTokenDO { public class OAuth2AccessTokenDO {
/** /**
...@@ -83,4 +91,4 @@ public class OAuth2AccessTokenDO { ...@@ -83,4 +91,4 @@ public class OAuth2AccessTokenDO {
return this; return this;
} }
} }
\ No newline at end of file
admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2RefreshTokenDO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.dataobject; package cn.iocoder.mall.admin.dataobject;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
/** /**
...@@ -7,6 +10,8 @@ import java.util.Date; ...@@ -7,6 +10,8 @@ import java.util.Date;
* *
* idx_uid * idx_uid
*/ */
@Data
@Accessors(chain = true)
public class OAuth2RefreshTokenDO { public class OAuth2RefreshTokenDO {
/** /**
...@@ -30,49 +35,4 @@ public class OAuth2RefreshTokenDO { ...@@ -30,49 +35,4 @@ public class OAuth2RefreshTokenDO {
*/ */
private Date createTime; 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;
}
} }
admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/ResourceDO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.dataobject; package cn.iocoder.mall.admin.dataobject;
import cn.iocoder.common.framework.dataobject.DeletableDO; import cn.iocoder.common.framework.dataobject.DeletableDO;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
/** /**
* 资源实体 * 资源实体
*/ */
@Data
@Accessors(chain = true)
public class ResourceDO extends DeletableDO { public class ResourceDO extends DeletableDO {
/** /**
...@@ -58,76 +62,4 @@ public class ResourceDO extends DeletableDO { ...@@ -58,76 +62,4 @@ public class ResourceDO extends DeletableDO {
*/ */
private String handler; 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;
}
} }
admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleDO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.dataobject; package cn.iocoder.mall.admin.dataobject;
import cn.iocoder.common.framework.dataobject.DeletableDO; import cn.iocoder.common.framework.dataobject.DeletableDO;
import lombok.Data;
import lombok.experimental.Accessors;
/** /**
* 角色实体 * 角色实体
*/ */
@Data
@Accessors(chain = true)
public class RoleDO extends DeletableDO { public class RoleDO extends DeletableDO {
/** /**
...@@ -16,22 +20,4 @@ public class RoleDO extends DeletableDO { ...@@ -16,22 +20,4 @@ public class RoleDO extends DeletableDO {
*/ */
private String name; 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;
}
} }
admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleResourceDO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.admin.dataobject; package cn.iocoder.mall.admin.dataobject;
import cn.iocoder.common.framework.dataobject.DeletableDO; import cn.iocoder.common.framework.dataobject.DeletableDO;
import lombok.Data;
import lombok.experimental.Accessors;
/** /**
* {@link RoleDO} 和 {@link ResourceDO} 的关联表 * {@link RoleDO} 和 {@link ResourceDO} 的关联表
*/ */
@Data
@Accessors(chain = true)
public class RoleResourceDO extends DeletableDO { public class RoleResourceDO extends DeletableDO {
/** /**
...@@ -20,31 +24,4 @@ public class RoleResourceDO extends DeletableDO { ...@@ -20,31 +24,4 @@ public class RoleResourceDO extends DeletableDO {
*/ */
private Integer resourceId; 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
common/pom.xml
浏览文件 @ 1eb5fbdb
...@@ -16,4 +16,4 @@ ...@@ -16,4 +16,4 @@
</modules> </modules>
</project> </project>
\ No newline at end of file
pay/pay-application/pom.xml
浏览文件 @ 1eb5fbdb
...@@ -22,12 +22,16 @@ ...@@ -22,12 +22,16 @@
<artifactId>common-framework</artifactId> <artifactId>common-framework</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.iocoder.mall</groupId> <groupId>cn.iocoder.mall</groupId>
<artifactId>pay-service-impl</artifactId> <artifactId>pay-service-impl</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>admin-sdk</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -43,42 +47,24 @@ ...@@ -43,42 +47,24 @@
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>dubbo</artifactId> <artifactId>dubbo</artifactId>
<version>2.6.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba.boot</groupId> <groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId> <artifactId>dubbo-spring-boot-starter</artifactId>
<version>0.2.1.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.curator</groupId> <groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId> <artifactId>curator-framework</artifactId>
<version>2.12.0</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher -->
<version>${org.mapstruct.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>springfox-swagger2</artifactId>
<version>2.9.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId> <artifactId>springfox-swagger-ui</artifactId>
<version>2.9.2</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher -->
<version>${org.mapstruct.version}</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -87,12 +73,6 @@ ...@@ -87,12 +73,6 @@
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>admin-sdk</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!--<dependency>--> <!--<dependency>-->
<!--<groupId>de.codecentric</groupId>--> <!--<groupId>de.codecentric</groupId>-->
<!--<artifactId>spring-boot-admin-starter-server</artifactId>--> <!--<artifactId>spring-boot-admin-starter-server</artifactId>-->
...@@ -122,30 +102,15 @@ ...@@ -122,30 +102,15 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>1.8</source> <!-- or higher, depending on your project -->
<target>1.8</target> <!-- or higher, depending on your project -->
<annotationProcessorPaths>
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>${org.mapstruct.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin> </plugin>
<!-- 打包 --> <!-- 打包 -->
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<fork>true</fork>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
pay/pay-service-api/pom.xml
浏览文件 @ 1eb5fbdb
...@@ -15,9 +15,26 @@ ...@@ -15,9 +15,26 @@
<groupId>cn.iocoder.mall</groupId> <groupId>cn.iocoder.mall</groupId>
<artifactId>common-framework</artifactId> <artifactId>common-framework</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<scope>compile</scope> </dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher -->
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-jdk8</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionBO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.pay.api.bo; package cn.iocoder.mall.pay.api.bo;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
/** /**
* 支付交易 BO * 支付交易 BO
*/ */
@Data
@Accessors(chain = true)
public class PayTransactionBO { public class PayTransactionBO {
/** /**
...@@ -86,157 +91,4 @@ public class PayTransactionBO { ...@@ -86,157 +91,4 @@ public class PayTransactionBO {
*/ */
private Date createTime; private Date createTime;
public Integer getId() { }
return id;
}
public PayTransactionBO setId(Integer id) {
this.id = id;
return this;
}
public String getAppId() {
return appId;
}
public PayTransactionBO setAppId(String appId) {
this.appId = appId;
return this;
}
public String getCreateIp() {
return createIp;
}
public PayTransactionBO setCreateIp(String createIp) {
this.createIp = createIp;
return this;
}
public String getOrderId() {
return orderId;
}
public PayTransactionBO setOrderId(String orderId) {
this.orderId = orderId;
return this;
}
public String getOrderSubject() {
return orderSubject;
}
public PayTransactionBO setOrderSubject(String orderSubject) {
this.orderSubject = orderSubject;
return this;
}
public String getOrderDescription() {
return orderDescription;
}
public PayTransactionBO setOrderDescription(String orderDescription) {
this.orderDescription = orderDescription;
return this;
}
public String getOrderMemo() {
return orderMemo;
}
public PayTransactionBO setOrderMemo(String orderMemo) {
this.orderMemo = orderMemo;
return this;
}
public Integer getPrice() {
return price;
}
public PayTransactionBO setPrice(Integer price) {
this.price = price;
return this;
}
public Integer getStatus() {
return status;
}
public PayTransactionBO setStatus(Integer status) {
this.status = status;
return this;
}
public Date getExpireTime() {
return expireTime;
}
public PayTransactionBO setExpireTime(Date expireTime) {
this.expireTime = expireTime;
return this;
}
public Date getFinishTime() {
return finishTime;
}
public PayTransactionBO setFinishTime(Date finishTime) {
this.finishTime = finishTime;
return this;
}
public Integer getExtensionId() {
return extensionId;
}
public PayTransactionBO setExtensionId(Integer extensionId) {
this.extensionId = extensionId;
return this;
}
public Integer getPayChannel() {
return payChannel;
}
public PayTransactionBO setPayChannel(Integer payChannel) {
this.payChannel = payChannel;
return this;
}
public Date getPaymentTime() {
return paymentTime;
}
public PayTransactionBO setPaymentTime(Date paymentTime) {
this.paymentTime = paymentTime;
return this;
}
public Date getNotifyTime() {
return notifyTime;
}
public PayTransactionBO setNotifyTime(Date notifyTime) {
this.notifyTime = notifyTime;
return this;
}
public String getTradeNo() {
return tradeNo;
}
public PayTransactionBO setTradeNo(String tradeNo) {
this.tradeNo = tradeNo;
return this;
}
public Date getCreateTime() {
return createTime;
}
public PayTransactionBO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
}
\ No newline at end of file
pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionSubmitBO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.pay.api.bo; package cn.iocoder.mall.pay.api.bo;
import lombok.Data;
import lombok.experimental.Accessors;
/** /**
* 支付交易提交结果 BO * 支付交易提交结果 BO
*/ */
@Data
@Accessors(chain = true)
public class PayTransactionSubmitBO { public class PayTransactionSubmitBO {
/** /**
...@@ -14,22 +19,4 @@ public class PayTransactionSubmitBO { ...@@ -14,22 +19,4 @@ public class PayTransactionSubmitBO {
*/ */
private String invokeResponse; private String invokeResponse;
public Integer getId() { }
return id;
}
public PayTransactionSubmitBO setId(Integer id) {
this.id = id;
return this;
}
public String getInvokeResponse() {
return invokeResponse;
}
public PayTransactionSubmitBO setInvokeResponse(String invokeResponse) {
this.invokeResponse = invokeResponse;
return this;
}
}
\ No newline at end of file
pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/PayTransactionCreateDTO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.pay.api.dto; package cn.iocoder.mall.pay.api.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.DecimalMin; import javax.validation.constraints.DecimalMin;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
...@@ -9,6 +12,8 @@ import java.util.Date; ...@@ -9,6 +12,8 @@ import java.util.Date;
/** /**
* 支付交易创建 DTO * 支付交易创建 DTO
*/ */
@Data
@Accessors(chain = true)
public class PayTransactionCreateDTO { public class PayTransactionCreateDTO {
/** /**
...@@ -55,76 +60,4 @@ public class PayTransactionCreateDTO { ...@@ -55,76 +60,4 @@ public class PayTransactionCreateDTO {
@NotNull(message = "交易过期时间不能为空") @NotNull(message = "交易过期时间不能为空")
private Date expireTime; private Date expireTime;
public String getAppId() { }
return appId;
}
public PayTransactionCreateDTO setAppId(String appId) {
this.appId = appId;
return this;
}
public String getCreateIp() {
return createIp;
}
public PayTransactionCreateDTO setCreateIp(String createIp) {
this.createIp = createIp;
return this;
}
public String getOrderId() {
return orderId;
}
public PayTransactionCreateDTO setOrderId(String orderId) {
this.orderId = orderId;
return this;
}
public String getOrderSubject() {
return orderSubject;
}
public PayTransactionCreateDTO setOrderSubject(String orderSubject) {
this.orderSubject = orderSubject;
return this;
}
public String getOrderDescription() {
return orderDescription;
}
public PayTransactionCreateDTO setOrderDescription(String orderDescription) {
this.orderDescription = orderDescription;
return this;
}
public String getOrderMemo() {
return orderMemo;
}
public PayTransactionCreateDTO setOrderMemo(String orderMemo) {
this.orderMemo = orderMemo;
return this;
}
public Integer getPrice() {
return price;
}
public PayTransactionCreateDTO setPrice(Integer price) {
this.price = price;
return this;
}
public Date getExpireTime() {
return expireTime;
}
public PayTransactionCreateDTO setExpireTime(Date expireTime) {
this.expireTime = expireTime;
return this;
}
}
\ No newline at end of file
pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/PayTransactionSubmitDTO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.pay.api.dto; package cn.iocoder.mall.pay.api.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
/** /**
* 支付交易提交 DTO * 支付交易提交 DTO
*/ */
@Data
@Accessors(chain = true)
public class PayTransactionSubmitDTO { public class PayTransactionSubmitDTO {
/** /**
...@@ -29,40 +34,4 @@ public class PayTransactionSubmitDTO { ...@@ -29,40 +34,4 @@ public class PayTransactionSubmitDTO {
@NotNull(message = "支付渠道") @NotNull(message = "支付渠道")
private Integer payChannel; private Integer payChannel;
public String getAppId() { }
return appId;
}
public PayTransactionSubmitDTO setAppId(String appId) {
this.appId = appId;
return this;
}
public String getCreateIp() {
return createIp;
}
public PayTransactionSubmitDTO setCreateIp(String createIp) {
this.createIp = createIp;
return this;
}
public String getOrderId() {
return orderId;
}
public PayTransactionSubmitDTO setOrderId(String orderId) {
this.orderId = orderId;
return this;
}
public Integer getPayChannel() {
return payChannel;
}
public PayTransactionSubmitDTO setPayChannel(Integer payChannel) {
this.payChannel = payChannel;
return this;
}
}
\ No newline at end of file
pay/pay-service-impl/pom.xml
浏览文件 @ 1eb5fbdb
...@@ -19,19 +19,16 @@ ...@@ -19,19 +19,16 @@
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>dubbo</artifactId> <artifactId>dubbo</artifactId>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.iocoder.mall</groupId> <groupId>cn.iocoder.mall</groupId>
<artifactId>admin-service-api</artifactId> <artifactId>admin-service-api</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.iocoder.mall</groupId> <groupId>cn.iocoder.mall</groupId>
<artifactId>pay-service-api</artifactId> <artifactId>pay-service-api</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
...@@ -46,18 +43,11 @@ ...@@ -46,18 +43,11 @@
<dependency> <dependency>
<groupId>org.mybatis.spring.boot</groupId> <groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId> <artifactId>mybatis-spring-boot-starter</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
<version>${org.mapstruct.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>27.0.1-jre</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -70,13 +60,11 @@ ...@@ -70,13 +60,11 @@
<dependency> <dependency>
<groupId>com.xuxueli</groupId> <groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId> <artifactId>xxl-job-core</artifactId>
<version>2.0.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.rocketmq</groupId> <groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-spring-boot-starter</artifactId> <artifactId>rocketmq-spring-boot-starter</artifactId>
<version>2.0.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
...@@ -87,18 +75,6 @@ ...@@ -87,18 +75,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>1.8</source> <!-- or higher, depending on your project -->
<target>1.8</target> <!-- or higher, depending on your project -->
<annotationProcessorPaths>
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>${org.mapstruct.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
...@@ -115,4 +91,4 @@ ...@@ -115,4 +91,4 @@
</repository> </repository>
</repositories> </repositories>
</project> </project>
\ No newline at end of file
pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayAppDO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.pay.biz.dataobject; package cn.iocoder.mall.pay.biz.dataobject;
import cn.iocoder.common.framework.dataobject.DeletableDO; import cn.iocoder.common.framework.dataobject.DeletableDO;
import lombok.Data;
import lombok.experimental.Accessors;
/** /**
* 支付应用（业务线）DO * 支付应用（业务线）DO
*/ */
@Data
@Accessors(chain = true)
public class PayAppDO extends DeletableDO { public class PayAppDO extends DeletableDO {
/** /**
...@@ -24,40 +28,4 @@ public class PayAppDO extends DeletableDO { ...@@ -24,40 +28,4 @@ public class PayAppDO extends DeletableDO {
*/ */
private Integer status; private Integer status;
public String getId() { }
return id;
}
public PayAppDO setId(String id) {
this.id = id;
return this;
}
public String getName() {
return name;
}
public PayAppDO setName(String name) {
this.name = name;
return this;
}
public String getNotifyUrl() {
return notifyUrl;
}
public PayAppDO setNotifyUrl(String notifyUrl) {
this.notifyUrl = notifyUrl;
return this;
}
public Integer getStatus() {
return status;
}
public PayAppDO setStatus(Integer status) {
this.status = status;
return this;
}
}
\ No newline at end of file
pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayLogDO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.pay.biz.dataobject; package cn.iocoder.mall.pay.biz.dataobject;
import lombok.Data;
import lombok.experimental.Accessors;
/** /**
* 交易日志 DO * 交易日志 DO
* *
...@@ -7,6 +10,8 @@ package cn.iocoder.mall.pay.biz.dataobject; ...@@ -7,6 +10,8 @@ package cn.iocoder.mall.pay.biz.dataobject;
* *
* TODO 芋艿，后面在捉摸 * TODO 芋艿，后面在捉摸
*/ */
@Data
@Accessors(chain = true)
public class PayLogDO { public class PayLogDO {
/** /**
...@@ -21,4 +26,4 @@ public class PayLogDO { ...@@ -21,4 +26,4 @@ public class PayLogDO {
* 业务线订单编号 * 业务线订单编号
*/ */
private Integer orderId; private Integer orderId;
} }
\ No newline at end of file
pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayRefundDO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.pay.biz.dataobject; package cn.iocoder.mall.pay.biz.dataobject;
import lombok.Data;
import lombok.experimental.Accessors;
@Data
@Accessors(chain = true)
public class PayRefundDO { public class PayRefundDO {
} }
pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayRepeatTransactionDO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.pay.biz.dataobject; package cn.iocoder.mall.pay.biz.dataobject;
import lombok.Data;
import lombok.experimental.Accessors;
/** /**
* TODO 重复支付的交易 * TODO 重复支付的交易
* *
* 可能不靠这个表，而是差错处理。 * 可能不靠这个表，而是差错处理。
*/ */
@Data
@Accessors(chain = true)
public class PayRepeatTransactionDO { public class PayRepeatTransactionDO {
} }
pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionDO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.pay.biz.dataobject; package cn.iocoder.mall.pay.biz.dataobject;
import cn.iocoder.common.framework.dataobject.DeletableDO; import cn.iocoder.common.framework.dataobject.DeletableDO;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
/** /**
* 支付交易 DO * 支付交易 DO
*/ */
@Data
@Accessors(chain = true)
public class PayTransactionDO extends DeletableDO { public class PayTransactionDO extends DeletableDO {
/** /**
...@@ -100,156 +104,4 @@ public class PayTransactionDO extends DeletableDO { ...@@ -100,156 +104,4 @@ public class PayTransactionDO extends DeletableDO {
*/ */
private String tradeNo; private String tradeNo;
public Integer getId() { }
return id;
}
public PayTransactionDO setId(Integer id) {
this.id = id;
return this;
}
public String getAppId() {
return appId;
}
public PayTransactionDO setAppId(String appId) {
this.appId = appId;
return this;
}
public String getCreateIp() {
return createIp;
}
public PayTransactionDO setCreateIp(String createIp) {
this.createIp = createIp;
return this;
}
public String getOrderId() {
return orderId;
}
public PayTransactionDO setOrderId(String orderId) {
this.orderId = orderId;
return this;
}
public Integer getStatus() {
return status;
}
public PayTransactionDO setStatus(Integer status) {
this.status = status;
return this;
}
public Integer getPrice() {
return price;
}
public PayTransactionDO setPrice(Integer price) {
this.price = price;
return this;
}
public Integer getPayChannel() {
return payChannel;
}
public PayTransactionDO setPayChannel(Integer payChannel) {
this.payChannel = payChannel;
return this;
}
public Date getPaymentTime() {
return paymentTime;
}
public PayTransactionDO setPaymentTime(Date paymentTime) {
this.paymentTime = paymentTime;
return this;
}
public Date getNotifyTime() {
return notifyTime;
}
public PayTransactionDO setNotifyTime(Date notifyTime) {
this.notifyTime = notifyTime;
return this;
}
public String getTradeNo() {
return tradeNo;
}
public PayTransactionDO setTradeNo(String tradeNo) {
this.tradeNo = tradeNo;
return this;
}
public String getOrderSubject() {
return orderSubject;
}
public PayTransactionDO setOrderSubject(String orderSubject) {
this.orderSubject = orderSubject;
return this;
}
public String getOrderDescription() {
return orderDescription;
}
public PayTransactionDO setOrderDescription(String orderDescription) {
this.orderDescription = orderDescription;
return this;
}
public String getOrderMemo() {
return orderMemo;
}
public PayTransactionDO setOrderMemo(String orderMemo) {
this.orderMemo = orderMemo;
return this;
}
public Date getExpireTime() {
return expireTime;
}
public PayTransactionDO setExpireTime(Date expireTime) {
this.expireTime = expireTime;
return this;
}
public Date getFinishTime() {
return finishTime;
}
public PayTransactionDO setFinishTime(Date finishTime) {
this.finishTime = finishTime;
return this;
}
public Integer getExtensionId() {
return extensionId;
}
public PayTransactionDO setExtensionId(Integer extensionId) {
this.extensionId = extensionId;
return this;
}
public String getNotifyUrl() {
return notifyUrl;
}
public PayTransactionDO setNotifyUrl(String notifyUrl) {
this.notifyUrl = notifyUrl;
return this;
}
}
\ No newline at end of file
pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionExtensionDO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.pay.biz.dataobject; package cn.iocoder.mall.pay.biz.dataobject;
import cn.iocoder.common.framework.dataobject.DeletableDO; import cn.iocoder.common.framework.dataobject.DeletableDO;
import lombok.Data;
import lombok.experimental.Accessors;
/** /**
* 交易扩展表 * 交易扩展表
*/ */
@Data
@Accessors(chain = true)
public class PayTransactionExtensionDO extends DeletableDO { public class PayTransactionExtensionDO extends DeletableDO {
/** /**
...@@ -43,67 +47,4 @@ public class PayTransactionExtensionDO extends DeletableDO { ...@@ -43,67 +47,4 @@ public class PayTransactionExtensionDO extends DeletableDO {
*/ */
private Integer status; private Integer status;
public Integer getId() { }
return id;
}
public PayTransactionExtensionDO setId(Integer id) {
this.id = id;
return this;
}
public Integer getTransactionId() {
return transactionId;
}
public PayTransactionExtensionDO setTransactionId(Integer transactionId) {
this.transactionId = transactionId;
return this;
}
public Integer getPayChannel() {
return payChannel;
}
public PayTransactionExtensionDO setPayChannel(Integer payChannel) {
this.payChannel = payChannel;
return this;
}
public String getTransactionCode() {
return transactionCode;
}
public PayTransactionExtensionDO setTransactionCode(String transactionCode) {
this.transactionCode = transactionCode;
return this;
}
public String getExtensionData() {
return extensionData;
}
public PayTransactionExtensionDO setExtensionData(String extensionData) {
this.extensionData = extensionData;
return this;
}
public String getCreateIp() {
return createIp;
}
public PayTransactionExtensionDO setCreateIp(String createIp) {
this.createIp = createIp;
return this;
}
public Integer getStatus() {
return status;
}
public PayTransactionExtensionDO setStatus(Integer status) {
this.status = status;
return this;
}
}
\ No newline at end of file
pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionNotifyLogDO.java
浏览文件 @ 1eb5fbdb
package cn.iocoder.mall.pay.biz.dataobject; package cn.iocoder.mall.pay.biz.dataobject;
import cn.iocoder.common.framework.dataobject.DeletableDO; import cn.iocoder.common.framework.dataobject.DeletableDO;
import lombok.Data;
import lombok.experimental.Accessors;
/** /**
* 支付交易通知 App 的日志 DO * 支付交易通知 App 的日志 DO
* *
* 通过该表，记录通知 App 时，产生的日志 * 通过该表，记录通知 App 时，产生的日志
*/ */
@Data
@Accessors(chain = true)
public class PayTransactionNotifyLogDO extends DeletableDO { public class PayTransactionNotifyLogDO extends DeletableDO {
/** /**
...@@ -32,49 +36,4 @@ public class PayTransactionNotifyLogDO extends DeletableDO { ...@@ -32,49 +36,4 @@ public class PayTransactionNotifyLogDO extends DeletableDO {
*/ */
private Integer status; private Integer status;
public Integer getId() { }
return id;
}
public PayTransactionNotifyLogDO setId(Integer id) {
this.id = id;
return this;
}
public String getRequest() {
return request;
}
public PayTransactionNotifyLogDO setRequest(String request) {
this.request = request;
return this;
}
public String getResponse() {
return response;
}
public PayTransactionNotifyLogDO setResponse(String response) {
this.response = response;
return this;
}
public Integer getStatus() {
return status;
}
public PayTransactionNotifyLogDO setStatus(Integer status) {
this.status = status;
return this;
}
public Integer getNotifyId() {
return notifyId;
}
public PayTransactionNotifyLogDO setNotifyId(Integer notifyId) {
this.notifyId = notifyId;
return this;
}
}
\ No newline at end of file
pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionNotifyTaskDO.java
浏览文件 @ 1eb5fbdb
...@@ -2,12 +2,16 @@ package cn.iocoder.mall.pay.biz.dataobject; ...@@ -2,12 +2,16 @@ package cn.iocoder.mall.pay.biz.dataobject;
import cn.iocoder.common.framework.dataobject.DeletableDO; import cn.iocoder.common.framework.dataobject.DeletableDO;
import cn.iocoder.mall.pay.biz.service.PayServiceImpl; import cn.iocoder.mall.pay.biz.service.PayServiceImpl;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
/** /**
* 支付交易通知 App 的任务 DO * 支付交易通知 App 的任务 DO
*/ */
@Data
@Accessors(chain = true)
public class PayTransactionNotifyTaskDO extends DeletableDO { public class PayTransactionNotifyTaskDO extends DeletableDO {
/** /**
...@@ -84,103 +88,4 @@ public class PayTransactionNotifyTaskDO extends DeletableDO { ...@@ -84,103 +88,4 @@ public class PayTransactionNotifyTaskDO extends DeletableDO {
*/ */
private String notifyUrl; private String notifyUrl;
public Integer getTransactionId() { }
return transactionId;
}
public PayTransactionNotifyTaskDO setTransactionId(Integer transactionId) {
this.transactionId = transactionId;
return this;
}
public String getAppId() {
return appId;
}
public PayTransactionNotifyTaskDO setAppId(String appId) {
this.appId = appId;
return this;
}
public String getOrderId() {
return orderId;
}
public PayTransactionNotifyTaskDO setOrderId(String orderId) {
this.orderId = orderId;
return this;
}
public Integer getStatus() {
return status;
}
public PayTransactionNotifyTaskDO setStatus(Integer status) {
this.status = status;
return this;
}
public Date getNextNotifyTime() {
return nextNotifyTime;
}
public PayTransactionNotifyTaskDO setNextNotifyTime(Date nextNotifyTime) {
this.nextNotifyTime = nextNotifyTime;
return this;
}
public Integer getNotifyTimes() {
return notifyTimes;
}
public PayTransactionNotifyTaskDO setNotifyTimes(Integer notifyTimes) {
this.notifyTimes = notifyTimes;
return this;
}
public Integer getMaxNotifyTimes() {
return maxNotifyTimes;
}
public PayTransactionNotifyTaskDO setMaxNotifyTimes(Integer maxNotifyTimes) {
this.maxNotifyTimes = maxNotifyTimes;
return this;
}
public Integer getId() {
return id;
}
public PayTransactionNotifyTaskDO setId(Integer id) {
this.id = id;
return this;
}
public Integer getTransactionExtensionId() {
return transactionExtensionId;
}
public PayTransactionNotifyTaskDO setTransactionExtensionId(Integer transactionExtensionId) {
this.transactionExtensionId = transactionExtensionId;
return this;
}
public String getNotifyUrl() {
return notifyUrl;
}
public PayTransactionNotifyTaskDO setNotifyUrl(String notifyUrl) {
this.notifyUrl = notifyUrl;
return this;
}
public Date getLastExecuteTime() {
return lastExecuteTime;
}
public PayTransactionNotifyTaskDO setLastExecuteTime(Date lastExecuteTime) {
this.lastExecuteTime = lastExecuteTime;
return this;
}
}
\ No newline at end of file
pom.xml
浏览文件 @ 1eb5fbdb
...@@ -25,19 +25,101 @@ ...@@ -25,19 +25,101 @@
</modules> </modules>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties>
<com.alibab.dubbo.version>2.6.5</com.alibab.dubbo.version>
<mysql-connector-java.version>5.1.47</mysql-connector-java.version>
<dubbo-spring-boot-starter.version>0.2.1.RELEASE</dubbo-spring-boot-starter.version>
<org.mapstruct.version>1.3.0.Final</org.mapstruct.version>
<curator.version>2.12.0</curator.version>
<springfox-swagger.version>2.9.2</springfox-swagger.version>
<mybatis-spring-boot-starter.version>2.0.0</mybatis-spring-boot-starter.version>
<xxl-job.version>2.0.1</xxl-job.version>
<guava.version>27.0.1-jre</guava.version>
<rocketmq-spring-boot-starter.version>2.0.1</rocketmq-spring-boot-starter.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<org.projectlombok.version>1.16.14</org.projectlombok.version>
<java.version>1.8</java.version>
</properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>dubbo</artifactId> <artifactId>dubbo</artifactId>
<version>2.6.5</version> <version>${com.alibab.dubbo.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
<version>${dubbo-spring-boot-starter.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>5.1.47</version> <version>${mysql-connector-java.version}</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher -->
<version>${org.mapstruct.version}</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-jdk8</artifactId>
<version>${org.mapstruct.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${org.projectlombok.version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
<version>${curator.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${springfox-swagger.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${springfox-swagger.version}</version>
</dependency>
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>${mybatis-spring-boot-starter.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId>
<version>${xxl-job.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-spring-boot-starter</artifactId>
<version>${rocketmq-spring-boot-starter.version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
...@@ -50,5 +132,42 @@ ...@@ -50,5 +132,42 @@
<!--</snapshotRepository>--> <!--</snapshotRepository>-->
<!--</distributionManagement>--> <!--</distributionManagement>-->
<build>
<pluginManagement>
<plugins>
<!-- 提供给 mapstruct 使用 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${java.version}</source> <!-- or higher, depending on your project -->
<target>${java.version}</target> <!-- or higher, depending on your project -->
<annotationProcessorPaths>
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>${org.mapstruct.version}</version>
</path>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${org.projectlombok.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<!-- 打包 -->
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<fork>true</fork>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project> </project>
\ No newline at end of file
product/product-application/pom.xml
浏览文件 @ 1eb5fbdb
...@@ -11,10 +11,6 @@ ...@@ -11,10 +11,6 @@
<artifactId>product-application</artifactId> <artifactId>product-application</artifactId>
<properties>
<org.mapstruct.version>1.3.0.Final</org.mapstruct.version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>cn.iocoder.mall</groupId> <groupId>cn.iocoder.mall</groupId>
...@@ -47,6 +43,7 @@ ...@@ -47,6 +43,7 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
...@@ -58,7 +55,6 @@ ...@@ -58,7 +55,6 @@
<dependency> <dependency>
<groupId>org.mybatis.spring.boot</groupId> <groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId> <artifactId>mybatis-spring-boot-starter</artifactId>
<version>2.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -70,44 +66,24 @@ ...@@ -70,44 +66,24 @@
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>dubbo</artifactId> <artifactId>dubbo</artifactId>
<version>2.6.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba.boot</groupId> <groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId> <artifactId>dubbo-spring-boot-starter</artifactId>
<version>0.2.1.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.curator</groupId> <groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId> <artifactId>curator-framework</artifactId>
<version>2.12.0</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher -->
<version>${org.mapstruct.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>springfox-swagger2</artifactId>
<version>2.9.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId> <artifactId>springfox-swagger-ui</artifactId>
<version>2.9.2</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
...@@ -118,29 +94,14 @@ ...@@ -118,29 +94,14 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>1.8</source> <!-- or higher, depending on your project -->
<target>1.8</target> <!-- or higher, depending on your project -->
<annotationProcessorPaths>
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>${org.mapstruct.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin> </plugin>
<!-- 打包 --> <!-- 打包 -->
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<fork>true</fork>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductCategoryController.java
浏览文件 @ 1eb5fbdb
...@@ -36,7 +36,7 @@ public class AdminsProductCategoryController { ...@@ -36,7 +36,7 @@ public class AdminsProductCategoryController {
public CommonResult<List<AdminsProductCategoryTreeNodeVO>> tree() { public CommonResult<List<AdminsProductCategoryTreeNodeVO>> tree() {
List<ProductCategoryBO> productCategories = productCategoryService.getAll().getData(); List<ProductCategoryBO> productCategories = productCategoryService.getAll().getData();
// 创建 ProductCategoryTreeNodeVO Map // 创建 ProductCategoryTreeNodeVO Map
Map<Integer, AdminsProductCategoryTreeNodeVO> treeNodeMap = productCategories.stream().collect(Collectors.toMap(ProductCategoryBO::getId, ProductCategoryConvert.INSTANCE::convert)); Map<Integer, AdminsProductCategoryTreeNodeVO> treeNodeMap = productCategories.stream().collect(Collectors.toMap(ProductCategoryBO::getId, ProductCategoryConvert.Admins.INSTANCE::convert));
// 处理父子关系 // 处理父子关系
treeNodeMap.values().stream() treeNodeMap.values().stream()
.filter(node -> !node.getPid().equals(ProductCategoryConstants.PID_ROOT)) .filter(node -> !node.getPid().equals(ProductCategoryConstants.PID_ROOT))
...@@ -77,7 +77,7 @@ public class AdminsProductCategoryController { ...@@ -77,7 +77,7 @@ public class AdminsProductCategoryController {
// 创建商品分类 // 创建商品分类
CommonResult<ProductCategoryBO> result = productCategoryService.addProductCategory(AdminSecurityContextHolder.getContext().getAdminId(), productCategoryAddDTO); CommonResult<ProductCategoryBO> result = productCategoryService.addProductCategory(AdminSecurityContextHolder.getContext().getAdminId(), productCategoryAddDTO);
// 返回结果 // 返回结果
return ProductCategoryConvert.INSTANCE.convert2(result); return ProductCategoryConvert.Admins.INSTANCE.convert2(result);
} }
@PostMapping("/update") @PostMapping("/update")
...@@ -121,4 +121,4 @@ public class AdminsProductCategoryController { ...@@ -121,4 +121,4 @@ public class AdminsProductCategoryController {
return productCategoryService.deleteProductCategory(AdminSecurityContextHolder.getContext().getAdminId(), id); return productCategoryService.deleteProductCategory(AdminSecurityContextHolder.getContext().getAdminId(), id);
} }
} }
\ No newline at end of file
product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductCategoryController.java
浏览文件 @ 1eb5fbdb
...@@ -29,7 +29,7 @@ public class UsersProductCategoryController { ...@@ -29,7 +29,7 @@ public class UsersProductCategoryController {
@ApiImplicitParam(name = "pid", value = "指定分类编号", required = true, example = "0") @ApiImplicitParam(name = "pid", value = "指定分类编号", required = true, example = "0")
public CommonResult<List<UsersProductCategoryVO>> list(@RequestParam("pid") Integer pid) { public CommonResult<List<UsersProductCategoryVO>> list(@RequestParam("pid") Integer pid) {
List<ProductCategoryBO> result = productCategoryService.getListByPid(pid); List<ProductCategoryBO> result = productCategoryService.getListByPid(pid);
return CommonResult.success(ProductCategoryConvert.INSTANCE.convertToVO(result)); return CommonResult.success(ProductCategoryConvert.Users.INSTANCE.convertToVO(result));
} }
} }
\ No newline at end of file
product/product-application/src/main/java/cn/iocoder/mall/product/application/convert/ProductCategoryConvert.java
浏览文件 @ 1eb5fbdb
...@@ -2,30 +2,41 @@ package cn.iocoder.mall.product.application.convert; ...@@ -2,30 +2,41 @@ package cn.iocoder.mall.product.application.convert;
import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.common.framework.vo.CommonResult;
import cn.iocoder.mall.product.api.bo.ProductCategoryBO; import cn.iocoder.mall.product.api.bo.ProductCategoryBO;
import cn.iocoder.mall.product.application.vo.users.UsersProductCategoryVO;
import cn.iocoder.mall.product.application.vo.admins.AdminsProductCategoryTreeNodeVO; import cn.iocoder.mall.product.application.vo.admins.AdminsProductCategoryTreeNodeVO;
import cn.iocoder.mall.product.application.vo.admins.AdminsProductCategoryVO; import cn.iocoder.mall.product.application.vo.admins.AdminsProductCategoryVO;
import cn.iocoder.mall.product.application.vo.users.UsersProductCategoryVO;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.Mappings; import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers; import org.mapstruct.factory.Mappers;
import java.util.List; import java.util.List;
@Mapper
public interface ProductCategoryConvert { public interface ProductCategoryConvert {
ProductCategoryConvert INSTANCE = Mappers.getMapper(ProductCategoryConvert.class); @Mapper
interface Users {
Users INSTANCE = Mappers.getMapper(Users.class);
@Mappings({})
UsersProductCategoryVO convertToVO(ProductCategoryBO category);
@Mappings({})
List<UsersProductCategoryVO> convertToVO(List<ProductCategoryBO> categoryList);
}
@Mapper
interface Admins {
@Mappings({}) Admins INSTANCE = Mappers.getMapper(Admins.class);
UsersProductCategoryVO convertToVO(ProductCategoryBO category);
@Mappings({}) @Mappings({})
List<UsersProductCategoryVO> convertToVO(List<ProductCategoryBO> categoryList); AdminsProductCategoryTreeNodeVO convert(ProductCategoryBO category);
@Mappings({}) @Mappings({})
AdminsProductCategoryTreeNodeVO convert(ProductCategoryBO category); CommonResult<AdminsProductCategoryVO> convert2(CommonResult<ProductCategoryBO> result);
@Mappings({}) }
CommonResult<AdminsProductCategoryVO> convert2(CommonResult<ProductCategoryBO> result);
} }
\ No newline at end of file
product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrAndValuePairVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,8 +2,12 @@ package cn.iocoder.mall.product.application.vo.admins; ...@@ -2,8 +2,12 @@ package cn.iocoder.mall.product.application.vo.admins;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
@ApiModel(value = "商品规格属性和值对 VO") @ApiModel(value = "商品规格属性和值对 VO")
@Data
@Accessors(chain = true)
public class AdminsProductAttrAndValuePairVO { public class AdminsProductAttrAndValuePairVO {
@ApiModelProperty(value = "规格编号", required = true, example = "1") @ApiModelProperty(value = "规格编号", required = true, example = "1")
...@@ -15,40 +19,4 @@ public class AdminsProductAttrAndValuePairVO { ...@@ -15,40 +19,4 @@ public class AdminsProductAttrAndValuePairVO {
@ApiModelProperty(value = "规格值名", required = true, example = "红色") @ApiModelProperty(value = "规格值名", required = true, example = "红色")
private String attrValueName; private String attrValueName;
public Integer getAttrId() { }
return attrId;
}
public AdminsProductAttrAndValuePairVO setAttrId(Integer attrId) {
this.attrId = attrId;
return this;
}
public String getAttrName() {
return attrName;
}
public AdminsProductAttrAndValuePairVO setAttrName(String attrName) {
this.attrName = attrName;
return this;
}
public Integer getAttrValueId() {
return attrValueId;
}
public AdminsProductAttrAndValuePairVO setAttrValueId(Integer attrValueId) {
this.attrValueId = attrValueId;
return this;
}
public String getAttrValueName() {
return attrValueName;
}
public AdminsProductAttrAndValuePairVO setAttrValueName(String attrValueName) {
this.attrValueName = attrValueName;
return this;
}
}
\ No newline at end of file
product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrDetailVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,11 +2,15 @@ package cn.iocoder.mall.product.application.vo.admins; ...@@ -2,11 +2,15 @@ package cn.iocoder.mall.product.application.vo.admins;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ApiModel(value = "商品规格明细 VO", description = "带有规格值数组") @ApiModel(value = "商品规格明细 VO", description = "带有规格值数组")
@Data
@Accessors(chain = true)
public class AdminsProductAttrDetailVO { public class AdminsProductAttrDetailVO {
@ApiModelProperty(value = "规格编号", required = true, example = "1") @ApiModelProperty(value = "规格编号", required = true, example = "1")
...@@ -20,49 +24,4 @@ public class AdminsProductAttrDetailVO { ...@@ -20,49 +24,4 @@ public class AdminsProductAttrDetailVO {
@ApiModelProperty(value = "规格值数组", required = true) @ApiModelProperty(value = "规格值数组", required = true)
private List<AdminsProductAttrValueDetailVO> values; private List<AdminsProductAttrValueDetailVO> values;
public Integer getId() { }
return id;
}
public AdminsProductAttrDetailVO setId(Integer id) {
this.id = id;
return this;
}
public String getName() {
return name;
}
public AdminsProductAttrDetailVO setName(String name) {
this.name = name;
return this;
}
public Integer getStatus() {
return status;
}
public AdminsProductAttrDetailVO setStatus(Integer status) {
this.status = status;
return this;
}
public Date getCreateTime() {
return createTime;
}
public AdminsProductAttrDetailVO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public List<AdminsProductAttrValueDetailVO> getValues() {
return values;
}
public AdminsProductAttrDetailVO setValues(List<AdminsProductAttrValueDetailVO> values) {
this.values = values;
return this;
}
}
\ No newline at end of file
product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrPageVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.admins; ...@@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.admins;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.List; import java.util.List;
@ApiModel(value = "商品规格明细分页 VO") @ApiModel(value = "商品规格明细分页 VO")
@Data
@Accessors(chain = true)
public class AdminsProductAttrPageVO { public class AdminsProductAttrPageVO {
@ApiModelProperty(value = "规格数组", required = true) @ApiModelProperty(value = "规格数组", required = true)
...@@ -13,22 +17,4 @@ public class AdminsProductAttrPageVO { ...@@ -13,22 +17,4 @@ public class AdminsProductAttrPageVO {
@ApiModelProperty(value = "总数", required = true) @ApiModelProperty(value = "总数", required = true)
private Integer count; private Integer count;
public List<AdminsProductAttrDetailVO> getAttrs() { }
return attrs;
}
public AdminsProductAttrPageVO setAttrs(List<AdminsProductAttrDetailVO> attrs) {
this.attrs = attrs;
return this;
}
public Integer getCount() {
return count;
}
public AdminsProductAttrPageVO setCount(Integer count) {
this.count = count;
return this;
}
}
\ No newline at end of file
product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrSimpleVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.admins; ...@@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.admins;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.List; import java.util.List;
@ApiModel(value = "商品规格精简 VO", description = "带有规格值数组") @ApiModel(value = "商品规格精简 VO", description = "带有规格值数组")
@Data
@Accessors(chain = true)
public class AdminsProductAttrSimpleVO { public class AdminsProductAttrSimpleVO {
@ApiModelProperty(value = "规格编号", required = true, example = "1") @ApiModelProperty(value = "规格编号", required = true, example = "1")
...@@ -15,31 +19,4 @@ public class AdminsProductAttrSimpleVO { ...@@ -15,31 +19,4 @@ public class AdminsProductAttrSimpleVO {
@ApiModelProperty(value = "规格值数组", required = true) @ApiModelProperty(value = "规格值数组", required = true)
private List<AdminsProductAttrValueSimpleVO> values; private List<AdminsProductAttrValueSimpleVO> values;
public Integer getId() { }
return id;
}
public AdminsProductAttrSimpleVO setId(Integer id) {
this.id = id;
return this;
}
public String getName() {
return name;
}
public AdminsProductAttrSimpleVO setName(String name) {
this.name = name;
return this;
}
public List<AdminsProductAttrValueSimpleVO> getValues() {
return values;
}
public AdminsProductAttrSimpleVO setValues(List<AdminsProductAttrValueSimpleVO> values) {
this.values = values;
return this;
}
}
\ No newline at end of file
product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.admins; ...@@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.admins;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
@ApiModel(value = "商品规格 VO", description = "不带有规格值数组") @ApiModel(value = "商品规格 VO", description = "不带有规格值数组")
@Data
@Accessors(chain = true)
public class AdminsProductAttrVO { public class AdminsProductAttrVO {
@ApiModelProperty(value = "规格编号", required = true, example = "1") @ApiModelProperty(value = "规格编号", required = true, example = "1")
...@@ -17,39 +21,4 @@ public class AdminsProductAttrVO { ...@@ -17,39 +21,4 @@ public class AdminsProductAttrVO {
@ApiModelProperty(value = "创建时间", required = true, example = "时间戳") @ApiModelProperty(value = "创建时间", required = true, example = "时间戳")
private Date createTime; private Date createTime;
public Integer getId() { }
return id;
}
public AdminsProductAttrVO setId(Integer id) {
this.id = id;
return this;
}
public String getName() {
return name;
}
public AdminsProductAttrVO setName(String name) {
this.name = name;
return this;
}
public Integer getStatus() {
return status;
}
public AdminsProductAttrVO setStatus(Integer status) {
this.status = status;
return this;
}
public Date getCreateTime() {
return createTime;
}
public AdminsProductAttrVO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
}
\ No newline at end of file
product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueDetailVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.admins; ...@@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.admins;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
@ApiModel(value = "商品规格值 VO") @ApiModel(value = "商品规格值 VO")
@Data
@Accessors(chain = true)
public class AdminsProductAttrValueDetailVO { public class AdminsProductAttrValueDetailVO {
@ApiModelProperty(value = "规格值编号", required = true, example = "1") @ApiModelProperty(value = "规格值编号", required = true, example = "1")
...@@ -17,40 +21,4 @@ public class AdminsProductAttrValueDetailVO { ...@@ -17,40 +21,4 @@ public class AdminsProductAttrValueDetailVO {
@ApiModelProperty(value = "创建时间", required = true, example = "时间戳") @ApiModelProperty(value = "创建时间", required = true, example = "时间戳")
private Date createTime; private Date createTime;
public Integer getId() { }
return id;
}
public AdminsProductAttrValueDetailVO setId(Integer id) {
this.id = id;
return this;
}
public String getName() {
return name;
}
public AdminsProductAttrValueDetailVO setName(String name) {
this.name = name;
return this;
}
public Integer getStatus() {
return status;
}
public AdminsProductAttrValueDetailVO setStatus(Integer status) {
this.status = status;
return this;
}
public Date getCreateTime() {
return createTime;
}
public AdminsProductAttrValueDetailVO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
}
\ No newline at end of file
product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueSimpleVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,8 +2,12 @@ package cn.iocoder.mall.product.application.vo.admins; ...@@ -2,8 +2,12 @@ package cn.iocoder.mall.product.application.vo.admins;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
@ApiModel(value = "商品规格值精简 VO") @ApiModel(value = "商品规格值精简 VO")
@Data
@Accessors(chain = true)
public class AdminsProductAttrValueSimpleVO { public class AdminsProductAttrValueSimpleVO {
@ApiModelProperty(value = "规格值编号", required = true, example = "1") @ApiModelProperty(value = "规格值编号", required = true, example = "1")
...@@ -11,22 +15,4 @@ public class AdminsProductAttrValueSimpleVO { ...@@ -11,22 +15,4 @@ public class AdminsProductAttrValueSimpleVO {
@ApiModelProperty(value = "规格值名", required = true, example = "颜色") @ApiModelProperty(value = "规格值名", required = true, example = "颜色")
private String name; private String name;
public Integer getId() { }
return id;
}
public AdminsProductAttrValueSimpleVO setId(Integer id) {
this.id = id;
return this;
}
public String getName() {
return name;
}
public AdminsProductAttrValueSimpleVO setName(String name) {
this.name = name;
return this;
}
}
\ No newline at end of file
product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.admins; ...@@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.admins;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
@ApiModel(value = "商品规格值 VO") @ApiModel(value = "商品规格值 VO")
@Data
@Accessors(chain = true)
public class AdminsProductAttrValueVO { public class AdminsProductAttrValueVO {
@ApiModelProperty(value = "规格值编号", required = true, example = "1") @ApiModelProperty(value = "规格值编号", required = true, example = "1")
...@@ -19,49 +23,4 @@ public class AdminsProductAttrValueVO { ...@@ -19,49 +23,4 @@ public class AdminsProductAttrValueVO {
@ApiModelProperty(value = "创建时间", required = true, example = "时间戳") @ApiModelProperty(value = "创建时间", required = true, example = "时间戳")
private Date createTime; private Date createTime;
public Integer getId() { }
return id;
}
public AdminsProductAttrValueVO setId(Integer id) {
this.id = id;
return this;
}
public String getName() {
return name;
}
public AdminsProductAttrValueVO setName(String name) {
this.name = name;
return this;
}
public Integer getStatus() {
return status;
}
public AdminsProductAttrValueVO setStatus(Integer status) {
this.status = status;
return this;
}
public Date getCreateTime() {
return createTime;
}
public AdminsProductAttrValueVO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Integer getAttrId() {
return attrId;
}
public AdminsProductAttrValueVO setAttrId(Integer attrId) {
this.attrId = attrId;
return this;
}
}
\ No newline at end of file
product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductCategoryTreeNodeVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,11 +2,15 @@ package cn.iocoder.mall.product.application.vo.admins; ...@@ -2,11 +2,15 @@ package cn.iocoder.mall.product.application.vo.admins;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ApiModel("产品分类树节点 VO") @ApiModel("产品分类树节点 VO")
@Data
@Accessors(chain = true)
public class AdminsProductCategoryTreeNodeVO { public class AdminsProductCategoryTreeNodeVO {
@ApiModelProperty(value = "分类编号", required = true, example = "1") @ApiModelProperty(value = "分类编号", required = true, example = "1")
...@@ -28,85 +32,4 @@ public class AdminsProductCategoryTreeNodeVO { ...@@ -28,85 +32,4 @@ public class AdminsProductCategoryTreeNodeVO {
@ApiModelProperty(value = "子节点数组") @ApiModelProperty(value = "子节点数组")
private List<AdminsProductCategoryTreeNodeVO> children; private List<AdminsProductCategoryTreeNodeVO> children;
public Integer getId() { }
return id;
}
public AdminsProductCategoryTreeNodeVO setId(Integer id) {
this.id = id;
return this;
}
public Integer getPid() {
return pid;
}
public AdminsProductCategoryTreeNodeVO setPid(Integer pid) {
this.pid = pid;
return this;
}
public String getName() {
return name;
}
public AdminsProductCategoryTreeNodeVO setName(String name) {
this.name = name;
return this;
}
public String getDescription() {
return description;
}
public AdminsProductCategoryTreeNodeVO setDescription(String description) {
this.description = description;
return this;
}
public String getPicUrl() {
return picUrl;
}
public AdminsProductCategoryTreeNodeVO setPicUrl(String picUrl) {
this.picUrl = picUrl;
return this;
}
public Integer getSort() {
return sort;
}
public AdminsProductCategoryTreeNodeVO setSort(Integer sort) {
this.sort = sort;
return this;
}
public Integer getStatus() {
return status;
}
public AdminsProductCategoryTreeNodeVO setStatus(Integer status) {
this.status = status;
return this;
}
public Date getCreateTime() {
return createTime;
}
public AdminsProductCategoryTreeNodeVO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public List<AdminsProductCategoryTreeNodeVO> getChildren() {
return children;
}
public AdminsProductCategoryTreeNodeVO setChildren(List<AdminsProductCategoryTreeNodeVO> children) {
this.children = children;
return this;
}
}
\ No newline at end of file
product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductCategoryVO.java
浏览文件 @ 1eb5fbdb
...@@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.admins; ...@@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.admins;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
@ApiModel("产品分类 VO") @ApiModel("产品分类 VO")
@Data
@Accessors(chain = true)
public class AdminsProductCategoryVO { public class AdminsProductCategoryVO {
@ApiModelProperty(value = "分类编号", required = true, example = "1") @ApiModelProperty(value = "分类编号", required = true, example = "1")
...@@ -25,76 +29,4 @@ public class AdminsProductCategoryVO { ...@@ -25,76 +29,4 @@ public class AdminsProductCategoryVO {
@ApiModelProperty(value = "创建时间", required = true, example = "时间戳") @ApiModelProperty(value = "创建时间", required = true, example = "时间戳")
private Date createTime; private Date createTime;
public Integer getId() { }
return id;
}
public AdminsProductCategoryVO setId(Integer id) {
this.id = id;
return this;
}
public Integer getPid() {
return pid;
}
public AdminsProductCategoryVO setPid(Integer pid) {
this.pid = pid;
return this;
}
public String getName() {
return name;
}
public AdminsProductCategoryVO setName(String name) {
this.name = name;
return this;
}
public String getDescription() {
return description;
}
public AdminsProductCategoryVO setDescription(String description) {
this.description = description;
return this;
}
public String getPicUrl() {
return picUrl;
}
public AdminsProductCategoryVO setPicUrl(String picUrl) {
this.picUrl = picUrl;
return this;
}
public Integer getSort() {
return sort;
}
public AdminsProductCategoryVO setSort(Integer sort) {
this.sort = sort;
return this;
}
public Integer getStatus() {
return status;
}
public AdminsProductCategoryVO setStatus(Integer status) {
this.status = status;
return this;
}
public Date getCreateTime() {
return createTime;
}
public AdminsProductCategoryVO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
}
\ No newline at end of file
user/user-sdk/pom.xml
浏览文件 @ 1eb5fbdb
差异被折叠。
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论