超省新代驾
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xuhy
2023-05-06 0ad75f90e6464b95bef06c88227f521c5c03d41d 
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java


@@ -6,6 +6,7 @@


import com.stylefeng.guns.core.exception.GunsException;


import com.stylefeng.guns.core.util.ObsUploadUtil;


import com.stylefeng.guns.modular.system.util.OssUploadUtil;


import com.stylefeng.guns.modular.system.util.huawei.OBSUtil;


import org.slf4j.Logger;


import org.slf4j.LoggerFactory;


import org.springframework.beans.factory.annotation.Autowired;


@@ -19,6 +20,7 @@


import javax.servlet.http.HttpServletRequest;


import java.io.File;


import java.io.IOException;


import java.io.InputStream;


import java.util.HashMap;


import java.util.Map;


import java.util.UUID;


@@ -66,7 +68,11 @@


            MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;


            MultipartFile file = (MultipartFile) multipartRequest.getFile("myfile");


            if (file.getSize() != 0) {


                ossUpload = OssUploadUtil.ossUpload(request, file);


                InputStream inputStream = file.getInputStream();


                String name = file.getOriginalFilename();


                name = UUIDUtil.getRandomCode() + name.substring(name.lastIndexOf("."));


                ossUpload = OBSUtil.putObjectToBucket(inputStream, name);


//                ossUpload = OssUploadUtil.ossUpload(request, file);


//                ossUpload = ObsUploadUtil.obsUpload(super.getHttpServletRequest(), file);


                m.put("imgUrl", ossUpload);


            }


@@ -91,7 +97,11 @@


            if(size > 524288000L){//500M限制


                return "请上传500M以内的文件";


            }


            String pictureName = OssUploadUtil.ossUpload(request, file);


            InputStream inputStream = file.getInputStream();


            String name1 = file.getOriginalFilename();


            name1 = UUIDUtil.getRandomCode() + name1.substring(name1.lastIndexOf("."));


            String pictureName = OBSUtil.putObjectToBucket(inputStream, name1);


//            String pictureName = OssUploadUtil.ossUpload(request, file);


//            String pictureName = ObsUploadUtil.obsUpload(super.getHttpServletRequest(), picture);


            return pictureName;


        } catch (IOException e1) {


@@ -147,8 +157,11 @@


            if(!s.equals("jpg") && !s.equals("png") && !s.equals("jpeg")){


                return null;


            }




            pictureName = OssUploadUtil.ossUpload(super.getHttpServletRequest(), picture);


            InputStream inputStream = picture.getInputStream();


            String name1 = picture.getOriginalFilename();


            name1 = UUIDUtil.getRandomCode() + name1.substring(name1.lastIndexOf("."));


            pictureName = OBSUtil.putObjectToBucket(inputStream, name1);


//            pictureName = OssUploadUtil.ossUpload(super.getHttpServletRequest(), picture);




            String result = "{'original': '" + picture.getOriginalFilename() + "', 'state': 'SUCCESS', 'url': '" + pictureName + "'}";


            if (callback == null) {