Merge branch 'master' into fix-4779

Author: Anilople

.github/workflows/build.yml

@@ -44,7 +44,7 @@ jobs:
         restore-keys: ${{ runner.os }}-m2
     - name: JDK 8
       if: matrix.jdk == '8'
-      run: mvn -B clean package -P travis jacoco:report -Dmaven.gitcommitid.skip=true
+      run: mvn -B clean package jacoco:report -Dmaven.gitcommitid.skip=true
     - name: JDK 11 
       if: matrix.jdk == '11'
       run: mvn -B clean compile -Dmaven.gitcommitid.skip=true

CHANGES.md

@@ -18,6 +18,8 @@ Apollo 2.2.0
 * [[Multi-Database Support] Optimize column define case sensitivity](https://github.com/apolloconfig/apollo/pull/4776)
 * [[Multi-Database Support][pg] Where clause need escape, otherwise will request postgre use lowwer case](https://github.com/apolloconfig/apollo/pull/4780)
 * [Misc dependency updates](https://github.com/apolloconfig/apollo/pull/4784)
+* [Fix the problem that the deletion failure of the system rights management page does not prompt](https://github.com/apolloconfig/apollo/pull/4803)
+* [Fix the issue of the system permission management page retrieving non-existent users](https://github.com/apolloconfig/apollo/pull/4802)
 
 ------------------
 All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/13?closed=1)

apollo-adminservice/src/test/resources/application.yml

@@ -19,12 +19,6 @@ spring:
 
 server:
   port: ${port:8090}
-  
-logging:
-  level:
-    org.springframework.cloud: 'DEBUG'
-  file:
-    name: /opt/logs/${ctrip.appid}/apollo-adminservice.log
 
 ctrip:
   appid: 100003172

apollo-configservice/src/test/resources/application.yml

@@ -19,12 +19,6 @@ spring:
 
 server:
   port: ${port:8080}
-  
-logging:
-  level:
-    org.springframework.cloud: 'DEBUG'
-  file:
-    name: /opt/logs/${ctrip.appid}/apollo-configservice.log
 
 ctrip:
   appid: 100003171

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultRolePermissionService.java

@@ -28,11 +28,14 @@
 import com.ctrip.framework.apollo.portal.repository.RoleRepository;
 import com.ctrip.framework.apollo.portal.repository.UserRoleRepository;
 import com.ctrip.framework.apollo.portal.service.RolePermissionService;
+import com.ctrip.framework.apollo.portal.spi.UserService;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
+import java.util.Comparator;
+import java.util.LinkedHashSet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -61,6 +64,8 @@ public class DefaultRolePermissionService implements RolePermissionService {
     private PortalConfig portalConfig;
     @Autowired
     private ConsumerRoleRepository consumerRoleRepository;
+    @Autowired
+    private UserService userService;
 
     /**
      * Create role with permissions, note that role name should be unique
@@ -149,12 +154,15 @@ public Set<UserInfo> queryUsersWithRole(String roleName) {
         }
 
         List<UserRole> userRoles = userRoleRepository.findByRoleId(role.getId());
+        List<UserInfo> userInfos = userService.findByUserIds(userRoles.stream().map(UserRole::getUserId).collect(Collectors.toList()));
+
+        if(userInfos == null){
+            return Collections.emptySet();
+        }
 
-        return userRoles.stream().map(userRole -> {
-            UserInfo userInfo = new UserInfo();
-            userInfo.setUserId(userRole.getUserId());
-            return userInfo;
-        }).collect(Collectors.toSet());
+        return userInfos.stream()
+            .sorted(Comparator.comparing(UserInfo::getUserId))
+            .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
     /**

apollo-portal/src/main/resources/static/scripts/controller/role/NamespaceRoleController.js

@@ -39,7 +39,7 @@ role_module.controller('NamespaceRoleController',
                 .then(function (result) {
 
                 }, function (result) {
-                    toastr.warn(AppUtil.errorMsg(result), $translate.instant('Namespace.Role.InitNamespacePermissionError'));
+                    toastr.warning(AppUtil.errorMsg(result), $translate.instant('Namespace.Role.InitNamespacePermissionError'));
                 });
 
             PermissionService.has_assign_user_permission($scope.pageContext.appId)

apollo-portal/src/main/resources/static/scripts/controller/role/SystemRoleController.js

@@ -63,7 +63,7 @@ angular.module('systemRole', ['app.service', 'apollo.directive', 'app.util', 'to
                                 getCreateApplicationRoleUsers();
                             },
                             function (reason) {
-                                toastr.warn(AppUtil.errorMsg(reason), $translate.instant('SystemRole.DeleteFailed'));
+                                toastr.warning(AppUtil.errorMsg(reason), $translate.instant('SystemRole.DeleteFailed'));
                             }
                         );
                 };

apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/spi/defaultImpl/RolePermissionServiceTest.java

@@ -16,6 +16,10 @@
  */
 package com.ctrip.framework.apollo.portal.spi.defaultImpl;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import com.ctrip.framework.apollo.common.entity.BaseEntity;
 import com.ctrip.framework.apollo.portal.AbstractIntegrationTest;
 import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
@@ -29,19 +33,15 @@
 import com.ctrip.framework.apollo.portal.repository.UserRoleRepository;
 import com.ctrip.framework.apollo.portal.service.RolePermissionService;
 import com.google.common.collect.Sets;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.assertj.core.api.Assertions;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.jdbc.Sql;
 
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 /**
  * @author Jason Song(song_s@ctrip.com)
  */
@@ -285,13 +285,14 @@ public void testRemoveRoleFromUsersWithRoleNotExisted() throws Exception {
   @Sql(scripts = "/sql/permission/insert-test-userroles.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
   @Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
   public void testQueryUsersWithRole() throws Exception {
-    String someRoleName = "someRoleName";
-
-    Set<UserInfo> users = rolePermissionService.queryUsersWithRole(someRoleName);
+    String roleName = "someRoleName";
+    Set<UserInfo> users = rolePermissionService.queryUsersWithRole(roleName);
+    Assertions.assertThat(users).isEmpty();
 
+    roleName = "apolloRoleName";
+    users = rolePermissionService.queryUsersWithRole(roleName);
     Set<String> userIds = users.stream().map(UserInfo::getUserId).collect(Collectors.toSet());
-
-    assertTrue(userIds.containsAll(Sets.newHashSet("someUser", "anotherUser")));
+    assertTrue(userIds.containsAll(Sets.newHashSet("apollo")));
   }
 
   @Test

apollo-portal/src/test/resources/application.yml

@@ -20,12 +20,6 @@ spring:
   application:
     name: apollo-portal
 
-logging:
-  level:
-    org.springframework.cloud: 'DEBUG'
-  file:
-    name: /opt/logs/100003173/apollo-portal.log
-
 apollo:
   portal:
     envs: local

apollo-portal/src/test/resources/sql/permission/insert-test-roles.sql

@@ -15,3 +15,4 @@
 --
 INSERT INTO "Role" (`Id`, `RoleName`) VALUES (990, 'someRoleName');
 INSERT INTO "Role" (`Id`, `RoleName`) VALUES (991, 'anotherRoleName');
+INSERT INTO "Role" (`Id`, `RoleName`) VALUES (992, 'apolloRoleName');