同步OpenAuth.Core

修复mvc三级菜单；
Reposiroty单元测试读取webapi配置文件;
修复日志打印2次；

OpenAuth.App/AuthStrategies/NormalAuthStrategy.cs

@@ -126,6 +126,14 @@ namespace OpenAuth.App
         public List<KeyDescription> GetProperties(string moduleCode)
         {
             var allprops = _dbExtension.GetProperties(moduleCode);
+            
+            //如果是系统模块，直接返回所有字段。防止开发者把模块配置成系统模块，还在外层调用loginContext.GetProperties("xxxx");
+            bool? isSysModule = UnitWork.FirstOrDefault<Module>(u => u.Code == moduleCode)?.IsSys;
+            if (isSysModule!= null && isSysModule.Value)
+            {
+                return allprops;
+            }
+            
             var props =UnitWork.Find<Relevance>(u =>
                     u.Key == Define.ROLEDATAPROPERTY && _userRoleIds.Contains(u.FirstId) && u.SecondId == moduleCode)
                 .Select(u => u.ThirdId);

OpenAuth.App/FlowInstanceApp.cs

@@ -98,7 +98,7 @@ namespace OpenAuth.App
             UnitWork.Add(flowInstance);
             wfruntime.flowInstanceId = flowInstance.Id;
 
-            if (flowInstance.FrmType == 1)
+            if (flowInstance.FrmType == 1) //如果是开发者自定义的表单
             {
                 var t = Type.GetType("OpenAuth.App."+ flowInstance.DbName +"App");
                 ICustomerForm icf = (ICustomerForm) _serviceProvider.GetService(t);

OpenAuth.App/Interface/ICustomerForm.cs

@@ -1,7 +1,16 @@
 namespace OpenAuth.App.Interface
 {
+    /// <summary>
+    /// 开发者自定义表单的统一接口
+    /// <para>例如：FrmLeaveReqApp为请假表单对应的应用层，实现该接口，可以自动向数据库中插入对应的记录</para>
+    /// </summary>
     public interface  ICustomerForm
     {
+        /// <summary>
+        /// 该接口定义自定义表单模式时需实现向数据库写入表单数据
+        /// </summary>
+        /// <param name="flowInstanceId">表单对应的流程实例ID</param>
+        /// <param name="frmData">表单数据</param>
         void Add(string flowInstanceId, string frmData);
     }
 }

OpenAuth.Mvc/Program.cs

@@ -17,9 +17,6 @@ namespace OpenAuth.Mvc
                 .ConfigureLogging((hostingContext, logging) =>
                 {
                     logging.ClearProviders(); //去掉默认的日志
-                    logging.AddFilter("System", LogLevel.Error);
-                    logging.AddFilter("Microsoft", LogLevel.Error);
-                    logging.AddLog4Net();
                 })
                .UseServiceProviderFactory(new AutofacServiceProviderFactory())   //将默认ServiceProviderFactory指定为AutofacServiceProviderFactory
                 .ConfigureWebHostDefaults(webBuilder =>

OpenAuth.Mvc/Startup.cs

@@ -109,8 +109,10 @@ namespace OpenAuth.Mvc
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostEnvironment env)
+        public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFactory loggerFactory)
         {
+            loggerFactory.AddLog4Net();
+            
             app.UseAuthentication();
             if (env.IsDevelopment())
             {

OpenAuth.Mvc/appsettings.Development.json

@@ -2,8 +2,9 @@
   "Logging": {
     "LogLevel": {
       "Default": "Debug",
-      "System": "Information",
+      "System": "Error",
-      "Microsoft": "Information"
+      "Microsoft": "Error",
+      "Microsoft.EntityFrameworkCore.Database.Command": "Information"
     }
   }
 }

OpenAuth.Mvc/wwwroot/css/main.css

@@ -202,3 +202,11 @@
 	.top_menu .layui-nav-item.showNotice[pc]{ display:none !important; }
 	.panel{ width:100%; }
 }
+
+ol li a {
+	background-color: rgba(0,0,0,1) !important;
+}
+
+.three_this {
+	background-color: #808080 !important;
+}

OpenAuth.Mvc/wwwroot/js/index.js

@@ -11,6 +11,22 @@ layui.config({
 			url: "/UserSession/GetModulesTree" //获取菜单json地址
 		});
 
+	$(".menu_three").on("click", function () {
+
+		$(this).next().toggle();
+		$.each($(this).parent().siblings(), function (i, e) {
+
+			$(e).find("ol").hide();;
+		});
+
+	})
+	$("ol").on("click", "li a", function () {
+		$.each($(this).parent().siblings(), function (i, e) {
+			$(e).find("a").removeClass('three_this')
+		});
+		$(this).addClass('three_this');                            // 添加当前元素的样式
+	})
+
     $.get('/UserSession/GetUserName',
         function(data) {
             $("#username").html(data);

OpenAuth.Mvc/wwwroot/js/leftNav.js

@@ -32,7 +32,37 @@ function navBar(strData){
 				if(data[i].Children[j].Item.IconName != undefined && data[i].Children[j].Item.IconName != ''){
 					ulHtml += '<i class="layui-icon '+ data[i].Children[j].Item.IconName +'"></i>'
 				}
-				ulHtml += '<cite>'+data[i].Children[j].Item.Name+'</cite></a></dd>';
+				ulHtml += '<cite>' + data[i].Children[j].Item.Name + '</cite></a>';
+
+				if (data[i].Children[j].Children != undefined && data[i].Children[j].Children.length > 0) {
+
+					let idx = 0;
+					for (var k = 0; k < data[i].Children[j].Children.length; k++) {
+
+						if (data[i].Children[j].Children[k].Item.Status === -1) continue;
+
+						idx++;
+
+						if (idx == 1) {
+							ulHtml += '<ol class="layui-nav-child">';
+						}
+
+						if (data[i].Children[j].Children[k].target == "_blank") {
+							ulHtml += '<li><a href="javascript:;" data-url="' + data[i].Children[j].Children[k].Item.Url + '" target="' + data[i].Children[j].Children[k].target + '">';
+							
+						} else {
+							ulHtml += '<li><a href="javascript:;" data-url="' + data[i].Children[j].Children[k].Item.Url + '">';
+						}
+						if (data[i].Children[j].Children[k].Item.IconName != undefined && data[i].Children[j].Children[k].Item.IconName != '') {
+							ulHtml += '&nbsp;&nbsp;&nbsp;&nbsp;<i class="layui-icon ' + data[i].Children[j].Children[k].Item.IconName + '"></i>'
+						}
+						ulHtml += '<cite>' + data[i].Children[j].Children[k].Item.Name + '</cite></a ></li > ';
+					}
+
+					if (idx > 0) {
+						ulHtml += '</ol>';
+					}
+				}
 			}
 			ulHtml += "</dl>";
 		}else{

OpenAuth.Repository/Domain/FlowInstance.cs

@@ -105,8 +105,10 @@ namespace OpenAuth.Repository.Domain
         public string FrmData { get; set; }
         /// <summary>
 	    /// 表单类型
+	    /// <para>0：动态表单；1：开发者自定义表单；2：拖动表单</para>
+	    /// <para>当类型为1时，流程实例必需有DbName，用于直接向对应数据库表中写入数据</para>
 	    /// </summary>
-         [Description("表单类型")]
+         [Description("表单类型：0：动态表单；1：开发者自定义表单；2：拖动表单")]
         public int FrmType { get; set; }
         /// <summary>
 	    /// 表单中的控件属性描述

OpenAuth.Repository/Test/TestBase.cs

@@ -1,4 +1,6 @@
-using System.Reflection;
+using System;
+using System.IO;
+using System.Reflection;
 using Autofac;
 using Autofac.Extensions.DependencyInjection;
 using Infrastructure;
@@ -6,6 +8,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
@@ -32,14 +35,27 @@ namespace OpenAuth.Repository.Test
             serviceCollection.AddScoped(typeof(IUnitWork<>), typeof(UnitWork<>));
 
             //模拟配置文件
-            var optionMock = new Mock<IOptions<AppSetting>>();
+            //读取OpenAuth.WebApi的配置文件用于单元测试
-            optionMock.Setup(x => x.Value).Returns(new AppSetting { DbType = Define.DBTYPE_MYSQL });
+            var path = AppContext.BaseDirectory;
-            serviceCollection.AddScoped(x => optionMock.Object);
+            int pos = path.IndexOf("OpenAuth.Repository");
+            var basepath = Path.Combine(path.Substring(0,pos) ,"OpenAuth.WebApi");
+            IConfiguration config = new ConfigurationBuilder()
+                .SetBasePath(basepath)
+                .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+                .AddJsonFile("appsettings.Development.json", optional: true)
+                .AddEnvironmentVariables()
+                .Build();
+            Console.WriteLine($"单元测试数据库信息:{config.GetSection("AppSetting")["DbType"]}/{config.GetSection("ConnectionStrings")["OpenAuthDBContext"]}");
+
+            //添加log4net
+            serviceCollection.AddLogging(builder =>
+            {
+                builder.ClearProviders(); //去掉默认的日志
+                builder.AddConfiguration(config.GetSection("Logging"));  //读取配置文件中的Logging配置
+            });
+            //注入OpenAuth.WebApi配置文件
+            serviceCollection.AddScoped(x => config);
             
-            //模拟多租户id
-            var configMock = new Mock<IConfiguration>();
-            configMock.Setup(x => x.GetSection("ConnectionStrings")[Define.TENANT_ID]).Returns("");
-            serviceCollection.AddScoped(x => configMock.Object);
 
             var httpContextAccessorMock = new Mock<IHttpContextAccessor>();
             httpContextAccessorMock.Setup(x => x.HttpContext.Request.Query[Define.TOKEN_NAME]).Returns("tokentest");
@@ -47,8 +63,7 @@ namespace OpenAuth.Repository.Test
 
             serviceCollection.AddScoped(x => httpContextAccessorMock.Object);
 
-            serviceCollection.AddDbContext<OpenAuthDBContext>(options =>
+            serviceCollection.AddDbContext<OpenAuthDBContext>();
-                options.UseSqlServer("Data Source=.;Initial Catalog=OpenAuthDB;User=sa;Password=000000;Integrated Security=True"));
 
             var builder = new ContainerBuilder();
 

OpenAuth.Repository/Test/TestTransaction.cs

@@ -82,5 +82,22 @@ namespace OpenAuth.Repository.Test
                 Account = "Trans2_" + user.Account
             });
         }
+
+
+        [Test]
+        public void MultiUpdate()
+        {
+            var unitWork = _autofacServiceProvider.GetService<IUnitWork<OpenAuthDBContext>>();
+
+            var users = unitWork.Find<User>(u => u.Account.Contains("test"));
+            foreach (var user in users)
+            {
+                user.Name  = "user_" + DateTime.Now.ToString("yyyy_MM_dd HH:mm:ss");
+                unitWork.Update(user);
+            }
+            
+            unitWork.Save();
+            
+        }
     }
 }

OpenAuth.WebApi/Program.cs

@@ -17,7 +17,7 @@ namespace OpenAuth.WebApi
                 .ConfigureLogging((hostingContext, logging) =>
                 {
                     logging.ClearProviders(); //去掉默认的日志
-                    logging.AddLog4Net();
+                    // logging.AddLog4Net();
                 })
                 .UseServiceProviderFactory(
                     new AutofacServiceProviderFactory()) //将默认ServiceProviderFactory指定为AutofacServiceProviderFactory