[IMP] 使用管理员配置gitops库的deploy-key

Author: 李浩

pom.xml

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>devops-service</artifactId>
-    <version>2.0.9.RELEASE</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <url>https://github.com/open-hand/devops-service</url>
 

src/main/java/io/choerodon/devops/app/service/impl/DevopsEnvironmentServiceImpl.java

@@ -940,7 +940,7 @@ public void handleCreateEnvSaga(EnvGitlabProjectPayload gitlabProjectPayload) {
                     gitlabProjectPayload.getPath(),
                     devopsEnvironmentDTO.getEnvIdRsaPub(),
                     true,
-                    gitlabProjectPayload.getUserId());
+                    GitUserNameUtil.getAdminId());
         }
         ProjectHookDTO projectHookDTO = ProjectHookDTO.allHook();
         projectHookDTO.setEnableSslVerification(true);
@@ -1641,7 +1641,8 @@ public DevopsEnvironmentDTO createSystemEnv(Long clusterId) {
                     devopsEnvironmentDTO.getCode(),
                     devopsEnvironmentDTO.getEnvIdRsaPub(),
                     true,
-                    gitlabUserId);
+                    GitUserNameUtil.getAdminId()
+            );
         }
 
         // 初始化web hook