1.0正式版

修复beta版未能解决的BUG；
全面修改页面结构，采用面向对象JS开发；
优化进出库管理示例，对资源的应用更加清晰；
完整的SQL初始数据；

OpenAuth.App/StockManagerApp.cs

@@ -1,94 +1,36 @@
-
+using OpenAuth.Domain;
-using OpenAuth.Domain;
-using OpenAuth.Domain.Interface;
-using System.Collections.Generic;
-using System.Linq;
 using Infrastructure;
-using Infrastructure.Helper;
+using OpenAuth.Domain.Service;
-using OpenAuth.App.ViewModel;
 
 namespace OpenAuth.App
 {
     public class StockManagerApp
     {
-        private IStockRepository _repository;
+        private StockManagerService _service;
-        private IOrgRepository _orgRepository;
 
-        public StockManagerApp(IStockRepository repository,
+        public StockManagerApp(StockManagerService service)
-            IOrgRepository orgRepository)
         {
-            _repository = repository;
+            _service = service;
-            _orgRepository = orgRepository;
         }
 
         /// <summary>
         /// 根据部门ID得到进出库信息
         /// </summary>
-        public dynamic Load(int orgId, int pageindex, int pagesize)
+        public dynamic Load(string username, int orgId, int pageindex, int pagesize)
         {
-            IEnumerable<Stock> Stocks;
+            return _service.Load(username, orgId, pageindex, pagesize);
-            //var user = AutofacExt.GetFromFac<LoginApp>().GetLoginUser();
-            //var loginOrgs = user.AccessedOrgs.Select(u => u.Id).ToArray();
-
-            //int total;
-            //if (orgId == 0)
-            //{
-               
-            //    if (loginOrgs.Length == 0)  //改用户没有任何可见机构
-            //    {
-            //        Stocks = _repository.Find(pageindex, pagesize, "", u => u.User == user.User.Account);
-            //        total = _repository.GetCount(u =>u.User ==user.User.Account);
-            //    }
-            //    else
-            //    {
-            //        Stocks = _repository.LoadInOrgs(pageindex, pagesize, loginOrgs);
-            //        total = _repository.GetStockCntInOrgs(loginOrgs);
-            //    }
-              
-            //}
-            //else  //加载选择的机构及用户可访问的所有子机构
-            //{
-            //    var orgs = _orgRepository.GetSubOrgs(orgId).Where(u =>loginOrgs.Contains(u.Id));
-            //    List<int> orgIds = orgs.Select(u => u.Id).ToList();
-            //    orgIds.Add(orgId);
-            //    Stocks = _repository.LoadInOrgs(pageindex, pagesize, orgIds.ToArray());
-            //    total = _repository.GetStockCntInOrgs(orgIds.ToArray());
-            //}
-
-            return new 
-            {
-               // total = total,
-            //    list = Stocks,
-                pageCurrent = pageindex
-            };
-        }
-
-        public Stock Find(int id)
-        {
-            var stock = _repository.FindSingle(u => u.Id == id);
-            if (stock == null) return new Stock();
-
-            return stock;
         }
 
         public void Delete(int id)
         {
-            _repository.Delete(id);
+            _service.Delete(id);
         }
 
         public void AddOrUpdate(Stock model)
         {
             Stock stock  = new  Stock();
             model.CopyTo(stock);
-            
+            _service.AddOrUpdate(stock);
-            if (stock.Id == 0)
-            {
-                _repository.Add(stock);
-            }
-            else
-            {
-                _repository.Update(stock);
-            }
            
         }
 

OpenAuth.Domain/Interface/IOrgRepository.cs

@@ -17,5 +17,12 @@ namespace OpenAuth.Domain.Interface
         /// </summary>
         /// <param name="orgId">部门ID</param>
         IEnumerable<Org> GetSubOrgs(int orgId);
+
+        /// <summary>
+        /// 获取包括自己在内的全部子部门
+        /// </summary>
+        /// <param name="orgId">The org identifier.</param>
+        /// <returns>IEnumerable&lt;Org&gt;.</returns>
+        IEnumerable<Org> GetSubWithOwn(int orgId);
     }
 }

OpenAuth.Domain/OpenAuth.Domain.csproj

@@ -64,6 +64,7 @@
     <Compile Include="Resource.cs" />
     <Compile Include="Role.cs" />
     <Compile Include="Service\AuthoriseService.cs" />
+    <Compile Include="Service\StockManagerService.cs" />
     <Compile Include="Stock.cs" />
     <Compile Include="User.cs" />
     <Compile Include="UserCfg.cs" />

OpenAuth.Domain/Service/AuthoriseService.cs

@@ -109,6 +109,7 @@ namespace OpenAuth.Domain.Service
             }
             else
             {
+                _user = _repository.FindSingle(u => u.Account == name);
                 //用户角色
                 var userRoleIds = _relevanceRepository.Find(u => u.FirstId == _user.Id && u.Key == "UserRole").Select(u => u.SecondId).ToList();
 

OpenAuth.Domain/Service/StockManagerService.cs

@@ -0,0 +1,91 @@
+using System;
+using System.Linq;
+using System.Linq.Expressions;
+using OpenAuth.Domain.Interface;
+
+namespace OpenAuth.Domain.Service
+{
+    /// <summary>
+    /// 领域服务
+    /// <para>进出库管理服务</para>
+    /// </summary>
+    public class StockManagerService
+    {
+        private IStockRepository _repository;
+        private IOrgRepository _orgRepository;
+        private AuthoriseService _authoriseService;
+
+        public StockManagerService(IStockRepository repository,
+            IOrgRepository orgRepository, AuthoriseService service)
+        {
+            _repository = repository;
+            _orgRepository = orgRepository;
+            _authoriseService = service;
+        }
+
+        /// <summary>
+        /// 根据部门ID得到进出库信息
+        /// </summary>
+        public dynamic Load(string username, int orgId, int pageindex, int pagesize)
+        {
+
+            _authoriseService.GetUserAccessed(username);
+            if (_authoriseService.Orgs.Count == 0) //用户没有任何可见机构
+            {
+                return new
+                {
+                    total = 0,
+                    pageCurrent = pageindex
+                };
+            }
+
+            var orgIds = _authoriseService.Orgs.Select(u => u.Id).ToArray();  //用户可访问的机构ID
+
+            var orgs = _orgRepository.GetSubWithOwn(orgId)   //点击的节点与用户可访问的机构合并
+                .Where(u => orgIds.Contains(u.Id))
+                .Select(u => u.Id).ToArray();
+
+            var keys = _authoriseService.Resources.Select(r => r.Key);    //用户可访问的资源的KEY列表
+
+            //由于库存Stock表开始没有设计资源有关的字段，暂时用User字段代替
+            Expression<Func<Stock, bool>> exp = u => orgs.Contains(u.OrgId) && (u.User == "" || keys.Contains(u.User));
+            var stocks = _repository.Find(pageindex, pagesize, "", exp);
+            int total = _repository.GetCount(exp);
+
+
+            return new
+            {
+                total = total,
+                list = stocks,
+                pageCurrent = pageindex
+            };
+        }
+
+        public Stock Find(int id)
+        {
+            var stock = _repository.FindSingle(u => u.Id == id);
+            if (stock == null) return new Stock();
+
+            return stock;
+        }
+
+        public void Delete(int id)
+        {
+            _repository.Delete(id);
+        }
+
+        public void AddOrUpdate(Stock stock)
+        {
+
+            if (stock.Id == 0)
+            {
+                _repository.Add(stock);
+            }
+            else
+            {
+                _repository.Update(stock);
+            }
+
+        }
+    }
+}

OpenAuth.Mvc/AutofacExt.cs

@@ -46,6 +46,7 @@ namespace OpenAuth.Mvc
             builder.RegisterType<StockManagerApp>();
             builder.RegisterType<RevelanceManagerApp>();
             builder.RegisterType<AuthoriseService>();
+            builder.RegisterType<StockManagerService>();
 
                 // Register your MVC controllers.
             builder.RegisterControllers(typeof(MvcApplication).Assembly);

OpenAuth.Mvc/BllScripts/stockManager.js

@@ -38,8 +38,9 @@ function MainGrid() {
                },
                {
                    name: 'User',
-                   label: '操作人',
+                   label: '可见范围（测试资源使用）',
-                   width: 100
+                   width: 100,
+                   items: [{ '': '全部可见' }, { 'ADMIN': '管理员可见' },{'DEV':'开发可见'}],
                },
                {
                    name: 'Time',
@@ -193,10 +194,10 @@ var editDlg = function () {
             show();
             $('#Id').val(ret.Id);
             $('#Name').val(ret.Name);
-            $('#Number').selectpicker('val', ret.Number);
+            $('#Number').val(ret.Number);
             $('#Price').val(ret.Price);
             $('#Status').selectpicker('val', ret.Status);
-            $('#User').val(ret.User);
+            $('#User').selectpicker('val', ret.User);
             $('#Time').val(ret.Time);
             $('#OrgId').val(ret.OrgId);
             parentTree.show();

OpenAuth.Mvc/Content/js/purl.js

@@ -0,0 +1,267 @@
+/*
+ * Purl (A JavaScript URL parser) v2.3.1
+ * Developed and maintanined by Mark Perkins, mark@allmarkedup.com
+ * Source repository: https://github.com/allmarkedup/jQuery-URL-Parser
+ * Licensed under an MIT-style license. See https://github.com/allmarkedup/jQuery-URL-Parser/blob/master/LICENSE for details.
+ */
+
+;(function(factory) {
+    if (typeof define === 'function' && define.amd) {
+        define(factory);
+    } else {
+        window.purl = factory();
+    }
+})(function() {
+
+    var tag2attr = {
+            a       : 'href',
+            img     : 'src',
+            form    : 'action',
+            base    : 'href',
+            script  : 'src',
+            iframe  : 'src',
+            link    : 'href',
+            embed   : 'src',
+            object  : 'data'
+        },
+
+        key = ['source', 'protocol', 'authority', 'userInfo', 'user', 'password', 'host', 'port', 'relative', 'path', 'directory', 'file', 'query', 'fragment'], // keys available to query
+
+        aliases = { 'anchor' : 'fragment' }, // aliases for backwards compatability
+
+        parser = {
+            strict : /^(?:([^:\/?#]+):)?(?:\/\/((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?))?((((?:[^?#\/]*\/)*)([^?#]*))(?:\?([^#]*))?(?:#(.*))?)/,  //less intuitive, more accurate to the specs
+            loose :  /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/ // more intuitive, fails on relative paths and deviates from specs
+        },
+
+        isint = /^[0-9]+$/;
+
+    function parseUri( url, strictMode ) {
+        var str = decodeURI( url ),
+        res   = parser[ strictMode || false ? 'strict' : 'loose' ].exec( str ),
+        uri = { attr : {}, param : {}, seg : {} },
+        i   = 14;
+
+        while ( i-- ) {
+            uri.attr[ key[i] ] = res[i] || '';
+        }
+
+        // build query and fragment parameters
+        uri.param['query'] = parseString(uri.attr['query']);
+        uri.param['fragment'] = parseString(uri.attr['fragment']);
+
+        // split path and fragement into segments
+        uri.seg['path'] = uri.attr.path.replace(/^\/+|\/+$/g,'').split('/');
+        uri.seg['fragment'] = uri.attr.fragment.replace(/^\/+|\/+$/g,'').split('/');
+
+        // compile a 'base' domain attribute
+        uri.attr['base'] = uri.attr.host ? (uri.attr.protocol ?  uri.attr.protocol+'://'+uri.attr.host : uri.attr.host) + (uri.attr.port ? ':'+uri.attr.port : '') : '';
+
+        return uri;
+    }
+
+    function getAttrName( elm ) {
+        var tn = elm.tagName;
+        if ( typeof tn !== 'undefined' ) return tag2attr[tn.toLowerCase()];
+        return tn;
+    }
+
+    function promote(parent, key) {
+        if (parent[key].length === 0) return parent[key] = {};
+        var t = {};
+        for (var i in parent[key]) t[i] = parent[key][i];
+        parent[key] = t;
+        return t;
+    }
+
+    function parse(parts, parent, key, val) {
+        var part = parts.shift();
+        if (!part) {
+            if (isArray(parent[key])) {
+                parent[key].push(val);
+            } else if ('object' == typeof parent[key]) {
+                parent[key] = val;
+            } else if ('undefined' == typeof parent[key]) {
+                parent[key] = val;
+            } else {
+                parent[key] = [parent[key], val];
+            }
+        } else {
+            var obj = parent[key] = parent[key] || [];
+            if (']' == part) {
+                if (isArray(obj)) {
+                    if ('' !== val) obj.push(val);
+                } else if ('object' == typeof obj) {
+                    obj[keys(obj).length] = val;
+                } else {
+                    obj = parent[key] = [parent[key], val];
+                }
+            } else if (~part.indexOf(']')) {
+                part = part.substr(0, part.length - 1);
+                if (!isint.test(part) && isArray(obj)) obj = promote(parent, key);
+                parse(parts, obj, part, val);
+                // key
+            } else {
+                if (!isint.test(part) && isArray(obj)) obj = promote(parent, key);
+                parse(parts, obj, part, val);
+            }
+        }
+    }
+
+    function merge(parent, key, val) {
+        if (~key.indexOf(']')) {
+            var parts = key.split('[');
+            parse(parts, parent, 'base', val);
+        } else {
+            if (!isint.test(key) && isArray(parent.base)) {
+                var t = {};
+                for (var k in parent.base) t[k] = parent.base[k];
+                parent.base = t;
+            }
+            if (key !== '') {
+                set(parent.base, key, val);
+            }
+        }
+        return parent;
+    }
+
+    function parseString(str) {
+        return reduce(String(str).split(/&|;/), function(ret, pair) {
+            try {
+                pair = decodeURIComponent(pair.replace(/\+/g, ' '));
+            } catch(e) {
+                // ignore
+            }
+            var eql = pair.indexOf('='),
+                brace = lastBraceInKey(pair),
+                key = pair.substr(0, brace || eql),
+                val = pair.substr(brace || eql, pair.length);
+
+            val = val.substr(val.indexOf('=') + 1, val.length);
+
+            if (key === '') {
+                key = pair;
+                val = '';
+            }
+
+            return merge(ret, key, val);
+        }, { base: {} }).base;
+    }
+
+    function set(obj, key, val) {
+        var v = obj[key];
+        if (typeof v === 'undefined') {
+            obj[key] = val;
+        } else if (isArray(v)) {
+            v.push(val);
+        } else {
+            obj[key] = [v, val];
+        }
+    }
+
+    function lastBraceInKey(str) {
+        var len = str.length,
+            brace,
+            c;
+        for (var i = 0; i < len; ++i) {
+            c = str[i];
+            if (']' == c) brace = false;
+            if ('[' == c) brace = true;
+            if ('=' == c && !brace) return i;
+        }
+    }
+
+    function reduce(obj, accumulator){
+        var i = 0,
+            l = obj.length >> 0,
+            curr = arguments[2];
+        while (i < l) {
+            if (i in obj) curr = accumulator.call(undefined, curr, obj[i], i, obj);
+            ++i;
+        }
+        return curr;
+    }
+
+    function isArray(vArg) {
+        return Object.prototype.toString.call(vArg) === "[object Array]";
+    }
+
+    function keys(obj) {
+        var key_array = [];
+        for ( var prop in obj ) {
+            if ( obj.hasOwnProperty(prop) ) key_array.push(prop);
+        }
+        return key_array;
+    }
+
+    function purl( url, strictMode ) {
+        if ( arguments.length === 1 && url === true ) {
+            strictMode = true;
+            url = undefined;
+        }
+        strictMode = strictMode || false;
+        url = url || window.location.toString();
+
+        return {
+
+            data : parseUri(url, strictMode),
+
+            // get various attributes from the URI
+            attr : function( attr ) {
+                attr = aliases[attr] || attr;
+                return typeof attr !== 'undefined' ? this.data.attr[attr] : this.data.attr;
+            },
+
+            // return query string parameters
+            param : function( param ) {
+                return typeof param !== 'undefined' ? this.data.param.query[param] : this.data.param.query;
+            },
+
+            // return fragment parameters
+            fparam : function( param ) {
+                return typeof param !== 'undefined' ? this.data.param.fragment[param] : this.data.param.fragment;
+            },
+
+            // return path segments
+            segment : function( seg ) {
+                if ( typeof seg === 'undefined' ) {
+                    return this.data.seg.path;
+                } else {
+                    seg = seg < 0 ? this.data.seg.path.length + seg : seg - 1; // negative segments count from the end
+                    return this.data.seg.path[seg];
+                }
+            },
+
+            // return fragment segments
+            fsegment : function( seg ) {
+                if ( typeof seg === 'undefined' ) {
+                    return this.data.seg.fragment;
+                } else {
+                    seg = seg < 0 ? this.data.seg.fragment.length + seg : seg - 1; // negative segments count from the end
+                    return this.data.seg.fragment[seg];
+                }
+            }
+
+        };
+
+    }
+    
+    purl.jQuery = function($){
+        if ($ != null) {
+            $.fn.url = function( strictMode ) {
+                var url = '';
+                if ( this.length ) {
+                    url = $(this).attr( getAttrName(this[0]) ) || '';
+                }
+                return purl( url, strictMode );
+            };
+
+            $.url = purl;
+        }
+    };
+
+    purl.jQuery(window.jQuery);
+
+    return purl;
+
+});

OpenAuth.Mvc/Content/js/util.js

@@ -0,0 +1,16 @@
+// ***********************************************************************
+// Assembly         : OpenAuth.Mvc
+// Author           : yubaolee
+// Created          : 04-20-2016
+//
+// Last Modified By : yubaolee
+// Last Modified On : 04-20-2016
+// Contact : www.cnblogs.com/yubaolee
+// File: util.js
+// ***********************************************************************
+
+
+//获取URL参数
+function getURLParameter(name) {
+    return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.search) || [, ""])[1].replace(/\+/g, '%20')) || null;
+}

OpenAuth.Mvc/Controllers/StockManagerController.cs

@@ -3,11 +3,13 @@ using OpenAuth.App;
 using OpenAuth.Domain;
 using System;
 using System.Web.Mvc;
-using Infrastructure.Helper;
-using OpenAuth.App.ViewModel;
 
 namespace OpenAuth.Mvc.Controllers
 {
+    /// <summary>
+    /// 进出库管理
+    /// <para>本示例主要演示如何使用用户拥有的机构/资源</para>
+    /// </summary>
     public class StockManagerController : BaseController
     {
         private StockManagerApp _app;
@@ -24,11 +26,6 @@ namespace OpenAuth.Mvc.Controllers
             return View();
         }
 
-        public ActionResult Add(int id = 0)
-        {
-            return View(_app.Find(id));
-        }
-
         //添加或修改Stock
         [HttpPost]
         public string Add(Stock model)
@@ -37,7 +34,6 @@ namespace OpenAuth.Mvc.Controllers
             {
                var newmodel =  new Stock();
                 model.CopyTo(newmodel);
-                newmodel.User = AutofacExt.GetFromFac<LoginApp>().GetLoginUser().User.Account;
                 _app.AddOrUpdate(newmodel);
             }
             catch (Exception ex)
@@ -53,7 +49,7 @@ namespace OpenAuth.Mvc.Controllers
         /// </summary>
         public string Load(int parentId, int pageCurrent = 1, int pageSize = 30)
         {
-            return JsonHelper.Instance.Serialize(_app.Load(parentId, pageCurrent, pageSize));
+            return JsonHelper.Instance.Serialize(_app.Load(User.Identity.Name, parentId, pageCurrent, pageSize));
         }
         
         public string Delete(int Id)

OpenAuth.Mvc/Views/StockManager/Index.cshtml

@@ -52,8 +52,12 @@
                     </tr>
                     <tr>
                         <td>
-                            <label for="User" class="control-label x120">操作人：</label>
+                            <label for="User" class="control-label x120">可见范围：</label>
-                            <input type="text" id="User" name="User" value="" />
+                            <select name="User" id="User" data-toggle="selectpicker">
+                                <option value="" selected="selected">全部可见</option>
+                                <option value="ADMIN">管理员可见</option>
+                                <option value="DEV">开发可见</option>
+                            </select>
                         </td>
                     </tr>
                     <tr>

OpenAuth.Repository/OrgRepository.cs

@@ -38,5 +38,19 @@ namespace OpenAuth.Repository
 
             return Find(u => u.CascadeId.Contains(cascadeId) && u.Id != orgId);
         }
+
+        public IEnumerable<Org> GetSubWithOwn(int orgId)
+        {
+            string cascadeId = "0.";
+            if (orgId != 0)
+            {
+                var org = FindSingle(u => u.Id == orgId);
+                if (org == null)
+                    throw new Exception("未能找到指定对象信息");
+                cascadeId = org.CascadeId;
+            }
+
+            return Find(u => u.CascadeId.Contains(cascadeId));
+        }
     }
 }