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()); } }