Merge remote-tracking branch 'refs/remotes/origin/master' into dev

schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareCircleController.java

@@ -73,7 +73,6 @@ public class SchisandraShareCircleController {
     /**
      * 分享圈列表返回
      */
-    @Cacheable(value = "sharelist", key = "'sharelist'")
     @GetMapping("sharelist")
     public Result<List<SchisandraShareCircleDTO>> getShareList() {
         try {

schisandra-cloud-storage-share/schisandra-cloud-storage-share-starter/src/main/resources/application.yml

@@ -38,7 +38,7 @@ spring:
     # Redis服务器连接密码（默认为空）
     password: LDQ20020618xxx
     # 连接超时时间
-    timeout: 2s
+    timeout: 10s
     lettuce:
       pool:
         # 连接池最大连接数