From 07fadc5331d6b9d410e3ab71fdf247c8707995b2 Mon Sep 17 00:00:00 2001 From: bruce Date: Mon, 11 May 2020 10:58:24 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=E7=BB=9F=E4=B8=80=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E7=AE=A1=E7=90=86=EF=BC=8C=E6=8A=9B=E5=87=BA=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8E=9F=E5=A7=8B=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/aop/RedisCacheAspect.java | 7 +------ .../src/main/java/com/iformall/service/ExcelService.java | 1 + 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java b/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java index e58baeb75..43e6bb644 100644 --- a/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java +++ b/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java @@ -3,9 +3,7 @@ package com.iformall.aop; import com.alibaba.fastjson.JSONObject; import com.iformall.annotation.RedisCache; -import com.iformall.common.ErrorCode; import com.iformall.domain.po.WxCUser; -import com.iformall.exception.MallinkException; import com.iformall.service.WxCUserTokenService; import com.iformall.utils.HashUtil; import com.iformall.utils.RedisLock; @@ -125,10 +123,7 @@ public class RedisCacheAspect { } catch (Throwable throwable) { log.error("CacheAspect proceed error , Illegal argument: {} in {}.{}()", Arrays.toString(jp.getArgs()), jp.getSignature().getDeclaringTypeName(), jp.getSignature().getName(), throwable); - if (throwable instanceof MallinkException) { - throw throwable; - } - throw new MallinkException(ErrorCode.SYS_SERVER_ERROR); + throw throwable; } finally { redisLock.unlock(lockKey, timeStr); } diff --git a/mallinkService/src/main/java/com/iformall/service/ExcelService.java b/mallinkService/src/main/java/com/iformall/service/ExcelService.java index 720e2aea3..0116856b8 100644 --- a/mallinkService/src/main/java/com/iformall/service/ExcelService.java +++ b/mallinkService/src/main/java/com/iformall/service/ExcelService.java @@ -76,6 +76,7 @@ public class ExcelService { response.getOutputStream().write(new byte[] { (byte) 0xEF, (byte) 0xBB,(byte) 0xBF }); // csv 乱码问题 CsvExportUtil.exportCsv(exportParams, pojoClass, list, response.getOutputStream()); } catch (IOException e) { + logger.error("defaultExportCsv error ",e); throw new MallinkException(ErrorCode.EXCEL_EXPORT_ERROR.getCode(), e.getMessage()); } }