From 18e9c3c8c5c05fb14b13d2a30a69af0165496f33 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 31 十月 2024 17:46:10 +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 | 13 ++++++++-----
1 files changed, 8 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 3d3bc10..98722b9 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
@@ -43,8 +43,6 @@
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/public")
@Slf4j
public class PublicCloudController extends BaseController {
-
-
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -153,6 +151,8 @@
@ResponseBody
public void upload(HttpServletRequest request, HttpServletResponse response, String folder) throws Exception {
// folder = systemDictDataBiz.queryByCode(Constants.FTP,folder).getCode();
+ Date d1 = new Date();
+ log.error("鎬诲緱涓婁紶鏂囦欢鎴愬姛=============寮�濮�========="+DateUtil.getPlusTime2(d1));
folder =StringUtils.defaultString(folder).replace("/", "");
String prefixPath = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode();
InputStream is = null;
@@ -161,12 +161,16 @@
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();
@@ -196,6 +200,8 @@
context.put("data",fileJSON);
context.put("message","璇锋眰鎴愬姛");
writerJson(response, context);
+ Date d2= new Date();
+ log.error("鎬荤殑涓婁紶鏂囦欢鎴愬姛=============缁撴潫========="+DateUtil.getPlusTime2(d2) +"鑰楁椂绉掞細"+( (d2.getTime()-d1.getTime()) /1000));
return;
}
}
@@ -303,9 +309,6 @@
e.printStackTrace();
}
}
-
-
-
public void uploadFileLocal(HttpServletRequest request, String folder, HttpServletResponse response, String rootPath,String dir) throws Exception {
response.setCharacterEncoding("UTF-8");
--
Gitblit v1.9.3