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

admin

2020-02-23 121c5ee5345d366ae4aadf7901af9b0678dbb7a8

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/QrCodeServiceImpl.java

@@ -286,6 +286,39 @@
   

   

   @Override

   public FileUploadResult drawDynamicGoodsPoster(String erCodeUrl, String portrait, String inviteCode, GoodsDetailVO goods) {
      // 二维码流
      InputStream erCodeStream = null;
      try {
         erCodeStream = QRCodeUtil.getInstance(250).encode(erCodeUrl);
      } catch (Exception e1) {
         e1.printStackTrace();
      }
		
      // 头像
      InputStream portraitStream = null; 
      if (!StringUtil.isNullOrEmpty(portrait)) {
         try {
            portraitStream = HttpUtil.getAsInputStream(portrait);
         } catch (Exception e) {
            e.printStackTrace();
         }
      }
      if (portraitStream == null) {
         portraitStream = ImageUtil.class.getClassLoader().getResourceAsStream("image/official_default_head.jpg");
      }
		
      // 画图
      InputStream drawStream = ImageUtil.drawGoodsPoster(erCodeStream, portraitStream,inviteCode, goods);
      // 上传位置
      String uuid = UUID.randomUUID().toString().replace("-", "");
      String upPath = FilePathEnum.shareGoods.getPath() + uuid + "_" + goods.getGoodsId() + "_" + System.currentTimeMillis() + ".png";
      // 上传文件
      return COSManager.getInstance().uploadInputStream(drawStream, upPath);
   }
	
	
   @Override
   public FileUploadResult drawGoodsPoster(String erCodeUrl, String portrait, GoodsDetailVO goods) {

      // 二维码流

      InputStream erCodeStream = null;