blumonilr 5 anni fa
parent
commit
6f37a1b2ac

+ 1 - 0
seecoder-gitlab-common/src/main/java/com/nju/edu/gitlab/vo/ProjectVO.java

@@ -12,4 +12,5 @@ import lombok.NoArgsConstructor;
 public class ProjectVO {
     private Integer projectId;
     private String webUrl;
+    private String projectName;
 }

+ 2 - 1
seecoder-gitlab-server/src/main/java/com/nju/edu/gitlab/service/impl/ProjectServiceImpl.java

@@ -48,6 +48,7 @@ public class ProjectServiceImpl implements ProjectService {
         return ProjectVO.builder()
                 .projectId(project.getId())
                 .webUrl(project.getWebUrl())
+                .projectName(projectName)
                 .build();
     }
 
@@ -236,7 +237,7 @@ public class ProjectServiceImpl implements ProjectService {
     public List<ProjectVO> getAllProjectByUserId(int userId) throws GitLabApiException {
         GitlabUser gitlabUser = getGitlabUser(userId);
         gitlabApi.setSudoAsId(gitlabUser.getGitlabUserId());
-        List<ProjectVO> projectVOS = gitlabApi.getProjectApi().getMemberProjects().stream().map(project->ProjectVO.builder().projectId(project.getId()).webUrl(project.getWebUrl()).build()).collect(Collectors.toList());
+        List<ProjectVO> projectVOS = gitlabApi.getProjectApi().getMemberProjects().stream().map(project->ProjectVO.builder().projectId(project.getId()).webUrl(project.getWebUrl()).projectName(project.getName()).build()).collect(Collectors.toList());
         gitlabApi.unsudo();
         return projectVOS;
     }

+ 4 - 3
seecoder-gitlab-server/src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
 
 spring:
   datasource:
-    url: jdbc:mysql://localhost:3306/sim?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    url: jdbc:mysql://localhost:3306/gitlab?useUnicode=true&characterEncoding=UTF-8&useSSL=false
     username: root
     password: 123456
     driver-class-name: com.mysql.jdbc.Driver
@@ -12,10 +12,11 @@ spring:
     hibernate:
       naming:
         physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+      ddl-auto: create
 
 gitlab:
-  host: http://seecoder-test-gitlab-80.seecii.cn
+  host: http://gitlab.seecoder.cn
   username: root
-  token: pBmdFxFyyCKwEMmN52Pc
+  token: Y4LjwFez_VF4fHFbeRmK
   administrator: root
   email: noreply@mooc.com