refactor bean struct

Zzm0809 · Oct 13, 2023 · 9fcae42 · 9fcae42
1 parent c7299a2
commit 9fcae42
Show file tree

Hide file tree

Showing 179 changed files with 1,033 additions and 842 deletions.
diff --git a/dinky-admin/src/main/java/org/dinky/aop/LogAspect.java b/dinky-admin/src/main/java/org/dinky/aop/LogAspect.java
@@ -22,8 +22,8 @@
 import org.dinky.context.UserInfoContextHolder;
 import org.dinky.data.annotation.Log;
 import org.dinky.data.enums.BusinessStatus;
-import org.dinky.data.model.OperateLog;
-import org.dinky.data.model.User;
+import org.dinky.data.model.log.OperateLog;
+import org.dinky.data.model.user.User;
 import org.dinky.data.result.Result;
 import org.dinky.service.impl.OperateLogServiceImpl;
 import org.dinky.utils.IpUtils;

diff --git a/dinky-admin/src/main/java/org/dinky/assertion/Assert.java b/dinky-admin/src/main/java/org/dinky/assertion/Assert.java
diff --git a/dinky-admin/src/main/java/org/dinky/context/LdapContext.java b/dinky-admin/src/main/java/org/dinky/context/LdapContext.java
@@ -20,9 +20,9 @@
 package org.dinky.context;
 
 import org.dinky.data.enums.UserType;
-import org.dinky.data.model.LdapUserIdentification;
 import org.dinky.data.model.SystemConfiguration;
-import org.dinky.data.model.User;
+import org.dinky.data.model.base.LdapUserIdentification;
+import org.dinky.data.model.user.User;
 
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;

diff --git a/dinky-admin/src/main/java/org/dinky/controller/APIController.java b/dinky-admin/src/main/java/org/dinky/controller/APIController.java
@@ -24,7 +24,7 @@
 import org.dinky.data.enums.BusinessType;
 import org.dinky.data.enums.Status;
 import org.dinky.data.exception.NotSupportExplainExcepition;
-import org.dinky.data.model.JobInstance;
+import org.dinky.data.model.job.JobInstance;
 import org.dinky.data.result.Result;
 import org.dinky.data.result.SqlExplainResult;
 import org.dinky.gateway.result.SavePointResult;

diff --git a/dinky-admin/src/main/java/org/dinky/controller/AlertGroupController.java b/dinky-admin/src/main/java/org/dinky/controller/AlertGroupController.java
@@ -23,7 +23,7 @@
 import org.dinky.data.constant.PermissionConstants;
 import org.dinky.data.enums.BusinessType;
 import org.dinky.data.enums.Status;
-import org.dinky.data.model.AlertGroup;
+import org.dinky.data.model.alert.AlertGroup;
 import org.dinky.data.result.ProTableResult;
 import org.dinky.data.result.Result;
 import org.dinky.service.AlertGroupService;

diff --git a/dinky-admin/src/main/java/org/dinky/controller/AlertHistoryController.java b/dinky-admin/src/main/java/org/dinky/controller/AlertHistoryController.java
@@ -22,7 +22,7 @@
 import org.dinky.data.annotation.Log;
 import org.dinky.data.enums.BusinessType;
 import org.dinky.data.enums.Status;
-import org.dinky.data.model.AlertHistory;
+import org.dinky.data.model.alert.AlertHistory;
 import org.dinky.data.result.Result;
 import org.dinky.service.AlertHistoryService;
 

diff --git a/dinky-admin/src/main/java/org/dinky/controller/AlertInstanceController.java b/dinky-admin/src/main/java/org/dinky/controller/AlertInstanceController.java
@@ -25,7 +25,7 @@
 import org.dinky.data.constant.PermissionConstants;
 import org.dinky.data.enums.BusinessType;
 import org.dinky.data.enums.Status;
-import org.dinky.data.model.AlertInstance;
+import org.dinky.data.model.alert.instance.AlertInstance;
 import org.dinky.data.result.ProTableResult;
 import org.dinky.data.result.Result;
 import org.dinky.service.AlertInstanceService;

diff --git a/dinky-admin/src/main/java/org/dinky/controller/AlertRuleController.java b/dinky-admin/src/main/java/org/dinky/controller/AlertRuleController.java
@@ -23,7 +23,7 @@
 import org.dinky.data.constant.PermissionConstants;
 import org.dinky.data.enums.BusinessType;
 import org.dinky.data.enums.Status;
-import org.dinky.data.model.AlertRule;
+import org.dinky.data.model.alert.AlertRule;
 import org.dinky.data.result.ProTableResult;
 import org.dinky.data.result.Result;
 import org.dinky.job.handler.JobAlertHandler;

diff --git a/dinky-admin/src/main/java/org/dinky/controller/AlertTemplateController.java b/dinky-admin/src/main/java/org/dinky/controller/AlertTemplateController.java
@@ -23,7 +23,7 @@
 import org.dinky.data.constant.PermissionConstants;
 import org.dinky.data.enums.BusinessType;
 import org.dinky.data.enums.Status;
-import org.dinky.data.model.AlertTemplate;
+import org.dinky.data.model.alert.AlertTemplate;
 import org.dinky.data.result.Result;
 import org.dinky.service.AlertTemplateService;
 

diff --git a/dinky-admin/src/main/java/org/dinky/controller/ClusterConfigurationController.java b/dinky-admin/src/main/java/org/dinky/controller/ClusterConfigurationController.java
@@ -24,7 +24,7 @@
 import org.dinky.data.dto.ClusterConfigurationDTO;
 import org.dinky.data.enums.BusinessType;
 import org.dinky.data.enums.Status;
-import org.dinky.data.model.ClusterConfiguration;
+import org.dinky.data.model.cluster.ClusterConfiguration;
 import org.dinky.data.result.ProTableResult;
 import org.dinky.data.result.Result;
 import org.dinky.gateway.result.TestResult;
@@ -59,7 +59,7 @@
  */
 @Slf4j
 @RestController
-@Api(tags = "Cluster Config Controller")
+@Api(tags = "ClusterInstance Config Controller")
 @RequestMapping("/api/clusterConfiguration")
 @RequiredArgsConstructor
 public class ClusterConfigurationController {
@@ -71,11 +71,11 @@ public class ClusterConfigurationController {
      * @return
      */
     @PutMapping
-    @Log(title = "Insert Or Update Cluster Config", businessType = BusinessType.INSERT_OR_UPDATE)
-    @ApiOperation("Insert Or Update Cluster Config")
+    @Log(title = "Insert Or Update ClusterInstance Config", businessType = BusinessType.INSERT_OR_UPDATE)
+    @ApiOperation("Insert Or Update ClusterInstance Config")
     @ApiImplicitParam(
             name = "clusterConfiguration",
-            value = "Cluster Configuration",
+            value = "ClusterInstance Configuration",
             dataType = "ClusterConfiguration",
             paramType = "body",
             required = true,
@@ -103,10 +103,10 @@ public Result<Void> saveOrUpdateClusterConfig(@RequestBody ClusterConfigurationD
      * @return
      */
     @PostMapping
-    @ApiOperation("Cluster Config List")
+    @ApiOperation("ClusterInstance Config List")
     @ApiImplicitParam(
             name = "para",
-            value = "Cluster Configuration",
+            value = "ClusterInstance Configuration",
             dataType = "JsonNode",
             paramType = "body",
             required = true)
@@ -129,10 +129,10 @@ public ProTableResult<ClusterConfigurationDTO> listClusterConfigList(@RequestBod
      * @return
      */
     @GetMapping("/listEnabledAll")
-    @ApiOperation("Cluster Config List Enabled All")
+    @ApiOperation("ClusterInstance Config List Enabled All")
     @ApiImplicitParam(
             name = "para",
-            value = "Cluster Configuration",
+            value = "ClusterInstance Configuration",
             dataType = "JsonNode",
             paramType = "body",
             required = true)
@@ -147,8 +147,8 @@ public Result<List<ClusterConfiguration>> listEnabledAllClusterConfig() {
      * @return {@link Result}<{@link Void}>
      */
     @DeleteMapping("/delete")
-    @Log(title = "Cluster Config Delete by id", businessType = BusinessType.DELETE)
-    @ApiOperation("Cluster Config Delete by id")
+    @Log(title = "ClusterInstance Config Delete by id", businessType = BusinessType.DELETE)
+    @ApiOperation("ClusterInstance Config Delete by id")
     @ApiImplicitParam(name = "id", value = "id", dataType = "Integer", paramType = "query", required = true)
     @SaCheckPermission(value = PermissionConstants.REGISTRATION_CLUSTER_CONFIG_DELETE)
     public Result<Void> deleteById(@RequestParam("id") Integer id) {
@@ -167,8 +167,8 @@ public Result<Void> deleteById(@RequestParam("id") Integer id) {
      * @return {@link Result}<{@link Void}>
      */
     @PutMapping("/enable")
-    @Log(title = "Modify Cluster Config Status", businessType = BusinessType.UPDATE)
-    @ApiOperation("Modify Cluster Config Status")
+    @Log(title = "Modify ClusterInstance Config Status", businessType = BusinessType.UPDATE)
+    @ApiOperation("Modify ClusterInstance Config Status")
     @ApiImplicitParam(name = "id", value = "id", dataType = "Integer", paramType = "query", required = true)
     @SaCheckPermission(value = PermissionConstants.REGISTRATION_CLUSTER_CONFIG_EDIT)
     public Result<Void> modifyClusterConfigStatus(@RequestParam("id") Integer id) {
@@ -190,7 +190,7 @@ public Result<Void> modifyClusterConfigStatus(@RequestParam("id") Integer id) {
     @ApiOperation("Test Connection")
     @ApiImplicitParam(
             name = "clusterConfiguration",
-            value = "Cluster Configuration",
+            value = "ClusterInstance Configuration",
             dataType = "ClusterConfiguration",
             paramType = "body",
             required = true,