diff --git a/conf/application.xml b/conf/application.xml index d5d1ebb..6734711 100644 --- a/conf/application.xml +++ b/conf/application.xml @@ -1,44 +1,30 @@ - - - - - - + - - - - - - - - + - + - - diff --git a/conf/conf.txt b/conf/conf.txt index 3362e7f..0f9864a 100644 --- a/conf/conf.txt +++ b/conf/conf.txt @@ -2,11 +2,11 @@ isDev=true ----------- arango conf ---------- -arango.host=120.24.230.60 +arango.host=101.132.161.85 arango.port=8529 arango.database=redbbs arango.user=root -arango.password=abc123 +arango.password=lxgwzswhp0zj ----------- file conf ---------- file.upload_dir=D:/wk/_own/redbbs/root/file_pub/ diff --git a/conf/persistence.xml b/conf/persistence.xml index 5cc12ba..2e0112a 100644 --- a/conf/persistence.xml +++ b/conf/persistence.xml @@ -1,19 +1,15 @@ - - + ALL - - - - - + - + diff --git a/pom.xml b/pom.xml index 5621b61..7d9e1a4 100644 --- a/pom.xml +++ b/pom.xml @@ -13,18 +13,18 @@ org.redkale redkale - 2.0.0.rc3 + 2.2.0 org.redkalex redkale-plugins - 2.0.0.rc3 + 2.2.0 mysql mysql-connector-java - 8.0.18 + 8.0.27 @@ -32,6 +32,11 @@ enjoy 3.6 + + org.projectlombok + lombok + 1.18.22 + @@ -55,8 +60,8 @@ org.apache.maven.plugins maven-compiler-plugin - 11 - 11 + 17 + 17 diff --git a/src/net/tccn/bbs/base/bean/ActLogBean.java b/src/net/tccn/bbs/base/bean/ActLogBean.java index d67871d..eca8eb8 100644 --- a/src/net/tccn/bbs/base/bean/ActLogBean.java +++ b/src/net/tccn/bbs/base/bean/ActLogBean.java @@ -1,5 +1,7 @@ package net.tccn.bbs.base.bean; +import lombok.Getter; +import lombok.Setter; import org.redkale.convert.json.JsonConvert; import org.redkale.source.FilterBean; @@ -9,6 +11,8 @@ import java.io.Serializable; /** * @author lxyer */ +@Setter +@Getter public class ActLogBean implements Serializable, FilterBean { @Column(comment = "[日志id]") @@ -32,62 +36,6 @@ public class ActLogBean implements Serializable, FilterBean { @Column(comment = "[状态]-1删除 1正常") private int status = 1; - public void setLogid(int logid) { - this.logid = logid; - } - - public int getLogid() { - return this.logid; - } - - public void setCate(int cate) { - this.cate = cate; - } - - public int getCate() { - return this.cate; - } - - public void setTid(int tid) { - this.tid = tid; - } - - public int getTid() { - return this.tid; - } - - public void setUserId(int userId) { - this.userId = userId; - } - - public int getUserId() { - return this.userId; - } - - public void setCreateTime(long createTime) { - this.createTime = createTime; - } - - public long getCreateTime() { - return this.createTime; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getRemark() { - return this.remark; - } - - public void setStatus(int status) { - this.status = status; - } - - public int getStatus() { - return this.status; - } - @Override public String toString() { return JsonConvert.root().convertTo(this); diff --git a/src/net/tccn/bbs/base/entity/ActLog.java b/src/net/tccn/bbs/base/entity/ActLog.java index 1e73880..8871a17 100644 --- a/src/net/tccn/bbs/base/entity/ActLog.java +++ b/src/net/tccn/bbs/base/entity/ActLog.java @@ -1,12 +1,19 @@ package net.tccn.bbs.base.entity; +import lombok.Getter; +import lombok.Setter; import org.redkale.convert.json.JsonConvert; -import javax.persistence.*; +import javax.persistence.Cacheable; +import javax.persistence.Column; +import javax.persistence.Id; +import javax.persistence.Table; /** * @author lxyer */ +@Setter +@Getter @Cacheable(interval = 5 * 60) @Table(catalog = "redbbs", name = "sys_actlog") public class ActLog implements java.io.Serializable { @@ -33,62 +40,6 @@ public class ActLog implements java.io.Serializable { @Column(comment = "[状态]-1删除 1正常") private short status = 10; - public void setLogid(int logid) { - this.logid = logid; - } - - public int getLogid() { - return this.logid; - } - - public void setCate(short cate) { - this.cate = cate; - } - - public short getCate() { - return this.cate; - } - - public void setTid(int tid) { - this.tid = tid; - } - - public int getTid() { - return this.tid; - } - - public void setUserid(int userid) { - this.userid = userid; - } - - public int getUserid() { - return this.userid; - } - - public void setCreatetime(long createtime) { - this.createtime = createtime; - } - - public long getCreatetime() { - return this.createtime; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getRemark() { - return this.remark; - } - - public void setStatus(short status) { - this.status = status; - } - - public short getStatus() { - return this.status; - } - @Override public String toString() { return JsonConvert.root().convertTo(this); diff --git a/src/net/tccn/bbs/base/entity/Count.java b/src/net/tccn/bbs/base/entity/Count.java index d2f0dab..4bb4979 100644 --- a/src/net/tccn/bbs/base/entity/Count.java +++ b/src/net/tccn/bbs/base/entity/Count.java @@ -1,32 +1,21 @@ package net.tccn.bbs.base.entity; +import lombok.Getter; +import lombok.Setter; + /** * 用来计数用 * * @author: liangxianyou at 2018/11/18 20:42. */ +@Setter +@Getter public class Count { private String name; private long total; //------------------- - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public long getTotal() { - return total; - } - - public void setTotal(long total) { - this.total = total; - } - @Override public String toString() { return "Count{" + diff --git a/src/net/tccn/bbs/base/entity/DynAttr.java b/src/net/tccn/bbs/base/entity/DynAttr.java index 05b3423..51912b1 100644 --- a/src/net/tccn/bbs/base/entity/DynAttr.java +++ b/src/net/tccn/bbs/base/entity/DynAttr.java @@ -1,5 +1,7 @@ package net.tccn.bbs.base.entity; +import lombok.Getter; +import lombok.Setter; import org.redkale.convert.json.JsonConvert; import javax.persistence.Cacheable; @@ -10,6 +12,8 @@ import javax.persistence.Table; /** * @author lxyer */ +@Setter +@Getter @Cacheable(interval = 5 * 60) @Table(catalog = "redbbs", name = "sys_dynattr", comment = "[动态属性表]") public class DynAttr implements java.io.Serializable { @@ -27,38 +31,6 @@ public class DynAttr implements java.io.Serializable { @Column(comment = "[属性值]") private String value = ""; - public void setTid(int tid) { - this.tid = tid; - } - - public int getTid() { - return this.tid; - } - - public void setCate(short cate) { - this.cate = cate; - } - - public short getCate() { - return this.cate; - } - - public void setAttr(String attr) { - this.attr = attr; - } - - public String getAttr() { - return this.attr; - } - - public void setValue(String value) { - this.value = value; - } - - public String getValue() { - return this.value; - } - @Override public String toString() { return JsonConvert.root().convertTo(this); diff --git a/src/net/tccn/bbs/base/entity/VisLog.java b/src/net/tccn/bbs/base/entity/VisLog.java index 7502d18..70585b0 100644 --- a/src/net/tccn/bbs/base/entity/VisLog.java +++ b/src/net/tccn/bbs/base/entity/VisLog.java @@ -1,5 +1,7 @@ package net.tccn.bbs.base.entity; +import lombok.Getter; +import lombok.Setter; import org.redkale.convert.json.JsonConvert; import java.util.Map; @@ -9,6 +11,8 @@ import java.util.Map; * * @author: liangxianyou at 2018/11/18 8:47. */ +@Setter +@Getter public class VisLog { private String ip; private int userid; @@ -18,62 +22,6 @@ public class VisLog { private Map para; private Map headers; - public String getIp() { - return ip; - } - - public void setIp(String ip) { - this.ip = ip; - } - - public int getUserid() { - return userid; - } - - public void setUserid(int userid) { - this.userid = userid; - } - - public String getFtime() { - return ftime; - } - - public void setFtime(String ftime) { - this.ftime = ftime; - } - - public String getUri() { - return uri; - } - - public void setUri(String uri) { - this.uri = uri; - } - - public long getTime() { - return time; - } - - public void setTime(long time) { - this.time = time; - } - - public Map getPara() { - return para; - } - - public void setPara(Map para) { - this.para = para; - } - - public Map getHeaders() { - return headers; - } - - public void setHeaders(Map headers) { - this.headers = headers; - } - @Override public String toString() { return JsonConvert.root().convertTo(this); diff --git a/src/net/tccn/bbs/base/user/LoginBean.java b/src/net/tccn/bbs/base/user/LoginBean.java index 315a008..c16bcea 100644 --- a/src/net/tccn/bbs/base/user/LoginBean.java +++ b/src/net/tccn/bbs/base/user/LoginBean.java @@ -1,5 +1,7 @@ package net.tccn.bbs.base.user; +import lombok.Getter; +import lombok.Setter; import org.redkale.net.http.RestSessionid; import org.redkale.source.FilterBean; import org.redkale.util.Comment; @@ -9,6 +11,8 @@ import javax.persistence.Transient; /** * Created by Lxy at 2017/10/1 10:40. */ +@Setter +@Getter public class LoginBean implements FilterBean { private String username; private String password; @@ -18,30 +22,6 @@ public class LoginBean implements FilterBean { @RestSessionid(create = true) private String sessionid = ""; - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return UserRecord.md5IfNeed(password); - } - - public void setPassword(String password) { - this.password = password; - } - - public String getSessionid() { - return sessionid; - } - - public void setSessionid(String sessionid) { - this.sessionid = sessionid; - } - public boolean emptyUsername() { return username == null || username.isEmpty(); } diff --git a/src/net/tccn/bbs/base/user/UserBean.java b/src/net/tccn/bbs/base/user/UserBean.java index f99f64e..dd33bb0 100644 --- a/src/net/tccn/bbs/base/user/UserBean.java +++ b/src/net/tccn/bbs/base/user/UserBean.java @@ -1,5 +1,7 @@ package net.tccn.bbs.base.user; +import lombok.Getter; +import lombok.Setter; import org.redkale.source.FilterBean; import javax.persistence.Column; @@ -7,6 +9,8 @@ import javax.persistence.Column; /** * Created by Lxy at 2017/10/10 8:30. */ +@Setter +@Getter public class UserBean implements FilterBean { @@ -25,43 +29,4 @@ public class UserBean implements FilterBean { @Column(length = 32, comment = "[邮箱]") private String email; - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public String getNickname() { - return nickname; - } - - public void setNickname(String nickname) { - this.nickname = nickname; - } - - public String getRealname() { - return realname; - } - - public void setRealname(String realname) { - this.realname = realname; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } } diff --git a/src/net/tccn/bbs/base/user/UserInfo.java b/src/net/tccn/bbs/base/user/UserInfo.java index 4c212e2..d9880f9 100644 --- a/src/net/tccn/bbs/base/user/UserInfo.java +++ b/src/net/tccn/bbs/base/user/UserInfo.java @@ -1,7 +1,7 @@ package net.tccn.bbs.base.user; -import org.redkale.convert.ConvertColumn; -import org.redkale.convert.ConvertType; +import lombok.Getter; +import lombok.Setter; import org.redkale.convert.json.JsonConvert; import javax.persistence.Column; @@ -10,6 +10,8 @@ import javax.persistence.Id; /** * @author lxyer */ +@Setter +@Getter public class UserInfo implements java.io.Serializable { @Id @@ -33,143 +35,6 @@ public class UserInfo implements java.io.Serializable { private int status = 1; private String time = ""; - public void setUserid(int userid) { - this.userid = userid; - } - - public int getUserid() { - return this.userid; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getUsername() { - return this.username; - } - - public int getSex() { - return sex; - } - - public void setSex(int sex) { - this.sex = sex; - } - - @ConvertColumn(ignore = true, type = ConvertType.JSON) - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public String getPhone() { - return this.phone; - } - - public void setNickname(String nickname) { - this.nickname = nickname; - } - - public String getNickname() { - return this.nickname; - } - - public void setAvatar(String avatar) { - this.avatar = avatar; - } - - public String getAvatar() { - return this.avatar; - } - - public void setRelaname(String relaname) { - this.relaname = relaname; - } - - public String getRelaname() { - return this.relaname; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getEmail() { - return this.email == null || this.email.isEmpty() ? "" : this.email; - } - - public int getRoleid() { - return roleid; - } - - public void setRoleid(int roleid) { - this.roleid = roleid; - } - - public String getSite() { - return site; - } - - public void setSite(String site) { - this.site = site; - } - - public String getGit() { - return git; - } - - public void setGit(String git) { - this.git = git; - } - - public void setCreatetime(long createtime) { - this.createtime = createtime; - } - - public long getCreatetime() { - return this.createtime; - } - - public String getSign() { - return sign; - } - - public void setSign(String sign) { - this.sign = sign; - } - - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } - - public void setStatus(int status) { - this.status = status; - } - - public int getStatus() { - return this.status; - } - - public String getTime() { - return time; - } - - public void setTime(String time) { - this.time = time; - } - @Override public String toString() { return JsonConvert.root().convertTo(this); diff --git a/src/net/tccn/bbs/base/user/UserRecord.java b/src/net/tccn/bbs/base/user/UserRecord.java index b4f68aa..6d9cd12 100644 --- a/src/net/tccn/bbs/base/user/UserRecord.java +++ b/src/net/tccn/bbs/base/user/UserRecord.java @@ -1,5 +1,7 @@ package net.tccn.bbs.base.user; +import lombok.Getter; +import lombok.Setter; import org.redkale.convert.json.JsonConvert; import org.redkale.util.Utility; @@ -11,6 +13,8 @@ import javax.persistence.Table; /** * @author lxyer */ +@Setter +@Getter @Cacheable(interval = 5 * 60) @Table(catalog = "redbbs", name = "sys_userrecord") public class UserRecord implements java.io.Serializable { @@ -64,134 +68,6 @@ public class UserRecord implements java.io.Serializable { @Column(comment = "[状态]-10删除 10正常") private short status = 10; - public void setUserid(int userid) { - this.userid = userid; - } - - public int getUserid() { - return this.userid; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getUsername() { - return this.username; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getPassword() { - return this.password; - } - - public void setSex(short sex) { - this.sex = sex; - } - - public short getSex() { - return this.sex; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public String getPhone() { - return this.phone; - } - - public void setNickname(String nickname) { - this.nickname = nickname; - } - - public String getNickname() { - return this.nickname; - } - - public void setAvatar(String avatar) { - this.avatar = avatar; - } - - public String getAvatar() { - return this.avatar; - } - - public void setRealname(String realname) { - this.realname = realname; - } - - public String getRealname() { - return this.realname; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getEmail() { - return this.email; - } - - public void setRoleid(int roleid) { - this.roleid = roleid; - } - - public int getRoleid() { - return this.roleid; - } - - public void setSite(String site) { - this.site = site; - } - - public String getSite() { - return this.site; - } - - public void setGit(String git) { - this.git = git; - } - - public String getGit() { - return this.git; - } - - public void setCreatetime(long createtime) { - this.createtime = createtime; - } - - public long getCreatetime() { - return this.createtime; - } - - public void setSign(String sign) { - this.sign = sign; - } - - public String getSign() { - return this.sign; - } - - public void setCity(String city) { - this.city = city; - } - - public String getCity() { - return this.city; - } - - public void setStatus(short status) { - this.status = status; - } - - public short getStatus() { - return this.status; - } - @Override public String toString() { return JsonConvert.root().convertTo(this); diff --git a/src/net/tccn/bbs/comment/Comment.java b/src/net/tccn/bbs/comment/Comment.java index 7219eab..858173d 100644 --- a/src/net/tccn/bbs/comment/Comment.java +++ b/src/net/tccn/bbs/comment/Comment.java @@ -1,15 +1,22 @@ package net.tccn.bbs.comment; +import lombok.Getter; +import lombok.Setter; import net.tccn.bbs.base.iface.C; import net.tccn.bbs.base.kit.LxyKit; import org.redkale.convert.json.JsonConvert; -import javax.persistence.*; +import javax.persistence.Cacheable; +import javax.persistence.Column; +import javax.persistence.Id; +import javax.persistence.Table; import java.io.Serializable; /** * @author lxyer */ +@Setter +@Getter @Cacheable(interval = 5 * 60) @Table(catalog = "redbbs", name = "sys_comment", comment = "[评论表]") public class Comment implements Serializable, C { @@ -42,78 +49,6 @@ public class Comment implements Serializable, C { @Column(comment = "[状态]1正常，-1删除") private short status = 10; - public void setCommentid(int commentid) { - this.commentid = commentid; - } - - public int getCommentid() { - return this.commentid; - } - - public void setUserid(int userid) { - this.userid = userid; - } - - public int getUserid() { - return this.userid; - } - - public void setPid(int pid) { - this.pid = pid; - } - - public int getPid() { - return this.pid; - } - - public void setCate(short cate) { - this.cate = cate; - } - - public short getCate() { - return this.cate; - } - - public void setContentid(int contentid) { - this.contentid = contentid; - } - - public int getContentid() { - return this.contentid; - } - - public void setContent(String content) { - this.content = content; - } - - public String getContent() { - return this.content; - } - - public void setCreatetime(long createtime) { - this.createtime = createtime; - } - - public long getCreatetime() { - return this.createtime; - } - - public void setSupportnum(int supportnum) { - this.supportnum = supportnum; - } - - public int getSupportnum() { - return this.supportnum; - } - - public void setStatus(short status) { - this.status = status; - } - - public short getStatus() { - return this.status; - } - @Override public String toString() { return JsonConvert.root().convertTo(this); diff --git a/src/net/tccn/bbs/comment/CommentInfo.java b/src/net/tccn/bbs/comment/CommentInfo.java index fffbfea..476b90f 100644 --- a/src/net/tccn/bbs/comment/CommentInfo.java +++ b/src/net/tccn/bbs/comment/CommentInfo.java @@ -1,5 +1,7 @@ package net.tccn.bbs.comment; +import lombok.Getter; +import lombok.Setter; import net.tccn.bbs.base.iface.CI; import net.tccn.bbs.base.iface.UI; import net.tccn.bbs.base.user.UserRecord; @@ -11,6 +13,8 @@ import java.io.Serializable; /** * @author lxyer */ +@Setter +@Getter public class CommentInfo implements UI, Serializable, CI { @Column(comment = "[评论id]") @@ -45,102 +49,6 @@ public class CommentInfo implements UI, Serializable, CI { @@ -58,118 +65,6 @@ public class Content implements Serializable, C { @Column(comment = "[状态] -10删除 10未结帖 20结帖 30私密") private short status = 10; - public void setContentid(int contentid) { - this.contentid = contentid; - } - - public int getContentid() { - return this.contentid; - } - - public void setUserid(int userid) { - this.userid = userid; - } - - public int getUserid() { - return this.userid; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getTitle() { - return this.title; - } - - public void setDigest(String digest) { - this.digest = digest; - } - - public String getDigest() { - return this.digest; - } - - public void setContent(String content) { - this.content = content; - } - - public String getContent() { - return this.content; - } - - public void setCreatetime(long createtime) { - this.createtime = createtime; - } - - public long getCreatetime() { - return this.createtime; - } - - public void setCate(short cate) { - this.cate = cate; - } - - public short getCate() { - return this.cate; - } - - public void setType(short type) { - this.type = type; - } - - public short getType() { - return this.type; - } - - public void setReplynum(int replynum) { - this.replynum = replynum; - } - - public int getReplynum() { - return this.replynum; - } - - public void setViewnum(int viewnum) { - this.viewnum = viewnum; - } - - public int getViewnum() { - return this.viewnum; - } - - public void setWonderful(short wonderful) { - this.wonderful = wonderful; - } - - public short getWonderful() { - return this.wonderful; - } - - public void setTop(short top) { - this.top = top; - } - - public short getTop() { - return this.top; - } - - public void setSolved(short solved) { - this.solved = solved; - } - - public short getSolved() { - return this.solved; - } - - public void setStatus(short status) { - this.status = status; - } - - public short getStatus() { - return this.status; - } - @Override public String toString() { return JsonConvert.root().convertTo(this); diff --git a/src/net/tccn/bbs/content/ContentBean.java b/src/net/tccn/bbs/content/ContentBean.java index 07d06d7..3a7752c 100644 --- a/src/net/tccn/bbs/content/ContentBean.java +++ b/src/net/tccn/bbs/content/ContentBean.java @@ -1,5 +1,7 @@ package net.tccn.bbs.content; +import lombok.Getter; +import lombok.Setter; import org.redkale.convert.json.JsonConvert; import org.redkale.source.FilterBean; @@ -10,6 +12,8 @@ import javax.persistence.Table; /** * @author lxyer */ +@Setter +@Getter @Table(catalog = "db_redbbs", name = "content", comment = "[内容表]") public class ContentBean implements FilterBean, java.io.Serializable { @@ -44,98 +48,6 @@ public class ContentBean implements FilterBean, java.io.Serializable { @Column(comment = "[阅读量]") private int viewnum; -/* @Column(comment = "[精] 0否，1是") - private int wonderful; - - @Column(comment = "[置顶] 0否，1是") - private int top; - - @Column(comment = "[结帖]大于0结帖") - private int solved; - - @Column(comment = "[状态]") - private int status = 1;*/ - - public void setContentid(int contentid) { - this.contentid = contentid; - } - - public int getContentid() { - return this.contentid; - } - - public void setUserid(int userid) { - this.userid = userid; - } - - public int getUserid() { - return this.userid; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getTitle() { - return this.title; - } - - public void setDigest(String digest) { - this.digest = digest; - } - - public String getDigest() { - return this.digest; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public void setCreatetime(long createtime) { - this.createtime = createtime; - } - - public long getCreatetime() { - return this.createtime; - } - - public int getCate() { - return cate; - } - - public void setCate(int cate) { - this.cate = cate; - } - - public void setType(int type) { - this.type = type; - } - - public int getType() { - return this.type; - } - - public int getReplynum() { - return replynum; - } - - public void setReplynum(int replynum) { - this.replynum = replynum; - } - - public int getViewnum() { - return viewnum; - } - - public void setViewnum(int viewnum) { - this.viewnum = viewnum; - } - @Override public String toString() { return JsonConvert.root().convertTo(this); diff --git a/src/net/tccn/bbs/content/ContentInfo.java b/src/net/tccn/bbs/content/ContentInfo.java index 3c702b1..5524bc5 100644 --- a/src/net/tccn/bbs/content/ContentInfo.java +++ b/src/net/tccn/bbs/content/ContentInfo.java @@ -1,5 +1,7 @@ package net.tccn.bbs.content; +import lombok.Getter; +import lombok.Setter; import net.tccn.bbs.base.iface.CI; import net.tccn.bbs.base.iface.UI; import net.tccn.bbs.base.user.UserRecord; @@ -10,6 +12,8 @@ import java.io.Serializable; /** * Created by Lxy at 2017/11/26 20:52. */ +@Setter +@Getter public class ContentInfo implements UI, Serializable, CI { private int contentid; @@ -29,136 +33,6 @@ public class ContentInfo implements UI, Serializable, CI { private String typename; private int hadcollect = -1; - - public int getContentid() { - return contentid; - } - - public void setContentid(int contentid) { - this.contentid = contentid; - } - - public int getUserid() { - return userid; - } - - public void setUserid(int userid) { - this.userid = userid; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getDigest() { - return digest; - } - - public void setDigest(String digest) { - this.digest = digest; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public int getCate() { - return cate; - } - - public void setCate(int cate) { - this.cate = cate; - } - - public int getType() { - return type; - } - - public void setType(int type) { - this.type = type; - } - - public int getReplynum() { - return replynum; - } - - public void setReplynum(int replynum) { - this.replynum = replynum; - } - - public int getViewnum() { - return viewnum; - } - - public void setViewnum(int viewnum) { - this.viewnum = viewnum; - } - - public int getStatus() { - return status; - } - - public void setStatus(int status) { - this.status = status; - } - - public int getWonderful() { - return wonderful; - } - - public void setWonderful(int wonderful) { - this.wonderful = wonderful; - } - - public int getTop() { - return top; - } - - public void setTop(int top) { - this.top = top; - } - - public int getSolved() { - return solved; - } - - public void setSolved(int solved) { - this.solved = solved; - } - - public String getCreatetime() { - return createtime; - } - - public void setCreatetime(String createtime) { - this.createtime = createtime; - } - - public String getTypename() { - return typename; - } - - public void setTypename(String typename) { - this.typename = typename; - } - - public int getHadcollect() { - return hadcollect; - } - - public void setHadcollect(int hadcollect) { - this.hadcollect = hadcollect; - } - - //----------- private UserRecord user; diff --git a/src/net/tccn/redim/ChatWebSocket.java b/src/net/tccn/redim/ChatWebSocket.java index cd1328d..daa0aea 100644 --- a/src/net/tccn/redim/ChatWebSocket.java +++ b/src/net/tccn/redim/ChatWebSocket.java @@ -98,10 +98,10 @@ public class ChatWebSocket extends WebSocket { } - @Override - @RestOnMessage(name = "close") + + /*@RestOnMessage(name = "close") public void onClose(int code, String reason) { System.out.println("close!"); super.onClose(code, reason); - } + }*/ } \ No newline at end of file diff --git a/src/net/tccn/redim/entity/MsgRecord.java b/src/net/tccn/redim/entity/MsgRecord.java index e47c318..c5be403 100644 --- a/src/net/tccn/redim/entity/MsgRecord.java +++ b/src/net/tccn/redim/entity/MsgRecord.java @@ -1,13 +1,18 @@ package net.tccn.redim.entity; +import lombok.Getter; +import lombok.Setter; import org.redkale.convert.json.JsonConvert; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Id; +import javax.persistence.Table; /** * @author lxyer */ -@Cacheable(interval = 5 * 60) +@Setter +@Getter @Table(catalog = "redbbs", name = "im_msgrecord", comment = "[聊天记录表]") public class MsgRecord implements java.io.Serializable { @@ -30,54 +35,6 @@ public class MsgRecord implements java.io.Serializable { @Column(comment = "[状态]-10删除，10未发送 20已发送 30已读") private short status = 10; - public void setMsgid(int msgid) { - this.msgid = msgid; - } - - public int getMsgid() { - return this.msgid; - } - - public void setFromuserid(int fromuserid) { - this.fromuserid = fromuserid; - } - - public int getFromuserid() { - return this.fromuserid; - } - - public void setTouserid(int touserid) { - this.touserid = touserid; - } - - public int getTouserid() { - return this.touserid; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public void setCreatetime(long createtime) { - this.createtime = createtime; - } - - public long getCreatetime() { - return this.createtime; - } - - public void setStatus(short status) { - this.status = status; - } - - public short getStatus() { - return this.status; - } - @Override public String toString() { return JsonConvert.root().convertTo(this);