From 81366d0eddd73f39758a3fcfb3ce497c57c37728 Mon Sep 17 00:00:00 2001 From: fanshuai <1141904845@qq.com> Date: Fri, 6 Sep 2024 16:44:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=AD=BB=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/platform/service/GitService.java | 2 +- .../java/com/ruoyi/platform/service/impl/GitServiceImpl.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/GitService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/GitService.java index 666136da..b4682647 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/GitService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/GitService.java @@ -23,5 +23,5 @@ public interface GitService { void deleteBranch(String owner,String projectName ,String branchName) throws Exception; - Map getUserInfo() throws Exception; + Map getUserInfo(String token) throws Exception; } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/GitServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/GitServiceImpl.java index 46a3cb4e..56f8ec5e 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/GitServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/GitServiceImpl.java @@ -81,7 +81,7 @@ public class GitServiceImpl implements GitService { token = jedis.get(ci4sUsername + "_gitToken"); } else { try { - Map userInfo = getUserInfo(); + Map userInfo = getUserInfo(token); if (userInfo == null || (userInfo.get("status") != null && 401 == (Integer) userInfo.get("status"))) { login(gitLinkUsername, gitLinkPassword); token = jedis.get(ci4sUsername + "_gitToken"); @@ -152,8 +152,7 @@ public class GitServiceImpl implements GitService { } @Override - public Map getUserInfo() throws Exception { - String token = this.checkoutToken(); + public Map getUserInfo(String token) throws Exception { String userReq = HttpUtils.sendGetWithToken("https://www.gitlink.org.cn/api/users/get_user_info.json",null, token); if (StringUtils.isEmpty(userReq)){ return null;