From 50353c2ae43cdddb8433358f4ba66bef30c5d628 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 05 十一月 2024 14:00:12 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 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 98722b9..22227be 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
@@ -161,16 +161,12 @@
Map<String, Object> context = new HashMap<>();
try {
if(ftp == null){
- log.error("鍒濆鍖朏tp涓婁紶鏂囦欢鎴愬姛=============寮�濮�========="+DateUtil.getPlusTime2(new Date()));
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());
- log.error("鍒濆鍖朏tp涓婁紶鏂囦欢鎴愬姛=============缁撴潫========="+DateUtil.getPlusTime2(new Date()));
}else{
- log.error("閲嶈繛ftp涓婁紶鏂囦欢鎴愬姛=============寮�濮�========="+DateUtil.getPlusTime2(new Date()));
ftp.connect();
- log.error("閲嶈繛ftp涓婁紶鏂囦欢鎴愬姛=============缁撴潫========="+DateUtil.getPlusTime2(new Date()));
}
CommonsMultipartResolver multipartResovler = new CommonsMultipartResolver();
@@ -181,7 +177,10 @@
MultipartFile file = multipartRequest.getFile(it.next());
String originname = file.getOriginalFilename();
is = file.getInputStream();
- String endType = originname.substring(originname.lastIndexOf("."),originname.length());
+ String endType = ".jpg";
+ if(originname.indexOf(".")>0){
+ endType=originname.substring(originname.lastIndexOf("."),originname.length());
+ }
String date = DateUtil.getNowShortDate();
String fName = date+"/"+ UUID.randomUUID()+endType;
String fileName = folder+"/"+fName;
--
Gitblit v1.9.3