[Improve] default team member improvement (#3953)

* set default team member * getTeamId from teamService --------- Co-authored-by: hechao <[email protected]>
apache · Aug 9, 2024 · e4cc7ef · e4cc7ef
1 parent ab5cc1f
commit e4cc7ef
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 0 deletions.
diff --git a/...ark-console-service/src/main/java/org/apache/streampark/console/base/domain/Constant.java b/...ark-console-service/src/main/java/org/apache/streampark/console/base/domain/Constant.java
@@ -32,4 +32,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/...nsole-service/src/main/java/org/apache/streampark/console/system/service/RoleService.java b/...nsole-service/src/main/java/org/apache/streampark/console/system/service/RoleService.java
@@ -62,4 +62,10 @@ public interface RoleService extends IService<Role> {
      * @param role Role
      */
     void updateRole(Role role);
+
+    /**
+     * Get the Default Role
+     *
+     */
+    Role getSysDefaultRole();
 }
diff --git a/...vice/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java b/...vice/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
@@ -123,4 +123,9 @@ private void updateRoleMenus(Role role, String[] menuIds) {
         }
         roleMenuService.saveBatch(roleMenus);
     }
+
+    @Override
+    public Role getSysDefaultRole() {
+        return baseMapper.selectOne(new LambdaQueryWrapper<Role>().eq(Role::getRoleId, Constant.DEFAULT_ROLE_ID));
+    }
 }
diff --git a/...vice/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java b/...vice/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
@@ -31,10 +31,13 @@
 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.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;
 
@@ -85,6 +88,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Autowired
     private TeamService teamService;
 
+    @Autowired
+    private RoleService roleService;
+
     @Override
     public User getByUsername(String username) {
         LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<User>().eq(User::getUsername, username);
@@ -121,6 +127,14 @@ public void createUser(User user) {
             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