tickers接口完善

api/v1/ticker.go

@@ -3,6 +3,7 @@ package v1
 import (
 	"encoding/json"
 	"net/http"
+	"time"
 
 	"github.com/gomodule/redigo/redis"
 	"github.com/labstack/echo"
@@ -11,15 +12,27 @@ import (
 )
 
 func V1GetTickers(context echo.Context) error {
+	mainDB := utils.MainDbBegin()
+	defer mainDB.DbRollback()
 	tickerRedis := utils.GetRedisConn("ticker")
 	defer tickerRedis.Close()
 	values, _ := redis.Values(tickerRedis.Do("HGETALL", TickersRedisKey))
-	var tickers []interface{}
+	tickers := make([]interface{}, 0)
+	var market Market
 	for i, value := range values {
 		if i%2 == 1 {
-			ticker := Ticker{}
-			json.Unmarshal(value.([]byte), &ticker)
+			ticker := Ticker{
+				MarketId: market.Id,
+				At:       time.Now().Unix(),
+				Name:     market.Name,
+			}
+			json.Unmarshal(value.([]byte), &ticker.TickerAspect)
 			tickers = append(tickers, ticker)
+		} else {
+			marketId, _ := redis.String(value, nil)
+			if mainDB.Where("id = ?", marketId).First(&market).RecordNotFound() {
+				return utils.BuildError("1021")
+			}
 		}
 	}
 	response := utils.SuccessResponse
@@ -37,8 +50,12 @@ func V1GetTickersMarket(context echo.Context) error {
 	tickerRedis := utils.GetRedisConn("ticker")
 	defer tickerRedis.Close()
 	value, _ := tickerRedis.Do("HGET", TickersRedisKey, market.Id)
-	ticker := Ticker{}
-	json.Unmarshal(value.([]byte), &ticker)
+	ticker := Ticker{
+		MarketId: market.Id,
+		At:       time.Now().Unix(),
+		Name:     market.Name,
+	}
+	json.Unmarshal(value.([]byte), &ticker.TickerAspect)
 	response := utils.SuccessResponse
 	response.Body = ticker
 	return context.JSON(http.StatusOK, response)

api/v1/user.go

@@ -92,6 +92,7 @@ func V1PostUsersLogin(context echo.Context) error {
 		token.InitializeLoginToken()
 	}
 	mainDB.Create(&token)
+	mainDB.Where("user_id = ?", user.Id).Where("expire_at < ?", time.Now()).First(&user.Tokens)
 	mainDB.DbCommit()
 
 	response := utils.SuccessResponse

models/ticker.go

@@ -20,7 +20,7 @@ type TickerAspect struct {
 
 type Ticker struct {
 	MarketId     int          `json:"market_id"`
+	At           int64        `json:"at"`
 	Name         string       `json:"name"`
-	Code         string       `json:"code"`
 	TickerAspect TickerAspect `json:"ticker"`
 }