This is an automated email from the ASF dual-hosted git repository.
panyuepeng pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new 0bfcf30cb [ISSUE-3064][Improve] Improve streampark-console system
package module service query method name base on [3.1 Naming Style] (#3304)
0bfcf30cb is described below
commit 0bfcf30cb6c790916fb2b660d331fd42fac18394
Author: VampireAchao <[email protected]>
AuthorDate: Thu Nov 2 09:59:06 2023 +0800
[ISSUE-3064][Improve] Improve streampark-console system package module
service query method name base on [3.1 Naming Style] (#3304)
---
.../streampark/console/core/aspect/ConsoleAspect.java | 4 ++--
.../console/system/authentication/ShiroRealm.java | 4 ++--
.../console/system/controller/AccessTokenController.java | 2 +-
.../console/system/controller/MemberController.java | 8 ++++----
.../console/system/controller/MenuController.java | 5 ++---
.../console/system/controller/RoleController.java | 6 +++---
.../console/system/controller/TeamController.java | 4 ++--
.../console/system/controller/UserController.java | 8 ++++----
.../console/system/security/impl/AuthenticatorImpl.java | 6 +++---
.../console/system/service/AccessTokenService.java | 2 +-
.../streampark/console/system/service/MemberService.java | 10 +++++-----
.../streampark/console/system/service/MenuService.java | 8 ++++----
.../console/system/service/RoleMenuServie.java | 2 +-
.../streampark/console/system/service/RoleService.java | 4 ++--
.../streampark/console/system/service/TeamService.java | 6 +++---
.../streampark/console/system/service/UserService.java | 10 +++++-----
.../system/service/impl/AccessTokenServiceImpl.java | 2 +-
.../console/system/service/impl/MemberServiceImpl.java | 16 ++++++++--------
.../console/system/service/impl/MenuServiceImpl.java | 10 +++++-----
.../console/system/service/impl/RoleMenuServiceImpl.java | 2 +-
.../console/system/service/impl/RoleServiceImpl.java | 6 +++---
.../console/system/service/impl/TeamServiceImpl.java | 8 ++++----
.../console/system/service/impl/UserServiceImpl.java | 16 ++++++++--------
.../console/core/service/AccessTokenServiceTest.java | 6 +++---
24 files changed, 77 insertions(+), 78 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/aspect/ConsoleAspect.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/aspect/ConsoleAspect.java
index c500c61d0..51b72c045 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/aspect/ConsoleAspect.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/aspect/ConsoleAspect.java
@@ -126,14 +126,14 @@ public class ConsoleAspect {
break;
case TEAM:
ApiAlertException.throwIfTrue(
- memberService.findByUserName(paramId, currentUser.getUsername())
== null,
+ memberService.getByTeamIdUserName(paramId,
currentUser.getUsername()) == null,
"Permission denied, only user belongs to this team can access
this permission");
break;
case APP:
Application app = applicationManageService.getById(paramId);
ApiAlertException.throwIfTrue(app == null, "Invalid operation,
application is null");
ApiAlertException.throwIfTrue(
- memberService.findByUserName(app.getTeamId(),
currentUser.getUsername()) == null,
+ memberService.getByTeamIdUserName(app.getTeamId(),
currentUser.getUsername()) == null,
"Permission denied, only user belongs to this team can access
this permission");
break;
default:
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/authentication/ShiroRealm.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/authentication/ShiroRealm.java
index 98e22a313..41e7f0586 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/authentication/ShiroRealm.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/authentication/ShiroRealm.java
@@ -63,7 +63,7 @@ public class ShiroRealm extends AuthorizingRealm {
SimpleAuthorizationInfo simpleAuthorizationInfo = new
SimpleAuthorizationInfo();
// Get user permission set
- Set<String> permissionSet = userService.getPermissions(userId, null);
+ Set<String> permissionSet = userService.listPermissions(userId, null);
simpleAuthorizationInfo.setStringPermissions(permissionSet);
return simpleAuthorizationInfo;
}
@@ -85,7 +85,7 @@ public class ShiroRealm extends AuthorizingRealm {
throw new AuthenticationException("Token verification failed");
}
// Query user information by username
- User user = userService.findByName(username);
+ User user = userService.getByUsername(username);
if (user == null) {
throw new AuthenticationException("ERROR Incorrect username or
password!");
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/AccessTokenController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/AccessTokenController.java
index 7deea1c23..446a3a8af 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/AccessTokenController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/AccessTokenController.java
@@ -117,7 +117,7 @@ public class AccessTokenController {
@RequiresPermissions("token:view")
public RestResponse tokensList(
RestRequest restRequest, @Parameter(hidden = true) AccessToken
accessToken) {
- IPage<AccessToken> accessTokens =
accessTokenService.findAccessTokens(accessToken, restRequest);
+ IPage<AccessToken> accessTokens = accessTokenService.getPage(accessToken,
restRequest);
return RestResponse.success(accessTokens);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MemberController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MemberController.java
index 809e1689d..6e7a3efe4 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MemberController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MemberController.java
@@ -57,28 +57,28 @@ public class MemberController {
@Operation(summary = "List members")
@PostMapping("list")
public RestResponse memberList(RestRequest restRequest, Member member) {
- IPage<Member> userList = memberService.findUsers(member, restRequest);
+ IPage<Member> userList = memberService.getPage(member, restRequest);
return RestResponse.success(userList);
}
@Operation(summary = "List candidate users")
@PostMapping("candidateUsers")
public RestResponse candidateUsers(Long teamId) {
- List<User> userList = memberService.findCandidateUsers(teamId);
+ List<User> userList = memberService.listUsersNotInTeam(teamId);
return RestResponse.success(userList);
}
@Operation(summary = "List teams")
@PostMapping("teams")
public RestResponse listTeams(Long userId) {
- List<Team> teamList = memberService.findUserTeams(userId);
+ List<Team> teamList = memberService.listTeamsByUserId(userId);
return RestResponse.success(teamList);
}
@Operation(summary = "Check the username")
@PostMapping("check/user")
public RestResponse check(@NotBlank(message = "{required}") Long teamId,
String userName) {
- Member result = this.memberService.findByUserName(teamId, userName);
+ Member result = this.memberService.getByTeamIdUserName(teamId, userName);
return RestResponse.success(result == null);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java
index 372fd111e..58e2ea8fe 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java
@@ -52,8 +52,7 @@ public class MenuController {
@PostMapping("router")
public RestResponse getUserRouters(Long teamId) {
// TODO The teamId is required, get routers should be called after choose
teamId.
- List<VueRouter<Menu>> routers =
- this.menuService.getUserRouters(commonService.getUserId(), teamId);
+ List<VueRouter<Menu>> routers =
this.menuService.listRouters(commonService.getUserId(), teamId);
return RestResponse.success(routers);
}
@@ -61,7 +60,7 @@ public class MenuController {
@PostMapping("list")
@RequiresPermissions("menu:view")
public RestResponse menuList(Menu menu) {
- Map<String, Object> maps = this.menuService.findMenus(menu);
+ Map<String, Object> maps = this.menuService.listMenuMap(menu);
return RestResponse.success(maps);
}
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/RoleController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/RoleController.java
index 7c639782d..e87ec81ce 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/RoleController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/RoleController.java
@@ -58,21 +58,21 @@ public class RoleController {
@PostMapping("list")
@RequiresPermissions("role:view")
public RestResponse roleList(RestRequest restRequest, Role role) {
- IPage<Role> roleList = roleService.findRoles(role, restRequest);
+ IPage<Role> roleList = roleService.getPage(role, restRequest);
return RestResponse.success(roleList);
}
@Operation(summary = "Check the role name")
@PostMapping("check/name")
public RestResponse checkRoleName(@NotBlank(message = "{required}") String
roleName) {
- Role result = this.roleService.findByName(roleName);
+ Role result = this.roleService.getByName(roleName);
return RestResponse.success(result == null);
}
@Operation(summary = "List role menus")
@PostMapping("menu")
public RestResponse getRoleMenus(@NotBlank(message = "{required}") String
roleId) {
- List<RoleMenu> list = this.roleMenuServie.getByRoleId(roleId);
+ List<RoleMenu> list = this.roleMenuServie.listByRoleId(roleId);
List<String> roleMenus =
list.stream()
.map(roleMenu -> String.valueOf(roleMenu.getMenuId()))
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/TeamController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/TeamController.java
index 86736b9e6..49d6569e1 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/TeamController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/TeamController.java
@@ -51,14 +51,14 @@ public class TeamController {
@Operation(summary = "List teams")
@PostMapping("list")
public RestResponse teamList(RestRequest restRequest, Team team) {
- IPage<Team> teamList = teamService.findTeams(team, restRequest);
+ IPage<Team> teamList = teamService.getPage(team, restRequest);
return RestResponse.success(teamList);
}
@Operation(summary = "Check the team name")
@PostMapping("check/name")
public RestResponse checkTeamName(@NotBlank(message = "{required}") String
teamName) {
- Team result = this.teamService.findByName(teamName);
+ Team result = this.teamService.getByName(teamName);
return RestResponse.success(result == null);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
index 4608157fd..0d15b02c7 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
@@ -69,7 +69,7 @@ public class UserController {
value = {"user:view", "app:view"},
logical = Logical.OR)
public RestResponse userList(RestRequest restRequest, User user) {
- IPage<User> userList = userService.findUserDetail(user, restRequest);
+ IPage<User> userList = userService.getPage(user, restRequest);
return RestResponse.success(userList);
}
@@ -100,14 +100,14 @@ public class UserController {
@Operation(summary = "List without token users")
@PostMapping("getNoTokenUser")
public RestResponse getNoTokenUser() {
- List<User> userList = this.userService.getNoTokenUser();
+ List<User> userList = this.userService.listNoTokenUser();
return RestResponse.success(userList);
}
@Operation(summary = "Check the username")
@PostMapping("check/name")
public RestResponse checkUserName(@NotBlank(message = "{required}") String
username) {
- boolean result = this.userService.findByName(username) == null;
+ boolean result = this.userService.getByUsername(username) == null;
return RestResponse.success(result);
}
@@ -161,7 +161,7 @@ public class UserController {
@Operation(summary = "List the team users")
@PostMapping("appOwners")
public RestResponse appOwners(Long teamId) {
- List<User> userList = userService.findByAppOwner(teamId);
+ List<User> userList = userService.listByTeamId(teamId);
userList.forEach(User::dataMasking);
return RestResponse.success(userList);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/AuthenticatorImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/AuthenticatorImpl.java
index 50c9616a3..c72dc9e79 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/AuthenticatorImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/AuthenticatorImpl.java
@@ -58,7 +58,7 @@ public class AuthenticatorImpl implements Authenticator {
}
private User passwordAuthenticate(String username, String password) {
- User user = usersService.findByName(username);
+ User user = usersService.getByUsername(username);
ApiAlertException.throwIfNull(user, String.format("User [%s] does not
exist", username));
@@ -81,7 +81,7 @@ public class AuthenticatorImpl implements Authenticator {
return null;
}
// check if user exist
- User user = usersService.findByName(username);
+ User user = usersService.getByUsername(username);
if (user != null) {
ApiAlertException.throwIfTrue(
@@ -95,7 +95,7 @@ public class AuthenticatorImpl implements Authenticator {
private User ssoAuthenticate(String username) throws Exception {
// check if user exist
- User user = usersService.findByName(username);
+ User user = usersService.getByUsername(username);
if (user != null) {
ApiAlertException.throwIfTrue(
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/AccessTokenService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/AccessTokenService.java
index 1eaed5cc0..b264e36c2 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/AccessTokenService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/AccessTokenService.java
@@ -32,7 +32,7 @@ public interface AccessTokenService extends
IService<AccessToken> {
boolean deleteToken(Long id);
- IPage<AccessToken> findAccessTokens(AccessToken tokenParam, RestRequest
request);
+ IPage<AccessToken> getPage(AccessToken tokenParam, RestRequest request);
boolean checkTokenEffective(Long userId, String token);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/MemberService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/MemberService.java
index 34ff96ca0..5a5245093 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/MemberService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/MemberService.java
@@ -35,15 +35,15 @@ public interface MemberService extends IService<Member> {
void deleteByTeamId(Long teamId);
- IPage<Member> findUsers(Member member, RestRequest request);
+ IPage<Member> getPage(Member member, RestRequest request);
- List<User> findCandidateUsers(Long teamId);
+ List<User> listUsersNotInTeam(Long teamId);
- List<Team> findUserTeams(Long userId);
+ List<Team> listTeamsByUserId(Long userId);
- Member findByUserName(Long teamId, String userName);
+ Member getByTeamIdUserName(Long teamId, String userName);
- List<Long> findUserIdsByRoleId(Long roleId);
+ List<Long> listUserIdsByRoleId(Long roleId);
void createMember(Member member);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/MenuService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/MenuService.java
index 261f4eb49..3bb5319a3 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/MenuService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/MenuService.java
@@ -34,11 +34,11 @@ public interface MenuService extends IService<Menu> {
* @param teamId team id. If it's null, will find permissions from all teams.
* @return permissions
*/
- List<String> findUserPermissions(Long userId, Long teamId);
+ List<String> listPermissions(Long userId, Long teamId);
- List<Menu> findUserMenus(Long userId, Long teamId);
+ List<Menu> listMenus(Long userId, Long teamId);
- Map<String, Object> findMenus(Menu menu);
+ Map<String, Object> listMenuMap(Menu menu);
- List<VueRouter<Menu>> getUserRouters(Long userId, Long teamId);
+ List<VueRouter<Menu>> listRouters(Long userId, Long teamId);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/RoleMenuServie.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/RoleMenuServie.java
index a23b28d9d..957dd0503 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/RoleMenuServie.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/RoleMenuServie.java
@@ -29,5 +29,5 @@ public interface RoleMenuServie extends IService<RoleMenu> {
void deleteByMenuId(String[] menuIds);
- List<RoleMenu> getByRoleId(String roleId);
+ List<RoleMenu> listByRoleId(String roleId);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/RoleService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/RoleService.java
index 8e1fd216b..0cbc63004 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/RoleService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/RoleService.java
@@ -25,9 +25,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
public interface RoleService extends IService<Role> {
- IPage<Role> findRoles(Role role, RestRequest request);
+ IPage<Role> getPage(Role role, RestRequest request);
- Role findByName(String roleName);
+ Role getByName(String roleName);
void createRole(Role role);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/TeamService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/TeamService.java
index 212a9ee4a..a4903d0ef 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/TeamService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/TeamService.java
@@ -27,9 +27,9 @@ import java.util.List;
public interface TeamService extends IService<Team> {
- IPage<Team> findTeams(Team team, RestRequest request);
+ IPage<Team> getPage(Team team, RestRequest request);
- Team findByName(String teamName);
+ Team getByName(String teamName);
void createTeam(Team team);
@@ -37,5 +37,5 @@ public interface TeamService extends IService<Team> {
void updateTeam(Team team);
- List<Team> findUserTeams(Long userId);
+ List<Team> listByUserId(Long userId);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java
index b1709acda..713d65cd0 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java
@@ -39,7 +39,7 @@ public interface UserService extends IService<User> {
* @param username username
* @return user
*/
- User findByName(String username);
+ User getByUsername(String username);
/**
* find uer detail, contains basic info, role, department
@@ -48,7 +48,7 @@ public interface UserService extends IService<User> {
* @param restRequest queryRequest
* @return IPage
*/
- IPage<User> findUserDetail(User user, RestRequest restRequest);
+ IPage<User> getPage(User user, RestRequest restRequest);
/**
* update login time
@@ -94,9 +94,9 @@ public interface UserService extends IService<User> {
* @param teamId team id. If it's null, will find permissions from all teams.
* @return permissions
*/
- Set<String> getPermissions(Long userId, @Nullable Long teamId);
+ Set<String> listPermissions(Long userId, @Nullable Long teamId);
- List<User> getNoTokenUser();
+ List<User> listNoTokenUser();
void setLastTeam(Long teamId, Long userId);
@@ -106,7 +106,7 @@ public interface UserService extends IService<User> {
void fillInTeam(User user);
- List<User> findByAppOwner(Long teamId);
+ List<User> listByTeamId(Long teamId);
Map<String, Object> generateFrontendUserInfo(User user, Long teamId,
JWTToken token);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
index 45f239c6d..df86ffee7 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
@@ -87,7 +87,7 @@ public class AccessTokenServiceImpl extends
ServiceImpl<AccessTokenMapper, Acces
}
@Override
- public IPage<AccessToken> findAccessTokens(AccessToken tokenParam,
RestRequest request) {
+ public IPage<AccessToken> getPage(AccessToken tokenParam, RestRequest
request) {
Page<AccessToken> page = new
MybatisPager<AccessToken>().getDefaultPage(request);
this.baseMapper.selectPage(page, tokenParam);
List<AccessToken> records = page.getRecords();
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
index dba05949f..086fd9dc3 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
@@ -74,7 +74,7 @@ public class MemberServiceImpl extends
ServiceImpl<MemberMapper, Member> impleme
}
@Override
- public IPage<Member> findUsers(Member member, RestRequest request) {
+ public IPage<Member> getPage(Member member, RestRequest request) {
ApiAlertException.throwIfNull(member.getTeamId(), "The team id is
required.");
Page<Member> page = new Page<>();
page.setCurrent(request.getPageNum());
@@ -83,18 +83,18 @@ public class MemberServiceImpl extends
ServiceImpl<MemberMapper, Member> impleme
}
@Override
- public List<User> findCandidateUsers(Long teamId) {
+ public List<User> listUsersNotInTeam(Long teamId) {
return baseMapper.selectUsersNotInTeam(teamId);
}
@Override
- public List<Team> findUserTeams(Long userId) {
- return teamService.findUserTeams(userId);
+ public List<Team> listTeamsByUserId(Long userId) {
+ return teamService.listByUserId(userId);
}
@Override
- public Member findByUserName(Long teamId, String userName) {
- User user = userService.findByName(userName);
+ public Member getByTeamIdUserName(Long teamId, String userName) {
+ User user = userService.getByUsername(userName);
if (user == null) {
return null;
}
@@ -111,7 +111,7 @@ public class MemberServiceImpl extends
ServiceImpl<MemberMapper, Member> impleme
}
@Override
- public List<Long> findUserIdsByRoleId(Long roleId) {
+ public List<Long> listUserIdsByRoleId(Long roleId) {
LambdaQueryWrapper<Member> queryWrapper =
new LambdaQueryWrapper<Member>().eq(Member::getRoleId, roleId);
List<Member> list = baseMapper.selectList(queryWrapper);
@@ -121,7 +121,7 @@ public class MemberServiceImpl extends
ServiceImpl<MemberMapper, Member> impleme
@Override
public void createMember(Member member) {
User user =
- Optional.ofNullable(userService.findByName(member.getUserName()))
+ Optional.ofNullable(userService.getByUsername(member.getUserName()))
.orElseThrow(
() ->
new ApiAlertException(
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
index 197ed20b4..0e1f711c8 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
@@ -60,7 +60,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper,
Menu> implements Me
@Autowired private RoleMenuServie roleMenuServie;
@Override
- public List<String> findUserPermissions(Long userId, Long teamId) {
+ public List<String> listPermissions(Long userId, Long teamId) {
User user =
Optional.ofNullable(userService.getById(userId))
.orElseThrow(
@@ -75,7 +75,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper,
Menu> implements Me
}
@Override
- public List<Menu> findUserMenus(Long userId, Long teamId) {
+ public List<Menu> listMenus(Long userId, Long teamId) {
User user =
Optional.ofNullable(userService.getById(userId))
.orElseThrow(
@@ -92,7 +92,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper,
Menu> implements Me
}
@Override
- public Map<String, Object> findMenus(Menu menu) {
+ public Map<String, Object> listMenuMap(Menu menu) {
Map<String, Object> result = new HashMap<>(16);
try {
LambdaQueryWrapper<Menu> queryWrapper = new LambdaQueryWrapper<>();
@@ -128,10 +128,10 @@ public class MenuServiceImpl extends
ServiceImpl<MenuMapper, Menu> implements Me
}
@Override
- public List<VueRouter<Menu>> getUserRouters(Long userId, Long teamId) {
+ public List<VueRouter<Menu>> listRouters(Long userId, Long teamId) {
List<VueRouter<Menu>> routes = new ArrayList<>();
// The query type is the menu type
- List<Menu> menus = this.findUserMenus(userId, teamId);
+ List<Menu> menus = this.listMenus(userId, teamId);
menus.forEach(
menu -> {
VueRouter<Menu> route = new VueRouter<>();
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleMenuServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleMenuServiceImpl.java
index e09a0b2a0..c35f1369b 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleMenuServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleMenuServiceImpl.java
@@ -53,7 +53,7 @@ public class RoleMenuServiceImpl extends
ServiceImpl<RoleMenuMapper, RoleMenu>
}
@Override
- public List<RoleMenu> getByRoleId(String roleId) {
+ public List<RoleMenu> listByRoleId(String roleId) {
LambdaQueryWrapper<RoleMenu> queryWrapper =
new LambdaQueryWrapper<RoleMenu>().eq(RoleMenu::getRoleId, roleId);
return baseMapper.selectList(queryWrapper);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
index 81ac22326..244cf6acb 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
@@ -59,7 +59,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper,
Role> implements Ro
@Autowired private RoleMenuServie roleMenuService;
@Override
- public IPage<Role> findRoles(Role role, RestRequest request) {
+ public IPage<Role> getPage(Role role, RestRequest request) {
Page<Role> page = new Page<>();
page.setCurrent(request.getPageNum());
page.setSize(request.getPageSize());
@@ -67,7 +67,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper,
Role> implements Ro
}
@Override
- public Role findByName(String roleName) {
+ public Role getByName(String roleName) {
return baseMapper.selectOne(new
LambdaQueryWrapper<Role>().eq(Role::getRoleName, roleName));
}
@@ -88,7 +88,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper,
Role> implements Ro
() ->
new ApiAlertException(
String.format("Role id [%s] not found. Delete role
failed.", roleId)));
- List<Long> userIdsByRoleId = memberService.findUserIdsByRoleId(roleId);
+ List<Long> userIdsByRoleId = memberService.listUserIdsByRoleId(roleId);
ApiAlertException.throwIfFalse(
CollectionUtils.isEmpty(userIdsByRoleId),
String.format(
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
index cf140f3d7..3d0bb708e 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
@@ -63,7 +63,7 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper,
Team> implements Te
@Autowired private CommonService commonService;
@Override
- public IPage<Team> findTeams(Team team, RestRequest request) {
+ public IPage<Team> getPage(Team team, RestRequest request) {
Page<Team> page = new Page<>();
page.setCurrent(request.getPageNum());
page.setSize(request.getPageSize());
@@ -71,7 +71,7 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper,
Team> implements Te
}
@Override
- public Team findByName(String teamName) {
+ public Team getByName(String teamName) {
LambdaQueryWrapper<Team> queryWrapper =
new LambdaQueryWrapper<Team>().eq(Team::getTeamName, teamName);
return baseMapper.selectOne(queryWrapper);
@@ -79,7 +79,7 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper,
Team> implements Te
@Override
public void createTeam(Team team) {
- Team existedTeam = findByName(team.getTeamName());
+ Team existedTeam = getByName(team.getTeamName());
ApiAlertException.throwIfFalse(
existedTeam == null,
String.format(
@@ -135,7 +135,7 @@ public class TeamServiceImpl extends
ServiceImpl<TeamMapper, Team> implements Te
}
@Override
- public List<Team> findUserTeams(Long userId) {
+ public List<Team> listByUserId(Long userId) {
User user =
Optional.ofNullable(userService.getById(userId))
.orElseThrow(
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
index f3253d05c..78e70d275 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
@@ -82,14 +82,14 @@ public class UserServiceImpl extends
ServiceImpl<UserMapper, User> implements Us
@Autowired private ShiroProperties shiroProperties;
@Override
- public User findByName(String username) {
+ public User getByUsername(String username) {
LambdaQueryWrapper<User> queryWrapper =
new LambdaQueryWrapper<User>().eq(User::getUsername, username);
return baseMapper.selectOne(queryWrapper);
}
@Override
- public IPage<User> findUserDetail(User user, RestRequest request) {
+ public IPage<User> getPage(User user, RestRequest request) {
Page<User> page = new Page<>();
page.setCurrent(request.getPageNum());
page.setSize(request.getPageSize());
@@ -180,13 +180,13 @@ public class UserServiceImpl extends
ServiceImpl<UserMapper, User> implements Us
}
@Override
- public Set<String> getPermissions(Long userId, @Nullable Long teamId) {
- List<String> userPermissions =
this.menuService.findUserPermissions(userId, teamId);
+ public Set<String> listPermissions(Long userId, @Nullable Long teamId) {
+ List<String> userPermissions = this.menuService.listPermissions(userId,
teamId);
return new HashSet<>(userPermissions);
}
@Override
- public List<User> getNoTokenUser() {
+ public List<User> listNoTokenUser() {
List<User> users = this.baseMapper.selectNoTokenUsers();
if (!users.isEmpty()) {
users.forEach(User::dataMasking);
@@ -220,7 +220,7 @@ public class UserServiceImpl extends
ServiceImpl<UserMapper, User> implements Us
@Override
public void fillInTeam(User user) {
if (user.getLastTeamId() == null) {
- List<Team> teams = memberService.findUserTeams(user.getUserId());
+ List<Team> teams = memberService.listTeamsByUserId(user.getUserId());
ApiAlertException.throwIfTrue(
CollectionUtils.isEmpty(teams),
@@ -235,7 +235,7 @@ public class UserServiceImpl extends
ServiceImpl<UserMapper, User> implements Us
}
@Override
- public List<User> findByAppOwner(Long teamId) {
+ public List<User> listByTeamId(Long teamId) {
return baseMapper.selectUsersByAppOwner(teamId);
}
@@ -261,7 +261,7 @@ public class UserServiceImpl extends
ServiceImpl<UserMapper, User> implements Us
userInfo.put("user", user);
// 3) permissions
- Set<String> permissions = this.getPermissions(user.getUserId(), teamId);
+ Set<String> permissions = this.listPermissions(user.getUserId(), teamId);
userInfo.put("permissions", permissions);
return userInfo;
diff --git
a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/AccessTokenServiceTest.java
b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/AccessTokenServiceTest.java
index f20d7fb80..4520ad47d 100644
---
a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/AccessTokenServiceTest.java
+++
b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/AccessTokenServiceTest.java
@@ -55,18 +55,18 @@ public class AccessTokenServiceTest extends
SpringUnitTestBase {
String username = JWTUtil.getUserName(jwtToken.getToken());
Assertions.assertNotNull(username);
Assertions.assertEquals("admin", username);
- User user = userService.findByName(username);
+ User user = userService.getByUsername(username);
Assertions.assertNotNull(user);
Assertions.assertTrue(JWTUtil.verify(jwtToken.getToken(), username));
// list
AccessToken mockToken1 = new AccessToken();
mockToken1.setUserId(100000L);
- IPage<AccessToken> tokens1 =
accessTokenService.findAccessTokens(mockToken1, new RestRequest());
+ IPage<AccessToken> tokens1 = accessTokenService.getPage(mockToken1, new
RestRequest());
Assertions.assertEquals(1, tokens1.getRecords().size());
AccessToken mockToken2 = new AccessToken();
mockToken2.setUserId(100001L);
- IPage<AccessToken> tokens2 =
accessTokenService.findAccessTokens(mockToken2, new RestRequest());
+ IPage<AccessToken> tokens2 = accessTokenService.getPage(mockToken2, new
RestRequest());
Assertions.assertTrue(tokens2.getRecords().isEmpty());
// toggle
