From cce147ff91f65a57832a9f118ee78d75a425684f Mon Sep 17 00:00:00 2001 From: kdh0120 Date: Mon, 28 Jun 2021 00:37:52 +0000 Subject: [PATCH] --- FO/Controllers/AccountController.cs | 2 +- FO/Controllers/CDMSController.cs | 2 +- FO/Controllers/HomeController.cs | 4 ++-- FO/Controllers/MyController.cs | 4 ++-- FO/Spring/Controllers.xml | 2 +- FO/Views/Account/GoogleCallback.cshtml | 2 +- FO/Views/Account/IndexBase.cshtml | 8 ++++---- FO/Views/Account/Join.cshtml | 2 +- FO/Views/Account/KakaoCallback.cshtml | 2 +- FO/Views/Account/NaverCallback.cshtml | 4 ++-- FO/Views/Account/NaverCallbackJoin.cshtml | 2 +- FO/Views/Account/SNSLinkCallback.cshtml | 2 +- FO/Views/My/MyInfoCheck.cshtml | 2 +- FO/Views/Shared/Partial/GNB.cshtml | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/FO/Controllers/AccountController.cs b/FO/Controllers/AccountController.cs index a2a2990..21e7040 100644 --- a/FO/Controllers/AccountController.cs +++ b/FO/Controllers/AccountController.cs @@ -54,7 +54,7 @@ namespace NP.FO.Controllers vm.Assign = new Assign(); //서브도메인 확인 하여 고객사 설정 var sd = Request.Url.Host.Split('.')[0]; - if (GetConfig("isdevtest") != "1" && Request.Url.Host != "222.122.63.91" && Request.Url.Host != "ynicte.nptc.kr" && Request.Url.Host != "phd.nptc.kr" && MainSubDomain.ToUpper() != sd.ToUpper()) + if (GetConfig("isdevtest") != "1" && Request.Url.Host != "222.122.63.91" && Request.Url.Host != "cte.nptc.kr" && Request.Url.Host != "ynicte.nptc.kr" && Request.Url.Host != "phd.nptc.kr" && MainSubDomain.ToUpper() != sd.ToUpper()) { ViewBag.Files = vm.Files; ViewBag.Assign = vm.Assign = Dao.Get("users.assignsite", new Hashtable() { { "subdomain", sd } }).First(); diff --git a/FO/Controllers/CDMSController.cs b/FO/Controllers/CDMSController.cs index 7caa00c..5851c25 100644 --- a/FO/Controllers/CDMSController.cs +++ b/FO/Controllers/CDMSController.cs @@ -71,7 +71,7 @@ namespace NP.FO.Controllers public ActionResult Play(VMCRoom vm) { var sd = Request.Url.Host.Split('.')[0]; - if (GetConfig("isdevtest") != "1" && Request.Url.Host != "222.122.63.91" && Request.Url.Host != "ynicte.nptc.kr" && Request.Url.Host != "phd.nptc.kr" && MainSubDomain.ToUpper() != sd.ToUpper()) + if (GetConfig("isdevtest") != "1" && Request.Url.Host != "222.122.63.91" && Request.Url.Host != "cte.nptc.kr" && Request.Url.Host != "ynicte.nptc.kr" && Request.Url.Host != "phd.nptc.kr" && MainSubDomain.ToUpper() != sd.ToUpper()) { ViewBag.SiteTitle = Dao.Get("users.assignsite", new System.Collections.Hashtable() { { "subdomain", sd } }).First().asname; } diff --git a/FO/Controllers/HomeController.cs b/FO/Controllers/HomeController.cs index 8abfbe0..bc29d05 100644 --- a/FO/Controllers/HomeController.cs +++ b/FO/Controllers/HomeController.cs @@ -14,7 +14,7 @@ namespace NP.FO.Controllers { //서브도메인 확인 하여 고객사 로그인/마이페이지로 이동 var sd = Request.Url.Host.Split('.')[0]; - if (GetConfig("isdevtest") != "1" && Request.Url.Host != "222.122.63.91" && Request.Url.Host != "ynicte.nptc.kr" && Request.Url.Host != "phd.nptc.kr" && MainSubDomain.ToUpper() != sd.ToUpper()) + if (GetConfig("isdevtest") != "1" && Request.Url.Host != "222.122.63.91" && Request.Url.Host != "cte.nptc.kr" && Request.Url.Host != "ynicte.nptc.kr" && Request.Url.Host != "phd.nptc.kr" && MainSubDomain.ToUpper() != sd.ToUpper()) { if (SUserInfo.UserNo < 1) { @@ -41,7 +41,7 @@ namespace NP.FO.Controllers { //서브도메인 확인 하여 고객사 로그인/마이페이지로 이동 var sd = Request.Url.Host.Split('.')[0]; - if (GetConfig("isdevtest") != "1" && Request.Url.Host != "222.122.63.91" && Request.Url.Host != "ynicte.nptc.kr" && Request.Url.Host != "phd.nptc.kr" && MainSubDomain.ToUpper() != sd.ToUpper()) + if (GetConfig("isdevtest") != "1" && Request.Url.Host != "222.122.63.91" && Request.Url.Host != "cte.nptc.kr" && Request.Url.Host != "ynicte.nptc.kr" && Request.Url.Host != "phd.nptc.kr" && MainSubDomain.ToUpper() != sd.ToUpper()) { if (SUserInfo.UserNo < 1) { diff --git a/FO/Controllers/MyController.cs b/FO/Controllers/MyController.cs index 9a5b44c..3eb0671 100644 --- a/FO/Controllers/MyController.cs +++ b/FO/Controllers/MyController.cs @@ -20,7 +20,7 @@ namespace NP.FO.Controllers ViewBag.Banners = GetBANNER; ViewBag.ismain = false; var sd = Request.Url.Host.Split('.')[0]; - if (GetConfig("isdevtest") != "1" && Request.Url.Host != "222.122.63.91" && Request.Url.Host != "ynicte.nptc.kr" && Request.Url.Host != "phd.nptc.kr" && MainSubDomain.ToUpper() != sd.ToUpper()) + if (GetConfig("isdevtest") != "1" && Request.Url.Host != "222.122.63.91" && Request.Url.Host != "cte.nptc.kr" && Request.Url.Host != "ynicte.nptc.kr" && Request.Url.Host != "phd.nptc.kr" && MainSubDomain.ToUpper() != sd.ToUpper()) { ViewBag.Assign = Dao.Get("users.assignsite", new System.Collections.Hashtable() { { "subdomain", sd } }).First(); ViewBag.Files = (new NP.Model.VMBase()).Files; @@ -38,7 +38,7 @@ namespace NP.FO.Controllers //신청중,수강중,나의할일,나의알림 vm.Datas = Dao.Get("lect.mydata", SUserInfo.UserNo).Where(x => x.time2 >= DateTime.Now).ToList(); //수강종료일이 지난건 노출하지않도록 var sd = Request.Url.Host.Split('.')[0]; - if (GetConfig("isdevtest") != "" && Request.Url.Host != "ynicte.nptc.kr" && Request.Url.Host != "222.122.63.91" && MainSubDomain.ToUpper() != sd.ToUpper()) + if (GetConfig("isdevtest") != "" && Request.Url.Host != "cte.nptc.kr" && Request.Url.Host != "ynicte.nptc.kr" && Request.Url.Host != "222.122.63.91" && MainSubDomain.ToUpper() != sd.ToUpper()) { vm.Boards = Dao.Get("board.bs.forassign", new System.Collections.Hashtable() { { "subdomain", sd }, { "limit", 2 },{ "isdefault",3} }); } diff --git a/FO/Spring/Controllers.xml b/FO/Spring/Controllers.xml index adf0493..a77a8ba 100644 --- a/FO/Spring/Controllers.xml +++ b/FO/Spring/Controllers.xml @@ -7,7 +7,7 @@ - + diff --git a/FO/Views/Account/GoogleCallback.cshtml b/FO/Views/Account/GoogleCallback.cshtml index 79b7a60..d3675f0 100644 --- a/FO/Views/Account/GoogleCallback.cshtml +++ b/FO/Views/Account/GoogleCallback.cshtml @@ -35,7 +35,7 @@ } function goHome() { if (capResult.code > 0) { - location.href = "https://cte.nptc.kr"; + location.href = "https://www.cte.or.kr"; } } function goIndex() { diff --git a/FO/Views/Account/IndexBase.cshtml b/FO/Views/Account/IndexBase.cshtml index 1de9955..573f902 100644 --- a/FO/Views/Account/IndexBase.cshtml +++ b/FO/Views/Account/IndexBase.cshtml @@ -23,12 +23,12 @@
- + @* + *@ @@ -114,7 +114,7 @@ gapi.load('auth2', function () {var gauth = gapi.auth2.init({client_id: "@googleClientId", scope: 'profile'});gauth.then(function () {console.log('google init success');}, function () {console.error('google init fail');})}); } - var naverLogin = new naver.LoginWithNaverId({ clientId: "@naverClientId", callbackUrl: "https://cte.nptc.kr/Account/NaverCallback",isPopup: true,loginButton: { color: "green", type: 3, height: 60 }}); + var naverLogin = new naver.LoginWithNaverId({ clientId: "@naverClientId", callbackUrl: "https://www.cte.or.kr/Account/NaverCallback",isPopup: true,loginButton: { color: "green", type: 3, height: 60 }}); function loginWithKakao() { Kakao.Auth.login({ diff --git a/FO/Views/Account/Join.cshtml b/FO/Views/Account/Join.cshtml index 4c7b4c7..3400ce2 100644 --- a/FO/Views/Account/Join.cshtml +++ b/FO/Views/Account/Join.cshtml @@ -269,7 +269,7 @@ else var naverLogin = new naver.LoginWithNaverId( { clientId: "@naverClientId", - callbackUrl: "https://cte.nptc.kr/Account/Join?jointype=2", + callbackUrl: "https://www.cte.or.kr/Account/Join?jointype=2", isPopup: false, callbackHandle: true } diff --git a/FO/Views/Account/KakaoCallback.cshtml b/FO/Views/Account/KakaoCallback.cshtml index 725d4be..8e281aa 100644 --- a/FO/Views/Account/KakaoCallback.cshtml +++ b/FO/Views/Account/KakaoCallback.cshtml @@ -45,7 +45,7 @@ } function goHome() { if (capResult.code > 0) { - location.href = "https://cte.nptc.kr"; + location.href = "https://www.cte.or.kr"; } } function goIndex() { diff --git a/FO/Views/Account/NaverCallback.cshtml b/FO/Views/Account/NaverCallback.cshtml index da7bb10..364b8d9 100644 --- a/FO/Views/Account/NaverCallback.cshtml +++ b/FO/Views/Account/NaverCallback.cshtml @@ -15,7 +15,7 @@ var naverLogin = new naver.LoginWithNaverId( { clientId: "@naverClientId", //개발자센터에 등록한 ClientID - callbackUrl: "https://cte.nptc.kr/Account/NaverCallback",//개발자센터에 등록한 callback Url + callbackUrl: "https://www.cte.or.kr/Account/NaverCallback",//개발자센터에 등록한 callback Url isPopup: false, /* 팝업을 통한 연동처리 여부 */ callbackHandle: true /* callback 페이지가 분리되었을 경우에 callback 페이지에서는 callback처리를 해줄수 있도록 설정합니다. */ @@ -75,7 +75,7 @@ } function goHome() { if (capResult.code > 0) { - opener.location.href = "https://cte.nptc.kr"; + opener.location.href = "https://www.cte.or.kr"; self.close(); } } diff --git a/FO/Views/Account/NaverCallbackJoin.cshtml b/FO/Views/Account/NaverCallbackJoin.cshtml index 8cb53d9..87c44d6 100644 --- a/FO/Views/Account/NaverCallbackJoin.cshtml +++ b/FO/Views/Account/NaverCallbackJoin.cshtml @@ -23,7 +23,7 @@ var naverLogin = new naver.LoginWithNaverId( { clientId: "@naverClientId", - callbackUrl: "https://cte.nptc.kr/Account/NaverCallbackJoin", + callbackUrl: "https://www.cte.or.kr/Account/NaverCallbackJoin", isPopup: false, callbackHandle: true } diff --git a/FO/Views/Account/SNSLinkCallback.cshtml b/FO/Views/Account/SNSLinkCallback.cshtml index 00a87ac..b534a09 100644 --- a/FO/Views/Account/SNSLinkCallback.cshtml +++ b/FO/Views/Account/SNSLinkCallback.cshtml @@ -24,7 +24,7 @@ var naverLogin = new naver.LoginWithNaverId( { clientId: "@naverClientId", - callbackUrl: "https://cte.nptc.kr/Account/SNSLinkCallback", + callbackUrl: "https://www.cte.or.kr/Account/SNSLinkCallback", isPopup: false, callbackHandle: true } diff --git a/FO/Views/My/MyInfoCheck.cshtml b/FO/Views/My/MyInfoCheck.cshtml index abadfb2..b655984 100644 --- a/FO/Views/My/MyInfoCheck.cshtml +++ b/FO/Views/My/MyInfoCheck.cshtml @@ -420,7 +420,7 @@ function googleInit() { gapi.load('auth2', function () {var gauth = gapi.auth2.init({client_id: "@googleClientId", scope: 'profile'});gauth.then(function () {console.log('google init success');}, function () {console.error('google init fail');})}); } - var naverLogin = new naver.LoginWithNaverId({ clientId: "@naverClientId", callbackUrl: "https://cte.nptc.kr/Account/SNSLinkCallback?jointype=2",isPopup: true,loginButton: { color: "green", type: 3, height: 60 }}); + var naverLogin = new naver.LoginWithNaverId({ clientId: "@naverClientId", callbackUrl: "https://www.cte.or.kr/Account/SNSLinkCallback?jointype=2",isPopup: true,loginButton: { color: "green", type: 3, height: 60 }}); function loginWithKakao() { Kakao.Auth.login({ diff --git a/FO/Views/Shared/Partial/GNB.cshtml b/FO/Views/Shared/Partial/GNB.cshtml index 3c12d79..5359f4d 100644 --- a/FO/Views/Shared/Partial/GNB.cshtml +++ b/FO/Views/Shared/Partial/GNB.cshtml @@ -11,7 +11,7 @@ else {
  • 로그인
    • -
  • 회원가입
    • + @*
  • 회원가입
    • *@ }