From eb1f4f9935a83a8c6a3e9be86cce3431e045685f Mon Sep 17 00:00:00 2001
From: jaysunxiao <jaysunxiao.gmail.com>
Date: Mon, 16 May 2022 21:18:37 +0800
Subject: [PATCH] =?UTF-8?q?perf[protocol]:=20=E4=BD=BF=E7=94=A8=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E7=94=9F=E6=88=90=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                                    | 2 +-
 .../com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java    | 4 ++--
 protocol/src/main/resources/cpp/PacketTemplate.h              | 2 +-
 protocol/src/test/javascript/main.spec.js                     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 07b60da2..bffc0c2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,7 +38,7 @@ hs_err_pid*
 **/gdProtocol/
 **/CsProtocol/
 **/LuaProtocol/
-**/zfoocpp/
+**/cppProtocol/
 **/protos/
 
 # 以下是web前端需要忽略的文件
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 c39542a0..c36b2133 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
@@ -46,7 +46,7 @@ import static com.zfoo.protocol.util.StringUtils.TAB;
  */
 public abstract class GenerateCppUtils {
 
-    private static String protocolOutputRootPath = "zfoocpp";
+    private static String protocolOutputRootPath = "cppProtocol";
     private static String protocolOutputPath = StringUtils.EMPTY;
 
     private static Map<ISerializer, ICppSerializer> cppSerializerMap;
@@ -142,7 +142,7 @@ public abstract class GenerateCppUtils {
         var writeObject = writeObject(registration);
         var readObject = readObject(registration);
 
-        protocolTemplate = StringUtils.format(protocolTemplate, defineProtocolName, defineProtocolName, includeHeaders, docTitle
+        protocolTemplate = StringUtils.format(protocolTemplate, defineProtocolName, defineProtocolName, protocolOutputRootPath, includeHeaders, docTitle
                 , protocolClazzName, fieldDefinition, protocolClazzName, protocolClazzName, valueOfMethod.getKey(), protocolClazzName
                 , valueOfMethod.getValue().trim(), protocolId, protocolClazzName, operator.trim(),
                 protocolClazzName, protocolId, protocolClazzName, writeObject.trim(), protocolClazzName, readObject.trim());
diff --git a/protocol/src/main/resources/cpp/PacketTemplate.h b/protocol/src/main/resources/cpp/PacketTemplate.h
index 42ebc3ae..77508ba2 100644
--- a/protocol/src/main/resources/cpp/PacketTemplate.h
+++ b/protocol/src/main/resources/cpp/PacketTemplate.h
@@ -1,7 +1,7 @@
 #ifndef ZFOO_{}_H
 #define ZFOO_{}_H
 
-#include "zfoocpp/ByteBuffer.h"
+#include "{}/ByteBuffer.h"
 {}
 namespace zfoo {
 
diff --git a/protocol/src/test/javascript/main.spec.js b/protocol/src/test/javascript/main.spec.js
index 3b08957e..887dc672 100644
--- a/protocol/src/test/javascript/main.spec.js
+++ b/protocol/src/test/javascript/main.spec.js
@@ -5,7 +5,7 @@ const fs = require('fs');
 
 describe('jsProtocolTest', () => {
     it('complexObjectTest', () => {
-        const data = fs.readFileSync('resources\\ComplexObject.bytes');
+        const data = fs.readFileSync('../resources/ComplexObject.bytes');
 
         ProtocolManager.initProtocol();