From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
index b47d7a0..b8d7082 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
@@ -55,6 +55,7 @@
@ResponseBody
public void upload(HttpServletRequest request, HttpServletResponse response, String folder) throws Exception {
// folder = systemDictDataBiz.queryByCode(Constants.FTP,folder).getCode();
+ folder =StringUtils.defaultString(folder).replace("/", "");
String prefixPath = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode();
InputStream is = null;
response.setCharacterEncoding("UTF-8");
@@ -78,8 +79,9 @@
MultipartFile file = multipartRequest.getFile(it.next());
String originname = file.getOriginalFilename();
is = file.getInputStream();
+ String endType = originname.substring(originname.lastIndexOf("."),originname.length());
String date = DateUtil.getNowShortDate();
- String fName = date+"/"+ UUID.randomUUID()+".jpg";
+ String fName = date+"/"+ UUID.randomUUID()+endType;
String fileName = folder+"/"+fName;
boolean r = ftp.uploadInputstream(is,fileName);
if(r){
--
Gitblit v1.9.3