From 7369a88090f69c48c6028be73ee78888c3a8ced5 Mon Sep 17 00:00:00 2001 From: huangyong37035 Date: Fri, 25 Nov 2022 16:32:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E5=BB=BA?= =?UTF-8?q?=E8=AE=AE=E3=80=91=E8=8E=B7=E5=8F=96gitlab=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=90=8E=EF=BC=8C=E5=8F=AF=E4=B8=8B=E6=AC=A1?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/io/github/ealenxie/gitlab/GitlabHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/github/ealenxie/gitlab/GitlabHandler.java b/src/main/java/io/github/ealenxie/gitlab/GitlabHandler.java index bab4dc2..8486a6f 100644 --- a/src/main/java/io/github/ealenxie/gitlab/GitlabHandler.java +++ b/src/main/java/io/github/ealenxie/gitlab/GitlabHandler.java @@ -12,6 +12,7 @@ import org.springframework.web.client.HttpStatusCodeException; import java.util.HashMap; import java.util.Map; +import java.util.Objects; /** * Created by EalenXie on 2022/3/4 13:18 @@ -45,12 +46,12 @@ public class GitlabHandler { @Nullable public GitlabUser getUser(Long userId) { - if (!gitlabUsers.containsKey(userId)) { + if (!gitlabUsers.containsKey(userId) || Objects.isNull(gitlabUsers.get(userId))) { try { GitlabUser body = gitlabClient.getUserById(userId); gitlabUsers.put(userId, body); } catch (Exception e) { - gitlabUsers.put(userId, new GitlabUser()); + gitlabUsers.put(userId, null); } } return gitlabUsers.get(userId); -- Gitee From b05283ceffc8a5aa7d8357821cf460ff279d10c2 Mon Sep 17 00:00:00 2001 From: huangyong37035 Date: Fri, 25 Nov 2022 17:04:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E5=BB=BA?= =?UTF-8?q?=E8=AE=AE=E3=80=91=E8=8E=B7=E5=8F=96gitlab=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=90=8E=EF=BC=8C=E5=8F=AF=E4=B8=8B=E6=AC=A1?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/io/github/ealenxie/gitlab/GitlabHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/github/ealenxie/gitlab/GitlabHandler.java b/src/main/java/io/github/ealenxie/gitlab/GitlabHandler.java index 8486a6f..f612ac0 100644 --- a/src/main/java/io/github/ealenxie/gitlab/GitlabHandler.java +++ b/src/main/java/io/github/ealenxie/gitlab/GitlabHandler.java @@ -46,12 +46,12 @@ public class GitlabHandler { @Nullable public GitlabUser getUser(Long userId) { - if (!gitlabUsers.containsKey(userId) || Objects.isNull(gitlabUsers.get(userId))) { + if (!gitlabUsers.containsKey(userId)) { try { GitlabUser body = gitlabClient.getUserById(userId); gitlabUsers.put(userId, body); } catch (Exception e) { - gitlabUsers.put(userId, null); + log.info("获取gitlab用户异常: " + e.getMessage()); } } return gitlabUsers.get(userId); -- Gitee From cc5991bf4a11bda053c6cc89fff1aa3d538768de Mon Sep 17 00:00:00 2001 From: huangyong37035 Date: Fri, 25 Nov 2022 17:04:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E5=BB=BA?= =?UTF-8?q?=E8=AE=AE=E3=80=91=E8=8E=B7=E5=8F=96gitlab=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=90=8E=EF=BC=8C=E5=8F=AF=E4=B8=8B=E6=AC=A1?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/io/github/ealenxie/gitlab/GitlabHandler.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/io/github/ealenxie/gitlab/GitlabHandler.java b/src/main/java/io/github/ealenxie/gitlab/GitlabHandler.java index f612ac0..4f69382 100644 --- a/src/main/java/io/github/ealenxie/gitlab/GitlabHandler.java +++ b/src/main/java/io/github/ealenxie/gitlab/GitlabHandler.java @@ -12,7 +12,6 @@ import org.springframework.web.client.HttpStatusCodeException; import java.util.HashMap; import java.util.Map; -import java.util.Objects; /** * Created by EalenXie on 2022/3/4 13:18 -- Gitee From 4df9281e2c9858f5e5db153f49d49cf2f025194f Mon Sep 17 00:00:00 2001 From: huangyong37035 Date: Fri, 25 Nov 2022 17:06:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E5=BB=BA?= =?UTF-8?q?=E8=AE=AE=E3=80=91=E8=8E=B7=E5=8F=96gitlab=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=90=8E=EF=BC=8C=E5=8F=AF=E4=B8=8B=E6=AC=A1?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/io/github/ealenxie/gitlab/GitlabHandler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/io/github/ealenxie/gitlab/GitlabHandler.java b/src/main/java/io/github/ealenxie/gitlab/GitlabHandler.java index 4f69382..9facdf8 100644 --- a/src/main/java/io/github/ealenxie/gitlab/GitlabHandler.java +++ b/src/main/java/io/github/ealenxie/gitlab/GitlabHandler.java @@ -51,6 +51,7 @@ public class GitlabHandler { gitlabUsers.put(userId, body); } catch (Exception e) { log.info("获取gitlab用户异常: " + e.getMessage()); + return null; } } return gitlabUsers.get(userId); -- Gitee