Skip to content

Commit c2f2477

Browse files
kalencayawangqi
kalencaya
and
wangqi
authored
[Feature][scaleph-schedule] update schedule module (flowerfine#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 <wangqi@xinxuan.net>
1 parent 862a392 commit c2f2477

File tree

100 files changed

+1074
-2368
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+1074
-2368
lines changed

‎pom.xml

+13-101
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>cn.sliew</groupId>
2525
<artifactId>carp-spring-boot-parent</artifactId>
26-
<version>0.0.19</version>
26+
<version>0.0.25</version>
2727
</parent>
2828
<groupId>cn.sliew</groupId>
2929
<artifactId>scaleph</artifactId>
@@ -129,36 +129,29 @@
129129
<org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
130130
<mapstruct.lombok.binding.version>0.2.0</mapstruct.lombok.binding.version>
131131
<org.projectlombok.version>1.18.24</org.projectlombok.version>
132-
<velocity.engine.version>2.2</velocity.engine.version>
133132
<auto-service.version>1.0.1</auto-service.version>
134-
<semver.version>0.9.0</semver.version>
135-
<disruptor.version>4.0.0</disruptor.version>
133+
<carp.version>0.0.23</carp.version>
134+
<milky.version>1.0.13</milky.version>
135+
136136
<ojdbc.version>21.1.0.0</ojdbc.version>
137137
<clickhouse-jdbc.version>0.3.2</clickhouse-jdbc.version>
138138
<doris.version>5.1.26</doris.version>
139139
<druid.version>0.22.1</druid.version>
140140
<calcite-druid.version>1.29.0</calcite-druid.version>
141141
<config.version>1.4.3</config.version>
142-
<okhttp.version>4.10.0</okhttp.version>
143-
<minio.version>8.3.8</minio.version>
144-
<carp.version>0.0.20</carp.version>
145-
<milky.version>1.0.13</milky.version>
142+
146143
<sakura.version>1.0.2</sakura.version>
147144
<hadoop.version>3.3.4</hadoop.version>
148145
<hive.version>3.1.3</hive.version>
149-
<protobuf.version>3.21.5</protobuf.version>
150-
<netty.version>4.1.82.Final</netty.version>
151146
<flink.version>1.18.1</flink.version>
152147
<flink.base.version>1.18</flink.base.version>
153148
<flink-jdbc.version>3.1.2</flink-jdbc.version>
154149
<paimon.version>0.7.0-incubating</paimon.version>
155-
<spring-cloud-openfeign.version>3.1.7</spring-cloud-openfeign.version>
156-
<zjsonpatch.version>0.4.14</zjsonpatch.version>
150+
151+
<netty.version>4.1.82.Final</netty.version>
157152
<kogito.version>2.44.0.Alpha</kogito.version>
158-
<cola.version>4.3.2</cola.version>
159153
<fury.version>0.4.1</fury.version>
160-
<jgrapht.version>1.5.2</jgrapht.version>
161-
<gravitino.version>0.5.1</gravitino.version>
154+
<disruptor.version>4.0.0</disruptor.version>
162155
</properties>
163156

164157
<dependencyManagement>
@@ -354,12 +347,6 @@
354347
<version>2.8.1</version>
355348
</dependency>
356349

357-
<dependency>
358-
<groupId>org.projectlombok</groupId>
359-
<artifactId>lombok</artifactId>
360-
<version>${org.projectlombok.version}</version>
361-
</dependency>
362-
363350
<dependency>
364351
<groupId>org.mapstruct.extensions.spring</groupId>
365352
<artifactId>mapstruct-spring-annotations</artifactId>
@@ -371,12 +358,6 @@
371358
<version>${org.mapstruct.version}</version>
372359
</dependency>
373360

374-
<dependency>
375-
<groupId>com.github.zafarkhaja</groupId>
376-
<artifactId>java-semver</artifactId>
377-
<version>${semver.version}</version>
378-
</dependency>
379-
380361
<dependency>
381362
<groupId>com.lmax</groupId>
382363
<artifactId>disruptor</artifactId>
@@ -451,7 +432,11 @@
451432
<artifactId>flink-table-planner_2.12</artifactId>
452433
<version>${flink.version}</version>
453434
</dependency>
454-
435+
<dependency>
436+
<groupId>org.apache.flink</groupId>
437+
<artifactId>flink-kubernetes</artifactId>
438+
<version>${flink.version}</version>
439+
</dependency>
455440
<dependency>
456441
<groupId>org.apache.flink</groupId>
457442
<artifactId>flink-connector-jdbc</artifactId>
@@ -469,53 +454,25 @@
469454
<version>${sakura.version}</version>
470455
</dependency>
471456

472-
<dependency>
473-
<groupId>org.apache.flink</groupId>
474-
<artifactId>flink-kubernetes</artifactId>
475-
<version>${flink.version}</version>
476-
</dependency>
477-
478457
<dependency>
479458
<groupId>com.typesafe</groupId>
480459
<artifactId>config</artifactId>
481460
<version>${config.version}</version>
482461
</dependency>
483462

484-
<dependency>
485-
<groupId>com.squareup.okhttp3</groupId>
486-
<artifactId>okhttp</artifactId>
487-
<version>${okhttp.version}</version>
488-
</dependency>
489-
<dependency>
490-
<groupId>com.squareup.okhttp3</groupId>
491-
<artifactId>logging-interceptor</artifactId>
492-
<version>${okhttp.version}</version>
493-
</dependency>
494-
495463
<dependency>
496464
<groupId>com.oracle.database.jdbc</groupId>
497465
<artifactId>ojdbc8</artifactId>
498466
<version>${ojdbc.version}</version>
499467
<scope>test</scope>
500468
</dependency>
501-
<dependency>
502-
<groupId>com.google.protobuf</groupId>
503-
<artifactId>protobuf-java</artifactId>
504-
<version>${protobuf.version}</version>
505-
</dependency>
506469

507470
<dependency>
508471
<groupId>io.netty</groupId>
509472
<artifactId>netty-all</artifactId>
510473
<version>${netty.version}</version>
511474
</dependency>
512475

513-
<dependency>
514-
<groupId>com.flipkart.zjsonpatch</groupId>
515-
<artifactId>zjsonpatch</artifactId>
516-
<version>${zjsonpatch.version}</version>
517-
</dependency>
518-
519476
<dependency>
520477
<groupId>org.kie.kogito</groupId>
521478
<artifactId>kogito-spring-boot-starter</artifactId>
@@ -532,51 +489,6 @@
532489
<artifactId>fury-core</artifactId>
533490
<version>${fury.version}</version>
534491
</dependency>
535-
536-
<dependency>
537-
<groupId>org.jgrapht</groupId>
538-
<artifactId>jgrapht-core</artifactId>
539-
<version>${jgrapht.version}</version>
540-
</dependency>
541-
542-
<dependency>
543-
<groupId>com.datastrato.gravitino</groupId>
544-
<artifactId>client-java-runtime</artifactId>
545-
<version>${gravitino.version}</version>
546-
<exclusions>
547-
<exclusion>
548-
<groupId>com.datastrato.gravitino</groupId>
549-
<artifactId>client-java</artifactId>
550-
</exclusion>
551-
</exclusions>
552-
</dependency>
553-
<dependency>
554-
<groupId>com.datastrato.gravitino</groupId>
555-
<artifactId>client-java</artifactId>
556-
<version>${gravitino.version}</version>
557-
<exclusions>
558-
<exclusion>
559-
<groupId>org.slf4j</groupId>
560-
<artifactId>slf4j-api</artifactId>
561-
</exclusion>
562-
<exclusion>
563-
<groupId>org.apache.logging.log4j</groupId>
564-
<artifactId>log4j-slf4j2-impl</artifactId>
565-
</exclusion>
566-
<exclusion>
567-
<groupId>org.apache.logging.log4j</groupId>
568-
<artifactId>log4j-api</artifactId>
569-
</exclusion>
570-
<exclusion>
571-
<groupId>org.apache.logging.log4j</groupId>
572-
<artifactId>log4j-core</artifactId>
573-
</exclusion>
574-
<exclusion>
575-
<groupId>org.apache.logging.log4j</groupId>
576-
<artifactId>log4j-1.2-api</artifactId>
577-
</exclusion>
578-
</exclusions>
579-
</dependency>
580492
</dependencies>
581493
</dependencyManagement>
582494

‎scaleph-api/src/main/java/cn/sliew/scaleph/api/annotation/AnonymousAccess.java

-35
This file was deleted.

‎scaleph-api/src/main/java/cn/sliew/scaleph/api/config/CarpDataSourceConfig.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ public class CarpDataSourceConfig {
4545

4646
@Autowired
4747
private MybatisPlusInterceptor mybatisPlusInterceptor;
48+
@Autowired
49+
private CarpMybatisConfig.CarpMetaHandler carpMetaHandler;
4850

4951
@Primary
5052
@Bean(DataSourceConstants.DATA_SOURCE_FACTORY)
@@ -65,7 +67,7 @@ public DataSourceTransactionManager carpTransactionManager() {
6567
public SqlSessionFactory carpSqlSessionFactory() throws Exception {
6668
MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
6769
GlobalConfig globalConfig = GlobalConfigUtils.defaults();
68-
globalConfig.setMetaObjectHandler(new CarpMybatisConfig.CarpMetaHandler());
70+
globalConfig.setMetaObjectHandler(carpMetaHandler);
6971

7072
MybatisPlusProperties props = new MybatisPlusProperties();
7173
props.setMapperLocations(new String[]{DataSourceConstants.MAPPER_XML_PATH});

‎scaleph-api/src/main/java/cn/sliew/scaleph/api/config/LogDataSourceConfig.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package cn.sliew.scaleph.api.config;
2020

21+
import cn.sliew.carp.framework.mybatis.config.CarpMybatisConfig;
2122
import cn.sliew.scaleph.dao.DataSourceConstants;
2223
import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
2324
import com.baomidou.mybatisplus.core.MybatisConfiguration;
@@ -45,6 +46,8 @@ public class LogDataSourceConfig {
4546

4647
@Autowired
4748
private MybatisPlusInterceptor mybatisPlusInterceptor;
49+
@Autowired
50+
private CarpMybatisConfig.CarpMetaHandler carpMetaHandler;
4851

4952
@Bean(DataSourceConstants.LOG_DATA_SOURCE_FACTORY)
5053
@ConfigurationProperties(prefix = "spring.datasource.log")
@@ -62,7 +65,7 @@ public DataSourceTransactionManager logTransactionManager() {
6265
public SqlSessionFactory logSqlSessionFactory() throws Exception {
6366
MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
6467
GlobalConfig globalConfig = GlobalConfigUtils.defaults();
65-
globalConfig.setMetaObjectHandler(new MybatisConfig.MetaHandler());
68+
globalConfig.setMetaObjectHandler(carpMetaHandler);
6669
MybatisPlusProperties props = new MybatisPlusProperties();
6770
props.setMapperLocations(new String[]{DataSourceConstants.LOG_MAPPER_XML_PATH});
6871
factoryBean.setMapperLocations(props.resolveMapperLocations());

‎scaleph-api/src/main/java/cn/sliew/scaleph/api/config/MasterDataSourceConfig.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package cn.sliew.scaleph.api.config;
2020

21+
import cn.sliew.carp.framework.mybatis.config.CarpMybatisConfig;
2122
import cn.sliew.scaleph.dao.DataSourceConstants;
2223
import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
2324
import com.baomidou.mybatisplus.core.MybatisConfiguration;
@@ -46,6 +47,8 @@ public class MasterDataSourceConfig {
4647

4748
@Autowired
4849
private MybatisPlusInterceptor mybatisPlusInterceptor;
50+
@Autowired
51+
private CarpMybatisConfig.CarpMetaHandler carpMetaHandler;
4952

5053
@Primary
5154
@Bean(DataSourceConstants.MASTER_DATA_SOURCE_FACTORY)
@@ -66,7 +69,7 @@ public DataSourceTransactionManager masterTransactionManager() {
6669
public SqlSessionFactory masterSqlSessionFactory() throws Exception {
6770
MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
6871
GlobalConfig globalConfig = GlobalConfigUtils.defaults();
69-
globalConfig.setMetaObjectHandler(new MybatisConfig.MetaHandler());
72+
globalConfig.setMetaObjectHandler(carpMetaHandler);
7073

7174
MybatisPlusProperties props = new MybatisPlusProperties();
7275
props.setMapperLocations(new String[]{DataSourceConstants.MASTER_MAPPER_XML_PATH});

‎scaleph-api/src/main/java/cn/sliew/scaleph/api/config/MybatisConfig.java

-68
This file was deleted.

‎scaleph-api/src/main/java/cn/sliew/scaleph/api/config/SakuraDataSourceConfig.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package cn.sliew.scaleph.api.config;
2020

21+
import cn.sliew.carp.framework.mybatis.config.CarpMybatisConfig;
2122
import cn.sliew.scaleph.dao.DataSourceConstants;
2223
import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
2324
import com.baomidou.mybatisplus.core.MybatisConfiguration;
@@ -45,6 +46,8 @@ public class SakuraDataSourceConfig {
4546

4647
@Autowired
4748
private MybatisPlusInterceptor mybatisPlusInterceptor;
49+
@Autowired
50+
private CarpMybatisConfig.CarpMetaHandler carpMetaHandler;
4851

4952
@Bean(DataSourceConstants.SAKURA_DATA_SOURCE_FACTORY)
5053
@ConfigurationProperties(prefix = "spring.datasource.sakura")
@@ -62,7 +65,7 @@ public DataSourceTransactionManager logTransactionManager() {
6265
public SqlSessionFactory logSqlSessionFactory() throws Exception {
6366
MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
6467
GlobalConfig globalConfig = GlobalConfigUtils.defaults();
65-
globalConfig.setMetaObjectHandler(new MybatisConfig.MetaHandler());
68+
globalConfig.setMetaObjectHandler(carpMetaHandler);
6669
MybatisPlusProperties props = new MybatisPlusProperties();
6770
props.setMapperLocations(new String[]{DataSourceConstants.SAKURA_MAPPER_XML_PATH});
6871
factoryBean.setMapperLocations(props.resolveMapperLocations());

0 commit comments

Comments
 (0)