Merge remote-tracking branch 'origin/xgh_内容中台' into developer

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

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

@@ -100,15 +100,18 @@ public class UploadController extends WebBaseController {
                 CloudFileTypeEnum type = getType(fileType) ;
                 File file = File.createTempFile("tmp", null);
                 mf.transferTo(file);
-                CloudFileInfo uploadInfo = CloudFileUtil.uploadTempFile(file, mf.getOriginalFilename(), type, factoryCode , CloudFileBusinessOptEnum.COMMON, 7*24L) ;
-                if (uploadInfo != null) {
-                    map.put("qcloudImageUrl", uploadInfo.getOrgFileUrl());
-                    map.put("imageFiledCode", "imageFiledCode");
-                    logger.info(uploadInfo instanceof ImageCloudFileInfo);
-                    if(uploadInfo instanceof ImageCloudFileInfo) {
-                        ImageCloudFileInfo info = (ImageCloudFileInfo) uploadInfo ;
-                        map.put("compressFileUrl", info.getCompressFileUrl());
+                try {
+                    CloudFileInfo uploadInfo = CloudFileUtil.uploadTempFile(file, mf.getOriginalFilename(), type, factoryCode , CloudFileBusinessOptEnum.COMMON, 7*24L) ;
+                    if (uploadInfo != null) {
+                        map.put("qcloudImageUrl", uploadInfo.getOrgFileUrl());
+                        map.put("imageFiledCode", "imageFiledCode");
+                        if(uploadInfo instanceof ImageCloudFileInfo) {
+                            ImageCloudFileInfo info = (ImageCloudFileInfo) uploadInfo ;
+                            map.put("compressFileUrl", info.getCompressFileUrl());
+                        }
                     }
+                }catch(Exception e) {
+                    return RestResponse.failure("9999", e.getMessage()) ;
                 }
                 picList.add(map);
                 file.deleteOnExit();

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/exception/GlobalExceptionHandler.java

@@ -32,12 +32,6 @@ public class GlobalExceptionHandler extends WebBaseController {
 
     /**
      * 控制器运行异常
-     *
-     * @param response 响应
-     * @param ex       前女友
-     * @return {@link HaobanResponse }
-     * @author mozhu
-     * @date 2021-12-15 14:55:50
      */
     @ResponseBody
     @ExceptionHandler(RuntimeException.class)
@@ -60,12 +54,6 @@ public class GlobalExceptionHandler extends WebBaseController {
 
     /**
      * 全局异常
-     *
-     * @param response 响应
-     * @param ex
-     * @return {@link HaobanResponse }
-     * @author mozhu
-     * @date 2021-12-15 14:54:25
      */
     @ResponseBody
     @ExceptionHandler(Exception.class)