Merge branch 'master' into dev

api/account/account.pb.go

@@ -1153,8 +1153,8 @@ var file_account_proto_rawDesc = []byte{
 	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x61,
 	0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x67,
 	0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x1c, 0x82,
-	0xd3, 0xe4, 0x93, 0x02, 0x16, 0x22, 0x11, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x3a, 0x01, 0x2a, 0x12, 0x70, 0x0a, 0x16, 0x47,
+	0xd3, 0xe4, 0x93, 0x02, 0x16, 0x22, 0x11, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6c, 0x6f, 0x67, 0x69,
+	0x6e, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x01, 0x2a, 0x12, 0x70, 0x0a, 0x16, 0x47,
 	0x65, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x79, 0x42, 0x79, 0x41, 0x63, 0x63, 0x6f,
 	0x75, 0x6e, 0x74, 0x49, 0x44, 0x12, 0x2a, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x61, 0x63, 0x63, 0x6f,
 	0x75, 0x6e, 0x74, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x79, 0x42,

api/account/account.proto

@@ -73,7 +73,7 @@ service Account {
   // 获取用户登录配置
   rpc GetUserLoginConfig (common.GetLoginConfigRequest) returns (common.GetLoginConfigReply){
     option (google.api.http) = {
-      post: "/api/config/login",
+      post: "/api/login/config",
       body:"*"
     };
   };

api/account/account_http.pb.go

@@ -44,7 +44,7 @@ func RegisterAccountHTTPServer(s *http.Server, srv AccountHTTPServer) {
 	r.POST("/api/common/random/avatar", _Account_RandomAvatar0_HTTP_Handler(srv))
 	r.POST("/api/common/random/introduce", _Account_RandomIntroduce0_HTTP_Handler(srv))
 	r.POST("/api/common/material/upload/voice", _Account_UploadMaterialVoice0_HTTP_Handler(srv))
-	r.POST("/api/config/login", _Account_GetUserLoginConfig0_HTTP_Handler(srv))
+	r.POST("/api/login/config", _Account_GetUserLoginConfig0_HTTP_Handler(srv))
 }
 
 func _Account_DebugLogin0_HTTP_Handler(srv AccountHTTPServer) func(ctx http.Context) error {
@@ -282,7 +282,7 @@ func (c *AccountHTTPClientImpl) DebugLogin(ctx context.Context, in *DebugLoginRe
 
 func (c *AccountHTTPClientImpl) GetUserLoginConfig(ctx context.Context, in *common.GetLoginConfigRequest, opts ...http.CallOption) (*common.GetLoginConfigReply, error) {
 	var out common.GetLoginConfigReply
-	pattern := "/api/config/login"
+	pattern := "/api/login/config"
 	path := binding.EncodeURL(pattern, in, false)
 	opts = append(opts, http.Operation("/api.account.Account/GetUserLoginConfig"))
 	opts = append(opts, http.PathTemplate(pattern))

js/api/account/account_http_pb.ts

@@ -32,7 +32,7 @@ const AccountService = {
   },
   /**  获取用户登录配置 */
   GetUserLoginConfig: async (req?: GetLoginConfigRequest) => {
-	const res = await request.post<{ data: GetLoginConfigReply, code: string, message: string }>('/api/config/login', req);
+	const res = await request.post<{ data: GetLoginConfigReply, code: string, message: string }>('/api/login/config', req);
     return res.data.data;
   },