Merge remote-tracking branch 'origin/origin/feature/上传接口替换' into developer

haoban-manage3-service/pom.xml

@@ -168,6 +168,12 @@
             <artifactId>gic-enterprise-operation-api</artifactId>
             <version>${gic-enterprise-operation-api}</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-thirdparty-sdk</artifactId>
+            <version>3.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

 package com.gic.haoban.manage.service.service.out.impl;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
+import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.clerk.api.dto.ClerkDTO;
@@ -24,49 +8,25 @@ import com.gic.clerk.api.dto.ClerkQwDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GICMQClientUtil;
-import com.gic.commons.util.GlobalInfo;
-import com.gic.commons.util.GlobalVar;
 import com.gic.commons.util.ImageUtil;
 import com.gic.haoban.app.customer.service.api.service.InnerApiService;
 import com.gic.haoban.base.api.common.Constant;
 import com.gic.haoban.base.api.common.ServiceResponse;
-import com.gic.haoban.manage.api.dto.CommonMQDTO;
-import com.gic.haoban.manage.api.dto.DepartmentDTO;
-import com.gic.haoban.manage.api.dto.QywxCallBackDTO;
-import com.gic.haoban.manage.api.dto.SecretSettingDTO;
-import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
-import com.gic.haoban.manage.api.dto.StaffDTO;
-import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
-import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
-import com.gic.haoban.manage.api.enums.AppPageType;
-import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
-import com.gic.haoban.manage.api.enums.NoticeMessageTypeEnum;
-import com.gic.haoban.manage.api.enums.SecretTypeEnum;
-import com.gic.haoban.manage.api.enums.WxEditType;
-import com.gic.haoban.manage.api.service.HaobanCommonMQApiService;
-import com.gic.haoban.manage.api.service.MessageApiService;
-import com.gic.haoban.manage.api.service.StaffApiService;
-import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
-import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
+import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.enums.*;
+import com.gic.haoban.manage.api.service.*;
 import com.gic.haoban.manage.api.util.notify.NoticeMessageUtil;
 import com.gic.haoban.manage.service.config.Config;
-import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
-import com.gic.haoban.manage.service.entity.TabHaobanStaff;
-import com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated;
-import com.gic.haoban.manage.service.entity.TabHaobanWxApplication;
-import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
-import com.gic.haoban.manage.service.service.DepartmentService;
-import com.gic.haoban.manage.service.service.SecretSettingService;
-import com.gic.haoban.manage.service.service.StaffDepartmentRelatedService;
-import com.gic.haoban.manage.service.service.StaffService;
-import com.gic.haoban.manage.service.service.WxApplicationService;
-import com.gic.haoban.manage.service.service.WxEnterpriseRelatedService;
-import com.gic.haoban.manage.service.service.WxEnterpriseService;
+import com.gic.haoban.manage.service.entity.*;
+import com.gic.haoban.manage.service.service.*;
 import com.gic.haoban.manage.service.service.chat.GroupChatService;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.redis.data.util.RedisUtil;
-import com.gic.thirdparty.api.dto.PicUploadResDTO;
 import com.gic.thirdparty.api.service.QQCloudPicService;
+import com.gic.thirdparty.cloudfile.CloudFileUtil;
+import com.gic.thirdparty.cloudfile.enums.CloudFileBusinessOptEnum;
+import com.gic.thirdparty.cloudfile.enums.CloudFileTypeEnum;
+import com.gic.thirdparty.cloudfile.pojo.CloudFileInfo;
 import com.gic.wechat.api.dto.qywx.ItemDTO;
 import com.gic.wechat.api.dto.qywx.QywxXcxSendMessageDTO;
 import com.gic.wechat.api.dto.qywx.UserDTO;
@@ -74,8 +34,16 @@ import com.gic.wechat.api.service.qywx.QywxDepartmentApiService;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.google.common.collect.Sets;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
-import cn.hutool.core.convert.Convert;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * 接收企业微信或者gic推送消息进行处理
@@ -486,9 +454,14 @@ public class MessageApiServiceImpl implements MessageApiService {
                 return headImgUrl;
             }
             byte[] data = ImageUtil.getImgbyte(headImgUrl);
-            PicUploadResDTO uploadPic = qqCloudPicService.uploadPic(GlobalVar.ctxPropertiesMap.get(GlobalInfo.QQPIC_KEY_ENTERPRISE), data);
-            log.info("腾讯云万象优图返回" + JSON.toJSONString(uploadPic));
-            return uploadPic.downloadUrl;
+//            PicUploadResDTO uploadPic = qqCloudPicService.uploadPic(GlobalVar.ctxPropertiesMap.get(GlobalInfo.QQPIC_KEY_ENTERPRISE), data);
+            //默认后缀为jpg,企业factoryCode取gic内部使用的factoryCode
+            String suffix="jpg";
+            String factoryCode="gic_inner";
+            CloudFileTypeEnum cloudFileTypeEnum = CloudFileTypeEnum.IMAGE;
+            CloudFileInfo cloudFileInfo =  CloudFileUtil.uploadFile(data, suffix, cloudFileTypeEnum,factoryCode, CloudFileBusinessOptEnum.HAOBAN_COMMON);
+            log.info("腾讯云万象优图返回" + JSON.toJSONString(cloudFileInfo));
+            return cloudFileInfo.getOrgFileUrl();
         } catch (Exception e) {
             log.info("上传腾讯云万象优图返回失败了：{}", e.getMessage());
             return headImgUrl;

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

 package com.gic.haoban.manage.service.service.out.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
@@ -23,8 +8,6 @@ import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.clerk.api.service.PowerService;
 import com.gic.commons.util.EntityUtil;
-import com.gic.commons.util.GlobalInfo;
-import com.gic.commons.util.GlobalVar;
 import com.gic.commons.util.ImageUtil;
 import com.gic.enterprise.api.dto.EnterpriseSettingDTO;
 import com.gic.enterprise.api.dto.StoreDTO;
@@ -38,16 +21,7 @@ import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.common.utils.RolesListUtils;
 import com.gic.haoban.common.utils.UuidUtil;
-import com.gic.haoban.manage.api.dto.DepartmentDTO;
-import com.gic.haoban.manage.api.dto.SecretSettingDTO;
-import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
-import com.gic.haoban.manage.api.dto.StaffDTO;
-import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
-import com.gic.haoban.manage.api.dto.StaffPrivacyUseLogDTO;
-import com.gic.haoban.manage.api.dto.StaffQrCodeDTO;
-import com.gic.haoban.manage.api.dto.UserLoginLogDTO;
-import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
-import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
+import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.dto.role.StoreRoleDTO;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
 import com.gic.haoban.manage.api.service.StaffApiService;
@@ -58,27 +32,29 @@ import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanSyncErrorLog;
-import com.gic.haoban.manage.service.service.DepartmentService;
-import com.gic.haoban.manage.service.service.SecretSettingService;
-import com.gic.haoban.manage.service.service.StaffClerkRelationService;
-import com.gic.haoban.manage.service.service.StaffDepartmentRelatedService;
-import com.gic.haoban.manage.service.service.StaffPrivacyUseLogService;
-import com.gic.haoban.manage.service.service.StaffService;
-import com.gic.haoban.manage.service.service.StoreRangeService;
-import com.gic.haoban.manage.service.service.SyncErrorLogService;
-import com.gic.haoban.manage.service.service.UserLoginLogService;
-import com.gic.haoban.manage.service.service.WxEnterpriseService;
+import com.gic.haoban.manage.service.service.*;
 import com.gic.haoban.manage.service.util.EmojiFilterUtil;
 import com.gic.redis.data.util.RedisUtil;
-import com.gic.thirdparty.api.dto.PicUploadResDTO;
 import com.gic.thirdparty.api.service.QQCloudPicService;
+import com.gic.thirdparty.cloudfile.CloudFileUtil;
+import com.gic.thirdparty.cloudfile.enums.CloudFileBusinessOptEnum;
+import com.gic.thirdparty.cloudfile.enums.CloudFileTypeEnum;
+import com.gic.thirdparty.cloudfile.pojo.CloudFileInfo;
 import com.gic.wechat.api.dto.qywx.QywxNewUseridDTO;
 import com.gic.wechat.api.dto.qywx.UserDTO;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
-import cn.hutool.core.collection.CollectionUtil;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 @Service
 public class StaffApiServiceImpl implements StaffApiService {
@@ -576,9 +552,15 @@ public class StaffApiServiceImpl implements StaffApiService {
                 return headImgUrl;
             }
             byte[] data = ImageUtil.getImgbyte(headImgUrl);
-            PicUploadResDTO uploadPic = qqCloudPicService.uploadPic(GlobalVar.ctxPropertiesMap.get(GlobalInfo.QQPIC_KEY_ENTERPRISE), data);
-            logger.info("腾讯云万象优图返回" + JSON.toJSONString(uploadPic));
-            return uploadPic.downloadUrl;
+            //上传接口替换
+            //PicUploadResDTO uploadPic = qqCloudPicService.uploadPic(GlobalVar.ctxPropertiesMap.get(GlobalInfo.QQPIC_KEY_ENTERPRISE), data);
+            //默认后缀为jpg,企业factoryCode取gic内部使用的factoryCode
+            String suffix="jpg";
+            String factoryCode="gic_inner";
+            CloudFileTypeEnum cloudFileTypeEnum = CloudFileTypeEnum.IMAGE;
+            CloudFileInfo cloudFileInfo =   CloudFileUtil.uploadFile(data, suffix, cloudFileTypeEnum,factoryCode, CloudFileBusinessOptEnum.HAOBAN_COMMON);
+            logger.info("腾讯云万象优图返回" + JSON.toJSONString(cloudFileInfo));
+            return cloudFileInfo.getOrgFileUrl();
         } catch (Exception e) {
             logger.info("上传腾讯云万象优图返回失败了:{}", e.getMessage());
             return headImgUrl;

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/UploadController.java

@@ -7,8 +7,8 @@ import com.gic.commons.util.DateUtil;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.common.utils.UploadUtils;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
-import com.gic.haoban.manage.web.utils.statistics.UploadUtils;
 import com.gic.qcloud.BucketNameEnum;
 import com.gic.thirdparty.cloudfile.CloudFileUtil;
 import com.gic.thirdparty.cloudfile.enums.CloudFileBusinessOptEnum;

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/utils/statistics/UploadUtils.java

-package com.gic.haoban.manage.web.utils.statistics;
-
-/**
- * @Author jinxin
- * @Date 2022/12/27 09:23
- * 文件上传工具类
- */
-public class UploadUtils {
-    /**
-     * 是否是图片
-     * @param fileSuffix
-     * @return
-     * @throws Exception
-     */
-    public static boolean isPicture(String fileSuffix) throws Exception{
-        //pdf 隐私文件，小程序端，只能用这个
-        String[] imageArray =
-                {"bmp", "dib","gif", "jfif", "jpe","jpeg", "jpg", "png", "tif", "tiff", "ico", "10", "pdf"};
-        for (String str : imageArray) {
-            if (str.equals(fileSuffix.replace(".", ""))) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static boolean isOffice(String fileSuffix) throws Exception{
-        String[] arr =
-                {"doc", "docx","xls", "xlsx", "pptx", "ppt"};
-        for (String str : arr) {
-            if (str.equals(fileSuffix.replace(".", ""))) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static boolean isMusic(String fileSuffix) throws Exception{
-        String[] arr =
-                {"wma", "mpc","ogg", "wav", "mpeg", "mp3"};
-        for (String str : arr) {
-            if (str.equals(fileSuffix.replace(".", ""))) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static boolean isVedio(String fileSuffix) throws Exception{
-        String[] arr =
-                {"rm", "rmvb","mp4", "wmv", "asf", "asx", "3gp", "mov", "m4v", "avi", "dat", "mkv", "flv", "vob"};
-        for (String str : arr) {
-            if (str.equals(fileSuffix.replace(".", ""))) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
+//package com.gic.haoban.manage.web.utils.statistics;
+//
+///**
+// * @Author jinxin
+// * @Date 2022/12/27 09:23
+// * 文件上传工具类
+// */
+//public class UploadUtils {
+//    /**
+//     * 是否是图片
+//     * @param fileSuffix
+//     * @return
+//     * @throws Exception
+//     */
+//    public static boolean isPicture(String fileSuffix) throws Exception{
+//        //pdf 隐私文件，小程序端，只能用这个
+//        String[] imageArray =
+//                {"bmp", "dib","gif", "jfif", "jpe","jpeg", "jpg", "png", "tif", "tiff", "ico", "10", "pdf"};
+//        for (String str : imageArray) {
+//            if (str.equals(fileSuffix.replace(".", ""))) {
+//                return true;
+//            }
+//        }
+//        return false;
+//    }
+//
+//    public static boolean isOffice(String fileSuffix) throws Exception{
+//        String[] arr =
+//                {"doc", "docx","xls", "xlsx", "pptx", "ppt"};
+//        for (String str : arr) {
+//            if (str.equals(fileSuffix.replace(".", ""))) {
+//                return true;
+//            }
+//        }
+//        return false;
+//    }
+//
+//    public static boolean isMusic(String fileSuffix) throws Exception{
+//        String[] arr =
+//                {"wma", "mpc","ogg", "wav", "mpeg", "mp3"};
+//        for (String str : arr) {
+//            if (str.equals(fileSuffix.replace(".", ""))) {
+//                return true;
+//            }
+//        }
+//        return false;
+//    }
+//
+//    public static boolean isVedio(String fileSuffix) throws Exception{
+//        String[] arr =
+//                {"rm", "rmvb","mp4", "wmv", "asf", "asx", "3gp", "mov", "m4v", "avi", "dat", "mkv", "flv", "vob"};
+//        for (String str : arr) {
+//            if (str.equals(fileSuffix.replace(".", ""))) {
+//                return true;
+//            }
+//        }
+//        return false;
+//    }
+//}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/UploadController.java

 package com.gic.haoban.manage.web.controller;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.gic.clerk.api.dto.AuthorizedUser;
-import org.apache.commons.lang.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-
-import com.gic.commons.util.GlobalInfo;
-import com.gic.commons.util.GlobalVar;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.haoban.common.anno.IgnoreLogin;
 import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.common.utils.UploadUtils;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
-import com.gic.thirdparty.api.dto.PicUploadResDTO;
 import com.gic.thirdparty.api.service.QQCloudPicService;
 import com.gic.thirdparty.cloudfile.CloudFileUtil;
 import com.gic.thirdparty.cloudfile.enums.CloudFileBusinessOptEnum;
 import com.gic.thirdparty.cloudfile.enums.CloudFileTypeEnum;
 import com.gic.thirdparty.cloudfile.pojo.CloudFileInfo;
 import com.gic.thirdparty.cloudfile.pojo.ImageCloudFileInfo;
+import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.InputStream;
+import java.util.*;
 
 @RestController
 public class UploadController extends WebBaseController {
@@ -76,7 +66,16 @@ public class UploadController extends WebBaseController {
                 //上传接口替换
 //                PicUploadResDTO picUploadResDTO = qqCloudPicService.uploadPic(
 //                        GlobalVar.ctxPropertiesMap.get(GlobalInfo.QQPIC_KEY_ENTERPRISE), fileBuffer);
-                CloudFileTypeEnum cloudFileTypeEnum = CloudFileTypeEnum.IMAGE;
+                CloudFileTypeEnum cloudFileTypeEnum = CloudFileTypeEnum.OTHER;
+                if (UploadUtils.isPicture(suffix)) {
+                    cloudFileTypeEnum = CloudFileTypeEnum.IMAGE;
+                } else if (UploadUtils.isOffice(suffix)) {
+                    cloudFileTypeEnum = CloudFileTypeEnum.FILE;
+                } else if (UploadUtils.isMusic(suffix)) {
+                    cloudFileTypeEnum = CloudFileTypeEnum.AUDIO;
+                } else if (UploadUtils.isVedio(suffix)) {
+                    cloudFileTypeEnum = CloudFileTypeEnum.VIDEO;
+                }
                 CloudFileInfo cloudFileInfo =   CloudFileUtil.uploadFile(fileBuffer, suffix, cloudFileTypeEnum,factoryCode, CloudFileBusinessOptEnum.HAOBAN_COMMON);
                 logger.info("上传返回的实体信息为:{}",cloudFileInfo);
                 if (cloudFileInfo != null) {