修改配置类

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/BaseController.java

@@ -72,7 +72,7 @@ public class BaseController {
      * @param rows 影响行数
      * @return 操作结果
      */
-    protected ApiResult toAjax(int rows) {
+    protected ApiResult<Void> toAjax(int rows) {
         return rows > 0 ? ApiResult.success() : ApiResult.error(BusinessErrorCode.BIZ_MODIFY_FAIL.getCode(), BusinessErrorCode.BIZ_MODIFY_FAIL.getDefaultMessage());
     }
 }

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysLoginController.java

@@ -4,11 +4,12 @@ import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.common.mvc.utils.ServletUtils;
 import com.bizmatics.model.system.SysMenu;
 import com.bizmatics.model.system.SysUser;
+import com.bizmatics.model.vo.RouterVo;
+import com.bizmatics.service.config.security.LoginUser;
 import com.bizmatics.service.system.ISysMenuService;
 import com.bizmatics.service.system.impl.SysLoginService;
 import com.bizmatics.service.system.impl.SysPermissionService;
 import com.bizmatics.service.system.impl.TokenService;
-import com.bizmatics.service.config.security.LoginUser;
 import com.bizmatics.service.vo.LoginBody;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -49,7 +50,7 @@ public class SysLoginController
      * @return 结果
      */
     @PostMapping("/login")
-    public ApiResult login(@RequestBody LoginBody loginBody)
+    public ApiResult<String> login(@RequestBody LoginBody loginBody)
     {
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
@@ -63,7 +64,7 @@ public class SysLoginController
      * @return 用户信息
      */
     @GetMapping("getInfo")
-    public ApiResult getInfo()
+    public ApiResult<Map<String,Object>> getInfo()
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         SysUser user = loginUser.getUser();
@@ -84,7 +85,7 @@ public class SysLoginController
      * @return 路由信息
      */
     @GetMapping("getRouters")
-    public ApiResult getRouters()
+    public ApiResult<List<RouterVo>> getRouters()
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         // 用户信息

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysUserController.java

@@ -45,11 +45,11 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysUser user)
+    public ApiResult<TableDataInfo> list(SysUser user)
     {
         startPage();
         List<SysUser> list = userService.selectUserList(user);
-        return getDataTable(list);
+        return ApiResult.success(getDataTable(list));
     }
 
     /**
@@ -57,7 +57,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping(value = { "/", "/{userId}" })
-    public ApiResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
+    public ApiResult<Map<String,Object>> getInfo(@PathVariable(value = "userId", required = false) Long userId)
     {
         Map<String,Object> ajax = new HashMap<>();
         List<SysRole> roles = roleService.selectRoleAll();
@@ -77,7 +77,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:add')")
     @PostMapping
-    public ApiResult add(@Validated @RequestBody SysUser user)
+    public ApiResult<Void> add(@Validated @RequestBody SysUser user)
     {
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName())))
         {
@@ -103,7 +103,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @PutMapping
-    public ApiResult edit(@Validated @RequestBody SysUser user)
+    public ApiResult<Void> edit(@Validated @RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);
         if (StringUtils.isNotEmpty(user.getPhonenumber())
@@ -125,7 +125,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
     @DeleteMapping("/{userIds}")
-    public ApiResult remove(@PathVariable Long[] userIds)
+    public ApiResult<Void> remove(@PathVariable Long[] userIds)
     {
         return toAjax(userService.deleteUserByIds(userIds));
     }
@@ -135,7 +135,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
     @PutMapping("/resetPwd")
-    public ApiResult resetPwd(@RequestBody SysUser user)
+    public ApiResult<Void> resetPwd(@RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
@@ -148,7 +148,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @PutMapping("/changeStatus")
-    public ApiResult changeStatus(@RequestBody SysUser user)
+    public ApiResult<Void> changeStatus(@RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);
         user.setUpdateBy(SecurityUtils.getUsername());
@@ -160,7 +160,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping("/authRole/{userId}")
-    public ApiResult authRole(@PathVariable("userId") Long userId)
+    public ApiResult<Map<String,Object>> authRole(@PathVariable("userId") Long userId)
     {
         Map<String,Object> ajax = new HashMap<>();
         SysUser user = userService.selectUserById(userId);
@@ -175,7 +175,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @PutMapping("/authRole")
-    public ApiResult insertAuthRole(Long userId, Long[] roleIds)
+    public ApiResult<Void> insertAuthRole(Long userId, Long[] roleIds)
     {
         userService.insertUserAuth(userId, roleIds);
         return ApiResult.success();