From d8b0879bbab78e1111abaa0ede14e8a61517f3bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E6=98=BE=E4=BC=98?= <237809796@qq.com> Date: Sun, 25 Jun 2023 03:59:02 +0800 Subject: [PATCH] . --- pom.xml | 37 +++++++++++++------------- src/net/tccn/bbs/base/BaseService.java | 5 +--- src/net/tccn/bbs/base/BaseServlet.java | 16 +++-------- src/net/tccn/bbs/base/TplRender.java | 14 +++++++--- src/net/tccn/bbs/base/Utils.java | 1 - 5 files changed, 35 insertions(+), 38 deletions(-) diff --git a/pom.xml b/pom.xml index cd34630..0004fce 100644 --- a/pom.xml +++ b/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.lxyer + net.tccn redbbs - 1.0-SNAPSHOT + 0.2 UTF-8 @@ -41,23 +41,9 @@ lombok 1.18.22 - - - - - - lib/redbbs src @@ -66,8 +52,8 @@ maven-compiler-plugin 3.11.0 - 17 - 17 + 1.8 + 1.8 @@ -120,4 +106,19 @@ + + + + maven-nexus + mvn-releasex + http://127.0.0.1:8081/repository/maven-public/ + + + + + mvn-release + mvn-release + http://127.0.0.1:8081/repository/maven-releases/ + + \ No newline at end of file diff --git a/src/net/tccn/bbs/base/BaseService.java b/src/net/tccn/bbs/base/BaseService.java index bb67e80..f46d836 100644 --- a/src/net/tccn/bbs/base/BaseService.java +++ b/src/net/tccn/bbs/base/BaseService.java @@ -15,10 +15,7 @@ public class BaseService implements Service { protected final int sessionExpireSeconds = 7 * 24 * 60 * 60; - protected final static RetResult RET_SUCCESS = RetResult.success(); - - /*@Resource(name = "SERVER_ROOT") - protected File webroot;*/ + protected static final RetResult RET_SUCCESS = RetResult.success(); @Resource(name = "redbbs") protected DataSource dataSource; diff --git a/src/net/tccn/bbs/base/BaseServlet.java b/src/net/tccn/bbs/base/BaseServlet.java index 65aa9c5..5f4a13b 100644 --- a/src/net/tccn/bbs/base/BaseServlet.java +++ b/src/net/tccn/bbs/base/BaseServlet.java @@ -8,10 +8,12 @@ import net.tccn.bbs.content.ContentService; import net.tccn.bbs.user.UserInfo; import net.tccn.bbs.user.UserService; import net.tccn.bbs.vislog.entity.VisLog; -import org.redkale.net.http.*; +import org.redkale.net.http.HttpRequest; +import org.redkale.net.http.HttpResponse; +import org.redkale.net.http.HttpScope; +import org.redkale.net.http.HttpServlet; import org.redkale.source.FilterExpress; import org.redkale.source.FilterNode; -import org.redkale.util.AnyValue; import javax.annotation.Resource; import java.io.File; @@ -42,22 +44,12 @@ public class BaseServlet extends HttpServlet { @Resource protected TaskQueue logQueue; - @Override - public void init(HttpContext context, AnyValue config) { - - } - @Override protected void preExecute(HttpRequest request, HttpResponse response) throws IOException { - /*if (true){ - response.finish(HttpScope.refer("404.html")); - return; - }*/ String sessionid = request.getSessionid(true); int currentid = 0; if (sessionid != null) { - request.setCurrentUser(userService.current(sessionid)); currentid = userService.currentUserid(sessionid); request.setCurrentUserid(currentid); } diff --git a/src/net/tccn/bbs/base/TplRender.java b/src/net/tccn/bbs/base/TplRender.java index 8d67fd5..13494b8 100644 --- a/src/net/tccn/bbs/base/TplRender.java +++ b/src/net/tccn/bbs/base/TplRender.java @@ -5,6 +5,7 @@ import com.jfinal.template.Engine; import com.jfinal.template.Template; import net.tccn.bbs.base.util.EJ; import net.tccn.bbs.user.UserInfo; +import net.tccn.bbs.user.UserService; import org.redkale.convert.Convert; import org.redkale.net.http.*; import org.redkale.util.AnyValue; @@ -21,6 +22,9 @@ public class TplRender implements HttpRender { @Resource(name = "SERVER_ROOT") protected File webroot; + @Resource + private UserService userService; + private static final Engine engine = new Engine(); @Override @@ -33,12 +37,16 @@ public class TplRender implements HttpRender { @Override public void renderTo(HttpRequest request, HttpResponse response, Convert convert, HttpScope scope) { - UserInfo mine = request.currentUser();//当前登录人 + //UserInfo mine = request.currentUser();//当前登录人 Template template = engine.getTemplate(scope.getReferid()); Map attr = scope.getAttributes(); - if (attr == null) attr = Kv.create(); - attr.put("mine", mine); + if (attr == null) { + attr = Kv.create(); + } + + UserInfo userInfo = userService.find(request.currentUserid(int.class)); + attr.put("mine", userInfo); attr.put("token", request.getSessionid(false)); String str = template.renderToString(attr); diff --git a/src/net/tccn/bbs/base/Utils.java b/src/net/tccn/bbs/base/Utils.java index 14455be..e76b99b 100644 --- a/src/net/tccn/bbs/base/Utils.java +++ b/src/net/tccn/bbs/base/Utils.java @@ -169,7 +169,6 @@ public final class Utils { Kv row = Kv.of(); for (int i = 1; i <= count; i++) { String columnTypeName = metaData.getColumnTypeName(i); - //String columnName = metaData.getColumnName(i); String columnLabel = metaData.getColumnLabel(i); row.put(columnLabel, null);