[Cherry-pick] default team member improvement 3953 (#3956)

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

Hide file tree

Showing 4 changed files with 23 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
@@ -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/...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
@@ -34,4 +34,6 @@ public interface RoleService extends IService<Role> {
   void deleteRole(Long roleId);
 
   void updateRole(Role 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
@@ -125,4 +125,10 @@ private void setRoleMenus(Role role, String[] menuIds) {
               this.roleMenuMapper.insert(rm);
             });
   }
+
+  @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
@@ -23,10 +23,13 @@
 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 void createUser(User user) {
     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