[Improve] Refactor the menus (#3225)

* [WIP][Improve] reorganize the menus * icon style improvement * menu icon style improvement * FE components path bug fixed. * [Improve] menu icon improvement * menu improvement * FE component bug fixed. * menu path improvement * menu improvement * menu ddl improve * mysql ddl improvement * FE page path improvement * logo style improvement * FE vue components path improvement * Transactional bug fixed. * application services improvement * [Bug] application mybatis Mapper bug fixed * FE build failed bug fixed * minor improvement * LinkBadge component improvement * FE api minor improvement * [Improve] upgrade ddl improvement --------- Co-authored-by: benjobs <[email protected]>
apache · Oct 15, 2023 · 6072491 · 6072491
1 parent 5879aec
commit 6072491
Show file tree

Hide file tree

Showing 143 changed files with 1,027 additions and 1,179 deletions.
diff --git a/streampark-console/streampark-console-service/pom.xml b/streampark-console/streampark-console-service/pom.xml
@@ -273,6 +273,12 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>

diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/data/mysql-data.sql b/streampark-console/streampark-console-service/src/main/assembly/script/data/mysql-data.sql
diff --git a/...mpark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.2.2.sql b/...mpark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.2.2.sql
diff --git a/...ce/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java b/...ce/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java
@@ -157,7 +157,7 @@ public RestResponse list(Application app, RestRequest request) {
   @PostMapping("mapping")
   @RequiresPermissions("app:mapping")
   public RestResponse mapping(Application app) {
-    boolean flag = applicationInfoService.mapping(app);
+    boolean flag = applicationManageService.mapping(app);
     return RestResponse.success(flag);
   }
 

diff --git a/...ervice/src/main/java/org/apache/streampark/console/core/controller/ProjectController.java b/...ervice/src/main/java/org/apache/streampark/console/core/controller/ProjectController.java
@@ -46,7 +46,7 @@
 @Slf4j
 @Validated
 @RestController
-@RequestMapping("flink/project")
+@RequestMapping("project")
 public class ProjectController {
 
   @Autowired private ProjectService projectService;

diff --git a/...-console-service/src/main/java/org/apache/streampark/console/core/entity/Application.java b/...-console-service/src/main/java/org/apache/streampark/console/core/entity/Application.java
@@ -48,6 +48,7 @@
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
+import lombok.Getter;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
@@ -112,7 +113,7 @@ public class Application implements Serializable {
   private String k8sJmPodTemplate;
   private String k8sTmPodTemplate;
 
-  private String ingressTemplate;
+  @Getter private String ingressTemplate;
   private String defaultModeIngress;
 
   /** flink-hadoop integration on flink-k8s mode */
@@ -252,10 +253,6 @@ public class Application implements Serializable {
 
   private transient AppControl appControl;
 
-  public String getIngressTemplate() {
-    return ingressTemplate;
-  }
-
   public void setDefaultModeIngress(String defaultModeIngress) {
     this.defaultModeIngress = defaultModeIngress;
   }

diff --git a/...le-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationBackUp.java b/...le-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationBackUp.java
@@ -47,6 +47,8 @@ public class ApplicationBackUp {
 
   private transient boolean backup;
 
+  public ApplicationBackUp() {}
+
   public ApplicationBackUp(Application application) {
     this.appId = application.getId();
     this.sqlId = application.getSqlId();

diff --git a/...le-service/src/main/java/org/apache/streampark/console/core/mapper/ApplicationMapper.java b/...le-service/src/main/java/org/apache/streampark/console/core/mapper/ApplicationMapper.java
@@ -29,17 +29,17 @@
 
 public interface ApplicationMapper extends BaseMapper<Application> {
 
-  IPage<Application> page(Page<Application> page, @Param("application") Application application);
+  IPage<Application> page(Page<Application> page, @Param("app") Application application);
 
-  Application getApp(@Param("application") Application application);
+  Application getApp(@Param("app") Application application);
 
-  void persistMetrics(@Param("application") Application application);
+  void persistMetrics(@Param("app") Application application);
 
   List<Application> getByTeamId(@Param("teamId") Long teamId);
 
   List<Application> getProbeApps();
 
-  boolean mapping(@Param("application") Application appParam);
+  boolean mapping(@Param("app") Application appParam);
 
   List<String> getRecentK8sNamespace(@Param("limitSize") Integer limit);
 

diff --git a/...n/java/org/apache/streampark/console/core/service/application/ApplicationInfoService.java b/...n/java/org/apache/streampark/console/core/service/application/ApplicationInfoService.java
@@ -34,14 +34,6 @@
  */
 public interface ApplicationInfoService extends IService<Application> {
 
-  /**
-   * Maps the given application.
-   *
-   * @param appParam The application to be mapped.
-   * @return True if the mapping was successful, false otherwise.
-   */
-  boolean mapping(Application appParam);
-
   /**
    * Checks the environment for the given application.
    *
@@ -142,13 +134,6 @@ public interface ApplicationInfoService extends IService<Application> {
    */
   AppExistsStateEnum checkExists(Application appParam);
 
-  /**
-   * Persists the metrics of the given application.
-   *
-   * @param appParam The application which metrics need to be persisted.
-   */
-  void persistMetrics(Application appParam);
-
   /**
    * Reads the configuration for the given application and returns it as a String.
    *

diff --git a/...java/org/apache/streampark/console/core/service/application/ApplicationManageService.java b/...java/org/apache/streampark/console/core/service/application/ApplicationManageService.java
@@ -76,6 +76,21 @@ public interface ApplicationManageService extends IService<Application> {
    */
   void toEffective(Application appParam);
 
+  /**
+   * Persists the metrics of the given application.
+   *
+   * @param appParam The application which metrics need to be persisted.
+   */
+  void persistMetrics(Application appParam);
+
+  /**
+   * Maps the given application.
+   *
+   * @param appParam The application to be mapped.
+   * @return True if the mapping was successful, false otherwise.
+   */
+  boolean mapping(Application appParam);
+
   /**
    * Checks if the given application is ready to build and update.
    *

diff --git a/...apache/streampark/console/core/service/application/impl/ApplicationActionServiceImpl.java b/...apache/streampark/console/core/service/application/impl/ApplicationActionServiceImpl.java
@@ -63,7 +63,6 @@
 import org.apache.streampark.console.core.service.SettingService;
 import org.apache.streampark.console.core.service.VariableService;
 import org.apache.streampark.console.core.service.application.ApplicationActionService;
-import org.apache.streampark.console.core.service.application.ApplicationInfoService;
 import org.apache.streampark.console.core.service.application.ApplicationManageService;
 import org.apache.streampark.console.core.utils.FlinkK8sDataTypeConverterStub;
 import org.apache.streampark.console.core.watcher.FlinkAppHttpWatcher;
@@ -133,9 +132,8 @@ public class ApplicationActionServiceImpl extends ServiceImpl<ApplicationMapper,
           new ThreadPoolExecutor.AbortPolicy());
 
   @Autowired private ApplicationBackUpService backUpService;
-  @Autowired private ApplicationManageService applicationManageService;
 
-  @Autowired private ApplicationInfoService applicationInfoService;
+  @Autowired private ApplicationManageService applicationManageService;
 
   @Autowired private ApplicationConfigService configService;
 

diff --git a/...g/apache/streampark/console/core/service/application/impl/ApplicationInfoServiceImpl.java b/...g/apache/streampark/console/core/service/application/impl/ApplicationInfoServiceImpl.java
@@ -75,7 +75,6 @@
 
 import static org.apache.streampark.common.enums.StorageType.LFS;
 import static org.apache.streampark.console.core.watcher.FlinkK8sWatcherWrapper.Bridge.toTrackId;
-import static org.apache.streampark.console.core.watcher.FlinkK8sWatcherWrapper.isKubernetesApp;
 
 @Slf4j
 @Service
@@ -455,22 +454,6 @@ public String getMain(Application appParam) {
     return manifest.getMainAttributes().getValue("Main-Class");
   }
 
-  @Override
-  public boolean mapping(Application appParam) {
-    boolean mapping = this.baseMapper.mapping(appParam);
-    Application application = getById(appParam.getId());
-    if (isKubernetesApp(application)) {
-      // todo mark
-      k8SFlinkTrackMonitor.doWatching(toTrackId(application));
-      if (K8sFlinkConfig.isV2Enabled()) {
-        flinkK8sObserver.watchApplication(application);
-      }
-    } else {
-      FlinkAppHttpWatcher.doWatching(application);
-    }
-    return mapping;
-  }
-
   @Override
   public String checkSavepointPath(Application appParam) throws Exception {
     String savepointPath = appParam.getSavePoint();
@@ -505,11 +488,6 @@ public String checkSavepointPath(Application appParam) throws Exception {
     }
   }
 
-  @Override
-  public void persistMetrics(Application appParam) {
-    this.baseMapper.persistMetrics(appParam);
-  }
-
   private Boolean checkJobName(String jobName) {
     if (!StringUtils.isBlank(jobName.trim())) {
       return JOB_NAME_PATTERN.matcher(jobName).matches()

diff --git a/...apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java b/...apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java
@@ -153,6 +153,27 @@ public void toEffective(Application appParam) {
     }
   }
 
+  @Override
+  public void persistMetrics(Application appParam) {
+    this.baseMapper.persistMetrics(appParam);
+  }
+
+  @Override
+  public boolean mapping(Application appParam) {
+    boolean mapping = this.baseMapper.mapping(appParam);
+    Application application = getById(appParam.getId());
+    if (isKubernetesApp(application)) {
+      // todo mark
+      k8SFlinkTrackMonitor.doWatching(toTrackId(application));
+      if (K8sFlinkConfig.isV2Enabled()) {
+        flinkK8sObserver.watchApplication(application);
+      }
+    } else {
+      FlinkAppHttpWatcher.doWatching(application);
+    }
+    return mapping;
+  }
+
   @Override
   public Boolean delete(Application appParam) {
 

diff --git a/...service/src/main/java/org/apache/streampark/console/core/watcher/FlinkAppHttpWatcher.java b/...service/src/main/java/org/apache/streampark/console/core/watcher/FlinkAppHttpWatcher.java
@@ -186,7 +186,7 @@ public void init() {
   public void doStop() {
     log.info(
         "FlinkAppHttpWatcher StreamPark Console will be shutdown,persistent application to database.");
-    WATCHING_APPS.forEach((k, v) -> applicationInfoService.persistMetrics(v));
+    WATCHING_APPS.forEach((k, v) -> applicationManageService.persistMetrics(v));
   }
 
   /**
@@ -529,7 +529,7 @@ private void doPersistMetrics(Application application, boolean stopWatch) {
     } else {
       WATCHING_APPS.put(application.getId(), application);
     }
-    applicationInfoService.persistMetrics(application);
+    applicationManageService.persistMetrics(application);
   }
 
   /**

diff --git a/...src/main/java/org/apache/streampark/console/core/watcher/FlinkK8sChangeEventListener.java b/...src/main/java/org/apache/streampark/console/core/watcher/FlinkK8sChangeEventListener.java
@@ -102,7 +102,7 @@ public void subscribeJobStatusChange(FlinkJobStatusChangeEvent event) {
     }
     // update application record
     setByJobStatusCV(app, jobStatus);
-    applicationInfoService.persistMetrics(app);
+    applicationManageService.persistMetrics(app);
 
     // email alerts when necessary
     FlinkAppStateEnum state = app.getStateEnum();
@@ -148,7 +148,7 @@ public void subscribeMetricsChange(FlinkClusterMetricChangeEvent event) {
     app.setTotalSlot(metrics.totalSlot());
     app.setAvailableSlot(metrics.availableSlot());
 
-    applicationInfoService.persistMetrics(app);
+    applicationManageService.persistMetrics(app);
   }
 
   @SuppressWarnings("UnstableApiUsage")

diff --git a/...service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java b/...service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java
@@ -31,12 +31,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-
 import java.util.List;
 import java.util.Map;
 
@@ -67,19 +64,4 @@ public RestResponse menuList(Menu menu) {
     Map<String, Object> maps = this.menuService.findMenus(menu);
     return RestResponse.success(maps);
   }
-
-  @Operation(summary = "Create menu")
-  @PostMapping("post")
-  @RequiresPermissions("menu:add")
-  public RestResponse addMenu(@Valid Menu menu) {
-    this.menuService.createMenu(menu);
-    return RestResponse.success();
-  }
-
-  @PutMapping("update")
-  @RequiresPermissions("menu:update")
-  public RestResponse updateMenu(@Valid Menu menu) throws Exception {
-    this.menuService.updateMenu(menu);
-    return RestResponse.success();
-  }
 }
diff --git a/...nsole-service/src/main/java/org/apache/streampark/console/system/service/MenuService.java b/...nsole-service/src/main/java/org/apache/streampark/console/system/service/MenuService.java
@@ -40,16 +40,5 @@ public interface MenuService extends IService<Menu> {
 
   Map<String, Object> findMenus(Menu menu);
 
-  void createMenu(Menu menu);
-
-  void updateMenu(Menu menu) throws Exception;
-
-  /**
-   * Recursively delete menu buttons
-   *
-   * @param menuIds menuIds
-   */
-  void deleteMenus(String[] menuIds) throws Exception;
-
   List<VueRouter<Menu>> getUserRouters(Long userId, Long teamId);
 }
diff --git a/...vice/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java b/...vice/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
@@ -40,8 +40,6 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -125,28 +123,6 @@ public Map<String, Object> findMenus(Menu menu) {
     return result;
   }
 
-  @Override
-  public void createMenu(Menu menu) {
-    menu.setCreateTime(new Date());
-    setMenu(menu);
-    this.save(menu);
-  }
-
-  @Override
-  public void updateMenu(Menu menu) throws Exception {
-    menu.setModifyTime(new Date());
-    setMenu(menu);
-    baseMapper.updateById(menu);
-  }
-
-  @Override
-  public void deleteMenus(String[] menuIds) throws Exception {
-    // Find users associated with these menus/buttons
-    this.roleMenuServie.deleteByMenuId(menuIds);
-    // Recursively delete these menus/buttons
-    this.removeByIds(Arrays.asList(menuIds));
-  }
-
   @Override
   public List<VueRouter<Menu>> getUserRouters(Long userId, Long teamId) {
     List<VueRouter<Menu>> routes = new ArrayList<>();
@@ -165,15 +141,4 @@ public List<VueRouter<Menu>> getUserRouters(Long userId, Long teamId) {
         });
     return VueRouterUtils.buildVueRouter(routes);
   }
-
-  private void setMenu(Menu menu) {
-    if (menu.getParentId() == null) {
-      menu.setParentId(0L);
-    }
-    if (Menu.TYPE_BUTTON.equals(menu.getType())) {
-      menu.setPath(null);
-      menu.setIcon(null);
-      menu.setComponent(null);
-    }
-  }
 }