Merge branch '84-wb' into '71-integrate'

fix:获取用户map缓存处理







See merge request !47

smsb-customer-manager-adapter/src/main/java/com/inspur/customer/web/controller/keyclaok/KeycloakUserController.java

@@ -96,7 +96,7 @@ public class KeycloakUserController {
     @Scheduled(cron = "0 0/10 * * * ?")
     public void askUserOppenId() {
         log.info("update wechat openId");
-        for (String userId : keycloakService.getUsersMap().keySet()) {
+        for (String userId : keycloakService.getUserMap().keySet()) {
             String oppenId = iWeChatService.askUser(userId);
             if (!StringUtils.isEmpty(oppenId)) {
                 SubscribeDto dto = new SubscribeDto();
@@ -127,7 +127,8 @@ public class KeycloakUserController {
         logDto.setUserId(userId);
         logDto.setBusiness(3);
         logDto.setDescription("账号角色分配");
-        StringBuffer sbf = new StringBuffer("给用户："+ keycloakService.getUserMap().get(usersRoleMappingDTO.getUserId()));
+        String userName = keycloakService.getUserMap().get(usersRoleMappingDTO.getUserId());
+        StringBuffer sbf = new StringBuffer("给用户："+ (StringUtils.isNotEmpty(userName) ? userName : usersRoleMappingDTO.getUserId()));
         if(!usersRoleMappingDTO.getAddRoleList().isEmpty()){
             sbf.append("，分配角色:"+getRoleNameList(usersRoleMappingDTO.getAddRoleList()));
         }

smsb-customer-manager-app/src/main/java/com/inspur/customer/service/keycloak/KeycloakServiceImpl.java

@@ -270,18 +270,6 @@ public class KeycloakServiceImpl implements KeycloakService {
         }
         return keycloakUserCo;
     }
-    @Override
-    @Cacheable(value = "smsb:userList")
-    public Map<String, String> getUsersMap() {
-        Map<String, String> userMap = new HashMap<>();
-        realmResource.users().list().forEach(user ->{
-            if (user.getFirstName() != null && user.getLastName() != null && !"".equals(user.getLastName())) {
-                user.setUsername(user.getLastName() + user.getFirstName());
-            }
-            userMap.put(user.getId(),user.getUsername());
-        });
-        return userMap;
-    }
 
     @Override
     public Response addKeycloakGroup(String id , GroupRepresentation groupRepresentation) {
@@ -333,6 +321,7 @@ public class KeycloakServiceImpl implements KeycloakService {
     }
 
     @Override
+    @CacheEvict(value = "smsb:users" , allEntries = true)
     public Response updateUser(String userId, Object representation, Integer operateType) {
         UserResource userResource = realmResource.users().get(userId);
         UserRepresentation user = userResource.toRepresentation();
@@ -362,6 +351,7 @@ public class KeycloakServiceImpl implements KeycloakService {
     }
 
     @Override
+    @CacheEvict(value = "smsb:users" , allEntries = true)
     public Response removeUser(String userId) {
         realmResource.users().get(userId).remove();
         return Response.buildSuccess();

smsb-customer-manager-app/src/main/java/com/inspur/customer/service/org/SmsbDepartmentServiceImpl.java

@@ -23,6 +23,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.BeanUtils;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
@@ -263,6 +264,7 @@ public class SmsbDepartmentServiceImpl extends ServiceImpl<SmsbDepartmentMapper
     }
 
     @Override
+    @CacheEvict(value = "smsb:users" , allEntries = true)
     public Response addKeyClaokUser(String userId ,SmsbUserAdd smsbUserAdd) {
         // 1、keycloak新增账号
         SingleResponse addUserResponse = service.addKeyClaokUser(smsbUserAdd);

smsb-customer-manager-client/src/main/java/com/inspur/customer/client/keycloak/KeycloakService.java

@@ -86,13 +86,6 @@ public interface KeycloakService {
 
     void changePassword(String userId, String newPassword);
 
-    /**
-     * 获取当前releam下用户Map<id,name>
-     *
-     * @return
-     */
-    Map<String, String> getUsersMap();
-
     /**
      * 该租户下添加部门
      *