Chuyaoyuan/Jiscuss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

标签调整，优化

Browse Source
This commit is contained in:
yaoyuan2.chu
2020-11-11 23:39:08 +08:00
parent 16a0e65627
commit ae0650fac4
46 changed files with 769 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/yaoyuan/jiscuss/entity/Discussion.java
+61 -60
View File
@@ -11,67 +11,68 @@ import javax.persistence.Id;
import javax.persistence.Table;
import lombok.Data;
@Data
@Entity
@Table(name="discussion")
@Table(name = "discussion")
public class Discussion implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id", unique = true)
private Integer id;
@Column(name="title")
private String title;
@Column(name="content")
private String content;
@Column(name="comments_count")
private Integer commentsCount;
@Column(name="participants_count")
private Integer participantsCount;
@Column(name="number_index")
private Integer numberIndex;
@Column(name="start_time")
private Date startTime;
@Column(name="start_user_id")
private Integer startUserId;
@Column(name="start_post_id")
private Integer startPostId;
@Column(name="last_time")
private Date lastTime;
@Column(name="last_user_id")
private Integer lastUserId;
@Column(name="last_post_id")
private Integer lastPostId;
@Column(name="last_post_number")
private Integer lastPostNumber;
@Column(name="is_approved")
private Integer isApproved;
@Column(name="like_count")
private Integer likeCount;
@Column(name="ip_address")
private String ipAddress;
@Column(name="create_id")
private Integer createId;
@Column(name="create_time")
private Date createTime;
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id", unique = true)
private Integer id;
@Column(name = "title")
private String title;
@Column(name = "content")
private String content;
@Column(name = "comments_count")
private Integer commentsCount;
@Column(name = "participants_count")
private Integer participantsCount;
@Column(name = "number_index")
private Integer numberIndex;
@Column(name = "start_time")
private Date startTime;
@Column(name = "start_user_id")
private Integer startUserId;
@Column(name = "start_post_id")
private Integer startPostId;
@Column(name = "last_time")
private Date lastTime;
@Column(name = "last_user_id")
private Integer lastUserId;
@Column(name = "last_post_id")
private Integer lastPostId;
@Column(name = "last_post_number")
private Integer lastPostNumber;
@Column(name = "is_approved")
private Integer isApproved;
@Column(name = "like_count")
private Integer likeCount;
@Column(name = "ip_address")
private String ipAddress;
@Column(name = "create_id")
private Integer createId;
@Column(name = "create_time")
private Date createTime;
}
src/main/java/com/yaoyuan/jiscuss/entity/DiscussionTag.java
+8 -7
View File
@@ -5,21 +5,22 @@ import java.io.Serializable;
import javax.persistence.*;
import lombok.Data;
@Data
@Entity
@Table(name="discussiontag")
public class DiscussionTag implements Serializable{
@Table(name = "discussiontag")
public class DiscussionTag implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id;
@Column(name="discussion_id")
@Column(name = "discussion_id")
private Integer discussionId;
@Column(name="tag_id")
@Column(name = "tag_id")
private Integer tagId;
}
src/main/java/com/yaoyuan/jiscuss/entity/LikeCollect.java
+13 -13
View File
@@ -15,7 +15,7 @@ import java.util.Date;
*/
@Data
@Entity
@Table(name="likecollect")
@Table(name = "likecollect")
public class LikeCollect implements Serializable {
private static final long serialVersionUID = 1L;
@@ -23,40 +23,40 @@ public class LikeCollect implements Serializable {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id;
@Column(name="discussion_id")
@Column(name = "discussion_id")
private Integer discussionId;
@Column(name="discussion_name")
@Column(name = "discussion_name")
private String discussionName;
@Column(name="tag_id")
@Column(name = "tag_id")
private Integer tagId;
@Column(name="post_id")
@Column(name = "post_id")
private Integer postId;
@Column(name="post_content")
@Column(name = "post_content")
private String postContent;
@Column(name="user_id")
@Column(name = "user_id")
private Integer userId;
@Column(name="user_name")
@Column(name = "user_name")
private String userName;
@Column(name="type")
@Column(name = "type")
private String type;
@Column(name="like_type")
@Column(name = "like_type")
private String likeType;
@Column(name="collect_type")
@Column(name = "collect_type")
private String collectType;
@Column(name="create_id")
@Column(name = "create_id")
private Integer createId;
@Column(name="create_time")
@Column(name = "create_time")
private Date createTime;
}
src/main/java/com/yaoyuan/jiscuss/entity/Post.java
+30 -30
View File
@@ -14,54 +14,54 @@ import lombok.Data;
@Data
@Entity
@Table(name="post")
public class Post implements Serializable{
@Table(name = "post")
public class Post implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id;
@Column(name="discussion_id")
@Column(name = "discussion_id")
private Integer discussionId;
@Column(name="number")
@Column(name = "number")
private Integer number;
@Column(name="time")
@Column(name = "time")
private Date time;
@Column(name="user_id")
@Column(name = "user_id")
private Integer userId;
@Column(name="type")
@Column(name = "type")
private String type;
@Column(name="content")
@Column(name = "content")
private String content;
@Column(name="parent_id")
@Column(name = "parent_id")
private Integer parentId;
@Column(name="edit_time")
@Column(name = "edit_time")
private Date editTime;
@Column(name="edit_user_id")
@Column(name = "edit_user_id")
private Integer editUserId;
@Column(name="ip_address")
@Column(name = "ip_address")
private String ipAddress;
@Column(name="copyright")
@Column(name = "copyright")
private String copyright;
@Column(name="is_approved")
@Column(name = "is_approved")
private Integer isApproved;
@Column(name="create_id")
@Column(name = "create_id")
private Integer createId;
@Column(name="create_time")
@Column(name = "create_time")
private Date createTime;
}
src/main/java/com/yaoyuan/jiscuss/entity/Setting.java
+11 -11
View File
@@ -8,20 +8,20 @@ import lombok.Data;
@Data
@Entity
@Table(name="setting")
public class Setting implements Serializable{
@Table(name = "setting")
public class Setting implements Serializable {
/**
*
*/
private static final long serialVersionUID = 1L;
*
*/
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id;
@Column(name="setting_key")
@Column(name = "setting_key")
private String settingKey;
@Column(name="setting_value")
@Column(name = "setting_value")
private String settingValue;
}
src/main/java/com/yaoyuan/jiscuss/entity/Tag.java
+23 -23
View File
@@ -14,44 +14,44 @@ import lombok.Data;
@Data
@Entity
@Table(name="tag")
public class Tag implements Serializable{
@Table(name = "tag")
public class Tag implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id;
@Column(name="name")
@Column(name = "name")
private String name;
@Column(name="description")
@Column(name = "description")
private String description;
@Column(name="color")
@Column(name = "color")
private String color;
@Column(name="icon")
@Column(name = "icon")
private String icon;
@Column(name="position")
@Column(name = "position")
private Integer position;
@Column(name="parent_id")
@Column(name = "parent_id")
private Integer parentId;
@Column(name="discussions_count")
@Column(name = "discussions_count")
private String discussionsCount;
@Column(name="last_time")
@Column(name = "last_time")
private Date lastTime;
@Column(name="last_discussion_id")
@Column(name = "last_discussion_id")
private Integer lastDiscussionId;
@Column(name="create_id")
@Column(name = "create_id")
private Integer createId;
@Column(name="create_time")
@Column(name = "create_time")
private Date createTime;
}
src/main/java/com/yaoyuan/jiscuss/entity/User.java
+29 -31
View File
@@ -15,62 +15,60 @@ import javax.persistence.Id;
import javax.persistence.Table;
import lombok.Data;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
@Data
@Entity
@Table(name="user")
@Table(name = "user")
public class User implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id;
@Column(name="username")
@Column(name = "username")
private String username;
@Column(name="realname")
@Column(name = "realname")
private String realname;
@Column(name="email")
@Column(name = "email")
private String email;
@Column(name="password")
@Column(name = "password")
private String password;
@Column(name="join_time")
@Column(name = "join_time")
private Date joinTime;
@Column(name="age")
@Column(name = "age")
private Integer age;
@Column(name="gender")
@Column(name = "gender")
private String gender;
@Column(name="avatar")
@Column(name = "avatar")
private String avatar;
@Column(name="phone")
@Column(name = "phone")
private String phone;
@Column(name="discussions_count")
@Column(name = "discussions_count")
private Integer discussionsCount;
@Column(name="comments_count")
@Column(name = "comments_count")
private Integer commentsCount;
@Column(name="last_seen_time")
@Column(name = "last_seen_time")
private Date lastSeenTime;
@Column(name="flag")
@Column(name = "flag")
private Integer flag;
@Column(name="level")
@Column(name = "level")
private Integer level;
}
src/main/java/com/yaoyuan/jiscuss/entity/UserInfo.java
+58 -58
View File
@@ -15,74 +15,74 @@ import java.util.Set;
* @date 2020/7/16 14:55
*/
@Data
public class UserInfo implements UserDetails{
public class UserInfo implements UserDetails {
private Collection<GrantedAuthority> authorities;
private String password;
private String username;
private String phone;
private Integer age;
private Integer id;
private String realname;
private String email;
private String gender;
private Integer level;
private Integer flag;
private Collection<GrantedAuthority> authorities;
private String password;
private String username;
private String phone;
private Integer age;
private Integer id;
private String realname;
private String email;
private String gender;
private Integer level;
private Integer flag;
public UserInfo() {
}
public UserInfo() {
}
public UserInfo(Collection<GrantedAuthority> authorities, Integer id, String password, String username, String phone) {
this.authorities = authorities;
this.id = id;
this.password = password;
this.username = username;
this.phone = phone;
}
public UserInfo(Collection<GrantedAuthority> authorities, Integer id, String password, String username, String phone) {
this.authorities = authorities;
this.id = id;
this.password = password;
this.username = username;
this.phone = phone;
}
@Override
public Collection<? extends GrantedAuthority> getAuthorities() {
return authorities;
}
@Override
public Collection<? extends GrantedAuthority> getAuthorities() {
return authorities;
}
@Override
public String getPassword() {
return password;
}
@Override
public String getPassword() {
return password;
}
@Override
public String getUsername() {
return username;
}
@Override
public String getUsername() {
return username;
}
@Override
public boolean isAccountNonExpired() {
return true;
}
@Override
public boolean isAccountNonExpired() {
return true;
}
@Override
public boolean isAccountNonLocked() {
return true;
}
@Override
public boolean isAccountNonLocked() {
return true;
}
@Override
public boolean isCredentialsNonExpired() {
return true;
}
@Override
public boolean isCredentialsNonExpired() {
return true;
}
@Override
public boolean isEnabled() {
return true;
}
@Override
public boolean isEnabled() {
return true;
}
@Override
public String toString() {
return "UserInfo{" +
"authorities=" + authorities +
", password='" + password + '\'' +
", username='" + username + '\'' +
", id='" + id + '\'' +
'}';
}
@Override
public String toString() {
return "UserInfo{" +
"authorities=" + authorities +
", password='" + password + '\'' +
", username='" + username + '\'' +
", id='" + id + '\'' +
'}';
}
}
src/main/java/com/yaoyuan/jiscuss/entity/custom/PostCustom.java
-1
View File
@@ -36,5 +36,4 @@ public class PostCustom extends Post {
private List<PostCustom> child;
}
src/main/java/com/yaoyuan/jiscuss/entity/custom/TagCustom.java
+6 -6
View File
@@ -20,21 +20,21 @@ import javax.persistence.GenerationType;
@Data
@Setter
@Getter
public class TagCustom {
public class TagCustom {
@Column(name="name")
@Column(name = "name")
private String name;
@Column(name="description")
@Column(name = "description")
private String description;
@Column(name="color")
@Column(name = "color")
private String color;
@Column(name="icon")
@Column(name = "icon")
private String icon;
@Column(name="discussion_id")
@Column(name = "discussion_id")
private Integer discussionId;