From 78b8e351bd409f817fb43d78be273b7b5b4cfad0 Mon Sep 17 00:00:00 2001 From: winc-link Date: Tue, 12 Sep 2023 13:37:32 +0800 Subject: [PATCH] fix openapi bug --- .gitignore | 2 ++ .../hummingbird/core/application/deviceapp/deviceaction.go | 4 ++-- internal/hummingbird/core/application/userapp/user.go | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a307657..118de43 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ vendor logs go.sum +hummingbird +manifest ## MacOS .DS_Store diff --git a/internal/hummingbird/core/application/deviceapp/deviceaction.go b/internal/hummingbird/core/application/deviceapp/deviceaction.go index 901722b..60e5b9e 100644 --- a/internal/hummingbird/core/application/deviceapp/deviceaction.go +++ b/internal/hummingbird/core/application/deviceapp/deviceaction.go @@ -130,12 +130,12 @@ func (p *deviceApp) SetDeviceProperty(req dtos.OpenApiSetDeviceThingModel) error device, err := p.dbClient.DeviceById(req.DeviceId) if err != nil { - return nil + return err } _, err = p.dbClient.ProductById(device.ProductId) if err != nil { - return nil + return err } //var findCode bool // diff --git a/internal/hummingbird/core/application/userapp/user.go b/internal/hummingbird/core/application/userapp/user.go index 0ae0a6f..b9ef726 100644 --- a/internal/hummingbird/core/application/userapp/user.go +++ b/internal/hummingbird/core/application/userapp/user.go @@ -206,7 +206,7 @@ func (uapp *userApp) CreateTokenDetail(userName string) (*dtos.TokenDetail, erro userID uint = 1 err error ) - td.AccessToken, err = uapp.createToken(userID, userName, td.AtExpires, jwt2.OpenAPIKey) + td.AccessToken, err = uapp.createToken(userID, userName, td.AtExpires, jwt2.JwtSignKey) if err != nil { return nil, err }