From c577687727897cca1e6ecf6838240bd7fa3fa7c0 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Thu, 21 Aug 2025 08:56:06 +0800
Subject: [PATCH] 'commit'

---
 dsLightRag/JiMeng/T1_JmTxt2Img.py            | 16 ++++++++++++++++
 dsLightRag/Util/GGB/Backup/GGB_3_QVQ.py      |  4 ++--
 dsLightRag/Util/GGB/Backup/GGB_3_QVQ_Test.py |  4 ++--
 dsLightRag/Util/GGB/GGB_3_GLM.py             |  4 ++--
 dsLightRag/Util/ObsUtil.py                   |  4 ++--
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/dsLightRag/JiMeng/T1_JmTxt2Img.py b/dsLightRag/JiMeng/T1_JmTxt2Img.py
index ad4aee77..a6c337ce 100644
--- a/dsLightRag/JiMeng/T1_JmTxt2Img.py
+++ b/dsLightRag/JiMeng/T1_JmTxt2Img.py
@@ -2,8 +2,10 @@ import base64
 import json
 import os
 
+from Config.Config import OBS_SERVER, OBS_PREFIX
 from JiMeng.Kit.JmCommon import JmCommon
 from JiMeng.Kit.JmErrorCode import JmErrorCode
+from Util.ObsUtil import ObsUploader
 
 
 class JmTxt2Img:
@@ -47,6 +49,20 @@ class JmTxt2Img:
             with open(save_img_path, 'wb') as f:
                 f.write(bytes_data)
             print(f"文件保存成功！文件位置: {save_img_path}")
+
+            # 创建上传器实例
+            uploader = ObsUploader()
+            # 上传参数
+            object_key = OBS_PREFIX + "/" + file_path
+            # 执行上传
+            success, result = uploader.upload_file(object_key, file_path)
+            # 处理结果
+            if success:
+                logger.info(f'{file_path}上传成功!')
+                # 获取上传文件的 URL
+                file_url = f"https://{OBS_BUCKET}.{OBS_SERVER}/{object_key}"
+                img_url_list.append(file_url)
+
         except Exception as e:
             print(f"保存图片失败: {str(e)}")
             raise Exception(f"保存图片失败: {str(e)}")
diff --git a/dsLightRag/Util/GGB/Backup/GGB_3_QVQ.py b/dsLightRag/Util/GGB/Backup/GGB_3_QVQ.py
index fad5d44c..59c0a5ed 100644
--- a/dsLightRag/Util/GGB/Backup/GGB_3_QVQ.py
+++ b/dsLightRag/Util/GGB/Backup/GGB_3_QVQ.py
@@ -14,11 +14,11 @@ def batch_glm(output_dir, img_list):
     img_url_list = []
     for file_path in img_list:
         # 创建上传器实例
-        uploader = ObsUploader(OBS_AK, OBS_SK, "https://" + OBS_SERVER)
+        uploader = ObsUploader()
         # 上传参数
         object_key = OBS_PREFIX + "/" + file_path
         # 执行上传
-        success, result = uploader.upload_file(OBS_BUCKET, object_key, file_path)
+        success, result = uploader.upload_file(object_key, file_path)
         # 处理结果
         if success:
             logger.info(f'{file_path}上传成功!')
diff --git a/dsLightRag/Util/GGB/Backup/GGB_3_QVQ_Test.py b/dsLightRag/Util/GGB/Backup/GGB_3_QVQ_Test.py
index 69efbad2..5343423f 100644
--- a/dsLightRag/Util/GGB/Backup/GGB_3_QVQ_Test.py
+++ b/dsLightRag/Util/GGB/Backup/GGB_3_QVQ_Test.py
@@ -38,11 +38,11 @@ def batch_qvq(output_dir, img_list):
     img_url_list = []
     for file_path in img_list:
         # 创建上传器实例
-        uploader = ObsUploader(OBS_AK, OBS_SK, "https://" + OBS_SERVER)
+        uploader = ObsUploader()
         # 上传参数
         object_key = OBS_PREFIX + "/" + file_path
         # 执行上传
-        success, result = uploader.upload_file(OBS_BUCKET, object_key, file_path)
+        success, result = uploader.upload_file(object_key, file_path)
         # 处理结果
         if success:
             logger.info(f'{file_path}上传成功!')
diff --git a/dsLightRag/Util/GGB/GGB_3_GLM.py b/dsLightRag/Util/GGB/GGB_3_GLM.py
index 3825d1ea..6d77fa74 100644
--- a/dsLightRag/Util/GGB/GGB_3_GLM.py
+++ b/dsLightRag/Util/GGB/GGB_3_GLM.py
@@ -33,11 +33,11 @@ def batch_glm(output_dir, img_list):
     img_url_list = []
     for file_path in img_list:
         # 创建上传器实例
-        uploader = ObsUploader(OBS_AK, OBS_SK, "https://" + OBS_SERVER)
+        uploader = ObsUploader()
         # 上传参数
         object_key = OBS_PREFIX + "/" + file_path
         # 执行上传
-        success, result = uploader.upload_file(OBS_BUCKET, object_key, file_path)
+        success, result = uploader.upload_file(object_key, file_path)
         # 处理结果
         if success:
             logger.info(f'{file_path}上传成功!')
diff --git a/dsLightRag/Util/ObsUtil.py b/dsLightRag/Util/ObsUtil.py
index 9c5cb9b4..731996ae 100644
--- a/dsLightRag/Util/ObsUtil.py
+++ b/dsLightRag/Util/ObsUtil.py
@@ -12,7 +12,7 @@ logger = logging.getLogger(__name__)
 
 
 class ObsUploader:
-    def __init__(self, access_key_id, secret_access_key, server):
+    def __init__(self, access_key_id=OBS_AK, secret_access_key=OBS_SK, server="https://" + OBS_SERVER):
         """
         初始化OBS客户端
         :param access_key_id: 访问密钥ID
@@ -25,7 +25,7 @@ class ObsUploader:
             server=server
         )
 
-    def upload_file(self, bucket_name, object_key, file_path, metadata=None, headers=None):
+    def upload_file(self, object_key, file_path, bucket_name=OBS_BUCKET, metadata=None, headers=None):
         """
         上传文件到OBS
         :param bucket_name: 桶名称