From 0ad75f90e6464b95bef06c88227f521c5c03d41d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 06 五月 2023 16:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java
index 8c9c6c5..959b34b 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java
@@ -22,6 +22,7 @@
import com.stylefeng.guns.core.util.ObsUploadUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.controller.util.UUIDUtil;
import com.stylefeng.guns.modular.system.dao.UserMapper;
import com.stylefeng.guns.modular.system.factory.UserFactory;
import com.stylefeng.guns.modular.system.model.TCompany;
@@ -31,6 +32,7 @@
import com.stylefeng.guns.modular.system.service.IUserService;
import com.stylefeng.guns.modular.system.transfer.UserDto;
import com.stylefeng.guns.modular.system.util.OssUploadUtil;
+import com.stylefeng.guns.modular.system.util.huawei.OBSUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -42,6 +44,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.io.File;
+import java.io.InputStream;
import java.util.*;
/**
@@ -439,7 +442,11 @@
String pictureName = UUID.randomUUID().toString() + "." + ToolUtil.getFileSuffix(file.getOriginalFilename());
try {
String fileSavePath = gunsProperties.getFileUploadPath()+"apk\\";
- String s = OssUploadUtil.ossUpload(request, file);
+ InputStream inputStream = file.getInputStream();
+ String name1 = file.getOriginalFilename();
+ name1 = UUIDUtil.getRandomCode() + name1.substring(name1.lastIndexOf("."));
+ String s = OBSUtil.putObjectToBucket(inputStream, name1);
+// String s = OssUploadUtil.ossUpload(request, file);
// file.transferTo(new File(fileSavePath + pictureName));
return s;
} catch (Exception e) {
--
Gitblit v1.7.1