This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev-2.1.5
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev-2.1.5 by this push:
new 081f985e3 [Improve] default team improvement
081f985e3 is described below
commit 081f985e365942588d7b28a13b2853e7dc167f09
Author: benjobs <[email protected]>
AuthorDate: Sat Jul 27 11:30:33 2024 +0800
[Improve] default team improvement
---
.../src/main/assembly/script/data/mysql-data.sql | 8 ++++----
.../src/main/assembly/script/data/pgsql-data.sql | 8 ++++----
.../streampark/console/base/domain/Constant.java | 4 ++++
.../streampark/console/base/domain/ResponseCode.java | 2 --
.../console/system/controller/PassportController.java | 13 -------------
.../console/system/controller/UserController.java | 18 ++++--------------
.../streampark/console/system/service/TeamService.java | 2 ++
.../streampark/console/system/service/UserService.java | 2 --
.../console/system/service/impl/TeamServiceImpl.java | 6 ++++++
.../console/system/service/impl/UserServiceImpl.java | 18 ++----------------
.../streampark-console-webapp/src/api/system/user.ts | 14 +++-----------
.../src/store/modules/user.ts | 18 +++++++-----------
.../src/views/base/login/LoginForm.vue | 7 -------
13 files changed, 36 insertions(+), 84 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/assembly/script/data/mysql-data.sql
b/streampark-console/streampark-console-service/src/main/assembly/script/data/mysql-data.sql
index bc9565b5f..1ced00b6d 100644
---
a/streampark-console/streampark-console-service/src/main/assembly/script/data/mysql-data.sql
+++
b/streampark-console/streampark-console-service/src/main/assembly/script/data/mysql-data.sql
@@ -250,13 +250,13 @@ insert into `t_setting` values (14,
'docker.register.namespace', null, 'Docker n
insert into `t_setting` values (15, 'ingress.mode.default', null, 'Ingress
domain address', 'Automatically generate an nginx-based ingress by passing in a
domain name', 1);
-- ----------------------------
--- Records of t_user
+-- Records of t_member
-- ----------------------------
-insert into `t_user` values (100000, 'admin', '',
'rh8b1ojwog777yrg0daesf04gk',
'2513f3748847298ea324dffbf67fe68681dd92315bda830065facd8efe08f54f', null, 1, 0,
null, '1', now(), now(),null,0,null,null);
+insert into `t_member` values (100000, 100000, 100000, 100001, now(), now());
-- ----------------------------
--- Records of t_member
+-- Records of t_user
-- ----------------------------
-insert into `t_member` values (100000, 100000, 100000, 100001, now(), now());
+insert into `t_user` values (100000, 'admin', '',
'rh8b1ojwog777yrg0daesf04gk',
'2513f3748847298ea324dffbf67fe68681dd92315bda830065facd8efe08f54f', null, 1, 0,
100000, '1', now(), now(),null,0,null,null);
set foreign_key_checks = 1;
diff --git
a/streampark-console/streampark-console-service/src/main/assembly/script/data/pgsql-data.sql
b/streampark-console/streampark-console-service/src/main/assembly/script/data/pgsql-data.sql
index bcd706880..ca2e6b791 100644
---
a/streampark-console/streampark-console-service/src/main/assembly/script/data/pgsql-data.sql
+++
b/streampark-console/streampark-console-service/src/main/assembly/script/data/pgsql-data.sql
@@ -244,11 +244,11 @@ insert into "public"."t_setting" values (14,
'docker.register.namespace', null,
insert into "public"."t_setting" values (15, 'ingress.mode.default', null,
'Ingress domain address', 'Automatically generate an nginx-based ingress by
passing in a domain name', 1);
-- ----------------------------
--- Records of t_user
+-- Records of t_member
-- ----------------------------
-insert into "public"."t_user" values (100000, 'admin', '',
'rh8b1ojwog777yrg0daesf04gk',
'2513f3748847298ea324dffbf67fe68681dd92315bda830065facd8efe08f54f', null, 1, 0,
null, '1', now(), now(), null, 0, null, null);
+insert into "public"."t_member" values (100000, 100000, 100000, 100001, now(),
now());
-- ----------------------------
--- Records of t_member
+-- Records of t_user
-- ----------------------------
-insert into "public"."t_member" values (100000, 100000, 100000, 100001, now(),
now());
+insert into "public"."t_user" values (100000, 'admin', '',
'rh8b1ojwog777yrg0daesf04gk',
'2513f3748847298ea324dffbf67fe68681dd92315bda830065facd8efe08f54f', null, 1, 0,
100000, '1', now(), now(), null, 0, null, null);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/Constant.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/Constant.java
index f1d7f6b74..84f137e05 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/Constant.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/Constant.java
@@ -28,6 +28,10 @@ public class Constant {
public static final String TYPE_BUTTON = "1";
// menu
public static final String TYPE_MENU = "0";
+
public static final String APP_MENU_ID = "100015";
+
public static final String APP_DETAIL_MENU_ID = "100018";
+
+ public static final Long DEFAULT_TEAM_ID = 10000L;
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/ResponseCode.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/ResponseCode.java
index 8c617031f..80254608c 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/ResponseCode.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/ResponseCode.java
@@ -23,8 +23,6 @@ public interface ResponseCode {
Long CODE_UNAUTHORIZED = 401L;
- Long CODE_FORBIDDEN = 403L;
-
Long CODE_FAIL = 500L;
Long CODE_FAIL_ALERT = 501L;
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/PassportController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/PassportController.java
index c6c9a7ba4..d7d98f281 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/PassportController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/PassportController.java
@@ -18,7 +18,6 @@
package org.apache.streampark.console.system.controller;
import org.apache.streampark.common.util.DateUtils;
-import org.apache.streampark.console.base.domain.ResponseCode;
import org.apache.streampark.console.base.domain.RestResponse;
import org.apache.streampark.console.base.util.WebUtils;
import org.apache.streampark.console.core.enums.AuthenticationType;
@@ -38,8 +37,6 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime;
@@ -56,8 +53,6 @@ public class PassportController {
@PostMapping("signin")
public RestResponse signin(
- HttpServletRequest request,
- HttpServletResponse response,
@NotBlank(message = "{required}") String username,
@NotBlank(message = "{required}") String password,
@NotBlank(message = "{required}") String loginType)
@@ -77,14 +72,6 @@ public class PassportController {
return RestResponse.success().put("code", 1);
}
- // set team
- userService.setDefaultTeam(user);
-
- // no team.
- if (user.getLastTeamId() == null) {
- return RestResponse.success().data(user.getUserId()).put("code",
ResponseCode.CODE_FORBIDDEN);
- }
-
this.userService.updateLoginTime(username);
String sign = JWTUtil.sign(user.getUserId(), username, user.getSalt(),
AuthenticationType.SIGN);
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 a5d34b0f0..126bd5a66 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
@@ -91,8 +91,8 @@ public class UserController {
}
@RequiresPermissions("token:add")
- @PostMapping("getNoTokenUser")
- public RestResponse getNoTokenUser() {
+ @PostMapping("get_no_token_user")
+ public RestResponse noTokenUser() {
List<User> userList = this.userService.getNoTokenUser();
return RestResponse.success(userList);
}
@@ -118,17 +118,7 @@ public class UserController {
return RestResponse.success(newPass);
}
- @PostMapping("initTeam")
- public RestResponse initTeam(Long teamId, Long userId) {
- Team team = teamService.getById(teamId);
- if (team == null) {
- return RestResponse.fail("teamId is invalid",
ResponseCode.CODE_FAIL_ALERT);
- }
- userService.setLastTeam(teamId, userId);
- return RestResponse.success();
- }
-
- @PostMapping("setTeam")
+ @PostMapping("set_team")
public RestResponse setTeam(Long teamId) {
Team team = teamService.getById(teamId);
if (team == null) {
@@ -146,7 +136,7 @@ public class UserController {
return new RestResponse().data(infoMap);
}
- @PostMapping("appOwners")
+ @PostMapping("app_owners")
public RestResponse appOwners(Long teamId) {
List<User> userList = userService.findByAppOwner(teamId);
userList.forEach(User::dataMasking);
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 73a6c1d7f..ae57676e6 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
@@ -37,5 +37,7 @@ public interface TeamService extends IService<Team> {
void updateTeam(Team team);
+ Team getSysDefaultTeam();
+
List<Team> findUserTeams(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 0e88b4db2..792830eb4 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
@@ -111,8 +111,6 @@ public interface UserService extends IService<User> {
void clearLastTeam(Long teamId);
- void setDefaultTeam(User user);
-
List<User> findByAppOwner(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/TeamServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
index f442ef1c8..d0617f118 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
@@ -17,6 +17,7 @@
package org.apache.streampark.console.system.service.impl;
+import org.apache.streampark.console.base.domain.Constant;
import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.exception.ApiAlertException;
import org.apache.streampark.console.base.mybatis.pager.MybatisPager;
@@ -137,6 +138,11 @@ public class TeamServiceImpl extends
ServiceImpl<TeamMapper, Team> implements Te
updateById(oldTeam);
}
+ @Override
+ public Team getSysDefaultTeam() {
+ return getById(Constant.DEFAULT_TEAM_ID);
+ }
+
@Override
public List<Team> findUserTeams(Long userId) {
User user =
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 a20e91d82..07bc869fd 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
@@ -31,7 +31,6 @@ import
org.apache.streampark.console.system.service.MenuService;
import org.apache.streampark.console.system.service.TeamService;
import org.apache.streampark.console.system.service.UserService;
-import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -102,6 +101,8 @@ public class UserServiceImpl extends
ServiceImpl<UserMapper, User> implements Us
String salt = ShaHashUtils.getRandomSalt();
String password = ShaHashUtils.encrypt(salt, user.getPassword());
user.setSalt(salt);
+ // default team
+ user.setLastTeamId(teamService.getSysDefaultTeam().getId());
user.setPassword(password);
save(user);
}
@@ -203,21 +204,6 @@ public class UserServiceImpl extends
ServiceImpl<UserMapper, User> implements Us
this.baseMapper.clearLastTeamByTeamId(teamId);
}
- @Override
- public void setDefaultTeam(User user) {
- if (user.getLastTeamId() == null) {
- List<Team> teams = memberService.findUserTeams(user.getUserId());
- if (CollectionUtils.isEmpty(teams)) {
- throw new ApiAlertException(
- "The current user not belong to any team, please contact the
administrator!");
- } else if (teams.size() == 1) {
- Team team = teams.get(0);
- user.setLastTeamId(team.getId());
- this.baseMapper.updateById(user);
- }
- }
- }
-
@Override
public List<User> findByAppOwner(Long teamId) {
return baseMapper.findByAppOwner(teamId);
diff --git
a/streampark-console/streampark-console-webapp/src/api/system/user.ts
b/streampark-console/streampark-console-webapp/src/api/system/user.ts
index 30a17ad53..072e02e6c 100644
--- a/streampark-console/streampark-console-webapp/src/api/system/user.ts
+++ b/streampark-console/streampark-console-webapp/src/api/system/user.ts
@@ -34,16 +34,15 @@ enum Api {
GetUserInfo = '/getUserInfo',
GetPermCode = '/getPermCode',
UserList = '/user/list',
- NoTokenUsers = '/user/getNoTokenUser',
+ NoTokenUsers = '/user/get_no_token_user',
UserUpdate = '/user/update',
UserAdd = '/user/post',
UserDelete = '/user/delete',
ResetPassword = '/user/password/reset',
Password = '/user/password',
CheckName = '/user/check/name',
- SET_TEAM = '/user/setTeam',
- INIT_TEAM = '/user/initTeam',
- APP_OWNERS = '/user/appOwners',
+ SET_TEAM = '/user/set_team',
+ APP_OWNERS = '/user/app_owners',
}
/**
@@ -136,13 +135,6 @@ export function fetchAppOwners(data: Recordable):
Promise<Array<UserInfo>> {
});
}
-export function fetchInitUserTeam(data: { userId: string; teamId: string }) {
- return defHttp.post({
- url: Api.INIT_TEAM,
- data,
- });
-}
-
export function fetchSetUserTeam(data: { teamId: string }):
Promise<TeamSetResponse> {
return defHttp.post({
url: Api.SET_TEAM,
diff --git
a/streampark-console/streampark-console-webapp/src/store/modules/user.ts
b/streampark-console/streampark-console-webapp/src/store/modules/user.ts
index ccfe25f30..b3611a8a0 100644
--- a/streampark-console/streampark-console-webapp/src/store/modules/user.ts
+++ b/streampark-console/streampark-console-webapp/src/store/modules/user.ts
@@ -12,7 +12,7 @@ import {
USER_INFO_KEY,
} from '/@/enums/cacheEnum';
import { getAuthCache, setAuthCache } from '/@/utils/auth';
-import { doLogout, fetchInitUserTeam, fetchSetUserTeam } from
'/@/api/system/user';
+import { doLogout, fetchSetUserTeam } from '/@/api/system/user';
import { useI18n } from '/@/hooks/web/useI18n';
import { useMessage } from '/@/hooks/web/useMessage';
import { router } from '/@/router';
@@ -135,20 +135,16 @@ export const useUserStore = defineStore({
try {
const { refreshMenu } = usePermission();
// The userId passed in is the binding operation at login
- if (data.userId) {
- await fetchInitUserTeam(data as { teamId: string; userId: string });
- } else {
- const resp = await fetchSetUserTeam(data);
- const { permissions, roles = [], user } = resp;
- this.setUserInfo(user);
- this.setRoleList(roles as RoleEnum[]);
- this.setPermissions(permissions);
- }
+ const { permissions, roles = [], user } = await fetchSetUserTeam(data);
+ this.setUserInfo(user as UserInfo);
+ this.setRoleList(roles as RoleEnum[]);
+ this.setPermissions(permissions);
+
// If it returns success, it will be stored in the local cache
this.teamId = data.teamId;
sessionStorage.setItem(APP_TEAMID_KEY_, data.teamId);
localStorage.setItem(APP_TEAMID_KEY_, data.teamId);
- if (!data.userId) refreshMenu(unref(router.currentRoute)?.path);
+ await refreshMenu(unref(router.currentRoute)?.path);
return Promise.resolve(true);
} catch (error) {
return Promise.reject(error);
diff --git
a/streampark-console/streampark-console-webapp/src/views/base/login/LoginForm.vue
b/streampark-console/streampark-console-webapp/src/views/base/login/LoginForm.vue
index eb0282414..f22f1c90b 100644
---
a/streampark-console/streampark-console-webapp/src/views/base/login/LoginForm.vue
+++
b/streampark-console/streampark-console-webapp/src/views/base/login/LoginForm.vue
@@ -92,7 +92,6 @@
import { loginApi } from '/@/api/system/user';
import { APP_TEAMID_KEY_ } from '/@/enums/cacheEnum';
import TeamModal from './teamModal.vue';
- import { fetchUserTeam } from '/@/api/system/member';
import { LoginResultModel } from '/@/api/system/model/userModel';
import { Result } from '/#/axios';
const FormItem = Form.Item;
@@ -165,12 +164,6 @@
(code === 0 ? ' authentication error' : ' current User is
locked.');
createMessage.error(message);
return;
- } else if (code == 403) {
- userId.value = data as unknown as string;
- const teamList = await fetchUserTeam({ userId: userId.value });
- userStore.setTeamList(teamList.map((i) => ({ label: i.teamName,
value: i.id })));
- modelVisible.value = true;
- return;
} else {
console.log(data);
}
