From e698f97dbe0aa609171bca623e69609ae3e49697 Mon Sep 17 00:00:00 2001
From: azw <vcl_delphi@126.com>
Date: Wed, 1 Nov 2023 13:12:57 +0000
Subject: [PATCH] 1

---
 server/notifyserver/tools/pbtools/app.js | 54 ++++++------------------
 1 file changed, 13 insertions(+), 41 deletions(-)

diff --git a/server/notifyserver/tools/pbtools/app.js b/server/notifyserver/tools/pbtools/app.js
index 14cc0a8..290b76d 100644
--- a/server/notifyserver/tools/pbtools/app.js
+++ b/server/notifyserver/tools/pbtools/app.js
@@ -65,23 +65,20 @@ class PBTools {
   }
 
   async genCsAutoGen() {
-    let data = `
-use std::rc::{Rc, Weak};
+    let data =
+`use std::rc::{Rc, Weak};
 use std::cell::RefCell;
 
-pub type CsNetMsgHandler = f9.NetMsgHandler<MsgHandler>;
-
-pub struct MsgHandlerImpl {
-}
-
-static mut handlers [2000]Option<CsNetMsgHandler>
+//static mut handlers [2000]Option<CsNetMsgHandler>
 
+/*
 func GetNetMsgHandler(msgId uint16) Option<CsNetMsgHandler> {
 //        handler := handlers[msgId]
 //        return handler
           return None
-}
+}*/
 
+/*
 func DispatchMsg(handler *CsNetMsgHandler, hdr *f5.MsgHdr, msgHandler MsgHandler) {
         handler.Cb(hdr, msgHandler)
 }
@@ -97,49 +94,24 @@ func ParsePb(msgId uint16, data []byte) interface{} {
                 return nil
         }
         return handler.ParseCb(data)
-}
+}*/
 `;
     data += `
-type MsgHandler interface {`;
+pub trait MsgHandler {`;
     this.csProtoPb.nested.cs.nestedArray.forEach(
       (item) => {
         if (item.name[0] == 'C' &&
             item.name[1] == 'M') {
           data += `
-        ${item.name}(*f5.MsgHdr, *${item.name})`;
+
+    ${item.name}(&self, _: &f9.MsgHdr, _: Rc::<RefCell::${item.name}>>) {
+        panic!("not implement");
+    }`;
         }
       });
     data += `
 }
 `;
-    this.csProtoPb.nested.cs.nestedArray.forEach(
-      (item) => {
-        if (item.name[0] == 'C' &&
-            item.name[1] == 'M') {
-          data += `
-func (this *MsgHandlerImpl) ${item.name}(hdr *f5.MsgHdr, msg *${item.name}) {
-}
-`;
-        }
-      });
-    this.csProtoPb.nested.cs.nestedArray.forEach(
-      (item) => {
-        if (item.name[0] == 'C' &&
-            item.name[1] == 'M') {
-          data += `
-func (this *${item.name}) GetNetMsgId() uint16 {
-        return uint16(CMMessageIdE__${item.name})
-}
-`;
-        } else if (item.name[0] == 'S' &&
-                   item.name[1] == 'M') {
-          data += `
-func (this *${item.name}) GetNetMsgId() uint16 {
-        return uint16(SMMessageIdE__${item.name})
-}
-`;
-        }
-      });
     data += `
 func init() {
 `;
@@ -164,7 +136,7 @@ func init() {
       });
     data += `
 }`;
-    //fs.writeFileSync('./src/cs_auto_gen.rs', data);
+    fs.writeFileSync('./src/cs/cs_auto_gen.rs', data);
   }
 
   async genSsAutoGen() {