Merge branch 'master' into Yolo

controller/src/main/java/com/koobietech/eas/controller/EasDepartmentController.java

@@ -1,6 +1,7 @@
 package com.koobietech.eas.controller;
 
 import com.github.pagehelper.PageHelper;
+import com.koobietech.eas.common.result.JsonPageResult;
 import com.koobietech.eas.common.result.JsonResult;
 import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.model.EasSysDepartment;
@@ -23,11 +24,11 @@ public class EasDepartmentController {
 
     @PostMapping("/query")
     @Operation(summary = "查询部门" ,  description = "根据参数查询基本信息")
-    public JsonResult query(@RequestBody EasSysDepartment department,
-                            @RequestParam Integer pageNum, @RequestParam Integer pageSize ) {
+    public JsonPageResult query(@RequestBody EasSysDepartment department,
+                                @RequestParam Integer pageNum, @RequestParam Integer pageSize ) {
         PageHelper.startPage(pageNum, pageSize);
         PageData ret = easDepartmentService.query(department);
-        return JsonResult.data(ret);
+        return JsonPageResult.data(ret);
     }
 
     @PostMapping("/add")

controller/src/main/java/com/koobietech/eas/controller/EasPermissionController.java

@@ -1,6 +1,7 @@
 package com.koobietech.eas.controller;
 
 import com.github.pagehelper.PageHelper;
+import com.koobietech.eas.common.result.JsonPageResult;
 import com.koobietech.eas.common.result.JsonResult;
 import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.model.EasSysPermission;
@@ -22,11 +23,11 @@ public class EasPermissionController {
 
     @PostMapping("/query")
     @Operation(summary = "查询权限" ,  description = "根据参数查询基本权限表信息")
-    public PageData query(@RequestBody(required = false) EasSysPermission permission,
-                          @RequestParam Integer pageNum, @RequestParam Integer pageSize ){
+    public JsonPageResult query(@RequestBody(required = false) EasSysPermission permission,
+                                @RequestParam Integer pageNum, @RequestParam Integer pageSize ){
         PageHelper.startPage(pageNum, pageSize);
         PageData ret = easPermissionService.query(permission);
-        return ret;
+        return JsonPageResult.data(ret);
     }
 
     @PostMapping("/add")

controller/src/main/resources/application-dev.yaml

@@ -2,7 +2,7 @@ server:
   port: 8080
 spring:
   datasource:
-    url: jdbc:mysql://39.105.160.25:10992/eas?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true&tinyInt1isBit=false
+    url: jdbc:mysql://mysql8-compose:3306/eas?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true&tinyInt1isBit=false
     username: eas
     password: eas
     driver-class-name: com.mysql.cj.jdbc.Driver