[incubator-streampark] branch dev updated: [Improve] System module code optimization (#3197)

[benjobs]

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 9cbece6ea [Improve] System module code optimization (#3197)
9cbece6ea is described below

commit 9cbece6ea269a451bc4ef79b08f658d497470736
Author: ChengJie1053 <18033291...@163.com>
AuthorDate: Thu Sep 28 13:15:17 2023 +0800

    [Improve] System module code optimization (#3197)
    
    * [Improve] System module code optimization
    
    * [Improve] Console core module code optimization
    
    * Revert "[Improve] Console core module code optimization"
    
    This reverts commit a646af11b0cc2c7ce885745097e6867cd80086ab.
    
    * delete objects
    
    * Modify AccessTokenController
---
 .../streampark/console/system/controller/PassportController.java   | 7 ++++---
 .../streampark/console/system/security/impl/AuthenticatorImpl.java | 2 +-
 .../streampark/console/system/service/impl/RoleServiceImpl.java    | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

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 76ea2aac1..8cd1d2f2e 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,6 +18,7 @@
 package org.apache.streampark.console.system.controller;
 
 import org.apache.streampark.console.base.domain.RestResponse;
+import org.apache.streampark.console.core.enums.LoginTypeEnum;
 import org.apache.streampark.console.system.entity.User;
 import org.apache.streampark.console.system.security.Authenticator;
 import org.apache.streampark.console.system.service.UserService;
@@ -61,12 +62,12 @@ public class PassportController {
   @PostMapping("signtype")
   public RestResponse type() {
     List<String> types = new ArrayList<>();
-    types.add("password");
+    types.add(LoginTypeEnum.PASSWORD.name().toLowerCase());
     if (ssoEnable) {
-      types.add("sso");
+      types.add(LoginTypeEnum.SSO.name().toLowerCase());
     }
     if (ldapEnable) {
-      types.add("ldap");
+      types.add(LoginTypeEnum.LDAP.name().toLowerCase());
     }
     return RestResponse.success(types);
   }
diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/AuthenticatorImpl.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/AuthenticatorImpl.java
index a4e77ec63..a4a94a365 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/AuthenticatorImpl.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/AuthenticatorImpl.java
@@ -77,7 +77,7 @@ public class AuthenticatorImpl implements Authenticator {
 
   private User ldapAuthenticate(String username, String password) throws 
Exception {
     String ldapEmail = ldapService.ldapLogin(username, password);
-    if (ldapEmail == null) {
+    if (StringUtils.isBlank(ldapEmail)) {
       return null;
     }
     // check if user exist
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 040e5f934..7a3f580b2 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
@@ -28,6 +28,7 @@ import 
org.apache.streampark.console.system.service.MemberService;
 import org.apache.streampark.console.system.service.RoleMenuServie;
 import org.apache.streampark.console.system.service.RoleService;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -89,7 +90,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, 
Role> implements Ro
                         String.format("Role id [%s] not found. Delete role 
failed.", roleId)));
     List<Long> userIdsByRoleId = memberService.findUserIdsByRoleId(roleId);
     ApiAlertException.throwIfFalse(
-        userIdsByRoleId == null || userIdsByRoleId.isEmpty(),
+        CollectionUtils.isEmpty(userIdsByRoleId),
         String.format(
             "There are some users of role %s, delete role failed, please 
unbind it first.",
             role.getRoleName()));