Merge remote-tracking branch 'origin/84-integrate' into 84-integrate

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

@@ -2,6 +2,7 @@ package com.inspur.customer.service.keycloak;
 
 import com.inspur.customer.service.client.keycloak.KeycloakService;
 import com.inspur.customer.service.dto.KeycloakUserCO;
+import com.inspur.customer.service.dto.Pair;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.keycloak.admin.client.Keycloak;
@@ -174,8 +175,8 @@ public class KeycloakServiceImpl implements KeycloakService {
     }
 
     @Override
-    public List<KeycloakUserCO> searchUserByAttrEntry(List<Map.Entry<String, String>> entries) {
-        String search = entries.stream()
+    public List<KeycloakUserCO> searchUserByAttrEntry(List<Pair> pairList) {
+        String search = pairList.stream()
             .filter(t -> Objects.nonNull(t) && Objects.nonNull(t.getKey()) && Objects.nonNull(t.getValue()))
             .map(t -> t.getKey() + ":" + t.getValue())
             .collect(Collectors.joining(" "));

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

@@ -1,5 +1,7 @@
 package com.inspur.customer.service.client.keycloak;
 import com.inspur.customer.service.dto.KeycloakUserCO;
+import com.inspur.customer.service.dto.Pair;
+
 import java.util.List;
 import java.util.Map;
 
@@ -68,5 +70,5 @@ public interface KeycloakService {
      * @param entries 属性键值对
      * @return 找到的用户
      */
-    List<KeycloakUserCO> searchUserByAttrEntry(List<Map.Entry<String, String>> entries);
+    List<KeycloakUserCO> searchUserByAttrEntry(List<Pair> entries);
 }

smsb-customer-manager-client/src/main/java/com/inspur/customer/service/dto/Pair.java

@@ -0,0 +1,22 @@
+package com.inspur.customer.service.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author zengweijie
+ * @version 1.0
+ * @date 2022/6/23 9:43
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Pair implements Serializable {
+
+    private static final long serialVersionUID = -5443549207721208232L;
+    private String key;
+    private String value;
+}