tolag3/kcc_adr_advc_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

이준호 전자조정시스템 고도화 커밋

Browse Source 
- 결재, 알림톡
 	 실서버/개발서버 구분값 추가
This commit is contained in:
leejunho 2022-12-22 17:00:30 +09:00
parent f3f82b1550
commit eb3e046886
6 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/kcc/kccadr/accdnt/apm/web/AdjstPayMentController.java
View File

@ -75,6 +75,9 @@ public class AdjstPayMentController {
@Value("#{globalSettings['Globals.pay.siteDomain']}")
private String global_siteDomain;
@Value("#{globalSettings['Globals.prod.islocal']}")
private String prodIsLocal;
@Resource(name="PayService")
private PayService payService;
@ -240,6 +243,9 @@ public class AdjstPayMentController {
model.addAttribute("list", adjstPayMentVOList);
model.addAttribute("ssoLoginVO", ssoLoginVO);
model.addAttribute("IsLocal", prodIsLocal);
return "/web/kccadr/accdnt/apm/adjstPayMentDetail";
}

2
src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java
View File

@ -673,6 +673,8 @@ public class AdjstReqStatusController {
model.addAttribute("merchantData", merchantData);
// ======================결제 끝===================
model.addAttribute("IsLocal", prodIsLocal);
return "/web/kccadr/accdnt/ars/tab/docIssReqList";
}

6
src/main/java/kcc/kccadr/kccadrCom/web/PayUtill.java
View File

@ -166,12 +166,6 @@ public class PayUtill {
return resultMap;
}
public void paySetting(HttpServletRequest request, ModelMap model) throws Exception {
}
// ----------------map to VO 세팅------------------

8
src/main/java/kcc/kccadr/message/SchedulerUtil.java
View File

@ -67,8 +67,6 @@ public class SchedulerUtil {
// @SchedulerLock(name = "kakaoAtSendPrcs", lockAtMostForString = ONE_MIN, lockAtLeastForString = ONE_MIN)
public void kakaoAtSendPrcs() throws Exception {
System.out.println("===========at scheduler run============");
log.error("===========at scheduler run============");
String hostAddr = null;
@ -93,11 +91,10 @@ public class SchedulerUtil {
try {
System.out.println("server ip ============" + hostAddr);
log.error("server ip ============" + hostAddr);
// if(hostAddr.equals(myLocalIp) || hostAddr.equals(devOutIp) || hostAddr.equals(devInIp) || hostAddr.equals(dmzIp1) || hostAddr.equals(dmzIp2) || hostAddr.equals(containerIp) ) {
if(hostAddr.equals(containerIp) ) {
// if(hostAddr.equals(containerIp) ) {
if(hostAddr.equals(dmzIp1) || hostAddr.equals(containerIp) ) {
//접속 서버 별 분기처리 필요
List<KakaoAtSendVO> list = kakaoAtSendService.selectKakaoAtList();
@ -124,7 +121,6 @@ public class SchedulerUtil {
}
System.out.println("===========at scheduler finish============");
log.error("===========at scheduler finish============");
}
@Bean

10
src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/apm/adjstPayMentDetail.jsp
View File

@ -13,9 +13,13 @@
<!-- inipay 결제 js -->
<!--테스트 JS-->
<script language="javascript" type="text/javascript" src="https://stgstdpay.inicis.com/stdjs/INIStdPay.js" charset="UTF-8"></script>
<!--운영 JS>
<script language="javascript" type="text/javascript" src="https://stdpay.inicis.com/stdjs/INIStdPay.js" charset="UTF-8"></script> -->
<c:if test="${IsLocal eq 'local'}">
<script language="javascript" type="text/javascript" src="https://stgstdpay.inicis.com/stdjs/INIStdPay.js" charset="UTF-8"></script>
</c:if>
<!--운영 JS> -->
<c:if test="${IsLocal eq 'real'}">
<script language="javascript" type="text/javascript" src="https://stdpay.inicis.com/stdjs/INIStdPay.js" charset="UTF-8"></script>
</c:if>
<script type="text/javaScript" language="javascript">
/* function print(){

10
src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqList.jsp
View File

@ -30,9 +30,13 @@
<script src="/kccadrPb/usr/datepicker/ko_KR.js"></script>
<!-- inipay 결제 js -->
<!--테스트 JS-->
<script language="javascript" type="text/javascript" src="https://stgstdpay.inicis.com/stdjs/INIStdPay.js" charset="UTF-8"></script>
<!--운영 JS>
<script language="javascript" type="text/javascript" src="https://stdpay.inicis.com/stdjs/INIStdPay.js" charset="UTF-8"></script> -->
<c:if test="${IsLocal eq 'local'}">
<script language="javascript" type="text/javascript" src="https://stgstdpay.inicis.com/stdjs/INIStdPay.js" charset="UTF-8"></script>
</c:if>
<!--운영 JS> -->
<c:if test="${IsLocal eq 'real'}">
<script language="javascript" type="text/javascript" src="https://stdpay.inicis.com/stdjs/INIStdPay.js" charset="UTF-8"></script>
</c:if>
<script type="text/javascript">
function paybtn(pk, recordReadingFlag) {