diff --git a/dsRag/Config/Config.py b/dsRag/Config/Config.py index 8c01224e..ec1827fe 100644 --- a/dsRag/Config/Config.py +++ b/dsRag/Config/Config.py @@ -7,8 +7,8 @@ MYSQL_DB_NAME = "base_db" # Elasticsearch配置 ES_CONFIG = { - "hosts": "https://10.10.14.206:9200", - #"hosts": "https://127.0.0.1:9200", + #"hosts": "https://10.10.14.206:9200", + "hosts": "https://127.0.0.1:9200", "basic_auth": ("elastic", "jv9h8uwRrRxmDi1dq6u8"), "verify_certs": False, "ssl_show_warn": False, diff --git a/dsRag/Config/__pycache__/Config.cpython-310.pyc b/dsRag/Config/__pycache__/Config.cpython-310.pyc index 26582166..27589a57 100644 Binary files a/dsRag/Config/__pycache__/Config.cpython-310.pyc and b/dsRag/Config/__pycache__/Config.cpython-310.pyc differ diff --git a/dsRag/Config/__pycache__/__init__.cpython-310.pyc b/dsRag/Config/__pycache__/__init__.cpython-310.pyc index 2278514c..b3f99ca7 100644 Binary files a/dsRag/Config/__pycache__/__init__.cpython-310.pyc and b/dsRag/Config/__pycache__/__init__.cpython-310.pyc differ diff --git a/dsRag/ElasticSearch/Utils/__pycache__/ElasticsearchConnectionPool.cpython-310.pyc b/dsRag/ElasticSearch/Utils/__pycache__/ElasticsearchConnectionPool.cpython-310.pyc index 6b078800..2c77d6cb 100644 Binary files a/dsRag/ElasticSearch/Utils/__pycache__/ElasticsearchConnectionPool.cpython-310.pyc and b/dsRag/ElasticSearch/Utils/__pycache__/ElasticsearchConnectionPool.cpython-310.pyc differ diff --git a/dsRag/ElasticSearch/__pycache__/__init__.cpython-310.pyc b/dsRag/ElasticSearch/__pycache__/__init__.cpython-310.pyc index f7c5e0e6..94ae6ce2 100644 Binary files a/dsRag/ElasticSearch/__pycache__/__init__.cpython-310.pyc and b/dsRag/ElasticSearch/__pycache__/__init__.cpython-310.pyc differ diff --git a/dsRag/Test/TestPandoc.py b/dsRag/Test/TestPandoc.py index ae9fd7c0..5b213b66 100644 --- a/dsRag/Test/TestPandoc.py +++ b/dsRag/Test/TestPandoc.py @@ -3,7 +3,7 @@ from Util.DocxUtil import * if __name__ == '__main__': # docx文件路径 #docx_file = '/static/Txt/Backup/化学方程式_CHEMISTRY_1.docx' - docx_file = '../static/Backup/化学方程式_CHEMISTRY_1.docx' + docx_file = '../static/Txt/化学方程式_CHEMISTRY_1.docx' # 整合最终的拼接完的文本 content = get_docx_content_by_pandoc(docx_file) diff --git a/dsRag/Util/DocxUtil.py b/dsRag/Util/DocxUtil.py index 6de248eb..4e3dd4d2 100644 --- a/dsRag/Util/DocxUtil.py +++ b/dsRag/Util/DocxUtil.py @@ -34,8 +34,8 @@ def get_docx_content_by_pandoc(docx_file): # 调用pandoc将docx文件转换成markdown subprocess.run(['pandoc', docx_file, '-f', 'docx', '-t', 'markdown', '-o', temp_markdown]) # 打印 temp_markdown 文件 - with open(temp_markdown, 'r', encoding='utf-8') as f: - print(f.read()) + # with open(temp_markdown, 'r', encoding='utf-8') as f: + # print(f.read()) # 读取然后修改内容，输出到新的文件 wmf_idx = 0 # wmf索引 img_idx = 0 # 图片索引 diff --git a/dsRag/Util/__pycache__/DocxUtil.cpython-310.pyc b/dsRag/Util/__pycache__/DocxUtil.cpython-310.pyc index 4d17c771..c3bd9382 100644 Binary files a/dsRag/Util/__pycache__/DocxUtil.cpython-310.pyc and b/dsRag/Util/__pycache__/DocxUtil.cpython-310.pyc differ diff --git a/dsRag/Util/__pycache__/EsSearchUtil.cpython-310.pyc b/dsRag/Util/__pycache__/EsSearchUtil.cpython-310.pyc index 51fbd0ac..7cdb86aa 100644 Binary files a/dsRag/Util/__pycache__/EsSearchUtil.cpython-310.pyc and b/dsRag/Util/__pycache__/EsSearchUtil.cpython-310.pyc differ diff --git a/dsRag/mtef-go-3/main.go b/dsRag/mtef-go-3/main.go index a51d3fd3..7441186b 100644 --- a/dsRag/mtef-go-3/main.go +++ b/dsRag/mtef-go-3/main.go @@ -5,7 +5,6 @@ import ( "github.com/urfave/cli" "github.com/zhexiao/mtef-go/docx" "github.com/zhexiao/mtef-go/eqn" - "log" "os" "time" ) @@ -78,6 +77,19 @@ func main() { err := app.Run(os.Args) if err != nil { - log.Panic(err) + /** + Error: CreateFile \tmp\1751286455911963600\word\embeddings: The system cannot find the file specified. + 2025/06/30 20:27:35 CreateFile \tmp\1751286455911963600\word\embeddings: The system cannot find the file specified. + panic: CreateFile \tmp\1751286455911963600\word\embeddings: The system cannot find the file specified. + + goroutine 1 [running]: + log.Panic({0xc0000e3df8?, 0xc000076068?, 0xc0000e3dc8?}) + C:/Program Files/Go/src/log/log.go:432 +0x5a + main.main() + D:/dsWork/dsProject/dsRag/mtef-go-3/main.go:96 +0x4b2 + */ + // 如果出现这面这样的错误，可以认为是需要解析的文件并不包含ole对象，提示即可，不用抛出错误 + // 包含这样的内容就输出没有找到：The system cannot find the file specified. + fmt.Println("No embedded objects found.") } } diff --git a/dsRag/mtef-go-3/mtef-go.exe b/dsRag/mtef-go-3/mtef-go.exe index 289bc36e..f1c899b8 100644 Binary files a/dsRag/mtef-go-3/mtef-go.exe and b/dsRag/mtef-go-3/mtef-go.exe differ diff --git a/dsRag/mtef-go-3/使用说明.txt b/dsRag/mtef-go-3/使用说明.txt index 125b5d6f..53b2f683 100644 --- a/dsRag/mtef-go-3/使用说明.txt +++ b/dsRag/mtef-go-3/使用说明.txt @@ -6,3 +6,7 @@ go build -o mtef-go.exe # 处理.docx文件并保存结果 ./mtef-go.exe -w "D:/dsWork/dsProject/dsRag/static/Txt/化学方程式_CHEMISTRY_1.docx" -o "d:/output.txt" + +./mtef-go.exe -w "D:/dsWork/dsProject/dsRag/static/Txt/高中文言文_CHINESE_1.docx" -o "d:/output.txt" + + diff --git a/dsRag/static/Backup/化学方程式_CHEMISTRY_1.docx b/dsRag/static/Txt/化学方程式_CHEMISTRY_1.docx similarity index 100% rename from dsRag/static/Backup/化学方程式_CHEMISTRY_1.docx rename to dsRag/static/Txt/化学方程式_CHEMISTRY_1.docx diff --git a/dsRag/static/Backup/小学数学教学中的若干问题_MATH_1.docx b/dsRag/static/Txt/小学数学教学中的若干问题_MATH_1.docx similarity index 100% rename from dsRag/static/Backup/小学数学教学中的若干问题_MATH_1.docx rename to dsRag/static/Txt/小学数学教学中的若干问题_MATH_1.docx diff --git a/dsRag/static/ai.html b/dsRag/static/ai.html index 6438ce41..6aa219b9 100644 --- a/dsRag/static/ai.html +++ b/dsRag/static/ai.html @@ -220,6 +220,7 @@ 帮我写一下 “如何理解点、线、面、体、角”的教学设计
请解释一下“文言虚词”
+
氢气与氧气燃烧的方程式
@@ -244,11 +245,16 @@ 高中文言文 +

知识库文稿下载

- 小学数学 + 小学数学 高中文言文 + 高中化学