Skip to content

Commit 5be006b

Browse files
alldatafounderalldatafounder
authored
Merge pull request alldatacenter#309 from alldatacenter/alldatadc
[develop] eladmin refactor && eladmin port change to 8613
2 parents e56c055 + a348776 commit 5be006b

File tree

692 files changed

+1259
-5585
lines changed

Some content is hidden

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

692 files changed

+1259
-5585
lines changed

‎oneHub/eladmin-versions/eladmin-2.6/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,13 @@
133133
>
134134
> 1.2 source install/eladmin/eladmin_dts.sql
135135
>
136-
> 1.3 source install/datax/data_cloud.sql
136+
> 1.3 source install/datax/eladmin_data_cloud.sql
137137
>
138-
> 1.4 source install/datax/data_cloud_quartz.sql
138+
> 1.4 source install/datax/eladmin_cloud_quartz.sql
139139
>
140-
> 1.5 source install/datax/foodmart2.sql
140+
> 1.5 source install/datax/eladmin_foodmart2.sql
141141
>
142-
> 1.6 source install/datax/robot.sql
142+
> 1.6 source install/datax/eladmin_robot.sql
143143
>
144144
#### 2、修改 **datax-config** 配置中心
145145

‎oneHub/eladmin-versions/eladmin-2.6/datax-common/datax-common-database/src/main/java/cn/datax/common/database/DbDialect.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
/**
99
* 表数据查询接口
1010
*
11-
* @author yuwei
12-
* @since 2020-03-14
11+
* @author AllDataDC
12+
* @date 2022-11-14
1313
*/
1414
public interface DbDialect {
1515

‎oneHub/eladmin-versions/eladmin-2.6/datax-common/datax-common-database/src/main/java/cn/datax/common/database/DbQuery.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
/**
1313
* 表数据查询接口
1414
*
15-
* @author yuwei
16-
* @since 2020-03-14
15+
* @author AllDataDC
16+
* @date 2022-11-14
1717
*/
1818
public interface DbQuery {
1919

‎oneHub/eladmin-versions/eladmin-2.6/datax-common/datax-common-database/src/main/java/cn/datax/common/database/DialectFactory.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
/**
77
* 方言工厂类
88
*
9-
* @author yuwei
10-
* @since 2020-03-14
9+
* @author AllDataDC
10+
* @date 2022-11-14
1111
*/
1212
public class DialectFactory {
1313

‎oneHub/eladmin-versions/eladmin-2.6/datax-common/datax-common-database/src/main/java/cn/datax/common/database/constants/DbType.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
/**
44
* 数据库类型
55
*
6-
* @author yuwei
7-
* @since 2020-03-14
6+
* @author AllDataDC
7+
* @date 2022-11-14
88
*/
99
public enum DbType {
1010

‎oneHub/eladmin-versions/eladmin-2.6/datax-common/datax-common-database/src/main/java/cn/datax/common/database/dialect/AbstractDbDialect.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
/**
66
* 方言抽象类
77
*
8-
* @author yuwei
9-
* @since 2020-03-14
8+
* @author AllDataDC
9+
* @date 2022-11-14
1010
*/
1111
public abstract class AbstractDbDialect implements DbDialect {
1212

‎oneHub/eladmin-versions/eladmin-2.6/datax-common/datax-common-database/src/main/java/cn/datax/common/database/dialect/MariaDBDialect.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
/**
44
* MariaDB 数据库方言
55
*
6-
* @author yuwei
7-
* @since 2020-03-14
6+
* @author AllDataDC
7+
* @date 2022-11-14
88
*/
99
public class MariaDBDialect extends MySqlDialect {
1010
}

‎oneHub/eladmin-versions/eladmin-2.6/datax-common/datax-common-database/src/main/java/cn/datax/common/database/dialect/MySqlDialect.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
/**
1010
* MySql 数据库方言
1111
*
12-
* @author yuwei
13-
* @since 2020-03-14
12+
* @author AllDataDC
13+
* @date 2022-11-14
1414
*/
1515
public class MySqlDialect extends AbstractDbDialect {
1616

‎oneHub/eladmin-versions/eladmin-2.6/datax-common/datax-common-database/src/main/java/cn/datax/common/database/dialect/Oracle12cDialect.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
/**
44
* ORACLE Oracle12c+数据库方言
55
*
6-
* @author yuwei
7-
* @since 2020-03-14
6+
* @author AllDataDC
7+
* @date 2022-11-14
88
*/
99
public class Oracle12cDialect extends OracleDialect {
1010

‎oneHub/eladmin-versions/eladmin-2.6/datax-common/datax-common-database/src/main/java/cn/datax/common/database/dialect/OracleDialect.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
/**
1313
* Oracle Oracle11g及以下数据库方言
1414
*
15-
* @author yuwei
16-
* @since 2020-03-14
15+
* @author AllDataDC
16+
* @date 2022-11-14
1717
*/
1818
public class OracleDialect extends AbstractDbDialect {
1919

‎oneHub/eladmin-versions/eladmin-2.6/datax-common/datax-common-database/src/main/java/cn/datax/common/database/dialect/PostgreDialect.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
/**
1010
* Postgre 数据库方言
1111
*
12-
* @author yuwei
13-
* @since 2020-03-14
12+
* @author AllDataDC
13+
* @date 2022-11-14
1414
*/
1515
public class PostgreDialect extends AbstractDbDialect {
1616

‎oneHub/eladmin-versions/eladmin-2.6/datax-common/datax-common-database/src/main/java/cn/datax/common/database/dialect/SQLServer2008Dialect.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
/**
1212
* SQLServer 2005 数据库方言
1313
*
14-
* @author yuwei
15-
* @since 2020-03-14
14+
* @author AllDataDC
15+
* @date 2022-11-14
1616
*/
1717
public class SQLServer2008Dialect extends AbstractDbDialect {
1818

‎oneHub/eladmin-versions/eladmin-2.6/datax-common/datax-common-database/src/main/java/cn/datax/common/database/dialect/SQLServerDialect.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
/**
44
* SQLServer 数据库方言
55
*
6-
* @author yuwei
7-
* @since 2020-03-14
6+
* @author AllDataDC
7+
* @date 2022-11-14
88
*/
99
public class SQLServerDialect extends SQLServer2008Dialect {
1010

‎oneHub/eladmin-versions/eladmin-2.6/datax-common/datax-common-database/src/main/java/cn/datax/common/database/dialect/UnknownDialect.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
/**
99
* 未知 数据库方言
1010
*
11-
* @author yuwei
12-
* @since 2020-03-14
11+
* @author AllDataDC
12+
* @date 2022-11-14
1313
*/
1414
public class UnknownDialect extends AbstractDbDialect {
1515

‎oneHub/eladmin-versions/eladmin-2.6/datax-common/datax-common-mybatis/src/main/java/cn/datax/common/mybatis/config/DataBatisPlusConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.springframework.context.annotation.Bean;
99
import org.springframework.transaction.annotation.EnableTransactionManagement;
1010

11-
@MapperScan("cn.datax.service.**.dao")
11+
@MapperScan({"cn.datax.service.**.dao","com.platform.dts.mapper"})
1212
@EnableTransactionManagement
1313
public class DataBatisPlusConfig {
1414

‎oneHub/eladmin-versions/eladmin-2.6/datax-common/datax-common-redis/pom.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
<artifactId>datax-common-redis</artifactId>
1313

1414
<dependencies>
15-
<dependency>
16-
<groupId>org.springframework.boot</groupId>
17-
<artifactId>spring-boot-starter-data-redis</artifactId>
18-
<exclusions>
19-
<exclusion>
20-
<groupId>io.lettuce</groupId>
21-
<artifactId>lettuce-core</artifactId>
22-
</exclusion>
23-
</exclusions>
24-
</dependency>
15+
<!-- <dependency>-->
16+
<!-- <groupId>org.springframework.boot</groupId>-->
17+
<!-- <artifactId>spring-boot-starter-data-redis</artifactId>-->
18+
<!-- <exclusions>-->
19+
<!-- <exclusion>-->
20+
<!-- <groupId>io.lettuce</groupId>-->
21+
<!-- <artifactId>lettuce-core</artifactId>-->
22+
<!-- </exclusion>-->
23+
<!-- </exclusions>-->
24+
<!-- </dependency>-->
2525
<dependency>
2626
<groupId>redis.clients</groupId>
2727
<artifactId>jedis</artifactId>

‎oneHub/eladmin-versions/eladmin-2.6/datax-common/datax-common-security/src/main/java/cn/datax/common/security/annotation/DataInner.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
/**
66
* 服务调用不鉴权注解
77
*
8-
* @author yuwei
9-
* @since 2019/10/30
8+
* @author AllDataDC
9+
* @date 2022/11/30
1010
*/
1111
@Target({ ElementType.PARAMETER, ElementType.METHOD })
1212
@Retention(RetentionPolicy.RUNTIME)

‎oneHub/eladmin-versions/eladmin-2.6/datax-common/datax-common-security/src/main/java/cn/datax/common/security/config/DataSecurityInnerAspect.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
/**
1111
* 服务间接口不鉴权处理逻辑
1212
*
13-
* @author yuwei
14-
* @since 2019/10/30
13+
* @author AllDataDC
14+
* @date 2022/11/30
1515
*/
1616
@Slf4j
1717
@Aspect

‎oneHub/eladmin-versions/eladmin-2.6/datax-common/datax-common-security/src/main/java/cn/datax/common/security/utils/DataUserAuthenticationConverter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
/**
2121
* 根据checktoken的结果转化用户信息
2222
*
23-
* @author yuwei
24-
* @since 2019/10/30
23+
* @author AllDataDC
24+
* @date 2022/11/30
2525
*/
2626
public class DataUserAuthenticationConverter implements UserAuthenticationConverter {
2727

‎oneHub/eladmin-versions/eladmin-2.6/datax-config/src/main/resources/config/datax-auth-dev.yml renamed to ‎oneHub/eladmin-versions/eladmin-2.6/datax-config/src/main/resources/config/eladmin-system-dev.yml

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
# 数据源配置
22
spring:
33
redis:
4-
database: 1
5-
host: myBackEndIpAddress
6-
port: RedisPort
7-
password: RedisPassword
8-
timeout: 6000ms # 连接超时时长（毫秒）
4+
#数据库索引
5+
database: ${REDIS_DB:0}
6+
host: ${REDIS_HOST:localhost}
7+
port: ${REDIS_PORT:6379}
8+
password: ${REDIS_PWD:RedisPassword}
9+
#连接超时时间
10+
timeout: 5000
911
jedis:
1012
pool:
1113
max-active: 1000 # 连接池最大连接数（使用负值表示没有限制）
@@ -26,6 +28,6 @@ spring:
2628
datasource:
2729
mysql:
2830
driver-class-name: com.mysql.cj.jdbc.Driver
29-
url: jdbc:mysql://myBackEndIpAddress:mysqlPort/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
31+
url: jdbc:mysql://localhost:3306/eladmin?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
3032
username: root
3133
password: RedisPassword

‎oneHub/eladmin-versions/eladmin-2.6/datax-gateway/pom.xml

+10
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@
2727
<groupId>com.github.xiaoymin</groupId>
2828
<artifactId>knife4j-spring-ui</artifactId>
2929
<version>${knife4j.version}</version>
30+
<exclusions>
31+
<exclusion>
32+
<groupId>io.springfox</groupId>
33+
<artifactId>springfox-boot-starter</artifactId>
34+
</exclusion>
35+
</exclusions>
3036
</dependency>
3137
<dependency>
3238
<groupId>io.springfox</groupId>
@@ -37,6 +43,10 @@
3743
<groupId>io.swagger</groupId>
3844
<artifactId>swagger-models</artifactId>
3945
</exclusion>
46+
<exclusion>
47+
<groupId>io.springfox</groupId>
48+
<artifactId>springfox-boot-starter</artifactId>
49+
</exclusion>
4050
</exclusions>
4151
</dependency>
4252
<dependency>

‎oneHub/eladmin-versions/eladmin-2.6/datax-modules/codegen-service-parent/codegen-service-api/src/main/java/cn/datax/service/codegen/api/dto/GenTableDto.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
* 代码生成信息表 实体DTO
1919
* </p>
2020
*
21-
* @author yuwei
22-
* @since 2020-05-19
21+
* @author AllDataDC
22+
* @date 2022-11-19
2323
*/
2424
@ApiModel(value = "代码生成信息表Model")
2525
@Data

‎oneHub/eladmin-versions/eladmin-2.6/datax-modules/codegen-service-parent/codegen-service-api/src/main/java/cn/datax/service/codegen/api/entity/GenTableEntity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
* 代码生成信息表
1717
* </p>
1818
*
19-
* @author yuwei
20-
* @since 2020-05-19
19+
* @author AllDataDC
20+
* @date 2022-11-19
2121
*/
2222
@Data
2323
@EqualsAndHashCode(callSuper = true)

‎oneHub/eladmin-versions/eladmin-2.6/datax-modules/codegen-service-parent/codegen-service-api/src/main/java/cn/datax/service/codegen/api/query/GenTableQuery.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
* 代码生成信息表 查询实体
1010
* </p>
1111
*
12-
* @author yuwei
13-
* @since 2020-05-19
12+
* @author AllDataDC
13+
* @date 2022-11-19
1414
*/
1515
@Data
1616
@EqualsAndHashCode(callSuper = true)

‎oneHub/eladmin-versions/eladmin-2.6/datax-modules/codegen-service-parent/codegen-service-api/src/main/java/cn/datax/service/codegen/api/vo/GenTableVo.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
* 代码生成信息表 实体VO
1414
* </p>
1515
*
16-
* @author yuwei
17-
* @since 2020-05-19
16+
* @author AllDataDC
17+
* @date 2022-11-19
1818
*/
1919
@Data
2020
public class GenTableVo implements Serializable {

‎oneHub/eladmin-versions/eladmin-2.6/datax-modules/codegen-service-parent/codegen-service/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
<dependency>
3636
<groupId>org.mapstruct</groupId>
3737
<artifactId>mapstruct</artifactId>
38-
<version>1.3.1.Final</version>
38+
<version>1.4.2.Final</version>
3939
<scope>provided</scope>
4040
</dependency>
4141
<dependency>
4242
<groupId>org.mapstruct</groupId>
4343
<artifactId>mapstruct-processor</artifactId>
44-
<version>1.3.1.Final</version>
44+
<version>1.4.2.Final</version>
4545
<scope>provided</scope>
4646
</dependency>
4747
<dependency>

‎oneHub/eladmin-versions/eladmin-2.6/datax-modules/codegen-service-parent/codegen-service/src/main/java/cn/datax/service/codegen/controller/GenTableController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
* 代码生成信息表 前端控制器
3030
* </p>
3131
*
32-
* @author yuwei
33-
* @since 2020-05-19
32+
* @author AllDataDC
33+
* @date 2022-11-19
3434
*/
3535
@Api(tags = {"代码生成信息表"})
3636
@RestController

‎oneHub/eladmin-versions/eladmin-2.6/datax-modules/codegen-service-parent/codegen-service/src/main/java/cn/datax/service/codegen/dao/GenTableDao.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
* 代码生成信息表 Mapper 接口
1616
* </p>
1717
*
18-
* @author yuwei
19-
* @since 2020-05-19
18+
* @author AllDataDC
19+
* @date 2022-11-19
2020
*/
2121
@Mapper
2222
public interface GenTableDao extends BaseDao<GenTableEntity> {

‎oneHub/eladmin-versions/eladmin-2.6/datax-modules/codegen-service-parent/codegen-service/src/main/java/cn/datax/service/codegen/mapstruct/GenTableMapper.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
* 代码生成信息表 Mapper 实体映射
1212
* </p>
1313
*
14-
* @author yuwei
15-
* @since 2020-05-19
14+
* @author AllDataDC
15+
* @date 2022-11-19
1616
*/
1717
@Mapper(componentModel = "spring")
1818
public interface GenTableMapper extends EntityMapper<GenTableDto, GenTableEntity, GenTableVo> {

‎oneHub/eladmin-versions/eladmin-2.6/datax-modules/codegen-service-parent/codegen-service/src/main/java/cn/datax/service/codegen/service/GenTableService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
* 代码生成信息表 服务类
1010
* </p>
1111
*
12-
* @author yuwei
13-
* @since 2020-05-19
12+
* @author AllDataDC
13+
* @date 2022-11-19
1414
*/
1515
public interface GenTableService extends BaseService<GenTableEntity> {
1616

‎oneHub/eladmin-versions/eladmin-2.6/datax-modules/codegen-service-parent/codegen-service/src/main/java/cn/datax/service/codegen/service/impl/GenTableServiceImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* 代码生成信息表 服务实现类
1515
* </p>
1616
*
17-
* @author yuwei
18-
* @since 2020-05-19
17+
* @author AllDataDC
18+
* @date 2022-11-19
1919
*/
2020
@Service
2121
public class GenTableServiceImpl extends BaseServiceImpl<GenTableDao, GenTableEntity> implements GenTableService {

0 commit comments

Comments
 (0)