From c2f24772b557dd630c6ec072299031b5c51fd118 Mon Sep 17 00:00:00 2001 From: kalencaya <1942460489@qq.com> Date: Fri, 10 Jan 2025 08:59:42 +0800 Subject: [PATCH] [Feature][scaleph-schedule] update schedule module (#757) * feature: update schedule group web * feature: upgrade carp version * fix: dependency update * fix: dependency update * feature: upgrade carp to 0.0.20 * feature: upgrade seatunnel plugin to 2.3.8 * fix: dependency update * feature: replace datasource class * feature: replace datasource class * feature: upgrade seatunnel hudi connectors to 2.3.8 * fix: license-header * fix: license-header * feature: upgrade carp-spring-boot-parent to 0.0.22 * feature: upgrade to carp * feature: remove dependency * feature: upgrade gravitino to 0.7.0-incubating * feature: update schedule job * feature: update schedule job * feature: update schedule job --------- Co-authored-by: wangqi --- pom.xml | 114 +-- .../api/annotation/AnonymousAccess.java | 35 - .../api/config/CarpDataSourceConfig.java | 4 +- .../api/config/LogDataSourceConfig.java | 5 +- .../api/config/MasterDataSourceConfig.java | 5 +- .../scaleph/api/config/MybatisConfig.java | 68 -- .../api/config/SakuraDataSourceConfig.java | 5 +- .../scaleph/api/config/SwaggerConfig.java | 75 -- .../api/controller/CommonController.java | 2 +- .../admin/LogMessageController.java | 2 +- .../dto/WsFlinkKubernetesJobInstanceDTO.java | 10 +- scaleph-dao/pom.xml | 18 +- .../cn/sliew/scaleph/dao/entity/BaseDO.java | 61 -- .../scaleph/dao/entity/log/LogAction.java | 4 +- .../scaleph/dao/entity/log/LogLogin.java | 4 +- .../scaleph/dao/entity/log/LogMessage.java | 4 +- .../scaleph/dao/entity/log/LogSchedule.java | 4 +- .../master/dataservice/DataserviceConfig.java | 4 +- .../dataservice/DataserviceParameterMap.java | 4 +- .../DataserviceParameterMapping.java | 4 +- .../dataservice/DataserviceResultMap.java | 4 +- .../dataservice/DataserviceResultMapping.java | 4 +- .../entity/master/meta/MetaDataElement.java | 4 +- .../dao/entity/master/meta/MetaDataMap.java | 4 +- .../dao/entity/master/meta/MetaDataSet.java | 4 +- .../entity/master/meta/MetaDataSetType.java | 4 +- .../entity/master/meta/MetaDatasource.java | 4 +- .../dao/entity/master/meta/MetaSystem.java | 4 +- .../master/oam/OamComponentDefinition.java | 4 +- .../master/oam/OamPolicyDefinition.java | 4 +- .../entity/master/oam/OamTraitDefinition.java | 4 +- .../master/oam/OamWorkloadDefinition.java | 4 +- .../resource/ResourceClusterCredential.java | 4 +- .../master/resource/ResourceFlinkRelease.java | 4 +- .../entity/master/resource/ResourceJar.java | 4 +- .../master/resource/ResourceKerberos.java | 4 +- .../resource/ResourceSeaTunnelRelease.java | 4 +- .../dao/entity/master/security/SecDept.java | 4 +- .../entity/master/security/SecDeptRole.java | 4 +- .../entity/master/security/SecPrivilege.java | 4 +- .../master/security/SecResourceWeb.java | 4 +- .../master/security/SecResourceWebRole.java | 4 +- .../dao/entity/master/security/SecRole.java | 4 +- .../master/security/SecRolePrivilege.java | 4 +- .../dao/entity/master/security/SecUser.java | 4 +- .../entity/master/security/SecUserActive.java | 4 +- .../entity/master/security/SecUserDept.java | 4 +- .../entity/master/security/SecUserRole.java | 4 +- .../master/snowflake/SnowflakeWorkerNode.java | 4 +- .../dao/entity/master/system/SysConfig.java | 4 +- .../master/workflow/WorkflowDefinition.java | 4 +- .../master/workflow/WorkflowDefinitionVO.java | 4 +- .../master/workflow/WorkflowSchedule.java | 4 +- .../dao/entity/master/ws/WsArtifact.java | 4 +- .../entity/master/ws/WsArtifactFlinkCDC.java | 4 +- .../entity/master/ws/WsArtifactFlinkJar.java | 4 +- .../entity/master/ws/WsArtifactFlinkSql.java | 4 +- .../entity/master/ws/WsArtifactSeaTunnel.java | 4 +- .../master/ws/WsDorisOperatorInstance.java | 4 +- .../master/ws/WsDorisOperatorTemplate.java | 4 +- .../entity/master/ws/WsFlinkCheckpoint.java | 4 +- .../ws/WsFlinkKubernetesDeployment.java | 4 +- .../master/ws/WsFlinkKubernetesJob.java | 4 +- .../ws/WsFlinkKubernetesJobInstance.java | 4 +- ...WsFlinkKubernetesJobInstanceSavepoint.java | 4 +- .../ws/WsFlinkKubernetesSessionCluster.java | 4 +- .../master/ws/WsFlinkKubernetesTemplate.java | 4 +- .../master/ws/WsFlinkSqlGatewayCatalog.java | 4 +- .../master/ws/WsFlinkSqlGatewayOperation.java | 4 +- .../master/ws/WsFlinkSqlGatewaySession.java | 4 +- .../dao/entity/master/ws/WsProject.java | 4 +- .../dto/DataserviceParameterMappingDTO.java | 4 +- .../dto/DataserviceResultMappingDTO.java | 4 +- scaleph-datasource/pom.xml | 11 - .../scaleph/ds/gravitino/GravitinoConfig.java | 51 -- .../ds/gravitino/GravitinoInitializer.java | 118 --- .../ds/gravitino/GravitinoProperties.java | 33 - scaleph-support/pom.xml | 1 - scaleph-support/scaleph-generator/pom.xml | 59 -- .../generator/MybatisPlusGenerator.java | 178 ----- .../MybatisPlusPostgreSQLGenerator.java | 179 ----- .../src/main/resources/custom-entity.java.vm | 155 ---- scaleph-ui-react/config/routes.ts | 4 + scaleph-ui-react/src/constants/dictType.ts | 4 + .../src/locales/zh-CN/pages/project.ts | 16 + .../Dag/components/node/steps/dataSource.tsx | 9 +- .../Schedule/Group/ScheduleGroupForm.tsx | 139 ++-- .../Workspace/Schedule/Group/index.tsx | 334 ++++----- .../Instance/ScheduleJobInstanceForm.tsx | 130 ++++ .../Workspace/Schedule/Instance/index.tsx | 217 ++++++ .../Schedule/Job/ScheduleJobForm.tsx | 49 +- .../Project/Workspace/Schedule/Job/index.tsx | 139 ++-- .../src/services/project/typings.d.ts | 65 -- .../schedule}/WsScheduleGroupService.ts | 18 +- .../schedule/WsScheduleJobInstanceService.ts | 56 ++ .../schedule}/WsScheduleJobService.ts | 22 +- .../services/workspace/schedule/typings.d.ts | 95 +++ tools/docker/local/docker-compose.yml | 5 +- tools/docker/mysql/init.d/carp-scheduler.sql | 2 +- .../mysql/init.d/scaleph-datasource-mysql.sql | 709 ------------------ 100 files changed, 1074 insertions(+), 2368 deletions(-) delete mode 100644 scaleph-api/src/main/java/cn/sliew/scaleph/api/annotation/AnonymousAccess.java delete mode 100644 scaleph-api/src/main/java/cn/sliew/scaleph/api/config/MybatisConfig.java delete mode 100644 scaleph-api/src/main/java/cn/sliew/scaleph/api/config/SwaggerConfig.java delete mode 100644 scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/BaseDO.java delete mode 100644 scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/gravitino/GravitinoConfig.java delete mode 100644 scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/gravitino/GravitinoInitializer.java delete mode 100644 scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/gravitino/GravitinoProperties.java delete mode 100644 scaleph-support/scaleph-generator/pom.xml delete mode 100644 scaleph-support/scaleph-generator/src/main/java/cn/sliew/scaleph/generator/MybatisPlusGenerator.java delete mode 100644 scaleph-support/scaleph-generator/src/main/java/cn/sliew/scaleph/generator/MybatisPlusPostgreSQLGenerator.java delete mode 100644 scaleph-support/scaleph-generator/src/main/resources/custom-entity.java.vm create mode 100644 scaleph-ui-react/src/pages/Project/Workspace/Schedule/Instance/ScheduleJobInstanceForm.tsx create mode 100644 scaleph-ui-react/src/pages/Project/Workspace/Schedule/Instance/index.tsx rename scaleph-ui-react/src/services/{project => workspace/schedule}/WsScheduleGroupService.ts (60%) create mode 100644 scaleph-ui-react/src/services/workspace/schedule/WsScheduleJobInstanceService.ts rename scaleph-ui-react/src/services/{project => workspace/schedule}/WsScheduleJobService.ts (62%) create mode 100644 scaleph-ui-react/src/services/workspace/schedule/typings.d.ts delete mode 100644 tools/docker/mysql/init.d/scaleph-datasource-mysql.sql diff --git a/pom.xml b/pom.xml index d0c7e0860..aecc58d7a 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ cn.sliew carp-spring-boot-parent - 0.0.19 + 0.0.25 cn.sliew scaleph @@ -129,36 +129,29 @@ 1.4.2.Final 0.2.0 1.18.24 - 2.2 1.0.1 - 0.9.0 - 4.0.0 + 0.0.23 + 1.0.13 + 21.1.0.0 0.3.2 5.1.26 0.22.1 1.29.0 1.4.3 - 4.10.0 - 8.3.8 - 0.0.20 - 1.0.13 + 1.0.2 3.3.4 3.1.3 - 3.21.5 - 4.1.82.Final 1.18.1 1.18 3.1.2 0.7.0-incubating - 3.1.7 - 0.4.14 + + 4.1.82.Final 2.44.0.Alpha - 4.3.2 0.4.1 - 1.5.2 - 0.5.1 + 4.0.0 @@ -354,12 +347,6 @@ 2.8.1 - - org.projectlombok - lombok - ${org.projectlombok.version} - - org.mapstruct.extensions.spring mapstruct-spring-annotations @@ -371,12 +358,6 @@ ${org.mapstruct.version} - - com.github.zafarkhaja - java-semver - ${semver.version} - - com.lmax disruptor @@ -451,7 +432,11 @@ flink-table-planner_2.12 ${flink.version} - + + org.apache.flink + flink-kubernetes + ${flink.version} + org.apache.flink flink-connector-jdbc @@ -469,40 +454,18 @@ ${sakura.version} - - org.apache.flink - flink-kubernetes - ${flink.version} - - com.typesafe config ${config.version} - - com.squareup.okhttp3 - okhttp - ${okhttp.version} - - - com.squareup.okhttp3 - logging-interceptor - ${okhttp.version} - - com.oracle.database.jdbc ojdbc8 ${ojdbc.version} test - - com.google.protobuf - protobuf-java - ${protobuf.version} - io.netty @@ -510,12 +473,6 @@ ${netty.version} - - com.flipkart.zjsonpatch - zjsonpatch - ${zjsonpatch.version} - - org.kie.kogito kogito-spring-boot-starter @@ -532,51 +489,6 @@ fury-core ${fury.version} - - - org.jgrapht - jgrapht-core - ${jgrapht.version} - - - - com.datastrato.gravitino - client-java-runtime - ${gravitino.version} - - - com.datastrato.gravitino - client-java - - - - - com.datastrato.gravitino - client-java - ${gravitino.version} - - - org.slf4j - slf4j-api - - - org.apache.logging.log4j - log4j-slf4j2-impl - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-core - - - org.apache.logging.log4j - log4j-1.2-api - - - diff --git a/scaleph-api/src/main/java/cn/sliew/scaleph/api/annotation/AnonymousAccess.java b/scaleph-api/src/main/java/cn/sliew/scaleph/api/annotation/AnonymousAccess.java deleted file mode 100644 index 794b1a7e1..000000000 --- a/scaleph-api/src/main/java/cn/sliew/scaleph/api/annotation/AnonymousAccess.java +++ /dev/null @@ -1,35 +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 cn.sliew.scaleph.api.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * 标记可以匿名访问的url - * - * @author gleiyu - */ -@Target(ElementType.METHOD) -@Retention(RetentionPolicy.RUNTIME) -public @interface AnonymousAccess { - -} diff --git a/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/CarpDataSourceConfig.java b/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/CarpDataSourceConfig.java index c526568d0..565a8c40b 100644 --- a/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/CarpDataSourceConfig.java +++ b/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/CarpDataSourceConfig.java @@ -45,6 +45,8 @@ public class CarpDataSourceConfig { @Autowired private MybatisPlusInterceptor mybatisPlusInterceptor; + @Autowired + private CarpMybatisConfig.CarpMetaHandler carpMetaHandler; @Primary @Bean(DataSourceConstants.DATA_SOURCE_FACTORY) @@ -65,7 +67,7 @@ public DataSourceTransactionManager carpTransactionManager() { public SqlSessionFactory carpSqlSessionFactory() throws Exception { MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean(); GlobalConfig globalConfig = GlobalConfigUtils.defaults(); - globalConfig.setMetaObjectHandler(new CarpMybatisConfig.CarpMetaHandler()); + globalConfig.setMetaObjectHandler(carpMetaHandler); MybatisPlusProperties props = new MybatisPlusProperties(); props.setMapperLocations(new String[]{DataSourceConstants.MAPPER_XML_PATH}); diff --git a/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/LogDataSourceConfig.java b/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/LogDataSourceConfig.java index 14e2e2678..d846e94d0 100644 --- a/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/LogDataSourceConfig.java +++ b/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/LogDataSourceConfig.java @@ -18,6 +18,7 @@ package cn.sliew.scaleph.api.config; +import cn.sliew.carp.framework.mybatis.config.CarpMybatisConfig; import cn.sliew.scaleph.dao.DataSourceConstants; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties; import com.baomidou.mybatisplus.core.MybatisConfiguration; @@ -45,6 +46,8 @@ public class LogDataSourceConfig { @Autowired private MybatisPlusInterceptor mybatisPlusInterceptor; + @Autowired + private CarpMybatisConfig.CarpMetaHandler carpMetaHandler; @Bean(DataSourceConstants.LOG_DATA_SOURCE_FACTORY) @ConfigurationProperties(prefix = "spring.datasource.log") @@ -62,7 +65,7 @@ public DataSourceTransactionManager logTransactionManager() { public SqlSessionFactory logSqlSessionFactory() throws Exception { MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean(); GlobalConfig globalConfig = GlobalConfigUtils.defaults(); - globalConfig.setMetaObjectHandler(new MybatisConfig.MetaHandler()); + globalConfig.setMetaObjectHandler(carpMetaHandler); MybatisPlusProperties props = new MybatisPlusProperties(); props.setMapperLocations(new String[]{DataSourceConstants.LOG_MAPPER_XML_PATH}); factoryBean.setMapperLocations(props.resolveMapperLocations()); diff --git a/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/MasterDataSourceConfig.java b/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/MasterDataSourceConfig.java index 7a91dd8dd..da39965e8 100644 --- a/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/MasterDataSourceConfig.java +++ b/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/MasterDataSourceConfig.java @@ -18,6 +18,7 @@ package cn.sliew.scaleph.api.config; +import cn.sliew.carp.framework.mybatis.config.CarpMybatisConfig; import cn.sliew.scaleph.dao.DataSourceConstants; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties; import com.baomidou.mybatisplus.core.MybatisConfiguration; @@ -46,6 +47,8 @@ public class MasterDataSourceConfig { @Autowired private MybatisPlusInterceptor mybatisPlusInterceptor; + @Autowired + private CarpMybatisConfig.CarpMetaHandler carpMetaHandler; @Primary @Bean(DataSourceConstants.MASTER_DATA_SOURCE_FACTORY) @@ -66,7 +69,7 @@ public DataSourceTransactionManager masterTransactionManager() { public SqlSessionFactory masterSqlSessionFactory() throws Exception { MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean(); GlobalConfig globalConfig = GlobalConfigUtils.defaults(); - globalConfig.setMetaObjectHandler(new MybatisConfig.MetaHandler()); + globalConfig.setMetaObjectHandler(carpMetaHandler); MybatisPlusProperties props = new MybatisPlusProperties(); props.setMapperLocations(new String[]{DataSourceConstants.MASTER_MAPPER_XML_PATH}); diff --git a/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/MybatisConfig.java b/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/MybatisConfig.java deleted file mode 100644 index df88a7c53..000000000 --- a/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/MybatisConfig.java +++ /dev/null @@ -1,68 +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 cn.sliew.scaleph.api.config; - -import java.util.Date; - -import cn.sliew.scaleph.security.util.SecurityUtil; -import com.baomidou.mybatisplus.annotation.DbType; -import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import org.apache.ibatis.reflection.MetaObject; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; - -//@Configuration -public class MybatisConfig { - - /** - * replace InsertUpdateAspect, which already deleted - */ - @Component - public static class MetaHandler implements MetaObjectHandler { - - @Override - public void insertFill(MetaObject metaObject) { - String userName = getUserNameOrDefault(); - this.strictInsertFill(metaObject, "creator", () -> userName, String.class); - this.strictInsertFill(metaObject, "createTime", () -> new Date(), Date.class); - this.strictInsertFill(metaObject, "editor", () -> userName, String.class); - this.strictInsertFill(metaObject, "updateTime", () -> new Date(), Date.class); - } - - @Override - public void updateFill(MetaObject metaObject) { - String userName = getUserNameOrDefault(); - this.strictUpdateFill(metaObject, "editor", () -> userName, String.class); - this.strictUpdateFill(metaObject, "updateTime", () -> new Date(), Date.class); - } - - private String getUserNameOrDefault() { - String userName = SecurityUtil.getCurrentUserName(); - if (StringUtils.isEmpty(userName)) { - return "sys"; - } - return userName; - } - - } -} diff --git a/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/SakuraDataSourceConfig.java b/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/SakuraDataSourceConfig.java index 3702b6e9a..92b5a938b 100644 --- a/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/SakuraDataSourceConfig.java +++ b/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/SakuraDataSourceConfig.java @@ -18,6 +18,7 @@ package cn.sliew.scaleph.api.config; +import cn.sliew.carp.framework.mybatis.config.CarpMybatisConfig; import cn.sliew.scaleph.dao.DataSourceConstants; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties; import com.baomidou.mybatisplus.core.MybatisConfiguration; @@ -45,6 +46,8 @@ public class SakuraDataSourceConfig { @Autowired private MybatisPlusInterceptor mybatisPlusInterceptor; + @Autowired + private CarpMybatisConfig.CarpMetaHandler carpMetaHandler; @Bean(DataSourceConstants.SAKURA_DATA_SOURCE_FACTORY) @ConfigurationProperties(prefix = "spring.datasource.sakura") @@ -62,7 +65,7 @@ public DataSourceTransactionManager logTransactionManager() { public SqlSessionFactory logSqlSessionFactory() throws Exception { MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean(); GlobalConfig globalConfig = GlobalConfigUtils.defaults(); - globalConfig.setMetaObjectHandler(new MybatisConfig.MetaHandler()); + globalConfig.setMetaObjectHandler(carpMetaHandler); MybatisPlusProperties props = new MybatisPlusProperties(); props.setMapperLocations(new String[]{DataSourceConstants.SAKURA_MAPPER_XML_PATH}); factoryBean.setMapperLocations(props.resolveMapperLocations()); diff --git a/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/SwaggerConfig.java b/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/SwaggerConfig.java deleted file mode 100644 index a9df2053b..000000000 --- a/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/SwaggerConfig.java +++ /dev/null @@ -1,75 +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 cn.sliew.scaleph.api.config; - -import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.info.Contact; -import io.swagger.v3.oas.models.info.Info; -import io.swagger.v3.oas.models.info.License; -import org.apache.commons.lang3.RandomUtils; -import org.springdoc.core.customizers.GlobalOpenApiCustomizer; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import java.util.Map; - -// fixme 这里要用 scaleph 自己的，不能用 carp 的 -//@Configuration -public class SwaggerConfig { - - /** - * 根据@Tag 上的排序，写入x-order - */ - @Bean - public GlobalOpenApiCustomizer orderGlobalOpenApiCustomizer() { - return openApi -> { - if (openApi.getTags() != null) { - openApi.getTags().forEach(tag -> tag.setExtensions(Map.of("x-order", RandomUtils.nextInt(0, 100)))); - } - if (openApi.getPaths() != null) { - openApi.addExtension("x-test123", "333"); - openApi.getPaths().addExtension("x-abb", RandomUtils.nextInt(1, 100)); - } - }; - } - - @Bean - public OpenAPI customOpenAPI() { - return new OpenAPI() - .info(apiInfo()); - } - - private Info apiInfo() { - return new Info() - .title("Scaleph API文档") - .description("Scaleph API文档") - .version("2.0.3-SNAPSHOT") - .termsOfService("https://flowerfine.github.io/scaleph-website/zh") - .license(new License().name("Apache 2.0").url("https://github.com/flowerfine/scaleph/blob/dev/LICENSE")) - .contact(contact()); - } - - private Contact contact() { - Contact kalencaya = new Contact(); - kalencaya.setName("kalencaya"); - kalencaya.setUrl("https://github.com/kalencaya"); - kalencaya.setEmail("1942460489@qq.com"); - return kalencaya; - } -} diff --git a/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/CommonController.java b/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/CommonController.java index 28a74d3d8..b8281eee9 100644 --- a/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/CommonController.java +++ b/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/CommonController.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.api.controller; -import cn.sliew.scaleph.api.annotation.AnonymousAccess; +import cn.sliew.carp.framework.common.security.annotations.AnonymousAccess; import cn.sliew.scaleph.api.annotation.Logging; import cn.sliew.scaleph.security.service.SecAuthenticateService; import cn.sliew.scaleph.security.service.dto.SecCaptchaDTO; diff --git a/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/admin/LogMessageController.java b/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/admin/LogMessageController.java index 46a3afc9c..488d493f7 100644 --- a/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/admin/LogMessageController.java +++ b/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/admin/LogMessageController.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.api.controller.admin; -import cn.sliew.scaleph.api.annotation.AnonymousAccess; +import cn.sliew.carp.framework.common.security.annotations.AnonymousAccess; import cn.sliew.scaleph.api.annotation.Logging; import cn.sliew.scaleph.common.constant.DictConstants; import cn.sliew.scaleph.common.enums.BoolEnum; diff --git a/scaleph-application/scaleph-application-flink/src/main/java/cn/sliew/scaleph/application/flink/service/dto/WsFlinkKubernetesJobInstanceDTO.java b/scaleph-application/scaleph-application-flink/src/main/java/cn/sliew/scaleph/application/flink/service/dto/WsFlinkKubernetesJobInstanceDTO.java index a52dc9376..899dedea1 100644 --- a/scaleph-application/scaleph-application-flink/src/main/java/cn/sliew/scaleph/application/flink/service/dto/WsFlinkKubernetesJobInstanceDTO.java +++ b/scaleph-application/scaleph-application-flink/src/main/java/cn/sliew/scaleph/application/flink/service/dto/WsFlinkKubernetesJobInstanceDTO.java @@ -18,13 +18,13 @@ package cn.sliew.scaleph.application.flink.service.dto; -import cn.sliew.scaleph.common.dict.flink.FlinkJobState; -import cn.sliew.scaleph.common.dict.flink.kubernetes.ResourceLifecycleState; -import cn.sliew.scaleph.common.dict.flink.kubernetes.UpgradeMode; -import cn.sliew.scaleph.dao.entity.BaseDO; import cn.sliew.scaleph.application.flink.operator.spec.JobManagerSpec; import cn.sliew.scaleph.application.flink.operator.spec.TaskManagerSpec; import cn.sliew.scaleph.application.flink.operator.status.TaskManagerInfo; +import cn.sliew.scaleph.common.dict.flink.FlinkJobState; +import cn.sliew.scaleph.common.dict.flink.kubernetes.ResourceLifecycleState; +import cn.sliew.scaleph.common.dict.flink.kubernetes.UpgradeMode; +import cn.sliew.scaleph.system.model.BaseDTO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -38,7 +38,7 @@ */ @Data @Schema(name = "WsFlinkKubernetesJobInstance对象", description = "flink kubernetes job instance") -public class WsFlinkKubernetesJobInstanceDTO extends BaseDO { +public class WsFlinkKubernetesJobInstanceDTO extends BaseDTO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/pom.xml b/scaleph-dao/pom.xml index 62d3c458d..64adde224 100644 --- a/scaleph-dao/pom.xml +++ b/scaleph-dao/pom.xml @@ -34,22 +34,8 @@ - org.mybatis - mybatis-spring - - - com.baomidou - mybatis-plus-boot-starter - - - - com.zaxxer - HikariCP - - - - com.mysql - mysql-connector-j + cn.sliew + carp-framework-mybatis diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/BaseDO.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/BaseDO.java deleted file mode 100644 index 9585bdc54..000000000 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/BaseDO.java +++ /dev/null @@ -1,61 +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 cn.sliew.scaleph.dao.entity; - -import java.io.Serializable; -import java.util.Date; - -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; - -/** - * @author gleiyu - */ -@Data -public class BaseDO implements Serializable { - - private static final long serialVersionUID = -3170630380110141492L; - - @TableId(value = "id", type = IdType.AUTO) - private Long id; - /** - * 创建人 - */ - @TableField(value = "creator", fill = FieldFill.INSERT) - private String creator; - /** - * 创建时间 - */ - @TableField(value = "create_time", fill = FieldFill.INSERT) - private Date createTime; - /** - * 修改人 - */ - @TableField(value = "editor", fill = FieldFill.INSERT_UPDATE) - private String editor; - /** - * 修改时间 - */ - @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) - private Date updateTime; - -} diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/log/LogAction.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/log/LogAction.java index 23912db8a..f2cf07a7f 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/log/LogAction.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/log/LogAction.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.log; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -35,7 +35,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("log_action") -public class LogAction extends BaseDO { +public class LogAction extends BaseAuditDO { private static final long serialVersionUID = 5083227320169178703L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/log/LogLogin.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/log/LogLogin.java index bc02fd69a..7bd8676a7 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/log/LogLogin.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/log/LogLogin.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.log; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -35,7 +35,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("log_login") -public class LogLogin extends BaseDO { +public class LogLogin extends BaseAuditDO { private static final long serialVersionUID = 314489698181828833L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/log/LogMessage.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/log/LogMessage.java index ac7f3498d..b1f770019 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/log/LogMessage.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/log/LogMessage.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.log; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -33,7 +33,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("log_message") -public class LogMessage extends BaseDO { +public class LogMessage extends BaseAuditDO { private static final long serialVersionUID = 1569135129606430763L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/log/LogSchedule.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/log/LogSchedule.java index e57dded88..c851b8ebb 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/log/LogSchedule.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/log/LogSchedule.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.log; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -36,7 +36,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("log_schedule") -public class LogSchedule extends BaseDO { +public class LogSchedule extends BaseAuditDO { private static final long serialVersionUID = -2239522121730705579L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/dataservice/DataserviceConfig.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/dataservice/DataserviceConfig.java index d5ffa69a4..12a166d20 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/dataservice/DataserviceConfig.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/dataservice/DataserviceConfig.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.dataservice; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -30,7 +30,7 @@ */ @Data @TableName("dataservice_config") -public class DataserviceConfig extends BaseDO { +public class DataserviceConfig extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/dataservice/DataserviceParameterMap.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/dataservice/DataserviceParameterMap.java index 43f797155..d361a157c 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/dataservice/DataserviceParameterMap.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/dataservice/DataserviceParameterMap.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.dataservice; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -32,7 +32,7 @@ */ @Data @TableName("dataservice_parameter_map") -public class DataserviceParameterMap extends BaseDO { +public class DataserviceParameterMap extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/dataservice/DataserviceParameterMapping.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/dataservice/DataserviceParameterMapping.java index 1df3ee663..4186c7f1c 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/dataservice/DataserviceParameterMapping.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/dataservice/DataserviceParameterMapping.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.dataservice; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; @@ -32,7 +32,7 @@ @Data @TableName("dataservice_parameter_mapping") @Schema(name = "DataserviceParameterMapping对象", description = "数据服务 请求参数映射") -public class DataserviceParameterMapping extends BaseDO { +public class DataserviceParameterMapping extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/dataservice/DataserviceResultMap.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/dataservice/DataserviceResultMap.java index 12ce7d4aa..848a76714 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/dataservice/DataserviceResultMap.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/dataservice/DataserviceResultMap.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.dataservice; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -32,7 +32,7 @@ */ @Data @TableName("dataservice_result_map") -public class DataserviceResultMap extends BaseDO { +public class DataserviceResultMap extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/dataservice/DataserviceResultMapping.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/dataservice/DataserviceResultMapping.java index 538407b0a..afb005b00 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/dataservice/DataserviceResultMapping.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/dataservice/DataserviceResultMapping.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.dataservice; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; @@ -32,7 +32,7 @@ @Data @TableName("dataservice_result_mapping") @Schema(name = "DataserviceResultMapping对象", description = "数据服务 返回结果映射") -public class DataserviceResultMapping extends BaseDO { +public class DataserviceResultMapping extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaDataElement.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaDataElement.java index 1fe1d053e..04f28d8d1 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaDataElement.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaDataElement.java @@ -18,9 +18,9 @@ package cn.sliew.scaleph.dao.entity.master.meta; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.common.YesOrNo; import cn.sliew.scaleph.common.dict.job.DataType; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -37,7 +37,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName(value = "meta_data_element", resultMap = "MetaDataElementMap") -public class MetaDataElement extends BaseDO { +public class MetaDataElement extends BaseAuditDO { private static final long serialVersionUID = -4396296342497985370L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaDataMap.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaDataMap.java index 9689d5d6c..84e2f6c4b 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaDataMap.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaDataMap.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.meta; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -35,7 +35,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("meta_data_map") -public class MetaDataMap extends BaseDO { +public class MetaDataMap extends BaseAuditDO { private static final long serialVersionUID = 1413344387211239856L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaDataSet.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaDataSet.java index ac0688c4d..a95e08f92 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaDataSet.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaDataSet.java @@ -18,8 +18,8 @@ package cn.sliew.scaleph.dao.entity.master.meta; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.common.YesOrNo; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -36,7 +36,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName(value = "meta_data_set", resultMap = "MetaDataSetMap") -public class MetaDataSet extends BaseDO { +public class MetaDataSet extends BaseAuditDO { private static final long serialVersionUID = -583630679647470414L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaDataSetType.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaDataSetType.java index e3126e9a7..2a7611ce0 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaDataSetType.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaDataSetType.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.meta; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -34,7 +34,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("meta_data_set_type") -public class MetaDataSetType extends BaseDO { +public class MetaDataSetType extends BaseAuditDO { private static final long serialVersionUID = 5820268887218510474L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaDatasource.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaDatasource.java index 006484a83..6b562498d 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaDatasource.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaDatasource.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.meta; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -29,7 +29,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("meta_datasource") -public class MetaDatasource extends BaseDO { +public class MetaDatasource extends BaseAuditDO { private static final long serialVersionUID = 6434784666593575818L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaSystem.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaSystem.java index d876ec79e..2129c5adc 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaSystem.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/meta/MetaSystem.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.meta; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -34,7 +34,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("meta_system") -public class MetaSystem extends BaseDO { +public class MetaSystem extends BaseAuditDO { private static final long serialVersionUID = -6440397331809516542L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/oam/OamComponentDefinition.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/oam/OamComponentDefinition.java index ca2deca94..833d6328b 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/oam/OamComponentDefinition.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/oam/OamComponentDefinition.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.oam; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -28,7 +28,7 @@ */ @Data @TableName("oam_component_definition") -public class OamComponentDefinition extends BaseDO { +public class OamComponentDefinition extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/oam/OamPolicyDefinition.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/oam/OamPolicyDefinition.java index c67d86b25..0a6738194 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/oam/OamPolicyDefinition.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/oam/OamPolicyDefinition.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.oam; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -28,7 +28,7 @@ */ @Data @TableName("oam_policy_definition") -public class OamPolicyDefinition extends BaseDO { +public class OamPolicyDefinition extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/oam/OamTraitDefinition.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/oam/OamTraitDefinition.java index bf0c64d73..3b30b8be9 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/oam/OamTraitDefinition.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/oam/OamTraitDefinition.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.oam; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -28,7 +28,7 @@ */ @Data @TableName("oam_trait_definition") -public class OamTraitDefinition extends BaseDO { +public class OamTraitDefinition extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/oam/OamWorkloadDefinition.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/oam/OamWorkloadDefinition.java index 14dcb4f79..d0eab57e6 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/oam/OamWorkloadDefinition.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/oam/OamWorkloadDefinition.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.oam; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -28,7 +28,7 @@ */ @Data @TableName("oam_workload_definition") -public class OamWorkloadDefinition extends BaseDO { +public class OamWorkloadDefinition extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceClusterCredential.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceClusterCredential.java index 3ae7ec1ca..c00200020 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceClusterCredential.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceClusterCredential.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.resource; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -32,7 +32,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("resource_cluster_credential") -public class ResourceClusterCredential extends BaseDO { +public class ResourceClusterCredential extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceFlinkRelease.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceFlinkRelease.java index cd98fd9f2..3e288d121 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceFlinkRelease.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceFlinkRelease.java @@ -18,8 +18,8 @@ package cn.sliew.scaleph.dao.entity.master.resource; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.flink.FlinkVersion; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -33,7 +33,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("resource_flink_release") -public class ResourceFlinkRelease extends BaseDO { +public class ResourceFlinkRelease extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceJar.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceJar.java index efb540509..76ee025c5 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceJar.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceJar.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.resource; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -32,7 +32,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("resource_jar") -public class ResourceJar extends BaseDO { +public class ResourceJar extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceKerberos.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceKerberos.java index e50310eb2..555bdb3fb 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceKerberos.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceKerberos.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.resource; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -32,7 +32,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("resource_kerberos") -public class ResourceKerberos extends BaseDO { +public class ResourceKerberos extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceSeaTunnelRelease.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceSeaTunnelRelease.java index b21e3e302..08d9852b5 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceSeaTunnelRelease.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/resource/ResourceSeaTunnelRelease.java @@ -18,8 +18,8 @@ package cn.sliew.scaleph.dao.entity.master.resource; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.seatunnel.SeaTunnelVersion; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -33,7 +33,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("resource_seatunnel_release") -public class ResourceSeaTunnelRelease extends BaseDO { +public class ResourceSeaTunnelRelease extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecDept.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecDept.java index 83bc0aad6..028bebb9e 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecDept.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecDept.java @@ -18,8 +18,8 @@ package cn.sliew.scaleph.dao.entity.master.security; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.security.DeptStatus; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -34,7 +34,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("sec_dept") -public class SecDept extends BaseDO { +public class SecDept extends BaseAuditDO { private static final long serialVersionUID = -6268620152048177679L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecDeptRole.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecDeptRole.java index f4f9a1aae..bebf4e5bb 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecDeptRole.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecDeptRole.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.security; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -33,7 +33,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("sec_dept_role") -public class SecDeptRole extends BaseDO { +public class SecDeptRole extends BaseAuditDO { private static final long serialVersionUID = -2427411241694222941L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecPrivilege.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecPrivilege.java index 82b487c0e..ceb2735f7 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecPrivilege.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecPrivilege.java @@ -18,8 +18,8 @@ package cn.sliew.scaleph.dao.entity.master.security; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.security.ResourceType; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -34,7 +34,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("sec_privilege") -public class SecPrivilege extends BaseDO { +public class SecPrivilege extends BaseAuditDO { private static final long serialVersionUID = 4366151466958631600L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecResourceWeb.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecResourceWeb.java index becf8f557..1c8e6a1ef 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecResourceWeb.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecResourceWeb.java @@ -18,8 +18,8 @@ package cn.sliew.scaleph.dao.entity.master.security; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.security.ResourceType; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -29,7 +29,7 @@ */ @Data @TableName("sec_resource_web") -public class SecResourceWeb extends BaseDO { +public class SecResourceWeb extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecResourceWebRole.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecResourceWebRole.java index 9e6a21b69..b5500e954 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecResourceWebRole.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecResourceWebRole.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.security; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -28,7 +28,7 @@ */ @Data @TableName("sec_resource_web_role") -public class SecResourceWebRole extends BaseDO { +public class SecResourceWebRole extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecRole.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecRole.java index c24ee3950..84c9503cc 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecRole.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecRole.java @@ -18,9 +18,9 @@ package cn.sliew.scaleph.dao.entity.master.security; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.security.RoleStatus; import cn.sliew.scaleph.common.dict.security.RoleType; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -38,7 +38,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName(value = "sec_role", resultMap = "SecRoleMap") -public class SecRole extends BaseDO { +public class SecRole extends BaseAuditDO { private static final long serialVersionUID = 2621684597930016649L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecRolePrivilege.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecRolePrivilege.java index 685ceb5ff..72cb45130 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecRolePrivilege.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecRolePrivilege.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.security; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -33,7 +33,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("sec_role_privilege") -public class SecRolePrivilege extends BaseDO { +public class SecRolePrivilege extends BaseAuditDO { private static final long serialVersionUID = -6673277143149726404L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecUser.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecUser.java index 4bde1aa7a..5962139ab 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecUser.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecUser.java @@ -18,10 +18,10 @@ package cn.sliew.scaleph.dao.entity.master.security; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.common.Gender; import cn.sliew.scaleph.common.dict.security.UserStatus; import cn.sliew.scaleph.common.dict.security.UserType; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -37,7 +37,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("sec_user") -public class SecUser extends BaseDO { +public class SecUser extends BaseAuditDO { private static final long serialVersionUID = 2955806429097700570L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecUserActive.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecUserActive.java index 170895591..ce82724a9 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecUserActive.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecUserActive.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.security; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -36,7 +36,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("sec_user_active") -public class SecUserActive extends BaseDO { +public class SecUserActive extends BaseAuditDO { private static final long serialVersionUID = 2629509779716126101L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecUserDept.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecUserDept.java index 36eed4a0a..260fa8f67 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecUserDept.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecUserDept.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.security; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -33,7 +33,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("sec_user_dept") -public class SecUserDept extends BaseDO { +public class SecUserDept extends BaseAuditDO { private static final long serialVersionUID = 8015344228302783975L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecUserRole.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecUserRole.java index dd72be96a..e7d79a5c0 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecUserRole.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecUserRole.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.security; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -33,7 +33,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("sec_user_role") -public class SecUserRole extends BaseDO { +public class SecUserRole extends BaseAuditDO { private static final long serialVersionUID = 8752486397778737688L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/snowflake/SnowflakeWorkerNode.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/snowflake/SnowflakeWorkerNode.java index d90b80c21..b7920a702 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/snowflake/SnowflakeWorkerNode.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/snowflake/SnowflakeWorkerNode.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.snowflake; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -29,7 +29,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("snowflake_worker_node") -public class SnowflakeWorkerNode extends BaseDO { +public class SnowflakeWorkerNode extends BaseAuditDO { @TableField("host_name") private String hostName; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/system/SysConfig.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/system/SysConfig.java index 2feccafa1..b9e263f96 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/system/SysConfig.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/system/SysConfig.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.system; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -34,7 +34,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("sys_config") -public class SysConfig extends BaseDO { +public class SysConfig extends BaseAuditDO { private static final long serialVersionUID = -5437539010004884444L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/workflow/WorkflowDefinition.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/workflow/WorkflowDefinition.java index ec8744e58..6b61439a4 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/workflow/WorkflowDefinition.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/workflow/WorkflowDefinition.java @@ -18,16 +18,16 @@ package cn.sliew.scaleph.dao.entity.master.workflow; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.workflow.WorkflowExecuteType; import cn.sliew.scaleph.common.dict.workflow.WorkflowType; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data @TableName("workflow_definition") -public class WorkflowDefinition extends BaseDO { +public class WorkflowDefinition extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/workflow/WorkflowDefinitionVO.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/workflow/WorkflowDefinitionVO.java index 5490b5c32..34d95a738 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/workflow/WorkflowDefinitionVO.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/workflow/WorkflowDefinitionVO.java @@ -18,16 +18,16 @@ package cn.sliew.scaleph.dao.entity.master.workflow; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.workflow.WorkflowExecuteType; import cn.sliew.scaleph.common.dict.workflow.WorkflowType; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data @TableName("workflow_definition") -public class WorkflowDefinitionVO extends BaseDO { +public class WorkflowDefinitionVO extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/workflow/WorkflowSchedule.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/workflow/WorkflowSchedule.java index dd2bbb904..301ce9b13 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/workflow/WorkflowSchedule.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/workflow/WorkflowSchedule.java @@ -18,8 +18,8 @@ package cn.sliew.scaleph.dao.entity.master.workflow; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.workflow.ScheduleStatus; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -28,7 +28,7 @@ @Data @TableName("workflow_schedule") -public class WorkflowSchedule extends BaseDO { +public class WorkflowSchedule extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifact.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifact.java index d5795da78..1fab60603 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifact.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifact.java @@ -18,8 +18,8 @@ package cn.sliew.scaleph.dao.entity.master.ws; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.flink.FlinkJobType; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -31,7 +31,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("ws_artifact") -public class WsArtifact extends BaseDO { +public class WsArtifact extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifactFlinkCDC.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifactFlinkCDC.java index c6acd51cf..c64840e12 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifactFlinkCDC.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifactFlinkCDC.java @@ -18,10 +18,10 @@ package cn.sliew.scaleph.dao.entity.master.ws; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.common.YesOrNo; import cn.sliew.scaleph.common.dict.flink.FlinkVersion; import cn.sliew.scaleph.common.dict.flink.cdc.FlinkCDCVersion; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -31,7 +31,7 @@ */ @Data @TableName("ws_artifact_flink_cdc") -public class WsArtifactFlinkCDC extends BaseDO { +public class WsArtifactFlinkCDC extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifactFlinkJar.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifactFlinkJar.java index 9d5475bdb..e46c7220a 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifactFlinkJar.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifactFlinkJar.java @@ -18,9 +18,9 @@ package cn.sliew.scaleph.dao.entity.master.ws; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.common.YesOrNo; import cn.sliew.scaleph.common.dict.flink.FlinkVersion; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -32,7 +32,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("ws_artifact_flink_jar") -public class WsArtifactFlinkJar extends BaseDO { +public class WsArtifactFlinkJar extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifactFlinkSql.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifactFlinkSql.java index f75386e06..c21515356 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifactFlinkSql.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifactFlinkSql.java @@ -18,9 +18,9 @@ package cn.sliew.scaleph.dao.entity.master.ws; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.common.YesOrNo; import cn.sliew.scaleph.common.dict.flink.FlinkVersion; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -30,7 +30,7 @@ */ @Data @TableName("ws_artifact_flink_sql") -public class WsArtifactFlinkSql extends BaseDO { +public class WsArtifactFlinkSql extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifactSeaTunnel.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifactSeaTunnel.java index 3207b79b5..741252d04 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifactSeaTunnel.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifactSeaTunnel.java @@ -18,11 +18,11 @@ package cn.sliew.scaleph.dao.entity.master.ws; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.common.YesOrNo; import cn.sliew.scaleph.common.dict.flink.FlinkVersion; import cn.sliew.scaleph.common.dict.seatunnel.SeaTunnelEngineType; import cn.sliew.scaleph.common.dict.seatunnel.SeaTunnelVersion; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; @@ -34,7 +34,7 @@ @Data @TableName("ws_artifact_seatunnel") @Schema(name = "WsArtifactSeaTunnel", description = "artifact seatunnel") -public class WsArtifactSeaTunnel extends BaseDO { +public class WsArtifactSeaTunnel extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisOperatorInstance.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisOperatorInstance.java index 98de4043d..50f38bab5 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisOperatorInstance.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisOperatorInstance.java @@ -18,8 +18,8 @@ package cn.sliew.scaleph.dao.entity.master.ws; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.common.YesOrNo; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; @@ -30,7 +30,7 @@ */ @Data @TableName("ws_doris_operator_instance") -public class WsDorisOperatorInstance extends BaseDO { +public class WsDorisOperatorInstance extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisOperatorTemplate.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisOperatorTemplate.java index c94b53e09..76033316b 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisOperatorTemplate.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisOperatorTemplate.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.ws; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -28,7 +28,7 @@ */ @Data @TableName("ws_doris_operator_template") -public class WsDorisOperatorTemplate extends BaseDO { +public class WsDorisOperatorTemplate extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkCheckpoint.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkCheckpoint.java index bfb055d66..161fc28b4 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkCheckpoint.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkCheckpoint.java @@ -18,9 +18,9 @@ package cn.sliew.scaleph.dao.entity.master.ws; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.flink.FlinkCheckpointStatus; import cn.sliew.scaleph.common.dict.flink.FlinkCheckpointType; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -34,7 +34,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("ws_flink_checkpoint") -public class WsFlinkCheckpoint extends BaseDO { +public class WsFlinkCheckpoint extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesDeployment.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesDeployment.java index fb61243c3..d6a59fe2b 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesDeployment.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesDeployment.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.ws; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -32,7 +32,7 @@ @Data @EqualsAndHashCode @TableName("ws_flink_kubernetes_deployment") -public class WsFlinkKubernetesDeployment extends BaseDO { +public class WsFlinkKubernetesDeployment extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesJob.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesJob.java index 3e4cc9e57..c1ca720d0 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesJob.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesJob.java @@ -18,10 +18,10 @@ package cn.sliew.scaleph.dao.entity.master.ws; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.flink.FlinkJobType; import cn.sliew.scaleph.common.dict.flink.FlinkRuntimeExecutionMode; import cn.sliew.scaleph.common.dict.flink.kubernetes.DeploymentKind; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -31,7 +31,7 @@ */ @Data @TableName("ws_flink_kubernetes_job") -public class WsFlinkKubernetesJob extends BaseDO { +public class WsFlinkKubernetesJob extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesJobInstance.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesJobInstance.java index 57c0a0eac..42ab6e40c 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesJobInstance.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesJobInstance.java @@ -18,10 +18,10 @@ package cn.sliew.scaleph.dao.entity.master.ws; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.flink.FlinkJobState; import cn.sliew.scaleph.common.dict.flink.kubernetes.ResourceLifecycleState; import cn.sliew.scaleph.common.dict.flink.kubernetes.UpgradeMode; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; @@ -36,7 +36,7 @@ */ @Data @TableName("ws_flink_kubernetes_job_instance") -public class WsFlinkKubernetesJobInstance extends BaseDO { +public class WsFlinkKubernetesJobInstance extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesJobInstanceSavepoint.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesJobInstanceSavepoint.java index f8cb24477..e73c8916e 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesJobInstanceSavepoint.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesJobInstanceSavepoint.java @@ -18,9 +18,9 @@ package cn.sliew.scaleph.dao.entity.master.ws; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.flink.kubernetes.SavepointFormatType; import cn.sliew.scaleph.common.dict.flink.kubernetes.SavepointTriggerType; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -30,7 +30,7 @@ */ @Data @TableName("ws_flink_kubernetes_job_instance_savepoint") -public class WsFlinkKubernetesJobInstanceSavepoint extends BaseDO { +public class WsFlinkKubernetesJobInstanceSavepoint extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesSessionCluster.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesSessionCluster.java index 20b7745dc..af35e969b 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesSessionCluster.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesSessionCluster.java @@ -18,9 +18,9 @@ package cn.sliew.scaleph.dao.entity.master.ws; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.common.YesOrNo; import cn.sliew.scaleph.common.dict.flink.kubernetes.ResourceLifecycleState; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; @@ -35,7 +35,7 @@ @Data @EqualsAndHashCode @TableName("ws_flink_kubernetes_session_cluster") -public class WsFlinkKubernetesSessionCluster extends BaseDO { +public class WsFlinkKubernetesSessionCluster extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesTemplate.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesTemplate.java index 21e925083..b640b5c77 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesTemplate.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkKubernetesTemplate.java @@ -18,8 +18,8 @@ package cn.sliew.scaleph.dao.entity.master.ws; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.flink.kubernetes.DeploymentKind; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -33,7 +33,7 @@ @Data @EqualsAndHashCode @TableName("ws_flink_kubernetes_template") -public class WsFlinkKubernetesTemplate extends BaseDO { +public class WsFlinkKubernetesTemplate extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkSqlGatewayCatalog.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkSqlGatewayCatalog.java index 66c8bf542..45dfe0581 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkSqlGatewayCatalog.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkSqlGatewayCatalog.java @@ -16,7 +16,7 @@ package cn.sliew.scaleph.dao.entity.master.ws; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Builder; @@ -25,7 +25,7 @@ @Data @Builder @TableName("ws_flink_sql_gateway_catalog") -public class WsFlinkSqlGatewayCatalog extends BaseDO { +public class WsFlinkSqlGatewayCatalog extends BaseAuditDO { @TableField("session_handler") private String sessionHandler; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkSqlGatewayOperation.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkSqlGatewayOperation.java index 1a314819a..84b6df8fa 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkSqlGatewayOperation.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkSqlGatewayOperation.java @@ -18,8 +18,8 @@ package cn.sliew.scaleph.dao.entity.master.ws; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import cn.sliew.scaleph.common.dict.common.YesOrNo; -import cn.sliew.scaleph.dao.entity.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -31,7 +31,7 @@ */ @Data @TableName("ws_flink_sql_gateway_operation") -public class WsFlinkSqlGatewayOperation extends BaseDO { +public class WsFlinkSqlGatewayOperation extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkSqlGatewaySession.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkSqlGatewaySession.java index 62955b92b..835e50e17 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkSqlGatewaySession.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsFlinkSqlGatewaySession.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.ws; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -30,7 +30,7 @@ */ @Data @TableName("ws_flink_sql_gateway_session") -public class WsFlinkSqlGatewaySession extends BaseDO { +public class WsFlinkSqlGatewaySession extends BaseAuditDO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsProject.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsProject.java index 24a56a4b3..51843fdde 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsProject.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsProject.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dao.entity.master.ws; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.carp.framework.mybatis.entity.BaseAuditDO; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -34,7 +34,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("ws_project") -public class WsProject extends BaseDO { +public class WsProject extends BaseAuditDO { private static final long serialVersionUID = 6755304433208751192L; diff --git a/scaleph-dataservice/src/main/java/cn/sliew/scaleph/dataservice/service/dto/DataserviceParameterMappingDTO.java b/scaleph-dataservice/src/main/java/cn/sliew/scaleph/dataservice/service/dto/DataserviceParameterMappingDTO.java index c6f8f0cb1..aa017dc73 100644 --- a/scaleph-dataservice/src/main/java/cn/sliew/scaleph/dataservice/service/dto/DataserviceParameterMappingDTO.java +++ b/scaleph-dataservice/src/main/java/cn/sliew/scaleph/dataservice/service/dto/DataserviceParameterMappingDTO.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dataservice.service.dto; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.scaleph.system.model.BaseDTO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -29,7 +29,7 @@ */ @Data @Schema(name = "DataserviceParameterMapping对象", description = "数据服务 请求参数映射") -public class DataserviceParameterMappingDTO extends BaseDO { +public class DataserviceParameterMappingDTO extends BaseDTO { private static final long serialVersionUID = 1L; diff --git a/scaleph-dataservice/src/main/java/cn/sliew/scaleph/dataservice/service/dto/DataserviceResultMappingDTO.java b/scaleph-dataservice/src/main/java/cn/sliew/scaleph/dataservice/service/dto/DataserviceResultMappingDTO.java index f94f7be31..a7354f5ee 100644 --- a/scaleph-dataservice/src/main/java/cn/sliew/scaleph/dataservice/service/dto/DataserviceResultMappingDTO.java +++ b/scaleph-dataservice/src/main/java/cn/sliew/scaleph/dataservice/service/dto/DataserviceResultMappingDTO.java @@ -18,7 +18,7 @@ package cn.sliew.scaleph.dataservice.service.dto; -import cn.sliew.scaleph.dao.entity.BaseDO; +import cn.sliew.scaleph.system.model.BaseDTO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -29,7 +29,7 @@ */ @Data @Schema(name = "DataserviceResultMapping对象", description = "数据服务 返回结果映射") -public class DataserviceResultMappingDTO extends BaseDO { +public class DataserviceResultMappingDTO extends BaseDTO { private static final long serialVersionUID = 1L; diff --git a/scaleph-datasource/pom.xml b/scaleph-datasource/pom.xml index dec5f71c6..15e0c3f9d 100644 --- a/scaleph-datasource/pom.xml +++ b/scaleph-datasource/pom.xml @@ -41,17 +41,6 @@ cn.sliew carp-module-datasource - - - com.datastrato.gravitino - client-java-runtime - - - - com.datastrato.gravitino - client-java - - \ No newline at end of file diff --git a/scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/gravitino/GravitinoConfig.java b/scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/gravitino/GravitinoConfig.java deleted file mode 100644 index 90da3c7bd..000000000 --- a/scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/gravitino/GravitinoConfig.java +++ /dev/null @@ -1,51 +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 cn.sliew.scaleph.ds.gravitino; - -import cn.sliew.scaleph.common.util.NetUtils; -import com.datastrato.gravitino.client.GravitinoAdminClient; -import com.datastrato.gravitino.client.GravitinoClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -@EnableConfigurationProperties(GravitinoProperties.class) -public class GravitinoConfig { - - @Autowired - private GravitinoProperties properties; - - @Bean - public GravitinoAdminClient gravitinoAdminClient() { - return GravitinoAdminClient.builder(NetUtils.replaceLocalhost(properties.getUrl())) - .withSimpleAuth() - .build(); - } - - /** - * fixme 必须添加 metalakeName - */ - public GravitinoClient gravitinoClient() { - return GravitinoClient.builder(NetUtils.replaceLocalhost(properties.getUrl())) - .withSimpleAuth() - .build(); - } -} diff --git a/scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/gravitino/GravitinoInitializer.java b/scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/gravitino/GravitinoInitializer.java deleted file mode 100644 index d8754c445..000000000 --- a/scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/gravitino/GravitinoInitializer.java +++ /dev/null @@ -1,118 +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 - *nch - * 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 cn.sliew.scaleph.ds.gravitino; - -import cn.sliew.carp.framework.common.dict.datasource.DataSourceType; -import cn.sliew.carp.module.datasource.modal.DataSourceInfo; -import cn.sliew.carp.module.datasource.modal.jdbc.MySQLDataSourceProperties; -import cn.sliew.carp.module.datasource.service.CarpDsInfoService; -import cn.sliew.carp.module.datasource.service.dto.DsInfoDTO; -import cn.sliew.milky.common.util.JacksonUtil; -import com.datastrato.gravitino.Catalog; -import com.datastrato.gravitino.NameIdentifier; -import com.datastrato.gravitino.client.GravitinoAdminClient; -import com.datastrato.gravitino.client.GravitinoMetalake; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@Component -public class GravitinoInitializer implements InitializingBean { - - @Autowired - private GravitinoProperties properties; - @Autowired - private GravitinoAdminClient adminClient; - @Autowired - private CarpDsInfoService dsInfoService; - - @Override - public void afterPropertiesSet() throws Exception { - initialize(); - } - - private void initialize() { - NameIdentifier nameIdentifier = NameIdentifier.ofMetalake(properties.getMetalake()); - - // 初始化 metalake - initMetalake(nameIdentifier); - // 初始化 catalog - initDataSource(properties.getMetalake(), DataSourceType.MYSQL); - initDataSource(properties.getMetalake(), DataSourceType.POSTGRESQL); - initDataSource(properties.getMetalake(), DataSourceType.HIVE); - initDataSource(properties.getMetalake(), DataSourceType.ICEBERG); - initDataSource(properties.getMetalake(), DataSourceType.DORIS); - initDataSource(properties.getMetalake(), DataSourceType.KAFKA); - initDataSource(properties.getMetalake(), DataSourceType.HDFS); - } - - private void initMetalake(NameIdentifier nameIdentifier) { - if (adminClient.metalakeExists(nameIdentifier) == false) { - adminClient.createMetalake(nameIdentifier, "scaleph created", Collections.emptyMap()); - } - } - - private void initDataSource(String metalakeName, DataSourceType type) { - List dsInfoDTOS = dsInfoService.listByType(type); - for (DsInfoDTO dsInfoDTO : dsInfoDTOS) { - doInitDataSource(metalakeName, type, dsInfoDTO); - } - } - - private void doInitDataSource(String metalakeName, DataSourceType type, DsInfoDTO dsInfoDTO) { - GravitinoMetalake metalake = adminClient.loadMetalake(NameIdentifier.ofMetalake(metalakeName)); - NameIdentifier catalogName = NameIdentifier.ofCatalog(metalakeName, dsInfoDTO.getName()); - if (metalake.catalogExists(catalogName) == false) { - switch (type) { - case MYSQL: - initMySQL(metalake, catalogName, dsInfoDTO); - break; - case POSTGRESQL: - break; - case HIVE: - break; - case ICEBERG: - break; - case DORIS: - break; - case KAFKA: - break; - case HDFS: - break; - default: - } - } - } - - private void initMySQL(GravitinoMetalake metalake, NameIdentifier catalogName, DsInfoDTO dsInfoDTO) { - DataSourceInfo dataSourceInfo = JacksonUtil.toObject(JacksonUtil.toJsonNode(dsInfoDTO), DataSourceInfo.class); - MySQLDataSourceProperties props = (MySQLDataSourceProperties) dataSourceInfo.getProps(); - Map properties = new HashMap<>(); - properties.put("jdbc-driver", props.getDriverClassName()); - properties.put("jdbc-url", props.getUrl()); - properties.put("jdbc-user", props.getUser()); - properties.put("jdbc-password", props.getPassword()); - metalake.createCatalog(catalogName, Catalog.Type.RELATIONAL, "jdbc-mysql", dataSourceInfo.getRemark(), properties); - } -} diff --git a/scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/gravitino/GravitinoProperties.java b/scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/gravitino/GravitinoProperties.java deleted file mode 100644 index 3b7010831..000000000 --- a/scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/gravitino/GravitinoProperties.java +++ /dev/null @@ -1,33 +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 cn.sliew.scaleph.ds.gravitino; - -import lombok.Getter; -import lombok.Setter; -import org.springframework.boot.context.properties.ConfigurationProperties; - -@Getter -@Setter -@ConfigurationProperties(prefix = "gravitino") -public class GravitinoProperties { - - private String url; - private String metalake; - private String user; -} diff --git a/scaleph-support/pom.xml b/scaleph-support/pom.xml index 37d689640..c7fea9751 100644 --- a/scaleph-support/pom.xml +++ b/scaleph-support/pom.xml @@ -36,7 +36,6 @@ scaleph-cache scaleph-log scaleph-system - scaleph-generator scaleph-dag scaleph-queue diff --git a/scaleph-support/scaleph-generator/pom.xml b/scaleph-support/scaleph-generator/pom.xml deleted file mode 100644 index f733772a6..000000000 --- a/scaleph-support/scaleph-generator/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - 4.0.0 - - cn.sliew - scaleph-support - 2.0.6-SNAPSHOT - ../pom.xml - - scaleph-generator - - - - ${project.parent.groupId} - scaleph-dao - - - - com.baomidou - mybatis-plus-generator - - - org.apache.velocity - velocity-engine-core - - - - - ${project.artifactId} - - - ${basedir}/src/main/resources - - custom-entity.java.vm - - true - - - - \ No newline at end of file diff --git a/scaleph-support/scaleph-generator/src/main/java/cn/sliew/scaleph/generator/MybatisPlusGenerator.java b/scaleph-support/scaleph-generator/src/main/java/cn/sliew/scaleph/generator/MybatisPlusGenerator.java deleted file mode 100644 index 8899e9ec0..000000000 --- a/scaleph-support/scaleph-generator/src/main/java/cn/sliew/scaleph/generator/MybatisPlusGenerator.java +++ /dev/null @@ -1,178 +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 cn.sliew.scaleph.generator; - -import cn.sliew.scaleph.dao.entity.BaseDO; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.generator.FastAutoGenerator; -import com.baomidou.mybatisplus.generator.config.*; -import com.baomidou.mybatisplus.generator.config.builder.Controller; -import com.baomidou.mybatisplus.generator.config.builder.Entity; -import com.baomidou.mybatisplus.generator.config.builder.Mapper; -import com.baomidou.mybatisplus.generator.config.builder.Service; -import com.baomidou.mybatisplus.generator.config.converts.MySqlTypeConvert; -import com.baomidou.mybatisplus.generator.config.querys.MySqlQuery; -import com.baomidou.mybatisplus.generator.config.rules.DateType; -import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; -import com.baomidou.mybatisplus.generator.fill.Column; -import com.baomidou.mybatisplus.generator.fill.Property; -import com.baomidou.mybatisplus.generator.keywords.MySqlKeyWordsHandler; -import lombok.extern.slf4j.Slf4j; - -/** - * https://baomidou.com/pages/981406/#controller-%E7%AD%96%E7%95%A5%E9%85%8D%E7%BD%AE - */ -@Slf4j -public class MybatisPlusGenerator { - - private final static String AUTHOR = "wangqi"; - private final static String URL = "jdbc:mysql://127.0.0.1:3306/carp"; - private final static String USERNAME = "root"; - private final static String PASSWORD = "123456"; //NOSONAR - private static final String BASE_PACKAGE = "cn.sliew"; - private static final String MODULE = "scaleph"; - private static final String TABLE_PREFIX = ""; - - /** - * just add table names here and run the {@link #main(String[])} method. - */ - private static final String[] TABLES = {"sec_application"}; - - public static void main(String[] args) { - //自动生成配置 - FastAutoGenerator generator = FastAutoGenerator.create(dataSourceConfig()) - .globalConfig(MybatisPlusGenerator::globalConfig) - .packageConfig(MybatisPlusGenerator::packageConfig) - .templateConfig(MybatisPlusGenerator::templateConfig) - .strategyConfig(MybatisPlusGenerator::strategyConfig) - .injectionConfig(MybatisPlusGenerator::injectionConfig); - generator.execute(); - } - - /** - * 数据源配置 - * - * @return DataSourceConfig - */ - private static DataSourceConfig.Builder dataSourceConfig() { - return new DataSourceConfig.Builder(URL, USERNAME, PASSWORD) - .dbQuery(new MySqlQuery()) - .typeConvert(new MySqlTypeConvert()) - .keyWordsHandler(new MySqlKeyWordsHandler()); - } - - /** - * 全局配置 - * - * @return GlobalConfig - */ - private static void globalConfig(GlobalConfig.Builder builder) { - builder - .outputDir(System.getProperty("user.dir") + - "/scaleph-support/scaleph-generator/src/main/java/") - .author(AUTHOR) - .enableSpringdoc() - .dateType(DateType.ONLY_DATE) - .commentDate("yyyy-MM-dd"); - } - - /** - * 包配置 - * - * @return PackageConfig - */ - private static void packageConfig(PackageConfig.Builder builder) { - builder.parent(BASE_PACKAGE) - .moduleName(MODULE) - .entity("dao.entity") - .service("service") - .serviceImpl("service.impl") - .mapper("dao.mapper") - .xml("dao.mapper") - .controller("api.controller"); -// .pathInfo(Collections.singletonMap(OutputFile.mapperXml, "/Users/wangqi/Downloads/generator")); - } - - private static void templateConfig(TemplateConfig.Builder builder) { - // 设置 null 避免对应的类生成 - // 修改 entity 模板，使用自定义的 - builder.controller(null) - .service(null) - .serviceImpl(null) - .entity("/custom-entity.java.vm"); - } - - /** - * 策略配置 - * - * @return StrategyConfig - */ - private static void strategyConfig(StrategyConfig.Builder builder) { - builder.enableCapitalMode() - .enableSkipView() - .disableSqlFilter() - .addInclude(TABLES) - .addTablePrefix(TABLE_PREFIX); - - Entity.Builder entityBuilder = builder.entityBuilder(); - entityBuilder.superClass(BaseDO.class) - .enableLombok() - .enableTableFieldAnnotation() - .enableRemoveIsPrefix() - .naming(NamingStrategy.underline_to_camel) - .columnNaming(NamingStrategy.underline_to_camel) - .addSuperEntityColumns("id", "creator", "created_time", "editor", "update_time") - .idType(IdType.AUTO) - .addTableFills(new Column("create_time", FieldFill.INSERT)) - .addTableFills(new Property("updateTime", FieldFill.INSERT_UPDATE)) - .formatFileName("%s"); - - Mapper.Builder mapperBuilder = builder.mapperBuilder(); - mapperBuilder.superClass(BaseMapper.class) - .enableMapperAnnotation() - .enableBaseResultMap() - .enableBaseColumnList() - .formatMapperFileName("%sMapper") - .formatXmlFileName("%sMapper"); - - Service.Builder serviceBuilder = builder.serviceBuilder(); - serviceBuilder.formatServiceFileName("%sService") - .formatServiceImplFileName("%sServiceImp") - .build(); - - - Controller.Builder controllerBuilder = builder.controllerBuilder(); - controllerBuilder.enableHyphenStyle() - .enableRestStyle() - .formatFileName("%sController") - .build(); - - } - - /** - * 自定义配置 - * - * @return InjectionConfig - */ - private static void injectionConfig(InjectionConfig.Builder builder) { - - } -} diff --git a/scaleph-support/scaleph-generator/src/main/java/cn/sliew/scaleph/generator/MybatisPlusPostgreSQLGenerator.java b/scaleph-support/scaleph-generator/src/main/java/cn/sliew/scaleph/generator/MybatisPlusPostgreSQLGenerator.java deleted file mode 100644 index bcd076a3b..000000000 --- a/scaleph-support/scaleph-generator/src/main/java/cn/sliew/scaleph/generator/MybatisPlusPostgreSQLGenerator.java +++ /dev/null @@ -1,179 +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 cn.sliew.scaleph.generator; - -import cn.sliew.scaleph.dao.entity.BaseDO; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.generator.FastAutoGenerator; -import com.baomidou.mybatisplus.generator.config.*; -import com.baomidou.mybatisplus.generator.config.builder.Controller; -import com.baomidou.mybatisplus.generator.config.builder.Entity; -import com.baomidou.mybatisplus.generator.config.builder.Mapper; -import com.baomidou.mybatisplus.generator.config.builder.Service; -import com.baomidou.mybatisplus.generator.config.converts.PostgreSqlTypeConvert; -import com.baomidou.mybatisplus.generator.config.querys.PostgreSqlQuery; -import com.baomidou.mybatisplus.generator.config.rules.DateType; -import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; -import com.baomidou.mybatisplus.generator.fill.Column; -import com.baomidou.mybatisplus.generator.fill.Property; -import com.baomidou.mybatisplus.generator.keywords.PostgreSqlKeyWordsHandler; -import lombok.extern.slf4j.Slf4j; - -/** - * https://baomidou.com/pages/981406/#controller-%E7%AD%96%E7%95%A5%E9%85%8D%E7%BD%AE - */ -@Slf4j -public class MybatisPlusPostgreSQLGenerator { - - private final static String AUTHOR = "wangqi"; - private final static String URL = "jdbc:postgresql://localhost:5432/dw"; - private final static String USERNAME = "root"; - private final static String PASSWORD = "123456"; //NOSONAR - private static final String BASE_PACKAGE = "cn.sliew"; - private static final String MODULE = "scaleph"; - private static final String TABLE_PREFIX = ""; - - /** - * just add table names here and run the {@link #main(String[])} method. - */ - private static final String[] TABLES = {"dwd_ds_table_1"}; - - public static void main(String[] args) { - //自动生成配置 - FastAutoGenerator generator = FastAutoGenerator.create(dataSourceConfig()) - .globalConfig(MybatisPlusPostgreSQLGenerator::globalConfig) - .packageConfig(MybatisPlusPostgreSQLGenerator::packageConfig) - .templateConfig(MybatisPlusPostgreSQLGenerator::templateConfig) - .strategyConfig(MybatisPlusPostgreSQLGenerator::strategyConfig) - .injectionConfig(MybatisPlusPostgreSQLGenerator::injectionConfig); - generator.execute(); - } - - /** - * 数据源配置 - * - * @return DataSourceConfig - */ - private static DataSourceConfig.Builder dataSourceConfig() { - return new DataSourceConfig.Builder(URL, USERNAME, PASSWORD) - .schema("dwd") - .dbQuery(new PostgreSqlQuery()) - .typeConvert(new PostgreSqlTypeConvert()) - .keyWordsHandler(new PostgreSqlKeyWordsHandler()); - } - - /** - * 全局配置 - * - * @return GlobalConfig - */ - private static void globalConfig(GlobalConfig.Builder builder) { - builder - .outputDir(System.getProperty("user.dir") + - "/scaleph-support/scaleph-generator/src/main/java/") - .author(AUTHOR) - .enableSpringdoc() - .dateType(DateType.ONLY_DATE) - .commentDate("yyyy-MM-dd"); - } - - /** - * 包配置 - * - * @return PackageConfig - */ - private static void packageConfig(PackageConfig.Builder builder) { - builder.parent(BASE_PACKAGE) - .moduleName(MODULE) - .entity("dao.entity") - .service("service") - .serviceImpl("service.impl") - .mapper("dao.mapper") - .xml("dao.mapper") - .controller("api.controller"); -// .pathInfo(Collections.singletonMap(OutputFile.mapperXml, "/Users/wangqi/Downloads/generator")); - } - - private static void templateConfig(TemplateConfig.Builder builder) { - // 设置 null 避免对应的类生成 - // 修改 entity 模板，使用自定义的 - builder.controller(null) - .service(null) - .serviceImpl(null) - .entity("/custom-entity.java.vm"); - } - - /** - * 策略配置 - * - * @return StrategyConfig - */ - private static void strategyConfig(StrategyConfig.Builder builder) { - builder.enableCapitalMode() - .enableSkipView() - .disableSqlFilter() - .addInclude(TABLES) - .addTablePrefix(TABLE_PREFIX); - - Entity.Builder entityBuilder = builder.entityBuilder(); - entityBuilder.superClass(BaseDO.class) - .enableLombok() - .enableTableFieldAnnotation() - .enableRemoveIsPrefix() - .naming(NamingStrategy.underline_to_camel) - .columnNaming(NamingStrategy.underline_to_camel) - .addSuperEntityColumns("id", "creator", "created_time", "editor", "update_time") - .idType(IdType.AUTO) - .addTableFills(new Column("create_time", FieldFill.INSERT)) - .addTableFills(new Property("updateTime", FieldFill.INSERT_UPDATE)) - .formatFileName("%s"); - - Mapper.Builder mapperBuilder = builder.mapperBuilder(); - mapperBuilder.superClass(BaseMapper.class) - .enableMapperAnnotation() - .enableBaseResultMap() - .enableBaseColumnList() - .formatMapperFileName("%sMapper") - .formatXmlFileName("%sMapper"); - - Service.Builder serviceBuilder = builder.serviceBuilder(); - serviceBuilder.formatServiceFileName("%sService") - .formatServiceImplFileName("%sServiceImp") - .build(); - - - Controller.Builder controllerBuilder = builder.controllerBuilder(); - controllerBuilder.enableHyphenStyle() - .enableRestStyle() - .formatFileName("%sController") - .build(); - - } - - /** - * 自定义配置 - * - * @return InjectionConfig - */ - private static void injectionConfig(InjectionConfig.Builder builder) { - - } -} diff --git a/scaleph-support/scaleph-generator/src/main/resources/custom-entity.java.vm b/scaleph-support/scaleph-generator/src/main/resources/custom-entity.java.vm deleted file mode 100644 index 90c28625f..000000000 --- a/scaleph-support/scaleph-generator/src/main/resources/custom-entity.java.vm +++ /dev/null @@ -1,155 +0,0 @@ -package ${package.Entity}; - -#foreach($pkg in ${table.importPackages}) -import ${pkg}; -#end -#if(${springdoc}) -import io.swagger.v3.oas.annotations.media.Schema; -#elseif(${swagger}) -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -#end -#if(${entityLombokModel}) -import lombok.Data; -#if(${chainModel}) -import lombok.experimental.Accessors; -#end -#end - -/** - * $!{table.comment} - */ -#if(${entityLombokModel}) -@Data - #if(${chainModel}) -@Accessors(chain = true) - #end -#end -#if(${table.convert}) -@TableName("${schemaName}${table.name}") -#end -#if(${springdoc}) -@Schema(name = "${entity}", description = "$!{table.comment}") -#elseif(${swagger}) -@ApiModel(value = "${entity}对象", description = "$!{table.comment}") -#end -#if(${superEntityClass}) -public class ${entity} extends ${superEntityClass}#if(${activeRecord})<${entity}>#end { -#elseif(${activeRecord}) -public class ${entity} extends Model<${entity}> { -#elseif(${entitySerialVersionUID}) -public class ${entity} implements Serializable { -#else -public class ${entity} { -#end -#if(${entitySerialVersionUID}) - - private static final long serialVersionUID = 1L; -#end -## ---------- BEGIN 字段循环遍历 ---------- -#foreach($field in ${table.fields}) - -#if(${field.keyFlag}) -#set($keyPropertyName=${field.propertyName}) -#end -#if("$!field.comment" != "") - #if(${springdoc}) - @Schema(description = "${field.comment}") - #elseif(${swagger}) - @ApiModelProperty("${field.comment}") - #else - /** - * ${field.comment} - */ - #end -#end -#if(${field.keyFlag}) -## 主键 - #if(${field.keyIdentityFlag}) - @TableId(value = "${field.annotationColumnName}", type = IdType.AUTO) - #elseif(!$null.isNull(${idType}) && "$!idType" != "") - @TableId(value = "${field.annotationColumnName}", type = IdType.${idType}) - #elseif(${field.convert}) - @TableId("${field.annotationColumnName}") - #end -## 普通字段 -#elseif(${field.fill}) -## ----- 存在字段填充设置 ----- - #if(${field.convert}) - @TableField(value = "${field.annotationColumnName}", fill = FieldFill.${field.fill}) - #else - @TableField(fill = FieldFill.${field.fill}) - #end -#elseif(${field.convert}) - @TableField("${field.annotationColumnName}") -#end -## 乐观锁注解 -#if(${field.versionField}) - @Version -#end -## 逻辑删除注解 -#if(${field.logicDeleteField}) - @TableLogic -#end - private ${field.propertyType} ${field.propertyName}; -#end -## ---------- END 字段循环遍历 ---------- -#if(!${entityLombokModel}) -#foreach($field in ${table.fields}) - #if(${field.propertyType.equals("boolean")}) - #set($getprefix="is") - #else - #set($getprefix="get") - #end - - public ${field.propertyType} ${getprefix}${field.capitalName}() { - return ${field.propertyName}; - } - - #if(${chainModel}) - public ${entity} set${field.capitalName}(${field.propertyType} ${field.propertyName}) { - #else - public void set${field.capitalName}(${field.propertyType} ${field.propertyName}) { - #end - this.${field.propertyName} = ${field.propertyName}; - #if(${chainModel}) - return this; - #end - } -#end -## --foreach end--- -#end -## --end of #if(!${entityLombokModel})-- -#if(${entityColumnConstant}) - #foreach($field in ${table.fields}) - - public static final String ${field.name.toUpperCase()} = "${field.name}"; - #end -#end -#if(${activeRecord}) - - @Override - public Serializable pkVal() { - #if(${keyPropertyName}) - return this.${keyPropertyName}; - #else - return null; - #end - } -#end -#if(!${entityLombokModel}) - - @Override - public String toString() { - return "${entity}{" + - #foreach($field in ${table.fields}) - #if($!{foreach.index}==0) - "${field.propertyName} = " + ${field.propertyName} + - #else - ", ${field.propertyName} = " + ${field.propertyName} + - #end - #end - "}"; - } -#end -} diff --git a/scaleph-ui-react/config/routes.ts b/scaleph-ui-react/config/routes.ts index e03627fc4..ec0a54013 100644 --- a/scaleph-ui-react/config/routes.ts +++ b/scaleph-ui-react/config/routes.ts @@ -272,6 +272,10 @@ export default [ path: '/workspace/schedule/job', component: './Project/Workspace/Schedule/Job', }, + { + path: '/workspace/schedule/instance', + component: './Project/Workspace/Schedule/Instance', + }, ] }, { diff --git a/scaleph-ui-react/src/constants/dictType.ts b/scaleph-ui-react/src/constants/dictType.ts index 97f6479af..a950a1e80 100644 --- a/scaleph-ui-react/src/constants/dictType.ts +++ b/scaleph-ui-react/src/constants/dictType.ts @@ -28,6 +28,10 @@ export const DICT_TYPE = { datasourceType: 'datasource_type', redisMode: 'redis_mode', + scheduleType: 'schedule_type', + scheduleEngineType: 'schedule_engine_type', + scheduleJobType: 'schedule_job_type', + jobType: 'job_type', jobStatus: 'job_status', jobInstanceState: 'job_instance_state', diff --git a/scaleph-ui-react/src/locales/zh-CN/pages/project.ts b/scaleph-ui-react/src/locales/zh-CN/pages/project.ts index 8ed365b36..db1365239 100644 --- a/scaleph-ui-react/src/locales/zh-CN/pages/project.ts +++ b/scaleph-ui-react/src/locales/zh-CN/pages/project.ts @@ -1236,6 +1236,22 @@ export default { 'pages.project.schedule.job': '任务', 'pages.project.schedule.job.name': '名称', 'pages.project.schedule.job.jobGroupId': '分组', + 'pages.project.schedule.job.type': '类型', + 'pages.project.schedule.job.engineType': '引擎', + 'pages.project.schedule.job.jobType': '任务类型', + 'pages.project.schedule.job.handler': '处理器', + 'pages.project.schedule.job.instance': '任务实例', + 'pages.project.schedule.job.instance.name': '名称', + 'pages.project.schedule.job.instance.jobConfigId': '任务', + 'pages.project.schedule.job.instance.timezone': '时区', + 'pages.project.schedule.job.instance.cron': '表达式', + 'pages.project.schedule.job.instance.validTime': '生效时间', + 'pages.project.schedule.job.instance.startTime': '开始时间', + 'pages.project.schedule.job.instance.endTime': '结束时间', + 'pages.project.schedule.job.instance.params': '参数', + 'pages.project.schedule.job.instance.timeout': '超时时间', + 'pages.project.schedule.job.instance.status': '状态', + 'Run': '运行', 'Save': '保存', diff --git a/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/dataSource.tsx b/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/dataSource.tsx index 54c795304..29774a70f 100644 --- a/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/dataSource.tsx +++ b/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/dataSource.tsx @@ -37,9 +37,12 @@ const DataSourceItem: React.FC<{ dataSource: string }> = ({dataSource}) => { dsType: params.dataSourceType }; return DsInfoService.list(param).then((response) => { - return response.data.map((item) => { - return {label: item.name, value: item.id, item: item}; - }); + if (response.data) { + return response.data.map((item) => { + return {label: item.name, value: item.id, item: item}; + }); + } + return [] }); })} /> diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Schedule/Group/ScheduleGroupForm.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Schedule/Group/ScheduleGroupForm.tsx index 4bfa59eb3..5a8cd2da5 100644 --- a/scaleph-ui-react/src/pages/Project/Workspace/Schedule/Group/ScheduleGroupForm.tsx +++ b/scaleph-ui-react/src/pages/Project/Workspace/Schedule/Group/ScheduleGroupForm.tsx @@ -3,78 +3,79 @@ import {ModalForm, ProFormDigit, ProFormText, ProFormTextArea} from "@ant-design import {useIntl} from '@umijs/max'; import {ModalFormProps} from '@/typings'; import {WORKSPACE_CONF} from '@/constants/constant'; -import {ScheduleGroup} from '@/services/project/typings'; -import {WsScheduleGroupService} from "@/services/project/WsScheduleGroupService"; +import {WsScheduleGroupService} from "@/services/workspace/schedule/WsScheduleGroupService"; +import {WorkspaceScheduleAPI} from "@/services/workspace/schedule/typings"; -const ScheduleGroupForm: React.FC> = ({data, visible, onVisibleChange}) => { - const intl = useIntl(); - const [form] = Form.useForm(); - const projectId = localStorage.getItem(WORKSPACE_CONF.projectId); +const ScheduleGroupForm: React.FC> = (props) => { + const intl = useIntl(); + const [form] = Form.useForm(); + const projectId = localStorage.getItem(WORKSPACE_CONF.projectId); + const {data, visible, onVisibleChange} = props - return ( - ) => { + const param = { + id: values.id, + namespace: projectId, + name: values.name, + remark: values.remark + }; + return values.id + ? WsScheduleGroupService.update(param).then((response) => { + if (response.success) { + message.success(intl.formatMessage({id: 'app.common.operate.edit.success'})); + if (onVisibleChange) { + onVisibleChange(false); + } } - form={form} - initialValues={{ - id: data?.id, - name: data?.name, - remark: data?.remark, - }} - open={visible} - onOpenChange={onVisibleChange} - width={580} - layout={"horizontal"} - labelCol={{span: 6}} - wrapperCol={{span: 16}} - modalProps={{ - destroyOnClose: true, - closeIcon: false - }} - onFinish={(values: Record) => { - const param = { - id: values.id, - namespace: projectId, - name: values.name, - remark: values.remark - }; - return values.id - ? WsScheduleGroupService.update(param).then((response) => { - if (response.success) { - message.success(intl.formatMessage({id: 'app.common.operate.edit.success'})); - if (onVisibleChange) { - onVisibleChange(false); - } - } - }) - : WsScheduleGroupService.add(param).then((response) => { - if (response.success) { - message.success(intl.formatMessage({id: 'app.common.operate.new.success'})); - if (onVisibleChange) { - onVisibleChange(false); - } - } - }) - }} - > - - ); + }) + : WsScheduleGroupService.add(param).then((response) => { + if (response.success) { + message.success(intl.formatMessage({id: 'app.common.operate.new.success'})); + if (onVisibleChange) { + onVisibleChange(false); + } + } + }) + }} + > +