修改：bug 及变量风格

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()

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();
+        UserInfo user = request.currentUser();
-        if (userInfo == null) {
+        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;

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());
+            bean.setCreatetime(System.currentTimeMillis());
-            info.setUserid(userid);
+            bean.setUserid(userid);
-            dataSource.insert(info);
+            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)) {//管理员可以做更多

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 user = new UserInfo();
-        userInfo.setUserid(userid);
+        user.setUserid(userid);
-        userInfo.setUsername(username);
+        user.setUsername(username);
-        userInfo.setSex(sex);
+        user.setSex(sex);
-        userInfo.setPassword(password);
+        user.setPassword(password);
-        userInfo.setPhone(phone);
+        user.setPhone(phone);
-        userInfo.setNickname(nickname);
+        user.setNickname(nickname);
-        userInfo.setAvatar(avatar);
+        user.setAvatar(avatar);
-        userInfo.setRelaname(realname);
+        user.setRelaname(realname);
-        userInfo.setEmail(email);
+        user.setEmail(email);
-        userInfo.setRoleid(roleid);
+        user.setRoleid(roleid);
-        userInfo.setSite(site);
+        user.setSite(site);
-        userInfo.setGit(git);
+        user.setGit(git);
-        userInfo.setCreatetime(createtime);
+        user.setCreatetime(createtime);
-        userInfo.setSign(sign);
+        user.setSign(sign);
-        userInfo.setCity(city);
+        user.setCity(city);
-        userInfo.setStatus(getStatus());
+        user.setStatus(getStatus());
-        return userInfo;
+        return user;
     }
 
     public String passwordForMd5() {

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);
+        UserInfo user = find((int) userid);
-        return info;
+        return user;
     }
 
     @RestMapping(name = "info", comment = "用户信息")

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);
+        UserInfo user = userService.current(sessionid);
-        if (userInfo != null) {
+        if (user != null) {
-            mine.set("username", userInfo.getNickname());
+            mine.set("username", user.getNickname());
-            mine.set("id", userInfo.getUserid());
+            mine.set("id", user.getUserid());
-            mine.set("sign", userInfo.getSign());
+            mine.set("sign", user.getSign());
-            mine.set("avatar", userInfo.getAvatar());
+            mine.set("avatar", user.getAvatar());
             mine.set("status", "online");
         }