Merge pull request #91 from codefuse-ai/fix_json

delete GsonHttpMessageConvertersConfiguration.java casing it would ch…

Author: lightislost

runtime/model/pom.xml

@@ -39,6 +39,14 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
 
     </dependencies>
 

runtime/model/src/main/java/com/alipay/muagent/model/tool/meta/ApiIvkSchema.java

@@ -4,6 +4,10 @@
  */
 package com.alipay.muagent.model.tool.meta;
 
+import com.alipay.muagent.model.tool.meta.serilizer.JsonObjectDeserializer;
+import com.alipay.muagent.model.tool.meta.serilizer.JsonObjectSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.gson.JsonObject;
 import lombok.Data;
 
@@ -39,10 +43,14 @@ public class ApiIvkSchema {
     /**
      * model 定义
      */
+    @JsonSerialize(using = JsonObjectSerializer.class)
+    @JsonDeserialize(using = JsonObjectDeserializer.class)
     private JsonObject definitions;
 
     /**
      * 接口信息
      */
+    @JsonSerialize(using = JsonObjectSerializer.class)
+    @JsonDeserialize(using = JsonObjectDeserializer.class)
     private JsonObject apis;
 }

runtime/model/src/main/java/com/alipay/muagent/model/tool/meta/Protocol.java

@@ -4,6 +4,10 @@
  */
 package com.alipay.muagent.model.tool.meta;
 
+import com.alipay.muagent.model.tool.meta.serilizer.JsonObjectDeserializer;
+import com.alipay.muagent.model.tool.meta.serilizer.JsonObjectSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.gson.JsonObject;
 import lombok.Data;
 
@@ -43,5 +47,7 @@ public class Protocol {
     /**
      * responses 的结构暂时忽略
      */
+    @JsonSerialize(using = JsonObjectSerializer.class)
+    @JsonDeserialize(using = JsonObjectDeserializer.class)
     private JsonObject responses;
 }

runtime/model/src/main/java/com/alipay/muagent/model/tool/meta/ProtocolSchema.java

@@ -4,6 +4,7 @@
  */
 package com.alipay.muagent.model.tool.meta;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 /**
@@ -17,5 +18,6 @@ public class ProtocolSchema {
      * $ref，参数的引用 id，与 FieldNode.id 是同一个值，该值将二者关联起来
      * 即可以通过 FieldNode.id 找到对应的 schema 参数，进而确定这个参数实际的参数位置
      */
+    @JsonProperty("$ref")
     private String $ref;
 }

runtime/model/src/main/java/com/alipay/muagent/model/tool/meta/Protocols.java

@@ -4,6 +4,10 @@
  */
 package com.alipay.muagent.model.tool.meta;
 
+import com.alipay.muagent.model.tool.meta.serilizer.JsonObjectDeserializer;
+import com.alipay.muagent.model.tool.meta.serilizer.JsonObjectSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.gson.JsonObject;
 import lombok.Data;
 
@@ -22,5 +26,7 @@ public class Protocols {
     /**
      * tr
      */
+    @JsonSerialize(using = JsonObjectSerializer.class)
+    @JsonDeserialize(using = JsonObjectDeserializer.class)
     private JsonObject tr;
 }

runtime/model/src/main/java/com/alipay/muagent/model/tool/meta/serilizer/JsonObjectDeserializer.java

@@ -0,0 +1,20 @@
+/**
+ * Alipay.com Inc.
+ * Copyright (c) 2004-2024 All Rights Reserved.
+ */
+package com.alipay.muagent.model.tool.meta.serilizer;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.google.gson.JsonObject;
+
+import java.io.IOException;
+
+public class JsonObjectDeserializer extends JsonDeserializer<JsonObject> {
+
+    @Override
+    public JsonObject deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+        return com.google.gson.JsonParser.parseString(p.getText()).getAsJsonObject();
+    }
+}

runtime/model/src/main/java/com/alipay/muagent/model/tool/meta/serilizer/JsonObjectSerializer.java

@@ -0,0 +1,28 @@
+/**
+ * Alipay.com Inc.
+ * Copyright (c) 2004-2024 All Rights Reserved.
+ */
+package com.alipay.muagent.model.tool.meta.serilizer;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+
+import com.google.gson.JsonObject;
+
+import java.io.IOException;
+/**
+ * @author renmao.rm
+ * @version : JsonObjectSerializer.java, v 0.1 2024年12月12日 15:58 renmao.rm Exp $
+ */
+public class JsonObjectSerializer extends StdSerializer<JsonObject> {
+
+    public JsonObjectSerializer(Class<JsonObject> t) {
+        super(t);
+    }
+
+    @Override
+    public void serialize(JsonObject value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+        gen.writeRawValue(value.toString());
+    }
+}

runtime/service/src/main/java/com/alipay/muagent/service/ekgmanager/impl/EkgGraphStorageClientImpl.java

@@ -128,6 +128,8 @@ public GraphGraph getGraphByTeam(String teamRootId) {
                 .put("nodeType", EkgNodeType.Intent.getCode())
                 .put("layer", "first")
                 .value());
+
+        LoggerUtil.info(LOGGER, "getGraphByTeam:{},{}", teamRootId, GsonUtils.toString(result));
         return convertToGraph(result);
     }
 

runtime/web/src/main/java/com/alipay/muagent/web/EkgStorageController.java

@@ -8,6 +8,7 @@
 import com.alipay.muagent.model.ekg.storage.GraphNode;
 import com.alipay.muagent.model.ekg.storage.GraphUpdateRequest;
 import com.alipay.muagent.service.ekgmanager.EkgGraphManager;
+import com.alipay.muagent.util.GsonUtils;
 import com.alipay.muagent.util.LoggerUtil;
 import com.alipay.muagent.web.model.Result;
 import org.slf4j.Logger;
@@ -95,6 +96,7 @@ public Result<GraphNode> getNode(@RequestParam("nodeId") String nodeId, @Request
     @PostMapping("/graph/update")
     public Result<GraphGraph> updateGraph(@RequestBody GraphUpdateRequest request) {
         try {
+            LoggerUtil.info(LOGGER, "/graph/update", GsonUtils.toString(request));
             return Result.success(ekgGraphManager.updateGraph(request));
         } catch (Exception e) {
             LoggerUtil.error(LOGGER, e, "updateGraph 接口异常");