1:修改返回

project-interface/src/main/java/com/dituhui/pea/user/IRole.java

 package com.dituhui.pea.user;
 package com.dituhui.pea.user;
 
 
 import com.dituhui.pea.common.PageResult;
 import com.dituhui.pea.common.PageResult;
+import com.dituhui.pea.common.Result;
 import com.dituhui.pea.pojo.PageRequest;
 import com.dituhui.pea.pojo.PageRequest;
 import com.dituhui.pea.pojo.ResourceInfo;
 import com.dituhui.pea.pojo.ResourceInfo;
 import com.dituhui.pea.pojo.RoleInfo;
 import com.dituhui.pea.pojo.RoleInfo;
@@ -123,7 +124,7 @@ public interface IRole {
      * @return
      * @return
      */
      */
     @RequestMapping(value = "/pea-user/role/list", method = RequestMethod.GET)
     @RequestMapping(value = "/pea-user/role/list", method = RequestMethod.GET)
-    WebResult<PageResult<RoleInfo>> listRole(PageRequest pageRequest);
+    Result<PageResult<RoleInfo>> listRole(PageRequest pageRequest);
 
 
     /**
     /**
      * 获取用户角色权限列表
      * 获取用户角色权限列表
@@ -132,7 +133,7 @@ public interface IRole {
      * @return
      * @return
      */
      */
     @RequestMapping(value = "/pea-user/role/info", method = RequestMethod.GET)
     @RequestMapping(value = "/pea-user/role/info", method = RequestMethod.GET)
-    WebResult<RoleInfo> info(@RequestParam("roleId") String roleId);
+    Result<RoleInfo> info(@RequestParam("roleId") String roleId);
 
 
     /**
     /**
      * 获取用户角色权限列表
      * 获取用户角色权限列表
@@ -141,5 +142,5 @@ public interface IRole {
      * @return
      * @return
      */
      */
     @RequestMapping(value = "/pea-user/role/allResource", method = RequestMethod.GET)
     @RequestMapping(value = "/pea-user/role/allResource", method = RequestMethod.GET)
-    WebResult<List<ResourceInfo>> allResource();
+    Result<List<ResourceInfo>> allResource();
 }
 }

project-interface/src/main/java/com/dituhui/pea/user/IUser.java

@@ -151,6 +151,6 @@ public interface IUser {
      * @return
      * @return
      */
      */
     @RequestMapping(value = "/pea-user/ban", method = RequestMethod.GET)
     @RequestMapping(value = "/pea-user/ban", method = RequestMethod.GET)
-    WebResult<Boolean> ban(UserInfoSearch search);
+    Result<Boolean> ban(UserInfoSearch search);
 
 
 }
 }

project-user/src/main/java/com/dituhui/pea/user/controller/RoleController.java

 package com.dituhui.pea.user.controller;
 package com.dituhui.pea.user.controller;
 
 
 import com.dituhui.pea.common.PageResult;
 import com.dituhui.pea.common.PageResult;
+import com.dituhui.pea.common.Result;
 import com.dituhui.pea.enums.StatusCodeEnum;
 import com.dituhui.pea.enums.StatusCodeEnum;
 import com.dituhui.pea.pojo.PageRequest;
 import com.dituhui.pea.pojo.PageRequest;
 import com.dituhui.pea.pojo.ResourceInfo;
 import com.dituhui.pea.pojo.ResourceInfo;
@@ -114,23 +115,23 @@ public class RoleController implements IRole {
     }
     }
 
 
     @Override
     @Override
-    public WebResult<PageResult<RoleInfo>> listRole(PageRequest pageRequest) {
+    public Result<PageResult<RoleInfo>> listRole(PageRequest pageRequest) {
         PageResult<RoleInfo> result = roleService.listRole(pageRequest);
         PageResult<RoleInfo> result = roleService.listRole(pageRequest);
-        return WebResult.ok(result);
+        return Result.success(result);
     }
     }
 
 
 
 
     @Override
     @Override
-    public WebResult<RoleInfo> info(String roleId) {
+    public Result<RoleInfo> info(String roleId) {
         RoleInfo result = roleService.info(roleId);
         RoleInfo result = roleService.info(roleId);
-        return WebResult.ok(result);
+        return Result.success(result);
     }
     }
 
 
 
 
     @Override
     @Override
-    public WebResult<List<ResourceInfo>> allResource() {
+    public Result<List<ResourceInfo>> allResource() {
         List<ResourceInfo> result = roleService.allResource();
         List<ResourceInfo> result = roleService.allResource();
-        return WebResult.ok(result);
+        return Result.success(result);
     }
     }
 
 
 
 

project-user/src/main/java/com/dituhui/pea/user/controller/UserController.java

@@ -152,9 +152,9 @@ public class UserController implements IUser {
      * @return
      * @return
      */
      */
     @Override
     @Override
-    public WebResult<Boolean> ban(UserInfoSearch search) {
+    public Result<Boolean> ban(UserInfoSearch search) {
         userService.ban(search);
         userService.ban(search);
-        return WebResult.ok();
+        return Result.success(true);
     }
     }
 
 
 }
 }