CRUD

Author: magicodes

Magicodes.Core.Web/GlobalConfigurationManager.cs

@@ -12,6 +12,9 @@
 using System.Web.OData.Builder;
 using System.Web.Routing;
 using System.Web.OData.Extensions;
+using Magicodes.Web.Interfaces;
+using System.Web;
+using System.Text.RegularExpressions;
 
 //======================================================================
 //
@@ -129,7 +132,6 @@ static void GlobalConfigurationManager_OnConfiguration_Config_MVC(object sender,
                         break;
                     case MvcPlusTypes.MVC:
                         {
-                            //var pluginNameSuffix = mvcPlus.PlusName.StartsWith("magicodes.", StringComparison.CurrentCultureIgnoreCase) ? mvcPlus.PlusName.Substring(10) : mvcPlus.PlusName;
                             RouteTable.Routes.MapRoute(name: "MCV_" + mvcPlus.PlusName, url: "_{pluginName}/{controller}/{action}/{id}", defaults: new { action = "Index", id = UrlParameter.Optional, pluginName = mvcPlus.PlusName });
                         }
                         break;
@@ -138,6 +140,49 @@ static void GlobalConfigurationManager_OnConfiguration_Config_MVC(object sender,
                 }
 
             }
+            //注册请求事件，处理插件资源加载问题
+            GlobalApplicationObject.Current.EventsManager.BeginRequest += (requestSender,arg) =>
+            {
+                //应用程序对象
+                var application = (HttpApplication)requestSender;
+                //HTTP上下文对象
+                var context = application.Context;
+                #region 如果非站内请求，随它去吧
+                if (!context.Request.IsLocal)
+                    return; 
+                #endregion
+                #region 如果非插件类请求，随它去吧
+                if (!context.Request.Url.AbsolutePath.StartsWith("/Magicodes.", StringComparison.CurrentCultureIgnoreCase))
+                    return; 
+                #endregion
+                foreach (var plusItem in MvcConfigManager.MVCPlusList)
+                {
+                    //插件名称
+                    var plusName = plusItem.PlusName;
+                    //插件路径
+                    var plusPath = "/plus/Plugins/" + plusName;
+                    //匹配当前插件路径
+                    if (context.Request.Url.AbsolutePath.StartsWith("/" + plusName + "/", StringComparison.CurrentCultureIgnoreCase))
+                    {
+                        //非bundles路径，则跳转到相应插件目录加载资源
+                        if (!context.Request.Url.AbsolutePath.StartsWith("/" + plusName + "/bundles", StringComparison.CurrentCultureIgnoreCase))
+                        {
+                            var url = Regex.Replace(context.Request.Url.AbsolutePath, "/" + plusName + "/", plusPath + "/", RegexOptions.IgnoreCase);
+                            context.Response.Redirect(url);
+                        }
+                        else
+                        {
+                            //如果Accept不为*/*或者text/css（脚本和样式）,则去掉bundles进行跳转
+                            if (!context.Request.AcceptTypes.Any(t => t.Equals("text/css", StringComparison.OrdinalIgnoreCase) || t.Equals("*/*", StringComparison.OrdinalIgnoreCase)))
+                            {
+                                var url = Regex.Replace(context.Request.Url.AbsolutePath, "/" + plusName + "/bundles/", plusPath + "/", RegexOptions.IgnoreCase);
+                                context.Response.Redirect(url);
+                            }
+                        }
+                        return;
+                    }
+                }
+            };
         }
         static void GlobalConfigurationManager_OnConfiguration_Config_WEBAPI(object sender, EventArgs e)
         {

Magicodes.Core.Web/Magicodes.Core.Web.csproj

@@ -148,7 +148,6 @@
     <Compile Include="Editor\EditorController.cs" />
     <Compile Include="Controllers\JSONActionResult.cs" />
     <Compile Include="Controllers\AdminControllerBase.cs" />
-    <Compile Include="Controllers\AdminODataControllerBase.cs" />
     <Compile Include="Controllers\Viewer\DocumentViewerController.cs" />
     <Compile Include="Controllers\ODataControllerBase.cs" />
     <Compile Include="Controllers\PlusControllerBase.cs" />
@@ -166,6 +165,7 @@
     <Compile Include="Mvc\MvcConfigManager.cs" />
     <Compile Include="Mvc\PluginControllerFactory.cs" />
     <Compile Include="Mvc\PluginRazorViewEngine.cs" />
+    <Compile Include="OData\ODataAdminControllerbase.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Security\AntiXssAttribute.cs" />
     <Compile Include="Security\AuthHelper.cs" />

Magicodes.Core.Web/Controllers/AdminODataControllerBase.cs renamed to Magicodes.Core.Web/OData/ODataAdminControllerbase.cs

@@ -1,31 +1,28 @@
-using Magicodes.Web.Interfaces;
+using Magicodes.Core.Web.Controllers;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Web.OData;
-using Microsoft.AspNet.Identity;
-using System.Web.Mvc;
-using Magicodes.Core.Web.Security;
-using System.Web;
-using System.Net;
+using System.Web.Http;
+
 //======================================================================
 //
 //        Copyright (C) 2014-2016 Magicodes团队    
 //        All rights reserved
 //
-//        filename :ODataControllerBase
+//        filename :ODataBaseControllerbase
 //        description :
 //
-//        created by 雪雁 at  2014/11/12 22:20:56
+//        created by 雪雁 at  2015/2/6 14:04:20
 //        http://www.magicodes.net
 //
 //======================================================================
-namespace Magicodes.Core.Web.Controllers
+namespace Magicodes.Core.Web.OData
 {
-    public class AdminODataControllerBase : ODataControllerBase
+    [Authorize]
+    public class ODataAdminControllerbase : ODataControllerBase
     {
-        
+       
     }
 }

Magicodes.Core/Config/ConfigManager.cs

@@ -72,6 +72,7 @@ public override void SaveConfig<T>(T configType)
             lock (_locker)
             {
                 var path = Path.Combine(GlobalApplicationObject.Current.ApplicationContext.SitePaths.SiteConfigDirPath, typeof(T).Name + ".config");
+                configType.UpdateTime = DateTime.Now;
                 SerializeHelper.Save(configType, path);
                 //Configs.AddOrUpdate(typeof(T), configType, (tKey, existingVal) => { return configType; });
             }

Magicodes.Services.Mvc/Controller/UsersODtataController.cs

@@ -14,6 +14,7 @@
 using Magicodes.Core.Web.Controllers;
 using Magicodes.Models.Mvc.Models.Account;
 using Magicodes.Services.Mvc.ViewModels;
+using Magicodes.Core.Web.OData;
 
 //======================================================================
 //
@@ -30,7 +31,7 @@
 namespace Magicodes.Services.Mvc.Controller
 {
     [ODataRoutePrefix("Users")]
-    public class UsersODtataController : ODataControllerBase
+    public class UsersODtataController : ODataAdminControllerbase
     {
         private AppDbContext db = new AppDbContext();
         UserManager<AppUser, string> userManager;

Magicodes.Web.Interfaces/Data/API/SiteNavs/SiteAdminNavigationBase.cs

@@ -1,6 +1,7 @@
 using Magicodes.Web.Interfaces.Models;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
@@ -29,12 +30,14 @@ public class SiteAdminNavigationBase<TUserKeyType> : CommonBusinessModelBase<Gui
         /// <summary>
         /// 父级Id
         /// </summary>
+        [Display(Name = "父级Id")]
         public Guid? ParentId { get; set; }
         /// <summary>
         /// 显示名称
         /// </summary>
         [MaxLength(100)]
         [Display(Name = "显示文本")]
+        [Required]
         public string Text { get; set; }
         /// <summary>
         /// 菜单链接
@@ -74,11 +77,14 @@ public class SiteAdminNavigationBase<TUserKeyType> : CommonBusinessModelBase<Gui
         /// 插件Id
         /// </summary>
         [Display(Name = "插件Id")]
+        [Description("为插件唯一标识，请不要更改。")]
+        [ReadOnly(true)]
         public Guid? PlusId { get; set; }
         /// <summary>
         /// 排序号
         /// </summary>
         [Display(Name = "排序号")]
+        [Description("排序号，越小越靠前。")]
         public int SortNo { get; set; }
     }
 }

Magicodes.Web/Magicodes.Web.csproj

@@ -2045,7 +2045,7 @@
     <Content Include="Scripts\knockout\knockout.mapping.min.js.map">
       <DependentUpon>knockout.mapping.min.js</DependentUpon>
     </Content>
-    <Content Include="Upload\Magicodes.NET框架说明文档.pdf" />
+    <Content Include="Scripts\Upload\Magicodes.NET框架说明文档.pdf" />
     <Content Include="Scripts\knockout\knockout.min.js.map">
       <DependentUpon>knockout.min.js</DependentUpon>
     </Content>