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 1c3b89095 [Improve] default team improvement (#3922)
1c3b89095 is described below
commit 1c3b89095d6eec6ac6f28078c66d8f7f60db1d2e
Author: benjobs <[email protected]>
AuthorDate: Sat Jul 27 20:50:56 2024 +0800
[Improve] default team improvement (#3922)
* [Improve] default team improvement
* [Bug] default teamId bug fixed.
---
.../src/main/assembly/script/data/pgsql-data.sql | 2 +-
.../streampark/console/base/domain/Constant.java | 9 +++---
.../console/system/authentication/JWTToken.java | 5 ++-
.../system/controller/PassportController.java | 20 +++---------
.../console/system/controller/SsoController.java | 1 -
.../console/system/controller/UserController.java | 12 +------
.../console/system/service/TeamService.java | 7 ++++
.../console/system/service/UserService.java | 7 ----
.../service/impl/AccessTokenServiceImpl.java | 2 +-
.../system/service/impl/TeamServiceImpl.java | 6 ++++
.../system/service/impl/UserServiceImpl.java | 37 ++++------------------
.../src/main/resources/db/data-h2.sql | 8 ++---
.../src/api/system/user.ts | 10 +-----
.../src/store/modules/user.ts | 18 ++++-------
.../src/views/base/login/LoginForm.vue | 6 ----
15 files changed, 47 insertions(+), 103 deletions(-)
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 ceb633ca0..9d82d4246 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
@@ -263,7 +263,7 @@ insert into "public"."t_setting" values (15,
'ingress.mode.default', null, 'Ingr
-- ----------------------------
-- Records of t_user
-- ----------------------------
-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_user" values (100000, 'admin', '',
'rh8b1ojwog777yrg0daesf04gk',
'2513f3748847298ea324dffbf67fe68681dd92315bda830065facd8efe08f54f', null, 1, 0,
100000, '1', now(), now(), null, 0, null, null);
-- ----------------------------
-- Records of t_member
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 280da2fc4..03a211c64 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
@@ -24,11 +24,12 @@ public class Constant {
public static final String ORDER_DESC = "desc";
// order rules: ascend
public static final String ORDER_ASC = "asc";
+
public static final String DEFAULT_SORT_FIELD = "create_time";
- // button
- 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 = 100000L;
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/authentication/JWTToken.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/authentication/JWTToken.java
index dada26528..15d13fe38 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/authentication/JWTToken.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/authentication/JWTToken.java
@@ -33,13 +33,16 @@ public class JWTToken implements AuthenticationToken {
private String expireAt;
+ private int signType;
+
public JWTToken(String token) {
this.token = token;
}
- public JWTToken(String token, String expireAt) {
+ public JWTToken(String token, String expireAt, int signType) {
this.token = token;
this.expireAt = expireAt;
+ this.signType = signType;
}
@Override
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 1b0a909ca..01256fef4 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;
@@ -41,8 +40,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;
@@ -83,8 +80,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) throws Exception {
@@ -103,14 +98,6 @@ public class PassportController {
return RestResponse.success().put("code", 1);
}
- // set team
- userService.fillInTeam(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);
@@ -118,15 +105,16 @@ public class PassportController {
String ttl = DateUtils.formatFullTime(expireTime);
// shiro login
- JWTToken loginToken = new JWTToken(sign, ttl);
+ JWTToken loginToken = new JWTToken(sign, ttl,
AuthenticationType.SIGN.get());
SecurityUtils.getSubject().login(loginToken);
// generate UserInfo
String token = WebUtils.encryptToken(sign);
- JWTToken jwtToken = new JWTToken(token, ttl);
+ JWTToken jwtToken = new JWTToken(token, ttl,
AuthenticationType.SIGN.get());
String userId = RandomStringUtils.randomAlphanumeric(20);
user.setId(userId);
- Map<String, Object> userInfo =
userService.generateFrontendUserInfo(user, user.getLastTeamId(), jwtToken);
+ Map<String, Object> userInfo =
+ userService.generateFrontendUserInfo(user, user.getLastTeamId(),
jwtToken);
return new RestResponse().data(userInfo);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/SsoController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/SsoController.java
index 1c37fbbec..808e5568d 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/SsoController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/SsoController.java
@@ -68,7 +68,6 @@ public class SsoController {
@GetMapping("token")
@ResponseBody
public RestResponse token() throws Exception {
-
// Check SSO enable status
ApiAlertException.throwIfTrue(
!ssoEnable,
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 9eb599243..d91d6abdd 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
@@ -123,17 +123,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(ResponseCode.CODE_FAIL_ALERT, "teamId is
invalid");
- }
- 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) {
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 7913af294..7dcd3209f 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
@@ -72,4 +72,11 @@ public interface TeamService extends IService<Team> {
* @return List of Team
*/
List<Team> listByUserId(Long userId);
+
+ /**
+ * get system default team
+ * @return
+ */
+
+ Team getSysDefaultTeam();
}
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 45c8cfe7e..cbf40603b 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
@@ -126,13 +126,6 @@ public interface UserService extends IService<User> {
*/
void clearLastTeam(Long teamId);
- /**
- * Populate team information for users
- *
- * @param user User
- */
- void fillInTeam(User user);
-
/**
* List all Users by team id
*
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 a2a204fc1..8afebcf70 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
@@ -67,7 +67,7 @@ public class AccessTokenServiceImpl extends
ServiceImpl<AccessTokenMapper, Acces
JWTUtil.sign(
user.getUserId(), user.getUsername(), user.getSalt(),
AuthenticationType.OPENAPI));
- JWTToken jwtToken = new JWTToken(token,
AccessToken.DEFAULT_EXPIRE_TIME);
+ JWTToken jwtToken = new JWTToken(token,
AccessToken.DEFAULT_EXPIRE_TIME, AuthenticationType.SIGN.get());
AccessToken accessToken = new AccessToken();
accessToken.setToken(jwtToken.getToken());
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 c5361b60e..3c698611c 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;
@@ -141,4 +142,9 @@ public class TeamServiceImpl extends
ServiceImpl<TeamMapper, Team> implements Te
}
return baseMapper.selectTeamsByUserId(userId);
}
+
+ @Override
+ public Team getSysDefaultTeam() {
+ return getById(Constant.DEFAULT_TEAM_ID);
+ }
}
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 c7ff596e5..08381e2f0 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
@@ -19,7 +19,6 @@ package org.apache.streampark.console.system.service.impl;
import org.apache.streampark.common.util.AssertUtils;
import org.apache.streampark.common.util.DateUtils;
-import org.apache.streampark.console.base.domain.ResponseCode;
import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.domain.RestResponse;
import org.apache.streampark.console.base.exception.ApiAlertException;
@@ -33,14 +32,13 @@ import
org.apache.streampark.console.core.service.application.ApplicationInfoSer
import
org.apache.streampark.console.core.service.application.ApplicationManageService;
import org.apache.streampark.console.system.authentication.JWTToken;
import org.apache.streampark.console.system.authentication.JWTUtil;
-import org.apache.streampark.console.system.entity.Team;
import org.apache.streampark.console.system.entity.User;
import org.apache.streampark.console.system.mapper.UserMapper;
import org.apache.streampark.console.system.service.MemberService;
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.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
@@ -85,6 +83,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,
User> implements Us
@Autowired
private ResourceService resourceService;
+ @Autowired
+ private TeamService teamService;
+
@Override
public User getByUsername(String username) {
LambdaQueryWrapper<User> queryWrapper = new
LambdaQueryWrapper<User>().eq(User::getUsername, username);
@@ -116,6 +117,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);
@@ -213,23 +216,6 @@ public class UserServiceImpl extends
ServiceImpl<UserMapper, User> implements Us
this.baseMapper.clearLastTeamByTeamId(teamId);
}
- @Override
- public void fillInTeam(User user) {
- if (user.getLastTeamId() == null) {
- List<Team> teams =
memberService.listTeamsByUserId(user.getUserId());
-
- ApiAlertException.throwIfTrue(
- CollectionUtils.isEmpty(teams),
- "The current user does not belong to any team, please contact
the administrator!");
-
- if (teams.size() == 1) {
- Team team = teams.get(0);
- user.setLastTeamId(team.getId());
- this.baseMapper.updateById(user);
- }
- }
- }
-
@Override
public List<User> listByTeamId(Long teamId) {
return baseMapper.selectUsersByAppOwner(teamId);
@@ -250,15 +236,6 @@ public class UserServiceImpl extends
ServiceImpl<UserMapper, User> implements Us
if (User.STATUS_LOCK.equals(user.getStatus())) {
return RestResponse.success().put(RestResponse.CODE_KEY, 1);
}
- // set team
- fillInTeam(user);
-
- // no team.
- if (user.getLastTeamId() == null) {
- return RestResponse.success()
- .data(user.getUserId())
- .put(RestResponse.CODE_KEY, ResponseCode.CODE_FORBIDDEN);
- }
updateLoginTime(user.getUsername());
String token = WebUtils.encryptToken(
@@ -266,7 +243,7 @@ public class UserServiceImpl extends
ServiceImpl<UserMapper, User> implements Us
user.getUserId(), user.getUsername(), user.getSalt(),
AuthenticationType.SIGN));
LocalDateTime expireTime =
LocalDateTime.now().plusSeconds(JWTUtil.getTTLOfSecond());
String expireTimeStr = DateUtils.formatFullTime(expireTime);
- JWTToken jwtToken = new JWTToken(token, expireTimeStr);
+ JWTToken jwtToken = new JWTToken(token, expireTimeStr,
AuthenticationType.SIGN.get());
String userId = RandomStringUtils.randomAlphanumeric(20);
user.setId(userId);
Map<String, Object> userInfo = generateFrontendUserInfo(user,
user.getLastTeamId(), jwtToken);
diff --git
a/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql
b/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql
index 722ea8b24..8bd14a6be 100644
---
a/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql
+++
b/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql
@@ -292,10 +292,10 @@ insert into `t_setting` values (15,
'ingress.mode.default', null, 'Ingress domai
-- ----------------------------
-- Records of t_user
-- ----------------------------
-insert into `t_user` values (100000, 'admin', '',
'rh8b1ojwog777yrg0daesf04gk',
'2513f3748847298ea324dffbf67fe68681dd92315bda830065facd8efe08f54f', null, 1, 0,
null, '1', now(), now(),null,'0',null,null);
-insert into `t_user` values (100001, 'test1', '',
'rh8b1ojwog777yrg0daesf04gk',
'2513f3748847298ea324dffbf67fe68681dd92315bda830065facd8efe08f54f', null, 2, 0,
null, '1', now(), now(),null,'0',null,null);
-insert into `t_user` values (100002, 'test2', '',
'rh8b1ojwog777yrg0daesf04gk',
'2513f3748847298ea324dffbf67fe68681dd92315bda830065facd8efe08f54f', null, 2, 0,
null, '1', now(), now(),null,'0',null,null);
-insert into `t_user` values (100003, 'test3', '',
'rh8b1ojwog777yrg0daesf04gk',
'2513f3748847298ea324dffbf67fe68681dd92315bda830065facd8efe08f54f', null, 2, 0,
null, '1', now(), now(),null,'0',null,null);
+insert into `t_user` values (100000, 'admin', '',
'rh8b1ojwog777yrg0daesf04gk',
'2513f3748847298ea324dffbf67fe68681dd92315bda830065facd8efe08f54f', null, 1, 0,
100000, '1', now(), now(),null,'0',null,null);
+insert into `t_user` values (100001, 'test1', '',
'rh8b1ojwog777yrg0daesf04gk',
'2513f3748847298ea324dffbf67fe68681dd92315bda830065facd8efe08f54f', null, 2, 0,
100000, '1', now(), now(),null,'0',null,null);
+insert into `t_user` values (100002, 'test2', '',
'rh8b1ojwog777yrg0daesf04gk',
'2513f3748847298ea324dffbf67fe68681dd92315bda830065facd8efe08f54f', null, 2, 0,
100000, '1', now(), now(),null,'0',null,null);
+insert into `t_user` values (100003, 'test3', '',
'rh8b1ojwog777yrg0daesf04gk',
'2513f3748847298ea324dffbf67fe68681dd92315bda830065facd8efe08f54f', null, 2, 0,
100001, '1', now(), now(),null,'0',null,null);
-- ----------------------------
-- Records of t_member
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 4a41cdd79..015c94f49 100644
--- a/streampark-console/streampark-console-webapp/src/api/system/user.ts
+++ b/streampark-console/streampark-console-webapp/src/api/system/user.ts
@@ -32,8 +32,7 @@ enum Api {
ResetPassword = '/user/password/reset',
Password = '/user/password',
CheckName = '/user/check/name',
- SET_TEAM = '/user/setTeam',
- INIT_TEAM = '/user/initTeam',
+ SET_TEAM = '/user/set_team',
APP_OWNERS = '/user/appOwners',
TransferUserResource = '/user/transferResource',
}
@@ -100,13 +99,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 c34d9f779..8cbc54f44 100644
--- a/streampark-console/streampark-console-webapp/src/store/modules/user.ts
+++ b/streampark-console/streampark-console-webapp/src/store/modules/user.ts
@@ -13,7 +13,7 @@ import {
} from '/@/enums/cacheEnum';
import { getAuthCache, setAuthCache } from '/@/utils/auth';
import { signout } from '/@/api/system/passport';
-import { fetchInitUserTeam, fetchSetUserTeam } from '/@/api/system/user';
+import { fetchSetUserTeam } from '/@/api/system/user';
import { useI18n } from '/@/hooks/web/useI18n';
import { useMessage } from '/@/hooks/web/useMessage';
@@ -136,23 +136,17 @@ export const useUserStore = defineStore({
async setTeamId(data: { teamId: string; userId?: string | number }):
Promise<boolean> {
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 } = await fetchSetUserTeam(data);
+ this.setUserInfo(user as UserInfo);
+ this.setRoleList(roles as RoleEnum[]);
+ this.setPermissions(permissions);
- const { permissions, roles = [], user } = resp;
- this.setUserInfo(user);
- 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 d1cb92ad3..9c3b6a719 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
@@ -179,12 +179,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);
}