From 082467e5ec683c8d1e53c4ab3a17265494786d72 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 四月 2022 18:45:02 +0800
Subject: [PATCH] 优化 繁体和英文 功能
---
java110-core/src/main/java/com/java110/core/aop/Java110TransactionalAop.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 bef57d8..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,13 +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.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -50,20 +50,22 @@
while (headerNames.hasMoreElements()) {
String key = (String) headerNames.nextElement();
String value = request.getHeader(key);
+ logger.debug("璇锋眰澶翠俊鎭� key= " + key+",value = "+value);
+
key = key.toLowerCase();
- if (CommonConstant.APP_ID.equals(key)) {
+ if (CommonConstant.APP_ID.equals(key) || CommonConstant.HTTP_APP_ID.equals(key)) {
orderDto.setAppId(value);
}
- if (CommonConstant.TRANSACTION_ID.equals(key)) {
+ if (CommonConstant.TRANSACTION_ID.equals(key)|| CommonConstant.HTTP_TRANSACTION_ID.equals(key)) {
orderDto.setExtTransactionId(value);
}
- if (CommonConstant.REQUEST_TIME.equals(key)) {
+ if (CommonConstant.REQUEST_TIME.equals(key)|| CommonConstant.HTTP_REQ_TIME.equals(key)) {
orderDto.setRequestTime(value);
}
if (OrderDto.O_ID.equals(key)) {
orderDto.setoId(value);
}
- if (CommonConstant.USER_ID.equals(key)) {
+ if (CommonConstant.USER_ID.equals(key)|| CommonConstant.HTTP_USER_ID.equals(key)) {
orderDto.setUserId(value);
}
}
@@ -112,6 +114,9 @@
Java110TransactionalFactory.fallbackOId();
//return new BusinessDto(BusinessDto.CODE_ERROR, "鍐呴儴寮傚父" + e.getLocalizedMessage());
throw e;
+ }finally {
+ //娓呯悊浜嬪姟淇℃伅
+ Java110TransactionalFactory.clearOId();
}
}
}
--
Gitblit v1.8.0