diff --git a/README.md b/README.md index 24245b7b41b3b6286e71c2ad385ee1c6fff9f9e0..9e948c60af32082b9c241b4600a563d1214318dc 100644 --- a/README.md +++ b/README.md @@ -551,3 +551,4 @@ exit 0 如有问题可关注公众号 **螺旋编程极客** 交流,共同学习进步。 +https://www.yuque.com/shuizhongdeshui/hgxpwp/mn1nb3? \ No newline at end of file diff --git a/datax-auth/src/main/java/cn/datax/auth/config/DataWebSecurityConfigurer.java b/datax-auth/src/main/java/cn/datax/auth/config/DataWebSecurityConfigurer.java index c386e9ee5f8cf97defc8b0e0b99b739cba307ded..60eed61c5e0e01780a2eb5c1e5092a270bf3a2ea 100644 --- a/datax-auth/src/main/java/cn/datax/auth/config/DataWebSecurityConfigurer.java +++ b/datax-auth/src/main/java/cn/datax/auth/config/DataWebSecurityConfigurer.java @@ -28,7 +28,8 @@ public class DataWebSecurityConfigurer extends WebSecurityConfigurerAdapter { http .authorizeRequests() .anyRequest().authenticated() - .and().csrf().disable(); + .and().csrf().disable() + ; } @Override diff --git a/datax-auth/src/main/resources/bootstrap.yml b/datax-auth/src/main/resources/bootstrap.yml index 9b147b24a50f463d2e2e41a94913efecbad630d0..ae1d5470c7afd6719c9f80919b4159169d6c0b4f 100644 --- a/datax-auth/src/main/resources/bootstrap.yml +++ b/datax-auth/src/main/resources/bootstrap.yml @@ -14,7 +14,6 @@ spring: discovery: enabled: true service-id: datax-config - # 注册中心配置 eureka: instance: @@ -22,11 +21,12 @@ eureka: # 设置使用IP prefer-ip-address: true # 设置外网IP号 - ip-address: localhost + ip-address: 111.231.19.173 client: register-with-eureka: true fetch-registry: true instance-info-replication-interval-seconds: 30 registry-fetch-interval-seconds: 3 service-url: - defaultZone: http://localhost:8610/eureka + defaultZone: http://111.231.19.173:8610/eureka +#debug: true diff --git a/datax-common/datax-common-database/src/main/java/cn/datax/common/database/constants/DbType.java b/datax-common/datax-common-database/src/main/java/cn/datax/common/database/constants/DbType.java index b465ec6c5ac5bd34b752b317d59e9da0377e8a8b..a6fe613451d2ca03ae85ad594a1990cbe5c65009 100644 --- a/datax-common/datax-common-database/src/main/java/cn/datax/common/database/constants/DbType.java +++ b/datax-common/datax-common-database/src/main/java/cn/datax/common/database/constants/DbType.java @@ -11,7 +11,7 @@ public enum DbType { /** * MYSQL */ - MYSQL("1", "MySql数据库", "jdbc:mysql://${host}:${port}/${dbName}?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8"), + MYSQL("1", "MySql数据库", "jdbc:mysql://${host}:${port}/${dbName}?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8"), /** * MARIADB */ diff --git a/datax-common/datax-common-office/libs/aspose-words-20.3.jar b/datax-common/datax-common-office/libs/aspose-words-20.3.jar new file mode 100644 index 0000000000000000000000000000000000000000..4db4eb8d7fc0ba1690897e66b733f053c2630bcc Binary files /dev/null and b/datax-common/datax-common-office/libs/aspose-words-20.3.jar differ diff --git a/datax-common/datax-common-office/pom.xml b/datax-common/datax-common-office/pom.xml index 2483b61960ff20ae42327adc0a448a283765f617..0835798977a1ff35e015e4fa3745ab9666dac827 100644 --- a/datax-common/datax-common-office/pom.xml +++ b/datax-common/datax-common-office/pom.xml @@ -16,6 +16,8 @@ com.aspose aspose-words ${aspose.version} + system + ${project.basedir}/libs/aspose-words-20.3.jar \ No newline at end of file diff --git a/datax-config/src/main/resources/bootstrap.yml b/datax-config/src/main/resources/bootstrap.yml index 4b7edbe3d07b1f0839122883a94a93f92ae46510..2b1bc456e0046bf6ce94e9d658a376bc9e6f19ad 100644 --- a/datax-config/src/main/resources/bootstrap.yml +++ b/datax-config/src/main/resources/bootstrap.yml @@ -20,14 +20,14 @@ eureka: # 设置使用IP prefer-ip-address: true # 设置外网IP号 - ip-address: localhost + ip-address: 111.231.19.173 client: register-with-eureka: true fetch-registry: true instance-info-replication-interval-seconds: 30 registry-fetch-interval-seconds: 3 service-url: - defaultZone: http://localhost:8610/eureka + defaultZone: http://111.231.19.173:8610/eureka # 暴露监控端点 management: diff --git a/datax-config/src/main/resources/config/datax-auth-dev.yml b/datax-config/src/main/resources/config/datax-auth-dev.yml index d5cc6371452c4dd4dd2db4d4c6ce5d5f31093005..14299e55f2565e2abfbbc6bd4ea55b854e825b3e 100644 --- a/datax-config/src/main/resources/config/datax-auth-dev.yml +++ b/datax-config/src/main/resources/config/datax-auth-dev.yml @@ -2,13 +2,13 @@ spring: redis: database: 1 - host: 127.0.0.1 - port: 6379 - password: + host: 111.231.19.173 + port: 63790 + password: '!QAZxsw2==' timeout: 6000ms # 连接超时时长(毫秒) jedis: pool: - max-active: 1000 # 连接池最大连接数(使用负值表示没有限制) + max-active: 10 # 连接池最大连接数(使用负值表示没有限制) max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制) max-idle: 10 # 连接池中的最大空闲连接 min-idle: 5 # 连接池中的最小空闲连接 @@ -26,6 +26,6 @@ spring: datasource: mysql: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://111.231.19.173:33060/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 username: root - password: ?rrq,oq),8cX + password: '!QAZxsw2=$' diff --git a/datax-config/src/main/resources/config/datax-service-codegen-dev.yml b/datax-config/src/main/resources/config/datax-service-codegen-dev.yml index 7fc57462b1ead9214be80059481f958a1b93eac8..63b30ed25405109374c84dbeeff86deed13f1e4c 100644 --- a/datax-config/src/main/resources/config/datax-service-codegen-dev.yml +++ b/datax-config/src/main/resources/config/datax-service-codegen-dev.yml @@ -2,13 +2,13 @@ spring: redis: database: 1 - host: 127.0.0.1 - port: 6379 - password: # 密码(默认为空) + host: 111.231.19.173 + port: 63790 + password: '!QAZxsw2==' # 密码(默认为空) timeout: 6000ms # 连接超时时长(毫秒) jedis: pool: - max-active: 1000 # 连接池最大连接数(使用负值表示没有限制) + max-active: 10 # 连接池最大连接数(使用负值表示没有限制) max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制) max-idle: 10 # 连接池中的最大空闲连接 min-idle: 5 # 连接池中的最小空闲连接 @@ -26,9 +26,9 @@ spring: datasource: mysql: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - url: jdbc:p6spy:mysql://127.0.0.1:3306/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:p6spy:mysql://111.231.19.173:33060/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 username: root - password: ?rrq,oq),8cX + password: '!QAZxsw2=$' mybatis-plus: mapper-locations: classpath*:mapper/*Mapper.xml diff --git a/datax-config/src/main/resources/config/datax-service-data-console-dev.yml b/datax-config/src/main/resources/config/datax-service-data-console-dev.yml index 6636ac02ba8defc6eb0423103f40ebbda993b254..d7fc807df785ab53754e445251049aa2bb3f5cf8 100644 --- a/datax-config/src/main/resources/config/datax-service-data-console-dev.yml +++ b/datax-config/src/main/resources/config/datax-service-data-console-dev.yml @@ -2,13 +2,13 @@ spring: redis: database: 1 - host: 127.0.0.1 - port: 6379 - password: # 密码(默认为空) + host: 111.231.19.173 + port: 63790 + password: '!QAZxsw2==' # 密码(默认为空) timeout: 6000ms # 连接超时时长(毫秒) jedis: pool: - max-active: 1000 # 连接池最大连接数(使用负值表示没有限制) + max-active: 10 # 连接池最大连接数(使用负值表示没有限制) max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制) max-idle: 10 # 连接池中的最大空闲连接 min-idle: 5 # 连接池中的最小空闲连接 @@ -26,9 +26,9 @@ spring: datasource: mysql: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - url: jdbc:p6spy:mysql://127.0.0.1:3306/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:p6spy:mysql://111.231.19.173:33060/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 username: root - password: ?rrq,oq),8cX + password: '!QAZxsw2=$' mybatis-plus: mapper-locations: classpath*:mapper/*Mapper.xml diff --git a/datax-config/src/main/resources/config/datax-service-data-integration-dev.yml b/datax-config/src/main/resources/config/datax-service-data-integration-dev.yml index 7155546ef69ff6fe8ef9d31fbd22343205e3013c..0135a6f86c039557275e8cc43ab7f6733b4d6283 100644 --- a/datax-config/src/main/resources/config/datax-service-data-integration-dev.yml +++ b/datax-config/src/main/resources/config/datax-service-data-integration-dev.yml @@ -2,13 +2,13 @@ spring: redis: database: 1 - host: 127.0.0.1 - port: 6379 - password: # 密码(默认为空) + host: 111.231.19.173 + port: 63790 + password: '!QAZxsw2==' # 密码(默认为空) timeout: 6000ms # 连接超时时长(毫秒) jedis: pool: - max-active: 1000 # 连接池最大连接数(使用负值表示没有限制) + max-active: 10 # 连接池最大连接数(使用负值表示没有限制) max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制) max-idle: 10 # 连接池中的最大空闲连接 min-idle: 5 # 连接池中的最小空闲连接 @@ -26,9 +26,9 @@ spring: datasource: mysql: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - url: jdbc:p6spy:mysql://127.0.0.1:3306/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:p6spy:mysql://111.231.19.173:33060/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 username: root - password: ?rrq,oq),8cX + password: '!QAZxsw2=$' mybatis-plus: mapper-locations: classpath*:mapper/*Mapper.xml diff --git a/datax-config/src/main/resources/config/datax-service-data-mapping-dev.yml b/datax-config/src/main/resources/config/datax-service-data-mapping-dev.yml index ffd8e825b32b2f03258a788bfca788d644a218ba..d8cf7a0a1fe29013b95d8bf56f5f8af0c01ac438 100644 --- a/datax-config/src/main/resources/config/datax-service-data-mapping-dev.yml +++ b/datax-config/src/main/resources/config/datax-service-data-mapping-dev.yml @@ -2,13 +2,13 @@ spring: redis: database: 1 - host: 127.0.0.1 - port: 6379 - password: # 密码(默认为空) + host: 111.231.19.173 + port: 63790 + password: '!QAZxsw2==' # 密码(默认为空) timeout: 6000ms # 连接超时时长(毫秒) jedis: pool: - max-active: 1000 # 连接池最大连接数(使用负值表示没有限制) + max-active: 10 # 连接池最大连接数(使用负值表示没有限制) max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制) max-idle: 10 # 连接池中的最大空闲连接 min-idle: 5 # 连接池中的最小空闲连接 @@ -36,9 +36,9 @@ spring: datasource: mysql: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - url: jdbc:p6spy:mysql://127.0.0.1:3306/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:p6spy:mysql://111.231.19.173:33060/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 username: root - password: ?rrq,oq),8cX + password: '!QAZxsw2=$' mybatis-plus: mapper-locations: classpath*:mapper/*Mapper.xml diff --git a/datax-config/src/main/resources/config/datax-service-data-market-dev.yml b/datax-config/src/main/resources/config/datax-service-data-market-dev.yml index 04fe43105ad6ee0a4df3e85736d9bc180188f069..52de411131fdb82fe7c6c1393e793b91f0cff00e 100644 --- a/datax-config/src/main/resources/config/datax-service-data-market-dev.yml +++ b/datax-config/src/main/resources/config/datax-service-data-market-dev.yml @@ -2,13 +2,13 @@ spring: redis: database: 1 - host: 127.0.0.1 - port: 6379 - password: # 密码(默认为空) + host: 111.231.19.173 + port: 63790 + password: '!QAZxsw2==' # 密码(默认为空) timeout: 6000ms # 连接超时时长(毫秒) jedis: pool: - max-active: 1000 # 连接池最大连接数(使用负值表示没有限制) + max-active: 10 # 连接池最大连接数(使用负值表示没有限制) max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制) max-idle: 10 # 连接池中的最大空闲连接 min-idle: 5 # 连接池中的最小空闲连接 @@ -35,9 +35,9 @@ spring: datasource: mysql: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - url: jdbc:p6spy:mysql://127.0.0.1:3306/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:p6spy:mysql://111.231.19.173:33060/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 username: root - password: ?rrq,oq),8cX + password: '!QAZxsw2=$' mybatis-plus: mapper-locations: classpath*:mapper/*Mapper.xml diff --git a/datax-config/src/main/resources/config/datax-service-data-masterdata-dev.yml b/datax-config/src/main/resources/config/datax-service-data-masterdata-dev.yml index 9d5f775ab9df6413ea09922e884960476703fc9a..38d7326e7b3aa78a18470c02c7d5b21b109013b2 100644 --- a/datax-config/src/main/resources/config/datax-service-data-masterdata-dev.yml +++ b/datax-config/src/main/resources/config/datax-service-data-masterdata-dev.yml @@ -2,13 +2,13 @@ spring: redis: database: 1 - host: 127.0.0.1 - port: 6379 - password: + host: 111.231.19.173 + port: 63790 + password: '!QAZxsw2==' timeout: 6000ms # 连接超时时长(毫秒) jedis: pool: - max-active: 1000 # 连接池最大连接数(使用负值表示没有限制) + max-active: 10 # 连接池最大连接数(使用负值表示没有限制) max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制) max-idle: 10 # 连接池中的最大空闲连接 min-idle: 5 # 连接池中的最小空闲连接 @@ -36,9 +36,9 @@ spring: datasource: mysql: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - url: jdbc:p6spy:mysql://127.0.0.1:3306/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:p6spy:mysql://111.231.19.173:33060/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 username: root - password: ?rrq,oq),8cX + password: '!QAZxsw2=$' mybatis-plus: mapper-locations: classpath*:mapper/*Mapper.xml diff --git a/datax-config/src/main/resources/config/datax-service-data-metadata-dev.yml b/datax-config/src/main/resources/config/datax-service-data-metadata-dev.yml index d9f13e57f4a1d00dd324723ea6e10f770f75ceb0..24eefc2eec74e0e50b31421a35edaa7241bdb1f3 100644 --- a/datax-config/src/main/resources/config/datax-service-data-metadata-dev.yml +++ b/datax-config/src/main/resources/config/datax-service-data-metadata-dev.yml @@ -2,13 +2,13 @@ spring: redis: database: 1 - host: 127.0.0.1 - port: 6379 - password: # 密码(默认为空) + host: 111.231.19.173 + port: 63790 + password: '!QAZxsw2==' # 密码(默认为空) timeout: 6000ms # 连接超时时长(毫秒) jedis: pool: - max-active: 1000 # 连接池最大连接数(使用负值表示没有限制) + max-active: 10 # 连接池最大连接数(使用负值表示没有限制) max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制) max-idle: 10 # 连接池中的最大空闲连接 min-idle: 5 # 连接池中的最小空闲连接 @@ -26,9 +26,9 @@ spring: datasource: mysql: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - url: jdbc:p6spy:mysql://127.0.0.1:3306/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:p6spy:mysql://111.231.19.173:33060/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 username: root - password: ?rrq,oq),8cX + password: '!QAZxsw2=$' mybatis-plus: mapper-locations: classpath*:mapper/*Mapper.xml diff --git a/datax-config/src/main/resources/config/datax-service-data-quality-dev.yml b/datax-config/src/main/resources/config/datax-service-data-quality-dev.yml index c89e0b7cc4cf77d3ff772db55a26c400d8ac67e8..26bdd0b584219fc3f34b3d85f1c191438c2cc020 100644 --- a/datax-config/src/main/resources/config/datax-service-data-quality-dev.yml +++ b/datax-config/src/main/resources/config/datax-service-data-quality-dev.yml @@ -2,13 +2,13 @@ spring: redis: database: 1 - host: 127.0.0.1 - port: 6379 - password: # 密码(默认为空) + host: 111.231.19.173 + port: 63790 + password: '!QAZxsw2==' # 密码(默认为空) timeout: 6000ms # 连接超时时长(毫秒) jedis: pool: - max-active: 1000 # 连接池最大连接数(使用负值表示没有限制) + max-active: 10 # 连接池最大连接数(使用负值表示没有限制) max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制) max-idle: 10 # 连接池中的最大空闲连接 min-idle: 5 # 连接池中的最小空闲连接 @@ -26,9 +26,9 @@ spring: datasource: mysql: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - url: jdbc:p6spy:mysql://127.0.0.1:3306/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:p6spy:mysql://111.231.19.173:33060/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 username: root - password: ?rrq,oq),8cX + password: '!QAZxsw2=$' mybatis-plus: mapper-locations: classpath*:mapper/*Mapper.xml diff --git a/datax-config/src/main/resources/config/datax-service-data-standard-dev.yml b/datax-config/src/main/resources/config/datax-service-data-standard-dev.yml index 34b3a6b7713d3dc6dfc2afd72a6022a7245f669c..8d6212253523ae480524848677085ece0894bcea 100644 --- a/datax-config/src/main/resources/config/datax-service-data-standard-dev.yml +++ b/datax-config/src/main/resources/config/datax-service-data-standard-dev.yml @@ -2,13 +2,13 @@ spring: redis: database: 1 - host: 127.0.0.1 - port: 6379 - password: # 密码(默认为空) + host: 111.231.19.173 + port: 63790 + password: '!QAZxsw2==' # 密码(默认为空) timeout: 6000ms # 连接超时时长(毫秒) jedis: pool: - max-active: 1000 # 连接池最大连接数(使用负值表示没有限制) + max-active: 10 # 连接池最大连接数(使用负值表示没有限制) max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制) max-idle: 10 # 连接池中的最大空闲连接 min-idle: 5 # 连接池中的最小空闲连接 @@ -26,9 +26,9 @@ spring: datasource: mysql: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - url: jdbc:p6spy:mysql://127.0.0.1:3306/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:p6spy:mysql://111.231.19.173:33060/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 username: root - password: ?rrq,oq),8cX + password: '!QAZxsw2=$' mybatis-plus: mapper-locations: classpath*:mapper/*Mapper.xml diff --git a/datax-config/src/main/resources/config/datax-service-data-visual-dev.yml b/datax-config/src/main/resources/config/datax-service-data-visual-dev.yml index c5e93b5c655f0ece45c5a3e5634d577c802a75ae..830f38069324a55876daae3f4d5f9c501a942d6f 100644 --- a/datax-config/src/main/resources/config/datax-service-data-visual-dev.yml +++ b/datax-config/src/main/resources/config/datax-service-data-visual-dev.yml @@ -2,13 +2,13 @@ spring: redis: database: 1 - host: 127.0.0.1 - port: 6379 - password: # 密码(默认为空) + host: 111.231.19.173 + port: 63790 + password: '!QAZxsw2==' # 密码(默认为空) timeout: 6000ms # 连接超时时长(毫秒) jedis: pool: - max-active: 1000 # 连接池最大连接数(使用负值表示没有限制) + max-active: 10 # 连接池最大连接数(使用负值表示没有限制) max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制) max-idle: 10 # 连接池中的最大空闲连接 min-idle: 5 # 连接池中的最小空闲连接 @@ -26,9 +26,9 @@ spring: datasource: mysql: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - url: jdbc:p6spy:mysql://127.0.0.1:3306/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:p6spy:mysql://111.231.19.173:33060/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 username: root - password: ?rrq,oq),8cX + password: '!QAZxsw2=$' mybatis-plus: mapper-locations: classpath*:mapper/*Mapper.xml diff --git a/datax-config/src/main/resources/config/datax-service-email-dev.yml b/datax-config/src/main/resources/config/datax-service-email-dev.yml index 43189be1ff5b3fe7bc653d415471daad183df627..e71786a5c3f1ff559c43b241914fbab6f7ccc72b 100644 --- a/datax-config/src/main/resources/config/datax-service-email-dev.yml +++ b/datax-config/src/main/resources/config/datax-service-email-dev.yml @@ -13,13 +13,13 @@ spring: properties.mail.smtp.ssl.enable: true redis: database: 1 - host: 127.0.0.1 - port: 6379 - password: # 密码(默认为空) + host: 111.231.19.173 + port: 63790 + password: '!QAZxsw2==' # 密码(默认为空) timeout: 6000ms # 连接超时时长(毫秒) jedis: pool: - max-active: 1000 # 连接池最大连接数(使用负值表示没有限制) + max-active: 10 # 连接池最大连接数(使用负值表示没有限制) max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制) max-idle: 10 # 连接池中的最大空闲连接 min-idle: 5 # 连接池中的最小空闲连接 @@ -37,9 +37,9 @@ spring: datasource: mysql: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - url: jdbc:p6spy:mysql://127.0.0.1:3306/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:p6spy:mysql://111.231.19.173:33060/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 username: root - password: ?rrq,oq),8cX + password: '!QAZxsw2=$' mybatis-plus: mapper-locations: classpath*:mapper/*Mapper.xml diff --git a/datax-config/src/main/resources/config/datax-service-file-dev.yml b/datax-config/src/main/resources/config/datax-service-file-dev.yml index b4b837fb3d8cbae3740947706c4650b112727d84..cc5b57c5c55c036e50c21dcddb755f2d91f41116 100644 --- a/datax-config/src/main/resources/config/datax-service-file-dev.yml +++ b/datax-config/src/main/resources/config/datax-service-file-dev.yml @@ -2,13 +2,13 @@ spring: redis: database: 1 - host: 127.0.0.1 - port: 6379 - password: # 密码(默认为空) + host: 111.231.19.173 + port: 63790 + password: '!QAZxsw2==' # 密码(默认为空) timeout: 6000ms # 连接超时时长(毫秒) jedis: pool: - max-active: 1000 # 连接池最大连接数(使用负值表示没有限制) + max-active: 10 # 连接池最大连接数(使用负值表示没有限制) max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制) max-idle: 10 # 连接池中的最大空闲连接 min-idle: 5 # 连接池中的最小空闲连接 @@ -26,9 +26,9 @@ spring: datasource: mysql: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - url: jdbc:p6spy:mysql://127.0.0.1:3306/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:p6spy:mysql://111.231.19.173:33060/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 username: root - password: ?rrq,oq),8cX + password: '!QAZxsw2=$' mybatis-plus: mapper-locations: classpath*:mapper/*Mapper.xml diff --git a/datax-config/src/main/resources/config/datax-service-quartz-dev.yml b/datax-config/src/main/resources/config/datax-service-quartz-dev.yml index 31c943b64843771b3119b2b250caf14fb2d88f2b..40ff9ab2bc9a0fe2af5ccb0fda92f76fff879a0d 100644 --- a/datax-config/src/main/resources/config/datax-service-quartz-dev.yml +++ b/datax-config/src/main/resources/config/datax-service-quartz-dev.yml @@ -2,13 +2,13 @@ spring: redis: database: 1 - host: 127.0.0.1 - port: 6379 - password: # 密码(默认为空) + host: 111.231.19.173 + port: 63790 + password: '!QAZxsw2==' # 密码(默认为空) timeout: 6000ms # 连接超时时长(毫秒) jedis: pool: - max-active: 1000 # 连接池最大连接数(使用负值表示没有限制) + max-active: 10 # 连接池最大连接数(使用负值表示没有限制) max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制) max-idle: 10 # 连接池中的最大空闲连接 min-idle: 5 # 连接池中的最小空闲连接 @@ -24,13 +24,13 @@ spring: primary: driver-class-name: com.mysql.cj.jdbc.Driver username: root - password: ?rrq,oq),8cX - url: jdbc:mysql://127.0.0.1:3306/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + password: 123456 + url: jdbc:mysql://111.231.19.173:33060/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 quartz: driver-class-name: com.mysql.cj.jdbc.Driver username: root - password: ?rrq,oq),8cX - url: jdbc:mysql://127.0.0.1:3306/data_cloud_quartz?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + password: 123456 + url: jdbc:mysql://111.231.19.173:33060/data_cloud_quartz?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 quartz: job-store-type: jdbc jdbc: diff --git a/datax-config/src/main/resources/config/datax-service-system-dev.yml b/datax-config/src/main/resources/config/datax-service-system-dev.yml index 8c646703bbcd1a3380114c6e9d8bc73f639e9ca9..01831e194cf100f04fd7cbdcf024328cec5a6056 100644 --- a/datax-config/src/main/resources/config/datax-service-system-dev.yml +++ b/datax-config/src/main/resources/config/datax-service-system-dev.yml @@ -2,13 +2,13 @@ spring: redis: database: 1 - host: 127.0.0.1 - port: 6379 - password: # 密码(默认为空) + host: 111.231.19.173 + port: 63790 + password: '!QAZxsw2==' # 密码(默认为空) timeout: 6000ms # 连接超时时长(毫秒) jedis: pool: - max-active: 1000 # 连接池最大连接数(使用负值表示没有限制) + max-active: 10 # 连接池最大连接数(使用负值表示没有限制) max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制) max-idle: 10 # 连接池中的最大空闲连接 min-idle: 5 # 连接池中的最小空闲连接 @@ -26,9 +26,9 @@ spring: datasource: mysql: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - url: jdbc:p6spy:mysql://127.0.0.1:3306/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:p6spy:mysql://111.231.19.173:33060/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 username: root - password: ?rrq,oq),8cX + password: '!QAZxsw2=$' mybatis-plus: mapper-locations: classpath*:mapper/*Mapper.xml diff --git a/datax-config/src/main/resources/config/datax-service-workflow-dev.yml b/datax-config/src/main/resources/config/datax-service-workflow-dev.yml index d753364565a59c6d137c5dc508593d757b5fc537..0098a22fe4a75f0ccc72183a117bb5b27fe37b8b 100644 --- a/datax-config/src/main/resources/config/datax-service-workflow-dev.yml +++ b/datax-config/src/main/resources/config/datax-service-workflow-dev.yml @@ -2,13 +2,13 @@ spring: redis: database: 1 - host: 127.0.0.1 - port: 6379 - password: # 密码(默认为空) + host: 111.231.19.173 + port: 63790 + password: '!QAZxsw2==' # 密码(默认为空) timeout: 6000ms # 连接超时时长(毫秒) jedis: pool: - max-active: 1000 # 连接池最大连接数(使用负值表示没有限制) + max-active: 10 # 连接池最大连接数(使用负值表示没有限制) max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制) max-idle: 10 # 连接池中的最大空闲连接 min-idle: 5 # 连接池中的最小空闲连接 @@ -35,15 +35,15 @@ spring: datasource: mysql: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - url: jdbc:p6spy:mysql://127.0.0.1:3306/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:p6spy:mysql://111.231.19.173:33060/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 username: root - password: ?rrq,oq),8cX + password: '!QAZxsw2=$' flowable: driver-class-name: com.mysql.cj.jdbc.Driver username: root - password: ?rrq,oq),8cX + password: '!QAZxsw2=$' # 如果不加这个参数,建表会失败:nullCatalogMeansCurrent=true - url: jdbc:mysql://127.0.0.1:3306/data_cloud_flowable?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true + url: jdbc:mysql://111.231.19.173:33060/data_cloud_flowable?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true flowable: # 关闭定时任务JOB diff --git a/datax-eureka/src/main/resources/bootstrap.yml b/datax-eureka/src/main/resources/bootstrap.yml index c7e380715869b144835833a5ee2ee3db44c62323..08ec1bfc0fd42c70dd345cee2767ca886e517a50 100644 --- a/datax-eureka/src/main/resources/bootstrap.yml +++ b/datax-eureka/src/main/resources/bootstrap.yml @@ -12,7 +12,7 @@ eureka: # 设置使用IP prefer-ip-address: true # 设置外网IP号 - ip-address: localhost + ip-address: 111.231.19.173 client: register-with-eureka: false fetch-registry: false diff --git a/datax-gateway/src/main/resources/bootstrap.yml b/datax-gateway/src/main/resources/bootstrap.yml index cfd32c20f9399792df3bc892348e8f96eb21c11a..81cc22f0c70470def68157e0e16bcb2fe0066e01 100644 --- a/datax-gateway/src/main/resources/bootstrap.yml +++ b/datax-gateway/src/main/resources/bootstrap.yml @@ -22,11 +22,11 @@ eureka: # 设置使用IP prefer-ip-address: true # 设置外网IP号 - ip-address: localhost + ip-address: 111.231.19.173 client: register-with-eureka: true fetch-registry: true instance-info-replication-interval-seconds: 30 registry-fetch-interval-seconds: 3 service-url: - defaultZone: http://localhost:8610/eureka \ No newline at end of file + defaultZone: http://111.231.19.173:8610/eureka \ No newline at end of file diff --git a/datax-gateway/src/main/resources/static/static/js/chunk-151ccd58.d9537eb2.js b/datax-gateway/src/main/resources/static/static/js/chunk-151ccd58.d9537eb2.js index fa3b8c578e50eacde086eb1991dcd918b47bf46d..822678a79c0bc36b629a68917f90d5ccbff20577 100644 --- a/datax-gateway/src/main/resources/static/static/js/chunk-151ccd58.d9537eb2.js +++ b/datax-gateway/src/main/resources/static/static/js/chunk-151ccd58.d9537eb2.js @@ -1,4 +1,4 @@ -(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-151ccd58","chunk-f997572c","chunk-7d11412e","chunk-2b12f9e6","chunk-cb7c7d5e","chunk-8ee67034","chunk-33d98211","chunk-ab13d2fa","chunk-eee0efce","chunk-30ca8599","chunk-ef9784da","chunk-57e8856e","chunk-59a71eaa","chunk-66112764","chunk-2d230fe7"],{"0089":function(e,t,n){"use strict";n.r(t);var a=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("el-card",{staticClass:"box-card",attrs:{shadow:"always"}},[n("el-form",{ref:"queryForm",attrs:{model:e.queryParams,inline:!0}},[n("el-form-item",{attrs:{label:"字段名称",prop:"fieldName"}},[n("el-input",{attrs:{placeholder:"请输入字段名称",clearable:"",size:"small"},nativeOn:{keyup:function(t){return!t.type.indexOf("key")&&e._k(t.keyCode,"enter",13,t.key,"Enter")?null:e.handleQuery(t)}},model:{value:e.queryParams.fieldName,callback:function(t){e.$set(e.queryParams,"fieldName",t)},expression:"queryParams.fieldName"}})],1),n("el-form-item",[n("el-button",{attrs:{type:"primary",icon:"el-icon-search",size:"mini"},on:{click:e.handleQuery}},[e._v("搜索")]),n("el-button",{attrs:{icon:"el-icon-refresh",size:"mini"},on:{click:e.resetQuery}},[e._v("重置")])],1)],1),n("el-row",{attrs:{type:"flex",justify:"space-between"}},[n("el-col",{attrs:{span:12}},[n("el-button-group")],1),n("el-col",{attrs:{span:12}},[n("div",{staticClass:"right-toolbar"},[n("el-tooltip",{attrs:{content:"密度",effect:"dark",placement:"top"}},[n("el-dropdown",{attrs:{trigger:"click"},on:{command:e.handleCommand}},[n("el-button",{attrs:{circle:"",size:"mini"}},[n("svg-icon",{attrs:{"class-name":"size-icon","icon-class":"colum-height"}})],1),n("el-dropdown-menu",{attrs:{slot:"dropdown"},slot:"dropdown"},[n("el-dropdown-item",{attrs:{command:"medium"}},[e._v("正常")]),n("el-dropdown-item",{attrs:{command:"small"}},[e._v("中等")]),n("el-dropdown-item",{attrs:{command:"mini"}},[e._v("紧凑")])],1)],1)],1),n("el-tooltip",{attrs:{content:"刷新",effect:"dark",placement:"top"}},[n("el-button",{attrs:{circle:"",size:"mini"},on:{click:e.handleRefresh}},[n("svg-icon",{attrs:{"class-name":"size-icon","icon-class":"shuaxin"}})],1)],1),n("el-tooltip",{attrs:{content:"列设置",effect:"dark",placement:"top"}},[n("el-popover",{attrs:{placement:"bottom",width:"100",trigger:"click"}},[n("el-checkbox-group",{on:{change:e.handleCheckedColsChange},model:{value:e.checkedTableColumns,callback:function(t){e.checkedTableColumns=t},expression:"checkedTableColumns"}},e._l(e.tableColumns,(function(t,a){return n("el-checkbox",{key:a,attrs:{label:t.prop}},[e._v(e._s(t.label))])})),1),n("span",{attrs:{slot:"reference"},slot:"reference"},[n("el-button",{attrs:{circle:"",size:"mini"}},[n("svg-icon",{attrs:{"class-name":"size-icon","icon-class":"shezhi"}})],1)],1)],1)],1)],1)])],1),n("el-table",{directives:[{name:"loading",rawName:"v-loading",value:e.loading,expression:"loading"}],staticStyle:{width:"100%",margin:"15px 0"},attrs:{data:e.changeRecordList,border:"","tooltip-effect":"dark",size:e.tableSize,height:e.tableHeight}},[n("el-table-column",{attrs:{type:"selection",width:"55",align:"center"}}),n("el-table-column",{attrs:{label:"序号",width:"55",align:"center"},scopedSlots:e._u([{key:"default",fn:function(t){return[n("span",[e._v(e._s(t.$index+1))])]}}])}),e._l(e.tableColumns,(function(t,a){return[t.show?n("el-table-column",{key:a,attrs:{prop:t.prop,label:t.label,formatter:t.formatter,align:"center","show-overflow-tooltip":""}}):e._e()]})),n("el-table-column",{attrs:{label:"操作",align:"center","class-name":"small-padding fixed-width"},scopedSlots:e._u([{key:"default",fn:function(t){return[n("el-popover",{attrs:{placement:"left",trigger:"click"}},[n("el-button",{directives:[{name:"hasPerm",rawName:"v-hasPerm",value:["metadata:changerecord:edit"],expression:"['metadata:changerecord:edit']"}],attrs:{size:"mini",type:"text",icon:"el-icon-edit-outline"},on:{click:function(n){return e.handleEdit(t.row)}}},[e._v("修改")]),n("el-button",{directives:[{name:"hasPerm",rawName:"v-hasPerm",value:["metadata:changerecord:detail"],expression:"['metadata:changerecord:detail']"}],attrs:{size:"mini",type:"text",icon:"el-icon-view"},on:{click:function(n){return e.handleDetail(t.row)}}},[e._v("详情")]),n("el-button",{directives:[{name:"hasPerm",rawName:"v-hasPerm",value:["metadata:changerecord:remove"],expression:"['metadata:changerecord:remove']"}],attrs:{size:"mini",type:"text",icon:"el-icon-delete"},on:{click:function(n){return e.handleDelete(t.row)}}},[e._v("删除")]),n("el-button",{attrs:{slot:"reference"},slot:"reference"},[e._v("操作")])],1)]}}])})],2),n("el-pagination",{attrs:{"page-sizes":[10,20,50,100],layout:"total, sizes, prev, pager, next, jumper","current-page":e.queryParams.pageNum,"page-size":e.queryParams.pageSize,total:e.total},on:{"update:currentPage":function(t){return e.$set(e.queryParams,"pageNum",t)},"update:current-page":function(t){return e.$set(e.queryParams,"pageNum",t)},"update:pageSize":function(t){return e.$set(e.queryParams,"pageSize",t)},"update:page-size":function(t){return e.$set(e.queryParams,"pageSize",t)},"size-change":e.handleSizeChange,"current-change":e.handleCurrentChange}})],1)},r=[],i=(n("4ec9"),n("d3b7"),n("3ca3"),n("ddb0"),n("d81d"),n("159b"),n("caad"),n("2532"),n("a54d")),o={name:"ChangeRecordList",data:function(){return{tableHeight:document.body.offsetHeight-310+"px",showOptions:{data:{},showList:!0,showAdd:!1,showEdit:!1,showDetail:!1},loading:!0,tableColumns:[{prop:"sourceName",label:"数据源",show:!0},{prop:"tableName",label:"数据库表",show:!0},{prop:"fieldName",label:"变更字段",show:!0},{prop:"objectType",label:"变更类型",show:!0,formatter:this.fieldNameFormatter},{prop:"fieldOldValue",label:"原来的值",show:!0},{prop:"fieldNewValue",label:"最新的值",show:!0},{prop:"version",label:"版本号",show:!0},{prop:"status",label:"状态",show:!0,formatter:this.statusFormatter},{prop:"createTime",label:"创建时间",show:!0}],checkedTableColumns:[],tableSize:"medium",statusOptions:[],changeRecordList:[],total:0,queryParams:{pageNum:1,pageSize:20,fieldName:""},dicts:new Map([["columnName","字段名称"],["columnComment","字段注释"],["dataDefault","数据默认值"],["columnKey","是否主键"],["columnNullable","是否允许为空"],["dataType","数据类型"],["dataLength","数据长度"],["dataPrecision","数据精度"],["dataScale","数据小数位"]])}},created:function(){var e=this;this.getDicts("sys_common_status").then((function(t){t.success&&(e.statusOptions=t.data)})),this.getList()},mounted:function(){this.initCols()},methods:{getList:function(){var e=this;this.loading=!0,Object(i["d"])(this.queryParams).then((function(t){if(e.loading=!1,t.success){var n=t.data;e.changeRecordList=n.data,e.total=n.total}}))},initCols:function(){this.checkedTableColumns=this.tableColumns.map((function(e){return e.prop}))},handleCheckedColsChange:function(e){var t=this;this.tableColumns.forEach((function(e){t.checkedTableColumns.includes(e.prop)?e.show=!0:e.show=!1}))},handleCommand:function(e){this.tableSize=e},handleQuery:function(){this.queryParams.pageNum=1,this.getList()},resetQuery:function(){this.queryParams={pageNum:1,pageSize:20,fieldName:""},this.handleQuery()},handleRefresh:function(){this.getList()},handleEdit:function(e){this.showOptions.data.id=e.id,this.showOptions.showList=!1,this.showOptions.showAdd=!1,this.showOptions.showEdit=!0,this.showOptions.showDetail=!1,this.$emit("showCard",this.showOptions)},handleDetail:function(e){this.showOptions.data.id=e.id,this.showOptions.showList=!1,this.showOptions.showAdd=!1,this.showOptions.showEdit=!1,this.showOptions.showDetail=!0,this.$emit("showCard",this.showOptions)},handleDelete:function(e){var t=this;this.$confirm("选中数据将被永久删除, 是否继续?","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then((function(){Object(i["b"])(e.id).then((function(e){e.success&&(t.$message.success("删除成功"),t.getList())}))})).catch((function(){}))},handleSizeChange:function(e){console.log("每页 ".concat(e," 条")),this.queryParams.pageNum=1,this.queryParams.pageSize=e,this.getList()},handleCurrentChange:function(e){console.log("当前页: ".concat(e)),this.queryParams.pageNum=e,this.getList()},statusFormatter:function(e,t,n,a){var r=this.$createElement,i=this.selectDictLabel(this.statusOptions,n);return r("el-tag","1"===n?{attrs:{type:"success"}}:{attrs:{type:"warning"}},[i])},fieldNameFormatter:function(e,t,n,a){return this.dicts.get(n)}}},s=o,l=(n("f2e3"),n("2877")),c=Object(l["a"])(s,a,r,!1,null,"43fd2bed",null);t["default"]=c.exports},"00ca":function(e,t,n){"use strict";n("c480")},"00de":function(e,t,n){"use strict";n("0b51")},"00e4":function(e,t,n){"use strict";n.r(t);var a=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("el-card",{staticClass:"box-card",attrs:{shadow:"always"}},[n("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[n("span",[e._v(e._s(e.title))]),n("el-button-group",{staticStyle:{float:"right"}},[n("el-button",{directives:[{name:"hasPerm",rawName:"v-hasPerm",value:["system:dict:add"],expression:"['system:dict:add']"}],attrs:{size:"mini",icon:"el-icon-plus",round:"",loading:e.loadingOptions.loading,disabled:e.loadingOptions.isDisabled},on:{click:e.submitForm}},[e._v(e._s(e.loadingOptions.loadingText))]),n("el-button",{attrs:{size:"mini",icon:"el-icon-back",round:""},on:{click:e.showCard}},[e._v("返回")])],1)],1),n("div",{staticClass:"body-wrapper"},[n("el-form",{ref:"form",attrs:{model:e.form,rules:e.rules,"label-width":"80px"}},[n("el-form-item",{attrs:{label:"字典项文本",prop:"itemText"}},[n("el-input",{attrs:{placeholder:"请输入字典项文本"},model:{value:e.form.itemText,callback:function(t){e.$set(e.form,"itemText",t)},expression:"form.itemText"}})],1),n("el-form-item",{attrs:{label:"字典项值",prop:"itemValue"}},[n("el-input",{attrs:{placeholder:"请输入字典项值"},model:{value:e.form.itemValue,callback:function(t){e.$set(e.form,"itemValue",t)},expression:"form.itemValue"}})],1),n("el-form-item",{attrs:{label:"排序",prop:"itemSort"}},[n("el-input-number",{attrs:{"controls-position":"right",min:1},model:{value:e.form.itemSort,callback:function(t){e.$set(e.form,"itemSort",t)},expression:"form.itemSort"}})],1),n("el-form-item",{attrs:{label:"状态",prop:"status"}},[n("el-radio-group",{model:{value:e.form.status,callback:function(t){e.$set(e.form,"status",t)},expression:"form.status"}},e._l(e.statusOptions,(function(t){return n("el-radio",{key:t.id,attrs:{label:t.itemText}},[e._v(e._s(t.itemValue))])})),1)],1),n("el-form-item",{attrs:{label:"备注",prop:"remark"}},[n("el-input",{attrs:{type:"textarea",placeholder:"请输入内容"},model:{value:e.form.remark,callback:function(t){e.$set(e.form,"remark",t)},expression:"form.remark"}})],1)],1)],1)])},r=[],i=(n("e9c4"),n("7754")),o={name:"DictItemAdd",props:{data:{type:Object,default:function(){return{}}}},data:function(){return{title:"字典项新增",showOptions:{data:{},showList:!0,showAdd:!1,showEdit:!1,showDetail:!1,showItemList:!1,showItemAdd:!1,showItemEdit:!1,showItemDetail:!1},loadingOptions:{loading:!1,loadingText:"保存",isDisabled:!1},form:{status:"1",dictId:""},rules:{itemText:[{required:!0,message:"字典项文本不能为空",trigger:"blur"}],itemValue:[{required:!0,message:"字典项值不能为空",trigger:"blur"}]},statusOptions:[]}},created:function(){var e=this;console.log("data:"+JSON.stringify(this.data)),this.form.dictId=this.data.dictId,this.getDicts("sys_common_status").then((function(t){t.success&&(e.statusOptions=t.data)}))},methods:{showCard:function(){this.$emit("showCard",this.showOptions)},submitForm:function(){var e=this;this.$refs["form"].validate((function(t){t&&(e.loadingOptions.loading=!0,e.loadingOptions.loadingText="保存中...",e.loadingOptions.isDisabled=!0,Object(i["b"])(e.form).then((function(t){t.success?(e.$message.success("保存成功"),setTimeout((function(){e.$emit("showCard",e.showOptions)}),2e3)):(e.$message.error("保存失败"),e.loadingOptions.loading=!1,e.loadingOptions.loadingText="保存",e.loadingOptions.isDisabled=!1)})).catch((function(){e.loadingOptions.loading=!1,e.loadingOptions.loadingText="保存",e.loadingOptions.isDisabled=!1})))}))}}},s=o,l=(n("3fae"),n("2877")),c=Object(l["a"])(s,a,r,!1,null,"0611ba99",null);t["default"]=c.exports},"00fd":function(e,t,n){var a=n("9e69"),r=Object.prototype,i=r.hasOwnProperty,o=r.toString,s=a?a.toStringTag:void 0;function l(e){var t=i.call(e,s),n=e[s];try{e[s]=void 0;var a=!0}catch(l){}var r=o.call(e);return a&&(t?e[s]=n:delete e[s]),r}e.exports=l},"010e":function(e,t,n){(function(e,t){t(n("c1df"))})(0,(function(e){"use strict"; +(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-151ccd58","chunk-f997572c","chunk-7d11412e","chunk-2b12f9e6","chunk-cb7c7d5e","chunk-8ee67034","chunk-33d98211","chunk-ab13d2fa","chunk-eee0efce","chunk-30ca8599","chunk-ef9784da","chunk-57e8856e","chunk-59a71eaa","chunk-66112764","chunk-2d230fe7"],{"0089":function(e,t,n){"use strict";n.r(t);var a=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("el-card",{staticClass:"box-card",attrs:{shadow:"always"}},[n("el-form",{ref:"queryForm",attrs:{model:e.queryParams,inline:!0}},[n("el-form-item",{attrs:{label:"字段名称",prop:"fieldName"}},[n("el-input",{attrs:{placeholder:"请输入字段名称",clearable:"",size:"small"},nativeOn:{keyup:function(t){return!t.type.indexOf("key")&&e._k(t.keyCode,"enter",13,t.key,"Enter")?null:e.handleQuery(t)}},model:{value:e.queryParams.fieldName,callback:function(t){e.$set(e.queryParams,"fieldName",t)},expression:"queryParams.fieldName"}})],1),n("el-form-item",[n("el-button",{attrs:{type:"primary",icon:"el-icon-search",size:"mini"},on:{click:e.handleQuery}},[e._v("搜索")]),n("el-button",{attrs:{icon:"el-icon-refresh",size:"mini"},on:{click:e.resetQuery}},[e._v("重置")])],1)],1),n("el-row",{attrs:{type:"flex",justify:"space-between"}},[n("el-col",{attrs:{span:12}},[n("el-button-group")],1),n("el-col",{attrs:{span:12}},[n("div",{staticClass:"right-toolbar"},[n("el-tooltip",{attrs:{content:"密度",effect:"dark",placement:"top"}},[n("el-dropdown",{attrs:{trigger:"click"},on:{command:e.handleCommand}},[n("el-button",{attrs:{circle:"",size:"mini"}},[n("svg-icon",{attrs:{"class-name":"size-icon","icon-class":"colum-height"}})],1),n("el-dropdown-menu",{attrs:{slot:"dropdown"},slot:"dropdown"},[n("el-dropdown-item",{attrs:{command:"medium"}},[e._v("正常")]),n("el-dropdown-item",{attrs:{command:"small"}},[e._v("中等")]),n("el-dropdown-item",{attrs:{command:"mini"}},[e._v("紧凑")])],1)],1)],1),n("el-tooltip",{attrs:{content:"刷新",effect:"dark",placement:"top"}},[n("el-button",{attrs:{circle:"",size:"mini"},on:{click:e.handleRefresh}},[n("svg-icon",{attrs:{"class-name":"size-icon","icon-class":"shuaxin"}})],1)],1),n("el-tooltip",{attrs:{content:"列设置",effect:"dark",placement:"top"}},[n("el-popover",{attrs:{placement:"bottom",width:"100",trigger:"click"}},[n("el-checkbox-group",{on:{change:e.handleCheckedColsChange},model:{value:e.checkedTableColumns,callback:function(t){e.checkedTableColumns=t},expression:"checkedTableColumns"}},e._l(e.tableColumns,(function(t,a){return n("el-checkbox",{key:a,attrs:{label:t.prop}},[e._v(e._s(t.label))])})),1),n("span",{attrs:{slot:"reference"},slot:"reference"},[n("el-button",{attrs:{circle:"",size:"mini"}},[n("svg-icon",{attrs:{"class-name":"size-icon","icon-class":"shezhi"}})],1)],1)],1)],1)],1)])],1),n("el-table",{directives:[{name:"loading",rawName:"v-loading",value:e.loading,expression:"loading"}],staticStyle:{width:"100%",margin:"15px 0"},attrs:{data:e.changeRecordList,border:"","tooltip-effect":"dark",size:e.tableSize,height:e.tableHeight}},[n("el-table-column",{attrs:{type:"selection",width:"55",align:"center"}}),n("el-table-column",{attrs:{label:"序号",width:"55",align:"center"},scopedSlots:e._u([{key:"default",fn:function(t){return[n("span",[e._v(e._s(t.$index+1))])]}}])}),e._l(e.tableColumns,(function(t,a){return[t.show?n("el-table-column",{key:a,attrs:{prop:t.prop,label:t.label,formatter:t.formatter,align:"center","show-overflow-tooltip":""}}):e._e()]})),n("el-table-column",{attrs:{label:"操作",align:"center","class-name":"small-padding fixed-width"},scopedSlots:e._u([{key:"default",fn:function(t){return[n("el-popover",{attrs:{placement:"left",trigger:"click"}},[n("el-button",{directives:[{name:"hasPerm",rawName:"v-hasPerm",value:["metadata:changerecord:edit"],expression:"['metadata:changerecord:edit']"}],attrs:{size:"mini",type:"text",icon:"el-icon-edit-outline"},on:{click:function(n){return e.handleEdit(t.row)}}},[e._v("修改")]),n("el-button",{directives:[{name:"hasPerm",rawName:"v-hasPerm",value:["metadata:changerecord:detail"],expression:"['metadata:changerecord:detail']"}],attrs:{size:"mini",type:"text",icon:"el-icon-view"},on:{click:function(n){return e.handleDetail(t.row)}}},[e._v("详情")]),n("el-button",{directives:[{name:"hasPerm",rawName:"v-hasPerm",value:["metadata:changerecord:remove"],expression:"['metadata:changerecord:remove']"}],attrs:{size:"mini",type:"text",icon:"el-icon-delete"},on:{click:function(n){return e.handleDelete(t.row)}}},[e._v("删除")]),n("el-button",{attrs:{slot:"reference"},slot:"reference"},[e._v("操作")])],1)]}}])})],2),n("el-pagination",{attrs:{"page-sizes":[10,20,50,100],layout:"total, sizes, prev, pager, next, jumper","current-page":e.queryParams.pageNum,"page-size":e.queryParams.pageSize,total:e.total},on:{"update:currentPage":function(t){return e.$set(e.queryParams,"pageNum",t)},"update:current-page":function(t){return e.$set(e.queryParams,"pageNum",t)},"update:pageSize":function(t){return e.$set(e.queryParams,"pageSize",t)},"update:page-size":function(t){return e.$set(e.queryParams,"pageSize",t)},"size-change":e.handleSizeChange,"current-change":e.handleCurrentChange}})],1)},r=[],i=(n("4ec9"),n("d3b7"),n("3ca3"),n("ddb0"),n("d81d"),n("159b"),n("caad"),n("2532"),n("a54d")),o={name:"ChangeRecordList",data:function(){return{tableHeight:document.body.offsetHeight-310+"px",showOptions:{data:{},showList:!0,showAdd:!1,showEdit:!1,showDetail:!1},loading:!0,tableColumns:[{prop:"sourceName",label:"数据源",show:!0},{prop:"tableName",label:"数据库表",show:!0},{prop:"fieldName",label:"变更字段",show:!0},{prop:"objectType",label:"变更类型",show:!0,formatter:this.fieldNameFormatter},{prop:"fieldOldValue",label:"原来的值",show:!0},{prop:"fieldNewValue",label:"最新的值",show:!0},{prop:"version",label:"版本号",show:!0},{prop:"status",label:"状态",show:!0,formatter:this.statusFormatter},{prop:"createTime",label:"创建时间",show:!0}],checkedTableColumns:[],tableSize:"medium",statusOptions:[],changeRecordList:[],total:0,queryParams:{pageNum:1,pageSize:20,fieldName:""},dicts:new Map([["columnName","字段名称"],["columnComment","字段注释"],["dataDefault","数据默认值"],["columnKey","是否主键"],["columnNullable","是否允许为空"],["dataType","数据类型"],["dataLength","数据长度"],["dataPrecision","数据精度"],["dataScale","数据小数位"]])}},created:function(){var e=this;this.getDicts("password: 123456").then((function(t){t.success&&(e.statusOptions=t.data)})),this.getList()},mounted:function(){this.initCols()},methods:{getList:function(){var e=this;this.loading=!0,Object(i["d"])(this.queryParams).then((function(t){if(e.loading=!1,t.success){var n=t.data;e.changeRecordList=n.data,e.total=n.total}}))},initCols:function(){this.checkedTableColumns=this.tableColumns.map((function(e){return e.prop}))},handleCheckedColsChange:function(e){var t=this;this.tableColumns.forEach((function(e){t.checkedTableColumns.includes(e.prop)?e.show=!0:e.show=!1}))},handleCommand:function(e){this.tableSize=e},handleQuery:function(){this.queryParams.pageNum=1,this.getList()},resetQuery:function(){this.queryParams={pageNum:1,pageSize:20,fieldName:""},this.handleQuery()},handleRefresh:function(){this.getList()},handleEdit:function(e){this.showOptions.data.id=e.id,this.showOptions.showList=!1,this.showOptions.showAdd=!1,this.showOptions.showEdit=!0,this.showOptions.showDetail=!1,this.$emit("showCard",this.showOptions)},handleDetail:function(e){this.showOptions.data.id=e.id,this.showOptions.showList=!1,this.showOptions.showAdd=!1,this.showOptions.showEdit=!1,this.showOptions.showDetail=!0,this.$emit("showCard",this.showOptions)},handleDelete:function(e){var t=this;this.$confirm("选中数据将被永久删除, 是否继续?","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then((function(){Object(i["b"])(e.id).then((function(e){e.success&&(t.$message.success("删除成功"),t.getList())}))})).catch((function(){}))},handleSizeChange:function(e){console.log("每页 ".concat(e," 条")),this.queryParams.pageNum=1,this.queryParams.pageSize=e,this.getList()},handleCurrentChange:function(e){console.log("当前页: ".concat(e)),this.queryParams.pageNum=e,this.getList()},statusFormatter:function(e,t,n,a){var r=this.$createElement,i=this.selectDictLabel(this.statusOptions,n);return r("el-tag","1"===n?{attrs:{type:"success"}}:{attrs:{type:"warning"}},[i])},fieldNameFormatter:function(e,t,n,a){return this.dicts.get(n)}}},s=o,l=(n("f2e3"),n("2877")),c=Object(l["a"])(s,a,r,!1,null,"43fd2bed",null);t["default"]=c.exports},"00ca":function(e,t,n){"use strict";n("c480")},"00de":function(e,t,n){"use strict";n("0b51")},"00e4":function(e,t,n){"use strict";n.r(t);var a=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("el-card",{staticClass:"box-card",attrs:{shadow:"always"}},[n("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[n("span",[e._v(e._s(e.title))]),n("el-button-group",{staticStyle:{float:"right"}},[n("el-button",{directives:[{name:"hasPerm",rawName:"v-hasPerm",value:["system:dict:add"],expression:"['system:dict:add']"}],attrs:{size:"mini",icon:"el-icon-plus",round:"",loading:e.loadingOptions.loading,disabled:e.loadingOptions.isDisabled},on:{click:e.submitForm}},[e._v(e._s(e.loadingOptions.loadingText))]),n("el-button",{attrs:{size:"mini",icon:"el-icon-back",round:""},on:{click:e.showCard}},[e._v("返回")])],1)],1),n("div",{staticClass:"body-wrapper"},[n("el-form",{ref:"form",attrs:{model:e.form,rules:e.rules,"label-width":"80px"}},[n("el-form-item",{attrs:{label:"字典项文本",prop:"itemText"}},[n("el-input",{attrs:{placeholder:"请输入字典项文本"},model:{value:e.form.itemText,callback:function(t){e.$set(e.form,"itemText",t)},expression:"form.itemText"}})],1),n("el-form-item",{attrs:{label:"字典项值",prop:"itemValue"}},[n("el-input",{attrs:{placeholder:"请输入字典项值"},model:{value:e.form.itemValue,callback:function(t){e.$set(e.form,"itemValue",t)},expression:"form.itemValue"}})],1),n("el-form-item",{attrs:{label:"排序",prop:"itemSort"}},[n("el-input-number",{attrs:{"controls-position":"right",min:1},model:{value:e.form.itemSort,callback:function(t){e.$set(e.form,"itemSort",t)},expression:"form.itemSort"}})],1),n("el-form-item",{attrs:{label:"状态",prop:"status"}},[n("el-radio-group",{model:{value:e.form.status,callback:function(t){e.$set(e.form,"status",t)},expression:"form.status"}},e._l(e.statusOptions,(function(t){return n("el-radio",{key:t.id,attrs:{label:t.itemText}},[e._v(e._s(t.itemValue))])})),1)],1),n("el-form-item",{attrs:{label:"备注",prop:"remark"}},[n("el-input",{attrs:{type:"textarea",placeholder:"请输入内容"},model:{value:e.form.remark,callback:function(t){e.$set(e.form,"remark",t)},expression:"form.remark"}})],1)],1)],1)])},r=[],i=(n("e9c4"),n("7754")),o={name:"DictItemAdd",props:{data:{type:Object,default:function(){return{}}}},data:function(){return{title:"字典项新增",showOptions:{data:{},showList:!0,showAdd:!1,showEdit:!1,showDetail:!1,showItemList:!1,showItemAdd:!1,showItemEdit:!1,showItemDetail:!1},loadingOptions:{loading:!1,loadingText:"保存",isDisabled:!1},form:{status:"1",dictId:""},rules:{itemText:[{required:!0,message:"字典项文本不能为空",trigger:"blur"}],itemValue:[{required:!0,message:"字典项值不能为空",trigger:"blur"}]},statusOptions:[]}},created:function(){var e=this;console.log("data:"+JSON.stringify(this.data)),this.form.dictId=this.data.dictId,this.getDicts("sys_common_status").then((function(t){t.success&&(e.statusOptions=t.data)}))},methods:{showCard:function(){this.$emit("showCard",this.showOptions)},submitForm:function(){var e=this;this.$refs["form"].validate((function(t){t&&(e.loadingOptions.loading=!0,e.loadingOptions.loadingText="保存中...",e.loadingOptions.isDisabled=!0,Object(i["b"])(e.form).then((function(t){t.success?(e.$message.success("保存成功"),setTimeout((function(){e.$emit("showCard",e.showOptions)}),2e3)):(e.$message.error("保存失败"),e.loadingOptions.loading=!1,e.loadingOptions.loadingText="保存",e.loadingOptions.isDisabled=!1)})).catch((function(){e.loadingOptions.loading=!1,e.loadingOptions.loadingText="保存",e.loadingOptions.isDisabled=!1})))}))}}},s=o,l=(n("3fae"),n("2877")),c=Object(l["a"])(s,a,r,!1,null,"0611ba99",null);t["default"]=c.exports},"00fd":function(e,t,n){var a=n("9e69"),r=Object.prototype,i=r.hasOwnProperty,o=r.toString,s=a?a.toStringTag:void 0;function l(e){var t=i.call(e,s),n=e[s];try{e[s]=void 0;var a=!0}catch(l){}var r=o.call(e);return a&&(t?e[s]=n:delete e[s]),r}e.exports=l},"010e":function(e,t,n){(function(e,t){t(n("c1df"))})(0,(function(e){"use strict"; //! moment.js locale configuration var t=e.defineLocale("uz-latn",{months:"Yanvar_Fevral_Mart_Aprel_May_Iyun_Iyul_Avgust_Sentabr_Oktabr_Noyabr_Dekabr".split("_"),monthsShort:"Yan_Fev_Mar_Apr_May_Iyun_Iyul_Avg_Sen_Okt_Noy_Dek".split("_"),weekdays:"Yakshanba_Dushanba_Seshanba_Chorshanba_Payshanba_Juma_Shanba".split("_"),weekdaysShort:"Yak_Dush_Sesh_Chor_Pay_Jum_Shan".split("_"),weekdaysMin:"Ya_Du_Se_Cho_Pa_Ju_Sha".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"D MMMM YYYY, dddd HH:mm"},calendar:{sameDay:"[Bugun soat] LT [da]",nextDay:"[Ertaga] LT [da]",nextWeek:"dddd [kuni soat] LT [da]",lastDay:"[Kecha soat] LT [da]",lastWeek:"[O'tgan] dddd [kuni soat] LT [da]",sameElse:"L"},relativeTime:{future:"Yaqin %s ichida",past:"Bir necha %s oldin",s:"soniya",ss:"%d soniya",m:"bir daqiqa",mm:"%d daqiqa",h:"bir soat",hh:"%d soat",d:"bir kun",dd:"%d kun",M:"bir oy",MM:"%d oy",y:"bir yil",yy:"%d yil"},week:{dow:1,doy:7}});return t}))},"0163":function(e,t,n){"use strict";n("55a7")},"021f":function(e,t,n){"use strict";n.r(t);var a=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{ref:e.ref,staticClass:"dv-border-box-2"},[n("svg",{staticClass:"dv-border-svg-container",attrs:{width:e.width,height:e.height}},[n("polygon",{attrs:{fill:e.backgroundColor,points:"\n 7, 7 "+(e.width-7)+", 7 "+(e.width-7)+", "+(e.height-7)+" 7, "+(e.height-7)+"\n "}}),n("polyline",{attrs:{stroke:e.mergedColor[0],points:"2, 2 "+(e.width-2)+" ,2 "+(e.width-2)+", "+(e.height-2)+" 2, "+(e.height-2)+" 2, 2"}}),n("polyline",{attrs:{stroke:e.mergedColor[1],points:"6, 6 "+(e.width-6)+", 6 "+(e.width-6)+", "+(e.height-6)+" 6, "+(e.height-6)+" 6, 6"}}),n("circle",{attrs:{fill:e.mergedColor[0],cx:"11",cy:"11",r:"1"}}),n("circle",{attrs:{fill:e.mergedColor[0],cx:e.width-11,cy:"11",r:"1"}}),n("circle",{attrs:{fill:e.mergedColor[0],cx:e.width-11,cy:e.height-11,r:"1"}}),n("circle",{attrs:{fill:e.mergedColor[0],cx:"11",cy:e.height-11,r:"1"}})]),n("div",{staticClass:"border-box-content"},[e._t("default")],2)])},r=[],i=(n("a9e3"),{name:"BorderBox2",props:{width:{type:Number,default:0},height:{type:Number,default:0}},data:function(){return{ref:"border-box-2",backgroundColor:"transparent",mergedColor:["#fff","rgba(255, 255, 255, 0.6)"]}}}),o=i,s=(n("1ea3"),n("2877")),l=Object(s["a"])(o,a,r,!1,null,"04cb6507",null);t["default"]=l.exports},"024d":function(e,t,n){"use strict";n.d(t,"d",(function(){return r})),n.d(t,"c",(function(){return i})),n.d(t,"b",(function(){return o})),n.d(t,"a",(function(){return s})),n.d(t,"e",(function(){return l}));var a=n("b775");function r(e){return Object(a["a"])({url:"/data/market/apiMasks/page",method:"get",params:e})}function i(e){return Object(a["a"])({url:"/data/market/apiMasks/"+e,method:"get"})}function o(e){return Object(a["a"])({url:"/data/market/apiMasks/"+e,method:"delete"})}function s(e){return Object(a["a"])({url:"/data/market/apiMasks",method:"post",data:e})}function l(e){return Object(a["a"])({url:"/data/market/apiMasks/"+e.id,method:"put",data:e})}},"0294":function(e,t,n){},"02fb":function(e,t,n){(function(e,t){t(n("c1df"))})(0,(function(e){"use strict"; //! moment.js locale configuration diff --git a/datax-modules/codegen-service-parent/codegen-service/src/main/java/cn/datax/service/codegen/utils/Generate.java b/datax-modules/codegen-service-parent/codegen-service/src/main/java/cn/datax/service/codegen/utils/Generate.java index cf3cdfee63869863d1200af3b668e913a79e4453..9d67775643f913d8fd9485a880deb740f17fafc2 100644 --- a/datax-modules/codegen-service-parent/codegen-service/src/main/java/cn/datax/service/codegen/utils/Generate.java +++ b/datax-modules/codegen-service-parent/codegen-service/src/main/java/cn/datax/service/codegen/utils/Generate.java @@ -227,7 +227,7 @@ public class Generate { */ private static DataSourceConfig getDataSourceConfig() { return new DataSourceConfig() - .setUrl("jdbc:mysql://localhost:3306/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8") + .setUrl("jdbc:mysql://localhost:3306/data_cloud?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8") .setDriverName("com.mysql.cj.jdbc.Driver") .setUsername("root") .setPassword("1234@abcd"); diff --git a/datax-modules/codegen-service-parent/codegen-service/src/main/resources/bootstrap.yml b/datax-modules/codegen-service-parent/codegen-service/src/main/resources/bootstrap.yml index 259c72c8f1535c5fa65559ed02b473db5618f3f3..ee92fb131de6505b2e9e1a96e98e8c9887a0c108 100644 --- a/datax-modules/codegen-service-parent/codegen-service/src/main/resources/bootstrap.yml +++ b/datax-modules/codegen-service-parent/codegen-service/src/main/resources/bootstrap.yml @@ -20,11 +20,11 @@ eureka: instance: lease-renewal-interval-in-seconds: 20 prefer-ip-address: true - ip-address: localhost + ip-address: 111.231.19.173 client: register-with-eureka: true fetch-registry: true instance-info-replication-interval-seconds: 30 registry-fetch-interval-seconds: 3 service-url: - defaultZone: http://localhost:8610/eureka + defaultZone: http://111.231.19.173:8610/eureka diff --git a/datax-modules/data-market-service-parent/data-market-service-integration/src/main/resources/bootstrap.yml b/datax-modules/data-market-service-parent/data-market-service-integration/src/main/resources/bootstrap.yml index 1e91c7ffaf2baa3137385a8617441ce7366083b0..56e5bc8ce84b180925df0c3b99d7cb3c55f422b8 100644 --- a/datax-modules/data-market-service-parent/data-market-service-integration/src/main/resources/bootstrap.yml +++ b/datax-modules/data-market-service-parent/data-market-service-integration/src/main/resources/bootstrap.yml @@ -20,11 +20,11 @@ eureka: instance: lease-renewal-interval-in-seconds: 20 prefer-ip-address: true - ip-address: localhost + ip-address: 111.231.19.173 client: register-with-eureka: true fetch-registry: true instance-info-replication-interval-seconds: 30 registry-fetch-interval-seconds: 3 service-url: - defaultZone: http://localhost:8610/eureka + defaultZone: http://111.231.19.173:8610/eureka diff --git a/datax-modules/data-market-service-parent/data-market-service-integration/src/main/resources/mapper/ServiceIntegrationMapper.xml b/datax-modules/data-market-service-parent/data-market-service-integration/src/main/resources/mapper/ServiceIntegrationMapper.xml index fce0b4c4574c4babe8a88a9f01f59eb2454763b7..457e86e500cb5386fa7e2f2c6ed897d2ca31893b 100644 --- a/datax-modules/data-market-service-parent/data-market-service-integration/src/main/resources/mapper/ServiceIntegrationMapper.xml +++ b/datax-modules/data-market-service-parent/data-market-service-integration/src/main/resources/mapper/ServiceIntegrationMapper.xml @@ -12,7 +12,6 @@ - diff --git a/datax-modules/data-market-service-parent/data-market-service-mapping/src/main/resources/bootstrap.yml b/datax-modules/data-market-service-parent/data-market-service-mapping/src/main/resources/bootstrap.yml index 49c5c954a62171f6f51ac5b76c55a65d85754076..9d45e5ce51dcc649bd27668226c341ba1b12f7d9 100644 --- a/datax-modules/data-market-service-parent/data-market-service-mapping/src/main/resources/bootstrap.yml +++ b/datax-modules/data-market-service-parent/data-market-service-mapping/src/main/resources/bootstrap.yml @@ -20,11 +20,11 @@ eureka: instance: lease-renewal-interval-in-seconds: 20 prefer-ip-address: true - ip-address: localhost + ip-address: 111.231.19.173 client: register-with-eureka: true fetch-registry: true instance-info-replication-interval-seconds: 30 registry-fetch-interval-seconds: 3 service-url: - defaultZone: http://localhost:8610/eureka + defaultZone: http://111.231.19.173:8610/eureka diff --git a/datax-modules/data-market-service-parent/data-market-service/src/main/resources/bootstrap.yml b/datax-modules/data-market-service-parent/data-market-service/src/main/resources/bootstrap.yml index 7af4fd76d0646d31e5f3475681ec825ea36ed41b..cd660fbbf9307da8cd9160d7c2f6535d1d9cf075 100644 --- a/datax-modules/data-market-service-parent/data-market-service/src/main/resources/bootstrap.yml +++ b/datax-modules/data-market-service-parent/data-market-service/src/main/resources/bootstrap.yml @@ -20,11 +20,11 @@ eureka: instance: lease-renewal-interval-in-seconds: 20 prefer-ip-address: true - ip-address: localhost + ip-address: 111.231.19.173 client: register-with-eureka: true fetch-registry: true instance-info-replication-interval-seconds: 30 registry-fetch-interval-seconds: 3 service-url: - defaultZone: http://localhost:8610/eureka + defaultZone: http://111.231.19.173:8610/eureka diff --git a/datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/resources/bootstrap.yml b/datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/resources/bootstrap.yml index f1cda25225d2c2af84b44d4251d9492b295b8f71..b7ed22472a65eb4b80e015686d852cc60026cf2c 100644 --- a/datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/resources/bootstrap.yml +++ b/datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/resources/bootstrap.yml @@ -20,11 +20,11 @@ eureka: instance: lease-renewal-interval-in-seconds: 20 prefer-ip-address: true - ip-address: localhost + ip-address: 111.231.19.173 client: register-with-eureka: true fetch-registry: true instance-info-replication-interval-seconds: 30 registry-fetch-interval-seconds: 3 service-url: - defaultZone: http://localhost:8610/eureka + defaultZone: http://111.231.19.173:8610/eureka diff --git a/datax-modules/data-metadata-service-parent/data-metadata-service-console/src/main/resources/bootstrap.yml b/datax-modules/data-metadata-service-parent/data-metadata-service-console/src/main/resources/bootstrap.yml index d988ef32cefad7d0777f59beb009ac2bff11590c..3c7284b523c4dd6a64cee1fc308bb28f426dda2a 100644 --- a/datax-modules/data-metadata-service-parent/data-metadata-service-console/src/main/resources/bootstrap.yml +++ b/datax-modules/data-metadata-service-parent/data-metadata-service-console/src/main/resources/bootstrap.yml @@ -20,11 +20,11 @@ eureka: instance: lease-renewal-interval-in-seconds: 20 prefer-ip-address: true - ip-address: localhost + ip-address: 111.231.19.173 client: register-with-eureka: true fetch-registry: true instance-info-replication-interval-seconds: 30 registry-fetch-interval-seconds: 3 service-url: - defaultZone: http://localhost:8610/eureka + defaultZone: http://111.231.19.173:8610/eureka diff --git a/datax-modules/data-metadata-service-parent/data-metadata-service/src/main/resources/bootstrap.yml b/datax-modules/data-metadata-service-parent/data-metadata-service/src/main/resources/bootstrap.yml index 1f1fd5f6a7c2fcc0e1be3ff33154115d935ea33f..8ab7e4974c3a1626670595d7ef49e73b2d58b200 100644 --- a/datax-modules/data-metadata-service-parent/data-metadata-service/src/main/resources/bootstrap.yml +++ b/datax-modules/data-metadata-service-parent/data-metadata-service/src/main/resources/bootstrap.yml @@ -20,11 +20,11 @@ eureka: instance: lease-renewal-interval-in-seconds: 20 prefer-ip-address: true - ip-address: localhost + ip-address: 111.231.19.173 client: register-with-eureka: true fetch-registry: true instance-info-replication-interval-seconds: 30 registry-fetch-interval-seconds: 3 service-url: - defaultZone: http://localhost:8610/eureka + defaultZone: http://111.231.19.173:8610/eureka diff --git a/datax-modules/data-quality-service-parent/data-quality-service/src/main/resources/bootstrap.yml b/datax-modules/data-quality-service-parent/data-quality-service/src/main/resources/bootstrap.yml index 910484a38aadc8c5e4d7e518d098198189638ca8..2d99440b7d951e1ce89324334f90ec37776b3749 100644 --- a/datax-modules/data-quality-service-parent/data-quality-service/src/main/resources/bootstrap.yml +++ b/datax-modules/data-quality-service-parent/data-quality-service/src/main/resources/bootstrap.yml @@ -20,11 +20,11 @@ eureka: instance: lease-renewal-interval-in-seconds: 20 prefer-ip-address: true - ip-address: localhost + ip-address: 111.231.19.173 client: register-with-eureka: true fetch-registry: true instance-info-replication-interval-seconds: 30 registry-fetch-interval-seconds: 3 service-url: - defaultZone: http://localhost:8610/eureka + defaultZone: http://111.231.19.173:8610/eureka diff --git a/datax-modules/data-standard-service-parent/data-standard-service/src/main/resources/bootstrap.yml b/datax-modules/data-standard-service-parent/data-standard-service/src/main/resources/bootstrap.yml index 8a7ceb8038d9fae37234f9884330d2fdfc3f4eb7..98bc698bc431bed8a24a6441f5435dec0ea359ca 100644 --- a/datax-modules/data-standard-service-parent/data-standard-service/src/main/resources/bootstrap.yml +++ b/datax-modules/data-standard-service-parent/data-standard-service/src/main/resources/bootstrap.yml @@ -20,11 +20,11 @@ eureka: instance: lease-renewal-interval-in-seconds: 20 prefer-ip-address: true - ip-address: localhost + ip-address: 111.231.19.173 client: register-with-eureka: true fetch-registry: true instance-info-replication-interval-seconds: 30 registry-fetch-interval-seconds: 3 service-url: - defaultZone: http://localhost:8610/eureka + defaultZone: http://111.231.19.173:8610/eureka diff --git a/datax-modules/data-visual-service-parent/data-visual-service/src/main/resources/bootstrap.yml b/datax-modules/data-visual-service-parent/data-visual-service/src/main/resources/bootstrap.yml index 985974007c32618c450cf6ec946a89058315d683..c65c026ab70f67f3f08f9e36296f2f2fb9c277ee 100644 --- a/datax-modules/data-visual-service-parent/data-visual-service/src/main/resources/bootstrap.yml +++ b/datax-modules/data-visual-service-parent/data-visual-service/src/main/resources/bootstrap.yml @@ -20,11 +20,11 @@ eureka: instance: lease-renewal-interval-in-seconds: 20 prefer-ip-address: true - ip-address: localhost + ip-address: 111.231.19.173 client: register-with-eureka: true fetch-registry: true instance-info-replication-interval-seconds: 30 registry-fetch-interval-seconds: 3 service-url: - defaultZone: http://localhost:8610/eureka + defaultZone: http://111.231.19.173:8610/eureka diff --git a/datax-modules/email-service-parent/email-service/src/main/resources/bootstrap.yml b/datax-modules/email-service-parent/email-service/src/main/resources/bootstrap.yml index 9d5516b2d3fadbaa69278acd4e3ea3a5e06b06fb..89cd351bb40fd7013672147377312862fda8231e 100644 --- a/datax-modules/email-service-parent/email-service/src/main/resources/bootstrap.yml +++ b/datax-modules/email-service-parent/email-service/src/main/resources/bootstrap.yml @@ -20,11 +20,11 @@ eureka: instance: lease-renewal-interval-in-seconds: 20 prefer-ip-address: true - ip-address: localhost + ip-address: 111.231.19.173 client: register-with-eureka: true fetch-registry: true instance-info-replication-interval-seconds: 30 registry-fetch-interval-seconds: 3 service-url: - defaultZone: http://localhost:8610/eureka + defaultZone: http://111.231.19.173:8610/eureka diff --git a/datax-modules/file-service-parent/file-service/src/main/resources/bootstrap.yml b/datax-modules/file-service-parent/file-service/src/main/resources/bootstrap.yml index c7029e8fdf3f7014bc554a50b9484ea19e3c9149..d82a845e01665d0b7f34cb21aeb6b1f335ba80ab 100644 --- a/datax-modules/file-service-parent/file-service/src/main/resources/bootstrap.yml +++ b/datax-modules/file-service-parent/file-service/src/main/resources/bootstrap.yml @@ -20,11 +20,11 @@ eureka: instance: lease-renewal-interval-in-seconds: 20 prefer-ip-address: true - ip-address: localhost + ip-address: 111.231.19.173 client: register-with-eureka: true fetch-registry: true instance-info-replication-interval-seconds: 30 registry-fetch-interval-seconds: 3 service-url: - defaultZone: http://localhost:8610/eureka + defaultZone: http://111.231.19.173:8610/eureka diff --git a/datax-modules/file-service-parent/file-service/src/main/resources/logback-spring.xml b/datax-modules/file-service-parent/file-service/src/main/resources/logback-spring.xml index 54c4a5a4c3b42f0a3da6c8951b1bf8aad5ccc09c..51ffedd5fbfa25f7902893639af564bebd9b38e3 100644 --- a/datax-modules/file-service-parent/file-service/src/main/resources/logback-spring.xml +++ b/datax-modules/file-service-parent/file-service/src/main/resources/logback-spring.xml @@ -71,7 +71,7 @@ - + diff --git a/datax-modules/quartz-service-parent/quartz-service/src/main/resources/bootstrap.yml b/datax-modules/quartz-service-parent/quartz-service/src/main/resources/bootstrap.yml index 17896b06c54490463b631c27895f3f63b3c88e42..81ae5c900345678d32d5d80960054751adf08d18 100644 --- a/datax-modules/quartz-service-parent/quartz-service/src/main/resources/bootstrap.yml +++ b/datax-modules/quartz-service-parent/quartz-service/src/main/resources/bootstrap.yml @@ -20,11 +20,11 @@ eureka: instance: lease-renewal-interval-in-seconds: 20 prefer-ip-address: true - ip-address: localhost + ip-address: 111.231.19.173 client: register-with-eureka: true fetch-registry: true instance-info-replication-interval-seconds: 30 registry-fetch-interval-seconds: 3 service-url: - defaultZone: http://localhost:8610/eureka + defaultZone: http://111.231.19.173:8610/eureka diff --git a/datax-modules/system-service-parent/system-service/src/main/resources/bootstrap.yml b/datax-modules/system-service-parent/system-service/src/main/resources/bootstrap.yml index 5de860bbfbaf8190b1da79f693d334b6798d9b18..165739605da3ef5c59a12a741d15016f4566c7cf 100644 --- a/datax-modules/system-service-parent/system-service/src/main/resources/bootstrap.yml +++ b/datax-modules/system-service-parent/system-service/src/main/resources/bootstrap.yml @@ -20,11 +20,11 @@ eureka: instance: lease-renewal-interval-in-seconds: 20 prefer-ip-address: true - ip-address: localhost + ip-address: 111.231.19.173 client: register-with-eureka: true fetch-registry: true instance-info-replication-interval-seconds: 30 registry-fetch-interval-seconds: 3 service-url: - defaultZone: http://localhost:8610/eureka + defaultZone: http://111.231.19.173:8610/eureka diff --git a/datax-modules/system-service-parent/system-service/src/main/resources/spy.properties b/datax-modules/system-service-parent/system-service/src/main/resources/spy.properties index 858ab8d1bd7ab9b0ce40d537b4f4cea10d37bb3e..7b81c1f5e7c90b2c4552a2f9ad6938eef32abc3d 100644 --- a/datax-modules/system-service-parent/system-service/src/main/resources/spy.properties +++ b/datax-modules/system-service-parent/system-service/src/main/resources/spy.properties @@ -1,25 +1,25 @@ module.log=com.p6spy.engine.logging.P6LogFactory,com.p6spy.engine.outage.P6OutageFactory -# Զ־ӡ +# \u81EA\u5B9A\u4E49\u65E5\u5FD7\u6253\u5370 logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger -#־̨ +#\u65E5\u5FD7\u8F93\u51FA\u5230\u63A7\u5236\u53F0 appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger -# ʹ־ϵͳ¼ sql +# \u4F7F\u7528\u65E5\u5FD7\u7CFB\u7EDF\u8BB0\u5F55 sql #appender=com.p6spy.engine.spy.appender.Slf4JLogger -# p6spy driver +# \u8BBE\u7F6E p6spy driver \u4EE3\u7406 deregisterdrivers=true -# ȡJDBC URLǰ׺ +# \u53D6\u6D88JDBC URL\u524D\u7F00 useprefix=true -# ü¼ Log ,ȥĽerror,info,batch,debug,statement,commit,rollback,result,resultset. +# \u914D\u7F6E\u8BB0\u5F55 Log \u4F8B\u5916,\u53EF\u53BB\u6389\u7684\u7ED3\u679C\u96C6\u6709error,info,batch,debug,statement,commit,rollback,result,resultset. excludecategories=info,debug,result,batch,resultset -# ڸʽ +# \u65E5\u671F\u683C\u5F0F dateformat=yyyy-MM-dd HH:mm:ss -# ʵɶ +# \u5B9E\u9645\u9A71\u52A8\u53EF\u591A\u4E2A #driverlist=org.h2.Driver -# ǷSQL¼ +# \u662F\u5426\u5F00\u542F\u6162SQL\u8BB0\u5F55 outagedetection=true -# SQL¼׼ 2 +# \u6162SQL\u8BB0\u5F55\u6807\u51C6 2 \u79D2 outagedetectioninterval=2 -# +# \u5F00\u542F\u8FC7\u6EE4 filter=true -# òӡ +# \u914D\u7F6E\u4E0D\u6253\u5370\u7684\u5185\u5BB9 exclude=select 1 \ No newline at end of file diff --git a/datax-modules/workflow-service-parent/workflow-service/src/main/resources/bootstrap.yml b/datax-modules/workflow-service-parent/workflow-service/src/main/resources/bootstrap.yml index 556f593011b40b7e5583c55080ad040439d431ca..c35c1d7d3bde73c7768a4f16c9c65eb22d5d1d81 100644 --- a/datax-modules/workflow-service-parent/workflow-service/src/main/resources/bootstrap.yml +++ b/datax-modules/workflow-service-parent/workflow-service/src/main/resources/bootstrap.yml @@ -20,11 +20,11 @@ eureka: instance: lease-renewal-interval-in-seconds: 20 prefer-ip-address: true - ip-address: localhost + ip-address: 111.231.19.173 client: register-with-eureka: true fetch-registry: true instance-info-replication-interval-seconds: 30 registry-fetch-interval-seconds: 3 service-url: - defaultZone: http://localhost:8610/eureka + defaultZone: http://111.231.19.173:8610/eureka diff --git a/datax-tools/datax-tool-monitor/src/main/resources/bootstrap.yml b/datax-tools/datax-tool-monitor/src/main/resources/bootstrap.yml index 5e9a5d2f8a5591f01aa109b37e9d0bc41d8deba6..ee7aef4af69ea1736df7870c7ffc9af91cb798dc 100644 --- a/datax-tools/datax-tool-monitor/src/main/resources/bootstrap.yml +++ b/datax-tools/datax-tool-monitor/src/main/resources/bootstrap.yml @@ -10,11 +10,11 @@ eureka: instance: lease-renewal-interval-in-seconds: 20 prefer-ip-address: true - ip-address: localhost + ip-address: 111.231.19.173 client: register-with-eureka: true fetch-registry: true instance-info-replication-interval-seconds: 30 registry-fetch-interval-seconds: 3 service-url: - defaultZone: http://localhost:8610/eureka \ No newline at end of file + defaultZone: http://111.231.19.173:8610/eureka \ No newline at end of file diff --git a/datax-ui-pro/src/layout/components/Topbar.vue b/datax-ui-pro/src/layout/components/Topbar.vue index 0f987cd8132ae810207d35c9d41fe19e33a1e78d..38c522b0636c39810bf5c313872ff2819808be17 100644 --- a/datax-ui-pro/src/layout/components/Topbar.vue +++ b/datax-ui-pro/src/layout/components/Topbar.vue @@ -6,7 +6,6 @@ :default-active="activeMenu" mode="horizontal" @select="handleSelect" - >