From e3aed650aa4e232f4583a00fc3de088276a2188b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 15 一月 2022 13:41:18 +0800
Subject: [PATCH] 优化代码
---
java110-core/src/main/java/com/java110/core/aop/Java110TransactionalAop.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 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
old mode 100644
new mode 100755
index 1e583e9..85c3f5d
--- a/java110-core/src/main/java/com/java110/core/aop/Java110TransactionalAop.java
+++ b/java110-core/src/main/java/com/java110/core/aop/Java110TransactionalAop.java
@@ -1,14 +1,13 @@
package com.java110.core.aop;
import com.java110.core.factory.Java110TransactionalFactory;
+import com.java110.core.log.LoggerFactory;
import com.java110.dto.order.OrderDto;
+import com.java110.utils.constant.CommonConstant;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.*;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -51,19 +50,22 @@
while (headerNames.hasMoreElements()) {
String key = (String) headerNames.nextElement();
String value = request.getHeader(key);
- if (OrderDto.APP_ID.equals(key.toUpperCase())) {
+ logger.debug("璇锋眰澶翠俊鎭� key= " + key+",value = "+value);
+
+ key = key.toLowerCase();
+ if (CommonConstant.APP_ID.equals(key) || CommonConstant.HTTP_APP_ID.equals(key)) {
orderDto.setAppId(value);
}
- if (OrderDto.TRANSACTION_ID.equals(key.toUpperCase())) {
+ if (CommonConstant.TRANSACTION_ID.equals(key)|| CommonConstant.HTTP_TRANSACTION_ID.equals(key)) {
orderDto.setExtTransactionId(value);
}
- if (OrderDto.REQUEST_TIME.equals(key.toUpperCase())) {
+ if (CommonConstant.REQUEST_TIME.equals(key)|| CommonConstant.HTTP_REQ_TIME.equals(key)) {
orderDto.setRequestTime(value);
}
- if (OrderDto.O_ID.equals(key.toUpperCase())) {
+ if (OrderDto.O_ID.equals(key)) {
orderDto.setoId(value);
}
- if (OrderDto.USER_ID.equals(key.toUpperCase())) {
+ if (CommonConstant.USER_ID.equals(key)|| CommonConstant.HTTP_USER_ID.equals(key)) {
orderDto.setUserId(value);
}
}
@@ -95,9 +97,10 @@
//鐜粫閫氱煡,鐜粫澧炲己锛岀浉褰撲簬MethodInterceptor
@Around("dataProcess()")
- public Object around(ProceedingJoinPoint pjp) {
+ public Object around(ProceedingJoinPoint pjp) throws Throwable {
+ Object o = null;
try {
- Object o = pjp.proceed();
+ o = pjp.proceed();
//瑙傚療鑰呬笉鍋氬鐞�
if (Java110TransactionalFactory.ROLE_OBSERVER.equals(Java110TransactionalFactory.getServiceRole())) {
return o;
@@ -109,7 +112,11 @@
logger.error("鎵ц鏂规硶寮傚父", e);
//鍥為��浜嬪姟
Java110TransactionalFactory.fallbackOId();
- return new ResponseEntity("鍐呴儴寮傚父" + e.getLocalizedMessage(), HttpStatus.BAD_REQUEST);
+ //return new BusinessDto(BusinessDto.CODE_ERROR, "鍐呴儴寮傚父" + e.getLocalizedMessage());
+ throw e;
+ }finally {
+ //娓呯悊浜嬪姟淇℃伅
+ Java110TransactionalFactory.clearOId();
}
}
}
--
Gitblit v1.8.0