djb-eapim/eapim-admin
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Merge branch 'timeout_수정' into jenkins_with_weblogic

Browse Source
This commit is contained in:
cho
2026-01-27 14:54:27 +09:00
parent f2811ee792 d877dc1075
commit 454e42b3b3
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebContent/jsp/onl/admin/service/eaiMsgManDetail.jsp
+5 -5
View File
@@ -127,9 +127,9 @@ function gridRendering(){
var rowData = $(this).getRowData(rowId); var rowData = $(this).getRowData(rowId);
var url2 = url_view; var url2 = url_view;
url2 += '?cmd=SVC'; url2 += '?cmd=SVC';
url2 += '&page='+'${param.page}'; url2 += '&page='+$(this).getGridParam("page");
url2 += '&returnUrl='+'${param.returnUrl}'; url2 += '&returnUrl='+getReturnUrl();
url2 += '&menuId='+'${param.menuId}'; url2 += '&menuId='+'${param.menuId}';
//검색값 //검색값
url2 += '&'+getSearchUrlForReturn(); url2 += '&'+getSearchUrlForReturn();
//key값 //key값
@@ -310,8 +310,8 @@ $(document).ready(function() {
var url2 = url_view; var url2 = url_view;
url2 += '?cmd=SVC'; url2 += '?cmd=SVC';
url2 += '&page='+'${param.page}'; url2 += '&page='+$(this).getGridParam("page");
url2 += '&returnUrl='+'${param.returnUrl}'; url2 += '&returnUrl='+getReturnUrl();
url2 += '&menuId='+'${param.menuId}'; url2 += '&menuId='+'${param.menuId}';
//검색값 //검색값
url2 += '&'+getSearchUrlForReturn(); url2 += '&'+getSearchUrlForReturn();
WebContent/jsp/onl/transaction/apim/apiInterfaceManDetail.jsp
+8 -4
View File
@@ -1601,10 +1601,14 @@
<label for="toutVal"><span class="material-icons-outlined">timer</span> 타임아웃 값</label> <label for="toutVal"><span class="material-icons-outlined">timer</span> 타임아웃 값</label>
<input type="number" class="form-control" id="toutVal" name="toutVal" required></input> <input type="number" class="form-control" id="toutVal" name="toutVal" required></input>
</div> </div>
<div id="contentTypePart" class="form-group col-md-8"> <div class="form-group col-md-2" x-show="showInboundResponse">
<label for="contentType"><span class="material-icons-outlined">movie</span> Content-Type (기본값:application/json)</label> <label for="toutVal"><span class="material-icons-outlined">timer</span> 타임아웃 값2</label>
<input type="text" class="form-control" id="contentType" name="restContentType"></input> <input type="number" class="form-control" id="toutVal2" name="toutVal2" required :disabled="!showInboundResponse"></input>
</div> </div>
<div id="contentTypePart" class="form-group col-md-6">
<label for="contentType"><span class="material-icons-outlined">movie</span> Content-Type (기본값:application/json)</label>
<input type="text" class="form-control" id="contentType" name="restContentType"></input>
</div>
</div> </div>
</fieldset> </fieldset>
</div> </div>
src/main/java/com/eactive/eai/rms/onl/transaction/apim/ApiInterfaceService.java
+3
View File
@@ -213,6 +213,7 @@ public class ApiInterfaceService extends OnlBaseService {
if("asyncSync".equals(apiInterfaceUI.getSyncAsyncType()) && serviceMessageEntityList != null && serviceMessageEntityList.size() > 1){ if("asyncSync".equals(apiInterfaceUI.getSyncAsyncType()) && serviceMessageEntityList != null && serviceMessageEntityList.size() > 1){
ServiceMessageEntity extraServiceMessageEntity = serviceMessageEntityList.get(1); ServiceMessageEntity extraServiceMessageEntity = serviceMessageEntityList.get(1);
apiInterfaceUI.setFromResponseAdapter(extraServiceMessageEntity.getPsvsysadptrbzwkgroupname()); apiInterfaceUI.setFromResponseAdapter(extraServiceMessageEntity.getPsvsysadptrbzwkgroupname());
apiInterfaceUI.setToutVal2(extraServiceMessageEntity.getToutval());
String restOptionStr = extraServiceMessageEntity.getRestoption(); String restOptionStr = extraServiceMessageEntity.getRestoption();
if(StringUtils.isNotBlank(restOptionStr)) { if(StringUtils.isNotBlank(restOptionStr)) {
@@ -480,6 +481,7 @@ public class ApiInterfaceService extends OnlBaseService {
// 응답용 ServiceMessageEntity 설정 // 응답용 ServiceMessageEntity 설정
responseEntity.setPsvsysadptrbzwkgroupname(vo.getFromResponseAdapter()); responseEntity.setPsvsysadptrbzwkgroupname(vo.getFromResponseAdapter());
responseEntity.setPsvintfacdsticname("ASYN"); responseEntity.setPsvintfacdsticname("ASYN");
responseEntity.setToutval(vo.getToutVal2());
// 응답용 REST 정보 설정 // 응답용 REST 정보 설정
AdapterGroupUI responseAdapter = adapterService.selectDetail(vo.getFromResponseAdapter()); AdapterGroupUI responseAdapter = adapterService.selectDetail(vo.getFromResponseAdapter());
@@ -506,6 +508,7 @@ public class ApiInterfaceService extends OnlBaseService {
// ServiceMessageEntity 설정 // ServiceMessageEntity 설정
responseEntity.setPsvsysadptrbzwkgroupname(vo.getToResponseAdapter()); responseEntity.setPsvsysadptrbzwkgroupname(vo.getToResponseAdapter());
responseEntity.setPsvintfacdsticname("ASYN"); responseEntity.setPsvintfacdsticname("ASYN");
responseEntity.setToutval(vo.getToutVal());
// REST 정보 설정 // REST 정보 설정
AdapterGroupUI responseAdapter = adapterService.selectDetail(vo.getToResponseAdapter()); AdapterGroupUI responseAdapter = adapterService.selectDetail(vo.getToResponseAdapter());
src/main/java/com/eactive/eai/rms/onl/transaction/apim/ui/ApiInterfaceUI.java
+1
View File
@@ -57,6 +57,7 @@ public class ApiInterfaceUI {
private String inboundResponseHttpMethod; private String inboundResponseHttpMethod;
private String inboundResponseRestPath; private String inboundResponseRestPath;
private String fromResponseAdapter; private String fromResponseAdapter;
private Long toutVal2;
//SYNC-ASYNC 용 //SYNC-ASYNC 용
private String outboundResponseHttpMethod; private String outboundResponseHttpMethod;