Pu Zhibing
7 天以前 258b6a8932bf026b773d9e33a82aa9d4cd745511
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java
@@ -4,7 +4,7 @@
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
import com.stylefeng.guns.core.exception.GunsException;
import com.stylefeng.guns.core.util.ObsUploadUtil;
import com.stylefeng.guns.modular.system.util.ObsUploadUtil;
import com.stylefeng.guns.modular.system.util.OssUploadUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,7 +67,7 @@
            MultipartFile file = (MultipartFile) multipartRequest.getFile("myfile");
            if (file.getSize() != 0) {
                ossUpload = ObsUploadUtil.obsUpload(request, file);
//                ossUpload = ObsUploadUtil.obsUpload(super.getHttpServletRequest(), file);
//                ossUpload = OssUploadUtil.ossUpload(request, file);
                m.put("imgUrl", ossUpload);
            }
        } catch (Exception e) {
@@ -88,7 +88,7 @@
                return null;
            }
            String pictureName = ObsUploadUtil.obsUpload(request, file);
//            String pictureName = ObsUploadUtil.obsUpload(super.getHttpServletRequest(), picture);
//            String pictureName = OssUploadUtil.ossUpload(request, file);
            return pictureName;
        } catch (IOException e1) {
            return null;
@@ -137,6 +137,7 @@
            }
            pictureName = ObsUploadUtil.obsUpload(super.getHttpServletRequest(), picture);
//            pictureName = OssUploadUtil.ossUpload(super.getHttpServletRequest(), picture);
            String result = "{'original': '" + picture.getOriginalFilename() + "', 'state': 'SUCCESS', 'url': '" + pictureName + "'}";
            if (callback == null) {