diff --git a/dinky-admin/pom.xml b/dinky-admin/pom.xml index 17cfbdf6f5..7fd1b2f957 100644 --- a/dinky-admin/pom.xml +++ b/dinky-admin/pom.xml @@ -32,7 +32,6 @@ provided - 5.13.1.202206130422-r 42.5.1 @@ -175,10 +174,6 @@ org.springframework.boot spring-boot-starter-data-redis - - org.apache.commons - commons-lang3 - org.dinky dinky-core @@ -298,28 +293,6 @@ junit-jupiter test - - org.eclipse.jgit - org.eclipse.jgit.archive - ${jgit.version} - - - org.slf4j - slf4j-api - - - - - org.eclipse.jgit - org.eclipse.jgit.ssh.jsch - ${jgit.version} - - - org.slf4j - slf4j-api - - - org.springframework.boot spring-boot-starter-data-ldap @@ -339,11 +312,6 @@ - - - com.github.oshi - oshi-core - org.apache.paimon paimon-bundle diff --git a/dinky-admin/src/main/java/org/dinky/aop/LogAspect.java b/dinky-admin/src/main/java/org/dinky/aop/LogAspect.java index a394f88fac..6a3ce0c72e 100644 --- a/dinky-admin/src/main/java/org/dinky/aop/LogAspect.java +++ b/dinky-admin/src/main/java/org/dinky/aop/LogAspect.java @@ -20,7 +20,7 @@ package org.dinky.aop; import org.dinky.context.UserInfoContextHolder; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.enums.BusinessStatus; import org.dinky.data.model.OperateLog; import org.dinky.data.model.User; @@ -63,7 +63,7 @@ @Component public class LogAspect { - @Pointcut("@annotation(org.dinky.data.annotation.Log)") + @Pointcut("@annotation(org.dinky.data.annotations.Log)") public void logPointCut() {} /** diff --git a/dinky-admin/src/main/java/org/dinky/configure/MybatisPlusConfig.java b/dinky-admin/src/main/java/org/dinky/configure/MybatisPlusConfig.java index 38bd99c86f..96ae498282 100644 --- a/dinky-admin/src/main/java/org/dinky/configure/MybatisPlusConfig.java +++ b/dinky-admin/src/main/java/org/dinky/configure/MybatisPlusConfig.java @@ -20,7 +20,6 @@ package org.dinky.configure; import org.dinky.context.TenantContextHolder; -import org.dinky.data.annotation.ConditionalOnListProperty; import org.dinky.interceptor.PostgreSQLPrepareInterceptor; import org.dinky.interceptor.PostgreSQLQueryInterceptor; import org.dinky.mybatis.handler.DateMetaObjectHandler; @@ -34,6 +33,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; @@ -80,8 +80,7 @@ public class MybatisPlusConfig { "dinky_task_version"); @Bean - // @ConditionalOnProperty(name = "spring.profiles.active", havingValue = "pgsql , jmx") - @ConditionalOnListProperty(name = "spring.profiles.active", havingValue = "pgsql") + @Profile("pgsql") public PostgreSQLQueryInterceptor postgreSQLQueryInterceptor() { return new PostgreSQLQueryInterceptor(); } @@ -92,8 +91,7 @@ public PostgreSQLQueryInterceptor postgreSQLQueryInterceptor() { * @return {@linkplain PostgreSQLPrepareInterceptor} */ @Bean - // @ConditionalOnProperty(name = "spring.profiles.active", havingValue = "pgsql , jmx") - @ConditionalOnListProperty(name = "spring.profiles.active", havingValue = "pgsql") + @Profile("pgsql") public PostgreSQLPrepareInterceptor postgreSQLPrepareInterceptor() { return new PostgreSQLPrepareInterceptor(); } diff --git a/dinky-admin/src/main/java/org/dinky/configure/schedule/metrics/GatherSysIndicator.java b/dinky-admin/src/main/java/org/dinky/configure/schedule/metrics/GatherSysIndicator.java index 9392ea8e12..f10a965dea 100644 --- a/dinky-admin/src/main/java/org/dinky/configure/schedule/metrics/GatherSysIndicator.java +++ b/dinky-admin/src/main/java/org/dinky/configure/schedule/metrics/GatherSysIndicator.java @@ -21,7 +21,7 @@ import org.dinky.configure.schedule.BaseSchedule; import org.dinky.context.MetricsContextHolder; -import org.dinky.data.annotation.GaugeM; +import org.dinky.data.annotations.GaugeM; import org.dinky.data.enums.MetricsType; import org.dinky.data.metrics.BaseMetrics; import org.dinky.data.metrics.Cpu; diff --git a/dinky-admin/src/main/java/org/dinky/controller/APIController.java b/dinky-admin/src/main/java/org/dinky/controller/APIController.java index 702085469e..4c9cf5e28a 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/APIController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/APIController.java @@ -19,7 +19,7 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.dto.TaskDTO; import org.dinky.data.enums.BusinessType; import org.dinky.data.enums.Status; diff --git a/dinky-admin/src/main/java/org/dinky/controller/AlertGroupController.java b/dinky-admin/src/main/java/org/dinky/controller/AlertGroupController.java index 16a13d6989..57030ed9f4 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/AlertGroupController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/AlertGroupController.java @@ -19,7 +19,7 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.constant.PermissionConstants; import org.dinky.data.enums.BusinessType; import org.dinky.data.enums.Status; diff --git a/dinky-admin/src/main/java/org/dinky/controller/AlertHistoryController.java b/dinky-admin/src/main/java/org/dinky/controller/AlertHistoryController.java index 442a68f17b..da8465b093 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/AlertHistoryController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/AlertHistoryController.java @@ -19,7 +19,7 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.enums.BusinessType; import org.dinky.data.enums.Status; import org.dinky.data.model.AlertHistory; diff --git a/dinky-admin/src/main/java/org/dinky/controller/AlertInstanceController.java b/dinky-admin/src/main/java/org/dinky/controller/AlertInstanceController.java index 2ffaef9ff7..bb2e27b2c5 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/AlertInstanceController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/AlertInstanceController.java @@ -21,7 +21,7 @@ import org.dinky.alert.AlertPool; import org.dinky.alert.AlertResult; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.constant.PermissionConstants; import org.dinky.data.dto.AlertInstanceDTO; import org.dinky.data.enums.BusinessType; diff --git a/dinky-admin/src/main/java/org/dinky/controller/AlertRuleController.java b/dinky-admin/src/main/java/org/dinky/controller/AlertRuleController.java index 65fe1b3e82..9c7777a200 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/AlertRuleController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/AlertRuleController.java @@ -19,7 +19,7 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.constant.PermissionConstants; import org.dinky.data.enums.BusinessType; import org.dinky.data.enums.Status; diff --git a/dinky-admin/src/main/java/org/dinky/controller/AlertTemplateController.java b/dinky-admin/src/main/java/org/dinky/controller/AlertTemplateController.java index 701a572b7c..d76f3e110a 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/AlertTemplateController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/AlertTemplateController.java @@ -19,7 +19,7 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.constant.PermissionConstants; import org.dinky.data.enums.BusinessType; import org.dinky.data.enums.Status; diff --git a/dinky-admin/src/main/java/org/dinky/controller/CatalogueController.java b/dinky-admin/src/main/java/org/dinky/controller/CatalogueController.java index f921ea57b7..c0170eb1e3 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/CatalogueController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/CatalogueController.java @@ -19,7 +19,7 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.dto.CatalogueTaskDTO; import org.dinky.data.enums.BusinessType; import org.dinky.data.enums.Status; diff --git a/dinky-admin/src/main/java/org/dinky/controller/ClusterConfigurationController.java b/dinky-admin/src/main/java/org/dinky/controller/ClusterConfigurationController.java index b8adec68ab..d6ea31c9ce 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/ClusterConfigurationController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/ClusterConfigurationController.java @@ -19,7 +19,7 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.constant.PermissionConstants; import org.dinky.data.dto.ClusterConfigurationDTO; import org.dinky.data.enums.BusinessType; diff --git a/dinky-admin/src/main/java/org/dinky/controller/ClusterInstanceController.java b/dinky-admin/src/main/java/org/dinky/controller/ClusterInstanceController.java index 9d76a170c1..b92f4a4229 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/ClusterInstanceController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/ClusterInstanceController.java @@ -19,7 +19,7 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.constant.PermissionConstants; import org.dinky.data.dto.ClusterInstanceDTO; import org.dinky.data.enums.BusinessType; diff --git a/dinky-admin/src/main/java/org/dinky/controller/DataBaseController.java b/dinky-admin/src/main/java/org/dinky/controller/DataBaseController.java index 2914165c91..9b328fd26e 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/DataBaseController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/DataBaseController.java @@ -20,7 +20,7 @@ package org.dinky.controller; import org.dinky.assertion.Asserts; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.constant.CommonConstant; import org.dinky.data.constant.PermissionConstants; import org.dinky.data.dto.DataBaseDTO; diff --git a/dinky-admin/src/main/java/org/dinky/controller/DocumentController.java b/dinky-admin/src/main/java/org/dinky/controller/DocumentController.java index aefefeb2e8..6044472230 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/DocumentController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/DocumentController.java @@ -19,7 +19,7 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.constant.PermissionConstants; import org.dinky.data.enums.BusinessType; import org.dinky.data.enums.Status; diff --git a/dinky-admin/src/main/java/org/dinky/controller/DownloadController.java b/dinky-admin/src/main/java/org/dinky/controller/DownloadController.java index 652b31b872..1e94b040f6 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/DownloadController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/DownloadController.java @@ -20,7 +20,7 @@ package org.dinky.controller; import org.dinky.assertion.Asserts; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.enums.BusinessType; import org.dinky.data.exception.BusException; import org.dinky.data.model.FlinkUdfManifest; diff --git a/dinky-admin/src/main/java/org/dinky/controller/FragmentController.java b/dinky-admin/src/main/java/org/dinky/controller/FragmentController.java index 055da43477..201ac2de6c 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/FragmentController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/FragmentController.java @@ -19,7 +19,7 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.constant.PermissionConstants; import org.dinky.data.enums.BusinessType; import org.dinky.data.enums.Status; diff --git a/dinky-admin/src/main/java/org/dinky/controller/GitController.java b/dinky-admin/src/main/java/org/dinky/controller/GitController.java index bd74ebcc11..a66219ae2d 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/GitController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/GitController.java @@ -19,7 +19,7 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.constant.PermissionConstants; import org.dinky.data.dto.GitProjectDTO; import org.dinky.data.dto.TreeNodeDTO; diff --git a/dinky-admin/src/main/java/org/dinky/controller/JobInstanceController.java b/dinky-admin/src/main/java/org/dinky/controller/JobInstanceController.java index 72201b7720..337648ef2d 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/JobInstanceController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/JobInstanceController.java @@ -21,7 +21,7 @@ import org.dinky.api.FlinkAPI; import org.dinky.assertion.Asserts; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.enums.BusinessType; import org.dinky.data.model.ID; import org.dinky.data.model.JobInfoDetail; diff --git a/dinky-admin/src/main/java/org/dinky/controller/LdapController.java b/dinky-admin/src/main/java/org/dinky/controller/LdapController.java index b72ce1d25c..ef2d386295 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/LdapController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/LdapController.java @@ -19,7 +19,7 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.dto.LoginDTO; import org.dinky.data.dto.UserDTO; import org.dinky.data.enums.BusinessType; diff --git a/dinky-admin/src/main/java/org/dinky/controller/MenuController.java b/dinky-admin/src/main/java/org/dinky/controller/MenuController.java index 667cf0e55e..d904b7d95a 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/MenuController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/MenuController.java @@ -19,7 +19,7 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.constant.PermissionConstants; import org.dinky.data.dto.MenuDTO; import org.dinky.data.dto.RoleMenuDTO; diff --git a/dinky-admin/src/main/java/org/dinky/controller/MonitorController.java b/dinky-admin/src/main/java/org/dinky/controller/MonitorController.java index c52d1e3028..a368b7b5f5 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/MonitorController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/MonitorController.java @@ -19,7 +19,7 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.dto.MetricsLayoutDTO; import org.dinky.data.enums.BusinessType; import org.dinky.data.enums.MetricsType; diff --git a/dinky-admin/src/main/java/org/dinky/controller/ResourceController.java b/dinky-admin/src/main/java/org/dinky/controller/ResourceController.java index 5c0ae8f7ec..cf7ea7f7ab 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/ResourceController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/ResourceController.java @@ -19,7 +19,7 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.constant.PermissionConstants; import org.dinky.data.dto.ResourcesDTO; import org.dinky.data.dto.TreeNodeDTO; diff --git a/dinky-admin/src/main/java/org/dinky/controller/RoleController.java b/dinky-admin/src/main/java/org/dinky/controller/RoleController.java index d760cb1328..9dbe28de1e 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/RoleController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/RoleController.java @@ -19,7 +19,7 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.constant.PermissionConstants; import org.dinky.data.dto.RoleDTO; import org.dinky.data.enums.BusinessType; diff --git a/dinky-admin/src/main/java/org/dinky/controller/RoleMenuController.java b/dinky-admin/src/main/java/org/dinky/controller/RoleMenuController.java index 79f9235558..8fd172de6a 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/RoleMenuController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/RoleMenuController.java @@ -19,7 +19,7 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.constant.PermissionConstants; import org.dinky.data.dto.AssignMenuToRoleDTO; import org.dinky.data.enums.BusinessType; diff --git a/dinky-admin/src/main/java/org/dinky/controller/RowPermissionsController.java b/dinky-admin/src/main/java/org/dinky/controller/RowPermissionsController.java index 9ad55ca06d..89c6275980 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/RowPermissionsController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/RowPermissionsController.java @@ -19,7 +19,7 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.constant.PermissionConstants; import org.dinky.data.enums.BusinessType; import org.dinky.data.enums.Status; diff --git a/dinky-admin/src/main/java/org/dinky/controller/StudioController.java b/dinky-admin/src/main/java/org/dinky/controller/StudioController.java index 4f5dcd8491..64d94b7d4f 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/StudioController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/StudioController.java @@ -20,7 +20,7 @@ package org.dinky.controller; import org.dinky.assertion.Asserts; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.dto.StudioDDLDTO; import org.dinky.data.dto.StudioLineageDTO; import org.dinky.data.dto.StudioMetaStoreDTO; diff --git a/dinky-admin/src/main/java/org/dinky/controller/SysConfigController.java b/dinky-admin/src/main/java/org/dinky/controller/SysConfigController.java index c966f4250f..6daaa0368e 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/SysConfigController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/SysConfigController.java @@ -19,7 +19,7 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.enums.BusinessType; import org.dinky.data.enums.Status; import org.dinky.data.model.Configuration; diff --git a/dinky-admin/src/main/java/org/dinky/controller/TaskController.java b/dinky-admin/src/main/java/org/dinky/controller/TaskController.java index bc23c4fe79..4a8a0d1c9b 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/TaskController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/TaskController.java @@ -19,8 +19,8 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; import org.dinky.data.annotations.ExecuteProcess; +import org.dinky.data.annotations.Log; import org.dinky.data.annotations.ProcessId; import org.dinky.data.dto.DebugDTO; import org.dinky.data.dto.TaskDTO; diff --git a/dinky-admin/src/main/java/org/dinky/controller/TaskVersionController.java b/dinky-admin/src/main/java/org/dinky/controller/TaskVersionController.java index 5ff5234218..952fea1617 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/TaskVersionController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/TaskVersionController.java @@ -19,7 +19,7 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.dto.TaskVersionHistoryDTO; import org.dinky.data.enums.BusinessType; import org.dinky.data.model.TaskVersion; diff --git a/dinky-admin/src/main/java/org/dinky/controller/TenantController.java b/dinky-admin/src/main/java/org/dinky/controller/TenantController.java index b5e6b8a186..db863fa0dd 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/TenantController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/TenantController.java @@ -19,7 +19,7 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.constant.PermissionConstants; import org.dinky.data.enums.BusinessType; import org.dinky.data.model.Tenant; diff --git a/dinky-admin/src/main/java/org/dinky/controller/TokenController.java b/dinky-admin/src/main/java/org/dinky/controller/TokenController.java index 8db9b8247e..93656e4266 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/TokenController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/TokenController.java @@ -19,7 +19,7 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.constant.PermissionConstants; import org.dinky.data.enums.BusinessType; import org.dinky.data.enums.Status; diff --git a/dinky-admin/src/main/java/org/dinky/controller/UDFTemplateController.java b/dinky-admin/src/main/java/org/dinky/controller/UDFTemplateController.java index 49cec7f746..7b7ffacac3 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/UDFTemplateController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/UDFTemplateController.java @@ -19,7 +19,7 @@ package org.dinky.controller; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.constant.PermissionConstants; import org.dinky.data.enums.BusinessType; import org.dinky.data.enums.Status; diff --git a/dinky-admin/src/main/java/org/dinky/controller/UserController.java b/dinky-admin/src/main/java/org/dinky/controller/UserController.java index 6325d6baac..d834f7a9b9 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/UserController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/UserController.java @@ -20,7 +20,7 @@ package org.dinky.controller; import org.dinky.assertion.Asserts; -import org.dinky.data.annotation.Log; +import org.dinky.data.annotations.Log; import org.dinky.data.constant.PermissionConstants; import org.dinky.data.dto.ModifyPasswordDTO; import org.dinky.data.enums.BusinessType; diff --git a/dinky-admin/src/main/java/org/dinky/data/annotation/ConditionalOnListProperty.java b/dinky-admin/src/main/java/org/dinky/data/annotation/ConditionalOnListProperty.java deleted file mode 100644 index 4f0c7dac57..0000000000 --- a/dinky-admin/src/main/java/org/dinky/data/annotation/ConditionalOnListProperty.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.dinky.data.annotation; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.util.Arrays; - -import org.springframework.context.annotation.Condition; -import org.springframework.context.annotation.ConditionContext; -import org.springframework.context.annotation.Conditional; -import org.springframework.core.type.AnnotatedTypeMetadata; - -@Target({ElementType.TYPE, ElementType.METHOD}) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Conditional(CustomListCondition.class) -public @interface ConditionalOnListProperty { - String name(); - - String havingValue(); -} - -class CustomListCondition implements Condition { - - @Override - public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) { - String propertyName = (String) metadata.getAnnotationAttributes(ConditionalOnListProperty.class.getName()) - .get("name"); - String requiredValue = (String) metadata.getAnnotationAttributes(ConditionalOnListProperty.class.getName()) - .get("havingValue"); - String[] propertyValues = context.getEnvironment().getProperty(propertyName, String[].class); - if (propertyValues != null) { - return Arrays.asList(propertyValues).contains(requiredValue); - } - return false; - } -} diff --git a/dinky-admin/src/main/java/org/dinky/data/model/AlertRule.java b/dinky-admin/src/main/java/org/dinky/data/model/AlertRule.java index 8013a28ce6..d0cba14a95 100644 --- a/dinky-admin/src/main/java/org/dinky/data/model/AlertRule.java +++ b/dinky-admin/src/main/java/org/dinky/data/model/AlertRule.java @@ -36,7 +36,7 @@ @Data @TableName("dinky_alert_rules") @ApiModel(value = "AlertRule", description = "AlertRule") -public class AlertRule extends SuperEntity { +public class AlertRule extends SuperEntity { @ApiModelProperty(value = "rule", required = true, dataType = "String", example = "rule") String rule; diff --git a/dinky-admin/src/main/java/org/dinky/service/task/BaseTask.java b/dinky-admin/src/main/java/org/dinky/service/task/BaseTask.java index 16e5993a04..270bc6617f 100644 --- a/dinky-admin/src/main/java/org/dinky/service/task/BaseTask.java +++ b/dinky-admin/src/main/java/org/dinky/service/task/BaseTask.java @@ -20,7 +20,7 @@ package org.dinky.service.task; import org.dinky.config.Dialect; -import org.dinky.data.annotation.SupportDialect; +import org.dinky.data.annotations.SupportDialect; import org.dinky.data.dto.TaskDTO; import org.dinky.data.exception.NotSupportExplainExcepition; import org.dinky.data.result.SelectResult; diff --git a/dinky-admin/src/main/java/org/dinky/service/task/CommonSqlTask.java b/dinky-admin/src/main/java/org/dinky/service/task/CommonSqlTask.java index 69d7469221..69432ad549 100644 --- a/dinky-admin/src/main/java/org/dinky/service/task/CommonSqlTask.java +++ b/dinky-admin/src/main/java/org/dinky/service/task/CommonSqlTask.java @@ -20,7 +20,7 @@ package org.dinky.service.task; import org.dinky.config.Dialect; -import org.dinky.data.annotation.SupportDialect; +import org.dinky.data.annotations.SupportDialect; import org.dinky.data.dto.SqlDTO; import org.dinky.data.dto.TaskDTO; import org.dinky.data.result.ResultPool; diff --git a/dinky-admin/src/main/java/org/dinky/service/task/FlinkJarSqlTask.java b/dinky-admin/src/main/java/org/dinky/service/task/FlinkJarSqlTask.java index c85da03006..a6dd4c804a 100644 --- a/dinky-admin/src/main/java/org/dinky/service/task/FlinkJarSqlTask.java +++ b/dinky-admin/src/main/java/org/dinky/service/task/FlinkJarSqlTask.java @@ -20,7 +20,7 @@ package org.dinky.service.task; import org.dinky.config.Dialect; -import org.dinky.data.annotation.SupportDialect; +import org.dinky.data.annotations.SupportDialect; import org.dinky.data.dto.TaskDTO; import org.dinky.data.result.SqlExplainResult; import org.dinky.job.JobResult; diff --git a/dinky-admin/src/main/java/org/dinky/service/task/FlinkSqlTask.java b/dinky-admin/src/main/java/org/dinky/service/task/FlinkSqlTask.java index 80739b1f99..29511c86f8 100644 --- a/dinky-admin/src/main/java/org/dinky/service/task/FlinkSqlTask.java +++ b/dinky-admin/src/main/java/org/dinky/service/task/FlinkSqlTask.java @@ -20,7 +20,7 @@ package org.dinky.service.task; import org.dinky.config.Dialect; -import org.dinky.data.annotation.SupportDialect; +import org.dinky.data.annotations.SupportDialect; import org.dinky.data.dto.TaskDTO; import org.dinky.data.result.SqlExplainResult; import org.dinky.job.JobManager; diff --git a/dinky-admin/src/main/java/org/dinky/service/task/UdfTask.java b/dinky-admin/src/main/java/org/dinky/service/task/UdfTask.java index c19bfe8b1c..094670fdc2 100644 --- a/dinky-admin/src/main/java/org/dinky/service/task/UdfTask.java +++ b/dinky-admin/src/main/java/org/dinky/service/task/UdfTask.java @@ -20,7 +20,7 @@ package org.dinky.service.task; import org.dinky.config.Dialect; -import org.dinky.data.annotation.SupportDialect; +import org.dinky.data.annotations.SupportDialect; import org.dinky.data.dto.TaskDTO; import org.dinky.data.model.Task; import org.dinky.function.FunctionFactory; diff --git a/dinky-common/pom.xml b/dinky-common/pom.xml index ac205eec14..79d9414507 100644 --- a/dinky-common/pom.xml +++ b/dinky-common/pom.xml @@ -156,6 +156,33 @@ org.apache.httpcomponents httpclient + + org.eclipse.jgit + org.eclipse.jgit.archive + ${jgit.version} + + + org.slf4j + slf4j-api + + + + + org.eclipse.jgit + org.eclipse.jgit.ssh.jsch + ${jgit.version} + + + org.slf4j + slf4j-api + + + + + + com.github.oshi + oshi-core + diff --git a/dinky-admin/src/main/java/org/dinky/data/annotation/GaugeM.java b/dinky-common/src/main/java/org/dinky/data/annotations/GaugeM.java similarity index 97% rename from dinky-admin/src/main/java/org/dinky/data/annotation/GaugeM.java rename to dinky-common/src/main/java/org/dinky/data/annotations/GaugeM.java index 317a7a1110..9b49fc30af 100644 --- a/dinky-admin/src/main/java/org/dinky/data/annotation/GaugeM.java +++ b/dinky-common/src/main/java/org/dinky/data/annotations/GaugeM.java @@ -17,7 +17,7 @@ * */ -package org.dinky.data.annotation; +package org.dinky.data.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/dinky-admin/src/main/java/org/dinky/data/annotation/Log.java b/dinky-common/src/main/java/org/dinky/data/annotations/Log.java similarity index 87% rename from dinky-admin/src/main/java/org/dinky/data/annotation/Log.java rename to dinky-common/src/main/java/org/dinky/data/annotations/Log.java index faec64b42c..4ba7e093a6 100644 --- a/dinky-admin/src/main/java/org/dinky/data/annotation/Log.java +++ b/dinky-common/src/main/java/org/dinky/data/annotations/Log.java @@ -17,7 +17,7 @@ * */ -package org.dinky.data.annotation; +package org.dinky.data.annotations; import org.dinky.data.enums.BusinessType; @@ -33,11 +33,11 @@ @Documented public @interface Log { /** 模块 */ - public String title() default ""; + String title() default ""; /** 功能 */ - public BusinessType businessType() default BusinessType.OTHER; + BusinessType businessType() default BusinessType.OTHER; /** 是否保存请求的参数 */ - public boolean isSaveRequestData() default true; + boolean isSaveRequestData() default true; } diff --git a/dinky-admin/src/main/java/org/dinky/data/annotation/SupportDialect.java b/dinky-common/src/main/java/org/dinky/data/annotations/SupportDialect.java similarity index 91% rename from dinky-admin/src/main/java/org/dinky/data/annotation/SupportDialect.java rename to dinky-common/src/main/java/org/dinky/data/annotations/SupportDialect.java index c706b92423..f46878a311 100644 --- a/dinky-admin/src/main/java/org/dinky/data/annotation/SupportDialect.java +++ b/dinky-common/src/main/java/org/dinky/data/annotations/SupportDialect.java @@ -17,7 +17,7 @@ * */ -package org.dinky.data.annotation; +package org.dinky.data.annotations; import org.dinky.config.Dialect; @@ -28,14 +28,14 @@ import java.lang.annotation.Target; /** - * 自定义操作日志记录注解 + * task support dialect */ @Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) @Documented public @interface SupportDialect { /** - * 模块 + * Support Dialect */ - public Dialect[] value(); + Dialect[] value(); } diff --git a/dinky-admin/src/main/java/org/dinky/data/constant/BaseConstant.java b/dinky-common/src/main/java/org/dinky/data/constant/BaseConstant.java similarity index 100% rename from dinky-admin/src/main/java/org/dinky/data/constant/BaseConstant.java rename to dinky-common/src/main/java/org/dinky/data/constant/BaseConstant.java diff --git a/dinky-admin/src/main/java/org/dinky/data/constant/DirConstant.java b/dinky-common/src/main/java/org/dinky/data/constant/DirConstant.java similarity index 66% rename from dinky-admin/src/main/java/org/dinky/data/constant/DirConstant.java rename to dinky-common/src/main/java/org/dinky/data/constant/DirConstant.java index 8885fee7c1..d71f0cd972 100644 --- a/dinky-admin/src/main/java/org/dinky/data/constant/DirConstant.java +++ b/dinky-common/src/main/java/org/dinky/data/constant/DirConstant.java @@ -19,7 +19,9 @@ package org.dinky.data.constant; -import org.springframework.boot.system.ApplicationHome; +import java.io.File; + +import cn.hutool.core.io.FileUtil; /** * DirConstant @@ -28,14 +30,8 @@ */ public class DirConstant { - public static final String FILE_SEPARATOR = "file.separator"; - public static final String LOG_DIR_PATH; - public static final String ROOT_LOG_PATH; - - static { - String separator = System.getProperty(FILE_SEPARATOR); - String rootPath = new ApplicationHome().getDir().getPath(); - LOG_DIR_PATH = rootPath + separator + "logs"; - ROOT_LOG_PATH = LOG_DIR_PATH + separator + "dinky.log"; - } + public static final String FILE_SEPARATOR = File.separator; + public static final String ROOT_PATH = FileUtil.getUserHomeDir().getAbsolutePath(); + public static final String LOG_DIR_PATH = ROOT_PATH + FILE_SEPARATOR + "logs"; + public static final String ROOT_LOG_PATH = LOG_DIR_PATH + FILE_SEPARATOR + "dinky.log"; } diff --git a/dinky-admin/src/main/java/org/dinky/data/constant/PermissionConstants.java b/dinky-common/src/main/java/org/dinky/data/constant/PermissionConstants.java similarity index 100% rename from dinky-admin/src/main/java/org/dinky/data/constant/PermissionConstants.java rename to dinky-common/src/main/java/org/dinky/data/constant/PermissionConstants.java diff --git a/dinky-admin/src/main/java/org/dinky/data/enums/BusinessStatus.java b/dinky-common/src/main/java/org/dinky/data/enums/BusinessStatus.java similarity index 100% rename from dinky-admin/src/main/java/org/dinky/data/enums/BusinessStatus.java rename to dinky-common/src/main/java/org/dinky/data/enums/BusinessStatus.java diff --git a/dinky-admin/src/main/java/org/dinky/data/enums/BusinessType.java b/dinky-common/src/main/java/org/dinky/data/enums/BusinessType.java similarity index 100% rename from dinky-admin/src/main/java/org/dinky/data/enums/BusinessType.java rename to dinky-common/src/main/java/org/dinky/data/enums/BusinessType.java diff --git a/dinky-admin/src/main/java/org/dinky/data/enums/CodeEnum.java b/dinky-common/src/main/java/org/dinky/data/enums/CodeEnum.java similarity index 100% rename from dinky-admin/src/main/java/org/dinky/data/enums/CodeEnum.java rename to dinky-common/src/main/java/org/dinky/data/enums/CodeEnum.java diff --git a/dinky-admin/src/main/java/org/dinky/data/enums/MenuType.java b/dinky-common/src/main/java/org/dinky/data/enums/MenuType.java similarity index 100% rename from dinky-admin/src/main/java/org/dinky/data/enums/MenuType.java rename to dinky-common/src/main/java/org/dinky/data/enums/MenuType.java diff --git a/dinky-admin/src/main/java/org/dinky/data/enums/MetricsType.java b/dinky-common/src/main/java/org/dinky/data/enums/MetricsType.java similarity index 100% rename from dinky-admin/src/main/java/org/dinky/data/enums/MetricsType.java rename to dinky-common/src/main/java/org/dinky/data/enums/MetricsType.java diff --git a/dinky-admin/src/main/java/org/dinky/data/enums/UserType.java b/dinky-common/src/main/java/org/dinky/data/enums/UserType.java similarity index 100% rename from dinky-admin/src/main/java/org/dinky/data/enums/UserType.java rename to dinky-common/src/main/java/org/dinky/data/enums/UserType.java diff --git a/dinky-admin/src/main/java/org/dinky/data/exception/AuthException.java b/dinky-common/src/main/java/org/dinky/data/exception/AuthException.java similarity index 100% rename from dinky-admin/src/main/java/org/dinky/data/exception/AuthException.java rename to dinky-common/src/main/java/org/dinky/data/exception/AuthException.java diff --git a/dinky-admin/src/main/java/org/dinky/data/exception/BusException.java b/dinky-common/src/main/java/org/dinky/data/exception/BusException.java similarity index 100% rename from dinky-admin/src/main/java/org/dinky/data/exception/BusException.java rename to dinky-common/src/main/java/org/dinky/data/exception/BusException.java diff --git a/dinky-admin/src/main/java/org/dinky/data/exception/NotSupportExplainExcepition.java b/dinky-common/src/main/java/org/dinky/data/exception/NotSupportExplainExcepition.java similarity index 100% rename from dinky-admin/src/main/java/org/dinky/data/exception/NotSupportExplainExcepition.java rename to dinky-common/src/main/java/org/dinky/data/exception/NotSupportExplainExcepition.java diff --git a/dinky-admin/src/main/java/org/dinky/data/exception/SqlExplainExcepition.java b/dinky-common/src/main/java/org/dinky/data/exception/SqlExplainExcepition.java similarity index 100% rename from dinky-admin/src/main/java/org/dinky/data/exception/SqlExplainExcepition.java rename to dinky-common/src/main/java/org/dinky/data/exception/SqlExplainExcepition.java diff --git a/dinky-admin/src/main/java/org/dinky/data/exception/TaskNotDoneException.java b/dinky-common/src/main/java/org/dinky/data/exception/TaskNotDoneException.java similarity index 100% rename from dinky-admin/src/main/java/org/dinky/data/exception/TaskNotDoneException.java rename to dinky-common/src/main/java/org/dinky/data/exception/TaskNotDoneException.java diff --git a/dinky-admin/src/main/java/org/dinky/data/metrics/BaseMetrics.java b/dinky-common/src/main/java/org/dinky/data/metrics/BaseMetrics.java similarity index 100% rename from dinky-admin/src/main/java/org/dinky/data/metrics/BaseMetrics.java rename to dinky-common/src/main/java/org/dinky/data/metrics/BaseMetrics.java diff --git a/dinky-admin/src/main/java/org/dinky/data/metrics/Cpu.java b/dinky-common/src/main/java/org/dinky/data/metrics/Cpu.java similarity index 97% rename from dinky-admin/src/main/java/org/dinky/data/metrics/Cpu.java rename to dinky-common/src/main/java/org/dinky/data/metrics/Cpu.java index 0f149eb00d..ad991329d7 100644 --- a/dinky-admin/src/main/java/org/dinky/data/metrics/Cpu.java +++ b/dinky-common/src/main/java/org/dinky/data/metrics/Cpu.java @@ -19,7 +19,7 @@ package org.dinky.data.metrics; -import org.dinky.data.annotation.GaugeM; +import org.dinky.data.annotations.GaugeM; import cn.hutool.core.bean.BeanUtil; import cn.hutool.system.oshi.CpuInfo; diff --git a/dinky-admin/src/main/java/org/dinky/data/metrics/Jvm.java b/dinky-common/src/main/java/org/dinky/data/metrics/Jvm.java similarity index 98% rename from dinky-admin/src/main/java/org/dinky/data/metrics/Jvm.java rename to dinky-common/src/main/java/org/dinky/data/metrics/Jvm.java index 9da3f42170..3a4b4c97a4 100644 --- a/dinky-admin/src/main/java/org/dinky/data/metrics/Jvm.java +++ b/dinky-common/src/main/java/org/dinky/data/metrics/Jvm.java @@ -19,7 +19,7 @@ package org.dinky.data.metrics; -import org.dinky.data.annotation.GaugeM; +import org.dinky.data.annotations.GaugeM; import java.lang.management.ManagementFactory; import java.lang.management.MemoryUsage; diff --git a/dinky-admin/src/main/java/org/dinky/data/metrics/Mem.java b/dinky-common/src/main/java/org/dinky/data/metrics/Mem.java similarity index 97% rename from dinky-admin/src/main/java/org/dinky/data/metrics/Mem.java rename to dinky-common/src/main/java/org/dinky/data/metrics/Mem.java index 74994da881..e07e1aa4aa 100644 --- a/dinky-admin/src/main/java/org/dinky/data/metrics/Mem.java +++ b/dinky-common/src/main/java/org/dinky/data/metrics/Mem.java @@ -19,7 +19,7 @@ package org.dinky.data.metrics; -import org.dinky.data.annotation.GaugeM; +import org.dinky.data.annotations.GaugeM; import cn.hutool.system.oshi.OshiUtil; import lombok.AllArgsConstructor; diff --git a/dinky-admin/src/main/java/org/dinky/data/metrics/MetricsTotal.java b/dinky-common/src/main/java/org/dinky/data/metrics/MetricsTotal.java similarity index 100% rename from dinky-admin/src/main/java/org/dinky/data/metrics/MetricsTotal.java rename to dinky-common/src/main/java/org/dinky/data/metrics/MetricsTotal.java diff --git a/pom.xml b/pom.xml index f3ab3bfc66..85d63e24ef 100644 --- a/pom.xml +++ b/pom.xml @@ -77,6 +77,7 @@ 1.6.2 2.3.0 2.9.0 + 5.13.1.202206130422-r 5.9.1 4.1.0 2.19.0