From 444aa2c403f7361921c93f6965d40bd36b31ef27 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 21 Jun 2024 11:27:04 +0800
Subject: [PATCH] 1

---
 server/marketserver/mt/Item.go          |  2 +-
 server/marketserver/mt/export.go        |  4 ++--
 server/marketserver/mtb/mtb.auto_gen.go | 10 +++++-----
 server/marketserver/proto/mt.proto      |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/server/marketserver/mt/Item.go b/server/marketserver/mt/Item.go
index 7f3672d7..3b634625 100644
--- a/server/marketserver/mt/Item.go
+++ b/server/marketserver/mt/Item.go
@@ -24,7 +24,7 @@ func (this *ItemTable) Search(name string, itemIds map[int32]int32) {
 	this.Traverse(
 		func (ele *Item) bool {
 			if strings.Contains(ele.lowerName, name) {
-				itemIds[ele.GetItemId()] = 1
+				itemIds[ele.GetId()] = 1
 			}
 			return true
 		})
diff --git a/server/marketserver/mt/export.go b/server/marketserver/mt/export.go
index dc504f3b..6c7b6aea 100644
--- a/server/marketserver/mt/export.go
+++ b/server/marketserver/mt/export.go
@@ -42,8 +42,8 @@ var Table = f5.New(func(this *table) {
 	})
 
 	this.Item = f5.New(func(this *ItemTable) {
-		this.FileName = "../config/item.json"
-		this.PrimKey = ""
+		this.FileName = "../res/item@item.json"
+		this.PrimKey = "id"
 	})
 
 	this.Contract = f5.New(func(this *ContractTable) {
diff --git a/server/marketserver/mtb/mtb.auto_gen.go b/server/marketserver/mtb/mtb.auto_gen.go
index 1246d0f7..8efa0238 100644
--- a/server/marketserver/mtb/mtb.auto_gen.go
+++ b/server/marketserver/mtb/mtb.auto_gen.go
@@ -56,7 +56,7 @@ type Config struct {
 
 type Item struct {
         name string
-        item_id int32
+        id int32
 
         _flags1_ uint64
         _flags2_ uint64
@@ -245,11 +245,11 @@ func (this *Item) HasName() bool {
         return (this._flags1_ & (uint64(1) << 1)) > 0
 }
 
-func (this *Item) GetItemId() int32 {
-        return this.item_id
+func (this *Item) GetId() int32 {
+        return this.id
 }
 
-func (this *Item) HasItemId() bool {
+func (this *Item) HasId() bool {
         return (this._flags1_ & (uint64(1) << 2)) > 0
 }
 
@@ -315,7 +315,7 @@ func (this *Config) LoadFromKv(kv map[string]interface{}) {
 
 func (this *Item) LoadFromKv(kv map[string]interface{}) {
         f5.ReadMetaTableField(&this.name, "name", &this._flags1_, 1, kv)
-        f5.ReadMetaTableField(&this.item_id, "item_id", &this._flags1_, 2, kv)
+        f5.ReadMetaTableField(&this.id, "id", &this._flags1_, 2, kv)
 }
 
 func (this *Contract) LoadFromKv(kv map[string]interface{}) {
diff --git a/server/marketserver/proto/mt.proto b/server/marketserver/proto/mt.proto
index 87ed067e..4871a69a 100644
--- a/server/marketserver/proto/mt.proto
+++ b/server/marketserver/proto/mt.proto
@@ -45,7 +45,7 @@ message Config
 message Item
 {
     optional string name = 1;
-    optional int32 item_id = 2;
+    optional int32 id = 2;
 }
 
 message Contract