Browse Source

Merge branch 'develop' of gitadmin/tuoheng_oidc into release

tags/v2.4.1
xuziqing 1 year ago
parent
commit
e83af8c90f
2 changed files with 6 additions and 4 deletions
  1. +3
    -4
      tuoheng_oidc_admin/src/main/java/com/tuoheng/common/ExceptionCatch.java
  2. +3
    -0
      tuoheng_oidc_admin/src/main/java/com/tuoheng/service/impl/TenantServiceImpl.java

+ 3
- 4
tuoheng_oidc_admin/src/main/java/com/tuoheng/common/ExceptionCatch.java View File

*/ */
@ExceptionHandler(Exception.class) @ExceptionHandler(Exception.class)
@ResponseBody @ResponseBody
public JsonResult exception(Exception e){
e.printStackTrace();
log.error("catch exception:{}",e.getMessage());
public JsonResult<Object> exception(Exception e){
log.error("系统异常,异常信息:{}", e.getMessage());
return JsonResult.error(e.getMessage()); return JsonResult.error(e.getMessage());
} }


*/ */
@ExceptionHandler(ServiceException.class) @ExceptionHandler(ServiceException.class)
@ResponseBody @ResponseBody
public JsonResult exception(ServiceException e){
public JsonResult<Object> exception(ServiceException e){
log.error("catch exception:{}",e.getMessage()); log.error("catch exception:{}",e.getMessage());
return JsonResult.error(e.getMessage()); return JsonResult.error(e.getMessage());
} }

+ 3
- 0
tuoheng_oidc_admin/src/main/java/com/tuoheng/service/impl/TenantServiceImpl.java View File

} }
//现有list //现有list
List<ClientRoleDto> list = dto.getClientRoleDtoList(); List<ClientRoleDto> list = dto.getClientRoleDtoList();
if (CollectionUtil.isEmpty(list)) {
return JsonResult.success("租户关联的业务平台系统不能为空");
}
log.info("现有集合:{}", list.toString()); log.info("现有集合:{}", list.toString());
//现有集合 //现有集合
List<ClientRoleDto> clientRoleDtos = getClientRoleDtos(list); List<ClientRoleDto> clientRoleDtos = getClientRoleDtos(list);

Loading…
Cancel
Save