Merge remote-tracking branch 'origin/master_merge' into master_merge

lms/nladmin-system/src/main/resources/config/application.yml

@@ -158,6 +158,26 @@ mybatis-plus:
     db-config:
       id-type: INPUT
     banner: false
+jetcache:
+  statIntervalMinutes: 15
+  areaInCacheName: false
+  local:
+    default:
+      type: linkedhashmap
+      keyConvertor: fastjson
+  remote:
+    default:
+      type: redis
+      keyConvertor: fastjson2
+      broadcastChannel: projectA
+      valueEncoder: java
+      valueDecoder: java
+      poolConfig:
+        minIdle: 5
+        maxIdle: 20
+        maxTotal: 50
+      host: 127.0.0.1
+      port: 6379
 lucene:
   index:
     path: D:\log\lms\lucene\index