diff --git a/root/project/index.html b/root/project/index.html
index 7935cbd..0668b27 100644
--- a/root/project/index.html
+++ b/root/project/index.html
@@ -4,7 +4,7 @@
#set(keywords=bean.title)
#set(description=bean.title)
#set(
-project=["redbbs","redtimer", "JKit","jfly"]
+project=["redbbs","redtimer","jfly"]
)
#@layout()
diff --git a/src/net/tccn/bbs/base/BaseServlet.java b/src/net/tccn/bbs/base/BaseServlet.java
index ddf0aa3..65aa9c5 100644
--- a/src/net/tccn/bbs/base/BaseServlet.java
+++ b/src/net/tccn/bbs/base/BaseServlet.java
@@ -170,12 +170,12 @@ public class BaseServlet extends HttpServlet {
//设置私密帖子过滤
protected FilterNode setPrivate(HttpRequest request, FilterNode node) {
- UserInfo userInfo = request.currentUser();
- if (userInfo == null) {
+ UserInfo user = request.currentUser();
+ if (user == null) {
node.and("status", FilterExpress.NOTEQUAL, 30);
- } else if (!userService.isAdmin(userInfo.getUserid())) {
+ } else if (!userService.isAdmin(user.getUserid())) {
//select * from content c where c.status != -1 and (c.status!=30 or (c.status=30 and c.userid=100001))
- node.and(FilterNode.create("status", FilterExpress.NOTEQUAL, 30).or(FilterNode.create("status", 30).and("userid", userInfo.getUserid())));
+ node.and(FilterNode.create("status", FilterExpress.NOTEQUAL, 30).or(FilterNode.create("status", 30).and("userid", user.getUserid())));
}
return node;
diff --git a/src/net/tccn/bbs/content/ContentService.java b/src/net/tccn/bbs/content/ContentService.java
index 7d56aaa..899e34c 100644
--- a/src/net/tccn/bbs/content/ContentService.java
+++ b/src/net/tccn/bbs/content/ContentService.java
@@ -67,24 +67,24 @@ public class ContentService extends BaseService {
@RestMapping(name = "save", comment = "帖子保存")
- public RetResult save(@RestUserid int userid, ContentInfo info) {
+ public RetResult save(@RestUserid int userid, ContentInfo bean) {
//数据校验
- if (info.getTitle().isEmpty() || info.getTitle().length() > 64) {
+ if (bean.getTitle().isEmpty() || bean.getTitle().length() > 64) {
return retError("少年你的文章标题太长啦，精简化标题吧，为了更好的SEO长度请少于64个字节");
}
- if (info.getContentid() < 1) {
+ if (bean.getContentid() < 1) {
synchronized (this) {
int maxid = dataSource.getNumberResult(ContentInfo.class, FilterFunc.MAX, 10_0000, "contentid").intValue();
- info.setContentid(maxid + 1);
+ bean.setContentid(maxid + 1);
}
- info.setCreatetime(System.currentTimeMillis());
- info.setUserid(userid);
- dataSource.insert(info);
+ bean.setCreatetime(System.currentTimeMillis());
+ bean.setUserid(userid);
+ dataSource.insert(bean);
} else {
- dataSource.findAsync(ContentInfo.class, info.getContentid()).thenAccept(x -> {
+ dataSource.findAsync(ContentInfo.class, bean.getContentid()).thenAccept(x -> {
if (x.getUserid() == userid || userService.isAdmin(userid)) {//身份验证 后修改内容
- dataSource.updateColumnAsync(info, SelectColumn.includes("title", "digest", "content", "type", "status"));
+ dataSource.updateColumnAsync(bean, SelectColumn.includes("title", "digest", "content", "type", "status"));
}
});
}
@@ -156,12 +156,10 @@ public class ContentService extends BaseService {
}
@RestMapping(name = "set", comment = "便捷的修改内容")
- public RetResult contentSet(UserInfo user,
+ public RetResult contentSet(@RestUserid int userid,
@Comment("帖子id") int id,
@Comment("status|top|wonderful") String field,
@Comment("目标修改值") short v) {
- int userid = user.getUserid();
-
//身份验证 后修改内容
dataSource.findAsync(ContentInfo.class, id).thenAccept(content -> {
if (userService.isAdmin(userid)) {//管理员可以做更多
diff --git a/src/net/tccn/bbs/user/UserDetail.java b/src/net/tccn/bbs/user/UserDetail.java
index 8fbd3f4..b78fb70 100644
--- a/src/net/tccn/bbs/user/UserDetail.java
+++ b/src/net/tccn/bbs/user/UserDetail.java
@@ -77,24 +77,24 @@ public class UserDetail implements java.io.Serializable {
//------
public UserInfo createUserInfo() {
- UserInfo userInfo = new UserInfo();
- userInfo.setUserid(userid);
- userInfo.setUsername(username);
- userInfo.setSex(sex);
- userInfo.setPassword(password);
- userInfo.setPhone(phone);
- userInfo.setNickname(nickname);
- userInfo.setAvatar(avatar);
- userInfo.setRelaname(realname);
- userInfo.setEmail(email);
- userInfo.setRoleid(roleid);
- userInfo.setSite(site);
- userInfo.setGit(git);
- userInfo.setCreatetime(createtime);
- userInfo.setSign(sign);
- userInfo.setCity(city);
- userInfo.setStatus(getStatus());
- return userInfo;
+ UserInfo user = new UserInfo();
+ user.setUserid(userid);
+ user.setUsername(username);
+ user.setSex(sex);
+ user.setPassword(password);
+ user.setPhone(phone);
+ user.setNickname(nickname);
+ user.setAvatar(avatar);
+ user.setRelaname(realname);
+ user.setEmail(email);
+ user.setRoleid(roleid);
+ user.setSite(site);
+ user.setGit(git);
+ user.setCreatetime(createtime);
+ user.setSign(sign);
+ user.setCity(city);
+ user.setStatus(getStatus());
+ return user;
}
public String passwordForMd5() {
diff --git a/src/net/tccn/bbs/user/UserService.java b/src/net/tccn/bbs/user/UserService.java
index 81aae45..cf376b3 100644
--- a/src/net/tccn/bbs/user/UserService.java
+++ b/src/net/tccn/bbs/user/UserService.java
@@ -73,8 +73,8 @@ public class UserService extends BaseService {
if (userid == 0) {
return null;
}
- UserInfo info = find((int) userid);
- return info;
+ UserInfo user = find((int) userid);
+ return user;
}
@RestMapping(name = "info", comment = "用户信息")
diff --git a/src/net/tccn/redim/impl/ImFriendServiceImpl.java b/src/net/tccn/redim/impl/ImFriendServiceImpl.java
index 8cb43c1..0730f72 100644
--- a/src/net/tccn/redim/impl/ImFriendServiceImpl.java
+++ b/src/net/tccn/redim/impl/ImFriendServiceImpl.java
@@ -40,12 +40,12 @@ public class ImFriendServiceImpl extends BaseService implements ImFriendService
//mine
Kv mine = Kv.by("username", "游客").set("id", "0").set("sign", "").set("status", "online").set("avatar", "/res/images/avatar/13.jpg");
- UserInfo userInfo = userService.current(sessionid);
- if (userInfo != null) {
- mine.set("username", userInfo.getNickname());
- mine.set("id", userInfo.getUserid());
- mine.set("sign", userInfo.getSign());
- mine.set("avatar", userInfo.getAvatar());
+ UserInfo user = userService.current(sessionid);
+ if (user != null) {
+ mine.set("username", user.getNickname());
+ mine.set("id", user.getUserid());
+ mine.set("sign", user.getSign());
+ mine.set("avatar", user.getAvatar());
mine.set("status", "online");
}