Przeglądaj źródła

修改创建的项目名。

GuardOfDawn 7 lat temu
rodzic
commit
eefaaebd8b

+ 9 - 5
src/main/java/nju/seec/SEECdemo/logic/service/impl/assignment/AssignmentPaperBuilder.java

@@ -105,11 +105,11 @@ public class AssignmentPaperBuilder {
         jenkinsApi.createBuildJob(buildJob);
         codeResult.setBuildJob(buildJob);
         // 调用kube Api创建该项目的部署空间,并记录其id
-//                Long projectDeployNameSpace = projectService.createSeecIIProject(group.getName() + code.getUuid(),
-//                        code.getDescription(), // 可以是中文吗?
-//                        Date.from(code.getStartAt().atZone(ZoneId.systemDefault()).toInstant()),
-//                        Date.from(code.getEndAt().atZone(ZoneId.systemDefault()).toInstant()));
-//                codeResult.setDeployNamespace(projectDeployNameSpace);
+        Long projectDeployNameSpace = projectService.createSeecIIProject(formProjectName(group.getId(), code.getId()),
+                "", // 暂时留空
+                Date.from(code.getStartAt().atZone(ZoneId.systemDefault()).toInstant()),
+                Date.from(code.getEndAt().atZone(ZoneId.systemDefault()).toInstant()));
+        codeResult.setDeployNamespace(projectDeployNameSpace);
         // 创建jenkins上的测试job
         String testJob = projectId + "-test";
         jenkinsApi.createTestJob(testJob);
@@ -125,5 +125,9 @@ public class AssignmentPaperBuilder {
         ZipUtil.unpack(inputStream, codeDir);
     }
 
+    private String formProjectName(int groupId, int codeWorkId){
+        return groupId + "c" + codeWorkId;
+    }
+
 
 }

+ 1 - 1
src/main/java/nju/seec/SEECdemo/logic/service/impl/assignment/CodeServiceImpl.java

@@ -93,7 +93,7 @@ public class CodeServiceImpl implements CodeService, InterCodeService {
         InterCodeAppInfoVO codeAppInfoVO = new InterCodeAppInfoVO();
         codeAppInfoVO.setId(codeResult.getId());
         codeAppInfoVO.setProjectId(codeResult.getDeployNamespace());
-        codeAppInfoVO.setApplicationName(code.getUuid() + codeResult.getGroupId());
+        codeAppInfoVO.setApplicationName(codeResult.getGroupId() + code.getUuid());
         return codeAppInfoVO;
     }