diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/DashboardUserController.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/DashboardUserController.java index 35a9037ccf3e..be658d113aee 100644 --- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/DashboardUserController.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/DashboardUserController.java @@ -80,8 +80,6 @@ public ShenyuAdminResult queryDashboardUsers(final String userName, new PageParameter(currentPage, pageSize))); if (CollectionUtils.isNotEmpty(commonPager.getDataList())) { - commonPager.getDataList() - .forEach(item -> item.setPassword("")); return ShenyuAdminResult.success(ShenyuResultMessage.QUERY_SUCCESS, commonPager); } else { return ShenyuAdminResult.error(ShenyuResultMessage.DASHBOARD_QUERY_ERROR); @@ -98,10 +96,9 @@ public ShenyuAdminResult queryDashboardUsers(final String userName, @GetMapping("/{id}") public ShenyuAdminResult detailDashboardUser(@PathVariable("id") final String id) { DashboardUserEditVO dashboardUserEditVO = dashboardUserService.findById(id); - return Optional.ofNullable(dashboardUserEditVO).map(item -> { - item.setPassword(""); - return ShenyuAdminResult.success(ShenyuResultMessage.DETAIL_SUCCESS, item); - }).orElseGet(() -> ShenyuAdminResult.error(ShenyuResultMessage.DASHBOARD_QUERY_ERROR)); + return Optional.ofNullable(dashboardUserEditVO) + .map(item -> ShenyuAdminResult.success(ShenyuResultMessage.DETAIL_SUCCESS, item)) + .orElseGet(() -> ShenyuAdminResult.error(ShenyuResultMessage.DASHBOARD_QUERY_ERROR)); } /** diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/DashboardUserVO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/DashboardUserVO.java index f6ce5c68dcdb..3bbd1182afca 100644 --- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/DashboardUserVO.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/DashboardUserVO.java @@ -17,6 +17,7 @@ package org.apache.shenyu.admin.model.vo; +import com.fasterxml.jackson.annotation.JsonIgnore; import org.apache.shenyu.admin.model.entity.DashboardUserDO; import org.apache.shenyu.common.utils.DateUtils; @@ -44,6 +45,7 @@ public class DashboardUserVO implements Serializable { /** * user password. */ + @JsonIgnore private String password; /** diff --git a/shenyu-admin/src/test/java/org/apache/shenyu/admin/controller/DashboardUserControllerTest.java b/shenyu-admin/src/test/java/org/apache/shenyu/admin/controller/DashboardUserControllerTest.java index e1f81c8d18da..4220ef055a03 100644 --- a/shenyu-admin/src/test/java/org/apache/shenyu/admin/controller/DashboardUserControllerTest.java +++ b/shenyu-admin/src/test/java/org/apache/shenyu/admin/controller/DashboardUserControllerTest.java @@ -98,7 +98,6 @@ public void queryDashboardUsers() throws Exception { mockMvc.perform(get(url)) .andExpect(status().isOk()) .andExpect(jsonPath("$.message", is(ShenyuResultMessage.QUERY_SUCCESS))) - .andExpect(jsonPath("$.data.dataList[0].password", is(""))) .andReturn(); final CommonPager commonPagerError = new CommonPager<>(new PageParameter(), @@ -121,8 +120,7 @@ public void detailDashboardUser() throws Exception { final String url = "/dashboardUser/1"; mockMvc.perform(get(url)) .andExpect(status().isOk()) - .andExpect(jsonPath("$.message", is(ShenyuResultMessage.DETAIL_SUCCESS))) - .andExpect(jsonPath("$.data.password", is(""))); + .andExpect(jsonPath("$.message", is(ShenyuResultMessage.DETAIL_SUCCESS))); given(dashboardUserService.findById(any())).willReturn(null); mockMvc.perform(get(url))