(incubator-streampark) branch dev-2.1.5 updated: [Cherry-pick] default team member improvement 3953 (#3956)

[benjobs]

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 ed19587c0 [Cherry-pick] default team member improvement 3953 (#3956)
ed19587c0 is described below

commit ed19587c061f1dc653f1594f43da233e96057e12
Author: ShawHee <whusha...@163.com>
AuthorDate: Fri Aug 9 22:12:35 2024 +0800

    [Cherry-pick] default team member improvement 3953 (#3956)
    
    * set default team member
    
    * getTeamId from teamService
    
    * code format
    
    ---------
    
    Co-authored-by: hechao <shawhe@BIH-D-50841.youdao.internal>
---
 .../org/apache/streampark/console/base/domain/Constant.java |  2 ++
 .../streampark/console/system/service/RoleService.java      |  2 ++
 .../console/system/service/impl/RoleServiceImpl.java        |  6 ++++++
 .../console/system/service/impl/UserServiceImpl.java        | 13 +++++++++++++
 4 files changed, 23 insertions(+)

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 92c760419..bfbcc369f 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
@@ -31,4 +31,6 @@ public class Constant {
   public static final String APP_DETAIL_MENU_ID = "100018";
 
   public static final Long DEFAULT_TEAM_ID = 100000L;
+
+  public static final Long DEFAULT_ROLE_ID = 100001L;
 }
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 a509ced3a..4c1bdeebc 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
@@ -34,4 +34,6 @@ public interface RoleService extends IService<Role> {
   void deleteRole(Long roleId);
 
   void updateRole(Role role);
+
+  Role getSysDefaultRole();
 }
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 a5a93ec54..c2447b9cf 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
@@ -125,4 +125,10 @@ public class RoleServiceImpl extends 
ServiceImpl<RoleMapper, Role> implements Ro
               this.roleMenuMapper.insert(rm);
             });
   }
+
+  @Override
+  public Role getSysDefaultRole() {
+    return baseMapper.selectOne(
+        new LambdaQueryWrapper<Role>().eq(Role::getRoleId, 
Constant.DEFAULT_ROLE_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 0527d583a..584f157a1 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
@@ -23,10 +23,13 @@ import 
org.apache.streampark.console.base.exception.ApiAlertException;
 import org.apache.streampark.console.base.mybatis.pager.MybatisPager;
 import org.apache.streampark.console.base.util.ShaHashUtils;
 import org.apache.streampark.console.system.authentication.JWTToken;
+import org.apache.streampark.console.system.entity.Member;
+import org.apache.streampark.console.system.entity.Role;
 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.RoleService;
 import org.apache.streampark.console.system.service.TeamService;
 import org.apache.streampark.console.system.service.UserService;
 
@@ -63,6 +66,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, 
User> implements Us
 
   @Autowired private TeamService teamService;
 
+  @Autowired private RoleService roleService;
+
   @Override
   public User findByName(String username) {
     LambdaQueryWrapper<User> queryWrapper =
@@ -104,6 +109,14 @@ public class UserServiceImpl extends 
ServiceImpl<UserMapper, User> implements Us
     user.setLastTeamId(teamService.getSysDefaultTeam().getId());
     user.setPassword(password);
     save(user);
+    // set team member
+    Member member = new Member();
+    member.setUserName(user.getUsername());
+    member.setTeamId(teamService.getSysDefaultTeam().getId());
+    Role role = roleService.getSysDefaultRole();
+    member.setRoleId(role.getRoleId());
+    member.setRoleName(role.getRoleName());
+    memberService.createMember(member);
   }
 
   @Override