From ce55cade57491b1f07d3bddfcb1f0a54a6c6dd21 Mon Sep 17 00:00:00 2001
From: chenzhihang <709011834@qq.com>
Date: Fri, 6 Dec 2024 14:45:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=EF=BC=8C=E6=A8=A1=E5=9E=8B=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/platform/service/impl/GitServiceImpl.java    | 7 +++----
 .../com/ruoyi/platform/service/impl/ModelsServiceImpl.java | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

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 3fd29369..26ae8ad2 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
@@ -50,7 +50,7 @@ public class GitServiceImpl implements GitService {
             String req = httpUtils.sendPost(gitendpoint + "/oauth/token", null, JsonUtils.mapToJson(params));
             // 解析响应JSON
             if (StringUtils.isEmpty(req)) {
-                throw new RuntimeException("终止响应内容为空。");
+                throw new RuntimeException("gitlink用户信息出错");
             }
             // 将响应的JSON字符串转换为Map对象
             Map<String, Object> runResMap = JsonUtils.jsonToMap(req);
@@ -61,7 +61,7 @@ public class GitServiceImpl implements GitService {
             //通过access_token获取用户信息
             String userReq = httpUtils.sendGetWithToken(gitendpoint + "/api/users/get_user_info.json", null, accessToken);
             if (StringUtils.isEmpty(userReq)) {
-                throw new RuntimeException("终止响应内容为空。");
+                throw new RuntimeException("gitlink用户信息出错");
             }
             LoginUser loginUser = SecurityUtils.getLoginUser();
             String ci4sUsername = loginUser.getUsername();
@@ -71,8 +71,7 @@ public class GitServiceImpl implements GitService {
             jedis.set(ci4sUsername + "_gitUserInfo", userReq);
             return accessToken;
         } catch (Exception e) {
-            log.error("登录GitLink失败。", e);
-            return null;
+            throw new RuntimeException("gitlink用户信息出错");
         }
     }
 
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
index 2e68c21f..a5b75118 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
@@ -1274,7 +1274,7 @@ public class ModelsServiceImpl implements ModelsService {
         modelDependency1TreeVo.setChildModelList(childModelList);
     }
 
-    Map<String, Object> getUserInfo(String ci4sUsername, String gitLinkUsername, String gitLinkPassword) throws IOException {
+    Map<String, Object> getUserInfo(String ci4sUsername, String gitLinkUsername, String gitLinkPassword) throws Exception {
         Jedis jedis = new Jedis(redisHost, redisPort);
         String userReq = jedis.get(ci4sUsername + "_gitUserInfo");
         if (userReq == null) {