Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-18 53562814add61acfdc02d6b25dae6324f6fd5f92

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java

@@ -9,8 +9,8 @@
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.TPubWithdrawal;
import com.stylefeng.guns.modular.system.util.OBSUploadUtil;
import com.stylefeng.guns.modular.system.util.OssUploadUtil;
import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@@ -43,12 +43,6 @@

    @Autowired
    private ITVersionManagementService tVersionManagementService;

    @Autowired
    private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;

    @Value("${pushMinistryOfTransport}")
    private boolean pushMinistryOfTransport;

    /**
     * 跳转到版本管理首页
@@ -142,7 +136,7 @@
            MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
            MultipartFile file = (MultipartFile) myfile;

            String pictureName = OssUploadUtil.ossUpload(request, file);
            String pictureName = OBSUploadUtil.inputStreamUpload(file);
            m.put("imgUrl", pictureName);
        }catch (Exception e){
            e.printStackTrace();