Browse Source

fix: 报错信息有误差,Integer替换为Long,本次commit完成user的修改

fanyanpeng 2 years ago
parent
commit
762b115749

+ 1 - 1
pom.xml

@@ -30,7 +30,7 @@
             <dependency>
                 <groupId>org.gitlab4j</groupId>
                 <artifactId>gitlab4j-api</artifactId>
-                <version>4.15.7</version>
+                <version>5.0.0</version>
             </dependency>
             <dependency>
                 <groupId>mysql</groupId>

+ 3 - 3
seecoder-gitlab-common/src/main/java/com/nju/edu/gitlab/vo/GitlabUserVO.java

@@ -9,8 +9,8 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class GitlabUserVO {
 
-    private int userId;
-    private int gitlabUserId;
-    private int namespaceId;
+    private Integer userId;
+    private Integer gitlabUserId;
+    private Integer namespaceId;
     private String token;
 }

+ 1 - 1
seecoder-gitlab-server/pom.xml

@@ -71,7 +71,7 @@
         <dependency>
             <groupId>org.gitlab4j</groupId>
             <artifactId>gitlab4j-api</artifactId>
-            <version>5.3.0</version>
+            <version>5.0.0</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>

+ 4 - 3
seecoder-gitlab-server/src/main/java/com/nju/edu/gitlab/service/impl/UserServiceImpl.java

@@ -53,11 +53,12 @@ public class UserServiceImpl implements UserService {
         gitlabUser.setUserId(userId);
         gitlabUser.setGitlabUserId(Math.toIntExact(user.getId()));
         gitlabUser.setNamespaceId(fetchNameSpaceId(username));
+        log.info("gitlabUser: " + gitlabUser.toString());
         gitlabUser.setToken(createToken(Math.toIntExact(user.getId())));
 
         gitlabUser = gitlabUserRepository.save(gitlabUser);
 
-        log.info("gitlabUser: " + gitlabUser.toString());
+
 
         if (gitlabUser != null) {
             GitlabUserVO gitlabUserVO = new GitlabUserVO();
@@ -97,7 +98,7 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public synchronized boolean deleteUser(Integer userId) throws GitLabApiException {
-        gitlabApi.getUserApi().deleteUser(userId);
+        gitlabApi.getUserApi().deleteUser(userId.toString());
         return true;
     }
 
@@ -133,7 +134,7 @@ public class UserServiceImpl implements UserService {
         Scope[] scopes = new Scope[]{Scope.API};
         ImpersonationToken token;
         log.info(String.format("createToken, userId = %d",userId));
-        token = gitlabApi.getUserApi().createImpersonationToken(userId, "AES-" + Tools.randomUUID(), null, scopes);
+        token = gitlabApi.getUserApi().createImpersonationToken(userId.toString(), "AES-" + Tools.randomUUID(), null, scopes);
         return token.getToken();
     }