This is an automated email from the ASF dual-hosted git repository.
benjobs 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 ff063ee4b [Feature] Remove unnecessary findUserRole (#1883)
ff063ee4b is described below
commit ff063ee4bb80c4a5bc6f5374ac5cdf8529586e7e
Author: fanrui <[email protected]>
AuthorDate: Sat Oct 22 22:45:13 2022 +0800
[Feature] Remove unnecessary findUserRole (#1883)
---
.../console/system/authentication/ShiroRealm.java | 8 ------
.../console/system/mapper/RoleMapper.java | 4 ---
.../console/system/service/RoleService.java | 7 -----
.../system/service/impl/RoleServiceImpl.java | 13 ----------
.../system/service/impl/UserServiceImpl.java | 6 +----
.../main/resources/mapper/system/RoleMapper.xml | 8 ------
.../src/core/directives/permission.js | 30 +---------------------
.../streampark-console-webapp/src/store/getters.js | 1 -
.../src/store/modules/user.js | 14 +---------
.../src/store/mutation-types.js | 1 -
10 files changed, 3 insertions(+), 89 deletions(-)
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 e7c293c60..536b6c13b 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
@@ -21,7 +21,6 @@ import org.apache.streampark.console.base.util.WebUtils;
import org.apache.streampark.console.system.entity.AccessToken;
import org.apache.streampark.console.system.entity.User;
import org.apache.streampark.console.system.service.AccessTokenService;
-import org.apache.streampark.console.system.service.RoleService;
import org.apache.streampark.console.system.service.UserService;
import org.apache.commons.lang3.StringUtils;
@@ -46,9 +45,6 @@ public class ShiroRealm extends AuthorizingRealm {
@Autowired
private UserService userService;
- @Autowired
- private RoleService roleService;
-
@Autowired
private AccessTokenService accessTokenService;
@@ -69,10 +65,6 @@ public class ShiroRealm extends AuthorizingRealm {
SimpleAuthorizationInfo simpleAuthorizationInfo = new
SimpleAuthorizationInfo();
- // Get user role set
- Set<String> roleSet = roleService.getUserRoleName(userId);
- simpleAuthorizationInfo.setRoles(roleSet);
-
// Get user permission set
Set<String> permissionSet = userService.getPermissions(userId, null);
simpleAuthorizationInfo.setStringPermissions(permissionSet);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/RoleMapper.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/RoleMapper.java
index 5b88bd9b3..412dadb6f 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/RoleMapper.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/RoleMapper.java
@@ -24,11 +24,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
-import java.util.List;
-
public interface RoleMapper extends BaseMapper<Role> {
- List<Role> findUserRole(Long userId);
-
IPage<Role> findRole(Page<Role> page, @Param("role") Role role);
}
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 9e9d93142..58a1e3121 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
@@ -23,17 +23,10 @@ import org.apache.streampark.console.system.entity.Role;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-import java.util.Set;
-
public interface RoleService extends IService<Role> {
- Set<String> getUserRoleName(Long userId);
-
IPage<Role> findRoles(Role role, RestRequest request);
- List<Role> findUserRole(Long userId);
-
Role findByName(String roleName);
void createRole(Role role);
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 531dac4ca..272f6a80d 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
@@ -44,8 +44,6 @@ import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
@Slf4j
@Service
@@ -61,12 +59,6 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper,
Role> implements Ro
@Autowired
private RoleMenuServie roleMenuService;
- @Override
- public Set<String> getUserRoleName(Long userId) {
- List<Role> roleList = this.findUserRole(userId);
- return
roleList.stream().map(Role::getRoleName).collect(Collectors.toSet());
- }
-
@Override
public IPage<Role> findRoles(Role role, RestRequest request) {
Page<Role> page = new Page<>();
@@ -75,11 +67,6 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper,
Role> implements Ro
return this.baseMapper.findRole(page, role);
}
- @Override
- public List<Role> findUserRole(Long userId) {
- return baseMapper.findUserRole(userId);
- }
-
@Override
public Role findByName(String roleName) {
return baseMapper.selectOne(new
LambdaQueryWrapper<Role>().eq(Role::getRoleName, roleName));
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 d3f8f9aa4..b51235d4b 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
@@ -227,11 +227,7 @@ public class UserServiceImpl extends
ServiceImpl<UserMapper, User> implements Us
user.dataMasking();
userInfo.put("user", user);
- // 3) roles
- Set<String> roles = this.roleService.getUserRoleName(user.getUserId());
- userInfo.put("roles", roles);
-
- // 4) permissions
+ // 3) permissions
Set<String> permissions = this.getPermissions(user.getUserId(),
teamId);
userInfo.put("permissions", permissions);
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/RoleMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/RoleMapper.xml
index fbb9a69b2..5e115d919 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/RoleMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/RoleMapper.xml
@@ -28,14 +28,6 @@
<result column="modify_time" jdbcType="TIMESTAMP"
property="modifyTime"/>
</resultMap>
- <select id="findUserRole" resultMap="roleMap">
- select r.*
- from t_role r
- left join t_member m on r.role_id = m.role_id
- left join t_user u on u.user_id = m.user_id
- where u.user_id = #{userId}
- </select>
-
<select id="findRole" resultType="role" parameterType="role">
select * from t_role
<where>
diff --git
a/streampark-console/streampark-console-webapp/src/core/directives/permission.js
b/streampark-console/streampark-console-webapp/src/core/directives/permission.js
index 10fa19d23..17b0bc4b6 100644
---
a/streampark-console/streampark-console-webapp/src/core/directives/permission.js
+++
b/streampark-console/streampark-console-webapp/src/core/directives/permission.js
@@ -70,38 +70,10 @@ const anyPermit = {
}
}
-// All roles listed must be included for the element to display
-const hasRole = {
- install (Vue) {
- Vue.directive('hasRole', {
- inserted (el, binding, vnode) {
- const roles = vnode.context.$store.getters.roles
- const value = binding.value.split(',')
- doCheck(roles, value, false, false, el)
- }
- })
- }
-}
-
-// The element will display as long as it contains any of the listed roles
-const hasAnyRole = {
- install (Vue) {
- Vue.directive('hasAnyRole', {
- inserted (el, binding, vnode) {
- const roles = vnode.context.$store.getters.roles
- const value = binding.value.split(',')
- doCheck(roles, value, true, true, el)
- }
- })
- }
-}
-
const Plugins = [
permit,
noPermit,
- anyPermit,
- hasRole,
- hasAnyRole
+ anyPermit
]
Plugins.map((plugin) => {
diff --git a/streampark-console/streampark-console-webapp/src/store/getters.js
b/streampark-console/streampark-console-webapp/src/store/getters.js
index 010cf99db..48799f6c9 100644
--- a/streampark-console/streampark-console-webapp/src/store/getters.js
+++ b/streampark-console/streampark-console-webapp/src/store/getters.js
@@ -23,7 +23,6 @@ const getters = {
// user
permissions: state => state.user.permissions,
- roles: state => state.user.roles,
token: state => state.user.token,
avatar: state => state.user.avatar,
nickname: state => state.user.name,
diff --git
a/streampark-console/streampark-console-webapp/src/store/modules/user.js
b/streampark-console/streampark-console-webapp/src/store/modules/user.js
index bdd077fa5..2ccd78c40 100644
--- a/streampark-console/streampark-console-webapp/src/store/modules/user.js
+++ b/streampark-console/streampark-console-webapp/src/store/modules/user.js
@@ -17,7 +17,7 @@
import { signin, signout } from '@/api/passport'
import { setTeam, initTeam } from '@/api/user'
-import {TOKEN, EXPIRE, PERMISSIONS, ROLES, USER_INFO, USER_NAME, USER_ROUTER,
INVALID, TEAM_ID} from '@/store/mutation-types'
+import {TOKEN, EXPIRE, PERMISSIONS, USER_INFO, USER_NAME, USER_ROUTER,
INVALID, TEAM_ID} from '@/store/mutation-types'
import storage from '@/utils/storage'
import { getRouter } from '@/api/menu'
@@ -26,7 +26,6 @@ const user = {
expire: storage.get(EXPIRE),
token: storage.get(TOKEN),
info: storage.get(USER_INFO),
- roles: storage.getSession(ROLES) || storage.get(ROLES),
permissions: storage.getSession(PERMISSIONS) || storage.get(PERMISSIONS),
routers: storage.getSession(USER_ROUTER) || storage.get(USER_ROUTER),
teamId: storage.getSession(TEAM_ID) || storage.get(TEAM_ID),
@@ -56,11 +55,6 @@ const user = {
storage.set(TEAM_ID, teamId)
state.teamId = teamId
},
- SET_ROLES: (state, roles) => {
- storage.set(ROLES, roles)
- storage.setSession(ROLES, roles)
- state.roles = roles
- },
SET_PERMISSIONS: (state, permissions) => {
storage.set(PERMISSIONS, permissions)
storage.setSession(PERMISSIONS, permissions)
@@ -72,7 +66,6 @@ const user = {
state.routers = routers
},
CLEAR_ROUTERS: (state, empty) => {
- state.roles = null
storage.rm(USER_ROUTER)
storage.rmSession(USER_ROUTER)
},
@@ -80,7 +73,6 @@ const user = {
SET_EMPTY: (state, empty) => {
state.token = null
state.info = null
- state.roles = null
state.permissions = null
state.name = null
state.welcome = null
@@ -92,12 +84,10 @@ const user = {
storage.rm(USER_ROUTER)
storage.rm(TEAM_ID)
- storage.rm(ROLES)
storage.rm(PERMISSIONS)
storage.rmSession(USER_ROUTER)
storage.rmSession(TEAM_ID)
- storage.rmSession(ROLES)
storage.rmSession(PERMISSIONS)
}
},
@@ -114,7 +104,6 @@ const user = {
if (respData != null && respData.token) {
commit('SET_EXPIRE', respData.expire)
commit('SET_TOKEN', respData.token)
- commit('SET_ROLES', respData.roles)
commit('SET_PERMISSIONS', respData.permissions)
commit('SET_INFO', respData.user)
}
@@ -161,7 +150,6 @@ const user = {
setTeam(data).then(resp => {
const respData = resp.data
commit('SET_TEAM', data.teamId)
- commit('SET_ROLES', respData.roles)
commit('SET_PERMISSIONS', respData.permissions)
commit('SET_INFO', respData.user)
commit('CLEAR_ROUTERS', null)
diff --git
a/streampark-console/streampark-console-webapp/src/store/mutation-types.js
b/streampark-console/streampark-console-webapp/src/store/mutation-types.js
index 6505f2971..5e2e84c97 100644
--- a/streampark-console/streampark-console-webapp/src/store/mutation-types.js
+++ b/streampark-console/streampark-console-webapp/src/store/mutation-types.js
@@ -19,7 +19,6 @@ export const TOKEN = 'TOKEN'
export const USER_ROUTER = 'USER_ROUTER'
export const PERMISSIONS = 'PERMISSIONS'
export const EXPIRE = 'EXPIRE'
-export const ROLES = 'ROLES'
export const USER_INFO = 'USER_INFO'
export const USER_NAME = 'USER_NAME'
export const TEAM_ID = 'TEAM_ID'
