From 3dd12d913b5d9c2096e53f9d14475c534b813e6b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 四月 2025 08:06:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/api/common/PublicCloudController.java | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/server/src/main/java/com/doumee/api/common/PublicCloudController.java b/server/src/main/java/com/doumee/api/common/PublicCloudController.java
index bc71f5b..bf5b3e1 100644
--- a/server/src/main/java/com/doumee/api/common/PublicCloudController.java
+++ b/server/src/main/java/com/doumee/api/common/PublicCloudController.java
@@ -4,6 +4,8 @@
import com.alibaba.fastjson.JSONObject;
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.config.annotation.EncryptionReq;
+import com.doumee.config.annotation.EncryptionResp;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
@@ -88,15 +90,7 @@
response.setContentType("text/html;charset=UTF-8");
Map<String, Object> context = new HashMap<>();
try {
- if(ftp == null){
- ftp = new FtpUtil(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_HOST).getCode(),
- Integer.parseInt(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_PORT).getCode()),
- systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_USERNAME).getCode(),
- systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_PWD).getCode());
- }else{
- ftp.connect();
- }
-
+ initUploadTool();
context.put("success", true);
context.put("code", 200);
context.put("errno",0);
@@ -112,7 +106,12 @@
String date = DateUtil.getNowShortDate();
String fName = date + "/" + UUID.randomUUID() + endType;
String fileName = folder + fName;
- boolean r = ftp.uploadInputstreamBatch(is, fileName, Constants.equalsInteger(index ,fileList.length),index);
+ boolean r =false;
+ if(StringUtils.equals(Constants.uploadType.blob,uploadType)){
+ r = azureBlobUtil.uploadFileWithResponse( fileName,is);//涓婁紶
+ }else{
+ r = ftp.uploadInputstreamBatch(is, fileName, Constants.equalsInteger(index ,fileList.length),index);
+ }
if (r) {
JSONObject fileJSON = new JSONObject();
fileJSON.put("url", prefixPath + fileName);
@@ -266,14 +265,7 @@
response.setContentType("text/html;charset=UTF-8");
Map<String, Object> context = new HashMap<>();
try {
- if(ftp == null){
- ftp = new FtpUtil(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_HOST).getCode(),
- Integer.parseInt(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_PORT).getCode()),
- systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_USERNAME).getCode(),
- systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_PWD).getCode());
- }else{
- ftp.connect();
- }
+ initUploadTool();
CommonsMultipartResolver multipartResovler = new CommonsMultipartResolver();
if (multipartResovler.isMultipart(request)) {
@@ -291,7 +283,12 @@
String date = DateUtil.getNowShortDate();
String fName = date+"/"+ UUID.randomUUID()+endType;
String fileName = folder+"/"+fName;
- boolean r = ftp.uploadInputstream(is,fileName);
+ boolean r =false;
+ if(StringUtils.equals(Constants.uploadType.blob,uploadType)){
+ r = azureBlobUtil.uploadFileWithResponse( fileName,is);//涓婁紶
+ }else{
+ r = ftp.uploadInputstream(is,fileName);
+ }
if(r){
context.put("success", true);
context.put("code", 200);
--
Gitblit v1.9.3