Merge pull request 'fix bug' (#62) from devad/pcm-coordinator:master into master
Former-commit-id: e9294decee1830595cc1742dbc1fa15790f43c84
This commit is contained in:
commit
93ecc639c4
|
@ -11,7 +11,7 @@ import (
|
|||
|
||||
func GetAdapterRelationHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var req types.AdapterQueryReq
|
||||
var req types.AdapterRelationQueryReq
|
||||
if err := httpx.Parse(r, &req); err != nil {
|
||||
result.ParamErrorResult(r, w, err)
|
||||
return
|
||||
|
|
|
@ -24,7 +24,7 @@ func NewGetAdapterRelationLogic(ctx context.Context, svcCtx *svc.ServiceContext)
|
|||
}
|
||||
}
|
||||
|
||||
func (l *GetAdapterRelationLogic) GetAdapterRelation(req *types.AdapterQueryReq) (resp *types.PageResult, err error) {
|
||||
func (l *GetAdapterRelationLogic) GetAdapterRelation(req *types.AdapterRelationQueryReq) (resp *types.PageResult, err error) {
|
||||
resp = &types.PageResult{}
|
||||
var list []types.AdapterInfo
|
||||
db := l.svcCtx.DbEngin.Model(&types.AdapterInfo{}).Table("t_adapter")
|
||||
|
|
|
@ -525,6 +525,15 @@ type AdapterQueryReq struct {
|
|||
PageInfo
|
||||
}
|
||||
|
||||
type AdapterRelationQueryReq struct {
|
||||
Id string `form:"id,optional" db:"id"`
|
||||
Name string `form:"name,optional"`
|
||||
Type string `form:"type,optional"`
|
||||
Nickname string `form:"nickname,optional"`
|
||||
Version string `form:"version,optional"`
|
||||
Server string `form:"server,optional"`
|
||||
}
|
||||
|
||||
type AdapterReq struct {
|
||||
Id string `json:"id,optional" db:"id"`
|
||||
Name string `json:"name,optional"`
|
||||
|
|
Loading…
Reference in New Issue