Merge branch 'master' into glx

src/main/java/com/youlai/boot/common/result/PageResult.java

@@ -37,10 +37,13 @@ public class PageResult<T> implements Serializable {
                         ? Collections.emptyList()
                         : page.getRecords();
         PageData<T> pageData = new PageData<>();
-        pageData.setList(records);
+        pageData.setRecords(records);
-        pageData.setTotal(page != null ? page.getTotal() : 0L);
+        pageData.setTotal(page.getTotal());
-        result.setData(pageData);
+        pageData.setSize(page.getSize());
+        pageData.setCurrent(page.getCurrent());
+        pageData.setPages(page.getPages());
 
+        result.setData(pageData);
         return result;
     }
 
@@ -54,7 +57,7 @@ public class PageResult<T> implements Serializable {
         result.setCode(ResultCode.SUCCESS.getCode());
         result.setMsg(ResultCode.SUCCESS.getMsg());
         PageData<T> pageData = new PageData<>();
-        pageData.setList(list != null ? list : Collections.emptyList());
+        pageData.setRecords(list != null ? list : Collections.emptyList());
         pageData.setTotal(0L);
         result.setData(pageData);
         return result;
@@ -63,9 +66,15 @@ public class PageResult<T> implements Serializable {
     @Data
     public static class PageData<T> {
 
-        private List<T> list;
+        private List<T> records;
 
         private long total;
+
+        private long size;
+
+        private long current;
+
+        private long pages;
     }
 
 }

src/main/java/com/youlai/boot/mini/controller/StrayAnimalController.java

@@ -116,7 +116,6 @@ public class StrayAnimalController {
 
     @Operation(summary = "获取自己登记创建的动物信息列表")
     @GetMapping(value = "/getSelfCreatedPage")
-    @Log(module = LogModuleEnum.STRAY_ANIMAL_INFO, value = ActionTypeEnum.LIST)
     public PageResult<StrayAnimalShortVO> getSelfCreatedPage(
         OwnStrayAnimalQuery queryParams
     ) {
@@ -134,7 +133,6 @@ public class StrayAnimalController {
 
     @Operation(summary = "获取某个用户登记创建的动物信息列表")
     @GetMapping(value = "/getOthersCreatedPage/{authorUuid}")
-    @Log(module = LogModuleEnum.STRAY_ANIMAL_INFO, value = ActionTypeEnum.LIST)
     public PageResult<StrayAnimalShortVO> getOthersCreatedPage(
         @PathVariable String authorUuid,
         OwnStrayAnimalQuery queryParams

src/main/java/com/youlai/boot/mini/controller/UnauthenticatedController.java

@@ -48,7 +48,6 @@ public class UnauthenticatedController {
 
     @Operation(summary = "获取某个用户登记创建的动物信息列表", operationId = "publicGetOthersCreatedPage")
     @GetMapping(value = "/strayAnimal/getOthersCreatedPage/{authorUuid}")
-    @Log(module = LogModuleEnum.STRAY_ANIMAL_INFO, value = ActionTypeEnum.LIST)
     public PageResult<StrayAnimalShortVO> getOthersCreatedPage(
         @PathVariable String authorUuid,
         OwnStrayAnimalQuery queryParams

src/main/resources/application-dev.yml

@@ -161,10 +161,10 @@ springdoc:
       paths-to-match: "/**" # 匹配的请求路径
       packages-to-scan: # 扫描的 Controller 包，限制只生成指定包的接口文档
         - com.youlai.boot.auth.controller
-        - com.youlai.boot.system.controller
+#        - com.youlai.boot.system.controller
         - com.youlai.boot.mini.controller
-        - com.youlai.boot.module.file.controller
+#        - com.youlai.boot.module.file.controller
-        - com.youlai.boot.module.codegen.controller
+#        - com.youlai.boot.module.codegen.controller
   default-flat-param-object: true # 将对象参数扁平化显示在文档中
 
 # knife4j 配置