Diff
checker
文本
文本
图像
文档
Excel
文件夹
Legal
Enterprise
桌面版
定价
登录
下载 Diffchecker 桌面版
比较文本
查找两个文本文件之间的差异
工具
历史
实时编辑器
折叠未更改行
关闭换行
视图
拆分
统一
比对精度
智能
单词
字符
语法高亮
选择语法
忽略
文本转换
转到第一个差异
编辑输入
Diffchecker Desktop
运行Diffchecker最安全的方式。获取Diffchecker桌面应用:您的差异永远不会离开您的电脑!
获取桌面版
Untitled diff
创建于
7年前
差异永不过期
清除
导出
分享
解释
59 删除
行
总计
删除
字符
总计
删除
要继续使用此功能,请升级到
Diff
checker
Pro
查看价格
79 行
全部复制
66 添加
行
总计
添加
字符
总计
添加
要继续使用此功能,请升级到
Diff
checker
Pro
查看价格
83 行
全部复制
package api
package api
import (
import (
复制
已复制
复制
已复制
"github.com/
grafana/grafana/pkg/api/dtos"
"github.com/
torkelo
/grafana
-pro
/pkg/bus"
"github.com
/grafana
/grafana
/pkg/bus"
"github.com/
torkelo
/grafana
-pro
/pkg/
middleware
"
"github.com/
grafana
/grafana
/pkg/
components/apikeygen
"
m
"github.com/
torkelo
/grafana
-pro
/pkg/models"
"github.com/
grafana
/grafana
/pkg/models"
"
github.com/torkelo/grafana-pro/pkg/util
"
"
time
"
)
)
复制
已复制
复制
已复制
func GetA
PI
Keys(c *
models.ReqContext) Response
{
func GetA
pi
Keys(c *
middleware.Context)
{
query :=
models
.GetApiKeysQuery{
OrgId
: c.
OrgId
}
query :=
m
.GetApiKeysQuery{
AccountId
: c.
AccountId
}
if err := bus.Dispatch(&query); err != nil {
if err := bus.Dispatch(&query); err != nil {
复制
已复制
复制
已复制
return Error
(500, "Failed to list api keys", err)
c.JsonApiErr
(500, "Failed to list api keys", err)
return
}
}
复制
已复制
复制
已复制
result := make([]*
models
.ApiKeyDTO, len(query.Result))
result := make([]*
m
.ApiKeyDTO, len(query.Result))
for i, t := range query.Result {
for i, t := range query.Result {
复制
已复制
复制
已复制
var expiration *time.Time = nil
result[i] = &
m
.ApiKeyDTO{
if t.Expires != nil {
Id:
t.Id,
v := time.Unix(*t.Expires, 0)
Name:
t.Name,
expiration = &v
Role:
t.Role,
}
Key: t.Key
,
result[i] = &
models
.ApiKeyDTO{
Id:
t.Id,
Name:
t.Name,
Role:
t.Role,
Expiration: expiration
,
}
}
}
}
复制
已复制
复制
已复制
c.
JSON(200, result)
return
JSON(200, result)
}
}
复制
已复制
复制
已复制
func DeleteA
PI
Key(c *
models.ReqContext) Response
{
func DeleteA
pi
Key(c *
middleware.Context)
{
id := c.ParamsInt64(":id")
id := c.ParamsInt64(":id")
复制
已复制
复制
已复制
cmd := &
models
.DeleteApiKeyCommand{Id: id,
OrgId
: c.
OrgId
}
cmd := &
m
.DeleteApiKeyCommand{Id: id,
AccountId
: c.
AccountId
}
err := bus.Dispatch(cmd)
err := bus.Dispatch(cmd)
if err != nil {
if err != nil {
复制
已复制
复制
已复制
return Error
(500, "Failed to delete API key", err)
c.JsonApiErr
(500, "Failed to delete API key", err)
return
}
}
复制
已复制
复制
已复制
return Success
("API key deleted")
c.JsonOK
("API key deleted")
}
}
复制
已复制
复制
已复制
func
(hs *HTTPServer)
AddA
PI
Key(c *
models.ReqContext
, cmd
models
.AddApiKeyCommand)
Response
{
func
AddA
pi
Key(c *
middleware.Context
, cmd
m
.AddApiKeyCommand)
{
if !cmd.Role.IsValid() {
if !cmd.Role.IsValid() {
复制
已复制
复制
已复制
return Error
(400, "Invalid role specified", nil)
c.JsonApiErr
(400, "Invalid role specified", nil)
return
}
}
复制
已复制
复制
已复制
if hs.Cfg.ApiKeyMaxSecondsToLive != -1 {
cmd.AccountId = c.AccountId
if cmd.SecondsToLive == 0 {
cmd.Key =
util.GetRandomString(64)
return Error(400, "Number of seconds before expiration should be set", nil)
}
if cmd.SecondsToLive > hs.Cfg.ApiKeyMaxSecondsToLive {
return Error(400, "Number of seconds before expiration is greater than the global limit", nil)
}
}
cmd.OrgId = c.OrgId
newKeyInfo := apikeygen.New(cmd.OrgId, cmd.Name)
cmd.Key =
newKeyInfo.HashedKey
if err := bus.Dispatch(&cmd); err != nil {
if err := bus.Dispatch(&cmd); err != nil {
复制
已复制
复制
已复制
if err == models.ErrInvalidApiKeyExpiration {
c.JsonApiErr
(500, "Failed to add API key", err)
return Error(400, err.Error(), nil)
return
}
return Error
(500, "Failed to add API key", err)
}
}
复制
已复制
复制
已复制
result := &
dtos.NewApiKeyResult{
result := &
m.ApiKeyDTO{
Id: cmd.Result.Id,
Name: cmd.Result.Name,
Name: cmd.Result.Name,
复制
已复制
复制
已复制
Key:
newKeyInfo.ClientSecret
}
Role: cmd.Result.Role,
Key:
cmd.Result.Key,
}
复制
已复制
复制
已复制
return
JSON(200, result)
c.
JSON(200, result)
}
func UpdateApiKey(c *middleware.Context, cmd m.UpdateApiKeyCommand) {
if !cmd.Role.IsValid() {
c.JsonApiErr(400, "Invalid role specified", nil)
return
}
cmd.AccountId = c.AccountId
err := bus.Dispatch(&cmd)
if err != nil {
c.JsonApiErr(500, "Failed to update api key", err)
return
}
c.JsonOK("API key updated")
}
}
已保存差异
原始文本
打开文件
package api import ( "github.com/grafana/grafana/pkg/api/dtos" "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/components/apikeygen" "github.com/grafana/grafana/pkg/models" "time" ) func GetAPIKeys(c *models.ReqContext) Response { query := models.GetApiKeysQuery{OrgId: c.OrgId} if err := bus.Dispatch(&query); err != nil { return Error(500, "Failed to list api keys", err) } result := make([]*models.ApiKeyDTO, len(query.Result)) for i, t := range query.Result { var expiration *time.Time = nil if t.Expires != nil { v := time.Unix(*t.Expires, 0) expiration = &v } result[i] = &models.ApiKeyDTO{ Id: t.Id, Name: t.Name, Role: t.Role, Expiration: expiration, } } return JSON(200, result) } func DeleteAPIKey(c *models.ReqContext) Response { id := c.ParamsInt64(":id") cmd := &models.DeleteApiKeyCommand{Id: id, OrgId: c.OrgId} err := bus.Dispatch(cmd) if err != nil { return Error(500, "Failed to delete API key", err) } return Success("API key deleted") } func (hs *HTTPServer) AddAPIKey(c *models.ReqContext, cmd models.AddApiKeyCommand) Response { if !cmd.Role.IsValid() { return Error(400, "Invalid role specified", nil) } if hs.Cfg.ApiKeyMaxSecondsToLive != -1 { if cmd.SecondsToLive == 0 { return Error(400, "Number of seconds before expiration should be set", nil) } if cmd.SecondsToLive > hs.Cfg.ApiKeyMaxSecondsToLive { return Error(400, "Number of seconds before expiration is greater than the global limit", nil) } } cmd.OrgId = c.OrgId newKeyInfo := apikeygen.New(cmd.OrgId, cmd.Name) cmd.Key = newKeyInfo.HashedKey if err := bus.Dispatch(&cmd); err != nil { if err == models.ErrInvalidApiKeyExpiration { return Error(400, err.Error(), nil) } return Error(500, "Failed to add API key", err) } result := &dtos.NewApiKeyResult{ Name: cmd.Result.Name, Key: newKeyInfo.ClientSecret} return JSON(200, result) }
更改后文本
打开文件
package api import ( "github.com/torkelo/grafana-pro/pkg/bus" "github.com/torkelo/grafana-pro/pkg/middleware" m "github.com/torkelo/grafana-pro/pkg/models" "github.com/torkelo/grafana-pro/pkg/util" ) func GetApiKeys(c *middleware.Context) { query := m.GetApiKeysQuery{AccountId: c.AccountId} if err := bus.Dispatch(&query); err != nil { c.JsonApiErr(500, "Failed to list api keys", err) return } result := make([]*m.ApiKeyDTO, len(query.Result)) for i, t := range query.Result { result[i] = &m.ApiKeyDTO{ Id: t.Id, Name: t.Name, Role: t.Role, Key: t.Key, } } c.JSON(200, result) } func DeleteApiKey(c *middleware.Context) { id := c.ParamsInt64(":id") cmd := &m.DeleteApiKeyCommand{Id: id, AccountId: c.AccountId} err := bus.Dispatch(cmd) if err != nil { c.JsonApiErr(500, "Failed to delete API key", err) return } c.JsonOK("API key deleted") } func AddApiKey(c *middleware.Context, cmd m.AddApiKeyCommand) { if !cmd.Role.IsValid() { c.JsonApiErr(400, "Invalid role specified", nil) return } cmd.AccountId = c.AccountId cmd.Key = util.GetRandomString(64) if err := bus.Dispatch(&cmd); err != nil { c.JsonApiErr(500, "Failed to add API key", err) return } result := &m.ApiKeyDTO{ Id: cmd.Result.Id, Name: cmd.Result.Name, Role: cmd.Result.Role, Key: cmd.Result.Key, } c.JSON(200, result) } func UpdateApiKey(c *middleware.Context, cmd m.UpdateApiKeyCommand) { if !cmd.Role.IsValid() { c.JsonApiErr(400, "Invalid role specified", nil) return } cmd.AccountId = c.AccountId err := bus.Dispatch(&cmd) if err != nil { c.JsonApiErr(500, "Failed to update api key", err) return } c.JsonOK("API key updated") }
查找差异