diff --git a/api/user.ts b/api/user.ts index 97785b0..1624d8e 100644 --- a/api/user.ts +++ b/api/user.ts @@ -12,45 +12,45 @@ export interface response { } export class userService{ - static async list(data :request, param?: Partial>):Promise{ - return http('/api/v1/sendmail/api/v1/user/list', { + static async list(data :Partial, param?: Partial):Promise{ + return http('/api/v1/sendmail/api/v1/user/list', { ...param, data: data, method:'GET' }) } - static async all(data :request, param?: Partial>):Promise{ - return http('/api/v1/sendmail/api/v1/user/all', { + static async all(data :Partial, param?: Partial):Promise{ + return http('/api/v1/sendmail/api/v1/user/all', { ...param, data: data, method:'GET' }) } - static async auto(data :request, param?: Partial>):Promise{ - return http('/api/v1/sendmail/api/v1/user/auto', { + static async auto(data :Partial, param?: Partial):Promise{ + return http('/api/v1/sendmail/api/v1/user/auto', { ...param, data: data, method:'GET' }) } //有 "user:list" - static async loginWithList(data :request, param?: Partial>):Promise{ - return http('/api/v1/sendmail/api/v1/user/login_list', { + static async loginWithList(data :Partial, param?: Partial):Promise{ + return http('/api/v1/sendmail/api/v1/user/login_list', { ...param, data: data, method:'GET' }) } // 没有 "user:list" 权限 - static async login(data :request, param?: Partial>):Promise{ - return http('/api/v1/sendmail/api/v1/user/login', { + static async login(data :Partial, param?: Partial):Promise{ + return http('/api/v1/sendmail/api/v1/user/login', { ...param, data: data, method:'GET' }) } - static async login1(data :request, param?: Partial>):Promise{ - return http('/api/v1/sendmail/api/v1/user/login1', { + static async login1(data :Partial, param?: Partial):Promise{ + return http('/api/v1/sendmail/api/v1/user/login1', { ...param, data: data, method:'POST' diff --git a/api/user_http.pb.go b/api/user_http.pb.go index e8946e6..64648d6 100644 --- a/api/user_http.pb.go +++ b/api/user_http.pb.go @@ -1,9 +1,9 @@ package user import ( + "git.diulo.com/mogfee/kit/middleware/jwt" "context" "git.diulo.com/mogfee/kit/transport/http" - "git.diulo.com/mogfee/kit/middleware/jwt" ) type UserHTTPServer interface { diff --git a/cmd/ts/main.go b/cmd/ts/main.go index 1a3dc44..59b799e 100644 --- a/cmd/ts/main.go +++ b/cmd/ts/main.go @@ -78,8 +78,8 @@ func (u *Kit) Generate(plugin *protogen.Plugin) error { if common != "" { t.P(` `, common) } - t.P(getInd(1), `static async `, m.Desc.Name(), `(data :`, m.Input.Desc.Name(), `, param?: Partial>):Promise<`, m.Output.Desc.Name(), `>{`) - t.P(getInd(2), `return http<`, m.Input.Desc.Name(), `, `, m.Output.Desc.Name(), `>('`, path, `', {`) + t.P(getInd(1), `static async `, m.Desc.Name(), `(data :Partial<`, m.Input.Desc.Name(), `>, param?: Partial):Promise<`, m.Output.Desc.Name(), `>{`) + t.P(getInd(2), `return http<`, m.Output.Desc.Name(), `>('`, path, `', {`) t.P(getInd(3), `...param,`) t.P(getInd(3), `data: data,`) t.P(getInd(3), `method:'`, method, `'`) @@ -97,7 +97,7 @@ func getInd(i int) string { func getType(key string) string { mps := map[string]string{ "int32": "number", - "int64": "number", + "int64": "string", "bytes": "Uint8Array", "Int32Value": "number", "StringValue": "string",