'normal'

apis/game/qmbz.go

@@ -95,14 +95,19 @@ func ServerList(c *gin.Context) {
 	}
 	version := c.DefaultPostForm("version", "A")
 	userID := tokenData.UserId
-	historyList, _ := dao.GetIUserServerByUid(userID, version)
-	serverList, _ := dao.GetAllServer(version)
-	retData := struct {
-		HistoryList interface{} `json:"historyList"`
-		ServerList  interface{} `json:"serverList"`
-	}{
-		HistoryList: historyList,
-		ServerList:  serverList,
+	historyList, err := dao.GetIUserServerByUid(userID, version)
+	if err != nil {
+		logger.Info("historyList err", err.Error())
+		historyList = []model.LUserServer{}
+	}
+	serverList, err := dao.GetAllServer(version)
+	if err != nil {
+		logger.Info("serverList err", err.Error())
+		serverList = []model.TServer{}
+	}
+	retData := map[string]interface{}{
+		"historyList": historyList,
+		"serverList":  serverList,
 	}
 	c.JSON(200, retData)
 }

server/dao/game.go

@@ -6,7 +6,7 @@ import (
 )
 
 func GetIUserServerByUid(uid int, version string) (list []model.LUserServer, err error) {
-	err = db.GDB.Where("userId=? AND version=?", uid, version).
+	err = db.GDB.Where("user_id=? AND version=?", uid, version).
 		Find(&list).Error
 	return
 }