baigugu/ProjectWIND
1
0
Fork 0
forked from ProjectWIND/ProjectWIND
Code Pull Requests Activity

添加了数据库和配置项的api

Browse Source
This commit is contained in:
Thun_Ann 2025-02-25 08:49:59 +08:00
parent d5fedc873b
commit bb599fad28
3 changed files with 262 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
core/api.go
View File

@ -2,7 +2,6 @@ package core
import ( import (
"ProjectWIND/LOG" "ProjectWIND/LOG"
"ProjectWIND/database"
"ProjectWIND/wba" "ProjectWIND/wba"
"crypto/rand" "crypto/rand"
"fmt" "fmt"
@ -821,82 +820,6 @@ func (a *apiInfo) Log(content string, args ...interface{}) {
//database模块 //database模块
//数据库部分允许字符串变量的读写操作，允许获取配置项操作 //数据库部分允许字符串变量的读写操作，允许获取配置项操作
func (a *apiInfo) VarSet(app wba.AppInfo, datamap string, unit string, id string, key string, value string) {
database.Set(app, datamap, unit, id, key, value)
}
func (a *apiInfo) VarGet(app wba.AppInfo, datamap string, unit string, id string, key string) (string, bool) {
res, ok := database.Get(app, datamap, unit, id, key, false)
if !ok {
return "", false
}
resStr, ok := res.(string)
if !ok {
return "", false
}
return resStr, true
}
func (a *apiInfo) GetIntConfig(app wba.AppInfo, datamap string, key string) (int64, bool) {
res, ok := database.Get(app, datamap, "config", "number", key, true)
if !ok {
return 0, false
}
resInt, ok := res.(int64)
if !ok {
return 0, false
}
return resInt, true
}
func (a *apiInfo) GetStringConfig(app wba.AppInfo, datamap string, key string) (string, bool) {
res, ok := database.Get(app, datamap, "config", "string", key, true)
if !ok {
return "", false
}
resStr, ok := res.(string)
if !ok {
return "", false
}
return resStr, true
}
func (a *apiInfo) GetFloatConfig(app wba.AppInfo, datamap string, key string) (float64, bool) {
res, ok := database.Get(app, datamap, "config", "float", key, true)
if !ok {
return 0, false
}
resFloat, ok := res.(float64)
if !ok {
return 0, false
}
return resFloat, true
}
func (a *apiInfo) GetIntSliceConfig(app wba.AppInfo, datamap string, key string) ([]int64, bool) {
res, ok := database.Get(app, datamap, "config", "number_slice", key, true)
if !ok {
return nil, false
}
resSlice, ok := res.([]int64)
if !ok {
return nil, false
}
return resSlice, true
}
func (a *apiInfo) GetStringSliceConfig(app wba.AppInfo, datamap string, key string) ([]string, bool) {
res, ok := database.Get(app, datamap, "config", "string_slice", key, true)
if !ok {
return nil, false
}
resSlice, ok := res.([]string)
if !ok {
return nil, false
}
return resSlice, true
}
// 文件管理模块 // 文件管理模块
//TODO: 文件管理模块待实现 //TODO: 文件管理模块待实现

227
database/database.go
View File

@ -2,7 +2,6 @@ package database
import ( import (
"ProjectWIND/LOG" "ProjectWIND/LOG"
"ProjectWIND/wba"
"encoding/json" "encoding/json"
"errors" "errors"
"os" "os"
@ -83,7 +82,7 @@ func (this *Database) addDatamap(id string) {
// func hash(word string) string { // func hash(word string) string {
// hash, err := bcrypt.GenerateFromPassword([]byte(word), bcrypt.DefaultCost) // hash, err := bcrypt.GenerateFromPassword([]byte(word), bcrypt.DefaultCost)
// if err != nil { // if err != nil {
// LOG.ERROR("[ERROR]Error while hash password: %v", err) // LOG.Error("[Error]Error while hash password: %v", err)
// return "" // return ""
// } // }
// return string(hash) // return string(hash)
@ -98,7 +97,7 @@ func folderCheck(filename string) {
if _, err := os.Stat(filename); os.IsNotExist(err) { if _, err := os.Stat(filename); os.IsNotExist(err) {
err := os.MkdirAll(filename, 0755) err := os.MkdirAll(filename, 0755)
if err != nil { if err != nil {
LOG.FATAL("[ERROR]Error occured while create folder: %v", err) LOG.Fatal("[Error]Error occured while create folder: %v", err)
} }
} }
} }
@ -110,12 +109,12 @@ func fileCheck(filename string) {
if _, err := os.Stat(filename); os.IsNotExist(err) { if _, err := os.Stat(filename); os.IsNotExist(err) {
file, err := os.Create(filename) file, err := os.Create(filename)
if err != nil { if err != nil {
LOG.FATAL("[ERROR]Error occured while create file: %v", err) LOG.Fatal("[Error]Error occured while create file: %v", err)
} }
defer func(file *os.File) { defer func(file *os.File) {
err := file.Close() err := file.Close()
if err != nil { if err != nil {
LOG.FATAL("[ERROR]Error occured while close file: %v", err) LOG.Fatal("[Error]Error occured while close file: %v", err)
} }
}(file) }(file)
} }
@ -124,13 +123,13 @@ func fileCheck(filename string) {
func writeContent(f *os.File, str string) error { func writeContent(f *os.File, str string) error {
// 写入内容到文件 // 写入内容到文件
if f == nil { if f == nil {
// log.Printf("[ERROR]file is nil") // log.Printf("[Error]file is nil")
LOG.ERROR("[ERROR]file is nil") LOG.Error("[Error]file is nil")
return errors.New("file is nil") return errors.New("file is nil")
} }
_, err := f.Write([]byte(str)) _, err := f.Write([]byte(str))
if err != nil { if err != nil {
LOG.ERROR("[ERROR]Error while write content to file: %v", err) LOG.Error("[Error]Error while write content to file: %v", err)
return err return err
} }
return nil return nil
@ -152,18 +151,18 @@ func getCorePassword() string {
fileCheck(filename) fileCheck(filename)
dataJson, err := printContent(filename) dataJson, err := printContent(filename)
if err != nil { if err != nil {
LOG.ERROR("[WARNING]Error while read file %s: %v") LOG.Error("[Error]Error while read file %s: %v", filename, err)
return "" return ""
} }
config := make(map[string]string) config := make(map[string]string)
err = json.Unmarshal([]byte(dataJson), config) err = json.Unmarshal([]byte(dataJson), config)
if err != nil { if err != nil {
LOG.WARN("[WARNING]Error while unmarshal data: %v", err) LOG.Error("[Error]Error while unmarshal data: %v", err)
return "" return ""
} }
password, ok := config["password"] password, ok := config["password"]
if !ok { if !ok {
LOG.WARN("[WARNING]Password not found in core.json") LOG.Warn("[Warning]Password not found in core.json")
return "" return ""
} }
return password return password
@ -173,13 +172,13 @@ func saveData(db *Database) error {
// 保存数据到文件 // 保存数据到文件
dataJson, err := json.Marshal(db) dataJson, err := json.Marshal(db)
if err != nil { if err != nil {
LOG.ERROR("[ERROR]:Error while marshal data: %v", err) LOG.Error("[Error]:Error while marshal data: %v", err)
return err return err
} }
filename := address filename := address
file, err := os.Create(filename) file, err := os.Create(filename)
if err != nil { if err != nil {
LOG.ERROR("[ERROR]:Error while create file %s: %v", filename, err) LOG.Error("[Error]:Error while create file %s: %v", filename, err)
return err return err
} }
writeContent(file, string(dataJson)) writeContent(file, string(dataJson))
@ -192,14 +191,14 @@ func loadData(db *Database) error {
fileCheck(filename) fileCheck(filename)
dataJson, err := printContent(filename) dataJson, err := printContent(filename)
if err != nil { if err != nil {
// log.Printf("[ERROR]:Error while read file %s: %v", filename, err) // log.Printf("[Error]:Error while read file %s: %v", filename, err)
LOG.ERROR("[ERROR]:Error while read file %s: %v", filename, err) LOG.Error("[Error]:Error while read file %s: %v", filename, err)
return err return err
} }
err = json.Unmarshal([]byte(dataJson), db) err = json.Unmarshal([]byte(dataJson), db)
if err != nil { if err != nil {
// log.Printf("[ERROR]:Error while unmarshal data: %v", err) // log.Printf("[Error]:Error while unmarshal data: %v", err)
LOG.WARN("[WARNING]:Error while unmarshal data: %v", err) LOG.Warn("[Warning]:Error while unmarshal data: %v", err)
return err return err
} }
return nil return nil
@ -212,11 +211,11 @@ func dataSet(datamap string, unit string, id string, key string, value interface
dm, ok := DB.Datamaps[datamap] dm, ok := DB.Datamaps[datamap]
if !ok { if !ok {
// 创建新数据表 // 创建新数据表
DB.Datamaps[datamap] = newDatamap(datamap) DB.addDatamap(datamap)
dm = DB.Datamaps[datamap] dm = DB.Datamaps[datamap]
} }
if !allowed && dm.Permission != "private" { if !allowed && dm.Permission != "private" {
LOG.WARN("[WARNING]:Permission denied") LOG.Warn("[Warning]:Permission denied")
return return
} }
switch unit { switch unit {
@ -225,52 +224,52 @@ func dataSet(datamap string, unit string, id string, key string, value interface
case "number": case "number":
valueInt64, ok := value.(int64) // 断言value为int64类型 valueInt64, ok := value.(int64) // 断言value为int64类型
if !ok { if !ok {
LOG.ERROR("[ERROR]:Value cannot be asserted to int64") LOG.Error("[Error]:Value cannot be asserted to int64")
return return
} }
dm.Configs.Number[key] = valueInt64 // 使用断言后的int64值 dm.Configs.Number[key] = valueInt64 // 使用断言后的int64值
case "string": case "string":
valueStr, ok := value.(string) // 断言value为string类型 valueStr, ok := value.(string) // 断言value为string类型
if !ok { if !ok {
LOG.ERROR("[ERROR]:Value cannot be asserted to string") LOG.Error("[Error]:Value cannot be asserted to string")
return return
} }
dm.Configs.String[key] = valueStr // 使用断言后的string值 dm.Configs.String[key] = valueStr // 使用断言后的string值
case "float": case "float":
valueFloat64, ok := value.(float64) // 断言value为float64类型 valueFloat64, ok := value.(float64) // 断言value为float64类型
if !ok { if !ok {
LOG.ERROR("[ERROR]:Value cannot be asserted to float64") LOG.Error("[Error]:Value cannot be asserted to float64")
return return
} }
dm.Configs.Float[key] = valueFloat64 // 使用断言后的float64值 dm.Configs.Float[key] = valueFloat64 // 使用断言后的float64值
case "number_slice": case "number_slice":
valueInt64Slice, ok := value.([]int64) // 断言value为[]int64类型 valueInt64Slice, ok := value.([]int64) // 断言value为[]int64类型
if !ok { if !ok {
LOG.ERROR("[ERROR]:Value cannot be asserted to []int64") LOG.Error("[Error]:Value cannot be asserted to []int64")
return return
} }
dm.Configs.Number_Slice[key] = valueInt64Slice // 使用断言后的[]int64值 dm.Configs.Number_Slice[key] = valueInt64Slice // 使用断言后的[]int64值
case "string_slice": case "string_slice":
valueStrSlice, ok := value.([]string) // 断言value为[]string类型 valueStrSlice, ok := value.([]string) // 断言value为[]string类型
if !ok { if !ok {
LOG.ERROR("[ERROR]:Value cannot be asserted to []string") LOG.Error("[Error]:Value cannot be asserted to []string")
return return
} }
dm.Configs.String_Slice[key] = valueStrSlice // 使用断言后的[]string值 dm.Configs.String_Slice[key] = valueStrSlice // 使用断言后的[]string值
case "hash": case "hash":
valueStr, ok := value.(string) // 断言value为string类型 valueStr, ok := value.(string) // 断言value为string类型
if !ok { if !ok {
LOG.ERROR("[ERROR]:Value cannot be asserted to string") LOG.Error("[Error]:Value cannot be asserted to string")
return return
} }
dm.Configs.Hash = valueStr // 使用断言后的string值 dm.Configs.Hash = valueStr // 使用断言后的string值
default: default:
LOG.ERROR("[ERROR]:Invalid id %s", id) LOG.Error("[Error]:Invalid id %s", id)
} }
case "user": case "user":
valueStr, ok := value.(string) // 断言value为string类型 valueStr, ok := value.(string) // 断言value为string类型
if !ok { if !ok {
LOG.ERROR("[ERROR]:Value cannot be asserted to string") LOG.Error("[Error]:Value cannot be asserted to string")
return return
} }
user, ok := dm.Users[id] user, ok := dm.Users[id]
@ -288,7 +287,7 @@ func dataSet(datamap string, unit string, id string, key string, value interface
case "group": case "group":
valueStr, ok := value.(string) // 断言value为string类型 valueStr, ok := value.(string) // 断言value为string类型
if !ok { if !ok {
LOG.ERROR("[ERROR]:Value cannot be asserted to string") LOG.Error("[Error]:Value cannot be asserted to string")
return return
} }
group, ok := dm.Groups[id] group, ok := dm.Groups[id]
@ -306,7 +305,7 @@ func dataSet(datamap string, unit string, id string, key string, value interface
case "global": case "global":
valueStr, ok := value.(string) // 断言value为string类型 valueStr, ok := value.(string) // 断言value为string类型
if !ok { if !ok {
LOG.ERROR("[ERROR]:Value cannot be asserted to string") LOG.Error("[Error]:Value cannot be asserted to string")
return return
} }
global, ok := dm.Global[id] global, ok := dm.Global[id]
@ -322,18 +321,18 @@ func dataSet(datamap string, unit string, id string, key string, value interface
} }
global.Data[key] = valueStr // 使用断言后的string值 global.Data[key] = valueStr // 使用断言后的string值
default: default:
LOG.ERROR("[ERROR]:Invalid unit %s", unit) LOG.Error("[Error]:Invalid unit %s", unit)
} }
} }
func dataGet(datamap string, unit string, id string, key string, allowed bool) (interface{}, bool) { func dataGet(datamap string, unit string, id string, key string, allowed bool) (interface{}, bool) {
dm, ok := DB.Datamaps[datamap] dm, ok := DB.Datamaps[datamap]
if !ok { if !ok {
LOG.WARN("[WARNING]:Datamap %s not found", datamap) LOG.Warn("[Warning]:Datamap %s not found", datamap)
return "", false return "", false
} }
if !allowed && dm.Permission != "private" { if !allowed && dm.Permission != "private" {
LOG.WARN("[WARNING]:Permission denied") LOG.Warn("[Warning]:Permission denied")
return "", false return "", false
} }
switch unit { switch unit {
@ -342,104 +341,104 @@ func dataGet(datamap string, unit string, id string, key string, allowed bool) (
case "number": case "number":
value, ok := dm.Configs.Number[key] value, ok := dm.Configs.Number[key]
if !ok { if !ok {
LOG.WARN("[WARNING]:Config %s not found", key) LOG.Warn("[Warning]:Config %s not found", key)
return 0, false return 0, false
} }
return value, true return value, true
case "string": case "string":
value, ok := dm.Configs.String[key] value, ok := dm.Configs.String[key]
if !ok { if !ok {
LOG.WARN("[WARNING]:Config %s not found", key) LOG.Warn("[Warning]:Config %s not found", key)
return "", false return "", false
} }
return value, true return value, true
case "float": case "float":
value, ok := dm.Configs.Float[key] value, ok := dm.Configs.Float[key]
if !ok { if !ok {
LOG.WARN("[WARNING]:Config %s not found", key) LOG.Warn("[Warning]:Config %s not found", key)
return 0.0, false return 0.0, false
} }
return value, true return value, true
case "number_slice": case "number_slice":
value, ok := dm.Configs.Number_Slice[key] value, ok := dm.Configs.Number_Slice[key]
if !ok { if !ok {
LOG.WARN("[WARNING]:Config %s not found", key) LOG.Warn("[Warning]:Config %s not found", key)
return []int64{}, false return []int64{}, false
} }
return value, true return value, true
case "string_slice": case "string_slice":
value, ok := dm.Configs.String_Slice[key] value, ok := dm.Configs.String_Slice[key]
if !ok { if !ok {
LOG.WARN("[WARNING]:Config %s not found", key) LOG.Warn("[Warning]:Config %s not found", key)
return []string{}, false return []string{}, false
} }
return value, true return value, true
case "hash": case "hash":
return dm.Configs.Hash, true return dm.Configs.Hash, true
default: default:
LOG.ERROR("[ERROR]:Invalid id %s", id) LOG.Error("[Error]:Invalid id %s", id)
return "", false return "", false
} }
case "user": case "user":
user, ok := dm.Users[id] user, ok := dm.Users[id]
if !ok { if !ok {
LOG.WARN("[WARNING]:User %s not found", id) LOG.Warn("[Warning]:User %s not found", id)
return "", false return "", false
} }
if user.Data == nil { if user.Data == nil {
LOG.WARN("[WARNING]:User %s's data is nil", id) LOG.Warn("[Warning]:User %s's data is nil", id)
return "", false return "", false
} }
value, ok := user.Data[key] value, ok := user.Data[key]
if !ok { if !ok {
LOG.WARN("[WARNING]:User %s's data %s not found", id, key) LOG.Warn("[Warning]:User %s's data %s not found", id, key)
return "", false return "", false
} }
return value, true return value, true
case "group": case "group":
group, ok := dm.Groups[id] group, ok := dm.Groups[id]
if !ok { if !ok {
LOG.WARN("[WARNING]:Group %s not found", id) LOG.Warn("[Warning]:Group %s not found", id)
return "", false return "", false
} }
if group.Data == nil { if group.Data == nil {
LOG.WARN("[WARNING]:Group %s's data is nil", id) LOG.Warn("[Warning]:Group %s's data is nil", id)
return "", false return "", false
} }
value, ok := group.Data[key] value, ok := group.Data[key]
if !ok { if !ok {
LOG.WARN("[WARNING]:Group %s's data %s not found", id, key) LOG.Warn("[Warning]:Group %s's data %s not found", id, key)
return "", false return "", false
} }
return value, true return value, true
case "global": case "global":
global, ok := dm.Global[id] global, ok := dm.Global[id]
if !ok { if !ok {
LOG.WARN("[WARNING]:Global %s not found", id) LOG.Warn("[Warning]:Global %s not found", id)
return "", false return "", false
} }
if global.Data == nil { if global.Data == nil {
LOG.WARN("[WARNING]:Global data of %s is nil", id) LOG.Warn("[Warning]:Global data of %s is nil", id)
return "", false return "", false
} }
value, ok := global.Data[key] value, ok := global.Data[key]
if !ok { if !ok {
LOG.WARN("[WARNING]:Global data of %s's %s not found", id, key) LOG.Warn("[Warning]:Global data of %s's %s not found", id, key)
return "", false return "", false
} }
return value, true return value, true
default: default:
LOG.ERROR("[ERROR]:Invalid category %s", category) LOG.Error("[Error]:Invalid unit %s", unit)
return "", false return "", false
} }
} }
func initializeDatabase() *Database { func initializeDatabase() *Database {
// 启动并检查程序 // 启动并检查程序
LOG.INFO("Starting database ...") LOG.Info("Starting database ...")
db := newDatabase() db := newDatabase()
loadData(&db) loadData(&db)
LOG.INFO("Database started successfully.") LOG.Info("Database started successfully.")
return &db return &db
} }
@ -460,12 +459,12 @@ func Start() {
select { select {
case <-dataChan: case <-dataChan:
// 接收到信号，保存数据并退出程序 // 接收到信号，保存数据并退出程序
LOG.INFO("Received signal, saving data and exiting...") LOG.Info("Received signal, saving data and exiting...")
saveData(DB) saveData(DB)
os.Exit(0) os.Exit(0)
case <-saveTicker.C: case <-saveTicker.C:
// 定时保存数据 // 定时保存数据
LOG.INFO("Saving data automatically...") LOG.Info("Saving data automatically...")
saveData(DB) saveData(DB)
} }
} }
@ -481,60 +480,146 @@ func CreatePublicDatamap(id string) {
DB.Datamaps[id] = db DB.Datamaps[id] = db
} }
func Get(app wba.AppInfo, datamap string, unit string, id string, key string, isGettingConfig bool) (interface{}, bool) { func Get(appName string, datamap string, unit string, id string, key string, isGettingConfig bool) (interface{}, bool) {
// 查询数据 // 查询数据
if unit == "config" && id == "hash" { if unit == "config" && id == "hash" {
// app不允许访问hash数据 // app不允许访问hash数据
LOG.ERROR("[ERROR]:App %s is not allowed to access hash data", app.Name) LOG.Error("[Error]:App %s is not allowed to access hash data", appName)
return "", false return "", false
} }
if !isGettingConfig && unit == "config" { if !isGettingConfig && unit == "config" {
// 不允许在非config数据表中访问config数据 // 不允许在非config数据表中访问config数据
LOG.ERROR("[ERROR]:App %s is not allowed to access config data", app.Name) LOG.Error("[Error]:App %s is not allowed to access config data", appName)
return "", false return "", false
} }
if app.Name != datamap { if appName != datamap {
// 需要master密码来访问其他app的数据 // 需要master密码来访问其他app的数据
hash := getCorePassword() hash := getCorePassword()
if hash == "" { if hash == "" {
// 删除数据表哈希 // 删除数据表哈希
dataSet(app.Name, "config", "hash", "", "", false) dataSet(appName, "config", "hash", "", "", false)
} }
datahash, ok := dataGet(app.Name, "config", "hash", "", false) datahash, ok := dataGet(appName, "config", "hash", "", false)
if !ok { if !ok {
LOG.ERROR("[ERROR]:Error while get hash of %s", app.Name) LOG.Error("[Error]:Error while get hash of %s", appName)
} }
if hash != datahash { if hash != datahash {
LOG.WARN("[WARNING]:App %s is not allowed to access data of %s", app.Name, datamap) LOG.Warn("[Warning]:App %s is not allowed to access data of %s", appName, datamap)
return dataGet(app.Name, unit, id, key, false) return dataGet(appName, unit, id, key, false)
} }
} }
return dataGet(app.Name, unit, id, key, true) return dataGet(appName, unit, id, key, true)
} }
func Set(app wba.AppInfo, datamap string, unit string, id string, key string, value interface{}) { func Set(appName string, datamap string, unit string, id string, key string, value interface{}) {
// 修改数据 // 修改数据
if unit == "config" { if unit == "config" {
// app不允许修改config数据 // app不允许修改config数据
LOG.ERROR("[ERROR]:App %s is not allowed to modify config data", app.Name) LOG.Error("[Error]:App %s is not allowed to modify config data", appName)
return return
} }
if app.Name != datamap { if appName != datamap {
// 需要master密码来访问其他app的数据 // 需要master密码来访问其他app的数据
hash := getCorePassword() hash := getCorePassword()
if hash == "" { if hash == "" {
// 删除数据表哈希 // 删除数据表哈希
dataSet(app.Name, "config", "hash", "", "", false) dataSet(appName, "config", "hash", "", "", false)
} }
datahash, ok := dataGet(app.Name, "config", "hash", "", false) datahash, ok := dataGet(appName, "config", "hash", "", false)
if !ok { if !ok {
LOG.ERROR("[ERROR]:Error while get hash of %s", app.Name) LOG.Error("[Error]:Error while get hash of %s", appName)
} }
if hash != datahash { if hash != datahash {
LOG.WARN("[WARNING]:App %s is not allowed to access data of %s", app.Name, datamap) LOG.Warn("[Warning]:App %s is not allowed to access data of %s", appName, datamap)
dataSet(app.Name, unit, id, key, value, false) dataSet(appName, unit, id, key, value, false)
} }
} }
dataSet(app.Name, unit, id, key, value, true) dataSet(appName, unit, id, key, value, true)
} }
type DatabaseHandlerImpl struct{}
func (dbh *DatabaseHandlerImpl) Set(appName string, datamap string, unit string, id string, key string, value interface{}) {
Set(appName, datamap, unit, id, key, value)
}
func (dbh *DatabaseHandlerImpl) Get(appName string, datamap string, unit string, id string, key string, isGettingConfig bool) (interface{}, bool) {
return Get(appName, datamap, unit, id, key, isGettingConfig)
}
// func VarSet(app wba.AppInfo, datamap string, unit string, id string, key string, value string) {
// Set(app.Name, datamap, unit, id, key, value)
// }
// func VarGet(app wba.AppInfo, datamap string, unit string, id string, key string) (string, bool) {
// res, ok := Get(app.Name, datamap, unit, id, key, false)
// if !ok {
// return "", false
// }
// resStr, ok := res.(string)
// if !ok {
// return "", false
// }
// return resStr, true
// }
// func GetIntConfig(app wba.AppInfo, datamap string, key string) (int64, bool) {
// res, ok := Get(app.Name, datamap, "config", "number", key, true)
// if !ok {
// return 0, false
// }
// resInt, ok := res.(int64)
// if !ok {
// return 0, false
// }
// return resInt, true
// }
// func GetStringConfig(app wba.AppInfo, datamap string, key string) (string, bool) {
// res, ok := Get(app.Name, datamap, "config", "string", key, true)
// if !ok {
// return "", false
// }
// resStr, ok := res.(string)
// if !ok {
// return "", false
// }
// return resStr, true
// }
// func GetFloatConfig(app wba.AppInfo, datamap string, key string) (float64, bool) {
// res, ok := Get(app.Name, datamap, "config", "float", key, true)
// if !ok {
// return 0, false
// }
// resFloat, ok := res.(float64)
// if !ok {
// return 0, false
// }
// return resFloat, true
// }
// func GetIntSliceConfig(app wba.AppInfo, datamap string, key string) ([]int64, bool) {
// res, ok := Get(app.Name, datamap, "config", "number_slice", key, true)
// if !ok {
// return nil, false
// }
// resSlice, ok := res.([]int64)
// if !ok {
// return nil, false
// }
// return resSlice, true
// }
// func GetStringSliceConfig(app wba.AppInfo, datamap string, key string) ([]string, bool) {
// res, ok := Get(app.Name, datamap, "config", "string_slice", key, true)
// if !ok {
// return nil, false
// }
// resSlice, ok := res.([]string)
// if !ok {
// return nil, false
// }
// return resSlice, true
// }

114
wba/wind.go
View File

@ -265,14 +265,9 @@ type WindStandardProtocolAPI interface {
Log(log string, args ...interface{}) Log(log string, args ...interface{})
} }
type Database interface { type DataBaseHandler interface {
VarSet(app AppInfo, datamap string, unit string, id string, key string, value string) Set(appName string, datamap string, unit string, id string, key string, value interface{})
VarGet(app AppInfo, datamap string, unit string, id string, key string) (string, bool) Get(appName string, datamap string, unit string, id string, key string, isGettingConfig bool) (interface{}, bool)
GetIntConfig(app AppInfo, datamap string, key string) (int64, bool)
GetStringConfig(app AppInfo, datamap string, key string) (string, bool)
GetFloatConfig(app AppInfo, datamap string, key string) (float64, bool)
GetIntSliceConfig(app AppInfo, datamap string, key string) ([]int64, bool)
GetStringSliceConfig(app AppInfo, datamap string, key string) ([]string, bool)
} }
type AppInfo struct { type AppInfo struct {
@ -292,6 +287,7 @@ type AppInfo struct {
MetaEventHandler func(msg MetaEventInfo) MetaEventHandler func(msg MetaEventInfo)
ScheduledTasks map[string]ScheduledTaskInfo ScheduledTasks map[string]ScheduledTaskInfo
API map[string]interface{} API map[string]interface{}
dbHandler DataBaseHandler
} }
func (ai AppInfo) Get() AppInfo { func (ai AppInfo) Get() AppInfo {
@ -311,6 +307,108 @@ func (ai *AppInfo) AddNoticeEventHandler(ScheduledTask ScheduledTaskInfo) {
ai.ScheduledTasks[ScheduledTask.Name] = ScheduledTask ai.ScheduledTasks[ScheduledTask.Name] = ScheduledTask
} }
func (ai *AppInfo) VarSet(datamap string, unit string, id string, key string, value string) {
if ai.dbHandler != nil {
ai.dbHandler.Set(ai.Name, datamap, unit, id, key, value)
}
}
// VarGet 获取变量
func (ai *AppInfo) VarGet(datamap string, unit string, id string, key string) (string, bool) {
if ai.dbHandler != nil {
res, ok := ai.dbHandler.Get(ai.Name, datamap, unit, id, key, false)
if !ok {
return "", false
}
resStr, ok := res.(string)
if !ok {
return "", false
}
return resStr, true
}
return "", false
}
// GetIntConfig 获取整数配置
func (ai *AppInfo) GetIntConfig(datamap string, key string) (int64, bool) {
if ai.dbHandler != nil {
res, ok := ai.dbHandler.Get(ai.Name, datamap, "config", "number", key, true)
if !ok {
return 0, false
}
resInt, ok := res.(int64)
if !ok {
return 0, false
}
return resInt, true
}
return 0, false
}
// GetStringConfig 获取字符串配置
func (ai *AppInfo) GetStringConfig(datamap string, key string) (string, bool) {
if ai.dbHandler != nil {
res, ok := ai.dbHandler.Get(ai.Name, datamap, "config", "string", key, true)
if !ok {
return "", false
}
resStr, ok := res.(string)
if !ok {
return "", false
}
return resStr, true
}
return "", false
}
// GetFloatConfig 获取浮点数配置
func (ai *AppInfo) GetFloatConfig(datamap string, key string) (float64, bool) {
if ai.dbHandler != nil {
res, ok := ai.dbHandler.Get(ai.Name, datamap, "config", "float", key, true)
if !ok {
return 0, false
}
resFloat, ok := res.(float64)
if !ok {
return 0, false
}
return resFloat, true
}
return 0, false
}
// GetIntSliceConfig 获取整数切片配置
func (ai *AppInfo) GetIntSliceConfig(datamap string, key string) ([]int64, bool) {
if ai.dbHandler != nil {
res, ok := ai.dbHandler.Get(ai.Name, datamap, "config", "number_slice", key, true)
if !ok {
return nil, false
}
resSlice, ok := res.([]int64)
if !ok {
return nil, false
}
return resSlice, true
}
return nil, false
}
// GetStringSliceConfig 获取字符串切片配置
func (ai *AppInfo) GetStringSliceConfig(datamap string, key string) ([]string, bool) {
if ai.dbHandler != nil {
res, ok := ai.dbHandler.Get(ai.Name, datamap, "config", "string_slice", key, true)
if !ok {
return nil, false
}
resSlice, ok := res.([]string)
if !ok {
return nil, false
}
return resSlice, true
}
return nil, false
}
type AppInfoOption func(ei *AppInfo) type AppInfoOption func(ei *AppInfo)
func WithName(name string) AppInfoOption { func WithName(name string) AppInfoOption {