KimHanJin
/
YNICTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This commit is contained in:
kdh0120 2021-06-28 00:37:52 +00:00
parent c0923b45f3
commit cce147ff91
14 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FO/Controllers/AccountController.cs
View File

@ -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<Assign>("users.assignsite", new Hashtable() { { "subdomain", sd } }).First();

2
FO/Controllers/CDMSController.cs
View File

@ -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<Assign>("users.assignsite", new System.Collections.Hashtable() { { "subdomain", sd } }).First().asname;
}

4
FO/Controllers/HomeController.cs
View File

@ -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)
{

4
FO/Controllers/MyController.cs
View File

@ -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<Assign>("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<Data>("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>("board.bs.forassign", new System.Collections.Hashtable() { { "subdomain", sd }, { "limit", 2 },{ "isdefault",3} });
}

2
FO/Spring/Controllers.xml
View File

@ -7,7 +7,7 @@
<!--<property name="Sms" ref="objSms" />-->
<property name="TopMenuNo" value="2" />
<property name="PageRowCount" value="10" />
<property name="MainSubDomain" value="cte" />
<property name="MainSubDomain" value="www" />
<property name="IsDupCheck" value="1" />
</object>

2
FO/Views/Account/GoogleCallback.cshtml
View File

@ -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() {

8
FO/Views/Account/IndexBase.cshtml
View File

@ -23,12 +23,12 @@
<ul class="lgnFind">
<li><a href="/Account/FindMe">아이디/비밀번호찾기</a></li>
<li><a href="/Account/JoinIdVeri">회원가입</a></li>
@*<li><a href="/Account/JoinIdVeri">회원가입</a></li>*@
</ul>
<br />
<div id="naverIdLogin" style="display:none"></div>
@*<div id="naverIdLogin" style="display:none"></div>
<ul class="lgnSns">
<li>
<a href="javascript:loginWithNaver()">네이버 아이디로 로그인</a>
@ -39,7 +39,7 @@
<li>
<a href="javascript:loginWithGoogle()">구글 아이디로 로그인</a>
</li>
</ul>
</ul>*@
</div>
</form>
@ -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({

2
FO/Views/Account/Join.cshtml
View File

@ -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
}

2
FO/Views/Account/KakaoCallback.cshtml
View File

@ -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() {

4
FO/Views/Account/NaverCallback.cshtml
View File

@ -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();
}
}

2
FO/Views/Account/NaverCallbackJoin.cshtml
View File

@ -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
}

2
FO/Views/Account/SNSLinkCallback.cshtml
View File

@ -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
}

2
FO/Views/My/MyInfoCheck.cshtml
View File

@ -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({

2
FO/Views/Shared/Partial/GNB.cshtml
View File

@ -11,7 +11,7 @@
else
{
<li><a href="/Account/Index">로그인</a></li>
<li><a href="/Account/JoinIdVeri">회원가입</a></li>
@*<li><a href="/Account/JoinIdVeri">회원가입</a></li>*@
}
</ul>
<ul class="gnbMenu">