Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

server/info/internal/logic/infologic.go

@@ -86,6 +86,7 @@ func (l *InfoLogic) Info(req *types.UserInfoRequest, userinfo *auth.UserInfo) (r
 	// 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data)
 	// userinfo 传入值时, 一定不为null
 
+	//TODO: 可以优化, 合并模块
 	var condUser string
 	switch userinfo.GetIdType() {
 	case auth.IDTYPE_User:

server/info/internal/logic/infologic_test.go

@@ -17,46 +17,57 @@ import (
 func TestMain(t *testing.T) {
 
 	conn := initalize.InitMysql("fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen")
-	condUser := "user_id = 105"
+	condUser := "user_id = 134"
+
+	// var condUser string
+	// switch userinfo.GetIdType() {
+	// case auth.IDTYPE_User:
+	// 	condUser = fmt.Sprintf("user_id = %d", userinfo.UserId)
+	// case auth.IDTYPE_Guest:
+	// 	condUser = fmt.Sprintf("guest_id = %d", userinfo.GuestId)
+	// default:
+	// 	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 []string{"material.logo.logo_url", "userinfo.profile"} {
-		if !check.CheckModuleQuery(module) {
+	for _, module := range []string{"userinfo.profile", "userinfo.profile.logo_selected", "userinfo.profile.logo_selected.logo_url1"} {
 
+		if !check.CheckModuleQuery(module) {
+			return
 		}
 
 		mlist := strings.Split(module, ".")
 		if len(mlist) < 2 {
-
+			return
 		}
 
 		mtable := mlist[0]
 		tname, ok := ModuleTable[mtable]
 		if !ok {
-
+			return
 		}
 
 		moduleName := mlist[1]
 		cond := fmt.Sprintf("module = '%s' and %s", moduleName, condUser)
 
 		if mquery, ok := mquerys[mtable]; ok {
-			mquery.ModuleQuery[strings.Join(mlist[2:], ",")] = struct{}{}
+			mquery.ModuleQuery[strings.Join(mlist[2:], ".")] = struct{}{}
 		} else {
 			mquery := &ModuleQuery{
 				TableName:   tname,
-				Cond:        cond,
 				ModuleName:  mtable + "." + moduleName,
-				ModuleQuery: map[string]struct{}{strings.Join(mlist[2:], ","): {}}}
+				Cond:        cond,
+				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 dec limit 1", mquery.EncodeQuery("metadata"), mquery.TableName, mquery.Cond)
-
+		log.Println(mquery.ModuleName, mquery.ModuleQuery)
+		sqlstr := fmt.Sprintf("select id, module, %s as querydata from %s where %s order by ctime DESC limit 1", mquery.EncodeQuery("metadata"), mquery.TableName, mquery.Cond)
 		raw := conn.Raw(sqlstr)
 
 		if raw.Error != nil {
@@ -64,10 +75,11 @@ func TestMain(t *testing.T) {
 				continue
 			} else {
 				logx.Error(raw.Error)
+
 			}
 		}
 
-		var info map[string]any = make(map[string]any)
+		var info map[string]any
 		err := raw.Scan(&info).Error
 		if err == gorm.ErrRecordNotFound {
 			continue
@@ -78,11 +90,13 @@ func TestMain(t *testing.T) {
 
 		}
 
-		logx.Error(info)
-
 		queryjson, ok := info["querydata"].(string)
 		if !ok {
-			return
+			for k, v := range mquery.EncodeEmpty() {
+				metadict[k] = v
+			}
+			continue
+			// return resp.SetStatusWithMessage(basic.CodeDbSqlErr, mquery.ModuleName)
 		}
 
 		var querydata map[string]any = make(map[string]any)
@@ -97,6 +111,54 @@ func TestMain(t *testing.T) {
 		}
 	}
 
+	//  隐含白板用户逻辑
+	if v, ok := metadict["userinfo.profile"]; ok {
+
+		if v == nil {
+
+			info := QueryDefault(conn, "profile", "logo_selected", "fs_user_info")
+			log.Println(info)
+			metadict["userinfo.profile"] = info
+			// log.Println(metadict)
+		} else {
+			profileDict := v.(map[string]any)
+			if _, ok := profileDict["logo_selected"]; !ok {
+				info := QueryDefault(conn, "profile", "logo_selected", "fs_user_info")
+				profileDict["logo_selected"] = info["logo_selected"]
+			}
+
+		}
+
+	} else if v, ok := metadict["userinfo.profile.logo_selected"]; ok {
+		if v == nil {
+
+		}
+	}
+
+	log.Println(metadict)
+
+	return
+
+}
+
+func QueryDefault(conn *gorm.DB, module string, moduleQuery string, tname string) map[string]any {
+
+	qname := strings.Split(moduleQuery, ".")
+	queryAsName := qname[len(qname)-1]
+	sqlstr := fmt.Sprintf(
+		"select JSON_EXTRACT(metadata,'$.%s') as %s from  %s   where module = '%s' and user_id = 0 and guest_id = 0 order by ctime DESC limit 1",
+		moduleQuery, // logo_selected
+		queryAsName, // logo_selected
+		tname,       // fs_user_info
+		module,      // profile
+	)
+	raw := conn.Raw(sqlstr)
+	var info map[string]any
+	err := raw.Scan(&info).Error
+	if err == gorm.ErrRecordNotFound {
+		logx.Error(err)
+	}
+	return info
 }
 
 func TestCaseJSON_EXTRACT(t *testing.T) {