Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

server_api/auth.api

@@ -12,28 +12,28 @@ import "basic.api"
 service auth {
 	@handler UserLoginHandler
 	post /api/auth/login(RequestUserLogin) returns (response);
-
+	
 	@handler UserRegisterHandler
 	post /api/auth/register(RequestUserRegister) returns (response);
-
+	
 	@handler AcceptCookieHandler
 	post /api/auth/accept-cookie(request) returns (response);
-
+	
 	@handler UserGoogleLoginHandler
 	get /api/auth/oauth2/login/google(RequestGoogleLogin) returns (response);
-
+	
 	@handler UserEmailConfirmationHandler
 	get /api/auth/email/confirmation(RequestEmailConfirmation) returns (response);
-
+	
 	@handler UserEmailRegisterHandler
 	post /api/auth/oauth2/register(RequestEmailRegister) returns (response);
-
+	
 	@handler UserResetTokenHandler
 	post /api/auth/reset/token(RequestUserResetToken) returns (response);
-
+	
 	@handler UserResetPasswordHandler
 	post /api/auth/reset/password(RequestUserResetPassword) returns (response);
-
+	
 	@handler DebugAuthDeleteHandler
 	post /api/auth/debug/delete(RequestAuthDelete) returns (response);
 }
@@ -79,7 +79,8 @@ type (
 
 	// RequestUserResetToken 请求重置token, 一定不为null
 	RequestUserResetToken {
-		Wid string `json:"wid"`
+		Wid   string `json:"wid"`
+		Email string `json:"email"` // email
 	}
 
 	// UserResetTokenHandler 返回重置token