|
|
@@ -6,14 +6,12 @@ import com.ym.mec.common.entity.HttpResponseResult;
|
|
|
import com.ym.mec.common.exception.BizException;
|
|
|
import com.ym.mec.thirdparty.exception.ThirdpartyException;
|
|
|
import com.ym.mec.util.http.HttpUtil;
|
|
|
-
|
|
|
import org.apache.commons.codec.binary.Base64;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.commons.lang3.exception.ExceptionUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.context.support.DefaultMessageSourceResolvable;
|
|
|
-import org.springframework.dao.DataIntegrityViolationException;
|
|
|
import org.springframework.http.HttpStatus;
|
|
|
import org.springframework.security.access.AccessDeniedException;
|
|
|
import org.springframework.validation.BindException;
|
|
|
@@ -25,7 +23,6 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
|
|
|
import javax.crypto.Mac;
|
|
|
import javax.crypto.spec.SecretKeySpec;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
-
|
|
|
import java.net.URLEncoder;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.Map;
|
|
|
@@ -111,8 +108,6 @@ public class BaseController {
|
|
|
.map(FieldError::getDefaultMessage)
|
|
|
.collect(Collectors.joining());
|
|
|
return failed(errorMsg);
|
|
|
- } else if(e instanceof DataIntegrityViolationException){
|
|
|
- return failed("数据库异常：" + e.getMessage());
|
|
|
}
|
|
|
try {
|
|
|
Map<String,Object> paramMap = new HashMap<>(2);
|
|
|
@@ -126,8 +121,8 @@ public class BaseController {
|
|
|
}catch (Exception exception){
|
|
|
logger.error("System Error", exception);
|
|
|
}
|
|
|
- if (StringUtils.isNotBlank(ex.getMessage())) {
|
|
|
- return failed(ex.getMessage());
|
|
|
+ if (StringUtils.isNotBlank(e.getMessage())) {
|
|
|
+ return failed(e.getMessage());
|
|
|
}
|
|
|
return failed("系统繁忙");
|
|
|
}
|
yonge