fix -- 将响应体R改回AjaxResult，方便兼容RuoYi-Vue-Plus的同步更新

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

@@ -5,7 +5,7 @@ import cn.hutool.captcha.generator.CodeGenerator;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.IdUtil;
 import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.CaptchaType;
 import com.ruoyi.common.utils.redis.RedisUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -42,12 +42,12 @@ public class CaptchaController {
      */
     @ApiOperation("生成验证码")
     @GetMapping("/captchaImage")
-    public R<Map<String, Object>> getCode() {
+    public AjaxResult<Map<String, Object>> getCode() {
         Map<String, Object> ajax = new HashMap<>();
         boolean captchaOnOff = configService.selectCaptchaOnOff();
         ajax.put("captchaOnOff", captchaOnOff);
         if (!captchaOnOff) {
-            return R.success(ajax);
+            return AjaxResult.success(ajax);
         }
         // 保存验证码信息
         String uuid = IdUtil.simpleUUID();
@@ -64,7 +64,7 @@ public class CaptchaController {
         RedisUtils.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
         ajax.put("uuid", uuid);
         ajax.put("img", captcha.getImageBase64());
-        return R.success(ajax);
+        return AjaxResult.success(ajax);
     }
 
     private String getCodeResult(String capStr) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java

@@ -1,7 +1,7 @@
 package com.ruoyi.web.controller.monitor;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -32,7 +32,7 @@ public class CacheController {
     @ApiOperation("获取缓存监控详细信息")
     @SaCheckPermission("monitor:cache:list")
     @GetMapping()
-    public R<Map<String, Object>> getInfo() throws Exception {
+    public AjaxResult<Map<String, Object>> getInfo() throws Exception {
         Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) RedisServerCommands::info);
         Properties commandStats = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
         Object dbSize = redisTemplate.execute((RedisCallback<Object>) RedisServerCommands::dbSize);
@@ -52,6 +52,6 @@ public class CacheController {
             });
         }
         result.put("commandStats", pieList);
-        return R.success(result);
+        return AjaxResult.success(result);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java

@@ -3,7 +3,7 @@ package com.ruoyi.web.controller.monitor;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
@@ -54,7 +54,7 @@ public class SysLogininforController extends BaseController {
     @SaCheckPermission("monitor:logininfor:remove")
     @Log(title = "登录日志", businessType = BusinessType.DELETE)
     @DeleteMapping("/{infoIds}")
-    public R<Void> remove(@PathVariable Long[] infoIds) {
+    public AjaxResult<Void> remove(@PathVariable Long[] infoIds) {
         return toAjax(logininforService.deleteLogininforByIds(infoIds));
     }
 
@@ -62,8 +62,8 @@ public class SysLogininforController extends BaseController {
     @SaCheckPermission("monitor:logininfor:remove")
     @Log(title = "登录日志", businessType = BusinessType.CLEAN)
     @DeleteMapping("/clean")
-    public R<Void> clean() {
+    public AjaxResult<Void> clean() {
         logininforService.cleanLogininfor();
-        return R.success();
+        return AjaxResult.success();
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java

@@ -3,7 +3,7 @@ package com.ruoyi.web.controller.monitor;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
@@ -54,7 +54,7 @@ public class SysOperlogController extends BaseController {
     @Log(title = "操作日志", businessType = BusinessType.DELETE)
     @SaCheckPermission("monitor:operlog:remove")
     @DeleteMapping("/{operIds}")
-    public R<Void> remove(@PathVariable Long[] operIds) {
+    public AjaxResult<Void> remove(@PathVariable Long[] operIds) {
         return toAjax(operLogService.deleteOperLogByIds(operIds));
     }
 
@@ -62,8 +62,8 @@ public class SysOperlogController extends BaseController {
     @Log(title = "操作日志", businessType = BusinessType.CLEAN)
     @SaCheckPermission("monitor:operlog:remove")
     @DeleteMapping("/clean")
-    public R<Void> clean() {
+    public AjaxResult<Void> clean() {
         operLogService.cleanOperLog();
-        return R.success();
+        return AjaxResult.success();
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java

@@ -7,7 +7,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.dto.UserOnlineDTO;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
@@ -78,11 +78,11 @@ public class SysUserOnlineController extends BaseController {
     @SaCheckPermission("monitor:online:forceLogout")
     @Log(title = "在线用户", businessType = BusinessType.FORCE)
     @DeleteMapping("/{tokenId}")
-    public R<Void> forceLogout(@PathVariable String tokenId) {
+    public AjaxResult<Void> forceLogout(@PathVariable String tokenId) {
         try {
             StpUtil.kickoutByTokenValue(tokenId);
         } catch (NotLoginException e) {
         }
-        return R.success();
+        return AjaxResult.success();
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
@@ -61,8 +61,8 @@ public class SysConfigController extends BaseController {
     @ApiOperation("根据参数编号获取详细信息")
     @SaCheckPermission("system:config:query")
     @GetMapping(value = "/{configId}")
-    public R<SysConfig> getInfo(@ApiParam("参数ID") @PathVariable Long configId) {
+    public AjaxResult<SysConfig> getInfo(@ApiParam("参数ID") @PathVariable Long configId) {
-        return R.success(configService.selectConfigById(configId));
+        return AjaxResult.success(configService.selectConfigById(configId));
     }
 
     /**
@@ -70,8 +70,8 @@ public class SysConfigController extends BaseController {
      */
     @ApiOperation("根据参数键名查询参数值")
     @GetMapping(value = "/configKey/{configKey}")
-    public R<Void> getConfigKey(@ApiParam("参数Key") @PathVariable String configKey) {
+    public AjaxResult<Void> getConfigKey(@ApiParam("参数Key") @PathVariable String configKey) {
-        return R.success(configService.selectConfigByKey(configKey));
+        return AjaxResult.success(configService.selectConfigByKey(configKey));
     }
 
     /**
@@ -81,9 +81,9 @@ public class SysConfigController extends BaseController {
     @SaCheckPermission("system:config:add")
     @Log(title = "参数管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysConfig config) {
+    public AjaxResult<Void> add(@Validated @RequestBody SysConfig config) {
         if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
-            return R.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
+            return AjaxResult.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
         return toAjax(configService.insertConfig(config));
     }
@@ -95,9 +95,9 @@ public class SysConfigController extends BaseController {
     @SaCheckPermission("system:config:edit")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysConfig config) {
+    public AjaxResult<Void> edit(@Validated @RequestBody SysConfig config) {
         if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
-            return R.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
+            return AjaxResult.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
         return toAjax(configService.updateConfig(config));
     }
@@ -109,7 +109,7 @@ public class SysConfigController extends BaseController {
     @SaCheckPermission("system:config:remove")
     @Log(title = "参数管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{configIds}")
-    public R<Void> remove(@ApiParam("参数ID串") @PathVariable Long[] configIds) {
+    public AjaxResult<Void> remove(@ApiParam("参数ID串") @PathVariable Long[] configIds) {
         configService.deleteConfigByIds(configIds);
         return success();
     }
@@ -121,8 +121,8 @@ public class SysConfigController extends BaseController {
     @SaCheckPermission("system:config:remove")
     @Log(title = "参数管理", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
-    public R<Void> refreshCache() {
+    public AjaxResult<Void> refreshCache() {
         configService.resetConfigCache();
-        return R.success();
+        return AjaxResult.success();
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -6,7 +6,7 @@ import cn.hutool.core.util.ArrayUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
@@ -43,9 +43,9 @@ public class SysDeptController extends BaseController {
     @ApiOperation("获取部门列表")
     @SaCheckPermission("system:dept:list")
     @GetMapping("/list")
-    public R<List<SysDept>> list(SysDept dept) {
+    public AjaxResult<List<SysDept>> list(SysDept dept) {
         List<SysDept> depts = deptService.selectDeptList(dept);
-        return R.success(depts);
+        return AjaxResult.success(depts);
     }
 
     /**
@@ -54,11 +54,11 @@ public class SysDeptController extends BaseController {
     @ApiOperation("查询部门列表（排除节点）")
     @SaCheckPermission("system:dept:list")
     @GetMapping("/list/exclude/{deptId}")
-    public R<List<SysDept>> excludeChild(@ApiParam("部门ID") @PathVariable(value = "deptId", required = false) Long deptId) {
+    public AjaxResult<List<SysDept>> excludeChild(@ApiParam("部门ID") @PathVariable(value = "deptId", required = false) Long deptId) {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
         depts.removeIf(d -> d.getDeptId().equals(deptId)
                 || ArrayUtil.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
-        return R.success(depts);
+        return AjaxResult.success(depts);
     }
 
     /**
@@ -67,9 +67,9 @@ public class SysDeptController extends BaseController {
     @ApiOperation("根据部门编号获取详细信息")
     @SaCheckPermission("system:dept:query")
     @GetMapping(value = "/{deptId}")
-    public R<SysDept> getInfo(@ApiParam("部门ID") @PathVariable Long deptId) {
+    public AjaxResult<SysDept> getInfo(@ApiParam("部门ID") @PathVariable Long deptId) {
         deptService.checkDeptDataScope(deptId);
-        return R.success(deptService.selectDeptById(deptId));
+        return AjaxResult.success(deptService.selectDeptById(deptId));
     }
 
     /**
@@ -77,9 +77,9 @@ public class SysDeptController extends BaseController {
      */
     @ApiOperation("获取部门下拉树列表")
     @GetMapping("/treeselect")
-    public R<List<Tree<Long>>> treeselect(SysDept dept) {
+    public AjaxResult<List<Tree<Long>>> treeselect(SysDept dept) {
         List<SysDept> depts = deptService.selectDeptList(dept);
-        return R.success(deptService.buildDeptTreeSelect(depts));
+        return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
     }
 
     /**
@@ -87,12 +87,12 @@ public class SysDeptController extends BaseController {
      */
     @ApiOperation("加载对应角色部门列表树")
     @GetMapping(value = "/roleDeptTreeselect/{roleId}")
-    public R<Map<String, Object>> roleDeptTreeselect(@ApiParam("角色ID") @PathVariable("roleId") Long roleId) {
+    public AjaxResult<Map<String, Object>> roleDeptTreeselect(@ApiParam("角色ID") @PathVariable("roleId") Long roleId) {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
         Map<String, Object> ajax = new HashMap<>();
         ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
         ajax.put("depts", deptService.buildDeptTreeSelect(depts));
-        return R.success(ajax);
+        return AjaxResult.success(ajax);
     }
 
     /**
@@ -102,9 +102,9 @@ public class SysDeptController extends BaseController {
     @SaCheckPermission("system:dept:add")
     @Log(title = "部门管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysDept dept) {
+    public AjaxResult<Void> add(@Validated @RequestBody SysDept dept) {
         if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
-            return R.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+            return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
         return toAjax(deptService.insertDept(dept));
     }
@@ -116,14 +116,14 @@ public class SysDeptController extends BaseController {
     @SaCheckPermission("system:dept:edit")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysDept dept) {
+    public AjaxResult<Void> edit(@Validated @RequestBody SysDept dept) {
         if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
-            return R.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         } else if (dept.getParentId().equals(dept.getDeptId())) {
-            return R.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
+            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
         } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
                 && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0) {
-            return R.error("该部门包含未停用的子部门！");
+            return AjaxResult.error("该部门包含未停用的子部门！");
         }
         return toAjax(deptService.updateDept(dept));
     }
@@ -135,12 +135,12 @@ public class SysDeptController extends BaseController {
     @SaCheckPermission("system:dept:remove")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deptId}")
-    public R<Void> remove(@ApiParam("部门ID串") @PathVariable Long deptId) {
+    public AjaxResult<Void> remove(@ApiParam("部门ID串") @PathVariable Long deptId) {
         if (deptService.hasChildByDeptId(deptId)) {
-            return R.error("存在下级部门,不允许删除");
+            return AjaxResult.error("存在下级部门,不允许删除");
         }
         if (deptService.checkDeptExistUser(deptId)) {
-            return R.error("部门存在用户,不允许删除");
+            return AjaxResult.error("部门存在用户,不允许删除");
         }
         return toAjax(deptService.deleteDeptById(deptId));
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

@@ -3,7 +3,7 @@ package com.ruoyi.web.controller.system;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -61,8 +61,8 @@ public class SysDictDataController extends BaseController {
     @ApiOperation("查询字典数据详细")
     @SaCheckPermission("system:dict:query")
     @GetMapping(value = "/{dictCode}")
-    public R<SysDictData> getInfo(@ApiParam("字典code") @PathVariable Long dictCode) {
+    public AjaxResult<SysDictData> getInfo(@ApiParam("字典code") @PathVariable Long dictCode) {
-        return R.success(dictDataService.selectDictDataById(dictCode));
+        return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
     }
 
     /**
@@ -70,12 +70,12 @@ public class SysDictDataController extends BaseController {
      */
     @ApiOperation("根据字典类型查询字典数据信息")
     @GetMapping(value = "/type/{dictType}")
-    public R<List<SysDictData>> dictType(@ApiParam("字典类型") @PathVariable String dictType) {
+    public AjaxResult<List<SysDictData>> dictType(@ApiParam("字典类型") @PathVariable String dictType) {
         List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
         if (StringUtils.isNull(data)) {
             data = new ArrayList<>();
         }
-        return R.success(data);
+        return AjaxResult.success(data);
     }
 
     /**
@@ -85,7 +85,7 @@ public class SysDictDataController extends BaseController {
     @SaCheckPermission("system:dict:add")
     @Log(title = "字典数据", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysDictData dict) {
+    public AjaxResult<Void> add(@Validated @RequestBody SysDictData dict) {
         return toAjax(dictDataService.insertDictData(dict));
     }
 
@@ -96,7 +96,7 @@ public class SysDictDataController extends BaseController {
     @SaCheckPermission("system:dict:edit")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysDictData dict) {
+    public AjaxResult<Void> edit(@Validated @RequestBody SysDictData dict) {
         return toAjax(dictDataService.updateDictData(dict));
     }
 
@@ -107,7 +107,7 @@ public class SysDictDataController extends BaseController {
     @SaCheckPermission("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictCodes}")
-    public R<Void> remove(@ApiParam("字典code串") @PathVariable Long[] dictCodes) {
+    public AjaxResult<Void> remove(@ApiParam("字典code串") @PathVariable Long[] dictCodes) {
         dictDataService.deleteDictDataByIds(dictCodes);
         return success();
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.entity.SysDictType;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -58,8 +58,8 @@ public class SysDictTypeController extends BaseController {
     @ApiOperation("查询字典类型详细")
     @SaCheckPermission("system:dict:query")
     @GetMapping(value = "/{dictId}")
-    public R<SysDictType> getInfo(@ApiParam("字典ID") @PathVariable Long dictId) {
+    public AjaxResult<SysDictType> getInfo(@ApiParam("字典ID") @PathVariable Long dictId) {
-        return R.success(dictTypeService.selectDictTypeById(dictId));
+        return AjaxResult.success(dictTypeService.selectDictTypeById(dictId));
     }
 
     /**
@@ -69,9 +69,9 @@ public class SysDictTypeController extends BaseController {
     @SaCheckPermission("system:dict:add")
     @Log(title = "字典类型", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysDictType dict) {
+    public AjaxResult<Void> add(@Validated @RequestBody SysDictType dict) {
         if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
-            return R.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
+            return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
         }
         return toAjax(dictTypeService.insertDictType(dict));
     }
@@ -83,9 +83,9 @@ public class SysDictTypeController extends BaseController {
     @SaCheckPermission("system:dict:edit")
     @Log(title = "字典类型", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysDictType dict) {
+    public AjaxResult<Void> edit(@Validated @RequestBody SysDictType dict) {
         if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
-            return R.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
+            return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
         }
         return toAjax(dictTypeService.updateDictType(dict));
     }
@@ -97,7 +97,7 @@ public class SysDictTypeController extends BaseController {
     @SaCheckPermission("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictIds}")
-    public R<Void> remove(@ApiParam("字典ID串") @PathVariable Long[] dictIds) {
+    public AjaxResult<Void> remove(@ApiParam("字典ID串") @PathVariable Long[] dictIds) {
         dictTypeService.deleteDictTypeByIds(dictIds);
         return success();
     }
@@ -109,9 +109,9 @@ public class SysDictTypeController extends BaseController {
     @SaCheckPermission("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
-    public R<Void> refreshCache() {
+    public AjaxResult<Void> refreshCache() {
         dictTypeService.resetDictCache();
-        return R.success();
+        return AjaxResult.success();
     }
 
     /**
@@ -119,8 +119,8 @@ public class SysDictTypeController extends BaseController {
      */
     @ApiOperation("获取字典选择框列表")
     @GetMapping("/optionselect")
-    public R<List<SysDictType>> optionselect() {
+    public AjaxResult<List<SysDictType>> optionselect() {
         List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
-        return R.success(dictTypes);
+        return AjaxResult.success(dictTypes);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -3,7 +3,7 @@ package com.ruoyi.web.controller.system;
 import cn.dev33.satoken.exception.NotLoginException;
 import cn.dev33.satoken.stp.StpUtil;
 import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginBody;
@@ -52,23 +52,23 @@ public class SysLoginController {
      */
     @ApiOperation("登录方法")
     @PostMapping("/login")
-    public R<Map<String, Object>> login(@RequestBody LoginBody loginBody) {
+    public AjaxResult<Map<String, Object>> login(@RequestBody LoginBody loginBody) {
         Map<String, Object> ajax = new HashMap<>();
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
                 loginBody.getUuid());
         ajax.put(Constants.TOKEN, token);
-        return R.success(ajax);
+        return AjaxResult.success(ajax);
     }
 
     @ApiOperation("登出方法")
     @PostMapping("/logout")
-    public R<Void> logout(){
+    public AjaxResult<Void> logout(){
         try {
             StpUtil.logout();
         } catch (NotLoginException e) {
         }
-        return R.success("退出成功");
+        return AjaxResult.success("退出成功");
     }
 
     /**
@@ -78,7 +78,7 @@ public class SysLoginController {
      */
     @ApiOperation("获取用户信息")
     @GetMapping("getInfo")
-    public R<Map<String, Object>> getInfo() {
+    public AjaxResult<Map<String, Object>> getInfo() {
         SysUser user = SpringUtils.getBean(UserService.class).selectUserById(LoginUtils.getUserId());
         // 角色集合
         Set<String> roles = permissionService.getRolePermission(user);
@@ -88,7 +88,7 @@ public class SysLoginController {
         ajax.put("user", user);
         ajax.put("roles", roles);
         ajax.put("permissions", permissions);
-        return R.success(ajax);
+        return AjaxResult.success(ajax);
     }
 
     /**
@@ -98,9 +98,9 @@ public class SysLoginController {
      */
     @ApiOperation("获取路由信息")
     @GetMapping("getRouters")
-    public R<List<RouterVo>> getRouters() {
+    public AjaxResult<List<RouterVo>> getRouters() {
         Long userId = LoginUtils.getUserId();
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
-        return R.success(menuService.buildMenus(menus));
+        return AjaxResult.success(menuService.buildMenus(menus));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

@@ -5,7 +5,7 @@ import cn.hutool.core.lang.tree.Tree;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
@@ -42,9 +42,9 @@ public class SysMenuController extends BaseController {
     @ApiOperation("获取菜单列表")
     @SaCheckPermission("system:menu:list")
     @GetMapping("/list")
-    public R<List<SysMenu>> list(SysMenu menu) {
+    public AjaxResult<List<SysMenu>> list(SysMenu menu) {
         List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
-        return R.success(menus);
+        return AjaxResult.success(menus);
     }
 
     /**
@@ -53,8 +53,8 @@ public class SysMenuController extends BaseController {
     @ApiOperation("根据菜单编号获取详细信息")
     @SaCheckPermission("system:menu:query")
     @GetMapping(value = "/{menuId}")
-    public R<SysMenu> getInfo(@ApiParam("菜单ID") @PathVariable Long menuId) {
+    public AjaxResult<SysMenu> getInfo(@ApiParam("菜单ID") @PathVariable Long menuId) {
-        return R.success(menuService.selectMenuById(menuId));
+        return AjaxResult.success(menuService.selectMenuById(menuId));
     }
 
     /**
@@ -62,9 +62,9 @@ public class SysMenuController extends BaseController {
      */
     @ApiOperation("获取菜单下拉树列表")
     @GetMapping("/treeselect")
-    public R<List<Tree<Long>>> treeselect(SysMenu menu) {
+    public AjaxResult<List<Tree<Long>>> treeselect(SysMenu menu) {
         List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
-        return R.success(menuService.buildMenuTreeSelect(menus));
+        return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
     }
 
     /**
@@ -72,12 +72,12 @@ public class SysMenuController extends BaseController {
      */
     @ApiOperation("加载对应角色菜单列表树")
     @GetMapping(value = "/roleMenuTreeselect/{roleId}")
-    public R<Map<String, Object>> roleMenuTreeselect(@ApiParam("角色ID") @PathVariable("roleId") Long roleId) {
+    public AjaxResult<Map<String, Object>> roleMenuTreeselect(@ApiParam("角色ID") @PathVariable("roleId") Long roleId) {
         List<SysMenu> menus = menuService.selectMenuList(getUserId());
         Map<String, Object> ajax = new HashMap<>();
         ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
         ajax.put("menus", menuService.buildMenuTreeSelect(menus));
-        return R.success(ajax);
+        return AjaxResult.success(ajax);
     }
 
     /**
@@ -87,11 +87,11 @@ public class SysMenuController extends BaseController {
     @SaCheckPermission("system:menu:add")
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysMenu menu) {
+    public AjaxResult<Void> add(@Validated @RequestBody SysMenu menu) {
         if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
-            return R.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
         } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
-            return R.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
         }
         return toAjax(menuService.insertMenu(menu));
     }
@@ -103,13 +103,13 @@ public class SysMenuController extends BaseController {
     @SaCheckPermission("system:menu:edit")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysMenu menu) {
+    public AjaxResult<Void> edit(@Validated @RequestBody SysMenu menu) {
         if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
-            return R.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
         } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
-            return R.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
         } else if (menu.getMenuId().equals(menu.getParentId())) {
-            return R.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
+            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
         }
         return toAjax(menuService.updateMenu(menu));
     }
@@ -121,12 +121,12 @@ public class SysMenuController extends BaseController {
     @SaCheckPermission("system:menu:remove")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{menuId}")
-    public R<Void> remove(@ApiParam("菜单ID") @PathVariable("menuId") Long menuId) {
+    public AjaxResult<Void> remove(@ApiParam("菜单ID") @PathVariable("menuId") Long menuId) {
         if (menuService.hasChildByMenuId(menuId)) {
-            return R.error("存在子菜单,不允许删除");
+            return AjaxResult.error("存在子菜单,不允许删除");
         }
         if (menuService.checkMenuExistRole(menuId)) {
-            return R.error("菜单已分配,不允许删除");
+            return AjaxResult.error("菜单已分配,不允许删除");
         }
         return toAjax(menuService.deleteMenuById(menuId));
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java

@@ -3,7 +3,7 @@ package com.ruoyi.web.controller.system;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
@@ -47,8 +47,8 @@ public class SysNoticeController extends BaseController {
     @ApiOperation("根据通知公告编号获取详细信息")
     @SaCheckPermission("system:notice:query")
     @GetMapping(value = "/{noticeId}")
-    public R<SysNotice> getInfo(@ApiParam("公告ID") @PathVariable Long noticeId) {
+    public AjaxResult<SysNotice> getInfo(@ApiParam("公告ID") @PathVariable Long noticeId) {
-        return R.success(noticeService.selectNoticeById(noticeId));
+        return AjaxResult.success(noticeService.selectNoticeById(noticeId));
     }
 
     /**
@@ -58,7 +58,7 @@ public class SysNoticeController extends BaseController {
     @SaCheckPermission("system:notice:add")
     @Log(title = "通知公告", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysNotice notice) {
+    public AjaxResult<Void> add(@Validated @RequestBody SysNotice notice) {
         return toAjax(noticeService.insertNotice(notice));
     }
 
@@ -69,7 +69,7 @@ public class SysNoticeController extends BaseController {
     @SaCheckPermission("system:notice:edit")
     @Log(title = "通知公告", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysNotice notice) {
+    public AjaxResult<Void> edit(@Validated @RequestBody SysNotice notice) {
         return toAjax(noticeService.updateNotice(notice));
     }
 
@@ -80,7 +80,7 @@ public class SysNoticeController extends BaseController {
     @SaCheckPermission("system:notice:remove")
     @Log(title = "通知公告", businessType = BusinessType.DELETE)
     @DeleteMapping("/{noticeIds}")
-    public R<Void> remove(@ApiParam("公告ID串") @PathVariable Long[] noticeIds) {
+    public AjaxResult<Void> remove(@ApiParam("公告ID串") @PathVariable Long[] noticeIds) {
         return toAjax(noticeService.deleteNoticeByIds(noticeIds));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
@@ -58,10 +58,10 @@ public class SysOssConfigController extends BaseController {
     @ApiOperation("获取对象存储配置详细信息")
     @SaCheckPermission("system:oss:query")
     @GetMapping("/{ossConfigId}")
-    public R<SysOssConfigVo> getInfo(@ApiParam("OSS配置ID")
+    public AjaxResult<SysOssConfigVo> getInfo(@ApiParam("OSS配置ID")
                                               @NotNull(message = "主键不能为空")
                                               @PathVariable("ossConfigId") Integer ossConfigId) {
-        return R.success(iSysOssConfigService.queryById(ossConfigId));
+        return AjaxResult.success(iSysOssConfigService.queryById(ossConfigId));
     }
 
     /**
@@ -72,7 +72,7 @@ public class SysOssConfigController extends BaseController {
     @Log(title = "对象存储配置", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
         return toAjax(iSysOssConfigService.insertByBo(bo) ? 1 : 0);
     }
 
@@ -84,7 +84,7 @@ public class SysOssConfigController extends BaseController {
     @Log(title = "对象存储配置", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
         return toAjax(iSysOssConfigService.updateByBo(bo) ? 1 : 0);
     }
 
@@ -95,7 +95,7 @@ public class SysOssConfigController extends BaseController {
     @SaCheckPermission("system:oss:remove")
     @Log(title = "对象存储配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ossConfigIds}")
-    public R<Void> remove(@ApiParam("OSS配置ID串")
+    public AjaxResult<Void> remove(@ApiParam("OSS配置ID串")
                                    @NotEmpty(message = "主键不能为空")
                                    @PathVariable Long[] ossConfigIds) {
         return toAjax(iSysOssConfigService.deleteWithValidByIds(Arrays.asList(ossConfigIds), true) ? 1 : 0);
@@ -108,7 +108,7 @@ public class SysOssConfigController extends BaseController {
     @SaCheckPermission("system:oss:edit")
     @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public R<Void> changeStatus(@RequestBody SysOssConfigBo bo) {
+    public AjaxResult<Void> changeStatus(@RequestBody SysOssConfigBo bo) {
         return toAjax(iSysOssConfigService.updateOssConfigStatus(bo));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java

@@ -9,7 +9,7 @@ import cn.hutool.http.HttpUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.QueryGroup;
@@ -76,7 +76,7 @@ public class SysOssController extends BaseController {
     @Log(title = "OSS对象存储", businessType = BusinessType.INSERT)
     @RepeatSubmit
     @PostMapping("/upload")
-    public R<Map<String, String>> upload(@RequestPart("file") MultipartFile file) {
+    public AjaxResult<Map<String, String>> upload(@RequestPart("file") MultipartFile file) {
         if (ObjectUtil.isNull(file)) {
             throw new ServiceException("上传文件不能为空");
         }
@@ -84,7 +84,7 @@ public class SysOssController extends BaseController {
         Map<String, String> map = new HashMap<>(2);
         map.put("url", oss.getUrl());
         map.put("fileName", oss.getFileName());
-        return R.success(map);
+        return AjaxResult.success(map);
     }
 
     @ApiOperation("下载OSS对象存储")
@@ -118,7 +118,7 @@ public class SysOssController extends BaseController {
     @SaCheckPermission("system:oss:remove")
     @Log(title = "OSS对象存储", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ossIds}")
-    public R<Void> remove(@ApiParam("OSS对象ID串")
+    public AjaxResult<Void> remove(@ApiParam("OSS对象ID串")
                                    @NotEmpty(message = "主键不能为空")
                                    @PathVariable Long[] ossIds) {
         return toAjax(iSysOssService.deleteWithValidByIds(Arrays.asList(ossIds), true) ? 1 : 0);
@@ -131,7 +131,7 @@ public class SysOssController extends BaseController {
     @SaCheckPermission("system:oss:edit")
     @Log(title = "OSS对象存储", businessType = BusinessType.UPDATE)
     @PutMapping("/changePreviewListResource")
-    public R<Void> changePreviewListResource(@RequestBody String body) {
+    public AjaxResult<Void> changePreviewListResource(@RequestBody String body) {
         Map<String, Boolean> map = JsonUtils.parseMap(body);
         SysConfig config = iSysConfigService.getOne(new SysConfig().setConfigKey(OssConstant.PEREVIEW_LIST_RESOURCE_KEY));
         config.setConfigValue(map.get("previewListResource").toString());

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
@@ -61,8 +61,8 @@ public class SysPostController extends BaseController {
     @ApiOperation("根据岗位编号获取详细信息")
     @SaCheckPermission("system:post:query")
     @GetMapping(value = "/{postId}")
-    public R<SysPost> getInfo(@ApiParam("岗位ID") @PathVariable Long postId) {
+    public AjaxResult<SysPost> getInfo(@ApiParam("岗位ID") @PathVariable Long postId) {
-        return R.success(postService.selectPostById(postId));
+        return AjaxResult.success(postService.selectPostById(postId));
     }
 
     /**
@@ -72,11 +72,11 @@ public class SysPostController extends BaseController {
     @SaCheckPermission("system:post:add")
     @Log(title = "岗位管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysPost post) {
+    public AjaxResult<Void> add(@Validated @RequestBody SysPost post) {
         if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) {
-            return R.error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+            return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
         } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) {
-            return R.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+            return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
         }
         return toAjax(postService.insertPost(post));
     }
@@ -88,11 +88,11 @@ public class SysPostController extends BaseController {
     @SaCheckPermission("system:post:edit")
     @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysPost post) {
+    public AjaxResult<Void> edit(@Validated @RequestBody SysPost post) {
         if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) {
-            return R.error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+            return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
         } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) {
-            return R.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+            return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
         }
         return toAjax(postService.updatePost(post));
     }
@@ -104,7 +104,7 @@ public class SysPostController extends BaseController {
     @SaCheckPermission("system:post:remove")
     @Log(title = "岗位管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{postIds}")
-    public R<Void> remove(@ApiParam("岗位ID串") @PathVariable Long[] postIds) {
+    public AjaxResult<Void> remove(@ApiParam("岗位ID串") @PathVariable Long[] postIds) {
         return toAjax(postService.deletePostByIds(postIds));
     }
 
@@ -113,8 +113,8 @@ public class SysPostController extends BaseController {
      */
     @ApiOperation("获取岗位选择框列表")
     @GetMapping("/optionselect")
-    public R<List<SysPost>> optionselect() {
+    public AjaxResult<List<SysPost>> optionselect() {
         List<SysPost> posts = postService.selectPostAll();
-        return R.success(posts);
+        return AjaxResult.success(posts);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -3,7 +3,7 @@ package com.ruoyi.web.controller.system;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.service.UserService;
 import com.ruoyi.common.enums.BusinessType;
@@ -48,13 +48,13 @@ public class SysProfileController extends BaseController {
      */
     @ApiOperation("个人信息")
     @GetMapping
-    public R<Map<String, Object>> profile() {
+    public AjaxResult<Map<String, Object>> profile() {
         SysUser user = userService.selectUserById(getUserId());
         Map<String, Object> ajax = new HashMap<>();
         ajax.put("user", user);
         ajax.put("roleGroup", userService.selectUserRoleGroup(user.getUserName()));
         ajax.put("postGroup", userService.selectUserPostGroup(user.getUserName()));
-        return R.success(ajax);
+        return AjaxResult.success(ajax);
     }
 
     /**
@@ -63,22 +63,22 @@ public class SysProfileController extends BaseController {
     @ApiOperation("修改用户")
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> updateProfile(@RequestBody SysUser user) {
+    public AjaxResult<Void> updateProfile(@RequestBody SysUser user) {
         if (StringUtils.isNotEmpty(user.getPhonenumber())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
-            return R.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
         }
         if (StringUtils.isNotEmpty(user.getEmail())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
-            return R.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setUserId(getUserId());
         user.setUserName(null);
         user.setPassword(null);
         if (userService.updateUserProfile(user) > 0) {
-            return R.success();
+            return AjaxResult.success();
         }
-        return R.error("修改个人信息异常，请联系管理员");
+        return AjaxResult.error("修改个人信息异常，请联系管理员");
     }
 
     /**
@@ -91,20 +91,20 @@ public class SysProfileController extends BaseController {
     })
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping("/updatePwd")
-    public R<Void> updatePwd(String oldPassword, String newPassword) {
+    public AjaxResult<Void> updatePwd(String oldPassword, String newPassword) {
         SysUser user = SpringUtils.getBean(UserService.class).selectUserById(LoginUtils.getUserId());
         String userName = user.getUserName();
         String password = user.getPassword();
         if (!SecurityUtils.matchesPassword(oldPassword, password)) {
-            return R.error("修改密码失败，旧密码错误");
+            return AjaxResult.error("修改密码失败，旧密码错误");
         }
         if (SecurityUtils.matchesPassword(newPassword, password)) {
-            return R.error("新密码不能与旧密码相同");
+            return AjaxResult.error("新密码不能与旧密码相同");
         }
         if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) {
-            return R.success();
+            return AjaxResult.success();
         }
-        return R.error("修改密码异常，请联系管理员");
+        return AjaxResult.error("修改密码异常，请联系管理员");
     }
 
     /**
@@ -116,16 +116,16 @@ public class SysProfileController extends BaseController {
     })
     @Log(title = "用户头像", businessType = BusinessType.UPDATE)
     @PostMapping("/avatar")
-    public R<Map<String, Object>> avatar(@RequestPart("avatarfile") MultipartFile file) {
+    public AjaxResult<Map<String, Object>> avatar(@RequestPart("avatarfile") MultipartFile file) {
         Map<String,Object> ajax = new HashMap<>();
         if (!file.isEmpty()) {
             SysOss oss = iSysOssService.upload(file);
             String avatar = oss.getUrl();
             if (userService.updateUserAvatar(getUsername(), avatar)) {
                 ajax.put("imgUrl", avatar);
-                return R.success(ajax);
+                return AjaxResult.success(ajax);
             }
         }
-        return R.error("上传图片异常，请联系管理员", ajax);
+        return AjaxResult.error("上传图片异常，请联系管理员", ajax);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java

@@ -1,7 +1,7 @@
 package com.ruoyi.web.controller.system;
 
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.RegisterBody;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysConfigService;
@@ -31,7 +31,7 @@ public class SysRegisterController extends BaseController {
 
     @ApiOperation("用户注册")
     @PostMapping("/register")
-    public R<Void> register(@RequestBody RegisterBody user) {
+    public AjaxResult<Void> register(@RequestBody RegisterBody user) {
         if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
             return error("当前系统没有开启注册功能！");
         }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -5,7 +5,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
@@ -65,9 +65,9 @@ public class SysRoleController extends BaseController {
     @ApiOperation("根据角色编号获取详细信息")
     @SaCheckPermission("system:role:query")
     @GetMapping(value = "/{roleId}")
-    public R<SysRole> getInfo(@ApiParam("角色ID") @PathVariable Long roleId) {
+    public AjaxResult<SysRole> getInfo(@ApiParam("角色ID") @PathVariable Long roleId) {
         roleService.checkRoleDataScope(roleId);
-        return R.success(roleService.selectRoleById(roleId));
+        return AjaxResult.success(roleService.selectRoleById(roleId));
     }
 
     /**
@@ -77,11 +77,11 @@ public class SysRoleController extends BaseController {
     @SaCheckPermission("system:role:add")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysRole role) {
+    public AjaxResult<Void> add(@Validated @RequestBody SysRole role) {
         if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
-            return R.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
+            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
         } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
-            return R.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
+            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
         return toAjax(roleService.insertRole(role));
 
@@ -94,12 +94,12 @@ public class SysRoleController extends BaseController {
     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysRole role) {
+    public AjaxResult<Void> edit(@Validated @RequestBody SysRole role) {
         roleService.checkRoleAllowed(role);
         if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
-            return R.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
+            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
         } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
-            return R.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
+            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
 
         if (roleService.updateRole(role) > 0) {
@@ -110,9 +110,9 @@ public class SysRoleController extends BaseController {
                 loginUser.setMenuPermission(permissionService.getMenuPermission(sysUser));
                 LoginUtils.setLoginUser(loginUser);
             }
-            return R.success();
+            return AjaxResult.success();
         }
-        return R.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
+        return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
     }
 
     /**
@@ -122,7 +122,7 @@ public class SysRoleController extends BaseController {
     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/dataScope")
-    public R<Void> dataScope(@RequestBody SysRole role) {
+    public AjaxResult<Void> dataScope(@RequestBody SysRole role) {
         roleService.checkRoleAllowed(role);
         return toAjax(roleService.authDataScope(role));
     }
@@ -134,7 +134,7 @@ public class SysRoleController extends BaseController {
     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public R<Void> changeStatus(@RequestBody SysRole role) {
+    public AjaxResult<Void> changeStatus(@RequestBody SysRole role) {
         roleService.checkRoleAllowed(role);
         return toAjax(roleService.updateRoleStatus(role));
     }
@@ -146,7 +146,7 @@ public class SysRoleController extends BaseController {
     @SaCheckPermission("system:role:remove")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{roleIds}")
-    public R<Void> remove(@ApiParam("岗位ID串") @PathVariable Long[] roleIds) {
+    public AjaxResult<Void> remove(@ApiParam("岗位ID串") @PathVariable Long[] roleIds) {
         return toAjax(roleService.deleteRoleByIds(roleIds));
     }
 
@@ -156,8 +156,8 @@ public class SysRoleController extends BaseController {
     @ApiOperation("获取角色选择框列表")
     @SaCheckPermission("system:role:query")
     @GetMapping("/optionselect")
-    public R<List<SysRole>> optionselect() {
+    public AjaxResult<List<SysRole>> optionselect() {
-        return R.success(roleService.selectRoleAll());
+        return AjaxResult.success(roleService.selectRoleAll());
     }
 
     /**
@@ -187,7 +187,7 @@ public class SysRoleController extends BaseController {
     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancel")
-    public R<Void> cancelAuthUser(@RequestBody SysUserRole userRole) {
+    public AjaxResult<Void> cancelAuthUser(@RequestBody SysUserRole userRole) {
         return toAjax(roleService.deleteAuthUser(userRole));
     }
 
@@ -202,7 +202,7 @@ public class SysRoleController extends BaseController {
     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancelAll")
-    public R<Void> cancelAuthUserAll(Long roleId, Long[] userIds) {
+    public AjaxResult<Void> cancelAuthUserAll(Long roleId, Long[] userIds) {
         return toAjax(roleService.deleteAuthUsers(roleId, userIds));
     }
 
@@ -217,7 +217,7 @@ public class SysRoleController extends BaseController {
     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/selectAll")
-    public R<Void> selectAuthUserAll(Long roleId, Long[] userIds) {
+    public AjaxResult<Void> selectAuthUserAll(Long roleId, Long[] userIds) {
         return toAjax(roleService.insertAuthUsers(roleId, userIds));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -7,7 +7,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysRole;
@@ -89,9 +89,9 @@ public class SysUserController extends BaseController {
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
     @SaCheckPermission("system:user:import")
     @PostMapping("/importData")
-    public R<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
+    public AjaxResult<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
         ExcelResult<SysUserImportVo> result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class, new SysUserImportListener(updateSupport));
-        return R.success(result.getAnalysis());
+        return AjaxResult.success(result.getAnalysis());
     }
 
     @ApiOperation("下载导入模板")
@@ -106,7 +106,7 @@ public class SysUserController extends BaseController {
     @ApiOperation("根据用户编号获取详细信息")
     @SaCheckPermission("system:user:query")
     @GetMapping(value = {"/", "/{userId}" })
-    public R<Map<String, Object>> getInfo(@ApiParam("用户ID") @PathVariable(value = "userId", required = false) Long userId) {
+    public AjaxResult<Map<String, Object>> getInfo(@ApiParam("用户ID") @PathVariable(value = "userId", required = false) Long userId) {
         userService.checkUserDataScope(userId);
         Map<String, Object> ajax = new HashMap<>();
         List<SysRole> roles = roleService.selectRoleAll();
@@ -118,7 +118,7 @@ public class SysUserController extends BaseController {
             ajax.put("postIds", postService.selectPostListByUserId(userId));
             ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
         }
-        return R.success(ajax);
+        return AjaxResult.success(ajax);
     }
 
     /**
@@ -128,15 +128,15 @@ public class SysUserController extends BaseController {
     @SaCheckPermission("system:user:add")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysUser user) {
+    public AjaxResult<Void> add(@Validated @RequestBody SysUser user) {
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) {
-            return R.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
+            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
         } else if (StringUtils.isNotEmpty(user.getPhonenumber())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
-            return R.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
+            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
         } else if (StringUtils.isNotEmpty(user.getEmail())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
-            return R.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         return toAjax(userService.insertUser(user));
@@ -149,14 +149,14 @@ public class SysUserController extends BaseController {
     @SaCheckPermission("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysUser user) {
+    public AjaxResult<Void> edit(@Validated @RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         if (StringUtils.isNotEmpty(user.getPhonenumber())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
-            return R.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
         } else if (StringUtils.isNotEmpty(user.getEmail())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
-            return R.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         return toAjax(userService.updateUser(user));
     }
@@ -168,7 +168,7 @@ public class SysUserController extends BaseController {
     @SaCheckPermission("system:user:remove")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
-    public R<Void> remove(@ApiParam("角色ID串") @PathVariable Long[] userIds) {
+    public AjaxResult<Void> remove(@ApiParam("角色ID串") @PathVariable Long[] userIds) {
         if (ArrayUtil.contains(userIds, getUserId())) {
             return error("当前用户不能删除");
         }
@@ -182,7 +182,7 @@ public class SysUserController extends BaseController {
     @SaCheckPermission("system:user:resetPwd")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
-    public R<Void> resetPwd(@RequestBody SysUser user) {
+    public AjaxResult<Void> resetPwd(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         return toAjax(userService.resetPwd(user));
@@ -195,7 +195,7 @@ public class SysUserController extends BaseController {
     @SaCheckPermission("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public R<Void> changeStatus(@RequestBody SysUser user) {
+    public AjaxResult<Void> changeStatus(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         return toAjax(userService.updateUserStatus(user));
     }
@@ -206,13 +206,13 @@ public class SysUserController extends BaseController {
     @ApiOperation("根据用户编号获取授权角色")
     @SaCheckPermission("system:user:query")
     @GetMapping("/authRole/{userId}")
-    public R<Map<String, Object>> authRole(@ApiParam("用户ID") @PathVariable("userId") Long userId) {
+    public AjaxResult<Map<String, Object>> authRole(@ApiParam("用户ID") @PathVariable("userId") Long userId) {
         SysUser user = userService.selectUserById(userId);
         List<SysRole> roles = roleService.selectRolesByUserId(userId);
         Map<String, Object> ajax = new HashMap<>();
         ajax.put("user", user);
         ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
-        return R.success(ajax);
+        return AjaxResult.success(ajax);
     }
 
     /**
@@ -226,7 +226,7 @@ public class SysUserController extends BaseController {
     @SaCheckPermission("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
-    public R<Void> insertAuthRole(Long userId, Long[] roleIds) {
+    public AjaxResult<Void> insertAuthRole(Long userId, Long[] roleIds) {
         userService.insertUserAuth(userId, roleIds);
         return success();
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowCategoryController.java

@@ -5,7 +5,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
@@ -72,10 +72,10 @@ public class FlowCategoryController extends BaseController {
     @ApiOperation("获取流程分类详细信息")
     @SaCheckPermission("workflow:category:query")
     @GetMapping("/{categoryId}")
-    public R<FlowCategoryVo> getInfo(@ApiParam("主键")
+    public AjaxResult<FlowCategoryVo> getInfo(@ApiParam("主键")
                                                   @NotNull(message = "主键不能为空")
                                                   @PathVariable("categoryId") Long categoryId) {
-        return R.success(iFlowCategoryService.queryById(categoryId));
+        return AjaxResult.success(iFlowCategoryService.queryById(categoryId));
     }
 
     /**
@@ -86,7 +86,7 @@ public class FlowCategoryController extends BaseController {
     @Log(title = "流程分类", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody FlowCategoryBo bo) {
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody FlowCategoryBo bo) {
         return toAjax(iFlowCategoryService.insertByBo(bo) ? 1 : 0);
     }
 
@@ -98,7 +98,7 @@ public class FlowCategoryController extends BaseController {
     @Log(title = "流程分类", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody FlowCategoryBo bo) {
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody FlowCategoryBo bo) {
         return toAjax(iFlowCategoryService.updateByBo(bo) ? 1 : 0);
     }
 
@@ -109,7 +109,7 @@ public class FlowCategoryController extends BaseController {
     @SaCheckPermission("workflow:category:remove")
     @Log(title = "流程分类" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{categoryIds}")
-    public R<Void> remove(@ApiParam("主键串")
+    public AjaxResult<Void> remove(@ApiParam("主键串")
                                        @NotEmpty(message = "主键不能为空")
                                        @PathVariable Long[] categoryIds) {
         return toAjax(iFlowCategoryService.deleteWithValidByIds(Arrays.asList(categoryIds), true) ? 1 : 0);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java

@@ -2,7 +2,7 @@ package com.ruoyi.web.controller.workflow;
 
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -75,7 +75,7 @@ public class FlowDefinitionController extends BaseController {
 
     @ApiOperation(value = "导入流程文件", notes = "上传bpmn20的xml文件")
     @PostMapping("/import")
-    public R<Void> importFile(@RequestParam(required = false) String name,
+    public AjaxResult<Void> importFile(@RequestParam(required = false) String name,
                                        @RequestParam(required = false) String category,
                                        MultipartFile file) {
         try (InputStream in = file.getInputStream()) {
@@ -91,11 +91,11 @@ public class FlowDefinitionController extends BaseController {
 
     @ApiOperation(value = "读取xml文件")
     @GetMapping("/readXml/{definitionId}")
-    public R<String> readXml(@ApiParam(value = "流程定义ID") @PathVariable(value = "definitionId") String definitionId) {
+    public AjaxResult<String> readXml(@ApiParam(value = "流程定义ID") @PathVariable(value = "definitionId") String definitionId) {
         try {
-            return R.success(null, flowDefinitionService.readXml(definitionId));
+            return AjaxResult.success(null, flowDefinitionService.readXml(definitionId));
         } catch (Exception e) {
-            return R.error("加载xml文件异常", null);
+            return AjaxResult.error("加载xml文件异常", null);
         }
 
     }
@@ -118,7 +118,7 @@ public class FlowDefinitionController extends BaseController {
 
     @ApiOperation(value = "保存流程设计器内的xml文件")
     @PostMapping("/save")
-    public R<Void> save(@RequestBody FlowSaveXmlVo vo) {
+    public AjaxResult<Void> save(@RequestBody FlowSaveXmlVo vo) {
         try (InputStream in = new ByteArrayInputStream(vo.getXml().getBytes(StandardCharsets.UTF_8))) {
             flowDefinitionService.importFile(vo.getName(), vo.getCategory(), in);
         } catch (Exception e) {
@@ -132,7 +132,7 @@ public class FlowDefinitionController extends BaseController {
 
     @ApiOperation(value = "根据流程定义id启动流程实例")
     @PostMapping("/start/{procDefId}")
-    public R<Void> start(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId,
+    public AjaxResult<Void> start(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId,
                                   @ApiParam(value = "变量集合,json对象") @RequestBody Map<String, Object> variables) {
         flowDefinitionService.startProcessInstanceById(procDefId, variables);
         return success("流程启动成功");
@@ -141,7 +141,7 @@ public class FlowDefinitionController extends BaseController {
 
     @ApiOperation(value = "激活或挂起流程定义")
     @PutMapping(value = "/updateState")
-    public R<Void> updateState(@ApiParam(value = "ture:挂起,false:激活", required = true) @RequestParam Boolean suspended,
+    public AjaxResult<Void> updateState(@ApiParam(value = "ture:挂起,false:激活", required = true) @RequestParam Boolean suspended,
                                         @ApiParam(value = "流程定义ID", required = true) @RequestParam String definitionId) {
         flowDefinitionService.updateState(suspended, definitionId);
         return success();
@@ -149,23 +149,23 @@ public class FlowDefinitionController extends BaseController {
 
     @ApiOperation(value = "删除流程")
     @DeleteMapping(value = "/delete")
-    public R<Void> delete(@ApiParam(value = "流程部署ID", required = true) @RequestParam String deployId) {
+    public AjaxResult<Void> delete(@ApiParam(value = "流程部署ID", required = true) @RequestParam String deployId) {
         flowDefinitionService.delete(deployId);
         return success();
     }
 
     @ApiOperation(value = "指定流程办理人员列表")
     @GetMapping("/userList")
-    public R<List<SysUser>> userList(SysUser user) {
+    public AjaxResult<List<SysUser>> userList(SysUser user) {
         List<SysUser> list = userService.selectUserList(user);
-        return R.success(list);
+        return AjaxResult.success(list);
     }
 
     @ApiOperation(value = "指定流程办理组列表")
     @GetMapping("/roleList")
-    public R<List<SysRole>> roleList(SysRole role) {
+    public AjaxResult<List<SysRole>> roleList(SysRole role) {
         List<SysRole> list = sysRoleService.selectRoleList(role);
-        return R.success(list);
+        return AjaxResult.success(list);
     }
 
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowInstanceController.java

@@ -1,7 +1,7 @@
 package com.ruoyi.web.controller.workflow;
 
 
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.workflow.domain.vo.FlowTaskVo;
 import com.ruoyi.workflow.service.IFlowInstanceService;
 import io.swagger.annotations.Api;
@@ -30,7 +30,7 @@ public class FlowInstanceController {
 
     @ApiOperation(value = "根据流程定义id启动流程实例")
     @PostMapping("/startBy/{procDefId}")
-    public R startById(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId,
+    public AjaxResult startById(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId,
                                 @ApiParam(value = "变量集合,json对象") @RequestBody Map<String, Object> variables) {
         return flowInstanceService.startProcessInstanceById(procDefId, variables);
     }
@@ -38,24 +38,24 @@ public class FlowInstanceController {
 
     @ApiOperation(value = "激活或挂起流程实例")
     @PostMapping(value = "/updateState")
-    public R updateState(@ApiParam(value = "1:激活,2:挂起", required = true) @RequestParam Integer state,
+    public AjaxResult updateState(@ApiParam(value = "1:激活,2:挂起", required = true) @RequestParam Integer state,
                                   @ApiParam(value = "流程实例ID", required = true) @RequestParam String instanceId) {
         flowInstanceService.updateState(state,instanceId);
-        return R.success();
+        return AjaxResult.success();
     }
 
     @ApiOperation("结束流程实例")
     @PostMapping(value = "/stopProcessInstance")
-    public R stopProcessInstance(@RequestBody FlowTaskVo flowTaskVo) {
+    public AjaxResult stopProcessInstance(@RequestBody FlowTaskVo flowTaskVo) {
         flowInstanceService.stopProcessInstance(flowTaskVo);
-        return R.success();
+        return AjaxResult.success();
     }
 
     @ApiOperation(value = "删除流程实例")
     @DeleteMapping(value = "/delete")
-    public R delete(@ApiParam(value = "流程实例ID", required = true) @RequestParam String instanceId,
+    public AjaxResult delete(@ApiParam(value = "流程实例ID", required = true) @RequestParam String instanceId,
                              @ApiParam(value = "删除原因") @RequestParam(required = false) String deleteReason) {
         flowInstanceService.delete(instanceId,deleteReason);
-        return R.success();
+        return AjaxResult.success();
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowTaskController.java

@@ -1,6 +1,6 @@
 package com.ruoyi.web.controller.workflow;
 
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.workflow.domain.dto.FlowTaskDto;
 import com.ruoyi.workflow.domain.vo.FlowTaskVo;
 import com.ruoyi.workflow.service.IFlowTaskService;
@@ -35,33 +35,33 @@ public class FlowTaskController {
 
     @ApiOperation(value = "我发起的流程", response = FlowTaskDto.class)
     @GetMapping(value = "/myProcess")
-    public R myProcess(@ApiParam(value = "当前页码", required = true) @RequestParam Integer pageNum,
+    public AjaxResult myProcess(@ApiParam(value = "当前页码", required = true) @RequestParam Integer pageNum,
                                 @ApiParam(value = "每页条数", required = true) @RequestParam Integer pageSize) {
         return flowTaskService.myProcess(pageNum, pageSize);
     }
 
     @ApiOperation(value = "取消申请", response = FlowTaskDto.class)
     @PostMapping(value = "/stopProcess")
-    public R stopProcess(@RequestBody FlowTaskVo flowTaskVo) {
+    public AjaxResult stopProcess(@RequestBody FlowTaskVo flowTaskVo) {
         return flowTaskService.stopProcess(flowTaskVo);
     }
 
     @ApiOperation(value = "撤回流程", response = FlowTaskDto.class)
     @PostMapping(value = "/revokeProcess")
-    public R revokeProcess(@RequestBody FlowTaskVo flowTaskVo) {
+    public AjaxResult revokeProcess(@RequestBody FlowTaskVo flowTaskVo) {
         return flowTaskService.revokeProcess(flowTaskVo);
     }
 
     @ApiOperation(value = "获取待办列表", response = FlowTaskDto.class)
     @GetMapping(value = "/todoList")
-    public R todoList(@ApiParam(value = "当前页码", required = true) @RequestParam Integer pageNum,
+    public AjaxResult todoList(@ApiParam(value = "当前页码", required = true) @RequestParam Integer pageNum,
                                @ApiParam(value = "每页条数", required = true) @RequestParam Integer pageSize) {
         return flowTaskService.todoList(pageNum, pageSize);
     }
 
     @ApiOperation(value = "获取已办任务", response = FlowTaskDto.class)
     @GetMapping(value = "/finishedList")
-    public R finishedList(@ApiParam(value = "当前页码", required = true) @RequestParam Integer pageNum,
+    public AjaxResult finishedList(@ApiParam(value = "当前页码", required = true) @RequestParam Integer pageNum,
                                    @ApiParam(value = "每页条数", required = true) @RequestParam Integer pageSize) {
         return flowTaskService.finishedList(pageNum, pageSize);
     }
@@ -69,81 +69,81 @@ public class FlowTaskController {
 
     @ApiOperation(value = "流程历史流转记录", response = FlowTaskDto.class)
     @GetMapping(value = "/flowRecord")
-    public R flowRecord(String procInsId,String deployId) {
+    public AjaxResult flowRecord(String procInsId, String deployId) {
         return flowTaskService.flowRecord(procInsId,deployId);
     }
 
     @ApiOperation(value = "获取流程变量", response = FlowTaskDto.class)
     @GetMapping(value = "/processVariables/{taskId}")
-    public R processVariables(@ApiParam(value = "流程任务Id")  @PathVariable(value = "taskId") String taskId) {
+    public AjaxResult processVariables(@ApiParam(value = "流程任务Id")  @PathVariable(value = "taskId") String taskId) {
         return flowTaskService.processVariables(taskId);
     }
 
     @ApiOperation(value = "审批任务")
     @PostMapping(value = "/complete")
-    public R complete(@RequestBody FlowTaskVo flowTaskVo) {
+    public AjaxResult complete(@RequestBody FlowTaskVo flowTaskVo) {
        return flowTaskService.complete(flowTaskVo);
     }
 
 
     @ApiOperation(value = "驳回任务")
     @PostMapping(value = "/reject")
-    public R taskReject(@RequestBody FlowTaskVo flowTaskVo) {
+    public AjaxResult taskReject(@RequestBody FlowTaskVo flowTaskVo) {
         flowTaskService.taskReject(flowTaskVo);
-        return R.success();
+        return AjaxResult.success();
     }
 
     @ApiOperation(value = "退回任务")
     @PostMapping(value = "/return")
-    public R taskReturn(@RequestBody FlowTaskVo flowTaskVo) {
+    public AjaxResult taskReturn(@RequestBody FlowTaskVo flowTaskVo) {
         flowTaskService.taskReturn(flowTaskVo);
-        return R.success();
+        return AjaxResult.success();
     }
 
     @ApiOperation(value = "获取所有可回退的节点")
     @PostMapping(value = "/returnList")
-    public R findReturnTaskList(@RequestBody FlowTaskVo flowTaskVo) {
+    public AjaxResult findReturnTaskList(@RequestBody FlowTaskVo flowTaskVo) {
         return flowTaskService.findReturnTaskList(flowTaskVo);
     }
 
     @ApiOperation(value = "删除任务")
     @DeleteMapping(value = "/delete")
-    public R delete(@RequestBody FlowTaskVo flowTaskVo) {
+    public AjaxResult delete(@RequestBody FlowTaskVo flowTaskVo) {
         flowTaskService.deleteTask(flowTaskVo);
-        return R.success();
+        return AjaxResult.success();
     }
 
     @ApiOperation(value = "认领/签收任务")
     @PostMapping(value = "/claim")
-    public R claim(@RequestBody FlowTaskVo flowTaskVo) {
+    public AjaxResult claim(@RequestBody FlowTaskVo flowTaskVo) {
         flowTaskService.claim(flowTaskVo);
-        return R.success();
+        return AjaxResult.success();
     }
 
     @ApiOperation(value = "取消认领/签收任务")
     @PostMapping(value = "/unClaim")
-    public R unClaim(@RequestBody FlowTaskVo flowTaskVo) {
+    public AjaxResult unClaim(@RequestBody FlowTaskVo flowTaskVo) {
         flowTaskService.unClaim(flowTaskVo);
-        return R.success();
+        return AjaxResult.success();
     }
 
     @ApiOperation(value = "委派任务")
     @PostMapping(value = "/delegate")
-    public R delegate(@RequestBody FlowTaskVo flowTaskVo) {
+    public AjaxResult delegate(@RequestBody FlowTaskVo flowTaskVo) {
         flowTaskService.delegateTask(flowTaskVo);
-        return R.success();
+        return AjaxResult.success();
     }
 
     @ApiOperation(value = "转办任务")
     @PostMapping(value = "/assign")
-    public R assign(@RequestBody FlowTaskVo flowTaskVo) {
+    public AjaxResult assign(@RequestBody FlowTaskVo flowTaskVo) {
         flowTaskService.assignTask(flowTaskVo);
-        return R.success();
+        return AjaxResult.success();
     }
 
     @ApiOperation(value = "获取下一节点")
     @PostMapping(value = "/nextFlowNode")
-    public R getNextFlowNode(@RequestBody FlowTaskVo flowTaskVo) {
+    public AjaxResult getNextFlowNode(@RequestBody FlowTaskVo flowTaskVo) {
         return flowTaskService.getNextFlowNode(flowTaskVo);
     }
 
@@ -185,7 +185,7 @@ public class FlowTaskController {
      * @param procInsId 任务ID
      */
     @RequestMapping("/flowViewer/{procInsId}")
-    public R getFlowViewer(@PathVariable("procInsId") String procInsId) {
+    public AjaxResult getFlowViewer(@PathVariable("procInsId") String procInsId) {
         return flowTaskService.getFlowViewer(procInsId);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/SysFormController.java

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -58,8 +58,8 @@ public class SysFormController extends BaseController {
      */
     @SaCheckPermission("flowable:form:query")
     @GetMapping(value = "/{formId}")
-    public R getInfo(@PathVariable("formId") Long formId) {
+    public AjaxResult getInfo(@PathVariable("formId") Long formId) {
-        return R.success(SysFormService.selectSysFormById(formId));
+        return AjaxResult.success(SysFormService.selectSysFormById(formId));
     }
 
     /**
@@ -68,7 +68,7 @@ public class SysFormController extends BaseController {
     @SaCheckPermission("flowable:form:add")
     @Log(title = "流程表单", businessType = BusinessType.INSERT)
     @PostMapping
-    public R add(@RequestBody SysForm sysForm) {
+    public AjaxResult add(@RequestBody SysForm sysForm) {
         return toAjax(SysFormService.insertSysForm(sysForm));
     }
 
@@ -78,7 +78,7 @@ public class SysFormController extends BaseController {
     @SaCheckPermission("flowable:form:edit")
     @Log(title = "流程表单", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R edit(@RequestBody SysForm sysForm) {
+    public AjaxResult edit(@RequestBody SysForm sysForm) {
         return toAjax(SysFormService.updateSysForm(sysForm));
     }
 
@@ -88,7 +88,7 @@ public class SysFormController extends BaseController {
     @SaCheckPermission("flowable:form:remove")
     @Log(title = "流程表单", businessType = BusinessType.DELETE)
     @DeleteMapping("/{formIds}")
-    public R remove(@PathVariable Long[] formIds) {
+    public AjaxResult remove(@PathVariable Long[] formIds) {
         return toAjax(SysFormService.deleteSysFormByIds(formIds));
     }
 
@@ -98,7 +98,7 @@ public class SysFormController extends BaseController {
      */
     @Log(title = "流程表单", businessType = BusinessType.INSERT)
     @PostMapping("/addDeployForm")
-    public R addDeployForm(@RequestBody SysDeployForm sysDeployForm) {
+    public AjaxResult addDeployForm(@RequestBody SysDeployForm sysDeployForm) {
         return toAjax(sysDeployFormService.insertSysDeployForm(sysDeployForm));
     }
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -1,6 +1,6 @@
 package com.ruoyi.common.core.controller;
 
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.LoginUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -15,29 +15,29 @@ public class BaseController {
     /**
      * 返回成功
      */
-    public R<Void> success() {
+    public AjaxResult<Void> success() {
-        return R.success();
+        return AjaxResult.success();
     }
 
     /**
      * 返回失败消息
      */
-    public R<Void> error() {
+    public AjaxResult<Void> error() {
-        return R.error();
+        return AjaxResult.error();
     }
 
     /**
      * 返回成功消息
      */
-    public R<Void> success(String message) {
+    public AjaxResult<Void> success(String message) {
-        return R.success(message);
+        return AjaxResult.success(message);
     }
 
     /**
      * 返回失败消息
      */
-    public R<Void> error(String message) {
+    public AjaxResult<Void> error(String message) {
-        return R.error(message);
+        return AjaxResult.error(message);
     }
 
     /**
@@ -46,8 +46,8 @@ public class BaseController {
      * @param rows 影响行数
      * @return 操作结果
      */
-    protected R<Void> toAjax(int rows) {
+    protected AjaxResult<Void> toAjax(int rows) {
-        return rows > 0 ? R.success() : R.error();
+        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
     }
 
     /**
@@ -56,7 +56,7 @@ public class BaseController {
      * @param result 结果
      * @return 操作结果
      */
-    protected R<Void> toAjax(boolean result) {
+    protected AjaxResult<Void> toAjax(boolean result) {
         return result ? success() : error();
     }
 

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java

@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
 @AllArgsConstructor
 @Accessors(chain = true)
 @ApiModel("请求响应对象")
-public class R<T> {
+public class AjaxResult<T> {
 
     private static final long serialVersionUID = 1L;
 
@@ -46,7 +46,7 @@ public class R<T> {
 	 * @param code 状态码
 	 * @param msg  返回内容
 	 */
-	public R(int code, String msg) {
+	public AjaxResult(int code, String msg) {
 		this.code = code;
 		this.msg = msg;
 	}
@@ -56,8 +56,8 @@ public class R<T> {
 	 *
 	 * @return 成功消息
 	 */
-	public static R<Void> success() {
+	public static AjaxResult<Void> success() {
-		return R.success("操作成功");
+		return AjaxResult.success("操作成功");
 	}
 
 	/**
@@ -65,8 +65,8 @@ public class R<T> {
 	 *
 	 * @return 成功消息
 	 */
-	public static <T> R<T> success(T data) {
+	public static <T> AjaxResult<T> success(T data) {
-		return R.success("操作成功", data);
+		return AjaxResult.success("操作成功", data);
 	}
 
 	/**
@@ -75,8 +75,8 @@ public class R<T> {
 	 * @param msg 返回内容
 	 * @return 成功消息
 	 */
-	public static R<Void> success(String msg) {
+	public static AjaxResult<Void> success(String msg) {
-		return R.success(msg, null);
+		return AjaxResult.success(msg, null);
 	}
 
 	/**
@@ -86,8 +86,8 @@ public class R<T> {
 	 * @param data 数据对象
 	 * @return 成功消息
 	 */
-	public static <T> R<T> success(String msg, T data) {
+	public static <T> AjaxResult<T> success(String msg, T data) {
-		return new R<>(HttpStatus.HTTP_OK, msg, data);
+		return new AjaxResult<>(HttpStatus.HTTP_OK, msg, data);
 	}
 
 	/**
@@ -95,8 +95,8 @@ public class R<T> {
 	 *
 	 * @return
 	 */
-	public static R<Void> error() {
+	public static AjaxResult<Void> error() {
-		return R.error("操作失败");
+		return AjaxResult.error("操作失败");
 	}
 
 	/**
@@ -105,8 +105,8 @@ public class R<T> {
 	 * @param msg 返回内容
 	 * @return 警告消息
 	 */
-	public static R<Void> error(String msg) {
+	public static AjaxResult<Void> error(String msg) {
-		return R.error(msg, null);
+		return AjaxResult.error(msg, null);
 	}
 
 	/**
@@ -116,8 +116,8 @@ public class R<T> {
 	 * @param data 数据对象
 	 * @return 警告消息
 	 */
-	public static <T> R<T> error(String msg, T data) {
+	public static <T> AjaxResult<T> error(String msg, T data) {
-		return new R<>(HttpStatus.HTTP_INTERNAL_ERROR, msg, data);
+		return new AjaxResult<>(HttpStatus.HTTP_INTERNAL_ERROR, msg, data);
 	}
 
 	/**
@@ -127,8 +127,8 @@ public class R<T> {
 	 * @param msg  返回内容
 	 * @return 警告消息
 	 */
-	public static R<Void> error(int code, String msg) {
+	public static AjaxResult<Void> error(int code, String msg) {
-		return new R<>(code, msg, null);
+		return new AjaxResult<>(code, msg, null);
 	}
 
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java

@@ -1,6 +1,6 @@
 package com.ruoyi.demo.controller;
 
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.redis.RedisUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -45,8 +45,8 @@ public class RedisCacheController {
     @ApiOperation("测试 @Cacheable")
     @Cacheable(cacheNames = "redissonCacheMap", key = "#key", condition = "#key != null")
     @GetMapping("/test1")
-    public R<String> test1(String key, String value) {
+    public AjaxResult<String> test1(String key, String value) {
-        return R.success("操作成功", value);
+        return AjaxResult.success("操作成功", value);
     }
 
     /**
@@ -60,8 +60,8 @@ public class RedisCacheController {
     @ApiOperation("测试 @CachePut")
     @CachePut(cacheNames = "redissonCacheMap", key = "#key", condition = "#key != null")
     @GetMapping("/test2")
-    public R<String> test2(String key, String value) {
+    public AjaxResult<String> test2(String key, String value) {
-        return R.success("操作成功", value);
+        return AjaxResult.success("操作成功", value);
     }
 
     /**
@@ -75,8 +75,8 @@ public class RedisCacheController {
     @ApiOperation("测试 @CacheEvict")
     @CacheEvict(cacheNames = "redissonCacheMap", key = "#key", condition = "#key != null")
     @GetMapping("/test3")
-    public R<String> test3(String key, String value) {
+    public AjaxResult<String> test3(String key, String value) {
-        return R.success("操作成功", value);
+        return AjaxResult.success("操作成功", value);
     }
 
     /**
@@ -86,7 +86,7 @@ public class RedisCacheController {
      */
     @ApiOperation("测试设置过期时间")
     @GetMapping("/test6")
-    public R<Boolean> test6(String key, String value) {
+    public AjaxResult<Boolean> test6(String key, String value) {
         RedisUtils.setCacheObject(key, value);
         boolean flag = RedisUtils.expire(key, 10, TimeUnit.SECONDS);
         System.out.println("***********" + flag);
@@ -96,7 +96,7 @@ public class RedisCacheController {
             e.printStackTrace();
         }
         Object obj = RedisUtils.getCacheObject(key);
-        return R.success("操作成功", value.equals(obj));
+        return AjaxResult.success("操作成功", value.equals(obj));
     }
 
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java

@@ -4,7 +4,7 @@ import com.baomidou.lock.LockInfo;
 import com.baomidou.lock.LockTemplate;
 import com.baomidou.lock.annotation.Lock4j;
 import com.baomidou.lock.executor.RedissonLockExecutor;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -36,7 +36,7 @@ public class RedisLockController {
     @ApiOperation("测试lock4j 注解")
     @Lock4j(keys = {"#key"})
     @GetMapping("/testLock4j")
-    public R<String> testLock4j(String key, String value) {
+    public AjaxResult<String> testLock4j(String key, String value) {
         System.out.println("start:" + key + ",time:" + LocalTime.now().toString());
         try {
             Thread.sleep(10000);
@@ -44,7 +44,7 @@ public class RedisLockController {
             e.printStackTrace();
         }
         System.out.println("end :" + key + ",time:" + LocalTime.now().toString());
-        return R.success("操作成功", value);
+        return AjaxResult.success("操作成功", value);
     }
 
     /**
@@ -52,7 +52,7 @@ public class RedisLockController {
      */
     @ApiOperation("测试lock4j 工具")
     @GetMapping("/testLock4jLockTemaplate")
-    public R<String> testLock4jLockTemaplate(String key, String value) {
+    public AjaxResult<String> testLock4jLockTemaplate(String key, String value) {
         final LockInfo lockInfo = lockTemplate.lock(key, 30000L, 5000L, RedissonLockExecutor.class);
         if (null == lockInfo) {
             throw new RuntimeException("业务处理中,请稍后再试");
@@ -70,7 +70,7 @@ public class RedisLockController {
             lockTemplate.releaseLock(lockInfo);
         }
         //结束
-        return R.success("操作成功", value);
+        return AjaxResult.success("操作成功", value);
     }
 
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java

@@ -1,6 +1,6 @@
 package com.ruoyi.demo.controller;
 
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.redis.RedisUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -24,20 +24,20 @@ public class RedisPubSubController {
 
     @ApiOperation("发布消息")
     @GetMapping("/pub")
-    public R<Void> pub(@ApiParam("通道Key") String key, @ApiParam("发送内容") String value) {
+    public AjaxResult<Void> pub(@ApiParam("通道Key") String key, @ApiParam("发送内容") String value) {
         RedisUtils.publish(key, value, consumer -> {
             System.out.println("发布通道 => " + key + ", 发送值 => " + value);
         });
-        return R.success("操作成功");
+        return AjaxResult.success("操作成功");
     }
 
     @ApiOperation("订阅消息")
     @GetMapping("/sub")
-    public R<Void> sub(@ApiParam("通道Key") String key) {
+    public AjaxResult<Void> sub(@ApiParam("通道Key") String key) {
         RedisUtils.subscribe(key, String.class, msg -> {
             System.out.println("订阅通道 => " + key + ", 接收值 => " + msg);
         });
-        return R.success("操作成功");
+        return AjaxResult.success("操作成功");
     }
 
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java

@@ -1,7 +1,7 @@
 package com.ruoyi.demo.controller;
 
 import com.ruoyi.common.annotation.RateLimiter;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.LimitType;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -29,8 +29,8 @@ public class RedisRateLimiterController {
     @ApiOperation("测试全局限流")
     @RateLimiter(count = 2, time = 10)
     @GetMapping("/test")
-    public R<String> test(String value) {
+    public AjaxResult<String> test(String value) {
-        return R.success("操作成功", value);
+        return AjaxResult.success("操作成功", value);
     }
 
     /**
@@ -40,8 +40,8 @@ public class RedisRateLimiterController {
     @ApiOperation("测试请求IP限流")
     @RateLimiter(count = 2, time = 10, limitType = LimitType.IP)
     @GetMapping("/testip")
-    public R<String> testip(String value) {
+    public AjaxResult<String> testip(String value) {
-        return R.success("操作成功", value);
+        return AjaxResult.success("操作成功", value);
     }
 
     /**
@@ -51,8 +51,8 @@ public class RedisRateLimiterController {
     @ApiOperation("测试集群实例限流")
     @RateLimiter(count = 2, time = 10, limitType = LimitType.CLUSTER)
     @GetMapping("/testcluster")
-    public R<String> testcluster(String value) {
+    public AjaxResult<String> testcluster(String value) {
-        return R.success("操作成功", value);
+        return AjaxResult.success("操作成功", value);
     }
 
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java

@@ -1,6 +1,6 @@
 package com.ruoyi.demo.controller;
 
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -31,8 +31,8 @@ public class Swagger3DemoController {
         @ApiImplicitParam(name = "file", value = "文件", dataType = "java.io.File", required = true),
     })
     @PostMapping(value = "/upload")
-    public R<String> upload(@RequestPart("file") MultipartFile file) {
+    public AjaxResult<String> upload(@RequestPart("file") MultipartFile file) {
-        return R.success("操作成功", file.getOriginalFilename());
+        return AjaxResult.success("操作成功", file.getOriginalFilename());
     }
 
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java

@@ -2,7 +2,7 @@ package com.ruoyi.demo.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.demo.domain.TestDemo;
 import com.ruoyi.demo.mapper.TestDemoMapper;
 import io.swagger.annotations.Api;
@@ -42,7 +42,7 @@ public class TestBatchController extends BaseController {
     @ApiOperation(value = "新增批量方法")
     @PostMapping("/add")
 //    @DS("slave")
-    public R<Void> add() {
+    public AjaxResult<Void> add() {
         List<TestDemo> list = new ArrayList<>();
         for (int i = 0; i < 1000; i++) {
             list.add(new TestDemo().setOrderNum(-1L).setTestKey("批量新增").setValue("测试新增"));
@@ -58,7 +58,7 @@ public class TestBatchController extends BaseController {
     @ApiOperation(value = "新增或更新批量方法")
     @PostMapping("/addOrUpdate")
 //    @DS("slave")
-    public R<Void> addOrUpdate() {
+    public AjaxResult<Void> addOrUpdate() {
         List<TestDemo> list = new ArrayList<>();
         for (int i = 0; i < 1000; i++) {
             list.add(new TestDemo().setOrderNum(-1L).setTestKey("批量新增").setValue("测试新增"));
@@ -80,7 +80,7 @@ public class TestBatchController extends BaseController {
     @ApiOperation(value = "删除批量方法")
     @DeleteMapping()
 //    @DS("slave")
-    public R<Void> remove() {
+    public AjaxResult<Void> remove() {
         return toAjax(testDemoMapper.delete(new LambdaQueryWrapper<TestDemo>()
             .eq(TestDemo::getOrderNum, -1L)));
     }

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java

@@ -5,7 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
@@ -76,12 +76,12 @@ public class TestDemoController extends BaseController {
     @Log(title = "测试单表", businessType = BusinessType.IMPORT)
     @SaCheckPermission("demo:demo:import")
     @PostMapping("/importData")
-    public R<Void> importData(@RequestPart("file") MultipartFile file) throws Exception {
+    public AjaxResult<Void> importData(@RequestPart("file") MultipartFile file) throws Exception {
         ExcelResult<TestDemoImportVo> excelResult = ExcelUtil.importExcel(file.getInputStream(), TestDemoImportVo.class, true);
         List<TestDemoImportVo> volist = excelResult.getList();
         List<TestDemo> list = BeanUtil.copyToList(volist, TestDemo.class);
         iTestDemoService.saveBatch(list);
-        return R.success(excelResult.getAnalysis());
+        return AjaxResult.success(excelResult.getAnalysis());
     }
 
     /**
@@ -106,10 +106,10 @@ public class TestDemoController extends BaseController {
     @ApiOperation("获取测试单表详细信息")
     @SaCheckPermission("demo:demo:query")
     @GetMapping("/{id}")
-    public R<TestDemoVo> getInfo(@ApiParam("测试ID")
+    public AjaxResult<TestDemoVo> getInfo(@ApiParam("测试ID")
                                           @NotNull(message = "主键不能为空")
                                           @PathVariable("id") Long id) {
-        return R.success(iTestDemoService.queryById(id));
+        return AjaxResult.success(iTestDemoService.queryById(id));
     }
 
     /**
@@ -120,7 +120,7 @@ public class TestDemoController extends BaseController {
     @Log(title = "测试单表", businessType = BusinessType.INSERT)
     @RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS, message = "不允许重复提交")
     @PostMapping()
-    public R<Void> add(@RequestBody TestDemoBo bo) {
+    public AjaxResult<Void> add(@RequestBody TestDemoBo bo) {
         // 使用校验工具对标 @Validated(AddGroup.class) 注解
         // 用于在非 Controller 的地方校验对象
         ValidatorUtils.validate(bo, AddGroup.class);
@@ -135,7 +135,7 @@ public class TestDemoController extends BaseController {
     @Log(title = "测试单表", businessType = BusinessType.UPDATE)
     @RepeatSubmit
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TestDemoBo bo) {
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody TestDemoBo bo) {
         return toAjax(iTestDemoService.updateByBo(bo) ? 1 : 0);
     }
 
@@ -146,7 +146,7 @@ public class TestDemoController extends BaseController {
     @SaCheckPermission("demo:demo:remove")
     @Log(title = "测试单表" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public R<Void> remove(@ApiParam("测试ID串")
+    public AjaxResult<Void> remove(@ApiParam("测试ID串")
                                    @NotEmpty(message = "主键不能为空")
                                    @PathVariable Long[] ids) {
         return toAjax(iTestDemoService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java

@@ -1,6 +1,6 @@
 package com.ruoyi.demo.controller;
 
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.MessageUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -35,8 +35,8 @@ public class TestI18nController {
      */
     @ApiOperation("通过code获取国际化内容")
     @GetMapping()
-    public R<Void> get(@ApiParam("国际化code") String code) {
+    public AjaxResult<Void> get(@ApiParam("国际化code") String code) {
-        return R.success(MessageUtils.message(code));
+        return AjaxResult.success(MessageUtils.message(code));
     }
 
     /**
@@ -47,8 +47,8 @@ public class TestI18nController {
      */
     @ApiOperation("Validator 校验国际化")
     @GetMapping("/test1")
-    public R<Void> test1(@NotBlank(message = "{not.null}") String str) {
+    public AjaxResult<Void> test1(@NotBlank(message = "{not.null}") String str) {
-        return R.success(str);
+        return AjaxResult.success(str);
     }
 
     /**
@@ -59,8 +59,8 @@ public class TestI18nController {
      */
     @ApiOperation("Bean 校验国际化")
     @GetMapping("/test2")
-    public R<TestI18nBo> test2(@Validated TestI18nBo bo) {
+    public AjaxResult<TestI18nBo> test2(@Validated TestI18nBo bo) {
-        return R.success(bo);
+        return AjaxResult.success(bo);
     }
 
     @Data

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java

@@ -2,7 +2,7 @@ package com.ruoyi.demo.controller;
 
 import com.ruoyi.common.annotation.Sensitive;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.SensitiveStrategy;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -32,14 +32,14 @@ public class TestSensitiveController extends BaseController {
      */
     @ApiOperation("查询测试单表列表")
     @GetMapping("/test")
-    public R<TestSensitive> test() {
+    public AjaxResult<TestSensitive> test() {
         TestSensitive testSensitive = new TestSensitive()
             .setIdCard("210397198608215431")
             .setPhone("17640125371")
             .setAddress("北京市朝阳区某某四合院1203室")
             .setEmail("17640125371@163.com")
             .setBankCard("6226456952351452853");
-        return R.success(testSensitive);
+        return AjaxResult.success(testSensitive);
     }
 
     @Data

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
@@ -48,9 +48,9 @@ public class TestTreeController extends BaseController {
     @ApiOperation("查询测试树表列表")
     @SaCheckPermission("demo:tree:list")
     @GetMapping("/list")
-    public R<List<TestTreeVo>> list(@Validated(QueryGroup.class) TestTreeBo bo) {
+    public AjaxResult<List<TestTreeVo>> list(@Validated(QueryGroup.class) TestTreeBo bo) {
         List<TestTreeVo> list = iTestTreeService.queryList(bo);
-        return R.success(list);
+        return AjaxResult.success(list);
     }
 
     /**
@@ -71,10 +71,10 @@ public class TestTreeController extends BaseController {
     @ApiOperation("获取测试树表详细信息")
     @SaCheckPermission("demo:tree:query")
     @GetMapping("/{id}")
-    public R<TestTreeVo> getInfo(@ApiParam("测试树ID")
+    public AjaxResult<TestTreeVo> getInfo(@ApiParam("测试树ID")
                                           @NotNull(message = "主键不能为空")
                                           @PathVariable("id") Long id) {
-        return R.success(iTestTreeService.queryById(id));
+        return AjaxResult.success(iTestTreeService.queryById(id));
     }
 
     /**
@@ -85,7 +85,7 @@ public class TestTreeController extends BaseController {
     @Log(title = "测试树表", businessType = BusinessType.INSERT)
     @RepeatSubmit
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody TestTreeBo bo) {
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody TestTreeBo bo) {
         return toAjax(iTestTreeService.insertByBo(bo) ? 1 : 0);
     }
 
@@ -97,7 +97,7 @@ public class TestTreeController extends BaseController {
     @Log(title = "测试树表", businessType = BusinessType.UPDATE)
     @RepeatSubmit
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TestTreeBo bo) {
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody TestTreeBo bo) {
         return toAjax(iTestTreeService.updateByBo(bo) ? 1 : 0);
     }
 
@@ -108,7 +108,7 @@ public class TestTreeController extends BaseController {
     @SaCheckPermission("demo:tree:remove")
     @Log(title = "测试树表" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public R<Void> remove(@ApiParam("测试树ID串")
+    public AjaxResult<Void> remove(@ApiParam("测试树ID串")
                                    @NotEmpty(message = "主键不能为空")
                                    @PathVariable Long[] ids) {
         return toAjax(iTestTreeService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java

@@ -1,6 +1,6 @@
 package com.ruoyi.demo.controller.queue;
 
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.redis.QueueUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,7 +33,7 @@ public class BoundedQueueController {
 
     @ApiOperation("添加队列数据")
     @GetMapping("/add")
-    public R<Void> add(@ApiParam("队列名") String queueName,
+    public AjaxResult<Void> add(@ApiParam("队列名") String queueName,
                                 @ApiParam("容量") int capacity) {
         // 用完了一定要销毁 否则会一直存在
         boolean b = QueueUtils.destroyBoundedQueueObject(queueName);
@@ -43,7 +43,7 @@ public class BoundedQueueController {
             log.info("通道: {} , 设置容量: {}", queueName, capacity);
         } else {
             log.info("通道: {} , 设置容量失败", queueName);
-            return R.error("操作失败");
+            return AjaxResult.error("操作失败");
         }
         for (int i = 0; i < 11; i++) {
             String data = "data-" + i;
@@ -54,30 +54,30 @@ public class BoundedQueueController {
                 log.info("通道: {} , 发送数据: {}", queueName, data);
             }
         }
-        return R.success("操作成功");
+        return AjaxResult.success("操作成功");
     }
 
     @ApiOperation("删除队列数据")
     @GetMapping("/remove")
-    public R<Void> remove(@ApiParam("队列名") String queueName) {
+    public AjaxResult<Void> remove(@ApiParam("队列名") String queueName) {
         String data = "data-" + 5;
         if (QueueUtils.removeBoundedQueueObject(queueName, data)) {
             log.info("通道: {} , 删除数据: {}", queueName, data);
         } else {
-            return R.error("操作失败");
+            return AjaxResult.error("操作失败");
         }
-        return R.success("操作成功");
+        return AjaxResult.success("操作成功");
     }
 
     @ApiOperation("获取队列数据")
     @GetMapping("/get")
-    public R<Void> get(@ApiParam("队列名") String queueName) {
+    public AjaxResult<Void> get(@ApiParam("队列名") String queueName) {
         String data;
         do {
             data = QueueUtils.getBoundedQueueObject(queueName);
             log.info("通道: {} , 获取数据: {}", queueName, data);
         } while (data != null);
-        return R.success("操作成功");
+        return AjaxResult.success("操作成功");
     }
 
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java

@@ -1,6 +1,6 @@
 package com.ruoyi.demo.controller.queue;
 
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.redis.QueueUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -35,45 +35,45 @@ public class DelayedQueueController {
 
     @ApiOperation("订阅队列")
     @GetMapping("/subscribe")
-    public R<Void> subscribe(@ApiParam("队列名") String queueName) {
+    public AjaxResult<Void> subscribe(@ApiParam("队列名") String queueName) {
         log.info("通道: {} 监听中......", queueName);
         // 项目初始化设置一次即可
         QueueUtils.subscribeBlockingQueue(queueName, (String orderNum) -> {
             // 观察接收时间
             log.info("通道: {}, 收到数据: {}", queueName, orderNum);
         });
-        return R.success("操作成功");
+        return AjaxResult.success("操作成功");
     }
 
     @ApiOperation("添加队列数据")
     @GetMapping("/add")
-    public R<Void> add(@ApiParam("队列名") String queueName,
+    public AjaxResult<Void> add(@ApiParam("队列名") String queueName,
                                 @ApiParam("订单号") String orderNum,
                                 @ApiParam("延迟时间(秒)") Long time) {
         QueueUtils.addDelayedQueueObject(queueName, orderNum, time, TimeUnit.SECONDS);
         // 观察发送时间
         log.info("通道: {} , 发送数据: {}", queueName, orderNum);
-        return R.success("操作成功");
+        return AjaxResult.success("操作成功");
     }
 
     @ApiOperation("删除队列数据")
     @GetMapping("/remove")
-    public R<Void> remove(@ApiParam("队列名") String queueName,
+    public AjaxResult<Void> remove(@ApiParam("队列名") String queueName,
                                    @ApiParam("订单号") String orderNum) {
         if (QueueUtils.removeDelayedQueueObject(queueName, orderNum)) {
             log.info("通道: {} , 删除数据: {}", queueName, orderNum);
         } else {
-            return R.error("操作失败");
+            return AjaxResult.error("操作失败");
         }
-        return R.success("操作成功");
+        return AjaxResult.success("操作成功");
     }
 
     @ApiOperation("销毁队列")
     @GetMapping("/destroy")
-    public R<Void> destroy(@ApiParam("队列名") String queueName) {
+    public AjaxResult<Void> destroy(@ApiParam("队列名") String queueName) {
         // 用完了一定要销毁 否则会一直存在
         QueueUtils.destroyDelayedQueue(queueName);
-        return R.success("操作成功");
+        return AjaxResult.success("操作成功");
     }
 
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java

@@ -1,7 +1,7 @@
 package com.ruoyi.demo.controller.queue;
 
 import cn.hutool.core.util.RandomUtil;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.redis.QueueUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,7 +33,7 @@ public class PriorityQueueController {
 
     @ApiOperation("添加队列数据")
     @GetMapping("/add")
-    public R<Void> add(@ApiParam("队列名") String queueName) {
+    public AjaxResult<Void> add(@ApiParam("队列名") String queueName) {
         // 用完了一定要销毁 否则会一直存在
         boolean b = QueueUtils.destroyPriorityQueueObject(queueName);
         log.info("通道: {} , 删除: {}", queueName, b);
@@ -43,7 +43,7 @@ public class PriorityQueueController {
             log.info("通道: {} , 设置比较器成功", queueName);
         } else {
             log.info("通道: {} , 设置比较器失败", queueName);
-            return R.error("操作失败");
+            return AjaxResult.error("操作失败");
         }
         for (int i = 0; i < 10; i++) {
             int randomNum = RandomUtil.randomInt(10);
@@ -54,32 +54,32 @@ public class PriorityQueueController {
                 log.info("通道: {} , 发送数据: {}, 发送失败", queueName, data);
             }
         }
-        return R.success("操作成功");
+        return AjaxResult.success("操作成功");
     }
 
     @ApiOperation("删除队列数据")
     @GetMapping("/remove")
-    public R<Void> remove(@ApiParam("队列名") String queueName,
+    public AjaxResult<Void> remove(@ApiParam("队列名") String queueName,
                                    @ApiParam("对象名") String name,
                                    @ApiParam("排序号") Integer orderNum) {
         PriorityDemo data = new PriorityDemo().setName(name).setOrderNum(orderNum);
         if (QueueUtils.removePriorityQueueObject(queueName, data)) {
             log.info("通道: {} , 删除数据: {}", queueName, data);
         } else {
-            return R.error("操作失败");
+            return AjaxResult.error("操作失败");
         }
-        return R.success("操作成功");
+        return AjaxResult.success("操作成功");
     }
 
     @ApiOperation("获取队列数据")
     @GetMapping("/get")
-    public R<Void> get(@ApiParam("队列名") String queueName) {
+    public AjaxResult<Void> get(@ApiParam("队列名") String queueName) {
         PriorityDemo data;
         do {
             data = QueueUtils.getPriorityQueueObject(queueName);
             log.info("通道: {} , 获取数据: {}", queueName, data);
         } while (data != null);
-        return R.success("操作成功");
+        return AjaxResult.success("操作成功");
     }
 
 }

ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java

@@ -4,7 +4,7 @@ import cn.dev33.satoken.exception.NotLoginException;
 import cn.dev33.satoken.exception.NotPermissionException;
 import cn.dev33.satoken.exception.NotRoleException;
 import cn.hutool.http.HttpStatus;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.exception.DemoModeException;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
@@ -34,112 +34,112 @@ public class GlobalExceptionHandler {
      * 权限校验异常
      */
     @ExceptionHandler(NotPermissionException.class)
-    public R<Void> handleAccessDeniedException(NotPermissionException e, HttpServletRequest request) {
+    public AjaxResult<Void> handleAccessDeniedException(NotPermissionException e, HttpServletRequest request) {
         String requestURI = request.getRequestURI();
         log.error("请求地址'{}',权限校验失败'{}'", requestURI, e.getMessage());
-        return R.error(HttpStatus.HTTP_FORBIDDEN, "没有权限，请联系管理员授权");
+        return AjaxResult.error(HttpStatus.HTTP_FORBIDDEN, "没有权限，请联系管理员授权");
     }
 
     /**
      * 角色校验异常
      */
     @ExceptionHandler(NotRoleException.class)
-    public R<Void> handleAccessDeniedException(NotRoleException e, HttpServletRequest request) {
+    public AjaxResult<Void> handleAccessDeniedException(NotRoleException e, HttpServletRequest request) {
         String requestURI = request.getRequestURI();
         log.error("请求地址'{}',角色校验失败'{}'", requestURI, e.getMessage());
-        return R.error(HttpStatus.HTTP_FORBIDDEN, "没有角色，请联系管理员授权");
+        return AjaxResult.error(HttpStatus.HTTP_FORBIDDEN, "没有角色，请联系管理员授权");
     }
 
     /**
      * 认证失败
      */
     @ExceptionHandler(NotLoginException.class)
-    public R<Void> handleAccessDeniedException(NotLoginException e, HttpServletRequest request) {
+    public AjaxResult<Void> handleAccessDeniedException(NotLoginException e, HttpServletRequest request) {
         String requestURI = request.getRequestURI();
         log.error("请求地址'{}',认证失败'{}',无法访问系统资源", requestURI, e.getMessage());
-        return R.error(HttpStatus.HTTP_UNAUTHORIZED, StringUtils.format("请求地址'{}',认证失败'{}',无法访问系统资源", requestURI));
+        return AjaxResult.error(HttpStatus.HTTP_UNAUTHORIZED, StringUtils.format("请求地址'{}',认证失败'{}',无法访问系统资源", requestURI));
     }
 
     /**
      * 请求方式不支持
      */
     @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
-    public R<Void> handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException e,
+    public AjaxResult<Void> handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException e,
                                                                 HttpServletRequest request) {
         String requestURI = request.getRequestURI();
         log.error("请求地址'{}',不支持'{}'请求", requestURI, e.getMethod());
-        return R.error(e.getMessage());
+        return AjaxResult.error(e.getMessage());
     }
 
     /**
      * 业务异常
      */
     @ExceptionHandler(ServiceException.class)
-    public R<Void> handleServiceException(ServiceException e, HttpServletRequest request) {
+    public AjaxResult<Void> handleServiceException(ServiceException e, HttpServletRequest request) {
         log.error(e.getMessage(), e);
         Integer code = e.getCode();
-        return StringUtils.isNotNull(code) ? R.error(code, e.getMessage()) : R.error(e.getMessage());
+        return StringUtils.isNotNull(code) ? AjaxResult.error(code, e.getMessage()) : AjaxResult.error(e.getMessage());
     }
 
     /**
      * 拦截未知的运行时异常
      */
     @ExceptionHandler(RuntimeException.class)
-    public R<Void> handleRuntimeException(RuntimeException e, HttpServletRequest request) {
+    public AjaxResult<Void> handleRuntimeException(RuntimeException e, HttpServletRequest request) {
         String requestURI = request.getRequestURI();
         log.error("请求地址'{}',发生未知异常.", requestURI, e);
-        return R.error(e.getMessage());
+        return AjaxResult.error(e.getMessage());
     }
 
     /**
      * 系统异常
      */
     @ExceptionHandler(Exception.class)
-    public R<Void> handleException(Exception e, HttpServletRequest request) {
+    public AjaxResult<Void> handleException(Exception e, HttpServletRequest request) {
         String requestURI = request.getRequestURI();
         log.error("请求地址'{}',发生系统异常.", requestURI, e);
-        return R.error(e.getMessage());
+        return AjaxResult.error(e.getMessage());
     }
 
     /**
      * 自定义验证异常
      */
     @ExceptionHandler(BindException.class)
-    public R<Void> handleBindException(BindException e) {
+    public AjaxResult<Void> handleBindException(BindException e) {
         log.error(e.getMessage(), e);
         String message = e.getAllErrors().stream()
             .map(DefaultMessageSourceResolvable::getDefaultMessage)
             .collect(Collectors.joining(", "));
-        return R.error(message);
+        return AjaxResult.error(message);
     }
 
     /**
      * 自定义验证异常
      */
     @ExceptionHandler(ConstraintViolationException.class)
-    public R<Void> constraintViolationException(ConstraintViolationException e) {
+    public AjaxResult<Void> constraintViolationException(ConstraintViolationException e) {
         log.error(e.getMessage(), e);
         String message = e.getConstraintViolations().stream()
             .map(ConstraintViolation::getMessage)
             .collect(Collectors.joining(", "));
-        return R.error(message);
+        return AjaxResult.error(message);
     }
 
     /**
      * 自定义验证异常
      */
     @ExceptionHandler(MethodArgumentNotValidException.class)
-    public R<Void> handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
+    public AjaxResult<Void> handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
         log.error(e.getMessage(), e);
         String message = e.getBindingResult().getFieldError().getDefaultMessage();
-        return R.error(message);
+        return AjaxResult.error(message);
     }
 
     /**
      * 演示模式异常
      */
     @ExceptionHandler(DemoModeException.class)
-    public R<Void> handleDemoModeException(DemoModeException e) {
+    public AjaxResult<Void> handleDemoModeException(DemoModeException e) {
-        return R.error("演示模式，不允许操作");
+        return AjaxResult.error("演示模式，不允许操作");
     }
 }

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java

@@ -5,7 +5,7 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.io.IoUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
@@ -57,7 +57,7 @@ public class GenController extends BaseController {
     @ApiOperation("修改代码生成业务")
     @SaCheckPermission("tool:gen:query")
     @GetMapping(value = "/{talbleId}")
-    public R<Map<String, Object>> getInfo(@PathVariable Long talbleId) {
+    public AjaxResult<Map<String, Object>> getInfo(@PathVariable Long talbleId) {
         GenTable table = genTableService.selectGenTableById(talbleId);
         List<GenTable> tables = genTableService.selectGenTableAll();
         List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(talbleId);
@@ -65,7 +65,7 @@ public class GenController extends BaseController {
         map.put("info", table);
         map.put("rows", list);
         map.put("tables", tables);
-        return R.success(map);
+        return AjaxResult.success(map);
     }
 
     /**
@@ -99,12 +99,12 @@ public class GenController extends BaseController {
     @SaCheckPermission("tool:gen:import")
     @Log(title = "代码生成", businessType = BusinessType.IMPORT)
     @PostMapping("/importTable")
-    public R<Void> importTableSave(String tables) {
+    public AjaxResult<Void> importTableSave(String tables) {
         String[] tableNames = Convert.toStrArray(tables);
         // 查询表信息
         List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames);
         genTableService.importGenTable(tableList);
-        return R.success();
+        return AjaxResult.success();
     }
 
     /**
@@ -114,10 +114,10 @@ public class GenController extends BaseController {
     @SaCheckPermission("tool:gen:edit")
     @Log(title = "代码生成", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> editSave(@Validated @RequestBody GenTable genTable) {
+    public AjaxResult<Void> editSave(@Validated @RequestBody GenTable genTable) {
         genTableService.validateEdit(genTable);
         genTableService.updateGenTable(genTable);
-        return R.success();
+        return AjaxResult.success();
     }
 
     /**
@@ -127,9 +127,9 @@ public class GenController extends BaseController {
     @SaCheckPermission("tool:gen:remove")
     @Log(title = "代码生成", businessType = BusinessType.DELETE)
     @DeleteMapping("/{tableIds}")
-    public R<Void> remove(@PathVariable Long[] tableIds) {
+    public AjaxResult<Void> remove(@PathVariable Long[] tableIds) {
         genTableService.deleteGenTableByIds(tableIds);
-        return R.success();
+        return AjaxResult.success();
     }
 
     /**
@@ -138,9 +138,9 @@ public class GenController extends BaseController {
     @ApiOperation("预览代码")
     @SaCheckPermission("tool:gen:preview")
     @GetMapping("/preview/{tableId}")
-    public R<Map<String, String>> preview(@PathVariable("tableId") Long tableId) throws IOException {
+    public AjaxResult<Map<String, String>> preview(@PathVariable("tableId") Long tableId) throws IOException {
         Map<String, String> dataMap = genTableService.previewCode(tableId);
-        return R.success(dataMap);
+        return AjaxResult.success(dataMap);
     }
 
     /**
@@ -162,9 +162,9 @@ public class GenController extends BaseController {
     @SaCheckPermission("tool:gen:code")
     @Log(title = "代码生成", businessType = BusinessType.GENCODE)
     @GetMapping("/genCode/{tableName}")
-    public R<Void> genCode(@PathVariable("tableName") String tableName) {
+    public AjaxResult<Void> genCode(@PathVariable("tableName") String tableName) {
         genTableService.generatorCode(tableName);
-        return R.success();
+        return AjaxResult.success();
     }
 
     /**
@@ -174,9 +174,9 @@ public class GenController extends BaseController {
     @SaCheckPermission("tool:gen:edit")
     @Log(title = "代码生成", businessType = BusinessType.UPDATE)
     @GetMapping("/synchDb/{tableName}")
-    public R<Void> synchDb(@PathVariable("tableName") String tableName) {
+    public AjaxResult<Void> synchDb(@PathVariable("tableName") String tableName) {
         genTableService.synchDb(tableName);
-        return R.success();
+        return AjaxResult.success();
     }
 
     /**

ruoyi-generator/src/main/resources/vm/java/controller.java.vm

@@ -2,7 +2,6 @@ package ${packageName}.controller;
 
 import java.util.List;
 import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
 
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
@@ -15,7 +14,7 @@ import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
@@ -58,9 +57,9 @@ public class ${ClassName}Controller extends BaseController {
         return i${ClassName}Service.queryPageList(bo, pageQuery);
     }
 #elseif($table.tree)
-    public R<List<${ClassName}Vo>> list(@Validated(QueryGroup.class) ${ClassName}Bo bo) {
+    public AjaxResult<List<${ClassName}Vo>> list(@Validated(QueryGroup.class) ${ClassName}Bo bo) {
         List<${ClassName}Vo> list = i${ClassName}Service.queryList(bo);
-        return R.success(list);
+        return AjaxResult.success(list);
     }
 #end
 
@@ -82,10 +81,10 @@ public class ${ClassName}Controller extends BaseController {
     @ApiOperation("获取${functionName}详细信息")
     @SaCheckPermission("${permissionPrefix}:query")
     @GetMapping("/{${pkColumn.javaField}}")
-    public R<${ClassName}Vo> getInfo(@ApiParam("主键")
+    public AjaxResult<${ClassName}Vo> getInfo(@ApiParam("主键")
                                                   @NotNull(message = "主键不能为空")
                                                   @PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) {
-        return R.success(i${ClassName}Service.queryById(${pkColumn.javaField}));
+        return AjaxResult.success(i${ClassName}Service.queryById(${pkColumn.javaField}));
     }
 
     /**
@@ -96,7 +95,7 @@ public class ${ClassName}Controller extends BaseController {
     @Log(title = "${functionName}", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ${ClassName}Bo bo) {
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody ${ClassName}Bo bo) {
         return toAjax(i${ClassName}Service.insertByBo(bo) ? 1 : 0);
     }
 
@@ -108,7 +107,7 @@ public class ${ClassName}Controller extends BaseController {
     @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ${ClassName}Bo bo) {
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody ${ClassName}Bo bo) {
         return toAjax(i${ClassName}Service.updateByBo(bo) ? 1 : 0);
     }
 
@@ -119,7 +118,7 @@ public class ${ClassName}Controller extends BaseController {
     @SaCheckPermission("${permissionPrefix}:remove")
     @Log(title = "${functionName}" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{${pkColumn.javaField}s}")
-    public R<Void> remove(@ApiParam("主键串")
+    public AjaxResult<Void> remove(@ApiParam("主键串")
                                        @NotEmpty(message = "主键不能为空")
                                        @PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) {
         return toAjax(i${ClassName}Service.deleteWithValidByIds(Arrays.asList(${pkColumn.javaField}s), true) ? 1 : 0);

ruoyi-system/src/main/java/com/ruoyi/workflow/service/IFlowInstanceService.java

@@ -1,6 +1,6 @@
 package com.ruoyi.workflow.service;
 
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.workflow.domain.vo.FlowTaskVo;
 import org.flowable.engine.history.HistoricProcessInstance;
 import org.flowable.task.api.Task;
@@ -54,5 +54,5 @@ public interface IFlowInstanceService {
      * @param variables 流程变量
      * @return
      */
-    R startProcessInstanceById(String procDefId, Map<String, Object> variables);
+    AjaxResult startProcessInstanceById(String procDefId, Map<String, Object> variables);
 }

ruoyi-system/src/main/java/com/ruoyi/workflow/service/IFlowTaskService.java

@@ -1,6 +1,6 @@
 package com.ruoyi.workflow.service;
 
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.workflow.domain.vo.FlowTaskVo;
 import org.flowable.task.api.Task;
 
@@ -17,7 +17,7 @@ public interface IFlowTaskService {
      *
      * @param task 请求实体参数
      */
-    R complete(FlowTaskVo task);
+    AjaxResult complete(FlowTaskVo task);
 
     /**
      * 驳回任务
@@ -40,7 +40,7 @@ public interface IFlowTaskService {
      * @param flowTaskVo
      * @return
      */
-    R findReturnTaskList(FlowTaskVo flowTaskVo);
+    AjaxResult findReturnTaskList(FlowTaskVo flowTaskVo);
 
     /**
      * 删除任务
@@ -84,21 +84,21 @@ public interface IFlowTaskService {
      * @param pageSize
      * @return
      */
-    R myProcess(Integer pageNum, Integer pageSize);
+    AjaxResult myProcess(Integer pageNum, Integer pageSize);
 
     /**
      * 取消申请
      * @param flowTaskVo
      * @return
      */
-    R stopProcess(FlowTaskVo flowTaskVo);
+    AjaxResult stopProcess(FlowTaskVo flowTaskVo);
 
     /**
      * 撤回流程
      * @param flowTaskVo
      * @return
      */
-    R revokeProcess(FlowTaskVo flowTaskVo);
+    AjaxResult revokeProcess(FlowTaskVo flowTaskVo);
 
 
     /**
@@ -108,7 +108,7 @@ public interface IFlowTaskService {
      * @param pageSize 每页条数
      * @return
      */
-    R todoList(Integer pageNum, Integer pageSize);
+    AjaxResult todoList(Integer pageNum, Integer pageSize);
 
 
     /**
@@ -118,7 +118,7 @@ public interface IFlowTaskService {
      * @param pageSize 每页条数
      * @return
      */
-    R finishedList(Integer pageNum, Integer pageSize);
+    AjaxResult finishedList(Integer pageNum, Integer pageSize);
 
     /**
      * 流程历史流转记录
@@ -126,7 +126,7 @@ public interface IFlowTaskService {
      * @param procInsId 流程实例Id
      * @return
      */
-    R flowRecord(String procInsId,String deployId);
+    AjaxResult flowRecord(String procInsId, String deployId);
 
     /**
      * 根据任务ID查询挂载的表单信息
@@ -148,19 +148,19 @@ public interface IFlowTaskService {
      * @param procInsId
      * @return
      */
-    R getFlowViewer(String procInsId);
+    AjaxResult getFlowViewer(String procInsId);
 
     /**
      * 获取流程变量
      * @param taskId
      * @return
      */
-    R processVariables(String taskId);
+    AjaxResult processVariables(String taskId);
 
     /**
      * 获取下一节点
      * @param flowTaskVo 任务
      * @return
      */
-    R getNextFlowNode(FlowTaskVo flowTaskVo);
+    AjaxResult getNextFlowNode(FlowTaskVo flowTaskVo);
 }

ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowInstanceServiceImpl.java

@@ -1,7 +1,7 @@
 package com.ruoyi.workflow.service.impl;
 
 
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.LoginUtils;
 import com.ruoyi.workflow.domain.vo.FlowTaskVo;
 import com.ruoyi.flowable.factory.FlowServiceFactory;
@@ -109,7 +109,7 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
      * @return
      */
     @Override
-    public R startProcessInstanceById(String procDefId, Map<String, Object> variables) {
+    public AjaxResult startProcessInstanceById(String procDefId, Map<String, Object> variables) {
 
         try {
             // 设置流程发起人Id到流程中
@@ -118,10 +118,10 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
             variables.put("initiator", userId);
             variables.put("_FLOWABLE_SKIP_EXPRESSION_ENABLED", true);
             runtimeService.startProcessInstanceById(procDefId, variables);
-            return R.success("流程启动成功");
+            return AjaxResult.success("流程启动成功");
         } catch (Exception e) {
             e.printStackTrace();
-            return R.error("流程启动错误");
+            return AjaxResult.error("流程启动错误");
         }
     }
 }

ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowTaskServiceImpl.java

@@ -4,7 +4,7 @@ package com.ruoyi.workflow.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.JsonUtils;
@@ -86,10 +86,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public R complete(FlowTaskVo taskVo) {
+    public AjaxResult complete(FlowTaskVo taskVo) {
         Task task = taskService.createTaskQuery().taskId(taskVo.getTaskId()).singleResult();
         if (Objects.isNull(task)) {
-            return R.error("任务不存在");
+            return AjaxResult.error("任务不存在");
         }
         if (DelegationState.PENDING.equals(task.getDelegationState())) {
             taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.DELEGATE.getType(), taskVo.getComment());
@@ -104,7 +104,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 taskService.complete(taskVo.getTaskId());
             }
         }
-        return R.success();
+        return AjaxResult.success();
     }
 
     /**
@@ -318,7 +318,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
      * @return
      */
     @Override
-    public R findReturnTaskList(FlowTaskVo flowTaskVo) {
+    public AjaxResult findReturnTaskList(FlowTaskVo flowTaskVo) {
         // 当前任务 task
         Task task = taskService.createTaskQuery().taskId(flowTaskVo.getTaskId()).singleResult();
         // 获取流程定义信息
@@ -349,7 +349,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 userTaskList.retainAll(road);
             }
         }
-        return R.success(userTaskList);
+        return AjaxResult.success(userTaskList);
     }
 
     /**
@@ -416,7 +416,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
      * @return
      */
     @Override
-    public R myProcess(Integer pageNum, Integer pageSize) {
+    public AjaxResult myProcess(Integer pageNum, Integer pageSize) {
         Page<FlowTaskDto> page = new Page<>();
         Long userId = LoginUtils.getUserId();
         HistoricProcessInstanceQuery historicProcessInstanceQuery = historyService.createHistoricProcessInstanceQuery()
@@ -460,7 +460,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             flowList.add(flowTask);
         }
         page.setRecords(flowList);
-        return R.success(page);
+        return AjaxResult.success(page);
     }
 
     /**
@@ -470,7 +470,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
      * @return
      */
     @Override
-    public R stopProcess(FlowTaskVo flowTaskVo) {
+    public AjaxResult stopProcess(FlowTaskVo flowTaskVo) {
         List<Task> task = taskService.createTaskQuery().processInstanceId(flowTaskVo.getInstanceId()).list();
         if (CollectionUtils.isEmpty(task)) {
             throw new RuntimeException("流程未启动或已执行完成，取消申请失败");
@@ -496,7 +496,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             }
         }
 
-        return R.success();
+        return AjaxResult.success();
     }
 
     /**
@@ -506,7 +506,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
      * @return
      */
     @Override
-    public R revokeProcess(FlowTaskVo flowTaskVo) {
+    public AjaxResult revokeProcess(FlowTaskVo flowTaskVo) {
         Task task = taskService.createTaskQuery().processInstanceId(flowTaskVo.getInstanceId()).singleResult();
         if (task == null) {
             throw new RuntimeException("流程未启动或已执行完成，无法撤回");
@@ -554,7 +554,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         List<SequenceFlow> oriSequenceFlows = new ArrayList<>(flowNode.getOutgoingFlows());
 
 
-        return R.success();
+        return AjaxResult.success();
     }
 
     /**
@@ -565,7 +565,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
      * @return
      */
     @Override
-    public R todoList(Integer pageNum, Integer pageSize) {
+    public AjaxResult todoList(Integer pageNum, Integer pageSize) {
         Page<FlowTaskDto> page = new Page<>();
         Long userId = LoginUtils.getUserId();
         TaskQuery taskQuery = taskService.createTaskQuery()
@@ -606,7 +606,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         }
 
         page.setRecords(flowList);
-        return R.success(page);
+        return AjaxResult.success(page);
     }
 
 
@@ -618,7 +618,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
      * @return
      */
     @Override
-    public R finishedList(Integer pageNum, Integer pageSize) {
+    public AjaxResult finishedList(Integer pageNum, Integer pageSize) {
         Page<FlowTaskDto> page = new Page<>();
         Long userId = LoginUtils.getUserId();
         HistoricTaskInstanceQuery taskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
@@ -666,7 +666,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
 //        Map<String, Object> result = new HashMap<>();
 //        result.put("result",page);
 //        result.put("finished",true);
-        return R.success(page);
+        return AjaxResult.success(page);
     }
 
     private static <T> Predicate<T> distinctByKey(Function<? super T, ?> keyExtractor) {
@@ -681,7 +681,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
      * @return
      */
     @Override
-    public R flowRecord(String procInsId, String deployId) {
+    public AjaxResult flowRecord(String procInsId, String deployId) {
         Map<String, Object> map = new HashMap<>();
         if (StringUtils.isNotBlank(procInsId)) {
             List<HistoricActivityInstance> list = historyService
@@ -746,11 +746,11 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         if (StringUtils.isNotBlank(deployId)) {
             SysForm sysForm = sysInstanceFormService.selectSysDeployFormByDeployId(deployId);
             if (Objects.isNull(sysForm)) {
-                return R.error("请先配置流程表单");
+                return AjaxResult.error("请先配置流程表单");
             }
             map.put("formData", JsonUtils.parseObject(sysForm.getFormContent(), Map.class));
         }
-        return R.success(map);
+        return AjaxResult.success(map);
     }
 
     /**
@@ -820,7 +820,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
      * @return
      */
     @Override
-    public R getFlowViewer(String procInsId) {
+    public AjaxResult getFlowViewer(String procInsId) {
         // 构建查询条件
         HistoricActivityInstanceQuery query = historyService.createHistoricActivityInstanceQuery()
             .processInstanceId(procInsId);
@@ -833,7 +833,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             .stream().distinct().map(HistoricActivityInstance::getActivityId)
             .collect(Collectors.toList());
         // 构建视图类
-        return R.success(new FlowViewerVo(finishedTaskList, unfinishedTaskList));
+        return AjaxResult.success(new FlowViewerVo(finishedTaskList, unfinishedTaskList));
     }
 
     /**
@@ -843,14 +843,14 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
      * @return
      */
     @Override
-    public R processVariables(String taskId) {
+    public AjaxResult processVariables(String taskId) {
         // 流程变量
         HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery().includeProcessVariables().finished().taskId(taskId).singleResult();
         if (Objects.nonNull(historicTaskInstance)) {
-            return R.success(historicTaskInstance.getProcessVariables());
+            return AjaxResult.success(historicTaskInstance.getProcessVariables());
         } else {
             Map<String, Object> variables = taskService.getVariables(taskId);
-            return R.success(variables);
+            return AjaxResult.success(variables);
         }
     }
 
@@ -861,7 +861,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
      * @return
      */
     @Override
-    public R getNextFlowNode(FlowTaskVo flowTaskVo) {
+    public AjaxResult getNextFlowNode(FlowTaskVo flowTaskVo) {
         Task task = taskService.createTaskQuery().taskId(flowTaskVo.getTaskId()).singleResult();
         FlowNextDto flowNextDto = new FlowNextDto();
         if (Objects.nonNull(task)) {
@@ -911,10 +911,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                     }
                 }
             } else {
-                return R.success("流程已完结", null);
+                return AjaxResult.success("流程已完结", null);
             }
         }
-        return R.success(flowNextDto);
+        return AjaxResult.success(flowNextDto);
     }
 
     /**