Skip to content

C
cloud-platform
Commit 02140c34 authored by 周健威's avatar 周健威
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 4daefdd5 b601eef8
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
ace-common/src/main/java/com/github/wxiaoqi/security/common/handler/PlatformExceptionHandler.java
View file @ 02140c34
...@@ -62,7 +62,7 @@ public class PlatformExceptionHandler { ...@@ -62,7 +62,7 @@ public class PlatformExceptionHandler {
} catch (Exception ex) { } catch (Exception ex) {
log.error(ex.getMessage()); log.error(ex.getMessage());
} }
return assembleResult(ObjectRestResponse.createFailedResult(5000, "服务器开小差了，请稍后重试！"), "Server exception: " + e.getMessage()); return assembleResult(ObjectRestResponse.createFailedResult(5000, "服务器开小差了，请稍后重试！"), "Server exception: " + e);
} }
log.error("Server exception: ", e); log.error("Server exception: ", e);
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
...@@ -74,7 +74,7 @@ public class PlatformExceptionHandler { ...@@ -74,7 +74,7 @@ public class PlatformExceptionHandler {
} catch (Exception ex) { } catch (Exception ex) {
log.error(ex.getMessage()); log.error(ex.getMessage());
} }
return assembleResult(ObjectRestResponse.createFailedResult(5000, "服务器开小差了，请稍后重试！"), "Server exception: " + e.getMessage()); return assembleResult(ObjectRestResponse.createFailedResult(5000, "服务器开小差了，请稍后重试！"), "Server exception: " + e);
} }
protected ObjectRestResponse<?> assembleResult(ObjectRestResponse<?> error, String msg) { protected ObjectRestResponse<?> assembleResult(ObjectRestResponse<?> error, String msg) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment