Merge remote-tracking branch 'origin/div' into div

admin

2020-01-03 ecb361733a4f90ad1672c422577292a18c0fd2bb

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

@@ -10,8 +10,6 @@


import javax.annotation.Resource;



import net.sf.json.JSONObject;



import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Controller;

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

@@ -24,23 +22,23 @@
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.order.OrderProcessService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.FilePathEnum;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

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



import net.sf.json.JSONObject;



@Controller

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

public class UploadController {



   @Resource

   private HongBaoService hongBaoService;



   @Resource

   private OrderService orderService;

@@ -76,7 +74,7 @@
         String contentType = file.getContentType();

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

         String uploadFilePath = COSManager.getInstance()

               .uploadFile(inputStream, UUID.randomUUID().toString().replace("-", "") + "." + type).getUrl();

               .uploadFile(inputStream, FilePathEnum.section.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type).getUrl();

         out.print(JsonUtil.loadTrueResult(uploadFilePath));

      } catch (IOException e) {

         e.printStackTrace();

@@ -99,7 +97,7 @@
         String contentType = file.getContentType();

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

         String uploadFilePath = COSManager.getInstance()

               .uploadFile(inputStream, UUID.randomUUID().toString().replace("-", "") + "." + type + ".apk")

               .uploadFile(inputStream, FilePathEnum.apk.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type + ".apk")

               .getUrl();

         out.print(JsonUtil.loadTrueResult(uploadFilePath));

      } catch (Exception e) {

@@ -117,7 +115,7 @@
         String contentType = file.getContentType();

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

         String uploadFilePath = COSManager.getInstance()

               .uploadFile(inputStream, "section/" + date + "/" + timeMillis + "." + type).getUrl();

               .uploadFile(inputStream, FilePathEnum.section.getPath() + timeMillis + "." + type).getUrl();

         JSONObject data = new JSONObject();

         data.put("original", file.getOriginalFilename());

         data.put("name", file.getOriginalFilename());

@@ -164,7 +162,7 @@
                  }

               }



               CMQManager.getInstance().addTaoBaoOrderMsg(key, orders);

               CMQManager.getInstance().addTaoBaoOrderMsg(key);

               try {

                  // 6小时内不再处理

                  if (Constant.IS_OUTNET) {

@@ -277,7 +275,7 @@
         String contentType = file.getContentType();

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

         // 上传文件相对位置

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

         String fileUrl=FilePathEnum.section.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type;

         

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

         

@@ -316,7 +314,7 @@
         String type = contentType.substring(contentType.indexOf("/") + 1);

         

         // 上传文件相对位置

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

         String fileUrl= FilePathEnum.apk.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type + ".apk";

         

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