Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun

internal/api/auth/auth.go

@@ -118,7 +118,7 @@ func ParseToken(c *gin.Context) {
 		return
 	}
 
-	resp := api.ParseTokenResp{CommResp: api.CommResp{ErrCode: 0, ErrMsg: ""}, ExpireTime: expireTime}
+	resp := api.ParseTokenResp{CommResp: api.CommResp{ErrCode: 0, ErrMsg: ""}, ExpireTime: api.ExpireTime{ExpireTimeSeconds: expireTime}}
 	log.NewInfo(params.OperationID, "ParseToken return ", resp)
 	c.JSON(http.StatusOK, resp)
 }

pkg/base_info/auth_api_struct.go

@@ -42,7 +42,16 @@ type ParseTokenReq struct {
 	OperationID string `json:"operationID" binding:"required"`
 }
 
+//type ParseTokenResp struct {
+//	CommResp
+//	ExpireTime int64 `json:"expireTime" binding:"required"`
+//}
+
+type ExpireTime struct {
+	ExpireTimeSeconds int64 `json:"expireTimeSeconds" `
+}
+
 type ParseTokenResp struct {
 	CommResp
-	ExpireTime int64 `json:"expireTime" binding:"required"`
+	ExpireTime ExpireTime `json:"expireTime"`
 }