From 28662526eee29a85d8d5f183e92c9536798416d7 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 12 Aug 2023 15:16:14 +0800
Subject: [PATCH] 1

---
 server/imserver/mtb/mtb.auto_gen.go |  2 ++
 third_party/f5                      |  2 +-
 third_party/q5                      |  2 +-
 tools/pbtools/app.js                | 23 +++++++++++++++++++----
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/server/imserver/mtb/mtb.auto_gen.go b/server/imserver/mtb/mtb.auto_gen.go
index 782b3264..369c849d 100644
--- a/server/imserver/mtb/mtb.auto_gen.go
+++ b/server/imserver/mtb/mtb.auto_gen.go
@@ -8,3 +8,5 @@ func (this *Server) GetListenPort() int32 {
         return this.listen_port
 }
 
+func (this *Server) LoadFromKv(kv map[string]interface{}) {
+}
diff --git a/third_party/f5 b/third_party/f5
index 22825917..07ab6ec2 160000
--- a/third_party/f5
+++ b/third_party/f5
@@ -1 +1 @@
-Subproject commit 2282591789752dfad7522c2c5068ff9d8d7cc9df
+Subproject commit 07ab6ec2aaeff9115cb3ccdca7a2bc04225dea0f
diff --git a/third_party/q5 b/third_party/q5
index 490774a7..2418793e 160000
--- a/third_party/q5
+++ b/third_party/q5
@@ -1 +1 @@
-Subproject commit 490774a7a352b1209d40346bb254556ea194814e
+Subproject commit 2418793e3d7eaf4229ddc272c4703cd2aed138a5
diff --git a/tools/pbtools/app.js b/tools/pbtools/app.js
index 8790345b..9e5ff68e 100644
--- a/tools/pbtools/app.js
+++ b/tools/pbtools/app.js
@@ -175,9 +175,6 @@ func init() {
   async genMtbAutoGen() {
     let data = `package mtb
 
-import (
-        "f5"
-)
 `;
     this.mtPb.nested.mt.nestedArray.forEach(
       (item) => {
@@ -185,7 +182,6 @@ import (
         item.fieldsArray.forEach
         (
           (item2, index) => {
-            data += `        f5.BaseMetaTableElement\n`;
             data += `        ${item2.name} ` + this.dumpClassField(item, item2, index) + `\n`;
           }
         );
@@ -207,6 +203,25 @@ import (
         );
       }
     );
+    this.mtPb.nested.mt.nestedArray.forEach(
+      (item) =>  {
+        data += `
+func (this *${item.name}) LoadFromKv(map[string]interface{}) {
+`;
+        item.fieldsArray.forEach
+        (
+          (item2, index) => {
+            /*
+            const newName = this.converUpperCamelCaseName(item2.name);
+            data += `func (this *${item.name}) Get${newName}() ` +
+              this.dumpClassField(item, item2, index) + ` {\n`;
+            data += `        return this.${item2.name}\n`;
+            data += `}\n`;*/
+          }
+        );
+        data += '}\n';
+      }
+    );
     fs.writeFileSync('./mtb/mtb.auto_gen.go', data);
   }