Merge branch 'master' of http://subsub8729@vcs.iten.co.kr/2025_PROJECT/mjgo_git
@71bd2d2c2ac331309610f84e94e91e32d539ac3f
--- src/main/resources/egovframework/egovProps/globals_prod.properties
+++ src/main/resources/egovframework/egovProps/globals_prod.properties
... | ... | @@ -108,6 +108,6 @@ |
| 108 | 108 |
Globals.slack.channel.name=mjon\uba54\uc2dc\uc9c0 |
| 109 | 109 |
|
| 110 | 110 |
#valkey |
| 111 |
-Globals.valkey.ip=10.12.107.9 |
|
| 111 |
+Globals.valkey.ip=1.201.116.193 |
|
| 112 | 112 |
Globals.valkey.port=6379 |
| 113 | 113 |
Globals.valkey.password=itntest123(No newline at end of file) |
--- src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
+++ src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
... | ... | @@ -5,7 +5,33 @@ |
| 5 | 5 |
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> |
| 6 | 6 |
<%@ page import="egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper" %> |
| 7 | 7 |
<%@ page import="itn.com.cmm.LoginVO" %> |
| 8 |
- |
|
| 8 |
+<script type="text/javascript"> |
|
| 9 |
+ if ( |
|
| 10 |
+ typeof Promise !== "undefined" && |
|
| 11 |
+ typeof Promise.allSettled !== "function" |
|
| 12 |
+ ) {
|
|
| 13 |
+ Promise.allSettled = function (promises) {
|
|
| 14 |
+ return Promise.all( |
|
| 15 |
+ Array.prototype.map.call(promises, function (promise) {
|
|
| 16 |
+ return Promise.resolve(promise).then( |
|
| 17 |
+ function (value) {
|
|
| 18 |
+ return {
|
|
| 19 |
+ status: "fulfilled", |
|
| 20 |
+ value: value |
|
| 21 |
+ }; |
|
| 22 |
+ }, |
|
| 23 |
+ function (reason) {
|
|
| 24 |
+ return {
|
|
| 25 |
+ status: "rejected", |
|
| 26 |
+ reason: reason |
|
| 27 |
+ }; |
|
| 28 |
+ } |
|
| 29 |
+ ); |
|
| 30 |
+ }) |
|
| 31 |
+ ); |
|
| 32 |
+ }; |
|
| 33 |
+ } |
|
| 34 |
+</script> |
|
| 9 | 35 |
<!-- 구글 공통 스크립트 : Global site tag (gtag.js) - Google Ads: 10967556094 --> |
| 10 | 36 |
<script async src="https://www.googletagmanager.com/gtag/js?id=AW-10967556094"></script> |
| 11 | 37 |
<script> |
--- src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
+++ src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
... | ... | @@ -378,9 +378,9 @@ |
| 378 | 378 |
else{
|
| 379 | 379 |
//실서버일 경우 |
| 380 | 380 |
//https가 없는경우 |
| 381 |
- if(url.indexOf('https://') == -1 && url.indexOf('dev.munjaon.co.kr') == -1 && url.indexOf('cs.munjaon.co.kr') == -1) {
|
|
| 382 |
- document.location.href = "https://www.munjaon.co.kr/web/main/mainPage.do"; |
|
| 383 |
- } |
|
| 381 |
+ // if(url.indexOf('https://') == -1 && url.indexOf('dev.munjaon.co.kr') == -1 && url.indexOf('cs.munjaon.co.kr') == -1) {
|
|
| 382 |
+ // document.location.href = "https://www.munjaon.co.kr/web/main/mainPage.do"; |
|
| 383 |
+ // } |
|
| 384 | 384 |
} |
| 385 | 385 |
} |
| 386 | 386 |
|
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?