swagger 在 springboot 2.6.x 不兼容问题的处理

RuoYi

2022-01-14 2d7fd84c57e6659c9ba46ac9f4e2d3bddf879e2b

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -5,7 +5,6 @@
import java.util.Set;

import java.util.stream.Collectors;

import javax.servlet.http.HttpServletResponse;



import org.apache.commons.lang3.ArrayUtils;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.validation.annotation.Validated;

@@ -20,7 +19,6 @@
import org.springframework.web.multipart.MultipartFile;

import com.ruoyi.common.core.constant.UserConstants;

import com.ruoyi.common.core.domain.R;

import com.ruoyi.common.core.utils.SecurityUtils;

import com.ruoyi.common.core.utils.StringUtils;

import com.ruoyi.common.core.utils.poi.ExcelUtil;

import com.ruoyi.common.core.web.controller.BaseController;

@@ -28,10 +26,13 @@
import com.ruoyi.common.core.web.page.TableDataInfo;

import com.ruoyi.common.log.annotation.Log;

import com.ruoyi.common.log.enums.BusinessType;

import com.ruoyi.common.security.annotation.PreAuthorize;

import com.ruoyi.common.security.annotation.InnerAuth;

import com.ruoyi.common.security.annotation.RequiresPermissions;

import com.ruoyi.common.security.utils.SecurityUtils;

import com.ruoyi.system.api.domain.SysRole;

import com.ruoyi.system.api.domain.SysUser;

import com.ruoyi.system.api.model.LoginUser;

import com.ruoyi.system.service.ISysConfigService;

import com.ruoyi.system.service.ISysPermissionService;

import com.ruoyi.system.service.ISysPostService;

import com.ruoyi.system.service.ISysRoleService;

@@ -58,10 +59,13 @@
    @Autowired

    private ISysPermissionService permissionService;



    @Autowired

    private ISysConfigService configService;



    /**

     * 获取用户列表

     */

    @PreAuthorize(hasPermi = "system:user:list")

    @RequiresPermissions("system:user:list")

    @GetMapping("/list")

    public TableDataInfo list(SysUser user)

    {

@@ -71,9 +75,9 @@
    }



    @Log(title = "用户管理", businessType = BusinessType.EXPORT)

    @PreAuthorize(hasPermi = "system:user:export")

    @RequiresPermissions("system:user:export")

    @PostMapping("/export")

    public void export(HttpServletResponse response, SysUser user) throws IOException

    public void export(HttpServletResponse response, SysUser user)

    {

        List<SysUser> list = userService.selectUserList(user);

        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);

@@ -81,7 +85,7 @@
    }



    @Log(title = "用户管理", businessType = BusinessType.IMPORT)

    @PreAuthorize(hasPermi = "system:user:import")

    @RequiresPermissions("system:user:import")

    @PostMapping("/importData")

    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception

    {

@@ -102,6 +106,7 @@
    /**

     * 获取当前用户信息

     */

    @InnerAuth

    @GetMapping("/info/{username}")

    public R<LoginUser> info(@PathVariable("username") String username)

    {

@@ -119,6 +124,25 @@
        sysUserVo.setRoles(roles);

        sysUserVo.setPermissions(permissions);

        return R.ok(sysUserVo);

    }



    /**

     * 注册用户信息

     */

    @InnerAuth

    @PostMapping("/register")

    public R<Boolean> register(@RequestBody SysUser sysUser)

    {

        String username = sysUser.getUserName();

        if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))

        {

            return R.fail("当前系统没有开启注册功能！");

        }

        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(username)))

        {

            return R.fail("保存用户'" + username + "'失败，注册账号已存在");

        }

        return R.ok(userService.registerUser(sysUser));

    }



    /**

@@ -144,19 +168,21 @@
    /**

     * 根据用户编号获取详细信息

     */

    @PreAuthorize(hasPermi = "system:user:query")

    @RequiresPermissions("system:user:query")

    @GetMapping(value = { "/", "/{userId}" })

    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)

    {

        userService.checkUserDataScope(userId);

        AjaxResult ajax = AjaxResult.success();

        List<SysRole> roles = roleService.selectRoleAll();

        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));

        ajax.put("posts", postService.selectPostAll());

        if (StringUtils.isNotNull(userId))

        {

            ajax.put(AjaxResult.DATA_TAG, userService.selectUserById(userId));

            SysUser sysUser = userService.selectUserById(userId);

            ajax.put(AjaxResult.DATA_TAG, sysUser);

            ajax.put("postIds", postService.selectPostListByUserId(userId));

            ajax.put("roleIds", roleService.selectRoleListByUserId(userId));

            ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));

        }

        return ajax;

    }

@@ -164,7 +190,7 @@
    /**

     * 新增用户

     */

    @PreAuthorize(hasPermi = "system:user:add")

    @RequiresPermissions("system:user:add")

    @Log(title = "用户管理", businessType = BusinessType.INSERT)

    @PostMapping

    public AjaxResult add(@Validated @RequestBody SysUser user)

@@ -191,7 +217,7 @@
    /**

     * 修改用户

     */

    @PreAuthorize(hasPermi = "system:user:edit")

    @RequiresPermissions("system:user:edit")

    @Log(title = "用户管理", businessType = BusinessType.UPDATE)

    @PutMapping

    public AjaxResult edit(@Validated @RequestBody SysUser user)

@@ -214,12 +240,13 @@
    /**

     * 删除用户

     */

    @PreAuthorize(hasPermi = "system:user:remove")

    @RequiresPermissions("system:user:remove")

    @Log(title = "用户管理", businessType = BusinessType.DELETE)

    @DeleteMapping("/{userIds}")

    public AjaxResult remove(@PathVariable Long[] userIds)

    {

        if (ArrayUtils.contains(userIds, SecurityUtils.getUserId())) {

        if (ArrayUtils.contains(userIds, SecurityUtils.getUserId()))

        {

            return AjaxResult.error("当前用户不能删除");

        }

        return toAjax(userService.deleteUserByIds(userIds));

@@ -228,7 +255,7 @@
    /**

     * 重置密码

     */

    @PreAuthorize(hasPermi = "system:user:edit")

    @RequiresPermissions("system:user:edit")

    @Log(title = "用户管理", businessType = BusinessType.UPDATE)

    @PutMapping("/resetPwd")

    public AjaxResult resetPwd(@RequestBody SysUser user)

@@ -242,7 +269,7 @@
    /**

     * 状态修改

     */

    @PreAuthorize(hasPermi = "system:user:edit")

    @RequiresPermissions("system:user:edit")

    @Log(title = "用户管理", businessType = BusinessType.UPDATE)

    @PutMapping("/changeStatus")

    public AjaxResult changeStatus(@RequestBody SysUser user)

@@ -255,7 +282,7 @@
    /**

     * 根据用户编号获取授权角色

     */

    @PreAuthorize(hasPermi = "system:user:query")

    @RequiresPermissions("system:user:query")

    @GetMapping("/authRole/{userId}")

    public AjaxResult authRole(@PathVariable("userId") Long userId)

    {

@@ -270,7 +297,7 @@
    /**

     * 用户授权角色

     */

    @PreAuthorize(hasPermi = "system:user:edit")

    @RequiresPermissions("system:user:edit")

    @Log(title = "用户管理", businessType = BusinessType.GRANT)

    @PutMapping("/authRole")

    public AjaxResult insertAuthRole(Long userId, Long[] roleIds)