Merge branch 'dev-hongbao'

admin

2019-01-05 86e46bc28e78b3a883132816e23dbcca37f9ca3a

 fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java

@@ -12,6 +12,8 @@
import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;



import net.sf.json.JSONObject;



import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Controller;

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

@@ -36,9 +38,6 @@
import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.annotation.RequestNoLogin;

import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;



import freemarker.core.ArithmeticEngine.ConservativeEngine;

import net.sf.json.JSONObject;



@Controller

@RequestMapping("admin/new/api/v1/upload")

@@ -282,17 +281,8 @@
    */

   @RequestNoLogin()

   @RequestMapping(value = "uploadPicture")

   public void uploadPicture(@RequestParam("file") CommonsMultipartFile file, Long uid, HttpServletResponse response,

   public void uploadPicture(@RequestParam("file") CommonsMultipartFile file, HttpServletResponse response,

         PrintWriter out) {



      response.setHeader("Access-Control-Allow-Origin", "*");

      response.setHeader("Access-Control-Allow-Methods", "*");



      AdminUser admin = adminUserService.selectByPrimaryKey(uid);

      if (admin == null) {

         out.print(JsonUtil.loadFalseResult("当前账户验证失败"));

         return;

      }



      if (file == null) {

         out.print(JsonUtil.loadFalseResult("上传文件为空"));

@@ -304,7 +294,7 @@
         String contentType = file.getContentType();

         String type = contentType.substring(contentType.indexOf("/") + 1);

         // 上传文件相对位置

         String fileUrl="/img/admin/" + UUID.randomUUID().toString().replace("-", "") + "." + type;

         String fileUrl="/img/admin/test/" + UUID.randomUUID().toString().replace("-", "") + "." + type;

         

         String uploadPath = COSManager.getInstance().uploadFile(inputStream, fileUrl).getUrl();