diff --git a/lib/enjoy-3.3.jar b/lib/enjoy-3.4.jar similarity index 67% rename from lib/enjoy-3.3.jar rename to lib/enjoy-3.4.jar index bbc013e..7f46fda 100644 Binary files a/lib/enjoy-3.3.jar and b/lib/enjoy-3.4.jar differ diff --git a/pom.xml b/pom.xml index dc94e7d..64498cf 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 1.8.6 --> - + diff --git a/root/_t/layout.html b/root/_t/layout.html index 6536059..f09904a 100644 --- a/root/_t/layout.html +++ b/root/_t/layout.html @@ -1,6 +1,22 @@ #define columned(e) - #if(e == column??"") layui-this + #if(e == column??"") layui-this #end +#end + +#define keywords(str) + #if(str) + #(str)、redkale社区 + #else + 架构设计、问题解答、经验分享、redkale社区、#(str) + #end +#end + + +#define description(str) + #if(str) + #(str)、redkale社区 + #else + 架构设计、问题解答、经验分享、redkale社区、#(str) #end #end @@ -12,8 +28,8 @@ #if(title)#(title) - #end Redbbs社区 - - + + @@ -25,6 +41,7 @@ .layui-nav-tree .layui-nav-child dd.layui-this, .layui-nav-tree .layui-nav-child dd.layui-this a, .layui-nav-tree .layui-this, .layui-nav-tree .layui-this>a, .layui-nav-tree .layui-this>a:hover {background-color:#4a184c;} + #@css?() diff --git a/root/index.html b/root/index.html index 40ca598..47e5a63 100644 --- a/root/index.html +++ b/root/index.html @@ -17,7 +17,7 @@ #(x.nickname) -

+

#(x.typeName) #if(x.top == 3) @@ -78,7 +78,7 @@ #(x.nickname) -

+

#(x.typeName) #(x.title)

diff --git a/root/jie/detail.html b/root/jie/detail.html index 24fa8d7..c2d6a6d 100644 --- a/root/jie/detail.html +++ b/root/jie/detail.html @@ -23,7 +23,7 @@ #if(bean.wonderful == 1) 精帖 #end - #if(mine.userId?? == 100001) + #if(mine.roleId?? == 1)
删除 #if(bean.top == 1) @@ -62,7 +62,7 @@ - #if(bean.userId == mine.userId?? || mine.userId?? == 100001) + #if(bean.userId == mine.userId?? || mine.roleId?? == 1) 编辑此贴 #end
diff --git a/src/com/lxyer/bbs/base/user/User.java b/src/com/lxyer/bbs/base/user/User.java index fe72be1..0ef991a 100644 --- a/src/com/lxyer/bbs/base/user/User.java +++ b/src/com/lxyer/bbs/base/user/User.java @@ -49,6 +49,9 @@ public class User implements java.io.Serializable { @Column(length = 32, comment = "[邮箱]") private String email = ""; + @Column(length = 2, comment = "[用户角色]") + private int roleId = 0; + @Column(comment = "[创建时间]", updatable = false) private long createTime; @@ -153,6 +156,14 @@ public class User implements java.io.Serializable { this.email = email; } + public int getRoleId() { + return roleId; + } + + public void setRoleId(int roleId) { + this.roleId = roleId; + } + public long getCreateTime() { return createTime; } @@ -201,6 +212,7 @@ public class User implements java.io.Serializable { userInfo.setAvatar(avatar); userInfo.setRelaname(realname); userInfo.setEmail(email); + userInfo.setRoleId(roleId); userInfo.setCreateTime(createTime); userInfo.setSign(sign); userInfo.setCity(city); diff --git a/src/com/lxyer/bbs/base/user/UserInfo.java b/src/com/lxyer/bbs/base/user/UserInfo.java index ebca9cb..bd86c18 100644 --- a/src/com/lxyer/bbs/base/user/UserInfo.java +++ b/src/com/lxyer/bbs/base/user/UserInfo.java @@ -18,29 +18,18 @@ public class UserInfo implements java.io.Serializable { private int userId; private String username = ""; - private int sex = 1; - private String password = ""; - private String phone = ""; - private String nickname = ""; - private String avatar = ""; - private String relaname = ""; - private String email = ""; - + private int roleId = 0; private long createTime; - private String sign = ""; - private String city = ""; - private int status = 1; - private String time = ""; public void setUserId(int userId) { @@ -116,6 +105,14 @@ public class UserInfo implements java.io.Serializable { return this.email == null || this.email.isEmpty() ? "" : this.email; } + public int getRoleId() { + return roleId; + } + + public void setRoleId(int roleId) { + this.roleId = roleId; + } + public void setCreateTime(long createTime) { this.createTime = createTime; }