From 86ded4364b5e1bb033f17624253cbc0fcdea11af Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Thu, 26 Jun 2025 14:54:40 +0800
Subject: [PATCH] 'commit'

---
 dsRag/Config/Config.py                        |  36 ++++----
 .../Config/__pycache__/Config.cpython-310.pyc | Bin 751 -> 654 bytes
 dsRag/Milvus/Config/MulvusConfig.py           |  84 ------------------
 dsRag/Milvus/Config/__init__.py               |   0
 .../__pycache__/MulvusConfig.cpython-310.pyc  | Bin 1244 -> 0 bytes
 .../__pycache__/__init__.cpython-310.pyc      | Bin 144 -> 0 bytes
 dsRag/Milvus/X1_create_collection.py          |   2 +-
 dsRag/Milvus/X2_create_index.py               |   2 +-
 dsRag/Milvus/X4_InsertMathData.py             |   2 +-
 dsRag/Milvus/X5_select_all_data.py            |   2 +-
 dsRag/Milvus/X6_search_near_data.py           |   2 +-
 .../__pycache__/SplitDocxUtil.cpython-310.pyc | Bin 1586 -> 854 bytes
 12 files changed, 23 insertions(+), 107 deletions(-)
 delete mode 100644 dsRag/Milvus/Config/MulvusConfig.py
 delete mode 100644 dsRag/Milvus/Config/__init__.py
 delete mode 100644 dsRag/Milvus/Config/__pycache__/MulvusConfig.cpython-310.pyc
 delete mode 100644 dsRag/Milvus/Config/__pycache__/__init__.cpython-310.pyc

diff --git a/dsRag/Config/Config.py b/dsRag/Config/Config.py
index 4105bf20..278dfcca 100644
--- a/dsRag/Config/Config.py
+++ b/dsRag/Config/Config.py
@@ -1,20 +1,3 @@
-# Elasticsearch配置
-ES_CONFIG = {
-    "hosts": "https://10.10.14.206:9200",
-    "basic_auth": ("elastic", "jv9h8uwRrRxmDi1dq6u8"),
-    "verify_certs": False,
-    "ssl_show_warn": False,
-    "default_index": "knowledge_base"
-}
-
-# 词向量模型路径
-WORD2VEC_MODEL_PATH = r"D:\Tencent_AILab_ChineseEmbedding\Tencent_AILab_ChineseEmbedding.txt"
-
-# DeepSeek
-DEEPSEEK_API_KEY = 'sk-44ae895eeb614aa1a9c6460579e322f1'
-DEEPSEEK_URL = 'https://api.deepseek.com'
-
-
 # MYSQL配置信息
 MYSQL_HOST = "10.10.14.210"
 MYSQL_PORT = 22066
@@ -26,4 +9,21 @@ MYSQL_DB_NAME = "base_db"
 # https://bailian.console.aliyun.com/?spm=a2c4g.11186623.0.0.77b17980FcMVYv&apiKey=1#/api-key
 MODEL_API_KEY = "sk-01d13a39e09844038322108ecdbd1bbc"
 MODEL_NAME = "qwen-plus"
-#MODEL_NAME = "deepseek-v3"
\ No newline at end of file
+#MODEL_NAME = "deepseek-v3"
+
+# Milvus 服务器的主机地址
+MS_HOST = "10.10.14.207"
+# Milvus 服务器的端口号
+MS_PORT = "19530"
+# Milvus 集合的名称
+MS_COLLECTION_NAME = "ds_collection"
+# Milvus 连接池的最大连接数
+MS_MAX_CONNECTIONS = 50
+# 腾讯 AI Lab 中文词向量模型的路径
+MS_MODEL_PATH = "D:/Tencent_AILab_ChineseEmbedding/Tencent_AILab_ChineseEmbedding.txt"
+# 加载词向量模型时限制的词汇数量
+MS_MODEL_LIMIT = 10000
+# 词向量的维度（腾讯 AI Lab 中文词向量模型的维度为 200）
+MS_DIMENSION = 200
+# Milvus 搜索时的 nprobe 参数，用于控制搜索的精度和性能
+MS_NPROBE = 100
diff --git a/dsRag/Config/__pycache__/Config.cpython-310.pyc b/dsRag/Config/__pycache__/Config.cpython-310.pyc
index 765cd6e0f0dcd50d45ebd0d5844f8758ebde9c7e..60f140ba33aaf922706c9ff1eba052a739e73038 100644
GIT binary patch
delta 385
zcmYk0&q~8U5XLv@rhk*Pc<|VR2c?&o)QZ@XwFxwkY)TWM3}Ox)!9cNKdyroG28EKR
z@J)P%Ts`%ocP~1rP&>2xF~4tTcK1tJE328NRT;(j^Zu#B8T-iLFeHK-+VfnH0YeES
zltIP<6p#Z)1r#ho5lc|QGL*3b6|6!PYfwWKRMbF29dxXRtkqbmmTBaxW3(+ZN!QYy
zap;*>nPOdEUYImAk0-O~^l`FCX3yI;J-@W=?)m1YDdlo(EM6B$<BYNGJDqKjM6~MZ
zsr<0YN`4p*f-u?@!(bF;N96Pa&vW{b8;Dr+d}rtRy)pSh{P`hh)aM7b<Hf^XGyr{%
wp6k0&rV`t(?}(6YfeMirj)Gg~jlI<913URnH*)u+Nyw#ra;i9&|FbOr0(wta+yDRo

delta 462
zcmYjN!A{#i5VajUi9-xX^w3_aLVL-f#x};pQ3XY@p$JN%qye!)tQOA(y9sgXbqLLc
zF8~SUz=a>+mwcu7en2l>idyx(c~A3ZPBS;kPvt7sw35K_<L)@T&I!WfQ}`cw9zJrh
z58OZi5hTtW$oC2oKtUqpkpu;lgCdeaMGBNq9%fJh%BTn$QehUAV6H7x<|nVhG##?q
z^0H~@Pi5;@mf_S~%P=YuD$qV*X%wIrUoYISIvTf<*5$bunefdSRkyO)-XI?LDV$M!
zN*JvunG(h<Wm$>GD8OWthFST7CQ<i04rszR8e@IT!g!3wBpGBH&@LJEQydL|UQRr(
zCLT{0#n*p)X=C!1_1@byp;dR4(o@H@2{DNqIJRS~uDNu@vbyHv<=-R7Fw%k2A)~aX
z2l4ss5bFDtnN0QDxZc>`+Sx`6hmDqJ9r$(px#9VHxVib|6PovYzuETvUA)=c!Mpwu
uD*u~wT6@!uc%nWCiOT<-s8d~9fA@yBk|c@G%>R;AIVX#<%=JvUDE<b(#d*g7

diff --git a/dsRag/Milvus/Config/MulvusConfig.py b/dsRag/Milvus/Config/MulvusConfig.py
deleted file mode 100644
index 6276bacf..00000000
--- a/dsRag/Milvus/Config/MulvusConfig.py
+++ /dev/null
@@ -1,84 +0,0 @@
-# Milvus 服务器的主机地址
-#MS_HOST = "10.10.14.205"
-MS_HOST = "10.10.14.207"
-# Milvus 服务器的端口号
-MS_PORT = "19530"
-
-# Milvus 集合的名称
-MS_COLLECTION_NAME = "ds_collection"
-
-# Milvus 连接池的最大连接数
-MS_MAX_CONNECTIONS = 50
-
-# 腾讯 AI Lab 中文词向量模型的路径
-MS_MODEL_PATH = "D:/Tencent_AILab_ChineseEmbedding/Tencent_AILab_ChineseEmbedding.txt"
-
-# 加载词向量模型时限制的词汇数量
-MS_MODEL_LIMIT = 10000
-
-# 词向量的维度（腾讯 AI Lab 中文词向量模型的维度为 200）
-MS_DIMENSION = 200
-
-# Milvus 搜索时的 nprobe 参数，用于控制搜索的精度和性能
-MS_NPROBE = 100
-
-# Redis 配置
-REDIS_HOST = '10.10.14.14'  # Redis 服务器地址
-REDIS_PORT = 18890  # Redis 端口
-REDIS_DB = 0  # Redis 数据库编号
-REDIS_PASSWORD = None  # Redis 密码（如果没有密码，设置为 None）
-
-# MYSQL配置信息
-MYSQL_HOST = "10.10.14.210"
-MYSQL_PORT = 22066
-MYSQL_USER = "root"
-MYSQL_PASSWORD = "DsideaL147258369"
-MYSQL_DB_NAME = "ai_db"
-
-# JWT密匙
-JWT_SECRET_KEY = "DsideaL4r5t6y7u"
-# 配置 JWT
-ALGORITHM = "HS256"
-ACCESS_TOKEN_EXPIRE_MINUTES = 24 * 60 * 30 # 一个月有效期
-#  ----------------下面的配置需要根据情况进行修改-------------------------
-
-'''
-######################### 驿来特 #########################
-ACCESS_KEY_ID = 'LTAI5t5jxkgJtRK8wew8fnbq'
-ACCESS_KEY_SECRET = 'b8HXNGz7IkI3Dhv7BZx9BNBEZy1uku'
-BUCKET_NAME = 'ylt'
-ENDPOINT = 'https://oss-cn-hangzhou.aliyuncs.com'
-OSS_PREFIX = "https://ylt.oss-cn-hangzhou.aliyuncs.com/"
-
-# 阿里云中用来调用 deepseek v3 的密钥
-MODEL_API_KEY = "sk-f6da0c787eff4b0389e4ad03a35a911f"
-#MODEL_NAME = "qwen-plus"
-MODEL_NAME = "deepseek-v3"
-
-# TTS的APPKEY
-APPKEY = "90RJcqjlN4ZqymGd"  # 获取Appkey请前往控制台：https://nls-portal.console.aliyun.com/applist
-'''
-
-######################### 绘智 #########################
-ACCESS_KEY_ID = 'LTAI5tE4tgpGcKWhbZg6C4bh'
-ACCESS_KEY_SECRET = 'oizcTOZ8izbGUouboC00RcmGE8vBQ1'
-BUCKET_NAME = 'hzkc'
-ENDPOINT = 'https://oss-cn-beijing.aliyuncs.com'
-OSS_PREFIX = "https://hzkc.oss-cn-beijing.aliyuncs.com/"
-REGION_ID = 'cn-beijing'
-
-# 阿里云中用来调用 deepseek v3 的密钥
-# https://bailian.console.aliyun.com/?spm=a2c4g.11186623.0.0.77b17980FcMVYv&apiKey=1#/api-key
-MODEL_API_KEY = "sk-01d13a39e09844038322108ecdbd1bbc"
-##MODEL_NAME = "qwen-plus"
-MODEL_NAME = "deepseek-v3"
-
-# TTS的APPKEY
-# 获取Appkey请前往控制台：https://nls-portal.console.aliyun.com/applist
-APPKEY = "CBeQJK7KbjpQXrFZ"
-# ----------------------------------------------------------------------
-
-# 魔搭社区黄海的令牌
-# https://modelscope.cn/my/myaccesstoken
-# 18686619970
-MODELSCOPE_ACCESS_TOKEN = '9b486dc5-28a3-4793-bb2c-0123c72a214f'
diff --git a/dsRag/Milvus/Config/__init__.py b/dsRag/Milvus/Config/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/dsRag/Milvus/Config/__pycache__/MulvusConfig.cpython-310.pyc b/dsRag/Milvus/Config/__pycache__/MulvusConfig.cpython-310.pyc
deleted file mode 100644
index 2fe8f020347dd131a2c00699556cda21c5121179..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1244
zcmah}OH<=U5SDELeq-1N?6S*cw<^WK#**b1wME62W<hIP5|RjP7gZ`tt;OPDQI<_D
zI^_2x|02g!euA$#@fUK+NCrYK$&A$M@0;$gd!}mS7YbR1j{Tf4D&!dE&j>sp2?~Cs
zZ}2lU$N+;0NMI6@n1U3tz~T}t;W8}a3anrn(wKn^W+96?$YCDxSbzc+p@^%niX|xF
z8m!?utm6xKkzw#9yu?@V3SYx(+<*<-giU+{Z}2U=#Vy#vckmA1!+Xpb%+7Y0=c<+H
z5h{GOIbY)1^;(t62bSYsUAfNG^T+o*Z8Vgmy<O8CJMMUDb>#lgw#1P)b_17O+b*Iv
zKL4NP%JloxEB(MQ_rFuUdyGVLPt`fW`$MKQWf|ppS6tQOe`1(9JMsM~l%&8zci88I
zCSPyW8f{n_dKTKS`mi8O>eI$ua|TO?248P@zx~26u-P{|a(zmK>G{op(>od2aNZCF
zdj#9Q7doa2EibeWj{TYKi`A;`Tpy6uZTE-+b`)MZ;fK+5dK2vJ?)pJccE)Af^)Bd!
zE5j@AZZ>v;isN60JC8w8O65Nycf;&I8sUfFvRvhms|{;yx7uzALbcYa@jO>;xenUM
z*|rnr&~<MD*S##?)}SPI-J>tPX3xI3IXazuhVWzC7FrE->Sew)td)gkyH>Vs-l4*L
z&1v#Oo)f<9Y|mE)hIObKX6$IHZqC;!BdYyA5lvZDETuCbF*oR(QeIIOya5FoH&7+g
zx3rFV2*oGZmj|*r&r>YP1ELsI1u_&Vnyz*UWOX9Ri=vNyR2R|<Ug|<|;b|SiI8k*8
zvV*V2Q9o|;(T_78_+x|Uw0s=%lv7w>sT*$qieFAl%OIjoOshw}LZ;I{P<7cn9Kcpb
z6p3M2rrINlMNTzYC)Pk#j!i;0`LIZHELnoJXK<kgx$d#pqpHz4L7FI%rpk&5S(Qp^
zI{7T0LPjSC(NR)?!s5g_njE*0UBEbZxua=OYa20Vh^j`c=dJz9O!D+5#OAN2w0DNV
zi9fldA8q1a(0fTeeRzI0@UCuW!I|ifzj+kRBD4UNo4a}X)3uMYD|bKo=LGxIut_>o
c|C$LlnyJ_>yd;}Qrr7l-Cc&~ai%l>84fF6-ga7~l

diff --git a/dsRag/Milvus/Config/__pycache__/__init__.cpython-310.pyc b/dsRag/Milvus/Config/__pycache__/__init__.cpython-310.pyc
deleted file mode 100644
index 57bab8efd292b3bf45f6d6b7c4d3086dfeee3966..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 144
zcmd1j<>g`k0vlG73=sVoL?8o3AjbiSi&=m~3PUi1CZpd<h9ZzKg7{_ZVil889G+j4
z4Wt5!^0QKtOMtAP#Pk^7%$%~);uz=rytK^pnE3e2yv&mLc)fzkTO2mI`6;D2sdga4
KikW}}3j+Y%%palv

diff --git a/dsRag/Milvus/X1_create_collection.py b/dsRag/Milvus/X1_create_collection.py
index 6d7372b9..c598c53b 100644
--- a/dsRag/Milvus/X1_create_collection.py
+++ b/dsRag/Milvus/X1_create_collection.py
@@ -4,7 +4,7 @@ pip install pymilvus gensim
 
 from pymilvus import FieldSchema, DataType, utility
 
-from Milvus.Config.MulvusConfig import MS_HOST, MS_PORT, MS_MAX_CONNECTIONS, MS_COLLECTION_NAME, MS_DIMENSION
+from Config.Config import MS_HOST, MS_PORT, MS_MAX_CONNECTIONS, MS_COLLECTION_NAME, MS_DIMENSION
 from Milvus.Utils.MilvusCollectionManager import MilvusCollectionManager
 from Milvus.Utils.MilvusConnectionPool import *
 
diff --git a/dsRag/Milvus/X2_create_index.py b/dsRag/Milvus/X2_create_index.py
index 745917de..21172216 100644
--- a/dsRag/Milvus/X2_create_index.py
+++ b/dsRag/Milvus/X2_create_index.py
@@ -1,6 +1,6 @@
 from Milvus.Utils.MilvusCollectionManager import MilvusCollectionManager
 from Milvus.Utils.MilvusConnectionPool import *
-from Milvus.Config.MulvusConfig import *
+from Config.Config import *
 
 # 1. 使用连接池管理 Milvus 连接
 milvus_pool = MilvusConnectionPool(host=MS_HOST, port=MS_PORT, max_connections=MS_MAX_CONNECTIONS)
diff --git a/dsRag/Milvus/X4_InsertMathData.py b/dsRag/Milvus/X4_InsertMathData.py
index 63033729..230527c5 100644
--- a/dsRag/Milvus/X4_InsertMathData.py
+++ b/dsRag/Milvus/X4_InsertMathData.py
@@ -1,4 +1,4 @@
-from Milvus.Config.MulvusConfig import *
+from Config.Config import *
 from Milvus.Utils.MilvusCollectionManager import MilvusCollectionManager
 from Milvus.Utils.MilvusConnectionPool import *
 from gensim.models import KeyedVectors
diff --git a/dsRag/Milvus/X5_select_all_data.py b/dsRag/Milvus/X5_select_all_data.py
index afaa5c39..a4b602a6 100644
--- a/dsRag/Milvus/X5_select_all_data.py
+++ b/dsRag/Milvus/X5_select_all_data.py
@@ -1,6 +1,6 @@
 from Milvus.Utils.MilvusCollectionManager import MilvusCollectionManager
 from Milvus.Utils.MilvusConnectionPool import *
-from Milvus.Config.MulvusConfig import *
+from Config.Config import *
 
 # 1. 使用连接池管理 Milvus 连接
 milvus_pool = MilvusConnectionPool(host=MS_HOST, port=MS_PORT, max_connections=MS_MAX_CONNECTIONS)
diff --git a/dsRag/Milvus/X6_search_near_data.py b/dsRag/Milvus/X6_search_near_data.py
index 37ec1c4a..0f10f2bb 100644
--- a/dsRag/Milvus/X6_search_near_data.py
+++ b/dsRag/Milvus/X6_search_near_data.py
@@ -2,7 +2,7 @@ import time
 import jieba  # 导入 jieba 分词库
 from Milvus.Utils.MilvusCollectionManager import MilvusCollectionManager
 from Milvus.Utils.MilvusConnectionPool import *
-from Milvus.Config.MulvusConfig import *
+from Config.Config import *
 from gensim.models import KeyedVectors
 
 # 1. 加载预训练的 Word2Vec 模型
diff --git a/dsRag/Util/__pycache__/SplitDocxUtil.cpython-310.pyc b/dsRag/Util/__pycache__/SplitDocxUtil.cpython-310.pyc
index 90e11e184e4b38782c92321ca1a5324e4a4e0907..9836806cb859d22219a444a378e839496cbf5e9c 100644
GIT binary patch
delta 171
zcmdnQbB&EJpO=@50SF4;#$;47PUH(#X9n^dfVfx!NTf1EF{Us?F{Lu6Fs3lIFf=np
zv7|5uGib6*oc5kEYH}One@6DnZA=c#ewwV4`&f-lg@C$>SWpRe5SIx^fW(X0fCL8v
o6C)oZSWJ_th->nHRtag4s#_d3x%nxjIjMGxAf+Jn91KFt03$FS6aWAK

delta 905
zcmZ`%-%Aux6u$S)kDVP|6%tlO=m!xEgay%?iIDV`FG~c2vJ5kmE{?O~y<;uQ4Evy#
zfl{(bkOXTFJ%xnSgQWD@U(mxmH>*DRC)7FPS`u{OeD|C)_xsMd=gtpxx4WlWDCh*%
z&o@)ElCsfLx+6n04koSvxWuFmF_|kl)M3kHiJCI_IY)MsWeSnvs3l@(8>=TYY1Zg3
zsx@nDym9;;$TkBwTX}HM?tzKV01;^s6y0X9OSs1@lO+*rVV+JvxmcPZu^h5UT7r1`
z?i7oaSdCP1d0{Am;&U>;6-nUb2FM_ZXcuv`71kIeK6UbOE>c1XsrY%0@QKr-ML6nc
z5nW-Ob6O;~WE3fqD7OXeL~4fG7I~*UhE^znax&ahU%U^!>z6vK{d(`{+t%UR<@U~(
zqgMy%>a+C4Zu-1&(BAxXvcHzD?58_>>H6l)^yON6{r%DQ+Tq6!f7o?a(76P9b*Ae!
z1?Ozx<nSR%U}6|x2Ie)b$26iXvQ0QU-8a|*D-n(-4Vow-<dwi+Tx~!ip+WZH6g0?i
zoPQBap!_hY-zWuMC7h_*wTEHF8xa_lL$?-=jCxhu^28W86%pFi`CyD=f5!-u9Df-@
zNpjo`Jj-^WGE$Sg>o3l`+zK0RB6+T#s8$fTzGLLM0t~a;uKFln7L~ed_WD&mZ+YN4
zSy8ixTTjb@#jP1`1+yYi?b$_tP9(I#a~VD0?vrvy!|e7^sT2Kk(+7$E_cFb}75xDH
zYCn@%AC)PiSETFoDn#{x|IJ|1pd49-+Wg9HKe_-ezlea-J_p%k&)!SmWHiF4PFcQ>
Va?HbnbRh-(bG%GOYmQ1ozX1>`;+p^f