Skip to content

Commit bdf1c30

Browse files
alldatafounderalldatafounder
committed
feature(alldatadc): eladmin fix build bug
1 parent e130344 commit bdf1c30

File tree

107 files changed

+1349
-1181
lines changed

Some content is hidden

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

107 files changed

+1349
-1181
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -199,4 +199,4 @@
199199
>
200200
> curl http://localhost:8013
201201
>
202-
> 用户名：admin 密码：123456
202+
> 用户名：admin 密码：jCH4D!Peaz3MQs7D

‎oneHub/eladmin-versions/eladmin-2.6/datax-assembly/src/main/assembly/package.xml

+29-3
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@
490490
<lineEnding>unix</lineEnding>
491491
<fileMode>0755</fileMode>
492492
<includes>
493-
<include>datax-service-data-integration.sh</include>
493+
<include>data-market-service-integration.sh</include>
494494
</includes>
495495
</fileSet>
496496
<fileSet>
@@ -499,7 +499,7 @@
499499
<lineEnding>unix</lineEnding>
500500
<fileMode>0755</fileMode>
501501
<includes>
502-
<include>eladmin-system.sh</include>
502+
<include>alldata-eladmin-system.sh</include>
503503
</includes>
504504
</fileSet>
505505

@@ -567,7 +567,33 @@
567567
<include>workflow-service.sh</include>
568568
</includes>
569569
</fileSet>
570-
570+
<fileSet>
571+
<directory>${project.parent.basedir}/install/alldata_dev/16gslave</directory>
572+
<outputDirectory>./16gslave</outputDirectory>
573+
<lineEnding>unix</lineEnding>
574+
<fileMode>0755</fileMode>
575+
<includes>
576+
<include>stop16gslave.sh</include>
577+
</includes>
578+
</fileSet>
579+
<fileSet>
580+
<directory>${project.parent.basedir}/install/alldata_dev/16gmaster</directory>
581+
<outputDirectory>./16gmaster</outputDirectory>
582+
<lineEnding>unix</lineEnding>
583+
<fileMode>0755</fileMode>
584+
<includes>
585+
<include>stop16gmaster.sh</include>
586+
</includes>
587+
</fileSet>
588+
<fileSet>
589+
<directory>${project.parent.basedir}/install/alldata_dev/16gdata</directory>
590+
<outputDirectory>./16gdata</outputDirectory>
591+
<lineEnding>unix</lineEnding>
592+
<fileMode>0755</fileMode>
593+
<includes>
594+
<include>stop16gdata.sh</include>
595+
</includes>
596+
</fileSet>
571597

572598
</fileSets>
573599
</assembly>

‎oneHub/eladmin-versions/eladmin-2.6/datax-auth/src/main/java/cn/datax/auth/config/AuthorizationServerConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdap
5858
@Override
5959
public void configure(ClientDetailsServiceConfigurer clients) throws Exception {
6060
// 默认数据库的配置
61-
// datax:123456
61+
// datax:jCH4D!Peaz3MQs7D
6262
// normal-app:normal-app
6363
// trusted-app:trusted-app
6464
clients.jdbc(dataSource).clients(clientDetails());

‎oneHub/eladmin-versions/eladmin-2.6/datax-auth/src/main/resources/bootstrap.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ spring:
1818
# redis:
1919
# database: 1
2020
# host: 16gmaster
21-
# port: 6379
22-
# password: 123456
21+
# port: 13790
22+
# password: jCH4D!Peaz3MQs7D
2323
# timeout: 6000ms # 连接超时时长（毫秒）
2424
# jedis:
2525
# pool:
@@ -41,9 +41,9 @@ spring:
4141
# datasource:
4242
# mysql:
4343
# driver-class-name: com.mysql.cj.jdbc.Driver
44-
# url: jdbc:mysql://16gmaster:3306/eladmin?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
44+
# url: jdbc:mysql://16gmaster:33060/eladmin?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
4545
# username: root
46-
# password: 123456
46+
# password: jCH4D!Peaz3MQs7D
4747

4848
# 注册中心配置
4949
eureka:

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,6 @@
8383
<groupId>org.springframework.security</groupId>
8484
<artifactId>spring-security-core</artifactId>
8585
</dependency>
86-
<dependency>
87-
<groupId>com.platform</groupId>
88-
<artifactId>eladmin-service-api</artifactId>
89-
<version>2.6</version>
90-
</dependency>
9186
<!-- jwt -->
9287
<dependency>
9388
<groupId>io.jsonwebtoken</groupId>
@@ -104,5 +99,11 @@
10499
<artifactId>jjwt-jackson</artifactId>
105100
<version>${jjwt.version}</version>
106101
</dependency>
102+
<dependency>
103+
<groupId>com.platform</groupId>
104+
<artifactId>eladmin-service-api</artifactId>
105+
<version>2.6</version>
106+
<scope>compile</scope>
107+
</dependency>
107108
</dependencies>
108109
</project>

‎oneHub/eladmin-versions/eladmin-2.6/datax-common/datax-common-core/src/main/java/cn/datax/common/core/DataConstant.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public enum Security {
99
//请求头TOKEN名称
1010
TOKENHEADER("gatewayToken"),
1111
//请求头TOKEN值
12-
TOKENVALUE("datax:gateway:123456"),
12+
TOKENVALUE("datax:gateway:jCH4D!Peaz3MQs7D"),
1313
//OAUTH2请求头
1414
AUTHORIZATION("Authorization"),
1515
//OAUTH2令牌类型

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

-5
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,5 @@
3939
<artifactId>datax-common-redis</artifactId>
4040
<version>2.6</version>
4141
</dependency>
42-
<!-- <dependency>-->
43-
<!-- <groupId>com.platform</groupId>-->
44-
<!-- <artifactId>eladmin-common</artifactId>-->
45-
<!-- <version>2.6</version>-->
46-
<!-- </dependency>-->
4742
</dependencies>
4843
</project>

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

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<artifactId>eladmin</artifactId>
77
<groupId>com.platform</groupId>
88
<version>2.6</version>
9-
109
</parent>
1110
<packaging>pom</packaging>
1211
<modelVersion>4.0.0</modelVersion>

‎oneHub/eladmin-versions/eladmin-2.6/datax-config/src/main/resources/bootstrap.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ eureka:
2020
# 设置使用IP
2121
prefer-ip-address: true
2222
# 设置外网IP号
23-
ip-address: localhost
23+
ip-address: 16gmaster
2424
client:
2525
register-with-eureka: true
2626
fetch-registry: true

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ spring:
33
redis:
44
database: 1
55
host: 16gmaster
6-
port: 6379
7-
password: 123456
6+
port: 13790
7+
password: jCH4D!Peaz3MQs7D
88
timeout: 6000ms # 连接超时时长（毫秒）
99
jedis:
1010
pool:
@@ -26,6 +26,6 @@ spring:
2626
datasource:
2727
mysql:
2828
driver-class-name: com.mysql.cj.jdbc.Driver
29-
url: jdbc:mysql://16gmaster:3306/eladmin?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
29+
url: jdbc:mysql://16gmaster:33060/eladmin?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
3030
username: root
31-
password: 123456
31+
password: jCH4D!Peaz3MQs7D

‎oneHub/eladmin-versions/eladmin-2.6/datax-config/src/main/resources/config/datax-service-codegen-dev.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ spring:
33
redis:
44
database: 1
55
host: 16gmaster
6-
port: 6379
7-
password: 123456 # 密码（默认为空）
6+
port: 13790
7+
password: jCH4D!Peaz3MQs7D # 密码（默认为空）
88
timeout: 6000ms # 连接超时时长（毫秒）
99
jedis:
1010
pool:
@@ -26,10 +26,10 @@ spring:
2626
datasource:
2727
mysql:
2828
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
29-
url: jdbc:p6spy:mysql://16gmaster:3306/eladmin?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
29+
url: jdbc:p6spy:mysql://16gmaster:33060/eladmin?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
3030

3131
username: root
32-
password: 123456
32+
password: jCH4D!Peaz3MQs7D
3333

3434
mybatis-plus:
3535
mapper-locations: classpath*:mapper/*Mapper.xml
@@ -54,7 +54,7 @@ security:
5454
access-token-uri: http://16gslave:8612/auth/oauth/token
5555
user-authorization-uri: http://16gslave:8612/auth/oauth/authorize
5656
client-id: datax
57-
client-secret: 123456
57+
client-secret: jCH4D!Peaz3MQs7D
5858
scope: all
5959
resource:
6060
loadBalanced: true

‎oneHub/eladmin-versions/eladmin-2.6/datax-config/src/main/resources/config/datax-service-data-console-dev.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ spring:
33
redis:
44
database: 1
55
host: 16gmaster
6-
port: 6379
7-
password: 123456 # 密码（默认为空）
6+
port: 13790
7+
password: jCH4D!Peaz3MQs7D # 密码（默认为空）
88
timeout: 6000ms # 连接超时时长（毫秒）
99
jedis:
1010
pool:
@@ -26,10 +26,10 @@ spring:
2626
datasource:
2727
mysql:
2828
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
29-
url: jdbc:p6spy:mysql://16gmaster:3306/eladmin?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
29+
url: jdbc:p6spy:mysql://16gmaster:33060/eladmin?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
3030

3131
username: root
32-
password: 123456
32+
password: jCH4D!Peaz3MQs7D
3333

3434
mybatis-plus:
3535
mapper-locations: classpath*:mapper/*Mapper.xml
@@ -54,7 +54,7 @@ security:
5454
access-token-uri: http://16gslave:8612/auth/oauth/token
5555
user-authorization-uri: http://16gslave:8612/auth/oauth/authorize
5656
client-id: datax
57-
client-secret: 123456
57+
client-secret: jCH4D!Peaz3MQs7D
5858
scope: all
5959
resource:
6060
loadBalanced: true

‎oneHub/eladmin-versions/eladmin-2.6/datax-config/src/main/resources/config/datax-service-data-integration-dev.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ spring:
33
redis:
44
database: 1
55
host: 16gmaster
6-
port: 6379
7-
password: 123456 # 密码（默认为空）
6+
port: 13790
7+
password: jCH4D!Peaz3MQs7D # 密码（默认为空）
88
timeout: 6000ms # 连接超时时长（毫秒）
99
jedis:
1010
pool:
@@ -26,9 +26,9 @@ spring:
2626
datasource:
2727
mysql:
2828
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
29-
url: jdbc:p6spy:mysql://16gmaster:3306/eladmin?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
29+
url: jdbc:p6spy:mysql://16gmaster:33060/eladmin?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
3030
username: root
31-
password: 123456
31+
password: jCH4D!Peaz3MQs7D
3232

3333
mybatis-plus:
3434
mapper-locations: classpath*:mapper/*Mapper.xml
@@ -53,7 +53,7 @@ security:
5353
access-token-uri: http://16gslave:8612/auth/oauth/token
5454
user-authorization-uri: http://16gslave:8612/auth/oauth/authorize
5555
client-id: datax
56-
client-secret: 123456
56+
client-secret: jCH4D!Peaz3MQs7D
5757
scope: all
5858
resource:
5959
loadBalanced: true

‎oneHub/eladmin-versions/eladmin-2.6/datax-config/src/main/resources/config/datax-service-data-mapping-dev.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ spring:
33
redis:
44
database: 1
55
host: 16gmaster
6-
port: 6379
7-
password: 123456 # 密码（默认为空）
6+
port: 13790
7+
password: jCH4D!Peaz3MQs7D # 密码（默认为空）
88
timeout: 6000ms # 连接超时时长（毫秒）
99
jedis:
1010
pool:
@@ -16,7 +16,7 @@ spring:
1616
host: 16gmaster
1717
port: 25672
1818
username: admin
19-
password: 123456
19+
password: jCH4D!Peaz3MQs7D
2020
listener:
2121
simple:
2222
acknowledge-mode: manual
@@ -36,9 +36,9 @@ spring:
3636
datasource:
3737
mysql:
3838
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
39-
url: jdbc:p6spy:mysql://16gmaster:3306/eladmin?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
39+
url: jdbc:p6spy:mysql://16gmaster:33060/eladmin?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
4040
username: root
41-
password: 123456
41+
password: jCH4D!Peaz3MQs7D
4242

4343
mybatis-plus:
4444
mapper-locations: classpath*:mapper/*Mapper.xml
@@ -63,7 +63,7 @@ security:
6363
access-token-uri: http://16gslave:8612/auth/oauth/token
6464
user-authorization-uri: http://16gslave:8612/auth/oauth/authorize
6565
client-id: datax
66-
client-secret: 123456
66+
client-secret: jCH4D!Peaz3MQs7D
6767
scope: all
6868
resource:
6969
loadBalanced: true

‎oneHub/eladmin-versions/eladmin-2.6/datax-config/src/main/resources/config/datax-service-data-market-dev.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ spring:
33
redis:
44
database: 1
55
host: 16gmaster
6-
port: 6379
7-
password: 123456 # 密码（默认为空）
6+
port: 13790
7+
password: jCH4D!Peaz3MQs7D # 密码（默认为空）
88
timeout: 6000ms # 连接超时时长（毫秒）
99
jedis:
1010
pool:
@@ -16,7 +16,7 @@ spring:
1616
host: 16gmaster
1717
port: 25672
1818
username: admin
19-
password: 123456
19+
password: jCH4D!Peaz3MQs7D
2020
publisher-confirm-type: correlated
2121
publisher-returns: true
2222
template:
@@ -35,10 +35,10 @@ spring:
3535
datasource:
3636
mysql:
3737
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
38-
url: jdbc:p6spy:mysql://16gmaster:3306/eladmin?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
38+
url: jdbc:p6spy:mysql://16gmaster:33060/eladmin?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
3939

4040
username: root
41-
password: 123456
41+
password: jCH4D!Peaz3MQs7D
4242

4343
mybatis-plus:
4444
mapper-locations: classpath*:mapper/*Mapper.xml
@@ -63,7 +63,7 @@ security:
6363
access-token-uri: http://16gslave:8612/auth/oauth/token
6464
user-authorization-uri: http://16gslave:8612/auth/oauth/authorize
6565
client-id: datax
66-
client-secret: 123456
66+
client-secret: jCH4D!Peaz3MQs7D
6767
scope: all
6868
resource:
6969
loadBalanced: true

‎oneHub/eladmin-versions/eladmin-2.6/datax-config/src/main/resources/config/datax-service-data-masterdata-dev.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ spring:
33
redis:
44
database: 1
55
host: 16gmaster
6-
port: 6379
7-
password: 123456
6+
port: 13790
7+
password: jCH4D!Peaz3MQs7D
88
timeout: 6000ms # 连接超时时长（毫秒）
99
jedis:
1010
pool:
@@ -16,7 +16,7 @@ spring:
1616
host: 16gmaster
1717
port: 25672
1818
username: admin
19-
password: 123456
19+
password: jCH4D!Peaz3MQs7D
2020
listener:
2121
simple:
2222
acknowledge-mode: manual
@@ -36,10 +36,10 @@ spring:
3636
datasource:
3737
mysql:
3838
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
39-
url: jdbc:p6spy:mysql://16gmaster:3306/eladmin?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
39+
url: jdbc:p6spy:mysql://16gmaster:33060/eladmin?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
4040

4141
username: root
42-
password: 123456
42+
password: jCH4D!Peaz3MQs7D
4343

4444
mybatis-plus:
4545
mapper-locations: classpath*:mapper/*Mapper.xml
@@ -64,7 +64,7 @@ security:
6464
access-token-uri: http://16gslave:8612/auth/oauth/token
6565
user-authorization-uri: http://16gslave:8612/auth/oauth/authorize
6666
client-id: datax
67-
client-secret: 123456
67+
client-secret: jCH4D!Peaz3MQs7D
6868
scope: all
6969
resource:
7070
loadBalanced: true

0 commit comments

Comments
 (0)