blame | history | patch | commit | commitdiff | ignore whitespace
1
zj
2024-06-05 09ab9394bd3614f373082754300c6ef39d60c1e9 
 src/main/java/com/nq/controller/protol/UserController.java


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


package com.nq.controller.protol;






import ch.qos.logback.core.util.FileUtil;


import com.google.common.collect.Maps;


import com.nq.common.ServerResponse;


import com.nq.enums.EStockType;


@@ -10,7 +11,13 @@


import com.nq.service.*;


import com.nq.utils.PropertiesUtil;




import java.io.File;


import java.io.FileOutputStream;


import java.io.IOException;


import java.io.InputStream;


import java.math.BigDecimal;


import java.util.Arrays;


import java.util.Base64;


import java.util.Map;


import javax.servlet.http.HttpServletRequest;


import javax.servlet.http.HttpSession;


@@ -25,6 +32,8 @@


import org.springframework.web.bind.annotation.RequestParam;


import org.springframework.web.bind.annotation.ResponseBody;


import org.springframework.web.multipart.MultipartFile;




import static com.nq.service.impl.SiteNewsServiceImpl.convertBase64ToImage;




@Controller


@RequestMapping({"/user/"})


@@ -241,10 +250,10 @@


    //图片上传


    @RequestMapping({"upload.do"})


    @ResponseBody


    public ServerResponse upload(HttpSession session, @RequestParam(value = "upload_file", required = false) MultipartFile file, HttpServletRequest request) {


        String path = request.getSession().getServletContext().getRealPath("upload");


    public ServerResponse upload(HttpSession session, @RequestParam(value = "upload_file", required = false) MultipartFile file, HttpServletRequest request) throws IOException {


        String path = PropertiesUtil.getProperty("ftp.address")+file.getOriginalFilename();




        ServerResponse serverResponse = this.iFileUploadService.upload(file, path);


        ServerResponse serverResponse = iFileUploadService.upload(file, path);


        if (serverResponse.isSuccess()) {


            String targetFileName = serverResponse.getData().toString();


            String url = PropertiesUtil.getProperty("ftp.server.http.prefix") + targetFileName;


@@ -256,7 +265,11 @@




            return ServerResponse.createBySuccess(fileMap);


        }


        return serverResponse;


//        convertBase64ToImage(file.getBytes().toString(),path);


        Map fileMap = Maps.newHashMap();


       fileMap.put("uri", file.getOriginalFilename());


       fileMap.put("url", PropertiesUtil.getProperty("ftp.server.http.prefix")+file.getOriginalFilename());


       return ServerResponse.createBySuccess(fileMap);


    }