rename configuration keys (#288)

arextest · Oct 11, 2023 · 4b73fbd · 4b73fbd
1 parent 46dbf41
commit 4b73fbd
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/arex-web-api/src/main/java/com/arextest/web/api/service/beans/MongodbConfiguration.java b/arex-web-api/src/main/java/com/arextest/web/api/service/beans/MongodbConfiguration.java
@@ -36,7 +36,7 @@
 @Configuration
 public class MongodbConfiguration {
 
-    @Value("${arex.report.mongo.uri}")
+    @Value("${arex.mongo.uri}")
     private String mongoUrl;
 
     private static final String APP_ID = "appId";

diff --git a/arex-web-api/src/main/resources/application-dev.properties b/arex-web-api/src/main/resources/application-dev.properties
@@ -1,5 +1,5 @@
 # test
-arex.report.mongo.uri=mongodb://arex:iLoveArex@ip:27017/arex_storage_db
+arex.mongo.uri=mongodb://arex:iLoveArex@ip:27017/arex_storage_db
 arex.storage.service.url=http://arex-storage-service:8080
 arex.schedule.service.url=http://arex-schedule-service:8080
 arex.redis.uri=redis://10.5.153.1:6379/
diff --git a/arex-web-api/src/main/resources/application-prod.properties b/arex-web-api/src/main/resources/application-prod.properties
@@ -1,5 +1,5 @@
 # prod
-arex.report.mongo.uri=mongodb://arex:iLoveArex@mongodb:27017/arex_storage_db
+arex.mongo.uri=mongodb://arex:iLoveArex@mongodb:27017/arex_storage_db
 arex.storage.service.url=http://arex-storage-service:8080
 arex.schedule.service.url=http://arex-schedule-service:8080
 arex.redis.uri=redis://redis:6379/
diff --git a/arex-web-api/src/main/resources/application.properties b/arex-web-api/src/main/resources/application.properties
@@ -22,9 +22,9 @@ arex.config.default.schedule.targetEnv=
 arex.email.domain=http://arextest.com:8081
 arex.interceptor.patterns=
 # arex report setting
-arex.report.case.inherited=true
+arex.api.case.inherited=true
 # redis leaseTime, unit:(second)
-arex.web.api.redis.lease-time=30
+arex.api.redis.lease-time=30
 #call storage
 arex.storage.countRecord.url=${arex.storage.service.url}/api/storage/replay/query/countByRange
 arex.storage.listRecord.url=${arex.storage.service.url}/api/storage/replay/query/replayCase

diff --git a/arex-web-api/src/main/resources/log4j2.xml b/arex-web-api/src/main/resources/log4j2.xml
@@ -17,7 +17,7 @@
         </RollingFile>
         <NoSql name="Mongo4">
             <ArexMongoDb4 capped="true" collectionSize="104857600"
-                      connection="${sys:arex.report.mongo.uri}"
+                      connection="${sys:arex.mongo.uri}"
             />
         </NoSql>
     </Appenders>

diff --git a/arex-web-core/src/main/java/com/arextest/web/core/business/filesystem/FileSystemService.java b/arex-web-core/src/main/java/com/arextest/web/core/business/filesystem/FileSystemService.java
@@ -126,7 +126,7 @@ public class FileSystemService {
     private static final String AREX_REPLAY_PREPARE_DEPENDENCY = "arex_replay_prepare_dependency";
     private static final String PINNED_PRE_FIX = "pinned_";
 
-    @Value("${arex.report.case.inherited}")
+    @Value("${arex.api.case.inherited}")
     private String arexCaseInherited;
 
     @Resource

diff --git a/arex-web-core/src/main/java/com/arextest/web/core/repository/mongo/FSTreeRepositoryImpl.java b/arex-web-core/src/main/java/com/arextest/web/core/repository/mongo/FSTreeRepositoryImpl.java
@@ -32,7 +32,7 @@ public class FSTreeRepositoryImpl implements FSTreeRepository {
     private static final String USERNAME = "userName";
     private static final String ROOTS = "roots";
 
-    @Value("${arex.web.api.redis.lease-time}")
+    @Value("${arex.api.redis.lease-time}")
     private long redisLeaseTime;
     @Resource
     private MongoTemplate mongoTemplate;