fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 src/main/java/com/xcong/excoin/configurations/security/CustomAccessDeniedHandler.java

@@ -19,7 +19,8 @@
public class CustomAccessDeniedHandler implements AccessDeniedHandler {
    @Override
    public void handle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, AccessDeniedException e) throws IOException, ServletException {
        Result result = Result.loginFail("fail");
        Result result = Result.loginFail("Forbidden");
        httpServletResponse.getWriter().write(new ObjectMapper().writeValueAsString(result));
        httpServletResponse.setStatus(HttpServletResponse.SC_FORBIDDEN);
    }
}