Skip to content

Commit ca0e8bc

Browse files
committed
fix: return json key camelCase
1 parent 400de6d commit ca0e8bc

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

src/naming/core.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,13 @@ impl NamingActor {
682682

683683
let total = ret.len();
684684
let start = (page_index - 1) * page_size;
685-
685+
ret.sort_by(|a, b| {
686+
a.service_name
687+
.cmp(&b.service_name)
688+
.then(a.group_name.cmp(&b.group_name))
689+
.then(a.ip.cmp(&b.ip))
690+
.then(a.port.cmp(&b.port))
691+
});
686692
let paginated_result = ret
687693
.into_iter()
688694
.skip(start)

src/naming/service.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,7 @@ pub struct ServiceInfoDto {
391391
}
392392

393393
#[derive(Debug, Default, Serialize, Deserialize, Clone)]
394+
#[serde(rename_all = "camelCase")]
394395
pub struct SubscriberInfoDto {
395396
pub service_name: Arc<String>,
396397
pub group_name: Arc<String>,

src/openapi/naming/service.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
use actix::Addr;
2-
use actix_web::{web, HttpResponse, Responder, Scope};
3-
41
use crate::merge_web_param;
52
use crate::naming::api_model::ServiceInfoParam;
63
use crate::naming::core::{NamingActor, NamingCmd, NamingResult};
@@ -10,6 +7,9 @@ use crate::openapi::constant::EMPTY;
107
use crate::openapi::naming::model::{
118
ServiceQueryListRequest, ServiceQueryListResponce, ServiceQuerySubscribersListResponce,
129
};
10+
use actix::Addr;
11+
use actix_web::http::header;
12+
use actix_web::{web, HttpResponse, Responder, Scope};
1313

1414
pub(super) fn service() -> Scope {
1515
web::scope("/service")
@@ -152,7 +152,9 @@ pub async fn query_subscribers_list(
152152
count: c,
153153
subscribers: v,
154154
};
155-
HttpResponse::Ok().body(serde_json::to_string(&resp).unwrap())
155+
HttpResponse::Ok()
156+
.insert_header(header::ContentType(mime::APPLICATION_JSON))
157+
.body(serde_json::to_string(&resp).unwrap())
156158
}
157159
_ => HttpResponse::InternalServerError().body("error"),
158160
}

src/user/permission.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ lazy_static::lazy_static! {
260260
//WebResource
261261
R::WebResource("/manage/service"),
262262
R::WebResource("/manage/service/instance"),
263+
R::WebResource("/manage/subscriber"),
263264
R::WebResource("/rnacos/manage/service"),
264265
R::WebResource("/rnacos/manage/service/instance"),
265266
//path
@@ -281,6 +282,7 @@ lazy_static::lazy_static! {
281282
//WebResource
282283
R::WebResource("/manage/service"),
283284
R::WebResource("/manage/service/instance"),
285+
R::WebResource("/manage/subscriber"),
284286
R::WebResource("/rnacos/manage/service"),
285287
R::WebResource("/rnacos/manage/service/instance"),
286288
R::WebResource("SERVICE_UPDATE"),

0 commit comments

Comments
 (0)