Merge branch 'master' of http://hylee@vcs.iten.co.kr:9999/hylee/mjon_git
@e959c0e6ee02105de2e2f284e79482a0d554841c
--- src/main/java/itn/let/main/web/EgovMainController.java
+++ src/main/java/itn/let/main/web/EgovMainController.java
... | ... | @@ -825,7 +825,7 @@ |
| 825 | 825 |
try {
|
| 826 | 826 |
//0번째 부터 6개의 항목만 조회 |
| 827 | 827 |
MjonMsgVO mjonMsgVO = new MjonMsgVO(); |
| 828 |
- adminMemLoginThisMonth = mjonMsgService.selectMemLoginThisMonth(mjonMsgVO); |
|
| 828 |
+ //adminMemLoginThisMonth = mjonMsgService.selectMemLoginThisMonth(mjonMsgVO); |
|
| 829 | 829 |
} |
| 830 | 830 |
catch(Exception e) {
|
| 831 | 831 |
isSuccess = false; |
--- src/main/java/itn/let/uat/uia/web/EgovMypageController.java
+++ src/main/java/itn/let/uat/uia/web/EgovMypageController.java
... | ... | @@ -3010,13 +3010,13 @@ |
| 3010 | 3010 |
|
| 3011 | 3011 |
//kmc 본인인증 실/개발 서버 구분 |
| 3012 | 3012 |
String serverNm = ""; |
| 3013 |
-// if(request.getServerName().contains("192.168.0.60") || request.getServerName().contains("localhost")) {
|
|
| 3014 |
-// serverNm = request.getScheme() + "://192.168.0.60:8085"; |
|
| 3015 |
-// }else{
|
|
| 3016 |
-// serverNm = request.getScheme() + "://www.munjaon.co.kr"; |
|
| 3017 |
-// } |
|
| 3018 |
- serverNm = request.getScheme() + "://munjaon.co.kr"; |
|
| 3013 |
+ if(request.getServerName().contains("192.168.0.60") || request.getServerName().contains("localhost")) {
|
|
| 3014 |
+ serverNm = request.getScheme() + "://192.168.0.60:8085"; |
|
| 3015 |
+ }else{
|
|
| 3016 |
+ serverNm = request.getScheme() + "://www.munjaon.co.kr"; |
|
| 3017 |
+ } |
|
| 3019 | 3018 |
|
| 3019 |
+ System.out.println("@@@ serverNm : " + serverNm);
|
|
| 3020 | 3020 |
AuthCertVO certVO = kmcCertCheck.authCertCheckNine(serverNm + "/web/user/selectSecurityAuthn.do", loginVO.getId()); |
| 3021 | 3021 |
model.addAttribute("certVO", certVO);
|
| 3022 | 3022 |
} |
--- src/main/java/itn/let/uat/uia/web/KmcCertChecker.java
+++ src/main/java/itn/let/uat/uia/web/KmcCertChecker.java
... | ... | @@ -617,6 +617,8 @@ |
| 617 | 617 |
String cpId = "MJOM1001"; // 회원사ID |
| 618 | 618 |
String urlCode = "001014"; // URL코드 |
| 619 | 619 |
//kmc 본인인증 실/개발 서버 구분 |
| 620 |
+ |
|
| 621 |
+ System.out.println("@@@@@ trUrl : " + trUrl);
|
|
| 620 | 622 |
if(trUrl.contains("192.168.0.60") || trUrl.contains("localhost")) {
|
| 621 | 623 |
urlCode = "010001"; |
| 622 | 624 |
} |
--- src/main/resources/egovframework/spring/com/context-scheduling-sym-log-lgm.xml
+++ src/main/resources/egovframework/spring/com/context-scheduling-sym-log-lgm.xml
... | ... | @@ -127,21 +127,21 @@ |
| 127 | 127 |
|
| 128 | 128 |
<!-- 14 --> |
| 129 | 129 |
<!-- mj_msg_data 백업 --> |
| 130 |
- <bean id="MjMsgDataBackupBean" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean"> |
|
| 130 |
+ <!-- <bean id="MjMsgDataBackupBean" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean"> |
|
| 131 | 131 |
<property name="targetObject" ref="tableBackupMsgScheduling" /> |
| 132 | 132 |
<property name="targetMethod" value="mjMsgDataBackup" /> |
| 133 | 133 |
<property name="concurrent" value="false" /> |
| 134 |
- </bean> |
|
| 134 |
+ </bean> --> |
|
| 135 | 135 |
|
| 136 |
- <bean id="MjMsgDataBackupBeanTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean"> |
|
| 137 |
- <property name="jobDetail" ref="MjMsgDataBackupBean" /> |
|
| 136 |
+<!-- <bean id="MjMsgDataBackupBeanTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean"> --> |
|
| 137 |
+<!-- <property name="jobDetail" ref="MjMsgDataBackupBean" /> --> |
|
| 138 | 138 |
<!-- 매년 3,11월 22일 4시38분 마다 작년도 테이블 백업 --> |
| 139 |
- <property name="cronExpression" value="0 38 4 22 11 ?" /> |
|
| 139 |
+<!-- <property name="cronExpression" value="0 38 4 22 11 ?" /> --> |
|
| 140 | 140 |
<!-- <property name="cronExpression" value="0 38 4 28 3 ?" /> --> |
| 141 | 141 |
<!-- 매일 4시18분 마다 작년도 테이블 백업 --> |
| 142 | 142 |
<!-- <property name="cronExpression" value="0 03 12 * * ?" /> --> |
| 143 | 143 |
<!-- <property name="cronExpression" value="8 * * * * ?" /> --> |
| 144 |
- </bean> |
|
| 144 |
+<!-- </bean> --> |
|
| 145 | 145 |
|
| 146 | 146 |
|
| 147 | 147 |
|
... | ... | @@ -157,7 +157,7 @@ |
| 157 | 157 |
<!-- <ref bean="SttstMsgRankDayBeanTrigger" /> --><!-- 문자전송순위통계집계(매일한번) --> |
| 158 | 158 |
|
| 159 | 159 |
<!-- mj_msg_data 백업 --> |
| 160 |
- <ref bean="MjMsgDataBackupBeanTrigger" /> |
|
| 160 |
+ <!-- <ref bean="MjMsgDataBackupBeanTrigger" /> --> |
|
| 161 | 161 |
|
| 162 | 162 |
</list> |
| 163 | 163 |
</property> |
--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
... | ... | @@ -5972,6 +5972,7 @@ |
| 5972 | 5972 |
|
| 5973 | 5973 |
<!-- 당월 회원전환률 --> |
| 5974 | 5974 |
<select id="mjonMsgDAO.selectMemLoginThisMonth" parameterClass="mjonMsgVO" resultClass="mjonMsgVO"> |
| 5975 |
+ /* mjonMsgDAO.selectMemLoginThisMonth */ |
|
| 5975 | 5976 |
SELECT |
| 5976 | 5977 |
M2.createDt |
| 5977 | 5978 |
,M2.visitCnt |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?