From 959966244a9237b9c59ce4c8f5edf8493cb9cf1e Mon Sep 17 00:00:00 2001
From: yanglin <yanglin@axzo.cn>
Date: Wed, 19 Mar 2025 11:20:27 +0800
Subject: [PATCH] =?UTF-8?q?REQ-3540:=20=E5=BD=92=E4=B8=80=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/axzo/nanopart/doc/config/DocProps.java |  1 +
 .../doc/wps/wpsedit/WpsEditManager.java       | 29 +++++++++----------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/config/DocProps.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/config/DocProps.java
index 1a7642ed..01566165 100644
--- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/config/DocProps.java
+++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/config/DocProps.java
@@ -26,6 +26,7 @@ public class DocProps {
 	private int indexNodeMaxDepth = 10;
 	private int indexNodeMaxCopyFileSize = 1000;
 	private String ossAppCode = "ent-workspace-doc";
+	private String ossBizScene = "ent-workspace-doc";
 	private int asyncTimeoutSeconds = 10;
 	private String defaultIconDatabase = "https://axzo-obs-public.obs.cn-north-4.myhuaweicloud.com:443/doc/doc/image-30.png";
 	private String defaultIconDir = "https://axzo-obs-public.obs.cn-north-4.myhuaweicloud.com:443/doc/doc/image-30.png";
diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/wps/wpsedit/WpsEditManager.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/wps/wpsedit/WpsEditManager.java
index 52530f96..024217b2 100644
--- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/wps/wpsedit/WpsEditManager.java
+++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/wps/wpsedit/WpsEditManager.java
@@ -1,11 +1,21 @@
 package cn.axzo.nanopart.doc.wps.wpsedit;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.stereotype.Component;
+
+import com.alibaba.excel.util.StringUtils;
+
 import cn.axzo.nanopart.doc.api.wps.request.WpsEditUploadAddressRequest;
 import cn.axzo.nanopart.doc.api.wps.request.WpsEditUploadCompleteRequest;
 import cn.axzo.nanopart.doc.api.wps.request.WpsEditUploadPrepareRequest;
 import cn.axzo.nanopart.doc.api.wps.response.WpsEditUploadAddressResponse;
 import cn.axzo.nanopart.doc.api.wps.response.WpsEditUploadCompleteResponse;
 import cn.axzo.nanopart.doc.api.wps.response.WpsEditUploadPrepareResponse;
+import cn.axzo.nanopart.doc.config.DocProps;
 import cn.axzo.nanopart.doc.dao.IndexNodeDao;
 import cn.axzo.nanopart.doc.dao.TemplateDatabaseDao;
 import cn.axzo.nanopart.doc.entity.IndexNode;
@@ -14,16 +24,8 @@ import cn.axzo.nanopart.doc.file.mq.FileBroadcaster;
 import cn.axzo.nanopart.doc.rpc.DocOssGateway;
 import cn.axzo.oss.http.model.ApiSignUrlUploadRequest;
 import cn.axzo.oss.http.model.ApiSignUrlUploadResponse;
-import com.alibaba.excel.util.StringUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
 
 /**
  * 文档编辑
@@ -43,12 +45,7 @@ public class WpsEditManager {
     private final IndexNodeDao indexNodeDao;
     private final DocOssGateway docOssGateway;
     private final FileBroadcaster fileBroadcaster;
-
-    @Value("${doc.entWorkspaceDocOss.appCode:ent-workspace-doc}")
-    private String entWorkspaceDocOssAppCode;
-
-    @Value("${doc.entWorkspaceDocOss.bizScene:ent-workspace-doc}")
-    private String entWorkspaceDocOssBizScene;
+    private final DocProps docProps;
 
     /**
      * 文档编辑
@@ -78,8 +75,8 @@ public class WpsEditManager {
         }
 
         ApiSignUrlUploadResponse response = docOssGateway.signUrlFetchUpload(ApiSignUrlUploadRequest.builder()
-                .appCode(entWorkspaceDocOssAppCode)
-                .bizScene(entWorkspaceDocOssBizScene)
+                .appCode(docProps.getOssAppCode())
+                .bizScene(docProps.getOssBizScene())
                 .fileName(node.getFullFileName())
                 .fileKey(fileKey)
                 .build());