Merge branch 'master' of http://hylee@vcs.iten.co.kr:9999/hylee/mjon_git
This commit is contained in:
commit
e959c0e6ee
@ -825,7 +825,7 @@ public class EgovMainController {
|
||||
try {
|
||||
//0번째 부터 6개의 항목만 조회
|
||||
MjonMsgVO mjonMsgVO = new MjonMsgVO();
|
||||
adminMemLoginThisMonth = mjonMsgService.selectMemLoginThisMonth(mjonMsgVO);
|
||||
//adminMemLoginThisMonth = mjonMsgService.selectMemLoginThisMonth(mjonMsgVO);
|
||||
}
|
||||
catch(Exception e) {
|
||||
isSuccess = false;
|
||||
|
||||
@ -3010,13 +3010,13 @@ public class EgovMypageController {
|
||||
|
||||
//kmc 본인인증 실/개발 서버 구분
|
||||
String serverNm = "";
|
||||
// if(request.getServerName().contains("192.168.0.60") || request.getServerName().contains("localhost")) {
|
||||
// serverNm = request.getScheme() + "://192.168.0.60:8085";
|
||||
// }else{
|
||||
// serverNm = request.getScheme() + "://www.munjaon.co.kr";
|
||||
// }
|
||||
serverNm = request.getScheme() + "://munjaon.co.kr";
|
||||
if(request.getServerName().contains("192.168.0.60") || request.getServerName().contains("localhost")) {
|
||||
serverNm = request.getScheme() + "://192.168.0.60:8085";
|
||||
}else{
|
||||
serverNm = request.getScheme() + "://www.munjaon.co.kr";
|
||||
}
|
||||
|
||||
System.out.println("@@@ serverNm : " + serverNm);
|
||||
AuthCertVO certVO = kmcCertCheck.authCertCheckNine(serverNm + "/web/user/selectSecurityAuthn.do", loginVO.getId());
|
||||
model.addAttribute("certVO", certVO);
|
||||
}
|
||||
|
||||
@ -617,6 +617,8 @@ public class KmcCertChecker {
|
||||
String cpId = "MJOM1001"; // 회원사ID
|
||||
String urlCode = "001014"; // URL코드
|
||||
//kmc 본인인증 실/개발 서버 구분
|
||||
|
||||
System.out.println("@@@@@ trUrl : " + trUrl);
|
||||
if(trUrl.contains("192.168.0.60") || trUrl.contains("localhost")) {
|
||||
urlCode = "010001";
|
||||
}
|
||||
|
||||
@ -127,21 +127,21 @@
|
||||
|
||||
<!-- 14 -->
|
||||
<!-- mj_msg_data 백업 -->
|
||||
<bean id="MjMsgDataBackupBean" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
|
||||
<!-- <bean id="MjMsgDataBackupBean" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
|
||||
<property name="targetObject" ref="tableBackupMsgScheduling" />
|
||||
<property name="targetMethod" value="mjMsgDataBackup" />
|
||||
<property name="concurrent" value="false" />
|
||||
</bean>
|
||||
</bean> -->
|
||||
|
||||
<bean id="MjMsgDataBackupBeanTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
|
||||
<property name="jobDetail" ref="MjMsgDataBackupBean" />
|
||||
<!-- <bean id="MjMsgDataBackupBeanTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean"> -->
|
||||
<!-- <property name="jobDetail" ref="MjMsgDataBackupBean" /> -->
|
||||
<!-- 매년 3,11월 22일 4시38분 마다 작년도 테이블 백업 -->
|
||||
<property name="cronExpression" value="0 38 4 22 11 ?" />
|
||||
<!-- <property name="cronExpression" value="0 38 4 22 11 ?" /> -->
|
||||
<!-- <property name="cronExpression" value="0 38 4 28 3 ?" /> -->
|
||||
<!-- 매일 4시18분 마다 작년도 테이블 백업 -->
|
||||
<!-- <property name="cronExpression" value="0 03 12 * * ?" /> -->
|
||||
<!-- <property name="cronExpression" value="8 * * * * ?" /> -->
|
||||
</bean>
|
||||
<!-- </bean> -->
|
||||
|
||||
|
||||
|
||||
@ -157,7 +157,7 @@
|
||||
<!-- <ref bean="SttstMsgRankDayBeanTrigger" /> --><!-- 문자전송순위통계집계(매일한번) -->
|
||||
|
||||
<!-- mj_msg_data 백업 -->
|
||||
<ref bean="MjMsgDataBackupBeanTrigger" />
|
||||
<!-- <ref bean="MjMsgDataBackupBeanTrigger" /> -->
|
||||
|
||||
</list>
|
||||
</property>
|
||||
|
||||
@ -5972,6 +5972,7 @@
|
||||
|
||||
<!-- 당월 회원전환률 -->
|
||||
<select id="mjonMsgDAO.selectMemLoginThisMonth" parameterClass="mjonMsgVO" resultClass="mjonMsgVO">
|
||||
/* mjonMsgDAO.selectMemLoginThisMonth */
|
||||
SELECT
|
||||
M2.createDt
|
||||
,M2.visitCnt
|
||||
|
||||
Loading…
Reference in New Issue
Block a user