diff --git a/src/main/java/com/rymcu/vertical/dto/UserDTO.java b/src/main/java/com/rymcu/vertical/dto/UserInfoDTO.java similarity index 50% rename from src/main/java/com/rymcu/vertical/dto/UserDTO.java rename to src/main/java/com/rymcu/vertical/dto/UserInfoDTO.java index 3b0e589..614afe8 100644 --- a/src/main/java/com/rymcu/vertical/dto/UserDTO.java +++ b/src/main/java/com/rymcu/vertical/dto/UserInfoDTO.java @@ -7,37 +7,27 @@ import java.io.Serializable; import java.util.Date; @Data -public class UserDTO implements Serializable { +public class UserInfoDTO implements Serializable { - private String id; + private String idUser; - private String office; + private String account; - private String officeId; + private String avatarType; - private String loginName; + private String avatarUrl; - private String password; - - private String no; - - private String name; + private String nickname; private String email; private String phone; - private String mobile; - private String status; - private String remarks; - private String roleIds; - private String sex = "男"; - - private String inputCode; + private String sex; @JSONField(format = "yyyy-MM-dd HH:mm") private Date lastLoginTime; diff --git a/src/main/java/com/rymcu/vertical/entity/Article.java b/src/main/java/com/rymcu/vertical/entity/Article.java new file mode 100644 index 0000000..fd770bb --- /dev/null +++ b/src/main/java/com/rymcu/vertical/entity/Article.java @@ -0,0 +1,42 @@ +package com.rymcu.vertical.entity; + +import lombok.Data; + +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import java.io.Serializable; +import java.util.Date; + +@Data +public class Article implements Serializable,Cloneable { + /** 主键 */ + @Id + @GeneratedValue + private Integer id ; + /** 文章标题 */ + private String articleTitle ; + /** 文章缩略图 */ + private String articleThumbnailUrl ; + /** 文章作者id */ + private Integer articleAuthorId ; + /** 文章类型 */ + private String articleType ; + /** 文章标签 */ + private String articleTags ; + /** 浏览总数 */ + private Integer articleViewCount ; + /** 预览内容 */ + private Integer articlePreviewContent ; + /** 评论总数 */ + private Integer commentCount ; + /** 过去时长 */ + private String timeAgo ; + /** 文章永久链接 */ + private String articlePermalink ; + /** 站内链接 */ + private String articleLink ; + /** 创建时间 */ + private Date createdTime ; + /** 更新时间 */ + private Date updatedTime ; +} diff --git a/src/main/java/com/rymcu/vertical/entity/Menu.java b/src/main/java/com/rymcu/vertical/entity/Menu.java index edd0bdd..00c0415 100644 --- a/src/main/java/com/rymcu/vertical/entity/Menu.java +++ b/src/main/java/com/rymcu/vertical/entity/Menu.java @@ -7,11 +7,12 @@ import tk.mybatis.mapper.annotation.ColumnType; import javax.persistence.Column; import javax.persistence.Id; import javax.persistence.Table; +import java.io.Serializable; import java.util.Date; @Data @Table(name = "SYS_MENU") -public class Menu { +public class Menu implements Serializable,Cloneable { @Id @Column(name = "id") diff --git a/src/main/java/com/rymcu/vertical/entity/Role.java b/src/main/java/com/rymcu/vertical/entity/Role.java index e7fbcef..1790720 100644 --- a/src/main/java/com/rymcu/vertical/entity/Role.java +++ b/src/main/java/com/rymcu/vertical/entity/Role.java @@ -5,11 +5,12 @@ import lombok.Data; import javax.persistence.Column; import javax.persistence.Id; import javax.persistence.Table; +import java.io.Serializable; import java.util.Date; @Data @Table(name = "sys_role") -public class Role { +public class Role implements Serializable,Cloneable { @Id @Column(name = "id") private Integer idRole; diff --git a/src/main/java/com/rymcu/vertical/entity/User.java b/src/main/java/com/rymcu/vertical/entity/User.java index 70464e9..0c9bf0e 100644 --- a/src/main/java/com/rymcu/vertical/entity/User.java +++ b/src/main/java/com/rymcu/vertical/entity/User.java @@ -7,11 +7,12 @@ import tk.mybatis.mapper.annotation.ColumnType; import javax.persistence.Column; import javax.persistence.Id; import javax.persistence.Table; +import java.io.Serializable; import java.util.Date; @Table(name = "sys_user") @Data -public class User { +public class User implements Serializable,Cloneable { @Id @Column(name = "id") private Integer idUser; diff --git a/src/main/java/com/rymcu/vertical/service/ArticleService.java b/src/main/java/com/rymcu/vertical/service/ArticleService.java new file mode 100644 index 0000000..cac1057 --- /dev/null +++ b/src/main/java/com/rymcu/vertical/service/ArticleService.java @@ -0,0 +1,7 @@ +package com.rymcu.vertical.service; + +import com.rymcu.vertical.core.service.Service; +import com.rymcu.vertical.entity.Article; + +public interface ArticleService extends Service
{ +} diff --git a/src/main/java/com/rymcu/vertical/service/TagService.java b/src/main/java/com/rymcu/vertical/service/TagService.java new file mode 100644 index 0000000..04be24b --- /dev/null +++ b/src/main/java/com/rymcu/vertical/service/TagService.java @@ -0,0 +1,7 @@ +package com.rymcu.vertical.service; + +import com.rymcu.vertical.core.service.Service; +import com.rymcu.vertical.entity.Article; + +public interface TagService extends Service
{ +} diff --git a/src/main/java/com/rymcu/vertical/service/impl/ArticleServiceImpl.java b/src/main/java/com/rymcu/vertical/service/impl/ArticleServiceImpl.java new file mode 100644 index 0000000..d12869e --- /dev/null +++ b/src/main/java/com/rymcu/vertical/service/impl/ArticleServiceImpl.java @@ -0,0 +1,10 @@ +package com.rymcu.vertical.service.impl; + +import com.rymcu.vertical.core.service.AbstractService; +import com.rymcu.vertical.entity.Article; +import com.rymcu.vertical.service.ArticleService; +import org.springframework.stereotype.Service; + +@Service +public class ArticleServiceImpl extends AbstractService
implements ArticleService { +} diff --git a/src/main/java/com/rymcu/vertical/service/impl/TagServiceImpl.java b/src/main/java/com/rymcu/vertical/service/impl/TagServiceImpl.java new file mode 100644 index 0000000..b9333e4 --- /dev/null +++ b/src/main/java/com/rymcu/vertical/service/impl/TagServiceImpl.java @@ -0,0 +1,10 @@ +package com.rymcu.vertical.service.impl; + +import com.rymcu.vertical.core.service.AbstractService; +import com.rymcu.vertical.entity.Article; +import com.rymcu.vertical.service.TagService; +import org.springframework.stereotype.Service; + +@Service +public class TagServiceImpl extends AbstractService
implements TagService { +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index 8b13789..0000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -