diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c83e7c40..ff2a2a68 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,15 +4,32 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -31,6 +48,9 @@
-
+
+
+
+
+
+
+
@@ -68,6 +95,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -84,4 +125,15 @@
true
+
+
+
+
+ file://$PROJECT_DIR$/server/adminserver/main.go
+ 7
+
+
+
+
+
\ No newline at end of file
diff --git a/server/adminserver/mt/Permission.go b/server/adminserver/mt/Permission.go
index 162e18f4..15605930 100644
--- a/server/adminserver/mt/Permission.go
+++ b/server/adminserver/mt/Permission.go
@@ -1,11 +1,10 @@
package mt
import (
- "bufio"
"encoding/json"
+ "f5"
"fmt"
"main/constant"
- "os"
"q5"
"strings"
)
@@ -26,9 +25,7 @@ func (this *PermissionTable) IsNoLoad() bool {
func (this *PermissionTable) Load() {
this.accountPermission = new(q5.ConcurrentMap[string, *Permission])
{
- if f, err := os.Open("../config/permission.json"); err == nil {
- jsonStr, _ := bufio.NewReader(f).ReadString(0)
-
+ if jsonStr, err := f5.ReadJsonFile("../config/permission.json"); err == nil {
type cfgPermission struct {
API []string `json:"api"`
UI []string `json:"ui"`
diff --git a/server/backtask/mt/Contract.go b/server/backtask/mt/Contract.go
index cb56e6db..67d33bde 100644
--- a/server/backtask/mt/Contract.go
+++ b/server/backtask/mt/Contract.go
@@ -1,22 +1,21 @@
package mt
import (
- "q5"
- "fmt"
- "os"
- "strings"
"encoding/json"
- "bufio"
+ "f5"
+ "fmt"
+ "q5"
+ "strings"
)
type Contract struct {
- netId int32
- name string
+ netId int32
+ name string
address string
}
type ContractTable struct {
- netIdNameHash *q5.ConcurrentMap[string, *Contract]
+ netIdNameHash *q5.ConcurrentMap[string, *Contract]
netIdAddressHash *q5.ConcurrentMap[string, *Contract]
}
@@ -41,8 +40,7 @@ func (this *ContractTable) Load() {
this.netIdAddressHash = new(q5.ConcurrentMap[string, *Contract])
nets := []interface{}{}
{
- if f, err := os.Open("../config/nets.json"); err == nil {
- jsonStr, _ := bufio.NewReader(f).ReadString(0)
+ if jsonStr, err := f5.ReadJsonFile("../config/nets.json"); err == nil {
if err := json.Unmarshal([]byte(jsonStr), &nets); err != nil {
panic(fmt.Sprintf("load metafile json decode error %s %s", "nets.json", err))
}
@@ -54,10 +52,9 @@ func (this *ContractTable) Load() {
for _, val := range nets {
netId := q5.SafeToInt32(val)
fileName := fmt.Sprintf("../config/nets/%d/contract.json", netId)
- if f, err := os.Open(fileName); err == nil {
- jsonStr, _ := bufio.NewReader(f).ReadString(0)
+ if jsonStr, err := f5.ReadJsonFile(fileName); err == nil {
contracts := []struct {
- Name string `json:"name"`
+ Name string `json:"name"`
Address string `json:"address"`
}{}
if err := json.Unmarshal([]byte(jsonStr), &contracts); err != nil {
@@ -115,7 +112,7 @@ func (this *ContractTable) GetByNetIdAddress(netId int32, address string) *Contr
}
func (this *ContractTable) Traverse(cb func(*Contract) bool) {
- this.netIdNameHash.Range(func (k string, v *Contract) bool {
+ this.netIdNameHash.Range(func(k string, v *Contract) bool {
return cb(v)
})
}
diff --git a/server/light_backtask/mt/Contract.go b/server/light_backtask/mt/Contract.go
index cb56e6db..67d33bde 100644
--- a/server/light_backtask/mt/Contract.go
+++ b/server/light_backtask/mt/Contract.go
@@ -1,22 +1,21 @@
package mt
import (
- "q5"
- "fmt"
- "os"
- "strings"
"encoding/json"
- "bufio"
+ "f5"
+ "fmt"
+ "q5"
+ "strings"
)
type Contract struct {
- netId int32
- name string
+ netId int32
+ name string
address string
}
type ContractTable struct {
- netIdNameHash *q5.ConcurrentMap[string, *Contract]
+ netIdNameHash *q5.ConcurrentMap[string, *Contract]
netIdAddressHash *q5.ConcurrentMap[string, *Contract]
}
@@ -41,8 +40,7 @@ func (this *ContractTable) Load() {
this.netIdAddressHash = new(q5.ConcurrentMap[string, *Contract])
nets := []interface{}{}
{
- if f, err := os.Open("../config/nets.json"); err == nil {
- jsonStr, _ := bufio.NewReader(f).ReadString(0)
+ if jsonStr, err := f5.ReadJsonFile("../config/nets.json"); err == nil {
if err := json.Unmarshal([]byte(jsonStr), &nets); err != nil {
panic(fmt.Sprintf("load metafile json decode error %s %s", "nets.json", err))
}
@@ -54,10 +52,9 @@ func (this *ContractTable) Load() {
for _, val := range nets {
netId := q5.SafeToInt32(val)
fileName := fmt.Sprintf("../config/nets/%d/contract.json", netId)
- if f, err := os.Open(fileName); err == nil {
- jsonStr, _ := bufio.NewReader(f).ReadString(0)
+ if jsonStr, err := f5.ReadJsonFile(fileName); err == nil {
contracts := []struct {
- Name string `json:"name"`
+ Name string `json:"name"`
Address string `json:"address"`
}{}
if err := json.Unmarshal([]byte(jsonStr), &contracts); err != nil {
@@ -115,7 +112,7 @@ func (this *ContractTable) GetByNetIdAddress(netId int32, address string) *Contr
}
func (this *ContractTable) Traverse(cb func(*Contract) bool) {
- this.netIdNameHash.Range(func (k string, v *Contract) bool {
+ this.netIdNameHash.Range(func(k string, v *Contract) bool {
return cb(v)
})
}
diff --git a/server/marketserver/mt/Contract.go b/server/marketserver/mt/Contract.go
index e5d406d1..8d95743c 100644
--- a/server/marketserver/mt/Contract.go
+++ b/server/marketserver/mt/Contract.go
@@ -1,21 +1,20 @@
package mt
import (
- "q5"
- "fmt"
- "os"
- "strings"
"encoding/json"
- "bufio"
+ "f5"
+ "fmt"
+ "q5"
+ "strings"
)
type Contract struct {
- name string
+ name string
address string
}
type ContractTable struct {
- netIdNameHash *q5.ConcurrentMap[string, *Contract]
+ netIdNameHash *q5.ConcurrentMap[string, *Contract]
netIdAddressHash *q5.ConcurrentMap[string, *Contract]
}
@@ -36,8 +35,7 @@ func (this *ContractTable) Load() {
this.netIdAddressHash = new(q5.ConcurrentMap[string, *Contract])
nets := []interface{}{}
{
- if f, err := os.Open("../config/nets.json"); err == nil {
- jsonStr, _ := bufio.NewReader(f).ReadString(0)
+ if jsonStr, err := f5.ReadJsonFile("../config/nets.json"); err == nil {
if err := json.Unmarshal([]byte(jsonStr), &nets); err != nil {
panic(fmt.Sprintf("load metafile json decode error %s %s", "nets.json", err))
}
@@ -49,10 +47,9 @@ func (this *ContractTable) Load() {
for _, val := range nets {
netId := q5.SafeToInt32(val)
fileName := fmt.Sprintf("../config/nets/%d/contract.json", netId)
- if f, err := os.Open(fileName); err == nil {
- jsonStr, _ := bufio.NewReader(f).ReadString(0)
+ if jsonStr, err := f5.ReadJsonFile(fileName); err == nil {
contracts := []struct {
- Name string `json:"name"`
+ Name string `json:"name"`
Address string `json:"address"`
}{}
if err := json.Unmarshal([]byte(jsonStr), &contracts); err != nil {
@@ -109,7 +106,7 @@ func (this *ContractTable) GetByNetIdAddress(netId int32, address string) *Contr
}
func (this *ContractTable) Traverse(cb func(*Contract) bool) {
- this.netIdNameHash.Range(func (k string, v *Contract) bool {
+ this.netIdNameHash.Range(func(k string, v *Contract) bool {
return cb(v)
})
}
diff --git a/server/nftserver/mt/Contract.go b/server/nftserver/mt/Contract.go
index 48ea85e1..f340d032 100644
--- a/server/nftserver/mt/Contract.go
+++ b/server/nftserver/mt/Contract.go
@@ -1,16 +1,15 @@
package mt
import (
- "q5"
- "fmt"
- "os"
- "strings"
"encoding/json"
- "bufio"
+ "f5"
+ "fmt"
+ "q5"
+ "strings"
)
type Contract struct {
- name string
+ name string
address string
}
@@ -34,8 +33,7 @@ func (this *ContractTable) Load() {
this.netIdNameHash = new(q5.ConcurrentMap[string, *Contract])
nets := []interface{}{}
{
- if f, err := os.Open("../config/nets.json"); err == nil {
- jsonStr, _ := bufio.NewReader(f).ReadString(0)
+ if jsonStr, err := f5.ReadJsonFile("../config/nets.json"); err == nil {
if err := json.Unmarshal([]byte(jsonStr), &nets); err != nil {
panic(fmt.Sprintf("load metafile json decode error %s %s", "nets.json", err))
}
@@ -47,10 +45,9 @@ func (this *ContractTable) Load() {
for _, val := range nets {
netId := q5.SafeToInt32(val)
fileName := fmt.Sprintf("../config/nets/%d/contract.json", netId)
- if f, err := os.Open(fileName); err == nil {
- jsonStr, _ := bufio.NewReader(f).ReadString(0)
+ if jsonStr, err := f5.ReadJsonFile(fileName); err == nil {
contracts := []struct {
- Name string `json:"name"`
+ Name string `json:"name"`
Address string `json:"address"`
}{}
if err := json.Unmarshal([]byte(jsonStr), &contracts); err != nil {
diff --git a/third_party/f5 b/third_party/f5
index 461f66af..8d8e92d3 160000
--- a/third_party/f5
+++ b/third_party/f5
@@ -1 +1 @@
-Subproject commit 461f66af6a994d308e6db1b5ac660e1ed3fd2e5f
+Subproject commit 8d8e92d31e2dfb27c7c87a2b5f92fe71dae9724d
diff --git a/third_party/q5 b/third_party/q5
index d40b258a..ba4b733a 160000
--- a/third_party/q5
+++ b/third_party/q5
@@ -1 +1 @@
-Subproject commit d40b258a47c4fd8f74a2afe6b856827a3cd3253b
+Subproject commit ba4b733a804045ae931cbef0c2aebb8b1a636ed7