lxy/redbbs-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
lxyer 2018-05-27 11:46:12 +08:00
parent 9011563784
commit ba0c5448fc
7 changed files with 48 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/enjoy-3.3.jar → lib/enjoy-3.4.jar
View File

Binary file not shown.

6
pom.xml
View File

@ -27,7 +27,7 @@
<version>1.8.6</version>
</dependency>-->
<dependency>
<!--<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>6.0.6</version>
@ -35,8 +35,8 @@
<dependency>
<groupId>com.jfinal</groupId>
<artifactId>enjoy</artifactId>
<version>3.3</version>
</dependency>
<version>3.4</version>
</dependency>-->
</dependencies>

23
root/_t/layout.html
View File

@ -1,6 +1,22 @@
<!-- Created by Lxy at 2017/11/25 17:36. -->
#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 @@
<title>#if(title)#(title) - #end Redbbs社区</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta http-equiv="Cache-Control" content="max-age=7200" />
<meta name="keywords" content="#(keywords??'redkale')">
<meta name="description" content="#(description??'redkale框架，redkale社区')">
<meta name="keywords" content="#@keywords(bean.title??'')">
<meta name="description" content="#@description(bean.title??'')">
<link rel="stylesheet" href="/res/layui/css/layui.css">
<link rel="stylesheet" href="/res/css/global.css">
<!--background-color: #4a184c;-->
@ -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;}
</style>
#@css?()
</head>
<body>

4
root/index.html
View File

@ -17,7 +17,7 @@
<a href="/user/#(x.userId)" class="fly-avatar">
<img src="#(x.avatar)" alt="#(x.nickname)">
</a>
<h2>
<h2 title="#(x.title)">
<a class="layui-badge">#(x.typeName)</a>
<a href="/jie/detail/#(x.contentId)">
#if(x.top == 3)
@ -78,7 +78,7 @@
<a href="/user/home.html" class="fly-avatar">
<img src="#(x.avatar)" alt="#(x.nickname)">
</a>
<h2>
<h2 title="#(x.title)">
<a class="layui-badge">#(x.typeName)</a>
<a href="/jie/detail/#(x.contentId)">#(x.title)</a>
</h2>

4
root/jie/detail.html
View File

@ -23,7 +23,7 @@
#if(bean.wonderful == 1)
<span class="layui-badge layui-bg-red">精帖</span>
#end
#if(mine.userId?? == 100001)
#if(mine.roleId?? == 1)
<div class="fly-admin-box" data-id="#(bean.contentId)">
<span class="layui-btn layui-btn-xs jie-admin" type="del">删除</span>
#if(bean.top == 1)
@ -62,7 +62,7 @@
<!--
<span style="padding-right: 10px; color: #FF7200">悬赏：60飞吻</span>
-->
#if(bean.userId == mine.userId?? || mine.userId?? == 100001)
#if(bean.userId == mine.userId?? || mine.roleId?? == 1)
<span class="layui-btn layui-btn-xs jie-admin" type="edit"><a href="/jie/add/#(bean.contentId)">编辑此贴</a></span>
#end
</div>

12
src/com/lxyer/bbs/base/user/User.java
View File

@ -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);

21
src/com/lxyer/bbs/base/user/UserInfo.java
View File

@ -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;
}