优化导入日志功能

java110-core/src/main/java/com/java110/core/aop/Java110TransactionalAop.java

@@ -73,8 +73,8 @@ public class Java110TransactionalAop {
         Object o = null;
         // 接收到请求，记录请求内容
         String curOId = Java110TransactionalFactory.getOId();
-        if (StringUtil.isEmpty(curOId)) {
-            ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (StringUtil.isEmpty(curOId) && attributes != null) {
             HttpServletRequest request = attributes.getRequest();
             Enumeration<String> headerNames = request.getHeaderNames();
             OrderDto orderDto = new OrderDto();
@@ -112,14 +112,14 @@ public class Java110TransactionalAop {
                 return o;
             }
             //完成事务
-            if (StringUtil.isEmpty(curOId)) {
+            if (StringUtil.isEmpty(curOId)  && attributes != null) {
                 Java110TransactionalFactory.finishOId();
             }
             return o;
         } catch (Throwable e) {
             logger.error("执行方法异常", e);
             //回退事务
-            if (StringUtil.isEmpty(curOId)) {
+            if (StringUtil.isEmpty(curOId)  && attributes != null) {
                 Java110TransactionalFactory.fallbackOId();
             }
             //return new BusinessDto(BusinessDto.CODE_ERROR, "内部异常" + e.getLocalizedMessage());