diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxAuth2ExceptionSerializer.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxAuth2ExceptionSerializer.java index 71f0f7db5..3bd2cb7d2 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxAuth2ExceptionSerializer.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxAuth2ExceptionSerializer.java @@ -20,6 +20,7 @@ package com.pig4cloud.pigx.common.security.component; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import com.pig4cloud.pigx.common.core.constant.CommonConstant; import com.pig4cloud.pigx.common.security.exception.PigxAuth2Exception; import java.io.IOException; @@ -38,8 +39,8 @@ public class PigxAuth2ExceptionSerializer extends StdSerializer(e))))); + .wrap(objectMapper.writeValueAsBytes( + R.builder().msg(e.getMessage()) + .code(CommonConstant.FAIL).build())))); } catch (JsonProcessingException e1) { log.error("对象输出异常", e1); } @@ -101,7 +103,7 @@ public class ValidateCodeGatewayFilter extends AbstractGatewayFilterFactory { String code = request.getQueryParams().getFirst("code"); if (StrUtil.isBlank(code)) { - throw new ValidateCodeException(); + throw new ValidateCodeException("验证码不能为空"); } String randomStr = request.getQueryParams().getFirst("randomStr"); @@ -111,24 +113,24 @@ public class ValidateCodeGatewayFilter extends AbstractGatewayFilterFactory { String key = CommonConstant.DEFAULT_CODE_KEY + randomStr; if (!redisTemplate.hasKey(key)) { - throw new ValidateCodeException(); + throw new ValidateCodeException("验证码不合法"); } Object codeObj = redisTemplate.opsForValue().get(key); if (codeObj == null) { - throw new ValidateCodeException(); + throw new ValidateCodeException("验证码不合法"); } String saveCode = codeObj.toString(); if (StrUtil.isBlank(saveCode)) { redisTemplate.delete(key); - throw new ValidateCodeException(); + throw new ValidateCodeException("验证码不合法"); } if (!StrUtil.equals(saveCode, code)) { redisTemplate.delete(key); - throw new ValidateCodeException(); + throw new ValidateCodeException("验证码不合法"); } redisTemplate.delete(key); diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/handler/HystrixFallbackHandler.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/handler/HystrixFallbackHandler.java index 649cc8809..e5ad57d4e 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/handler/HystrixFallbackHandler.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/handler/HystrixFallbackHandler.java @@ -17,6 +17,8 @@ package com.pig4cloud.pigx.gateway.handler; +import com.pig4cloud.pigx.common.core.constant.CommonConstant; +import com.pig4cloud.pigx.common.core.util.R; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -46,6 +48,10 @@ public class HystrixFallbackHandler implements HandlerFunction { originalUris.ifPresent(originalUri -> log.error("网关执行请求:{}失败,hystrix服务降级处理", originalUri)); return ServerResponse.status(HttpStatus.INTERNAL_SERVER_ERROR.value()) - .contentType(MediaType.TEXT_PLAIN).body(BodyInserters.fromObject("服务异常")); + .contentType(MediaType.APPLICATION_JSON_UTF8) + .body(BodyInserters.fromObject(R.builder() + .msg("服务异常") + .code(CommonConstant.FAIL) + .build())); } } diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/listener/LeaveProcessTaskListener.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/listener/LeaveProcessTaskListener.java index a350e0272..0e2addf43 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/listener/LeaveProcessTaskListener.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/listener/LeaveProcessTaskListener.java @@ -50,11 +50,11 @@ public class LeaveProcessTaskListener implements TaskListener { R> result = userService.ancestorUsers(SecurityUtils.getUsername()); if (CollUtil.isEmpty(result.getData())) { - log.warn("用户 {} 不存在上级,任务单由当前用户审批", SecurityUtils.getUsername()); + log.info("用户 {} 不存在上级,任务单由当前用户审批", SecurityUtils.getUsername()); delegateTask.addCandidateUser(SecurityUtils.getUsername()); } else { List userList = result.getData().stream().map(SysUser::getUsername).collect(Collectors.toList()); - log.warn("当前任务 {},由 {}处理", delegateTask.getId(), userList); + log.info("当前任务 {},由 {}处理", delegateTask.getId(), userList); delegateTask.addCandidateUsers(userList); }