fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
eson 2023-09-01 17:03:27 +08:00
parent 38d963b9a5
commit 7d9435ca29
2 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
server/info/internal/logic/infologic.go
View File

@ -44,6 +44,7 @@ var ModuleTable map[string]string = map[string]string{
type ModuleQuery struct {
TableName string
ModuleName string
Cond string
ModuleQuery map[string]struct{}
}
@ -55,7 +56,7 @@ func (mquery *ModuleQuery) EncodeQuery(field string) string {
if query != "" {
query = "." + query
}
qstr = append(qstr, []byte(fmt.Sprintf("'%s%s',%s ->> '$%s',", mquery.ModuleName, query, field, query))...)
qstr = append(qstr, []byte(fmt.Sprintf("'%s%s', JSON_EXTRACT(%s,'$%s'),", mquery.ModuleName, query, field, query))...)
}
if qstr[len(qstr)-1] == ',' {
qstr[len(qstr)-1] = ')'
@ -70,20 +71,21 @@ func (l *InfoLogic) Info(req *types.UserInfoRequest, userinfo *auth.UserInfo) (r
// 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data)
// userinfo 传入值时, 一定不为null
var cond string
var condUser string
switch userinfo.GetIdType() {
case auth.IDTYPE_User:
cond = fmt.Sprintf("user_id = %d", userinfo.UserId)
condUser = fmt.Sprintf("user_id = %d", userinfo.UserId)
case auth.IDTYPE_Guest:
cond = fmt.Sprintf("guest_id = %d", userinfo.GuestId)
condUser = fmt.Sprintf("guest_id = %d", userinfo.GuestId)
default:
cond = "user_id = 0 and guest_id = 0"
condUser = "user_id = 0 and guest_id = 0"
}
var mquerys map[string]*ModuleQuery = make(map[string]*ModuleQuery)
var metadict map[string]any = make(map[string]any)
for _, module := range req.Module {
if !check.CheckModuleQuery(module) {
return resp.SetStatusWithMessage(basic.CodeApiErr, fmt.Sprintf("%s format is error", module))
}
@ -100,11 +102,7 @@ func (l *InfoLogic) Info(req *types.UserInfoRequest, userinfo *auth.UserInfo) (r
}
moduleName := mlist[1]
cond = fmt.Sprintf("module = '%s' and %s", moduleName, cond)
if len(mlist) == 2 {
mlist = append(mlist, "")
}
cond := fmt.Sprintf("module = '%s' and %s", moduleName, condUser)
if mquery, ok := mquerys[mtable]; ok {
mquery.ModuleQuery[strings.Join(mlist[2:], ",")] = struct{}{}
@ -112,6 +110,7 @@ func (l *InfoLogic) Info(req *types.UserInfoRequest, userinfo *auth.UserInfo) (r
mquery := &ModuleQuery{
TableName: tname,
ModuleName: mtable + "." + moduleName,
Cond: cond,
ModuleQuery: map[string]struct{}{strings.Join(mlist[2:], ","): {}}}
mquerys[mtable] = mquery
}
@ -119,7 +118,7 @@ func (l *InfoLogic) Info(req *types.UserInfoRequest, userinfo *auth.UserInfo) (r
for _, mquery := range mquerys {
sqlstr := fmt.Sprintf("select id, module, %s as querydata from %s where %s order by ctime asc limit 1", mquery.EncodeQuery("metadata"), mquery.TableName, cond)
sqlstr := fmt.Sprintf("select id, module, %s as querydata from %s where %s order by ctime asc limit 1", mquery.EncodeQuery("metadata"), mquery.TableName, mquery.Cond)
raw := l.svcCtx.MysqlConn.Raw(sqlstr)
@ -144,10 +143,13 @@ func (l *InfoLogic) Info(req *types.UserInfoRequest, userinfo *auth.UserInfo) (r
return resp.SetStatusWithMessage(basic.CodeApiErr, err.Error())
}
logx.Error(info)
queryjson, ok := info["querydata"].(string)
if !ok {
return resp.SetStatusWithMessage(basic.CodeDbSqlErr, mquery.ModuleName)
}
var querydata map[string]any = make(map[string]any)
err = json.Unmarshal([]byte(info["querydata"].(string)), &querydata)
err = json.Unmarshal([]byte(queryjson), &querydata)
if err != nil {
logx.Error(info)
return resp.SetStatusWithMessage(basic.CodeApiErr, err.Error())

37
server/info/internal/logic/infologic_test.go
View File

@ -5,7 +5,6 @@ import (
"fmt"
"fusenapi/initalize"
"fusenapi/utils/check"
"log"
"strings"
"testing"
@ -16,18 +15,18 @@ import (
func TestMain(t *testing.T) {
conn := initalize.InitMysql("fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen")
cond := "user_id = 105 and guest_id = 0"
condUser := "user_id = 105"
var mquerys map[string]*ModuleQuery = make(map[string]*ModuleQuery)
var metadict map[string]any = make(map[string]any)
for _, module := range []string{"material.logo_url"} {
for _, module := range []string{"material.logo.logo_url", "userinfo.profile"} {
if !check.CheckModuleQuery(module) {
}
mlist := strings.Split(module, ".")
if len(mlist) == 0 {
if len(mlist) < 2 {
}
@ -37,20 +36,24 @@ func TestMain(t *testing.T) {
}
moduleName := mlist[1]
cond := fmt.Sprintf("module = '%s' and %s", moduleName, condUser)
if mquery, ok := mquerys[mtable]; ok {
mquery.ModuleQuery[strings.Join(mlist[1:], ",")] = struct{}{}
mquery.ModuleQuery[strings.Join(mlist[2:], ",")] = struct{}{}
} else {
mquery := &ModuleQuery{
TableName: tname,
ModuleName: mtable,
ModuleQuery: map[string]struct{}{strings.Join(mlist[1:], ","): {}}}
Cond: cond,
ModuleName: mtable + "." + moduleName,
ModuleQuery: map[string]struct{}{strings.Join(mlist[2:], ","): {}}}
mquerys[mtable] = mquery
}
}
for _, mquery := range mquerys {
sqlstr := fmt.Sprintf("select id, module, %s as querydata from %s where %s order by ctime asc", mquery.EncodeQuery("metadata"), mquery.TableName, cond)
sqlstr := fmt.Sprintf("select id, module, %s as querydata from %s where %s order by ctime asc limit 1", mquery.EncodeQuery("metadata"), mquery.TableName, mquery.Cond)
raw := conn.Raw(sqlstr)
@ -59,7 +62,6 @@ func TestMain(t *testing.T) {
continue
} else {
logx.Error(raw.Error)
}
}
@ -74,20 +76,23 @@ func TestMain(t *testing.T) {
}
logx.Error(info["querydata"].(string))
var querydata map[string]any = make(map[string]any)
err = json.Unmarshal([]byte(info["querydata"].(string)), &querydata)
if err != nil {
logx.Error(err, info)
logx.Error(info)
queryjson, ok := info["querydata"].(string)
if !ok {
return
}
log.Println(querydata)
var querydata map[string]any = make(map[string]any)
err = json.Unmarshal([]byte(queryjson), &querydata)
if err != nil {
logx.Error(info)
}
for k, v := range querydata {
metadict[k] = v
}
}
return
}