diff --git a/BO/BO.csproj b/BO/BO.csproj index 43ff4d8..8a80240 100644 --- a/BO/BO.csproj +++ b/BO/BO.csproj @@ -489,10 +489,8 @@ - - - + diff --git a/BO/Content/file/KFCFManualaaxds.pdf b/BO/Content/file/KFCFManualaaxds.pdf deleted file mode 100644 index 489f2b4..0000000 Binary files a/BO/Content/file/KFCFManualaaxds.pdf and /dev/null differ diff --git a/BO/Content/file/KFCFManualaxds.pdf b/BO/Content/file/KFCFManualaxds.pdf deleted file mode 100644 index aa70306..0000000 Binary files a/BO/Content/file/KFCFManualaxds.pdf and /dev/null differ diff --git a/BO/Content/file/KFCFManualpxds.pdf b/BO/Content/file/KFCFManualpxds.pdf deleted file mode 100644 index 00d06b0..0000000 Binary files a/BO/Content/file/KFCFManualpxds.pdf and /dev/null differ diff --git a/BO/Controllers/BOBaseController.cs b/BO/Controllers/BOBaseController.cs index 462cf3a..15040f1 100644 --- a/BO/Controllers/BOBaseController.cs +++ b/BO/Controllers/BOBaseController.cs @@ -26,7 +26,7 @@ namespace NP.BO.Controllers ViewBag.Menus = GetMENUS.Where(w => w.usertype == base.SUserInfo.UserType).ToList(); //로그인을 위해서 다 https로 돌림 - if (!Request.IsSecureConnection) + if (!Request.IsSecureConnection && GetConfig("usessl") == "Y") { filterContext.Result = new RedirectResult("https://" + Request.Url.Host + Request.Url.PathAndQuery); } diff --git a/BO/Views/Shared/_Layout.cshtml b/BO/Views/Shared/_Layout.cshtml index 49e6a5f..2bf253b 100644 --- a/BO/Views/Shared/_Layout.cshtml +++ b/BO/Views/Shared/_Layout.cshtml @@ -78,8 +78,8 @@ @ViewBag.SSUserName 님 diff --git a/BO/obj/Debug/BO.csprojAssemblyReference.cache b/BO/obj/Debug/BO.csprojAssemblyReference.cache index e3c9000..a1cc82d 100644 Binary files a/BO/obj/Debug/BO.csprojAssemblyReference.cache and b/BO/obj/Debug/BO.csprojAssemblyReference.cache differ diff --git a/Base/obj/Debug/Base.csprojAssemblyReference.cache b/Base/obj/Debug/Base.csprojAssemblyReference.cache index 1ca9416..a7b426b 100644 Binary files a/Base/obj/Debug/Base.csprojAssemblyReference.cache and b/Base/obj/Debug/Base.csprojAssemblyReference.cache differ diff --git a/Dao/obj/Debug/Dao.csprojAssemblyReference.cache b/Dao/obj/Debug/Dao.csprojAssemblyReference.cache index f2809af..98e6029 100644 Binary files a/Dao/obj/Debug/Dao.csprojAssemblyReference.cache and b/Dao/obj/Debug/Dao.csprojAssemblyReference.cache differ