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

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -49,6 +49,7 @@ import com.gic.haoban.manage.service.pojo.bo.welcome.FriendSettingDetailBO;
 import com.gic.haoban.manage.service.pojo.bo.welcome.WelcomeDetailBO;
 import com.gic.haoban.manage.service.pojo.bo.welcome.WelcomeMediaBO;
 import com.gic.haoban.manage.service.service.*;
+import com.gic.haoban.manage.service.util.CommonUtil;
 import com.gic.haoban.manage.service.util.EmojiFilterUtil;
 import com.gic.member.api.dto.MemberDTO;
 import com.gic.member.api.service.MemberApiService;
@@ -66,7 +67,6 @@ import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Sets;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -76,8 +76,6 @@ import org.redisson.api.RateType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.io.InputStream;
-import java.net.URL;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -448,15 +446,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         }
     }
 
-    private static byte[] getFileByte(String url) {
-        try {
-            InputStream in = new URL(url).openStream();
-            return IOUtils.toByteArray(in);
-        } catch (Exception e) {
-            log.info("【异常】" + e.getMessage(), e);
-        }
-        return null;
-    }
 
     /**
      * 欢迎语新增好友
@@ -553,12 +542,16 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             String sceneStr = "QWHY_" + relationKey + "_" + clerkId;
             //7天失效
             String temporaryQRcodeURL = weixinBaseFunService.getTemporaryQRcodeURL(enterpriseDTO.getAppkey(), sceneStr, 604800);
-            JSONResponse jp = qywxSuiteApiService.uploadMedia(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), getFileByte(temporaryQRcodeURL), sceneStr, QywxMediaTypeEnum.IMAGE.getCode());
-            log.info("欢迎语发送带参数的公众号二维码返回：{}", JSON.toJSONString(jp));
-            if (jp.getErrorCode() == 0) {
-                QywxImageExternalBaseDTO qywxImageExternalBaseDTO = new QywxImageExternalBaseDTO();
-                qywxImageExternalBaseDTO.setMediaId(jp.getResult().toString());
-                attachments.add(qywxImageExternalBaseDTO);
+            log.info("参数的公众号二维码返回：{}",temporaryQRcodeURL);
+            if (StringUtils.isNotBlank(temporaryQRcodeURL)) {
+                String[] arr = temporaryQRcodeURL.split("/");
+                JSONResponse jp = qywxSuiteApiService.uploadMedia(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(temporaryQRcodeURL), arr[arr.length - 1], QywxMediaTypeEnum.IMAGE.getCode());
+                log.info("欢迎语发送带参数的公众号企微二维码返回：{}", JSON.toJSONString(jp));
+                if (jp.getErrorCode() == 0) {
+                    QywxImageExternalBaseDTO qywxImageExternalBaseDTO = new QywxImageExternalBaseDTO();
+                    qywxImageExternalBaseDTO.setMediaId(jp.getResult().toString());
+                    attachments.add(qywxImageExternalBaseDTO);
+                }
             }
         } else if (friendSettingType.equals(FriendSettingTypeEnum.TEXT_AND_MINI_PROGRAM.getCode())) {
             log.info("发送小程序：wxEnterpriseId:{},sendApp:{}", wxEnterpriseId,sendApp);
@@ -585,8 +578,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                 if (mediaType.equals(WelcomeMediaTypeEnum.IMAGE.getCode())) {
                     String mediaUrl = welcomeMediaBO.getMediaUrl();
                     String[] arr = mediaUrl.split("/");
-                    int count = arr.length;
-                    JSONResponse jp = qywxSuiteApiService.uploadMedia(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), getFileByte(mediaUrl), arr[count - 1], QywxExternalMessageTypeEnum.IMAGE.getCode());
+                    JSONResponse jp = qywxSuiteApiService.uploadMedia(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(mediaUrl), arr[arr.length - 1], QywxExternalMessageTypeEnum.IMAGE.getCode());
                     log.info("欢迎语发送图片返回：{}", JSON.toJSONString(jp));
                     if (jp.getErrorCode() == 0) {
                         QywxImageExternalBaseDTO qywxImageExternalBaseDTO = new QywxImageExternalBaseDTO();
@@ -597,8 +589,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                 if (mediaType.equals(WelcomeMediaTypeEnum.VIDEO.getCode())) {
                     String mediaUrl = welcomeMediaBO.getMediaUrl();
                     String[] arr = mediaUrl.split("/");
-                    int count = arr.length;
-                    JSONResponse jp = qywxSuiteApiService.uploadMedia(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), getFileByte(mediaUrl), arr[count - 1], QywxExternalMessageTypeEnum.VIDEO.getCode());
+                    JSONResponse jp = qywxSuiteApiService.uploadMedia(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(mediaUrl), arr[arr.length - 1], QywxExternalMessageTypeEnum.VIDEO.getCode());
                     log.info("欢迎语发送视频返回：{}", JSON.toJSONString(jp));
                     if (jp.getErrorCode() == 0) {
                         QywxVideoExternalBaseDTO qywxVideoExternalBaseDTO = new QywxVideoExternalBaseDTO();
@@ -609,8 +600,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                 if (mediaType.equals(WelcomeMediaTypeEnum.FILE.getCode())) {
                     String mediaUrl = welcomeMediaBO.getMediaUrl();
                     String[] arr = mediaUrl.split("/");
-                    int count = arr.length;
-                    JSONResponse jp = qywxSuiteApiService.uploadMedia(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), getFileByte(mediaUrl), arr[count - 1], QywxExternalMessageTypeEnum.FILE.getCode());
+                    JSONResponse jp = qywxSuiteApiService.uploadMedia(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(mediaUrl), arr[arr.length - 1], QywxExternalMessageTypeEnum.FILE.getCode());
                     log.info("欢迎语发送文件返回：{}", JSON.toJSONString(jp));
                     if (jp.getErrorCode() == 0) {
                         QywxFileExternalBaseDTO qywxFileExternalBaseDTO = new QywxFileExternalBaseDTO();
@@ -621,10 +611,10 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                 if (mediaType.equals(WelcomeMediaTypeEnum.LINK.getCode())) {
                     String mediaTitle = welcomeMediaBO.getMediaTitle();
                     String mediaUrl = welcomeMediaBO.getMediaUrl();
-                    QywxLinkExternalBaseDTO qywxIinkExternalBaseDTO = new QywxLinkExternalBaseDTO();
-                    qywxIinkExternalBaseDTO.setTitle(mediaTitle);
-                    qywxIinkExternalBaseDTO.setUrl(mediaUrl);
-                    attachments.add(qywxIinkExternalBaseDTO);
+                    QywxLinkExternalBaseDTO qywxLinkExternalBaseDTO = new QywxLinkExternalBaseDTO();
+                    qywxLinkExternalBaseDTO.setTitle(mediaTitle);
+                    qywxLinkExternalBaseDTO.setUrl(mediaUrl);
+                    attachments.add(qywxLinkExternalBaseDTO);
                 }
             }
         }