修改变量名

src/main/java/com/keymobile/sso/ud/ApiTestRunner.java

@@ -45,12 +45,9 @@ public class ApiTestRunner {
             //testDescribeUsersByOrganization();
 
             logger.info("\n\n\n========== 用户组接口测试 ==========\n\n\n");
-            testDescribeGroupList();
+            //testDescribeGroupList();
             //testDescribeGroup();
-            //testDescribeGroupUserList();
-
-            
-
+            testDescribeGroupUserList();
             logger.info("\n\n\n========== 所有测试完成 ==========\n\n\n");
         } catch (Exception e) {
             logger.error("测试执行失败", e);
@@ -257,7 +254,6 @@ public class ApiTestRunner {
         GroupApi api = new GroupApi(config);
 
         String groupId = "5e37f3ba-1011-41f2-96e3-e0b5a8631380";
-        
         GroupApi.DescribeGroupResponse response = api.describeGroup(groupId);
 
         if (response.getResponse().isSuccess()) {

src/main/java/com/keymobile/sso/ud/api/GroupApi.java

@@ -301,7 +301,7 @@ public class GroupApi {
         private String userId;
         @SerializedName("DisplayName")
         private String displayName;
-        @SerializedName("Username")
+        @SerializedName("UserName")
         private String username;
         @SerializedName("UserType")
         private String userType;

src/main/java/com/keymobile/sso/ud/service/UserGroupService.java

@@ -5,7 +5,6 @@ import com.keymobile.sso.ud.api.GroupApi;
 import com.keymobile.sso.ud.config.ApiConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -13,7 +12,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
 
 import static com.keymobile.sso.api.Constants.*;
 
@@ -330,17 +328,17 @@ public class UserGroupService {
                 List<Long> memberUserIds = new ArrayList<>();
 
                 for (GroupApi.GroupUser member : members) {
-                    String username = member.getDisplayName();
+                    String username = member.getUsername();
                     if (username == null || username.isEmpty()) {
-                        username = member.getUserId();
+                        username = member.getDisplayName();
                     }
 
                     Long userId = userIdMap.get(username);
 
                     if (userId == null) {
                         Map<String, Object> newUser = new HashMap<>();
-                        newUser.put(USER_INFO_D_NAME, username);
-                        newUser.put(USER_INFO_NAME, member.getDisplayName() != null ? member.getDisplayName() : username);
+                        newUser.put(USER_INFO_NAME, username);
+                        newUser.put(USER_INFO_D_NAME, member.getDisplayName() != null ? member.getDisplayName() : username);
                         newUser.put(USER_INFO_PASSWORD, "37fa265330ad83eaa879efb1e2db6380896cf639");
 
                         Map<String, Object> addUserResult = authService.addUser(newUser);
@@ -396,7 +394,7 @@ public class UserGroupService {
         Map<String, Long> userMap = new ConcurrentHashMap<>();
         if (users != null) {
             for (Map<String, Object> user : users) {
-                Object username = user.get("username");
+                Object username = user.get("name");
                 Object id = user.get("id");
                 if (username != null && id != null) {
                     userMap.put(username.toString(), ((Number) id).longValue());