From 91e95f68fda73940ac69cf84bba7e8223b00a04a Mon Sep 17 00:00:00 2001 From: HuangHai <10402852@qq.com> Date: Mon, 26 May 2025 18:42:23 +0800 Subject: [PATCH] 'commit' --- .../com/dsideal/gw/Handler/RouterHandler.java | 22 +++------------ .../com/dsideal/Res/Neo4jDemoController.java | 3 ++- .../com/dsideal/Res/Plugin/Neo4jConfig.java | 27 ++++++++++++++++++- .../java/com/dsideal/Res/ResApplication.java | 20 +++++++++----- dsRes/src/main/resources/application_dev.yaml | 4 +++ dsRes/src/main/resources/application_pro.yaml | 4 +++ 6 files changed, 54 insertions(+), 26 deletions(-) diff --git a/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java b/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java index a9f78c3e..7fdba2a2 100644 --- a/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java +++ b/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java @@ -1,9 +1,9 @@ package com.dsideal.gw.Handler; -import com.dsideal.Config.GatewayConfig; import com.dsideal.gw.Bean.RetBean; import com.dsideal.gw.GwApplication; import com.dsideal.gw.Util.JwtUtil; +import com.dsideal.gw.Config.GatewayConfig; import com.jfinal.handler.Handler; import com.jfinal.kit.StrKit; import com.jfinal.upload.MultipartRequest; @@ -15,7 +15,6 @@ import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; @@ -240,22 +239,9 @@ public class RouterHandler extends Handler { } // 处理Cookie - javax.servlet.http.Cookie[] cookies = req.getCookies(); - if (cookies != null && cookies.length > 0) { - StringBuilder cookieString = new StringBuilder(); - for (Cookie cookie : cookies) { - if (cookieString.length() > 0) { - cookieString.append("; "); - } - cookieString.append(cookie.getName()).append("=").append(cookie.getValue()); - } - builder.addHeader(Constants.HEADER_COOKIE, cookieString.toString()); - } - - // 如果还有Cookie头，也添加进去 - String cookieHeader = req.getHeader(Constants.HEADER_COOKIE); - if (!StrKit.isBlank(cookieHeader)) { - builder.addHeader(Constants.HEADER_COOKIE, cookieHeader); + String cookie = req.getHeader(Constants.HEADER_COOKIE); + if (!StrKit.isBlank(cookie)) { + builder.addHeader(Constants.HEADER_COOKIE, cookie); } // 添加其他重要头信息 diff --git a/dsRes/src/main/java/com/dsideal/Res/Neo4jDemoController.java b/dsRes/src/main/java/com/dsideal/Res/Neo4jDemoController.java index 7e8538d7..d4364f62 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Neo4jDemoController.java +++ b/dsRes/src/main/java/com/dsideal/Res/Neo4jDemoController.java @@ -7,7 +7,7 @@ import org.neo4j.driver.Record; import org.neo4j.driver.types.Node; public class Neo4jDemoController extends Controller { - private Neo4jConfig neo4jConfig = new Neo4jConfig(); + private final Neo4jConfig neo4jConfig = Neo4jConfig.getInstance(); public void index() { // 获取 Neo4j 驱动 @@ -25,5 +25,6 @@ public class Neo4jDemoController extends Controller { System.out.println(node.get("name").asString()); } } + renderText("数据读取成功！"); } } \ No newline at end of file diff --git a/dsRes/src/main/java/com/dsideal/Res/Plugin/Neo4jConfig.java b/dsRes/src/main/java/com/dsideal/Res/Plugin/Neo4jConfig.java index df1ba43c..8f16c3bb 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Plugin/Neo4jConfig.java +++ b/dsRes/src/main/java/com/dsideal/Res/Plugin/Neo4jConfig.java @@ -4,11 +4,36 @@ import org.neo4j.driver.AuthTokens; import org.neo4j.driver.Driver; import org.neo4j.driver.GraphDatabase; +import org.neo4j.driver.Session; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class Neo4jConfig { + private static Neo4jConfig instance; private Driver driver; + private static final Logger logger = LoggerFactory.getLogger(Neo4jConfig.class); + + private Neo4jConfig() {} + + public static Neo4jConfig getInstance() { + if (instance == null) { + instance = new Neo4jConfig(); + } + return instance; + } public void init(String uri, String user, String password) { - driver = GraphDatabase.driver(uri, AuthTokens.basic(user, password)); + try { + driver = GraphDatabase.driver(uri, AuthTokens.basic(user, password)); + // 验证连接 + try (Session session = driver.session()) { + session.run("RETURN 1").consume(); + logger.info("Neo4j连接成功"); + } + } catch (Exception e) { + logger.error("Neo4j初始化失败: " + e.getMessage(), e); + throw new RuntimeException("Neo4j初始化失败", e); + } } public Driver getDriver() { diff --git a/dsRes/src/main/java/com/dsideal/Res/ResApplication.java b/dsRes/src/main/java/com/dsideal/Res/ResApplication.java index 1cea924a..ad5792cb 100644 --- a/dsRes/src/main/java/com/dsideal/Res/ResApplication.java +++ b/dsRes/src/main/java/com/dsideal/Res/ResApplication.java @@ -22,10 +22,11 @@ import org.slf4j.LoggerFactory; import java.io.File; public class ResApplication extends JFinalConfig { + // 将字段改为静态 + private static final Neo4jConfig neo4jConfig = Neo4jConfig.getInstance(); + private static final Logger logger = LoggerFactory.getLogger(ResApplication.class); - private final Neo4jConfig neo4jConfig = new Neo4jConfig(); - public static void main(String[] args) { System.out.println("当前环境: " + PropKit.getEnvPrefix()); UndertowServer.create(ResApplication.class, "undertow.properties").start(); @@ -93,7 +94,17 @@ public class ResApplication extends JFinalConfig { me.add(redis); // 配置 Neo4j - neo4jConfig.init("bolt://localhost:7687", "neo4j", "DsideaL4r5t6y7u"); + try { + String url = PropKit.get("neo4j.url"); + String username = PropKit.get("neo4j.username"); + String password = PropKit.get("neo4j.password"); + + logger.info("正在初始化Neo4j连接: url={}", url); + neo4jConfig.init(url, username, password); + } catch (Exception e) { + logger.error("Neo4j配置失败", e); + throw new RuntimeException("Neo4j配置失败", e); + } } /** @@ -135,9 +146,6 @@ public class ResApplication extends JFinalConfig { public void onStart() { //打印 启动Logo System.out.println(FileUtil.readUtf8String("logo.txt")); - - // JFinal 启动时初始化 Neo4j 配置 - //neo4jConfig.init("bolt://localhost:7687", "neo4j", "password"); } @Override diff --git a/dsRes/src/main/resources/application_dev.yaml b/dsRes/src/main/resources/application_dev.yaml index 00768f55..168afc83 100644 --- a/dsRes/src/main/resources/application_dev.yaml +++ b/dsRes/src/main/resources/application_dev.yaml @@ -55,3 +55,7 @@ excel: # 导入excel 的模板配置路径 ExcelImportTemplatePathSuffix: /ExcelImportTemplate/ +neo4j: + url: bolt://localhost:7687 + username: neo4j + password: DsideaL4r5t6y7u \ No newline at end of file diff --git a/dsRes/src/main/resources/application_pro.yaml b/dsRes/src/main/resources/application_pro.yaml index f70b63a3..697af23c 100644 --- a/dsRes/src/main/resources/application_pro.yaml +++ b/dsRes/src/main/resources/application_pro.yaml @@ -54,3 +54,7 @@ excel: # 导入excel 的模板配置路径 ExcelImportTemplatePathSuffix: /ExcelImportTemplate/ +neo4j: + url: bolt://localhost:7687 + username: neo4j + password: DsideaL4r5t6y7u \ No newline at end of file