-
diff --git a/root/project/index.html b/root/project/index.html
new file mode 100644
index 0000000..673a1a9
--- /dev/null
+++ b/root/project/index.html
@@ -0,0 +1,258 @@
+
+
+#set(title=bean.title)
+#set(keywords=bean.title)
+#set(description=bean.title)
+
+#@layout()
+#define css()
+
+#end
+
+#define main()
+Redbbs 2017 © http://1216.top
+
+ Redbbs 2017 © http://1216.top
+ 
+
付费计划 diff --git a/root/jie/add.html b/root/jie/add.html index 87abff1..8da4c78 100644 --- a/root/jie/add.html +++ b/root/jie/add.html @@ -44,8 +44,8 @@
+
+ implements Service {
protected static final boolean winos = System.getProperty("os.name").contains("Window");
+ @RestMapping(ignore = true)
+ public DataSource getSource() {
+ return source;
+ }
- protected Sheet createInfo(Sheet fSheet){
+ /*protected Sheet createInfo(Sheet fSheet){
Sheet sheet = new Sheet<>();
if (fSheet == null || fSheet.getTotal() < 1){
@@ -53,7 +53,7 @@ public class BaseService implements Service {
}
return sheet;
- }
+ }*/
/**
* 批量设置用户信息
@@ -61,7 +61,7 @@ public class BaseService implements Service {
* @param
* @return
*/
- protected Sheet setIUser(Sheet ufSheet){
+ /*protected Sheet setIUser(Sheet ufSheet){
int[] userIds = ufSheet.stream().mapToInt(I::getUserid).toArray();
List users = source.queryList(UserRecord.class, FilterNode.create("userId", FilterExpress.IN, userIds));
@@ -70,16 +70,23 @@ public class BaseService implements Service {
x.setUser(user);
});
return ufSheet;
- }
+ }*/
/**
* 将含有用户外键的实体，转为info，并加入用户信息
* @param uf
* @return
*/
- protected I setIUser(I uf){
+ /*protected I setIUser(I uf){
UserRecord user = source.find(UserRecord.class, uf.getUserid());
return (I) uf.setUser(user);
+ }*/
+
+ @RestMapping(ignore = true)
+ public int currentUserId(String sessionid){
+ if (sessionid == null) return 0;
+ Object userid = sessions.getAndRefresh(sessionid, sessionExpireSeconds);
+ return userid == null ? 0 : (Integer)userid;
}
}
diff --git a/src/com/lxyer/bbs/base/UF.java b/src/com/lxyer/bbs/base/UF.java
index 6c5451f..d1aaa08 100644
--- a/src/com/lxyer/bbs/base/UF.java
+++ b/src/com/lxyer/bbs/base/UF.java
@@ -1,5 +1,7 @@
package com.lxyer.bbs.base;
+import com.lxyer.bbs.base.iface.UI;
+
/**
* user foreign key (userId)
* Created by liangxianyou at 2018/6/9 14:50.
diff --git a/src/com/lxyer/bbs/base/iface/C.java b/src/com/lxyer/bbs/base/iface/C.java
new file mode 100644
index 0000000..cfca4f0
--- /dev/null
+++ b/src/com/lxyer/bbs/base/iface/C.java
@@ -0,0 +1,9 @@
+package com.lxyer.bbs.base.iface;
+
+/**
+ * 创建信息
+ * Created by liangxianyou at 2018/6/16 17:43.
+ */
+public interface C {
+ I createInfo();
+}
diff --git a/src/com/lxyer/bbs/base/iface/CI.java b/src/com/lxyer/bbs/base/iface/CI.java
new file mode 100644
index 0000000..6f95339
--- /dev/null
+++ b/src/com/lxyer/bbs/base/iface/CI.java
@@ -0,0 +1,7 @@
+package com.lxyer.bbs.base.iface;
+
+/**
+ * Created by liangxianyou at 2018/6/16 18:39.
+ */
+public interface CI {
+}
diff --git a/src/com/lxyer/bbs/base/iface/CService.java b/src/com/lxyer/bbs/base/iface/CService.java
new file mode 100644
index 0000000..6ad62ed
--- /dev/null
+++ b/src/com/lxyer/bbs/base/iface/CService.java
@@ -0,0 +1,32 @@
+package com.lxyer.bbs.base.iface;
+
+import org.redkale.net.http.RestMapping;
+import org.redkale.util.Sheet;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by liangxianyou at 2018/6/16 17:56.
+ */
+public interface CService {
+
+ @RestMapping(ignore = true)
+ default Sheet createInfo(Sheet fSheet){
+ Sheet sheet = new Sheet<>();
+
+ if (fSheet == null || fSheet.getTotal() < 1){
+ sheet.setTotal(0);
+ sheet.setRows(new ArrayList<>());
+ }else {
+ int total = (int)fSheet.getTotal();
+ List rows = new ArrayList<>(total);
+ fSheet.forEach(x->rows.add((I)x.createInfo()));
+
+ sheet.setTotal(total);
+ sheet.setRows(rows);
+ }
+
+ return sheet;
+ }
+}
diff --git a/src/com/lxyer/bbs/base/UI.java b/src/com/lxyer/bbs/base/iface/UI.java
similarity index 95%
rename from src/com/lxyer/bbs/base/UI.java
rename to src/com/lxyer/bbs/base/iface/UI.java
index 46057d0..a3a6d78 100644
--- a/src/com/lxyer/bbs/base/UI.java
+++ b/src/com/lxyer/bbs/base/iface/UI.java
@@ -1,4 +1,4 @@
-package com.lxyer.bbs.base;
+package com.lxyer.bbs.base.iface;
import com.lxyer.bbs.base.user.UserRecord;
diff --git a/src/com/lxyer/bbs/base/iface/UIService.java b/src/com/lxyer/bbs/base/iface/UIService.java
new file mode 100644
index 0000000..74467c7
--- /dev/null
+++ b/src/com/lxyer/bbs/base/iface/UIService.java
@@ -0,0 +1,38 @@
+package com.lxyer.bbs.base.iface;
+
+import com.lxyer.bbs.base.user.UserRecord;
+import org.redkale.net.http.RestMapping;
+import org.redkale.source.DataSource;
+import org.redkale.source.FilterExpress;
+import org.redkale.source.FilterNode;
+import org.redkale.util.Sheet;
+
+import java.util.List;
+
+/**
+ * Created by liangxianyou at 2018/6/16 18:25.
+ */
+public interface UIService extends CService {
+
+ DataSource getSource();
+
+ @RestMapping(ignore = true)
+ default Sheet setIUser(Sheet sheet){
+ int[] userids = sheet.stream().mapToInt(I::getUserid).toArray();
+
+ List users = getSource().queryList(UserRecord.class, FilterNode.create("userid", FilterExpress.IN, userids));
+ sheet.forEach(x->{
+ UserRecord user = users.stream().filter(u -> u.getUserid() == x.getUserid()).findAny().orElse(null);
+ x.setUser(user);
+ });
+ return sheet;
+ }
+
+ @RestMapping(ignore = true)
+ default I setIUser(I i){
+ UserRecord user = getSource().find(UserRecord.class, i.getUserid());
+
+ return (I) i.setUser(user);
+ }
+
+}
diff --git a/src/com/lxyer/bbs/base/user/UserService.java b/src/com/lxyer/bbs/base/user/UserService.java
index 6a24aaa..b9d9766 100644
--- a/src/com/lxyer/bbs/base/user/UserService.java
+++ b/src/com/lxyer/bbs/base/user/UserService.java
@@ -52,12 +52,6 @@ public class UserService extends BaseService {
sessions.getAndRefresh(sessionid, sessionExpireSeconds);
return userid == null ? null : findUserInfo((Integer) userid);
}
- @RestMapping(name = "userid")
- public int currentUserId(String sessionid){
- if (sessionid == null) return 0;
- Object userid = sessions.getAndRefresh(sessionid, sessionExpireSeconds);
- return userid == null ? 0 : (Integer)userid;
- }
@RestMapping(name = "info", comment = "用户信息")
public UserInfo findUserInfo(int userid) {
diff --git a/src/com/lxyer/bbs/comment/Comment.java b/src/com/lxyer/bbs/comment/Comment.java
index 5254222..2c850ce 100644
--- a/src/com/lxyer/bbs/comment/Comment.java
+++ b/src/com/lxyer/bbs/comment/Comment.java
@@ -3,6 +3,8 @@ package com.lxyer.bbs.comment;
import javax.persistence.*;
import com.lxyer.bbs.base.UF;
+import com.lxyer.bbs.base.iface.C;
+import com.lxyer.bbs.base.iface.UI;
import com.lxyer.bbs.base.kit.LxyKit;
import org.redkale.convert.json.*;
@@ -14,7 +16,7 @@ import java.io.Serializable;
*/
@Cacheable(interval = 5*60)
@Table(catalog = "redbbs", name = "sys_comment", comment = "[评论表]")
-public class Comment implements Serializable, UF {
+public class Comment implements Serializable, C {
@Id
@GeneratedValue
diff --git a/src/com/lxyer/bbs/comment/CommentInfo.java b/src/com/lxyer/bbs/comment/CommentInfo.java
index 99e62f9..cee3313 100644
--- a/src/com/lxyer/bbs/comment/CommentInfo.java
+++ b/src/com/lxyer/bbs/comment/CommentInfo.java
@@ -1,6 +1,7 @@
package com.lxyer.bbs.comment;
-import com.lxyer.bbs.base.UI;
+import com.lxyer.bbs.base.iface.CI;
+import com.lxyer.bbs.base.iface.UI;
import com.lxyer.bbs.base.user.UserRecord;
import org.redkale.convert.json.JsonConvert;
@@ -11,7 +12,7 @@ import java.io.Serializable;
*
* @author lxyer
*/
-public class CommentInfo implements UI,Serializable {
+public class CommentInfo implements UI,Serializable, CI {
@Column(comment = "[评论id]")
private int commentid;
diff --git a/src/com/lxyer/bbs/comment/CommentService.java b/src/com/lxyer/bbs/comment/CommentService.java
index e5978f5..acdfeb5 100644
--- a/src/com/lxyer/bbs/comment/CommentService.java
+++ b/src/com/lxyer/bbs/comment/CommentService.java
@@ -2,6 +2,8 @@ package com.lxyer.bbs.comment;
import com.lxyer.bbs.base.BaseService;
import com.lxyer.bbs.base.entity.ActLog;
+import com.lxyer.bbs.base.iface.UI;
+import com.lxyer.bbs.base.iface.UIService;
import com.lxyer.bbs.base.kit.LxyKit;
import com.lxyer.bbs.base.kit.RetCodes;
import com.lxyer.bbs.base.user.UserService;
@@ -27,10 +29,10 @@ import static com.lxyer.bbs.base.kit.RetCodes.RET_COMMENT_PARA_ILLEGAL;
* Created by Lxy at 2017/11/29 10:00.
*/
@RestService(automapping = true, comment = "评论服务")
-public class CommentService extends BaseService {
+public class CommentService extends BaseService implements UIService {
- @Resource
- private UserService userService;
+ /*@Resource
+ private UserService userService;*/
@RestMapping(name = "save", comment = "评论保存")
public RetResult commentSave(@RestSessionid String sessionid, @RestParam(name = "bean") Comment comment){
@@ -46,7 +48,7 @@ public class CommentService extends BaseService {
return RetCodes.retResult(RET_COMMENT_CONTENT_ILLEGAL, "评论内容无效");
if (comment.getCommentid() < 1) {
- int userid = userService.currentUserId(sessionid);
+ int userid = currentUserId(sessionid);
comment.setUserid(userid);
comment.setCreatetime(System.currentTimeMillis());
//todo:@用户处理
@@ -63,7 +65,7 @@ public class CommentService extends BaseService {
@RestMapping(name = "query", auth = false,comment = "查询评论")
public Sheet commentQuery(@RestSessionid String sessionid , int contentId, Flipper flipper){
- int userid = userService.currentUserId(sessionid);
+ int userid = currentUserId(sessionid);
flipper.setSort("supportnum DESC,commentid ASC");
Sheet comments = source.querySheet(Comment.class, flipper, FilterNode.create("contentid", contentId));
@@ -89,42 +91,35 @@ public class CommentService extends BaseService {
Sheet comments = source.querySheet(Comment.class, new Flipper().sort("createtime DESC"), FilterNode.create("userid", userid));
int[] contentIds = comments.stream().mapToInt(x -> x.getCommentid()).toArray();
-
List contents = source.queryList(Content.class, SelectColumn.createIncludes("contentid","title"), FilterNode.create("contentid", FilterExpress.IN, contentIds));
- Sheet infos = new Sheet<>();
- List list = new ArrayList<>();
-
- comments.forEach(x->{
- CommentInfo info = x.createInfo();
+ Sheet infos = createInfo(comments);
+ infos.forEach(x->{
Content content = contents.stream().filter(k -> k.getContentid() == x.getContentid()).findFirst().orElse(new Content());
- info.setTitle(content.getTitle());
- list.add(info);
+ x.setTitle(content.getTitle());
});
-
- infos.setRows(list);
- infos.setTotal(comments.getTotal());
return infos;
}
@RestMapping(name = "support", comment = "评论点赞")
public RetResult support(@RestSessionid String sessionid, int commentid, int ok){
- int userid = userService.currentUserId(sessionid);
+ int userid = currentUserId(sessionid);
- ActLog actLog = source.find(ActLog.class, FilterNode.create("userid", userid).and("tid", commentid).and("cate", 10));
- if (actLog == null && ok == 1){
- actLog = new ActLog(10, commentid, userid);
- actLog.setCreatetime(System.currentTimeMillis());
- source.insert(actLog);
- }else if (actLog != null && actLog.getStatus() != ok){
- actLog.setStatus((short) -10);
- source.update(actLog);
- }else {
- return RetCodes.retResult(-1, ok == 1 ? "已赞" : "已取消赞");
- }
+ source.findAsync(ActLog.class, FilterNode.create("userid", userid).and("tid", commentid).and("cate", 10)).thenAccept(actLog -> {
+ if (actLog == null && ok == 1){
+ actLog = new ActLog(10, commentid, userid);
+ actLog.setCreatetime(System.currentTimeMillis());
+ source.insert(actLog);
+ }else if (actLog != null && actLog.getStatus() != ok){
+ actLog.setStatus((short) -10);
+ source.update(actLog);
+ }/*else {
+ return RetCodes.retResult(-1, ok == 1 ? "已赞" : "已取消赞");
+ }*/
- int count = source.getNumberResult(ActLog.class, FilterFunc.COUNT, 0, "logid", FilterNode.create("tid", commentid).and("status", 10)).intValue();
- source.updateColumn(Comment.class, commentid,"supportnum", count);
+ int count = source.getNumberResult(ActLog.class, FilterFunc.COUNT, 0, "logid", FilterNode.create("tid", commentid).and("status", 10)).intValue();
+ source.updateColumn(Comment.class, commentid,"supportnum", count);
+ });
return RetResult.success();
}
diff --git a/src/com/lxyer/bbs/content/Content.java b/src/com/lxyer/bbs/content/Content.java
index 6357c6c..1fe52b1 100644
--- a/src/com/lxyer/bbs/content/Content.java
+++ b/src/com/lxyer/bbs/content/Content.java
@@ -1,12 +1,11 @@
package com.lxyer.bbs.content;
-import javax.persistence.*;
-
import com.jfinal.kit.Kv;
-import com.lxyer.bbs.base.UF;
+import com.lxyer.bbs.base.iface.C;
import com.lxyer.bbs.base.kit.LxyKit;
-import org.redkale.convert.json.*;
+import org.redkale.convert.json.JsonConvert;
+import javax.persistence.*;
import java.io.Serializable;
/**
@@ -15,7 +14,7 @@ import java.io.Serializable;
*/
@Cacheable(interval = 5*60)
@Table(catalog = "redbbs", name = "sys_content", comment = "[内容表]")
-public class Content implements Serializable, UF {
+public class Content implements Serializable, C {
@Id
@GeneratedValue
diff --git a/src/com/lxyer/bbs/content/ContentInfo.java b/src/com/lxyer/bbs/content/ContentInfo.java
index 3648ed8..83e5987 100644
--- a/src/com/lxyer/bbs/content/ContentInfo.java
+++ b/src/com/lxyer/bbs/content/ContentInfo.java
@@ -1,6 +1,7 @@
package com.lxyer.bbs.content;
-import com.lxyer.bbs.base.UI;
+import com.lxyer.bbs.base.iface.CI;
+import com.lxyer.bbs.base.iface.UI;
import com.lxyer.bbs.base.user.UserRecord;
import org.redkale.convert.ConvertColumn;
@@ -9,7 +10,7 @@ import java.io.Serializable;
/**
* Created by Lxy at 2017/11/26 20:52.
*/
-public class ContentInfo implements UI,Serializable {
+public class ContentInfo implements UI,Serializable, CI {
private int contentid;
private int userid;
diff --git a/src/com/lxyer/bbs/content/ContentService.java b/src/com/lxyer/bbs/content/ContentService.java
index 4aa851d..697f6e6 100644
--- a/src/com/lxyer/bbs/content/ContentService.java
+++ b/src/com/lxyer/bbs/content/ContentService.java
@@ -3,6 +3,7 @@ package com.lxyer.bbs.content;
import com.jfinal.kit.Kv;
import com.lxyer.bbs.base.BaseService;
import com.lxyer.bbs.base.entity.ActLog;
+import com.lxyer.bbs.base.iface.UIService;
import com.lxyer.bbs.base.kit.RetCodes;
import com.lxyer.bbs.base.user.UserInfo;
import com.lxyer.bbs.base.user.UserService;
@@ -18,7 +19,7 @@ import javax.annotation.Resource;
* Created by Lxy at 2017/11/26 9:33.
*/
@RestService(automapping = true, comment = "内容管理")
-public class ContentService extends BaseService{
+public class ContentService extends BaseService implements UIService {
@Resource
protected UserService userService;
@@ -32,6 +33,7 @@ public class ContentService extends BaseService{
public Sheet contentQuery(Flipper flipper, FilterNode filterNode){
Sheet contents = source.querySheet(Content.class, flipper, filterNode);
+ createInfo(contents);
Sheet infos = createInfo(contents);
setIUser(infos);
@@ -134,7 +136,7 @@ public class ContentService extends BaseService{
@RestMapping(name = "collectquery", comment = "收藏列表")
public Sheet collectQuery(@RestSessionid String sessionid){
- int userid = userService.currentUserId(sessionid);
+ int userid = currentUserId(sessionid);
Flipper flipper = new Flipper().sort("createtime DESC");
FilterNode filterNode = FilterNode.create("cate", 20).and("status", 10).and("userid", userid);
diff --git a/src/com/lxyer/bbs/servlet/ContentServlet.java b/src/com/lxyer/bbs/servlet/ContentServlet.java
index 8faea3a..353ce90 100644
--- a/src/com/lxyer/bbs/servlet/ContentServlet.java
+++ b/src/com/lxyer/bbs/servlet/ContentServlet.java
@@ -69,7 +69,7 @@ public class ContentServlet extends BaseServlet {
@Override
public String get() {
UserRecord user = request.currentUser();
- if (user == null || user.getUserid() > 10_0003)
+ if (user == null || user.getRoleid() != 0)
contentService.incrViewNum(contentid);
return "";
}
diff --git a/src/com/lxyer/bbs/servlet/IndexServlet.java b/src/com/lxyer/bbs/servlet/IndexServlet.java
index be192fb..c784d7a 100644
--- a/src/com/lxyer/bbs/servlet/IndexServlet.java
+++ b/src/com/lxyer/bbs/servlet/IndexServlet.java
@@ -3,6 +3,7 @@ package com.lxyer.bbs.servlet;
import com.jfinal.kit.Kv;
import com.lxyer.bbs.base.BaseServlet;
import com.lxyer.bbs.base.user.UserInfo;
+import com.lxyer.bbs.comment.CommentInfo;
import com.lxyer.bbs.content.ContentInfo;
import org.redkale.net.http.HttpMapping;
import org.redkale.net.http.HttpRequest;
@@ -12,7 +13,6 @@ import org.redkale.source.FilterNode;
import org.redkale.source.Flipper;
import org.redkale.util.Sheet;
-import static org.redkale.source.FilterExpress.GREATERTHAN;
import static org.redkale.source.FilterExpress.GREATERTHANOREQUALTO;
import static org.redkale.source.FilterExpress.NOTEQUAL;
@@ -20,14 +20,14 @@ import static org.redkale.source.FilterExpress.NOTEQUAL;
/**
* Created by Lxy at 2017/11/25 12:31.
*/
-@WebServlet({"/"
+@WebServlet({"/","/project"
/* ,"/article","/article/*" */
})
public class IndexServlet extends BaseServlet {
@HttpMapping(url = "/", auth = false, comment = "社区首页")
public void abc(HttpRequest request, HttpResponse response){
- Flipper flipper = new Flipper().limit(30).sort("top DESC,createtime DESC");
+ Flipper flipper = new Flipper().limit(15).sort("top DESC,createtime DESC");
//置顶贴
FilterNode topNode = FilterNode.create("status", NOTEQUAL, -10).and("top", GREATERTHANOREQUALTO, 20);
Sheet top = contentService.contentQuery(flipper, setPrivate(topNode));
@@ -66,4 +66,16 @@ public class IndexServlet extends BaseServlet {
finish("/article/index.html");
}*/
+
+ //====================================项目相关====================================
+ @HttpMapping(url = "/project", auth = false, comment = "项目首页")
+ public void project(HttpRequest request, HttpResponse response){
+ int contentid = 22;
+ ContentInfo content = contentService.contentInfo(sessionid, contentid);
+ Sheet comments = commentService.commentQuery(request.getSessionid(false) ,contentid, new Flipper().limit(30));
+
+ Kv kv = Kv.by("bean", content).set("comments", comments);
+ finish("project/index.html", kv);
+ }
+
}
+
+
+#end
+
+#define js()
+
+
+#end
\ No newline at end of file
diff --git a/src/com/lxyer/bbs/base/BaseService.java b/src/com/lxyer/bbs/base/BaseService.java
index 19b7430..27d14ca 100644
--- a/src/com/lxyer/bbs/base/BaseService.java
+++ b/src/com/lxyer/bbs/base/BaseService.java
@@ -1,19 +1,15 @@
package com.lxyer.bbs.base;
-import com.lxyer.bbs.base.user.UserRecord;
+import com.lxyer.bbs.base.iface.UI;
import com.lxyer.bbs.base.user.UserInfo;
+import org.redkale.net.http.RestMapping;
import org.redkale.service.Service;
import org.redkale.source.CacheSource;
import org.redkale.source.DataSource;
-import org.redkale.source.FilterExpress;
-import org.redkale.source.FilterNode;
-import org.redkale.util.Sheet;
import org.redkalex.cache.RedisCacheSource;
import javax.annotation.Resource;
import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
/**
* Created by Lxy at 2017/10/3 13:50.
@@ -36,8 +32,12 @@ public class BaseService
+
+
+
+
+
+
+
+ #(bean.title)
++
+ #(bean.content??)
+
+ #if(bean.site?? || bean.git??)
+
+ + #if(bean.site??) + + #end + #if(bean.git??) + + #end ++ #end +
+
+
+
+ -
+ #for(x : comments.rows??)
+
-
+
+ + ++
+ +
+ + #(x.nickname) + + + #if(x.userid == bean.userid??) + (楼主) + #end + ++ +#(x.createtime??)+ #if(1>2) + + #end ++ #(x.content) +++ #if(x.hadsupport == 1) + #(x.supportnum) + #else + #(x.supportnum) + #end + 回复 +++ #if(x.userid == mine.userid?? && false) + 编辑 + 删除 + #end + #if(bean.userid == mine.userid??) + 采纳 + #end ++
+ #else
+ - 消灭零回复 + #end +
+
+
+
+
+
+
+
+
+
+
+
+
+