From c98d85d5e90ba12ca47db91bd162f83b122bc699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 31 Dec 2024 13:58:17 +0800 Subject: [PATCH] 'commit' --- .../QingLong/MaxKB/Service/Impl/MaxKbImpl.java | 4 ++-- .../dsideal/QingLong/MaxKB/Service/MaxKbService.java | 4 ++-- .../java/com/dsideal/QingLong/MaxKB/TestMaxKB.java | 7 +++---- .../dsideal/QingLong/MaxKB/ToDel/UploadDocument.java | 8 ++++---- .../java/com/dsideal/QingLong/MaxKB/UploadQA.java | 10 +++++----- .../com/dsideal/QingLong/MaxKB/Util/MaxKbUtil.java | 8 ++++---- src/main/resources/MaxKb.properties | 10 ---------- src/main/resources/application.properties | 11 +++++++++++ 8 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 src/main/resources/MaxKb.properties diff --git a/src/main/java/com/dsideal/QingLong/MaxKB/Service/Impl/MaxKbImpl.java b/src/main/java/com/dsideal/QingLong/MaxKB/Service/Impl/MaxKbImpl.java index becd4f10..5afe01c2 100644 --- a/src/main/java/com/dsideal/QingLong/MaxKB/Service/Impl/MaxKbImpl.java +++ b/src/main/java/com/dsideal/QingLong/MaxKB/Service/Impl/MaxKbImpl.java @@ -1,4 +1,4 @@ -package Tools.MaxKb.Service.Impl; +package com.dsideal.QingLong.MaxKB.Service.Impl; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; @@ -15,7 +15,7 @@ import java.util.List; public class MaxKbImpl { //MaxKB的url - static final String baseUrl = PropKit.get("baseUrl"); + static final String baseUrl = PropKit.get("MaxKB_baseUrl"); //获取身份识别码接口 static final String Authorization_URL = baseUrl + "/api/user/login"; diff --git a/src/main/java/com/dsideal/QingLong/MaxKB/Service/MaxKbService.java b/src/main/java/com/dsideal/QingLong/MaxKB/Service/MaxKbService.java index 05463ca0..72b45845 100644 --- a/src/main/java/com/dsideal/QingLong/MaxKB/Service/MaxKbService.java +++ b/src/main/java/com/dsideal/QingLong/MaxKB/Service/MaxKbService.java @@ -1,9 +1,9 @@ -package Tools.MaxKb.Service; +package com.dsideal.QingLong.MaxKB.Service; -import Tools.MaxKb.Service.Impl.MaxKbImpl; import com.dsideal.QingLong.MaxKB.Model.MaxKbModel; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.dsideal.QingLong.MaxKB.Service.Impl.MaxKbImpl; import com.dsideal.QingLong.Util.CommonUtil; import com.jfinal.plugin.activerecord.Record; diff --git a/src/main/java/com/dsideal/QingLong/MaxKB/TestMaxKB.java b/src/main/java/com/dsideal/QingLong/MaxKB/TestMaxKB.java index a53726e5..3bd959e8 100644 --- a/src/main/java/com/dsideal/QingLong/MaxKB/TestMaxKB.java +++ b/src/main/java/com/dsideal/QingLong/MaxKB/TestMaxKB.java @@ -1,16 +1,15 @@ -package Tools.MaxKb; +package com.dsideal.QingLong.MaxKB; import com.dsideal.QingLong.MaxKB.Model.MaxKbModel; -import Tools.MaxKb.Util.MaxKbUtil; +import com.dsideal.QingLong.MaxKB.Util.MaxKbUtil; import com.jfinal.kit.PropKit; public class TestMaxKB { - public static void main(String[] args) throws Exception { MaxKbModel mkm = new MaxKbModel(); //加载配置文件 - PropKit.use("MaxKb.properties"); + PropKit.use("application.properties"); //初始化数据库 MaxKbUtil.Init(); diff --git a/src/main/java/com/dsideal/QingLong/MaxKB/ToDel/UploadDocument.java b/src/main/java/com/dsideal/QingLong/MaxKB/ToDel/UploadDocument.java index 15762512..623df58c 100644 --- a/src/main/java/com/dsideal/QingLong/MaxKB/ToDel/UploadDocument.java +++ b/src/main/java/com/dsideal/QingLong/MaxKB/ToDel/UploadDocument.java @@ -1,7 +1,7 @@ -package Tools.MaxKb.ToDel; +package com.dsideal.QingLong.MaxKB.ToDel; -import Tools.MaxKb.Service.MaxKbService; -import Tools.MaxKb.Util.MaxKbUtil; +import com.dsideal.QingLong.MaxKB.Service.MaxKbService; +import com.dsideal.QingLong.MaxKB.Util.MaxKbUtil; import com.jfinal.kit.PropKit; public class UploadDocument { @@ -12,7 +12,7 @@ public class UploadDocument { public static void main(String[] args) throws Exception { //加载配置文件 - PropKit.use("MaxKb.properties"); + PropKit.use("application.properties"); //初始化数据库 MaxKbUtil.Init(); diff --git a/src/main/java/com/dsideal/QingLong/MaxKB/UploadQA.java b/src/main/java/com/dsideal/QingLong/MaxKB/UploadQA.java index 4dfcad57..1688d47c 100644 --- a/src/main/java/com/dsideal/QingLong/MaxKB/UploadQA.java +++ b/src/main/java/com/dsideal/QingLong/MaxKB/UploadQA.java @@ -1,9 +1,9 @@ -package Tools.MaxKb; +package com.dsideal.QingLong.MaxKB; -import Tools.MaxKb.Service.Impl.MaxKbImpl; -import Tools.MaxKb.Service.MaxKbService; -import Tools.MaxKb.Util.MaxKbUtil; import com.alibaba.fastjson.JSONObject; +import com.dsideal.QingLong.MaxKB.Service.Impl.MaxKbImpl; +import com.dsideal.QingLong.MaxKB.Service.MaxKbService; +import com.dsideal.QingLong.MaxKB.Util.MaxKbUtil; import com.jfinal.kit.PropKit; public class UploadQA { @@ -13,7 +13,7 @@ public class UploadQA { public static void main(String[] args) throws Exception { //加载配置文件 - PropKit.use("MaxKb.properties"); + PropKit.use("application.properties"); //初始化数据库 MaxKbUtil.Init(); diff --git a/src/main/java/com/dsideal/QingLong/MaxKB/Util/MaxKbUtil.java b/src/main/java/com/dsideal/QingLong/MaxKB/Util/MaxKbUtil.java index 0bb9546f..f76238ae 100644 --- a/src/main/java/com/dsideal/QingLong/MaxKB/Util/MaxKbUtil.java +++ b/src/main/java/com/dsideal/QingLong/MaxKB/Util/MaxKbUtil.java @@ -1,4 +1,4 @@ -package Tools.MaxKb.Util; +package com.dsideal.QingLong.MaxKB.Util; import com.jfinal.kit.PropKit; import com.jfinal.plugin.activerecord.ActiveRecordPlugin; @@ -10,9 +10,9 @@ public class MaxKbUtil { * 初始化MaxKB的数据库连接 */ public static void Init() { - String jdbcUrl = PropKit.get("jdbcUrl"); - String user = PropKit.get("user"); - String password = PropKit.get("password"); + String jdbcUrl = PropKit.get("MaxKB_jdbcUrl"); + String user = PropKit.get("MaxKB_user"); + String password = PropKit.get("MaxKB_password"); String driverClassName = PropKit.get("driverClassName"); //读取库 HikariCpPlugin hp = new HikariCpPlugin(jdbcUrl, user, password, driverClassName); diff --git a/src/main/resources/MaxKb.properties b/src/main/resources/MaxKb.properties deleted file mode 100644 index 8de6698c..00000000 --- a/src/main/resources/MaxKb.properties +++ /dev/null @@ -1,10 +0,0 @@ -# 数据库信息 -driverClassName=org.postgresql.Driver -user=root -password=Password123@postgres -jdbcUrl=jdbc:postgresql://10.10.14.206:5432/maxkb?reWriteBatchedInserts=true -# MaxKB的配置信息 -baseUrl=http://10.10.14.206:8080 -# MaxKB系统的管理员账号 -MaxKBUsername=admin -MaxKBPassword=Dsideal4r5t6y7u!@# diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index e0642e76..f3c2ee06 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -5,6 +5,17 @@ password=DsideaL147258369 # 长春市 jdbcUrl=jdbc:postgresql://10.10.14.71:5432/szjz_db?reWriteBatchedInserts=true +# MaxKB数据库信息 +MaxKB_user=root +MaxKB_password=Password123@postgres +MaxKB_jdbcUrl=jdbc:postgresql://10.10.14.206:5432/maxkb?reWriteBatchedInserts=true +# MaxKB的配置信息 +MaxKB_baseUrl=http://10.10.14.206:8080 +# MaxKB系统的管理员账号 +MaxKBUsername=admin +MaxKBPassword=Dsideal4r5t6y7u!@# + + # redis redis_ip=10.10.14.14 redis_port=18890