Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

1098226878

2021-09-08 d31920a1233ab14cdd5e33756bb1b0e3ed235e66

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

old mode 100644
new mode 100755
@@ -53,19 +53,19 @@
            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);
            }
        }
@@ -114,6 +114,9 @@
            Java110TransactionalFactory.fallbackOId();
            //return new BusinessDto(BusinessDto.CODE_ERROR, "内部异常" + e.getLocalizedMessage());
            throw e;
        }finally {
            //清理事务信息
            Java110TransactionalFactory.clearOId();
        }
    }
}