b2baccline/ballcat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🎨 修改ResultMsg => ResultCode

Browse Source
This commit is contained in:
b2baccline
2020-03-27 22:05:33 +08:00
parent fdee0f6a50
commit f4ace29984
18 changed files with 81 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/AuthController.java
View File

@@ -2,7 +2,7 @@ package com.hccake.ballcat.admin.modules.sys.controller;
import cn.hutool.core.util.StrUtil;
import com.hccake.ballcat.common.core.result.R;
import com.hccake.ballcat.common.core.result.SystemResultMsg;
import com.hccake.ballcat.common.core.result.SystemResultCode;
import io.swagger.annotations.Api;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpHeaders;
@@ -34,13 +34,13 @@ public class AuthController {
@DeleteMapping("/logout")
public R logout(@RequestHeader(value = HttpHeaders.AUTHORIZATION, required = false) String authHeader) {
if (StrUtil.isBlank(authHeader)) {
return R.failed(SystemResultMsg.FORBIDDEN, "退出失败，token 为空");
return R.failed(SystemResultCode.FORBIDDEN, "退出失败，token 为空");
}
String tokenValue = authHeader.replace(OAuth2AccessToken.BEARER_TYPE, StrUtil.EMPTY).trim();
OAuth2AccessToken accessToken = tokenStore.readAccessToken(tokenValue);
if (accessToken == null || StrUtil.isBlank(accessToken.getValue())) {
return R.failed(SystemResultMsg.FORBIDDEN,"退出失败，token 无效");
return R.failed(SystemResultCode.FORBIDDEN,"退出失败，token 无效");
}

14
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysDictController.java
View File

@@ -7,7 +7,7 @@ import com.hccake.ballcat.admin.modules.sys.model.entity.SysDict;
import com.hccake.ballcat.admin.modules.sys.model.entity.SysDictItem;
import com.hccake.ballcat.admin.modules.sys.model.qo.SysDictQO;
import com.hccake.ballcat.commom.log.operation.annotation.OperationLogging;
import com.hccake.ballcat.common.core.result.BaseResultMsg;
import com.hccake.ballcat.common.core.result.BaseResultCode;
import com.hccake.ballcat.common.core.result.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -68,7 +68,7 @@ public class SysDictController {
@PreAuthorize("@per.hasPermission('sys:dict:add')")
public R save(@RequestBody SysDict sysDict) {
return sysDictManager.dictSave(sysDict) ?
R.ok() : R.failed(BaseResultMsg.UPDATE_DATABASE_ERROR, "新增字典表失败");
R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "新增字典表失败");
}
/**
@@ -83,7 +83,7 @@ public class SysDictController {
@PreAuthorize("@per.hasPermission('sys:dict:edit')")
public R updateById(@RequestBody SysDict sysDict) {
return sysDictManager.updateDictById(sysDict) ?
R.ok() : R.failed(BaseResultMsg.UPDATE_DATABASE_ERROR, "修改字典表失败");
R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改字典表失败");
}
/**
@@ -98,7 +98,7 @@ public class SysDictController {
@PreAuthorize("@per.hasPermission('sys:dict:del')")
public R removeById(@PathVariable Integer id) {
return sysDictManager.removeDictById(id) ?
R.ok() : R.failed(BaseResultMsg.UPDATE_DATABASE_ERROR, "通过id删除字典表失败");
R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "通过id删除字典表失败");
}
/**
@@ -129,7 +129,7 @@ public class SysDictController {
@PreAuthorize("@per.hasPermission('sys:dict:add')")
public R saveItem(@RequestBody SysDictItem sysDictItem) {
return sysDictManager.saveDictItem(sysDictItem) ?
R.ok() : R.failed(BaseResultMsg.UPDATE_DATABASE_ERROR, "新增字典项失败");
R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "新增字典项失败");
}
/**
@@ -144,7 +144,7 @@ public class SysDictController {
@PreAuthorize("@per.hasPermission('sys:dict:edit')")
public R updateItemById(@RequestBody SysDictItem sysDictItem) {
return sysDictManager.updateDictItemById(sysDictItem) ?
R.ok() : R.failed(BaseResultMsg.UPDATE_DATABASE_ERROR, "修改字典项失败");
R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改字典项失败");
}
/**
@@ -159,7 +159,7 @@ public class SysDictController {
@PreAuthorize("@per.hasPermission('sys:dict:del')")
public R removeItemById(@PathVariable Integer id) {
return sysDictManager.removeDictItemById(id) ?
R.ok() : R.failed(BaseResultMsg.UPDATE_DATABASE_ERROR, "通过id删除字典项失败");
R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "通过id删除字典项失败");
}
}

20
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java
View File

@@ -13,9 +13,9 @@ import com.hccake.ballcat.admin.modules.sys.model.qo.SysUserQO;
import com.hccake.ballcat.admin.modules.sys.service.SysUserRoleService;
import com.hccake.ballcat.admin.modules.sys.service.SysUserService;
import com.hccake.ballcat.commom.log.operation.annotation.OperationLogging;
import com.hccake.ballcat.common.core.result.BaseResultMsg;
import com.hccake.ballcat.common.core.result.BaseResultCode;
import com.hccake.ballcat.common.core.result.R;
import com.hccake.ballcat.common.core.result.SystemResultMsg;
import com.hccake.ballcat.common.core.result.SystemResultCode;
import com.hccake.ballcat.common.core.vo.SelectData;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -82,7 +82,7 @@ public class SysUserController {
@PreAuthorize("@per.hasPermission('sys:sysuser:add')")
public R addSysUser(@Valid @RequestBody SysUserDTO sysUserDto) {
return sysUserService.addSysUser(sysUserDto) ?
R.ok() : R.failed(BaseResultMsg.UPDATE_DATABASE_ERROR, "新增系统用户失败");
R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "新增系统用户失败");
}
@@ -98,7 +98,7 @@ public class SysUserController {
@PreAuthorize("@per.hasPermission('sys:sysuser:edit')")
public R updateUserInfo(@Valid @RequestBody SysUserDTO sysUserDto) {
return sysUserService.updateSysUser(sysUserDto) ?
R.ok() : R.failed(BaseResultMsg.UPDATE_DATABASE_ERROR, "修改系统用户失败");
R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改系统用户失败");
}
@@ -114,7 +114,7 @@ public class SysUserController {
@PreAuthorize("@per.hasPermission('sys:sysuser:del')")
public R deleteByUserId(@PathVariable Integer userId) {
return sysUserService.deleteByUserId(userId) ?
R.ok() : R.failed(BaseResultMsg.UPDATE_DATABASE_ERROR, "删除系统用户失败");
R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "删除系统用户失败");
}
@@ -157,7 +157,7 @@ public class SysUserController {
@PreAuthorize("@per.hasPermission('sys:sysuser:grant')")
public R updateUserScope(@PathVariable Integer userId, @RequestBody SysUserScope sysUserScope) {
return sysUserService.updateUserScope(userId, sysUserScope) ?
R.ok() : R.failed(BaseResultMsg.UPDATE_DATABASE_ERROR, "系统用户授权失败");
R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "系统用户授权失败");
}
@@ -175,11 +175,11 @@ public class SysUserController {
@PreAuthorize("@per.hasPermission('sys:sysuser:pass')")
public R updateUserPass(@PathVariable Integer userId, String pass, String confirm) {
if (StrUtil.isBlank(pass) || StrUtil.isBlank(confirm) || !pass.equals(confirm)) {
return R.failed(SystemResultMsg.BAD_REQUEST, "错误的密码!");
return R.failed(SystemResultCode.BAD_REQUEST, "错误的密码!");
}
return sysUserService.updateUserPass(userId, pass) ?
R.ok() : R.failed(BaseResultMsg.UPDATE_DATABASE_ERROR, "修改用户密码失败！");
R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改用户密码失败！");
}
@@ -200,7 +200,7 @@ public class SysUserController {
throw new ValidationException("不支持的用户状态！");
}
return sysUserService.updateUserStatus(userIds, status) ?
R.ok() : R.failed(BaseResultMsg.UPDATE_DATABASE_ERROR, "批量修改用户状态！");
R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "批量修改用户状态！");
}
@@ -214,7 +214,7 @@ public class SysUserController {
objectName = sysUserService.updateAvatar(file, userId);
} catch (IOException e) {
log.error("修改系统用户头像异常", e);
return R.failed(BaseResultMsg.FILE_UPLOAD_ERROR);
return R.failed(BaseResultCode.FILE_UPLOAD_ERROR);
}
return R.ok(objectName);
}

10
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/manager/SysDictManager.java
View File

@@ -10,7 +10,7 @@ import com.hccake.ballcat.admin.modules.sys.model.qo.SysDictQO;
import com.hccake.ballcat.admin.modules.sys.service.SysDictItemService;
import com.hccake.ballcat.admin.modules.sys.service.SysDictService;
import com.hccake.ballcat.common.core.exception.BallCatException;
import com.hccake.ballcat.common.core.result.BaseResultMsg;
import com.hccake.ballcat.common.core.result.BaseResultCode;
import com.hccake.ballcat.common.core.vo.SelectData;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -67,7 +67,7 @@ public class SysDictManager {
SysDict oldData = sysDictService.getById(sysDict.getId());
if (DictTypeEnum.SYSTEM.getType().equals(oldData.getType())) {
throw new BallCatException(
BaseResultMsg.LOGIC_CHECK_ERROR.getCode(), "系统内置字典项目不能修改"
BaseResultCode.LOGIC_CHECK_ERROR.getCode(), "系统内置字典项目不能修改"
);
}
return sysDictService.updateById(sysDict);
@@ -84,7 +84,7 @@ public class SysDictManager {
SysDict dict = sysDictService.getById(id);
if (DictTypeEnum.SYSTEM.getType().equals(dict.getType())) {
throw new BallCatException(
BaseResultMsg.LOGIC_CHECK_ERROR.getCode(), "系统内置字典项目不能删除"
BaseResultCode.LOGIC_CHECK_ERROR.getCode(), "系统内置字典项目不能删除"
);
}
// 需级联删除对应的字典项
@@ -128,7 +128,7 @@ public class SysDictManager {
// 校验是否系统内置
if (DictTypeEnum.SYSTEM.getType().equals(dict.getType())) {
throw new BallCatException(
BaseResultMsg.LOGIC_CHECK_ERROR.getCode(), "系统内置字典项目不能修改"
BaseResultCode.LOGIC_CHECK_ERROR.getCode(), "系统内置字典项目不能修改"
);
}
return sysDictItemService.updateById(sysDictItem);
@@ -147,7 +147,7 @@ public class SysDictManager {
// 校验是否系统内置
if (DictTypeEnum.SYSTEM.getType().equals(dict.getType())) {
throw new BallCatException(
BaseResultMsg.LOGIC_CHECK_ERROR.getCode(), "系统内置字典项目不能删除"
BaseResultCode.LOGIC_CHECK_ERROR.getCode(), "系统内置字典项目不能删除"
);
}
return sysDictItemService.removeById(id);

4
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysPermissionServiceImpl.java
View File

@@ -10,7 +10,7 @@ import com.hccake.ballcat.admin.modules.sys.model.entity.SysRolePermission;
import com.hccake.ballcat.admin.modules.sys.model.vo.PermissionVO;
import com.hccake.ballcat.admin.modules.sys.service.SysPermissionService;
import com.hccake.ballcat.common.core.exception.BallCatException;
import com.hccake.ballcat.common.core.result.BaseResultMsg;
import com.hccake.ballcat.common.core.result.BaseResultCode;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -42,7 +42,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
List<SysPermission> permissionList = this.list(Wrappers.<SysPermission>query()
.lambda().eq(SysPermission::getParentId, id));
if (CollUtil.isNotEmpty(permissionList)) {
throw new BallCatException(BaseResultMsg.LOGIC_CHECK_ERROR.getCode(), "菜单含有下级不能删除");
throw new BallCatException(BaseResultCode.LOGIC_CHECK_ERROR.getCode(), "菜单含有下级不能删除");
}
sysRolePermissionMapper

4
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/CustomAuthenticationEntryPoint.java
View File

@@ -2,7 +2,7 @@ package com.hccake.ballcat.admin.oauth;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.hccake.ballcat.common.core.result.R;
import com.hccake.ballcat.common.core.result.SystemResultMsg;
import com.hccake.ballcat.common.core.result.SystemResultCode;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
@@ -29,7 +29,7 @@ public class CustomAuthenticationEntryPoint implements AuthenticationEntryPoint
httpServletResponse.setHeader("Content-Type", MediaType.APPLICATION_JSON.toString());
httpServletResponse.setStatus(HttpStatus.UNAUTHORIZED.value());
httpServletResponse.getWriter().write(
objectMapper.writeValueAsString(R.failed(SystemResultMsg.UNAUTHORIZED, e.getMessage()))
objectMapper.writeValueAsString(R.failed(SystemResultCode.UNAUTHORIZED, e.getMessage()))
);
}
}

4
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/exception/CustomOAuth2ExceptionSerializer.java
View File

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
import com.hccake.ballcat.common.core.result.R;
import com.hccake.ballcat.common.core.result.SystemResultMsg;
import com.hccake.ballcat.common.core.result.SystemResultCode;
import java.io.IOException;
@@ -21,6 +21,6 @@ public class CustomOAuth2ExceptionSerializer extends StdSerializer<CustomOAuth2E
@Override
public void serialize(CustomOAuth2Exception e, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
jsonGenerator.writeObject(R.failed(SystemResultMsg.UNAUTHORIZED, e.getMessage()));
jsonGenerator.writeObject(R.failed(SystemResultCode.UNAUTHORIZED, e.getMessage()));
}
}

4
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/filter/LoginPasswordDecoderFilter.java
View File

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.hccake.ballcat.admin.constants.UrlMappingConst;
import com.hccake.ballcat.common.core.filter.ModifyParamMapRequestWrapper;
import com.hccake.ballcat.common.core.result.R;
import com.hccake.ballcat.common.core.result.SystemResultMsg;
import com.hccake.ballcat.common.core.result.SystemResultCode;
import com.hccake.ballcat.common.core.util.PasswordUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -84,7 +84,7 @@ public class LoginPasswordDecoderFilter extends OncePerRequestFilter {
response.setHeader("Content-Type", MediaType.APPLICATION_JSON.toString());
response.setStatus(HttpStatus.UNAUTHORIZED.value());
response.getWriter().write(
objectMapper.writeValueAsString(R.failed(SystemResultMsg.UNAUTHORIZED, e.getMessage()))
objectMapper.writeValueAsString(R.failed(SystemResultCode.UNAUTHORIZED, e.getMessage()))
);
return;
}