x

api/user.ts

@@ -12,45 +12,45 @@ export interface response {
 }
 
 export class userService{
-	static async list(data :request, param?: Partial<Config<request>>):Promise<response>{
+	static async list(data :Partial<request>, param?: Partial<Config>):Promise<response>{
-		return http<request, response>('/api/v1/sendmail/api/v1/user/list', {
+		return http<response>('/api/v1/sendmail/api/v1/user/list', {
 			...param,
 			data: data,
 			method:'GET'
 		})
 	}
-	static async all(data :request, param?: Partial<Config<request>>):Promise<response>{
+	static async all(data :Partial<request>, param?: Partial<Config>):Promise<response>{
-		return http<request, response>('/api/v1/sendmail/api/v1/user/all', {
+		return http<response>('/api/v1/sendmail/api/v1/user/all', {
 			...param,
 			data: data,
 			method:'GET'
 		})
 	}
-	static async auto(data :request, param?: Partial<Config<request>>):Promise<response>{
+	static async auto(data :Partial<request>, param?: Partial<Config>):Promise<response>{
-		return http<request, response>('/api/v1/sendmail/api/v1/user/auto', {
+		return http<response>('/api/v1/sendmail/api/v1/user/auto', {
 			...param,
 			data: data,
 			method:'GET'
 		})
 	}
 	//有 "user:list"
-	static async loginWithList(data :request, param?: Partial<Config<request>>):Promise<response>{
+	static async loginWithList(data :Partial<request>, param?: Partial<Config>):Promise<response>{
-		return http<request, response>('/api/v1/sendmail/api/v1/user/login_list', {
+		return http<response>('/api/v1/sendmail/api/v1/user/login_list', {
 			...param,
 			data: data,
 			method:'GET'
 		})
 	}
 	// 没有 "user:list" 权限
-	static async login(data :request, param?: Partial<Config<request>>):Promise<response>{
+	static async login(data :Partial<request>, param?: Partial<Config>):Promise<response>{
-		return http<request, response>('/api/v1/sendmail/api/v1/user/login', {
+		return http<response>('/api/v1/sendmail/api/v1/user/login', {
 			...param,
 			data: data,
 			method:'GET'
 		})
 	}
-	static async login1(data :request, param?: Partial<Config<request>>):Promise<response>{
+	static async login1(data :Partial<request>, param?: Partial<Config>):Promise<response>{
-		return http<request, response>('/api/v1/sendmail/api/v1/user/login1', {
+		return http<response>('/api/v1/sendmail/api/v1/user/login1', {
 			...param,
 			data: data,
 			method:'POST'

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 {

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<Config<`, m.Input.Desc.Name(), `>>):Promise<`, m.Output.Desc.Name(), `>{`)
+				t.P(getInd(1), `static async `, m.Desc.Name(), `(data :Partial<`, m.Input.Desc.Name(), `>, param?: Partial<Config>):Promise<`, m.Output.Desc.Name(), `>{`)
-				t.P(getInd(2), `return http<`, m.Input.Desc.Name(), `, `, m.Output.Desc.Name(), `>('`, path, `', {`)
+				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",