From af43ab7830c79ea66c987d3df938cf86b6716bc4 Mon Sep 17 00:00:00 2001 From: ludj Date: Tue, 16 Jan 2024 20:36:48 +0800 Subject: [PATCH] Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one # Conflicts: # acs2/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java # acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceController.java # acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml --- .../src/main/resources/config/application.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml index 387ab2798..9158f64c8 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -13,6 +13,24 @@ spring: redis: repositories: enabled: false + redis: + #数据库索引 + host: ${REDIS_HOST:127.0.0.1} + port: ${REDIS_PORT:6379} + password: ${REDIS_PWD:} + #连接超时时间 + timeout: 5000 + redisson: + config: | + threads: 4 + nettyThreads: 4 + singleServerConfig: + database: 1 + connectionMinimumIdleSize: 8 + connectionPoolSize: 8 + address: redis://127.0.0.1:6379 + idleConnectionTimeout: 10000 + timeout: 3000 #配置 Jpa jpa: