raledong 7 лет назад
Родитель
Сommit
6a4b725390

+ 1 - 1
src/main/java/nju/seec/SEECdemo/logic/api/k8s/NamespaceApi.java

@@ -63,5 +63,5 @@ public interface NamespaceApi {
      * @param name
      * @return
      */
-    boolean exists(String name) throws K8sApiException;
+    boolean exists(String name);
 }

+ 1 - 1
src/main/java/nju/seec/SEECdemo/logic/api/k8s/exception/K8sApiException.java

@@ -8,7 +8,7 @@ import java.util.Map;
 
 @Data
 @NoArgsConstructor
-public class K8sApiException extends Exception{
+public class K8sApiException extends RuntimeException{
 
     private int code;
 

+ 1 - 1
src/main/java/nju/seec/SEECdemo/logic/api/k8s/impl/NamespaceApiImpl.java

@@ -155,7 +155,7 @@ public class NamespaceApiImpl implements NamespaceApi{
     }
 
     @Override
-    public boolean exists(String name) throws K8sApiException {
+    public boolean exists(String name) {
         if (StringUtils.isBlank(name)) throw new K8sApiException(K8sApiException.ILLEGAL_PARAMETER, "名称不能为空");
         try {
             V1NamespaceList v1NamespaceList = coreV1Api.listNamespace(PRETTY_FORMAT,

+ 9 - 1
src/main/java/nju/seec/SEECdemo/logic/service/DBService.java

@@ -15,8 +15,16 @@ public interface DBService {
     DBDetailVO createSchemaAndUser(String schema, String username, String password);
 
     /**
-     * 在公用数据库中随机创建schema和用户,并赋予权限s
+     * 在公用数据库中随机创建schema和用户,并赋予权限
      * @return
      */
     DBDetailVO createSchemaAndUserForApplication(String projectId, String applicationName);
+
+    /**
+     * 在公用数据库中随机创建schema和用户,并赋予权限
+     * @warning 用该API创建的schema名称即为projectId, 即一个project下只能有一个schema
+     * @param projectId
+     * @return
+     */
+    DBDetailVO createSchemaAndUserForProject(String projectId);
 }

+ 10 - 0
src/main/java/nju/seec/SEECdemo/logic/service/impl/DBServiceImpl.java

@@ -74,4 +74,14 @@ public class DBServiceImpl implements DBService{
         return createSchemaAndUser(schemaName, userName, password);
     }
 
+    @Override
+    public DBDetailVO createSchemaAndUserForProject(String projectId) {
+        String schemaName = projectId + "_db";
+        String userName = projectId;
+        String password = RandomStringUtil.getRandomString(10);
+        LoggerUtil.info(logger,"创建数据库信息 schema={}, userName={}, password={}",
+                schemaName, userName, password);
+        return createSchemaAndUser(schemaName, userName, password);
+    }
+
 }

+ 8 - 3
src/main/java/nju/seec/SEECdemo/logic/vo/ProjectVO.java

@@ -3,20 +3,25 @@ package nju.seec.SEECdemo.logic.vo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.time.LocalDate;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Map;
 
 @Data
 @EqualsAndHashCode
 public class ProjectVO {
+    public static final String DB = "DB";
 
     private String name;
 
     private String description;
 
-    private Date startsAt;
+    private String startsAt;
+
+    private String endsAt;
+
+    private Map<String, Object> extra = new HashMap<>();
 
-    private Date endsAt;
 
-    private Map<String, String> extra;
 }

+ 5 - 0
src/main/java/nju/seec/SEECdemo/util/DateUtil.java

@@ -15,6 +15,11 @@ public class DateUtil {
     public static final String BASE_DATE_TIME_FORMAT = "yyyy-MM-dd hh:MM:ss";
     public static final String BASE_DATE_TIME_FORMAT_WITHOUT_SECONDS = "yyyy-MM-dd HH:mm";
 
+    public static String fromDateToString(LocalDate date) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(BASE_DATE_FORMAT);
+        return date.format(formatter);
+    }
+
     public static String fromDateToString(LocalDate date, String format) {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format);
         return date.format(formatter);