Solve the conflict between the jdbc.url parameter of audit-store and…

… the container environment variable
doleyzi · May 23, 2024 · f4f5441 · f4f5441
1 parent 6eeec6e
commit f4f5441
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/config/JdbcConfig.java b/inlong-audit/audit-store/src/main/java/org/apache/inlong/audit/config/JdbcConfig.java
@@ -25,20 +25,20 @@
 @Data
 public class JdbcConfig {
 
-    @Value("${jdbc.driver:com.mysql.cj.jdbc.Driver}")
+    @Value("${audit.store.jdbc.driver:com.mysql.cj.jdbc.Driver}")
     private String driver;
-    @Value("${jdbc.url}")
+    @Value("${audit.store.jdbc.url}")
     private String url;
-    @Value("${jdbc.username}")
+    @Value("${audit.store.jdbc.username}")
     private String userName;
-    @Value("${jdbc.password}")
+    @Value("${audit.store.jdbc.password}")
     private String password;
-    @Value("${jdbc.batchIntervalMs:1000}")
+    @Value("${audit.store.jdbc.batchIntervalMs:1000}")
     private int batchIntervalMs;
-    @Value("${jdbc.batchThreshold:500}")
+    @Value("${audit.store.jdbc.batchThreshold:500}")
     private int batchThreshold;
-    @Value("${jdbc.processIntervalMs:100}")
+    @Value("${audit.store.jdbc.processIntervalMs:100}")
     private int processIntervalMs;
-    @Value("${data.queue.size:1000000}")
+    @Value("${audit.store.data.queue.size:1000000}")
     private int dataQueueSize;
 }
diff --git a/inlong-audit/conf/application.properties b/inlong-audit/conf/application.properties
@@ -47,7 +47,7 @@ audit.kafka.consumer.name=inlong-audit-consumer
 audit.kafka.group.id=audit-consumer-group
 
 # Generic jdbc storage
-jdbc.driver=com.mysql.cj.jdbc.Driver
-jdbc.url=jdbc:mysql://127.0.0.1:3306/apache_inlong_audit?characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2b8&rewriteBatchedStatements=true&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
-jdbc.username=root
-jdbc.password=inlong
+audit.store.jdbc.driver=com.mysql.cj.jdbc.Driver
+audit.store.jdbc.url=jdbc:mysql://127.0.0.1:3306/apache_inlong_audit?characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2b8&rewriteBatchedStatements=true&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
+audit.store.jdbc.username=root
+audit.store.jdbc.password=inlong