Merge remote-tracking branch 'origin/develop-20231222' into develop-20231222

studio/config/src/main/resources/bootstrap.yml

@@ -20,14 +20,14 @@ eureka:
     # 设置使用IP
     prefer-ip-address: true
     # 设置外网IP号
-    ip-address: 192.168.1.169
+    ip-address: 192.168.1.217
   client:
     register-with-eureka: true
     fetch-registry: true
     instance-info-replication-interval-seconds: 30
     registry-fetch-interval-seconds: 3
     service-url:
-      defaultZone: http://192.168.1.169:8610/eureka
+      defaultZone: http://192.168.1.217:8610/eureka
 
 # 暴露监控端点
 management:

studio/eureka/src/main/resources/bootstrap.yml

@@ -12,10 +12,10 @@ eureka:
     # 设置使用IP
     prefer-ip-address: true
     # 设置外网IP号
-    ip-address: 192.168.1.169
+    ip-address: 192.168.1.217
   client:
     register-with-eureka: false
     fetch-registry: false
     instance-info-replication-interval-seconds: 30
     service-url:
-      defaultZone: http://192.168.1.169:8610/eureka/
+      defaultZone: http://192.168.1.217:8610/eureka/

studio/install/16gdata/data-standard-service.sh

@@ -1,8 +1,3 @@
 #!/bin/sh
-source /etc/profile
+nohup java -jar -Xms128m -Xmx512m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./data-standard-service/data-standard-service.jar --server.port=8825  > data-standard-service.log 2>&1 &
-
-cd $(dirname $0)
-
-
-nohup java -jar -Xms128m -Xmx2048m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./data-standard-service/data-standard-service.jar --server.port=8825  > data-standard-service.log 2>&1 &
 

studio/install/16gdata/data-visual-service.sh

@@ -1,8 +1,3 @@
 #!/bin/sh
-source /etc/profile
+nohup java -jar -Xms128m -Xmx512m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./data-visual-service/data-visual-service.jar --server.port=8827  > data-visual-service.log 2>&1 &
-
-cd $(dirname $0)
-
-
-nohup java -jar -Xms128m -Xmx2048m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./data-visual-service/data-visual-service.jar --server.port=8827  > data-visual-service.log 2>&1 &
 

studio/install/16gdata/email-service.sh

@@ -1,8 +1,3 @@
 #!/bin/sh
-source /etc/profile
+nohup java -jar -Xms128m -Xmx512m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./email-service/email-service.jar --server.port=8812  > email-service.log 2>&1 &
-
-cd $(dirname $0)
-
-
-nohup java -jar -Xms128m -Xmx2048m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./email-service/email-service.jar --server.port=8812  > email-service.log 2>&1 &
 

studio/install/16gdata/file-service.sh

@@ -1,8 +1,3 @@
 #!/bin/sh
-source /etc/profile
+nohup java -jar -Xms128m -Xmx512m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./file-service/file-service.jar --server.port=8811  > data-market-service.log 2>&1 &
-
-cd $(dirname $0)
-
-
-nohup java -jar -Xms128m -Xmx2048m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./file-service/file-service.jar --server.port=8811  > data-market-service.log 2>&1 &
 

studio/install/16gdata/gateway.sh

@@ -1,8 +1,3 @@
 #!/bin/sh
-source /etc/profile
+nohup java -jar -Xms1024m -Xmx512m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./gateway/gateway.jar --server.port=9538  > gateway.log 2>&1 &
-
-cd $(dirname $0)
-
-
-nohup java -jar -Xms1024m -Xmx2048m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./gateway/gateway.jar --server.port=9538  > gateway.log 2>&1 &
 

studio/install/16gdata/quartz-service.sh

@@ -1,8 +1,3 @@
 #!/bin/sh
-source /etc/profile
+nohup java -jar -Xms128m -Xmx512m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./quartz-service/quartz-service.jar --server.port=8813  > quartz-service.log 2>&1 &
-
-cd $(dirname $0)
-
-
-nohup java -jar -Xms128m -Xmx2048m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./quartz-service/quartz-service.jar --server.port=8813  > quartz-service.log 2>&1 &
 

studio/install/16gmaster/data-compare-service/data-compare-service.sh

@@ -1,7 +1,2 @@
 #!/bin/sh
-source /etc/profile
+nohup java -jar -Xms128m -Xmx512m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./data-compare-service.jar --server.port=8096  --spring.profiles.active=dev > data-compare-service.log 2>&1 &
-
-cd $(dirname $0)
-
-
-nohup java -jar -Xms128m -Xmx2048m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./data-compare-service.jar --server.port=8096  --spring.profiles.active=dev > data-compare-service.log 2>&1 &

studio/install/16gmaster/data-market-service-integration/data-market-service-integration.sh

@@ -1,9 +1,3 @@
 #!/bin/sh
-source /etc/profile
+nohup java -jar -Xms128m -Xmx512m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./data-market-service-integration.jar --server.port=8824  --spring.profiles.active=dev > data-market-service-integration.log 2>&1 &
-
-cd $(dirname $0)
-
-
-
-nohup java -jar -Xms128m -Xmx2048m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./data-market-service-integration.jar --server.port=8824  --spring.profiles.active=dev > data-market-service-integration.log 2>&1 &
 

studio/install/16gmaster/data-market-service/data-market-service.sh

@@ -1,8 +1,3 @@
 #!/bin/sh
-source /etc/profile
+nohup java -jar -Xms128m -Xmx512m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./data-market-service.jar --server.port=8822  --spring.profiles.active=dev > data-market-service.log 2>&1 &
-
-cd $(dirname $0)
-
-
-nohup java -jar -Xms128m -Xmx2048m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./data-market-service.jar --server.port=8822  --spring.profiles.active=dev > data-market-service.log 2>&1 &
 

studio/install/16gmaster/data-metadata-service/data-metadata-service.sh

@@ -1,7 +1,3 @@
 #!/bin/sh
-source /etc/profile
+nohup java -jar -Xms128m -Xmx512m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./data-metadata-service.jar --server.port=8820 --spring.profiles.active=dev > data-metadata-service.log 2>&1 &
-
-cd $(dirname $0)
-
-nohup java -jar -Xms128m -Xmx2048m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./data-metadata-service.jar --server.port=8820 --spring.profiles.active=dev > data-metadata-service.log 2>&1 &
 

studio/install/16gmaster/data-system-service/data-system-service.sh

@@ -1,7 +1,3 @@
 #!/bin/sh
-source /etc/profile
+nohup java -jar -Xms128m -Xmx512m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./data-system-service.jar --server.port=8810 --spring.profiles.active=dev > data-system-service.log 2>&1 &
-
-cd $(dirname $0)
-
-nohup java -jar -Xms128m -Xmx2048m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./data-system-service.jar --server.port=8810 --spring.profiles.active=dev > data-system-service.log 2>&1 &
 

studio/install/16gmaster/service-data-dts/service-data-dts.sh

@@ -1,7 +1,3 @@
 #!/bin/sh
-source /etc/profile
+nohup java -jar -Xms128m -Xmx512m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./service-data-dts.jar --server.port=8810 --spring.profiles.active=dev > service-data-dts.log 2>&1 &
-
-cd $(dirname $0)
-
-nohup java -jar -Xms128m -Xmx2048m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./service-data-dts.jar --server.port=8810 --spring.profiles.active=dev > service-data-dts.log 2>&1 &
 

studio/install/16gmaster/system-service/system-service.sh

@@ -1,7 +1,3 @@
 #!/bin/sh
-source /etc/profile
+nohup java -jar -Xms128m -Xmx512m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./system-service.jar --server.port=8000  --spring.profiles.active=dev > system-service.log 2>&1 &
-
-cd $(dirname $0)
-
-nohup java -jar -Xms128m -Xmx2048m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./system-service.jar --server.port=8000  --spring.profiles.active=dev > system-service.log 2>&1 &
 

studio/install/16gslave/data-market-service-mapping.sh

@@ -1,8 +1,3 @@
 #!/bin/sh
-source /etc/profile
+nohup java -jar -Xms128m -Xmx512m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./data-market-service-mapping/data-market-service-mapping.jar --server.port=8823  > data-market-service-mapping.log 2>&1 &
-
-cd $(dirname $0)
-
-
-nohup java -jar -Xms128m -Xmx2048m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./data-market-service-mapping/data-market-service-mapping.jar --server.port=8823  > data-market-service-mapping.log 2>&1 &
 

studio/install/16gslave/data-masterdata-service.sh

@@ -1,8 +1,3 @@
 #!/bin/sh
-source /etc/profile
+nohup java -jar -Xms128m -Xmx512m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./data-masterdata-service/data-masterdata-service.jar --server.port=8828  > data-masterdata-service.log 2>&1 &
-
-cd $(dirname $0)
-
-
-nohup java -jar -Xms128m -Xmx2048m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./data-masterdata-service/data-masterdata-service.jar --server.port=8828  > data-masterdata-service.log 2>&1 &
 

studio/install/16gslave/data-metadata-service-console.sh

@@ -1,8 +1,3 @@
 #!/bin/sh
-source /etc/profile
+nohup java -jar -Xms128m -Xmx512m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./data-metadata-service-console/data-metadata-service-console.jar --server.port=8821  > data-metadata-service-console.log 2>&1 &
-
-cd $(dirname $0)
-
-
-nohup java -jar -Xms128m -Xmx2048m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./data-metadata-service-console/data-metadata-service-console.jar --server.port=8821  > data-metadata-service-console.log 2>&1 &
 

studio/install/16gslave/data-quality-service.sh

@@ -1,8 +1,3 @@
 #!/bin/sh
-source /etc/profile
+nohup java -jar -Xms128m -Xmx512m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./data-quality-service/data-quality-service.jar --server.port=8826  > data-quality-service.log 2>&1 &
-
-cd $(dirname $0)
-
-
-nohup java -jar -Xms128m -Xmx2048m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./data-quality-service/data-quality-service.jar --server.port=8826  > data-quality-service.log 2>&1 &
 

studio/install/16gslave/eureka.sh

@@ -1,8 +1,3 @@
 #!/bin/sh
-source /etc/profile
+nohup java -jar -Xms1024m -Xmx512m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./eureka/eureka.jar --server.port=8610  > eureka.log 2>&1 &
-
-cd $(dirname $0)
-
-
-nohup java -jar -Xms1024m -Xmx2048m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 ./eureka/eureka.jar --server.port=8610  > eureka.log 2>&1 &
 

studio/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: 192.168.1.169
+    ip-address: 192.168.1.217
   client:
     register-with-eureka: true
     fetch-registry: true
     instance-info-replication-interval-seconds: 30
     registry-fetch-interval-seconds: 3
     service-url:
-      defaultZone: http://192.168.1.169:8610/eureka
+      defaultZone: http://192.168.1.217:8610/eureka

studio/modules/data-compare-service-parent/data-compare-service/src/main/resources/bootstrap.yml

@@ -33,11 +33,11 @@ eureka:
   instance:
     lease-renewal-interval-in-seconds: 20
     prefer-ip-address: true
-    ip-address: 192.168.1.169
+    ip-address: 192.168.1.217
   client:
     register-with-eureka: true
     fetch-registry: true
     instance-info-replication-interval-seconds: 30
     registry-fetch-interval-seconds: 3
     service-url:
-      defaultZone: http://192.168.1.169:8610/eureka
+      defaultZone: http://192.168.1.217:8610/eureka

studio/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: 192.168.1.169
+    ip-address: 192.168.1.217
   client:
     register-with-eureka: true
     fetch-registry: true
     instance-info-replication-interval-seconds: 30
     registry-fetch-interval-seconds: 3
     service-url:
-      defaultZone: http://192.168.1.169:8610/eureka
+      defaultZone: http://192.168.1.217:8610/eureka

studio/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: 192.168.1.169
+    ip-address: 192.168.1.217
   client:
     register-with-eureka: true
     fetch-registry: true
     instance-info-replication-interval-seconds: 30
     registry-fetch-interval-seconds: 3
     service-url:
-      defaultZone: http://192.168.1.169:8610/eureka
+      defaultZone: http://192.168.1.217:8610/eureka

studio/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: 192.168.1.169
+    ip-address: 192.168.1.217
   client:
     register-with-eureka: true
     fetch-registry: true
     instance-info-replication-interval-seconds: 30
     registry-fetch-interval-seconds: 3
     service-url:
-      defaultZone: http://192.168.1.169:8610/eureka
+      defaultZone: http://192.168.1.217:8610/eureka

studio/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: 192.168.1.169
+    ip-address: 192.168.1.217
   client:
     register-with-eureka: true
     fetch-registry: true
     instance-info-replication-interval-seconds: 30
     registry-fetch-interval-seconds: 3
     service-url:
-      defaultZone: http://192.168.1.169:8610/eureka
+      defaultZone: http://192.168.1.217:8610/eureka

studio/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: 192.168.1.169
+    ip-address: 192.168.1.217
   client:
     register-with-eureka: true
     fetch-registry: true
     instance-info-replication-interval-seconds: 30
     registry-fetch-interval-seconds: 3
     service-url:
-      defaultZone: http://192.168.1.169:8610/eureka
+      defaultZone: http://192.168.1.217:8610/eureka

studio/modules/data-metadata-service-parent/data-metadata-service/src/main/resources/bootstrap.yml

@@ -20,14 +20,14 @@ eureka:
   instance:
     lease-renewal-interval-in-seconds: 20
     prefer-ip-address: true
-    ip-address: 192.168.1.169
+    ip-address: 192.168.1.217
   client:
-    register-with-eureka: true
+    register-with-eureka: false
     fetch-registry: true
     instance-info-replication-interval-seconds: 30
     registry-fetch-interval-seconds: 3
     service-url:
-      defaultZone: http://192.168.1.169:8610/eureka
+      defaultZone: http://192.168.1.217:8610/eureka
 #jwt
 jwt:
   header: Authorization

studio/modules/data-quality-service-parent/data-quality-service-api/src/main/java/cn/datax/service/data/quality/api/dto/Regular.java

@@ -0,0 +1,20 @@
+package cn.datax.service.data.quality.api.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author ch
+ * @date 2023/12/25 17:18
+ *
+ * 正则校验
+ */
+@Data
+public class Regular  implements Serializable {
+
+    /**
+     * 正则表达
+     */
+    private String regular;
+}

studio/modules/data-quality-service-parent/data-quality-service-api/src/main/java/cn/datax/service/data/quality/api/dto/RuleConfig.java

@@ -32,4 +32,11 @@ public class RuleConfig implements Serializable {
      * 准确性
      */
     private Accuracy accuracy;
+
+    /**
+     * 正则表达
+     */
+
+    private Regular regular;
+
 }

studio/modules/data-quality-service-parent/data-quality-service-api/src/main/java/cn/datax/service/data/quality/api/enums/RuleItem.java

@@ -7,6 +7,8 @@ public enum RuleItem {
     Integrity("integrity_key", "验证表中必须出现的字段非空"),
     Relevance("relevance_key", "验证关联性"),
     Timeliness("timeliness_key", "验证及时性"),
+    Regular("regular_key","正则表达式"),
+
     Consistent("consistent_key", "验证用户指定的字段枚举值是否合乎要求");
 
     private final String code;

studio/modules/data-quality-service-parent/data-quality-service/src/main/java/cn/datax/service/data/quality/schedule/rules/RegularRule.java

@@ -0,0 +1,40 @@
+package cn.datax.service.data.quality.schedule.rules;
+
+import cn.datax.common.database.constants.DbType;
+
+import java.util.Map;
+
+/**
+ * @author ch
+ * @date 2023/12/25 18:14
+ */
+public class RegularRule implements RuleItem{
+    private static String REGULAR = "regular";
+
+    @Override
+    public String parse(DbType dbType, String table, String column, Map<String, Object> map) {
+        final StringBuilder builder = new StringBuilder();
+        switch (dbType) {
+            case ORACLE:
+            case ORACLE_12C:
+                builder.append("SELECT SUM(CASE WHEN ROUND(TO_NUMBER(SYSDATE - ").append(column).append(")) >= ").append(map.get(REGULAR)).append(" THEN 1 ELSE 0 END), COUNT(*) FROM ").append(table);
+                break;
+            case MYSQL:
+                builder.append("select sum(case when ").append(column).append(" REGEXP ").append("'"+map.get(REGULAR)+"'").append("  != '' THEN 0 ELSE 1 END),")
+                .append(" COUNT(*) from ").append(table);
+            case MARIADB:
+            case SQL_SERVER:
+            case SQL_SERVER2008:
+            case POSTGRE_SQL:
+            case OTHER:
+            default:
+                break;
+        }
+        return builder.toString();
+    }
+
+    @Override
+    public String code() {
+        return "timeliness_key";
+    }
+}

studio/modules/data-quality-service-parent/data-quality-service/src/main/java/cn/datax/service/data/quality/schedule/rules/RuleItemRegistry.java

@@ -1,5 +1,7 @@
 package cn.datax.service.data.quality.schedule.rules;
 
+import cn.datax.service.data.quality.api.dto.Regular;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -13,6 +15,7 @@ public class RuleItemRegistry {
         this.rule_item_map.put("integrity_key", new IntegrityRule());
         this.rule_item_map.put("relevance_key", new RelevanceRule());
         this.rule_item_map.put("timeliness_key", new TimelinessRule());
+        this.rule_item_map.put("regular_key", new RegularRule());
         this.rule_item_map.put("accuracy_key_length", new AccuracyLengthRule());
     }
 

studio/modules/data-quality-service-parent/data-quality-service/src/main/java/cn/datax/service/data/quality/service/impl/CheckRuleServiceImpl.java

@@ -4,12 +4,7 @@ import cn.datax.common.base.BaseServiceImpl;
 import cn.datax.common.core.RedisConstant;
 import cn.datax.common.database.constants.DbType;
 import cn.datax.common.redis.service.RedisService;
-import cn.datax.service.data.quality.api.dto.Accuracy;
+import cn.datax.service.data.quality.api.dto.*;
-import cn.datax.service.data.quality.api.dto.CheckRuleDto;
-import cn.datax.service.data.quality.api.dto.Consistent;
-import cn.datax.service.data.quality.api.dto.Relevance;
-import cn.datax.service.data.quality.api.dto.RuleConfig;
-import cn.datax.service.data.quality.api.dto.Timeliness;
 import cn.datax.service.data.quality.api.entity.CheckRuleEntity;
 import cn.datax.service.data.quality.api.enums.RuleItem;
 import cn.datax.service.data.quality.dao.CheckRuleDao;
@@ -132,6 +127,11 @@ public class CheckRuleServiceImpl extends BaseServiceImpl<CheckRuleDao, CheckRul
 				Accuracy accuracy = ruleConfig.getAccuracy();
 				map.put("max_length", accuracy.getMaxLength());
 				break;
+			// 正则表达
+			case Regular:
+				Regular regular = ruleConfig.getRegular();
+				map.put("regular", regular.getRegular());
+				break;
 			default:
 				return null;
 		}

studio/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: 192.168.1.169
+    ip-address: 192.168.1.217
   client:
     register-with-eureka: true
     fetch-registry: true
     instance-info-replication-interval-seconds: 30
     registry-fetch-interval-seconds: 3
     service-url:
-      defaultZone: http://192.168.1.169:8610/eureka
+      defaultZone: http://192.168.1.217:8610/eureka

studio/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: 192.168.1.169
+    ip-address: 192.168.1.217
   client:
     register-with-eureka: true
     fetch-registry: true
     instance-info-replication-interval-seconds: 30
     registry-fetch-interval-seconds: 3
     service-url:
-      defaultZone: http://192.168.1.169:8610/eureka
+      defaultZone: http://192.168.1.217:8610/eureka

studio/modules/data-system-service-parent/data-system-service/src/main/resources/bootstrap.yml

@@ -22,11 +22,11 @@ eureka:
     # 设置使用IP
     prefer-ip-address: true
     # 设置外网IP号
-    ip-address: 192.168.1.169
+    ip-address: 192.168.1.217
   client:
     register-with-eureka: true
     fetch-registry: true
     instance-info-replication-interval-seconds: 30
     registry-fetch-interval-seconds: 3
     service-url:
-      defaultZone: http://192.168.1.169:8610/eureka
+      defaultZone: http://192.168.1.217:8610/eureka

studio/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: 192.168.1.169
+    ip-address: 192.168.1.217
   client:
     register-with-eureka: true
     fetch-registry: true
     instance-info-replication-interval-seconds: 30
     registry-fetch-interval-seconds: 3
     service-url:
-      defaultZone: http://192.168.1.169:8610/eureka
+      defaultZone: http://192.168.1.217:8610/eureka

studio/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: 192.168.1.169
+    ip-address: 192.168.1.217
   client:
     register-with-eureka: true
     fetch-registry: true
     instance-info-replication-interval-seconds: 30
     registry-fetch-interval-seconds: 3
     service-url:
-      defaultZone: http://192.168.1.169:8610/eureka
+      defaultZone: http://192.168.1.217:8610/eureka

studio/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: 192.168.1.169
+    ip-address: 192.168.1.217
   client:
     register-with-eureka: true
     fetch-registry: true
     instance-info-replication-interval-seconds: 30
     registry-fetch-interval-seconds: 3
     service-url:
-      defaultZone: http://192.168.1.169:8610/eureka
+      defaultZone: http://192.168.1.217:8610/eureka

studio/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: 192.168.1.169
+    ip-address: 192.168.1.217
   client:
     register-with-eureka: true
     fetch-registry: true
     instance-info-replication-interval-seconds: 30
     registry-fetch-interval-seconds: 3
     service-url:
-      defaultZone: http://192.168.1.169:8610/eureka
+      defaultZone: http://192.168.1.217:8610/eureka

studio/modules/service-data-dts-parent/service-data-dts/src/main/resources/bootstrap.yml

@@ -20,11 +20,11 @@ eureka:
   instance:
     lease-renewal-interval-in-seconds: 20
     prefer-ip-address: true
-    ip-address: 192.168.1.169
+    ip-address: 192.168.1.217
   client:
     register-with-eureka: true
     fetch-registry: true
     instance-info-replication-interval-seconds: 30
     registry-fetch-interval-seconds: 3
     service-url:
-      defaultZone: http://192.168.1.169:8610/eureka
+      defaultZone: http://192.168.1.217:8610/eureka

studio/modules/system-service-parent/system-service/src/main/resources/bootstrap.yml

@@ -46,11 +46,11 @@ eureka:
   instance:
     lease-renewal-interval-in-seconds: 20
     prefer-ip-address: true
-    ip-address: 192.168.1.169
+    ip-address: 192.168.1.217
   client:
     register-with-eureka: true
     fetch-registry: true
     instance-info-replication-interval-seconds: 30
     registry-fetch-interval-seconds: 3
     service-url:
-      defaultZone: http://192.168.1.169:8610/eureka/
+      defaultZone: http://192.168.1.217:8610/eureka/

studio/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: 192.168.1.169
+    ip-address: 192.168.1.217
   client:
     register-with-eureka: true
     fetch-registry: true
     instance-info-replication-interval-seconds: 30
     registry-fetch-interval-seconds: 3
     service-url:
-      defaultZone: http://192.168.1.169:8610/eureka
+      defaultZone: http://192.168.1.217:8610/eureka