Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -9,10 +9,6 @@
import java.util.UUID;



import javax.annotation.Resource;

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;

@@ -23,11 +19,9 @@
import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.tencentcloud.COSManager;



import com.yeshi.fanli.entity.common.AdminUser;

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;

@@ -36,15 +30,14 @@
import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

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

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;

@@ -168,7 +161,7 @@
                  }

               }



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

               CMQManager.getInstance().addTaoBaoOrderMsg(key);

               try {

                  // 6小时内不再处理

                  if (Constant.IS_OUTNET) {

@@ -227,19 +220,8 @@
    * @param response

    * @param out

    */

   @RequestNoLogin()

   @RequestMapping(value = "uploadOrderFile")

   public void uploadOrderFile(@RequestParam("file") CommonsMultipartFile file, Long uid, HttpServletRequest request,

         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;

      }

   public void uploadOrderFile(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {



      if (file == null) {

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

@@ -279,10 +261,8 @@
    * @param file

    * @param out

    */

   @RequestNoLogin()

   @RequestMapping(value = "uploadPicture")

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

         PrintWriter out) {

   public void uploadPicture(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {



      if (file == null) {

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

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

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

         // 上传文件相对位置

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

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

         

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

         

@@ -320,17 +300,7 @@
    * @param out

    */

   @RequestMapping(value = "installPackage")

   public void installPackage(@RequestParam("file") CommonsMultipartFile file, Long uid, 
         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;

      }

   public void installPackage(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {

      

      if (file == null) {

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