设备消息BUG解决，品牌

admin

2019-06-14 1e92eff67b997263ecefa255c63eb6641c47b57f

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

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



import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;



import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Controller;

@@ -21,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;

@@ -34,18 +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 freemarker.core.ArithmeticEngine.ConservativeEngine;

import net.sf.json.JSONObject;



@Controller

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

public class UploadController {



   @Resource

   private HongBaoService hongBaoService;



   @Resource

   private OrderService orderService;

@@ -228,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("上传文件不能为空"));

@@ -280,19 +261,8 @@
    * @param file

    * @param out

    */

   @RequestNoLogin()

   @RequestMapping(value = "uploadPicture")

   public void uploadPicture(@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 uploadPicture(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {



      if (file == null) {

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

@@ -316,9 +286,6 @@
         data.put("type", "." + type);

         data.put("state", "SUCCESS");

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

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



      } catch (IOException e) {

         out.print(JsonUtil.loadFalseResult("上传图片失败"));

         e.printStackTrace();

@@ -333,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("上传文件为空"));