From a917f84e3f5f216d6b6e52155403076f504c5af7 Mon Sep 17 00:00:00 2001
From: godotg <jaysunxiao@gmail.com>
Date: Sun, 15 Oct 2023 19:57:17 +0800
Subject: [PATCH] feat[golang]: compatible field of inside protocol class

---
 .../zfoo/protocol/serializer/cpp/GenerateCppUtils.java |  2 +-
 .../zfoo/protocol/serializer/go/GenerateGoUtils.java   | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java
index 21e253e0..325a3005 100644
--- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java
+++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java
@@ -142,7 +142,7 @@ public abstract class GenerateCppUtils {
                 protocolClazzName, protocolId, protocolClazzName, writeObject.trim(), protocolClazzName, readObject.trim());
 
         var outputPath = StringUtils.format("{}/{}/{}.h"
-                , GenerateCppUtils.protocolOutputPath
+                , protocolOutputPath
                 , GenerateProtocolPath.getProtocolPath(protocolId)
                 , protocolClazzName);
         FileUtils.writeStringToFile(new File(outputPath), protocolTemplate, true);
diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/go/GenerateGoUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/go/GenerateGoUtils.java
index 6bdba843..43cd4fda 100644
--- a/protocol/src/main/java/com/zfoo/protocol/serializer/go/GenerateGoUtils.java
+++ b/protocol/src/main/java/com/zfoo/protocol/serializer/go/GenerateGoUtils.java
@@ -126,14 +126,8 @@ public abstract class GenerateGoUtils {
                 , protocolClazzName, protocolId, protocolClazzName, protocolClazzName
                 , writeObject.trim(), protocolClazzName, protocolClazzName, readObject.trim());
 
-        var protocolPath = GenerateProtocolPath.protocolAbsolutePath(protocolId);
-        if (StringUtils.isEmpty(protocolPath)) {
-            protocolPath = protocolClazzName;
-        } else if (protocolPath.contains(StringUtils.SLASH)) {
-            protocolPath = StringUtils.substringAfterLast(protocolPath, StringUtils.SLASH);
-        }
-        var outputPath = StringUtils.format("{}/{}/{}.go", protocolOutputPath, protocolOutputRootPath, protocolClazzName);
-        FileUtils.writeStringToFile(outputPath, protocolTemplate, true);
+        var outputPath = StringUtils.format("{}/{}.go", protocolOutputPath, protocolClazzName);
+        FileUtils.writeStringToFile(new File(outputPath), protocolTemplate, true);
     }
 
     private static String fieldDefinition(ProtocolRegistration registration) {