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

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: