From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/web/src/main/java/com/doumee/api/web/PublicController.java | 43 ++++++++++---------------------------------
1 files changed, 10 insertions(+), 33 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/PublicController.java b/server/web/src/main/java/com/doumee/api/web/PublicController.java
index 459aea0..1eef751 100644
--- a/server/web/src/main/java/com/doumee/api/web/PublicController.java
+++ b/server/web/src/main/java/com/doumee/api/web/PublicController.java
@@ -64,40 +64,16 @@
}
+
+ public static FtpUtil ftp = null;
+
@ApiOperation(value = "涓婁紶", notes = "涓婁紶", httpMethod = "POST", position = 6)
@ApiImplicitParams({
- @ApiImplicitParam(name = "folder", value = "鏂囦欢澶�", required = true, paramType = "query", dataType = "String", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "folder", value = "鏂囦欢澶�", required = true, paramType = "query", dataType = "String", dataTypeClass = String.class),
})
@PostMapping(value = "/upload", headers = "content-type=multipart/form-data")
public void uploadMobile(String folder, HttpServletRequest request, HttpServletResponse response) throws Exception {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
- upload(multipartRequest, response, folder + "/",
- systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.BUCKETNAME).getCode(),
- systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.ACCESS_ID).getCode(),
- systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.ACCESS_KEY).getCode(),
- systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode(),
- systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.ENDPOINT).getCode());
- }
-
-
- @ApiOperation(value = "涓婁紶鍥剧墖", notes = "涓婁紶鍥剧墖", httpMethod = "POST", position = 6)
- @ApiImplicitParams({
- @ApiImplicitParam(name = "folder", value = "鏂囦欢澶�", required = true, paramType = "query", dataType = "String", dataTypeClass = String.class),
- })
- @PostMapping(value = "/uploadPicture", headers = "content-type=multipart/form-data")
- public void uploadPicture(String folder, HttpServletRequest request, HttpServletResponse response) throws Exception {
- MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
- Iterator<String> fileNames = multipartRequest.getFileNames();
- Map<String, Object> context = new HashMap<>();
- while (fileNames.hasNext()){
- MultipartFile file = multipartRequest.getFile(fileNames.next());
- String fileName = file.getOriginalFilename();
- String suffix = fileName.substring(fileName.lastIndexOf("."));
- if ( !StringUtils.equalsIgnoreCase(suffix, ".jpg") || !StringUtils.equalsIgnoreCase(suffix, ".png")) {
- context.put("code", 0);
- context.put("message", "瀵逛笉璧凤紝鏂囦欢鏍煎紡涓婁紶鏈夎锛�");
- }
- }
upload(multipartRequest, response, folder + "/",
systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.BUCKETNAME).getCode(),
systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.ACCESS_ID).getCode(),
@@ -107,9 +83,6 @@
}
-
-
- public static FtpUtil ftp = null;
@ApiOperation(value = "涓婁紶鏂囦欢鍒癋TP")
@RequestMapping(method= RequestMethod.POST,value="api/uploadFtp.do",headers = "content-type=multipart/form-data")
@@ -205,7 +178,7 @@
public void upload(HttpServletRequest request, HttpServletResponse response, String folder, String bucketName,
- String access_id, String access_key, String resourcePath, String endpoint) throws Exception {
+ String access_id, String access_key, String resourcePath, String endpoint) throws Exception {
response.setCharacterEncoding("UTF-8");
response.setContentType("text/html;charset=UTF-8");
Map<String, Object> context = new HashMap<>();
@@ -236,6 +209,11 @@
if (StringUtils.equalsIgnoreCase(nfix, ".dll")) {
context.put("code", 4000);
context.put("message", "瀵逛笉璧凤紝鏂囦欢鏍煎紡\".dll\"涓婁紶鏈夎锛�");
+ return;
+ }
+ if (StringUtils.equalsIgnoreCase(nfix, ".so")) {
+ context.put("code", 4000);
+ context.put("message", "瀵逛笉璧凤紝鏂囦欢鏍煎紡\".so\"涓婁紶鏈夎锛�");
return;
}
String nowDate = DateUtil.getNowShortDate();// 褰撳墠鏃堕棿锛堝勾鏈堟棩锛�
@@ -297,6 +275,5 @@
e.printStackTrace();
}
}
-
}
--
Gitblit v1.9.3