Skip to content

D
DataCenter_Core2.1_20190520
Commit b81a97c0 by guanzhenshan
Options

调整数据中心的登录验证方式

parent 60762134
Showing with 60 additions and 52 deletions
Bailun.DC.Web/Controllers/HomeController.cs
...@@ -85,47 +85,47 @@ namespace Bailun.DC.Web.Controllers ...@@ -85,47 +85,47 @@ namespace Bailun.DC.Web.Controllers
var cookie = HttpContext.Request.Cookies["BailunToken"]; var cookie = HttpContext.Request.Cookies["BailunToken"];
#endif #endif
var companyid = -1; //var companyid = -1;
var departmentname = ""; //var departmentname = "";
var username = ""; //var username = "";
var userid = 0; //var userid = 0;
var isAllCompany = 0; //var isAllCompany = 0;
var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource", new string[] { "Authorization" }, new string[] { (cookie != null ? System.Net.WebUtility.UrlDecode(cookie) : "") }); //var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource", new string[] { "Authorization" }, new string[] { (cookie != null ? System.Net.WebUtility.UrlDecode(cookie) : "") });
var json = Newtonsoft.Json.Linq.JObject.Parse(user); //var json = Newtonsoft.Json.Linq.JObject.Parse(user);
if (json["statusCode"].ToStr() == "200" && json["result"]["success"].ToString().ToLower() == "true") //if (json["statusCode"].ToStr() == "200" && json["result"]["success"].ToString().ToLower() == "true")
{ //{
username = json["result"]["Account"].ToString(); // username = json["result"]["Account"].ToString();
//userid = json["result"]["UserId"].ToInt32(); // //userid = json["result"]["UserId"].ToInt32();
userid = json["result"]["OaUserId"].ToInt32(); // userid = json["result"]["OaUserId"].ToInt32();
isAllCompany = json["result"]["AllCompany"].ToStr().ToLower() == "false" ? 0 : 1; // isAllCompany = json["result"]["AllCompany"].ToStr().ToLower() == "false" ? 0 : 1;
int.TryParse(json["result"]["Company"]["Id"].ToString(), out companyid); // int.TryParse(json["result"]["Company"]["Id"].ToString(), out companyid);
if (json["result"]["Department"].ToString() != "null" && json["result"]["Department"].ToString() != "") // if (json["result"]["Department"].ToString() != "null" && json["result"]["Department"].ToString() != "")
{ // {
departmentname = json["result"]["Department"]["Name"].ToStr(); // departmentname = json["result"]["Department"]["Name"].ToStr();
} // }
} //}
else //else
{ //{
//HttpContext.Response.Cookies["token"].Expires.AddDays(-1); // //HttpContext.Response.Cookies["token"].Expires.AddDays(-1);
} //}
ViewBag.companyid = companyid; //ViewBag.companyid = companyid;
ViewBag.allcompany = isAllCompany; //ViewBag.allcompany = isAllCompany;
ViewBag.username = username; //ViewBag.username = username;
ViewBag.departmentname = departmentname; //ViewBag.departmentname = departmentname;
HttpContext.Response.Cookies.Append("companyid", companyid + "", new Microsoft.AspNetCore.Http.CookieOptions //HttpContext.Response.Cookies.Append("companyid", companyid + "", new Microsoft.AspNetCore.Http.CookieOptions
{ //{
Expires = DateTime.Now.AddDays(1) // Expires = DateTime.Now.AddDays(1)
}); //});
//var listMenu = new Services.MenuServices().ListMenu(username); ////var listMenu = new Services.MenuServices().ListMenu(username);
var listMenu = new Services.MenuServices().ListMenu(userid); //var listMenu = new Services.MenuServices().ListMenu(userid);
ViewBag.menus = listMenu; //ViewBag.menus = listMenu;
return View(); return View();
} }
......
Bailun.DC.Web/Views/Home/Main.cshtml
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
<span class="nav-label">@item.name</span> <span class="nav-label">@item.name</span>
<span class="fa arrow"></span> <span class="fa arrow"></span>
</a> </a>
<ul class="nav nav-second-level"> <ul class="nav nav-second-level collapse">
@if (item.childrens.Count > 0) @if (item.childrens.Count > 0)
{ {
foreach (var f_level in item.childrens) foreach (var f_level in item.childrens)
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
<span class="nav-label">@f_level.name</span> <span class="nav-label">@f_level.name</span>
<span class="fa arrow"></span> <span class="fa arrow"></span>
</a> </a>
<ul class="nav nav-third-level"> <ul class="nav nav-third-level collapse">
@foreach (var s_level in f_level.childrens) @foreach (var s_level in f_level.childrens)
{ {
<li> <li>
...@@ -171,20 +171,16 @@ ...@@ -171,20 +171,16 @@
</div> </div>
<script src="/css/hplus/js/bootstrap.min.js?v=3.3.6"></script> <script src="/css/hplus/js/bootstrap.min.js?v=3.3.6"></script>
<script src="/css/hplus/js/plugins/slimscroll/jquery.slimscroll.min.js"></script>
<script src="/css/hplus/js/plugins/layer/layer.min.js"></script> <script src="/css/hplus/js/plugins/layer/layer.min.js"></script>
<script src="/css/hplus/js/hplus.min.js?v=4.1.0"></script>
<script type="text/javascript" src="/css/hplus/js/contabs.min.js"></script> <script type="text/javascript" src="/css/hplus/js/contabs.min.js"></script>
<script src="/css/hplus/js/plugins/pace/pace.min.js"></script> <script src="/css/hplus/js/plugins/pace/pace.min.js"></script>
<script> <script>
$(document).ready(function () { $(document).ready(function () {
//getuser(); getuser();
}) })
function getuser() { function getuser() {
var token = getUrlParam('token'); var token = getUrlParam('token');
if (token != '') { if (token != '') {
$.cookie('BailunToken', token, { expires: 1, domain: 'bailuntec.com' }); $.cookie('BailunToken', token, { expires: 1, domain: 'bailuntec.com' });
} }
...@@ -215,7 +211,9 @@ ...@@ -215,7 +211,9 @@
getmenu(); getmenu();
} }
else { else {
alert('获取sso用户信息失败，请联系管理员。');
window.location = "http://sso.bailuntec.com/?returnUrl=" + baseUrl;
$.cookie('BailunToken', token, { expires: -1 });
} }
} }
}); });
...@@ -245,31 +243,31 @@ ...@@ -245,31 +243,31 @@
for (var second in result[onepart].childrens) { for (var second in result[onepart].childrens) {
var f_level = result[onepart].childrens[second]; var f_level = result[onepart].childrens[second];
s += '<li>'; s += '<li>';
if (result[onepart].childrens[second].length > 0) { if (f_level.childrens.length > 0) {
s += '<a href="#">' + s += ('<a href="#">' +
'<i class="' + f_level.icon + '"></i>' + '<i class="' + f_level.icon + '"></i>' +
'<span class="nav-label">' + f_level.name + '</span>' + '<span class="nav-label">' + f_level.name + '</span>' +
'<span class="fa arrow"></span>' + '<span class="fa arrow"></span>' +
'</a>' + '</a>' +
'<ul class="nav nav-third-level">'; '<ul class="nav nav-third-level">');
for (var third in f_level.childrens) { for (var third in f_level.childrens) {
var s_level = f_level.childrens[third]; var s_level = f_level.childrens[third];
s += '<li>' + s += ('<li>' +
'<a class="J_menuItem" href="' + baseUrl + s_level.path + '" data-index="0">' + '<a class="J_menuItem" href="' + baseUrl + s_level.path + '" data-index="0">' +
'<i class="fa fa-dot-circle-o"></i>' + '<i class="fa fa-dot-circle-o"></i>' +
'<span class="nav-label">' + s_level.name + '</span>' + '<span class="nav-label">' + s_level.name + '</span>' +
'</a>' + '</a>' +
'</li>'; '</li>');
} }
s += '</ul>'; s += '</ul>';
} }
else { else {
s += '<a class="J_menuItem" href="' + baseUrl + f_level.path + '" data-index="0">' + s += ('<a class="J_menuItem" href="' + baseUrl + f_level.path + '" data-index="0">' +
'<i class="fa fa-dot-circle-o"></i>' '<i class="fa fa-dot-circle-o"></i>' +
'<span class="nav-label">' + f_level.name + '</span>' + '<span class="nav-label">' + f_level.name + '</span>' +
'</a>'; '</a>');
} }
s += '</li>'; s += '</li>';
...@@ -280,7 +278,17 @@ ...@@ -280,7 +278,17 @@
s += '</li>'; s += '</li>';
} }
$('#side-menu').html(s); $('#side-menu').append(s);
$.getScript('../css/hplus/js/plugins/metisMenu/jquery.metisMenu.js', function () {
$.getScript('../css/hplus/js/plugins/slimscroll/jquery.slimscroll.min.js', function () {
$.getScript('../css/hplus/js/hplus.min.js?v=4.1.0', function () {
$.getScript('../css/hplus/js/contabs.min.js', function () {
});
});
});
});
} }
} }
}) })
...@@ -288,6 +296,6 @@ ...@@ -288,6 +296,6 @@
} }
</script> </script>
<script src="/css/hplus/js/plugins/metisMenu/jquery.metisMenu.js"></script>
</body> </body>
</html> </html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment