From a1539e3815d0516c669b4a0fe56a4e4cdb695d98 Mon Sep 17 00:00:00 2001
From: zhouhuang <assouan@sohu.com>
Date: Mon, 16 Dec 2024 12:11:04 +0800
Subject: [PATCH] update

---
 das-dn/cmg/ry.cpp          | 6 +++---
 das-dn/minio/ftp2minio.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/das-dn/cmg/ry.cpp b/das-dn/cmg/ry.cpp
index b2b52f45..a5569823 100644
--- a/das-dn/cmg/ry.cpp
+++ b/das-dn/cmg/ry.cpp
@@ -1317,11 +1317,11 @@ BOOLEAN CRYDevice::processRyFTP2MinioParam(const Json::Value jsonRoot, int pid)
     if (jsonRoot["bucket"].isString()) {
         snprintf(config_config.processes[pid].option.ftp2minio.minio.bucket, sizeof(config_config.processes[pid].option.ftp2minio.minio.bucket), "%s", jsonRoot["bucket"].asCString());
     } else {
-        snprintf(config_config.processes[pid].option.ftp2minio.minio.bucket, sizeof(config_config.processes[pid].option.ftp2minio.minio.bucket), "%s", "test");
+        snprintf(config_config.processes[pid].option.ftp2minio.minio.bucket, sizeof(config_config.processes[pid].option.ftp2minio.minio.bucket), "%s", "das");
     }
     //桶中的绝对路径
-    if (jsonRoot["object"].isString()) {
-        snprintf(config_config.processes[pid].option.ftp2minio.minio.object, sizeof(config_config.processes[pid].option.ftp2minio.minio.object), "%s", jsonRoot["object"].asCString());
+    if (jsonRoot["deviceCode"].isString()) {
+        snprintf(config_config.processes[pid].option.ftp2minio.minio.object, sizeof(config_config.processes[pid].option.ftp2minio.minio.object), "%s", jsonRoot["deviceCode"].asCString());
     } else {
         snprintf(config_config.processes[pid].option.ftp2minio.minio.object, sizeof(config_config.processes[pid].option.ftp2minio.minio.object), "%s", "/A-001/Alarm/");
     }
diff --git a/das-dn/minio/ftp2minio.cpp b/das-dn/minio/ftp2minio.cpp
index 6b330300..38d55aa9 100644
--- a/das-dn/minio/ftp2minio.cpp
+++ b/das-dn/minio/ftp2minio.cpp
@@ -415,7 +415,7 @@ BOOLEAN CFtp2MinioProcess::push2minio(std::string parentDir, std::string pathNam
     }
 
     //return TRUE;
-    args.object = std::string(GetCurProcessName()) + std::string("/") + parentDir + std::string("/") + date_string + std::string("/") + pathName;
+    args.object = std::string(m_nOptions.minio.object) + std::string("/") + parentDir + std::string("/") + date_string + std::string("/") + pathName;
 
     //本地文件系统中的绝对路径
     args.filename = m_localPath + pathName;