统一拦截相应 组装分页参数

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/TestController.java

@@ -91,7 +91,7 @@ public class TestController {
     RedisLockUtil redisLockUtil;
 
 
-    @PostMapping("/test")
+    @GetMapping("/test")
     public String test(String test) throws Exception {
 
 
@@ -135,9 +135,9 @@ public class TestController {
 
 //        JedisConnectionFactory bean = (JedisConnectionFactory)SpringUtil.getBean(RedisConnectionFactory.class);
 //        int maxIdle = bean.getPoolConfig().getMaxIdle();
-        MatrixToImageWriterUtil
-            .createQRCode("https://test.4dkankan.com" + "t-RGjyzx4", ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+"t-RGjyzx4"+".png",
-                null);
+//        MatrixToImageWriterUtil
+//            .createQRCode("https://test.4dkankan.com" + "t-RGjyzx4", ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+"t-RGjyzx4"+".png",
+//                null);
         return "123";
 
     }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/FolderServiceImpl.java

@@ -213,10 +213,9 @@ public class FolderServiceImpl extends ServiceImpl<IFolderMapper, Folder> implem
                 sceneNumFile = 0;
                 List<FolderScene> folderSceneList =
                         folderSceneService.list(
-                                new QueryWrapper<FolderScene>()
-                                        .eq("tbStatus", TbStatus.VALID.code())
-                                        .eq("folderId", folder.getId())
-                                        .orderByDesc("id"));
+                                new LambdaQueryWrapper<FolderScene>()
+                                        .eq(FolderScene::getFolderId, folder.getId())
+                                        .orderByDesc(FolderScene::getId));
 
                 if(CollUtil.isNotEmpty(folderSceneList)){
                     sceneNumFile =  sceneProService.findFolderIdScence(folder.getId(),folder.getUserId());

4dkankan-center-scene/src/main/resources/bootstrap.yml

@@ -62,7 +62,6 @@ spring:
             dataId: ${spring.application.name}-flow-rules
             groupId: SENTINEL_GROUP
             namespace: 4dkankan-dev
-#            data-type: json
             rule-type: flow
         #熔断规则
         degrade:
@@ -71,7 +70,6 @@ spring:
             dataId: ${spring.application.name}-degrade-rules
             groupId: SENTINEL_GROUP
             namespace: 4dkankan-dev
-#            data-type: json
             rule-type: degrade
 #      log:
 #        dir: ./logs # 默认值${home}/logs/csp/