多元融合

src/main/java/com/fdkankan/fusion/aop/PushJmAspect.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.http.ContentType;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.config.FusionConfig;
 import com.fdkankan.fusion.down.CaseDownService;
@@ -97,16 +98,15 @@ public class PushJmAspect {
 			}
 
 			return result;
-		}catch (BusinessException exception){
-			log.info("servicePush-BusinessException-error:{}",exception);
-			return exception;
-		} catch (Exception e){
+		}catch (BusinessException e){
+			log.info("servicePush-BusinessException-error:{}",e);
+			return ResultData.error(e.getCode(),e.getMessage());
+		}catch (Exception e){
 			log.info("servicePush-Exception-error:{}",e);
-			return e;
 		}catch (Throwable throwable){
-			log.info("servicePush-Throwable-error:{}",throwable);
-			return throwable;
+			log.info("servicePush-throwable-error:{}",throwable);
 		}
+		return ResultData.error(ResultCode.SYSTEM_ERROR);
 	}