Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d79bcf8430 | |||
| e049420ca3 | |||
| 10bbd57c78 | |||
| 70c636d719 |
+1
-1
Submodule elink-online-common updated: 9e1f7391a0...44093681b7
+1
-1
Submodule elink-online-core updated: f5a653ca6a...495241c5d0
+1
-1
Submodule elink-online-core-jpa updated: 9620845daf...138621f2d0
+1
-1
Submodule elink-online-transformer updated: f9e6522b8f...229156d51d
@@ -50,7 +50,8 @@ public class DJBApiAdapterController implements HttpAdapterServiceKey {
|
|||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
DJBApiAdapterService service;
|
DJBApiAdapterService service;
|
||||||
|
|
||||||
|
EAIServerManager eaiServerManager;
|
||||||
/**
|
/**
|
||||||
* DJErp OAuth 조기 적용을 위한 Controller
|
* DJErp OAuth 조기 적용을 위한 Controller
|
||||||
*
|
*
|
||||||
@@ -89,7 +90,13 @@ public class DJBApiAdapterController implements HttpAdapterServiceKey {
|
|||||||
|
|
||||||
ResponseEntity<String> responseEntity = null;
|
ResponseEntity<String> responseEntity = null;
|
||||||
Properties transactionProp = new Properties();
|
Properties transactionProp = new Properties();
|
||||||
String uuid = UUIDGenerator.getUUID().toString().replaceAll("-", "");
|
|
||||||
|
if(eaiServerManager == null)
|
||||||
|
eaiServerManager = EAIServerManager.getInstance();
|
||||||
|
|
||||||
|
String instid = eaiServerManager.getGroupInstId();
|
||||||
|
String uuid = instid+UUIDGenerator.getUUID().toString().replaceAll("-", "");
|
||||||
|
|
||||||
transactionProp.setProperty(TransactionContextKeys.TRANSACTION_UUID, uuid);
|
transactionProp.setProperty(TransactionContextKeys.TRANSACTION_UUID, uuid);
|
||||||
transactionProp.put(INBOUND_REQUESTED_TIME, receivedTimeStr);
|
transactionProp.put(INBOUND_REQUESTED_TIME, receivedTimeStr);
|
||||||
|
|
||||||
@@ -154,14 +161,14 @@ public class DJBApiAdapterController implements HttpAdapterServiceKey {
|
|||||||
responseEntity = ResponseEntity.status(e1.getStatus()).contentType(mediaType).body(responseErrorMsg);
|
responseEntity = ResponseEntity.status(e1.getStatus()).contentType(mediaType).body(responseErrorMsg);
|
||||||
} else if (e instanceof JwtAuthException) {
|
} else if (e instanceof JwtAuthException) {
|
||||||
responseErrorMsg = genErrorResponseMessage(adapterGroupName, adapterName,
|
responseErrorMsg = genErrorResponseMessage(adapterGroupName, adapterName,
|
||||||
transactionProp, MessageUtil.ERROR_CODE_AP_ERROR, e, adptMsgType, encode, errorResponseFormat);
|
transactionProp, MessageUtil.ERROR_CODE_AUTH_FAIL, e, adptMsgType, encode, errorResponseFormat);
|
||||||
JwtAuthException e1 = (JwtAuthException) e;
|
JwtAuthException e1 = (JwtAuthException) e;
|
||||||
this.logError(servletRequest, adapterGroupName, e1.getCode(), responseErrorMsg, transactionProp, e);
|
this.logError(servletRequest, adapterGroupName, e1.getCode(), responseErrorMsg, transactionProp, e);
|
||||||
logger.error("ApiAdapterController] " + adapterGroupName + "-" + adapterName + ">>" + e.getMessage(), e);
|
logger.error("ApiAdapterController] " + adapterGroupName + "-" + adapterName + ">>" + e.getMessage(), e);
|
||||||
responseEntity = ResponseEntity.status(HttpStatus.UNAUTHORIZED).contentType(mediaType).body(responseErrorMsg);
|
responseEntity = ResponseEntity.status(HttpStatus.UNAUTHORIZED).contentType(mediaType).body(responseErrorMsg);
|
||||||
} else if (e instanceof HttpStatusException) {
|
} else if (e instanceof HttpStatusException) {
|
||||||
responseErrorMsg = genErrorResponseMessage(adapterGroupName, adapterName,
|
responseErrorMsg = genErrorResponseMessage(adapterGroupName, adapterName,
|
||||||
transactionProp, MessageUtil.ERROR_CODE_AUTH_FAIL, e, adptMsgType, encode, errorResponseFormat);
|
transactionProp, MessageUtil.ERROR_CODE_AP_ERROR, e, adptMsgType, encode, errorResponseFormat);
|
||||||
logger.error("ApiAdapterController] " + adapterGroupName + "-" + adapterName + ">>" + e.getMessage());
|
logger.error("ApiAdapterController] " + adapterGroupName + "-" + adapterName + ">>" + e.getMessage());
|
||||||
HttpStatusException e1 = (HttpStatusException) e;
|
HttpStatusException e1 = (HttpStatusException) e;
|
||||||
responseEntity = ResponseEntity.status(e1.getStatus()).contentType(mediaType).body(responseErrorMsg);
|
responseEntity = ResponseEntity.status(e1.getStatus()).contentType(mediaType).body(responseErrorMsg);
|
||||||
|
|||||||
Reference in New Issue
Block a user