check Issues #1

2025-07-15 14:04:41 +08:00 · 2016-01-02 23:16:22 +08:00 · 2016-01-02 23:16:22 +08:00 · 7cc293c121
commit 7cc293c121
parent 935f5e5cc1
3 changed files with 37 additions and 27 deletions
--- a/OpenAuth.App/LoginApp.cs
+++ b/OpenAuth.App/LoginApp.cs
@ -1,4 +1,4 @@
-using OpenAuth.Domain.Interface;
+using OpenAuth.Domain.Interface;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@ -35,7 +35,7 @@ namespace OpenAuth.App
            var user = _repository.FindSingle(u => u.Account == userName);
            if (user == null)
            {
-                throw new Exception("用户帐号不存在");
+                throw new Exception("用户帐号不存在");
            }
            user.CheckPassword(password);

@ -43,32 +43,32 @@ namespace OpenAuth.App
            {
                User = user
            };
-            //用户角色
+            //用户角色
            var userRoleIds =
                _relevanceRepository.Find(u => u.FirstId == user.Id && u.Key == "UserRole").Select(u => u.SecondId).ToList();

-            //用户角色与自己分配到的模块ID
+            //用户角色与自己分配到的模块ID
            var moduleIds =
                _relevanceRepository.Find(
                    u =>
                        (u.FirstId == user.Id && u.Key == "UserModule") ||
                        (u.Key == "RoleModule" && userRoleIds.Contains(u.FirstId))).Select(u =>u.SecondId).ToList();
-            //用户角色与自己分配到的菜单ID
+            //用户角色与自己分配到的菜单ID
            var elementIds =
               _relevanceRepository.Find(
                   u =>
                       (u.FirstId == user.Id && u.Key == "UserElement") ||
                       (u.Key == "RoleElement" && userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId).ToList();
-            //得出最终用户拥有的模块
+            //得出最终用户拥有的模块
            loginVM.Modules = _moduleRepository.Find(u => moduleIds.Contains(u.Id)).MapToList<ModuleView>();

-            //模块菜单权限
+            //模块菜单权限
            foreach (var module in loginVM.Modules)
            {
                module.Elements = _moduleElementRepository.Find(u => u.ModuleId == module.Id && elementIds.Contains( u.Id)).ToList();
            }

-            //用户角色与自己分配到的资源ID
+            //用户角色与自己分配到的资源ID
            var resourceIds = _relevanceRepository.Find(
                    u =>
                        (u.FirstId == user.Id && u.Key == "UserResource") ||
@ -79,7 +79,7 @@ namespace OpenAuth.App
        }

        /// <summary>
-        /// 开发者登陆
+        /// 开发者登陆
        /// </summary>
        public LoginUserVM LoginByDev()
        {
@ -87,11 +87,11 @@ namespace OpenAuth.App
            {
                User = new User
                {
-                    Name = "开发者账号"
+                    Name = "开发者账号"
                }
            };
            loginUser.Modules = _moduleRepository.Find(null).MapToList<ModuleView>();
-            //模块包含的菜单
+            //模块包含的菜单
            foreach (var module in loginUser.Modules)
            {
                module.Elements = _moduleElementRepository.Find(u => u.ModuleId == module.Id).ToList();
--- a/OpenAuth.Mvc/Controllers/LoginController.cs
+++ b/OpenAuth.Mvc/Controllers/LoginController.cs
@ -5,6 +5,7 @@ using System.Web;
 using System.Web.Mvc;
 using Infrastructure.Helper;
 using OpenAuth.App;
+using OpenAuth.Mvc.Models;

 namespace OpenAuth.Mvc.Controllers
 {
@ -33,7 +34,12 @@ namespace OpenAuth.Mvc.Controllers
            }
            catch (Exception e)
            {
-                return View(e.Message);
+                var response = new BjuiResponse
+                {
+                    statusCode = "300",
+                    message = e.Message
+                };
+                return View(response);
            }
        }

--- a/OpenAuth.Mvc/Views/Login/Index.cshtml
+++ b/OpenAuth.Mvc/Views/Login/Index.cshtml
@ -1,7 +1,8 @@
-<!DOCTYPE html>
-<html>
+@model OpenAuth.Mvc.Models.BjuiResponse
+<!DOCTYPE html>
+<html lang="zh">
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta charset="utf-8">
    <title>系统登录</title>
    <script src="~/BJUI/js/jquery-1.7.2.min.js"></script>
    <script src="~/BJUI/js/jquery.cookie.js"></script>
@ -189,20 +190,23 @@
    <div id="errorie"><div>您还在使用老掉牙的IE，请升级您的浏览器到 IE8以上版本 <a target="_blank" href="http://windows.microsoft.com/zh-cn/internet-explorer/ie-8-worldwide-languages">点击升级</a>&nbsp;&nbsp;强烈建议您更改换浏览器：<a href="http://down.tech.sina.com.cn/content/40975.html" target="_blank">谷歌 Chrome</a></div></div>
    <![endif]-->
    <div class="main_box">
-        <div class="setting"><a href="javascript:;" onclick=" choose_bg(); " title="更换背景">
+        <div class="setting">
+            <a href="javascript:;" onclick=" choose_bg(); " title="更换背景">
                <span class="glyphicon glyphicon-th-large"></span>
-        </a></div>
+            </a>
+        </div>
        <div class="login_box">
            <div class="login_logo">
                <img src="/BJUI/images/logo.png">
            </div>
-            <!--
-            <c:if test="${!empty message}">
+            @if (Model != null && Model.statusCode == "300")
+            {
                <div class="login_msg">
-                    <font color="red">${message }</font>
+                    <font color="red">@Model.message</font>
                </div>
-            </c:if>
-            -->
+            }
+
+
            <div class="login_form">
                <input type="hidden" value="${randomKey }" id="j_randomKey" />
                <form action="/Login/Index" id="login_form" method="post">