Merge remote-tracking branch 'origin/master'

admin

2018-12-05 21f49216736c547d99ec1dd46a24c6f43f852fc5

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

@@ -250,7 +250,7 @@
      List<TaoBaoOrder> orderList = null;

      try {

         orderList = TaoBaoOrderUtil.parseOrder(file.getInputStream());

         out.print(JsonUtil.loadTrueResult("上传文件成功"));

         out.print(JsonUtil.loadTrueResult("上传成功,系统正在处理中..."));

      } catch (IOException e) {

         out.print(JsonUtil.loadFalseResult("上传文件失败"));

         e.printStackTrace();

@@ -304,10 +304,19 @@
         String contentType = file.getContentType();

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

         // 上传文件相对位置

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



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

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



			
         JSONObject data = new JSONObject();

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

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

         data.put("url", uploadPath);

         data.put("size", file.getSize() + "");

         data.put("type", "." + type);

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

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

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



      } catch (IOException e) {

@@ -315,4 +324,54 @@
         e.printStackTrace();

      }

   }

	
   /**

    * 
    * 方法说明: 上传Apk安装包

    * 
    * @param file

    * @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;

      }

		
      if (file == null) {

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

         return;

      }

		
      try {

         InputStream inputStream = file.getInputStream();

         String contentType = file.getContentType();

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

			
         // 上传文件相对位置

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

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

			
         JSONObject data = new JSONObject();

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

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

         data.put("url", uploadFilePath);

         data.put("size", file.getSize() + "");

         data.put("type", "." + type);

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

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

			
      } catch (Exception e) {

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

         e.printStackTrace();

      }

   }

}