From 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 七月 2023 10:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-core/src/main/java/com/java110/core/aop/Java110TransactionalAop.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/aop/Java110TransactionalAop.java b/java110-core/src/main/java/com/java110/core/aop/Java110TransactionalAop.java
index 5b33ee6..67bcb3e 100755
--- a/java110-core/src/main/java/com/java110/core/aop/Java110TransactionalAop.java
+++ b/java110-core/src/main/java/com/java110/core/aop/Java110TransactionalAop.java
@@ -73,8 +73,9 @@
Object o = null;
// 鎺ユ敹鍒拌姹傦紝璁板綍璇锋眰鍐呭
String curOId = Java110TransactionalFactory.getOId();
- if (StringUtil.isEmpty(curOId)) {
- ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+ ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+ // todo attributes 涓虹┖鍒ゆ柇涓昏鍘熷洜鏃� 閫氳繃娑堟伅闃熷垪澶勭悊鐨勬暟鎹槸娌℃湁 attributes 瀵硅薄鐨�
+ if (StringUtil.isEmpty(curOId) && attributes != null) {
HttpServletRequest request = attributes.getRequest();
Enumeration<String> headerNames = request.getHeaderNames();
OrderDto orderDto = new OrderDto();
@@ -112,14 +113,14 @@
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());
--
Gitblit v1.8.0