Merge remote-tracking branch 'origin/internal-paas' into internal-paas

Dockerfile

@@ -29,7 +29,7 @@ COPY . .
 # 多线程下载依赖，只要pom文件不改变，依赖不会重复下载
 RUN mvn clean install -DskipTests -DfinalName=$PROJECT_NAME
 
-FROM openjdk:8-alpine
+FROM seecjdk/adoptzh-jre
 
 ENV PROJECT_NAME app
 ENV WORK_PATH /opt/$PROJECT_NAME

pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>com.nju.edu</groupId>
     <artifactId>seecoder-gitlab</artifactId>
-    <version>0.1.2</version>
+    <version>0.1.3</version>
     <packaging>pom</packaging>
     <description>Gitlab API project</description>
     <modules>
@@ -22,7 +22,7 @@
 
     <properties>
         <java.version>1.8</java.version>
-        <seecoder-gitlab-version>0.1.2</seecoder-gitlab-version>
+        <seecoder-gitlab-version>0.1.3</seecoder-gitlab-version>
     </properties>
 
     <dependencyManagement>

seecoder-gitlab-client/pom.xml

@@ -5,14 +5,14 @@
     <parent>
         <artifactId>seecoder-gitlab</artifactId>
         <groupId>com.nju.edu</groupId>
-        <version>0.1.2</version>
+        <version>0.1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>seecoder-gitlab-client</artifactId>
 
     <properties>
-        <seecoder-gitlab-version>0.1.2</seecoder-gitlab-version>
+        <seecoder-gitlab-version>0.1.3</seecoder-gitlab-version>
     </properties>
 
     <dependencies>

seecoder-gitlab-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>seecoder-gitlab</artifactId>
         <groupId>com.nju.edu</groupId>
-        <version>0.1.2</version>
+        <version>0.1.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

seecoder-gitlab-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>seecoder-gitlab</artifactId>
         <groupId>com.nju.edu</groupId>
-        <version>0.1.2</version>
+        <version>0.1.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>com.nju.edu</groupId>
             <artifactId>seecoder-gitlab-common</artifactId>
-            <version>0.1.2</version>
+            <version>0.1.3</version>
         </dependency>
     </dependencies>
 

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

@@ -46,9 +46,14 @@ public class ProjectServiceImpl implements ProjectService {
     public ProjectVO createProject(ProjectDTO projectDTO) throws GitLabApiException {
         String projectName=projectDTO.getProjectName();
         Visibility visibility=projectDTO.getVisibility();
+        //日志输出项目名称
+        log.info("projectName:"+projectName);
+
         Project project=new Project();
         project.setName(projectName);
         project.setVisibility(visibility);
+        project.setPath(projectName);
+
         project=gitlabApi.getProjectApi().createProject(project);
         return ProjectVO.builder()
                 .projectId(Math.toIntExact(project.getId()))
@@ -62,10 +67,17 @@ public class ProjectServiceImpl implements ProjectService {
         int userId=projectDTO.getUserId();
         GitlabUser gitlabUser = getGitlabUser(userId);
         Project project=new Project();
+        log.info("准备创建项目：{}",projectDTO.getProjectName());
         project.setName(projectDTO.getProjectName());
         project.setVisibility(projectDTO.getVisibility());
+        project.setPath(projectDTO.getProjectName());
+        Namespace namespace=new Namespace();
+        namespace.setName(projectDTO.getProjectName());
+        namespace.setPath(projectDTO.getProjectName());
+        project.setNamespace(namespace);
         gitlabApi.setSudoAsId((long) gitlabUser.getGitlabUserId());
         project=gitlabApi.getProjectApi().createProject(project);
+        log.info("创建私有项目成功。下一步是加上webhook");
         gitlabApi.unsudo();
         return ProjectVO.builder()
                 .projectId(Math.toIntExact(project.getId()))
@@ -90,7 +102,7 @@ public class ProjectServiceImpl implements ProjectService {
         log.info("trying to fork project {} to user {} (whose gitlab id is {})", projectId, userId, gitlabUser.getGitlabUserId());
         try{
             gitlabApi.setSudoAsId((long) gitlabUser.getGitlabUserId());
-            project=gitlabApi.getProjectApi().forkProject(projectId, String.valueOf(namespaceId));
+            project=gitlabApi.getProjectApi().forkProject(new Long(projectId), String.valueOf(namespaceId));
             project.setVisibility(Visibility.PRIVATE);
             project=gitlabApi.getProjectApi().updateProject(project);
         }finally {
@@ -111,7 +123,7 @@ public class ProjectServiceImpl implements ProjectService {
         Project project;
         try{
             gitlabApi.sudo("root");
-            project=gitlabApi.getProjectApi().forkProject(projectId, String.valueOf(namespaceId));
+            project=gitlabApi.getProjectApi().forkProject(new Long(projectId), String.valueOf(namespaceId));
             project.setVisibility(Visibility.PRIVATE);
             project=gitlabApi.getProjectApi().updateProject(project);
         }finally {
@@ -155,7 +167,8 @@ public class ProjectServiceImpl implements ProjectService {
         boolean doPushEvents=webHookDTO.isDoPushEvents();
         boolean doIssueEvents=webHookDTO.isDoIssueEvents();
         boolean doMergeRequestsEvents=webHookDTO.isDoMergeRequestsEvents();
-        gitlabApi.getProjectApi().addHook(projectId, url, doPushEvents, doIssueEvents, doMergeRequestsEvents);
+        log.info("给项目{}添加webhook,url是{}",projectId,url);
+        gitlabApi.getProjectApi().addHook((long)projectId, url, doPushEvents, doIssueEvents, doMergeRequestsEvents);
         return true;
     }