Merge branch 'feature/error-response-format' into jenkins_with_weblogic

2025-12-11 13:41:37 +09:00
parent e8fd8d8278 7b3807300b
commit 0553ec7a59
29 changed files with 1583 additions and 50 deletions
@@ -48,6 +48,10 @@
    <servlet>
 		<servlet-name>authserver</servlet-name>
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+		<init-param>
+			<param-name>throwExceptionIfNoHandlerFound</param-name>
+			<param-value>true</param-value>
+		</init-param>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet-mapping>
@@ -1,5 +1,26 @@
+<%@page import="com.eactive.eai.common.util.MessageUtil"%>
 <%@ page import="java.io.*, java.util.*"%>
 <%@ page language="java" contentType="text/html;charset=utf-8" isErrorPage="true"%>
+<%
+Integer statusCode = (Integer) request.getAttribute("_authServerStatusCode");
+if (statusCode != null) {
+    response.setStatus(statusCode);
+}
+
+String code;
+if (statusCode != null && statusCode == 401) {
+    code = MessageUtil.ERROR_CODE_AUTH_FAIL;
+} else if (statusCode != null && statusCode == 404) {
+    code = MessageUtil.ERROR_CODE_SERVICE_NOT_FOUND;
+} else {
+    code = MessageUtil.ERROR_CODE_AP_ERROR;
+}
+
+String message = (String)request.getAttribute("errorMessage");
+String jsonErrorMessage = MessageUtil.makeJsonErrorMessage(code, message);
+out.println(jsonErrorMessage);
+%>
+<%--
 <html>
  <head>
    <title>Error</title>
@@ -16,3 +37,4 @@
  </body>
 </html>
 <% response.setStatus(200); %>
+ --%>