From 25d4266d7485ec4d40dec798ddf130197bc67dd0 Mon Sep 17 00:00:00 2001 From: lxyer <237809796@qq.com> Date: Mon, 26 Nov 2018 22:30:37 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=BB=98=E8=AE=A4=E5=8E=BB=E9=99=A4r?= =?UTF-8?q?edis=E4=BD=BF=E7=94=A8=202=E3=80=81=E9=BB=98=E8=AE=A4=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E6=97=A5=E5=BF=97=E7=9A=84=E8=AE=B0=E5=BD=95=EF=BC=8C?= =?UTF-8?q?=E5=8F=AF=E5=B0=91=E9=85=8D=E7=BD=AE=E4=B8=80=E4=B8=AAmongodb?= =?UTF-8?q?=E6=88=96=E8=80=85=20arangodb=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 下载后导入数据库，并配置便可直接运行。 --- conf/application.xml | 5 +++-- src/com/lxyer/bbs/base/BaseService.java | 6 ++++-- src/com/lxyer/bbs/base/BaseServlet.java | 1 + src/com/lxyer/bbs/base/TaskQueue.java | 3 +++ src/com/lxyer/bbs/base/entity/VisLog.java | 18 ++++++------------ src/com/lxyer/bbs/base/user/UserService.java | 2 +- src/com/lxyer/bbs/servlet/ContentServlet.java | 4 ++-- 7 files changed, 20 insertions(+), 19 deletions(-) diff --git a/conf/application.xml b/conf/application.xml index 21406c0..090d184 100644 --- a/conf/application.xml +++ b/conf/application.xml @@ -3,9 +3,10 @@ - + + diff --git a/src/com/lxyer/bbs/base/BaseService.java b/src/com/lxyer/bbs/base/BaseService.java index c54f87c..7ea5b0f 100644 --- a/src/com/lxyer/bbs/base/BaseService.java +++ b/src/com/lxyer/bbs/base/BaseService.java @@ -21,8 +21,10 @@ public class BaseService implements Service { @Resource(name = "art123") protected DataSource source; - @Resource(name = "redis") - protected CacheSource sessions; + /* 使用redis 代码中配置此处即可 + @Resource(name = "redis")*/ + @Resource(name = "cacheSource") + protected CacheSource sessions; @Resource(name = "cacheSource") protected CacheSource cacheSource; diff --git a/src/com/lxyer/bbs/base/BaseServlet.java b/src/com/lxyer/bbs/base/BaseServlet.java index b800116..ae75a8f 100644 --- a/src/com/lxyer/bbs/base/BaseServlet.java +++ b/src/com/lxyer/bbs/base/BaseServlet.java @@ -88,6 +88,7 @@ public class BaseServlet extends HttpServlet { visLog.setIp(request.getRemoteAddr()); visLog.setUri(request.getRequestURI()); visLog.setHeaders(headers); + visLog.setUserid(userid); visLog.setPara(para); visLog.setTime(System.currentTimeMillis()); visLog.setFtime(String.format("%1$tY%1$tm%1$td%1$tH%1$tM%1$tS", visLog.getTime())); diff --git a/src/com/lxyer/bbs/base/TaskQueue.java b/src/com/lxyer/bbs/base/TaskQueue.java index fa3e8e0..5805734 100644 --- a/src/com/lxyer/bbs/base/TaskQueue.java +++ b/src/com/lxyer/bbs/base/TaskQueue.java @@ -86,6 +86,8 @@ public class TaskQueue extends BaseService implements Runnable //记录访问日志，如果是访问的文章详情：对文章访问数量更新 if (task instanceof VisLog) { + System.out.println(task); + /* todo: 需要记录 访问日志，此处添加记录日志逻辑 ArangoKit.save(task).thenAcceptAsync((_task) -> { VisLog visLog = (VisLog) _task; //[访问量] @@ -94,6 +96,7 @@ public class TaskQueue extends BaseService implements Runnable updateViewNum(visLog); } }); + */ } } catch (InterruptedException e) { diff --git a/src/com/lxyer/bbs/base/entity/VisLog.java b/src/com/lxyer/bbs/base/entity/VisLog.java index f1b7809..f35ebaf 100644 --- a/src/com/lxyer/bbs/base/entity/VisLog.java +++ b/src/com/lxyer/bbs/base/entity/VisLog.java @@ -1,5 +1,7 @@ package com.lxyer.bbs.base.entity; +import org.redkale.convert.json.JsonConvert; + import java.util.Map; /** @@ -9,7 +11,7 @@ import java.util.Map; */ public class VisLog { private String ip; - private String userid; + private int userid; private String ftime; private String uri; private long time; @@ -24,11 +26,11 @@ public class VisLog { this.ip = ip; } - public String getUserid() { + public int getUserid() { return userid; } - public void setUserid(String userid) { + public void setUserid(int userid) { this.userid = userid; } @@ -74,14 +76,6 @@ public class VisLog { @Override public String toString() { - return "VisLog{" + - "ip='" + ip + '\'' + - ", userid='" + userid + '\'' + - ", ftime='" + ftime + '\'' + - ", uri='" + uri + '\'' + - ", time=" + time + - ", para=" + para + - ", headers=" + headers + - '}'; + return JsonConvert.root().convertTo(this); } } diff --git a/src/com/lxyer/bbs/base/user/UserService.java b/src/com/lxyer/bbs/base/user/UserService.java index 0cb27d7..ce10ae9 100644 --- a/src/com/lxyer/bbs/base/user/UserService.java +++ b/src/com/lxyer/bbs/base/user/UserService.java @@ -40,7 +40,7 @@ public class UserService extends BaseService { //log(user, 0, "用户登录成功."); UserInfo userInfo = user.createUserInfo(); - sessions.setAsync(sessionExpireSeconds, loginBean.getSessionid(), userInfo.getUserid()); + sessions.setAsync(sessionExpireSeconds, loginBean.getSessionid(), (long)userInfo.getUserid()); retResult.setRetcode(0); retResult.setResult(userInfo); retResult.setRetinfo("登录成功."); diff --git a/src/com/lxyer/bbs/servlet/ContentServlet.java b/src/com/lxyer/bbs/servlet/ContentServlet.java index 5b0a50a..09a342d 100644 --- a/src/com/lxyer/bbs/servlet/ContentServlet.java +++ b/src/com/lxyer/bbs/servlet/ContentServlet.java @@ -62,7 +62,7 @@ public class ContentServlet extends BaseServlet { /*Flipper flipper3 = new Flipper().limit(8).sort("replynum DESC"); Sheet hotReply = contentService.contentQuery(flipper3, "", sessionid);*/ - Sheet hotView = logQueue.hotView(sessionid); + Sheet hotView = Sheet.empty();//logQueue.hotView(sessionid); TODO: 依赖日志记录，需记录日志后可使用 Kv kv = Kv.by("bean", content).set("comments", comments).set("hotView", hotView)/*.set("hotReply", hotReply)*/; response.finish(HttpScope.refer("/jie/detail.html").attr(kv)); @@ -87,7 +87,7 @@ public class ContentServlet extends BaseServlet { Sheet contents = contentService.contentQuery(flipper, setPrivate(request, setPrivate(request, filterNode))); //热帖 - Sheet hotView = logQueue.hotView(sessionid); + Sheet hotView = Sheet.empty();//logQueue.hotView(sessionid); TODO: 依赖日志记录，需记录日志后可使用 Kv kv = Kv.by("contents", contents).set("hotView", hotView) .set("solved", solved).set("wonderful", wonderful)