From fe891f627a483eb6298f12eca60cf7f274e31c88 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 20 八月 2025 16:54:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/common/aspect/ApiLogAspect.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/jeecg/common/aspect/ApiLogAspect.java b/src/main/java/org/jeecg/common/aspect/ApiLogAspect.java
index 9da336c..a3539e8 100644
--- a/src/main/java/org/jeecg/common/aspect/ApiLogAspect.java
+++ b/src/main/java/org/jeecg/common/aspect/ApiLogAspect.java
@@ -4,7 +4,6 @@
import com.alibaba.fastjson.parser.Feature;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sap.conn.jco.*;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
@@ -83,6 +82,13 @@
break;
case WMS:
dto.setRequestMethod("Webservice");
+ if (result instanceof Map) {
+ Map<String, Object> map = (Map<String, Object>) result;
+ dto.setResponseCode(map.get("ztype").toString());
+ dto.setResponseMessage(map.get("zmess").toString());
+ dto.setRequestBody(map.get("importParameters") == null ? null : map.get("importParameters").toString());
+ dto.setResponseBody(parseSAPResponseResult(map.get("result")));
+ }
break;
case FEI_SHU:
dto.setRequestMethod("Http");
@@ -146,6 +152,16 @@
} catch (JsonProcessingException e) {
throw new JeecgBootException(e);
}
+ } else if (result instanceof String) {
+ return result.toString();
+ } else {
+ try {
+ String json = objectMapper.writeValueAsString(result);
+ JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+ items.add(item);
+ } catch (JsonProcessingException e) {
+ throw new JeecgBootException(e);
+ }
}
return items.toString();
}
--
Gitblit v1.9.3