Merge branch 'main' of https://gitee.com/dotnetchina/OpenAuth.Net

Infrastructure/Define.cs

@@ -11,6 +11,7 @@
 
         public const string DBTYPE_SQLSERVER = "SqlServer";    //sql server
         public const string DBTYPE_MYSQL = "MySql";    //mysql
+        public const string DBTYPE_PostgreSQL = "PostgreSQL";    //PostgreSQL
         public const string DBTYPE_ORACLE = "Oracle";    //oracle
 
 

Infrastructure/Extensions/SecurityEncDecryptExtension.cs

@@ -7,7 +7,6 @@ namespace Infrastructure.Extensions
 {
     public static class SecurityEncDecryptExtensions
     {
-
         private static byte[] Keys = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F };
         /// <summary>
         /// DES加密字符串
@@ -24,7 +23,7 @@ namespace Infrastructure.Extensions
                 byte[] rgbIV = Keys;
                 byte[] inputByteArray = Encoding.UTF8.GetBytes(encryptString);
 
-                using (var DCSP = Aes.Create())
+                using (var DCSP = DES.Create())
                 {
                     using (MemoryStream mStream = new MemoryStream())
                     {
@@ -41,7 +40,6 @@ namespace Infrastructure.Extensions
             {
                 throw new Exception("密码加密异常" + ex.Message);
             }
-
         }
 
         /// <summary>
@@ -56,7 +54,7 @@ namespace Infrastructure.Extensions
             byte[] rgbKey = Encoding.UTF8.GetBytes(decryptKey.Substring(0, 16));
             byte[] rgbIV = Keys;
             byte[] inputByteArray = Convert.FromBase64String(decryptString.Replace('_', '+').Replace('~', '/'));
-            using (var DCSP = Aes.Create())
+            using (var DCSP = DES.Create())
             {
                 using (MemoryStream mStream = new MemoryStream())
                 {
@@ -69,8 +67,8 @@ namespace Infrastructure.Extensions
                     }
                 }
             }
-
         }
+
         public static bool TryDecryptDES(this string decryptString, string decryptKey, out string result)
         {
             result = "";

OpenAuth.App/BuilderTable/BuilderTableColumnApp.cs

@@ -40,7 +40,9 @@ namespace OpenAuth.App
                 objs = objs.Where(u => u.ColumnName.Contains(request.key));
             }
 
-            result.data =await objs.OrderBy(u => u.ColumnName)
+            result.data =await objs.OrderByDescending(u => u.IsList)
+                .ThenBy(u=>u.Sort)
+                .ThenBy(u =>u.ColumnName)
                 .Skip((request.page - 1) * request.limit)
                 .Take(request.limit).ToListAsync();
             result.count =await objs.CountAsync();

OpenAuth.App/Category/CategoryApp.cs

@@ -69,6 +69,7 @@ namespace OpenAuth.App
             var user = _auth.GetCurrentUser().User;
             UnitWork.Update<Category>(u => u.Id == obj.Id, u => new Category
             {
+                Name = obj.Name,
                 Enable = obj.Enable,
                 DtValue = obj.DtValue,
                 DtCode = obj.DtCode,

OpenAuth.Mvc/Controllers/ModuleManagerController.cs

@@ -1,12 +1,15 @@
-using Infrastructure;
+using System;
-using OpenAuth.App;
+using System.Collections.Generic;
-using System;
 using System.Linq;
+
+using Infrastructure;
+
 using Microsoft.AspNetCore.Mvc;
+
+using OpenAuth.App;
 using OpenAuth.App.Interface;
 using OpenAuth.App.Response;
 using OpenAuth.Repository.Domain;
-using System.Collections.Generic;
 
 namespace OpenAuth.Mvc.Controllers
 {

OpenAuth.Mvc/Controllers/UserSessionController.cs

@@ -140,6 +140,10 @@ namespace OpenAuth.Mvc.Controllers
         {
             try
             {
+                if (string.IsNullOrEmpty(moduleCode))
+                {
+                    throw new Exception("模块标识为空，不能分配可见字段");
+                }
                 var list = _authStrategyContext.GetTableColumns(moduleCode);
                 return JsonHelper.Instance.Serialize(new TableData
                 {

OpenAuth.Mvc/Models/OpenAuthFilter.cs

@@ -1,8 +1,10 @@
 using System.Linq;
 using System.Reflection;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
+
 using OpenAuth.App;
 using OpenAuth.App.Interface;
 using OpenAuth.Repository.Domain;

OpenAuth.Mvc/Views/ModuleManager/Assign.cshtml

@@ -41,4 +41,4 @@
 </div>
 
 <script type="text/javascript" src="/layui/layui.js"></script>
-<script type="text/javascript" src="/userJs/assignModule.js?v=3.3"></script>
+<script type="text/javascript" src="/userJs/assignModule.js?v=3.4"></script>

OpenAuth.Mvc/appsettings.Production.json

@@ -15,7 +15,7 @@
     "SSOPassport": "http://localhost:52789",
     "Version": "demo",
     "DbTypes": {
-      "OpenAuthDBContext":"MySql" //数据库类型：SqlServer、MySql、Oracle
+      "OpenAuthDBContext":"MySql" //数据库类型：SqlServer、MySql、Oracle、PostgreSQL
     },
     "RedisConf": "redistest.cq-p.com.cn:8001,password=share_redis@123",  //redis配置
     "HttpHost": "http://*:1802" //启动绑定地址及端口

OpenAuth.Mvc/appsettings.json

@@ -9,6 +9,7 @@
   "ConnectionStrings": {
     "OpenAuthDBContext": "Data Source=.;Initial Catalog=OpenAuthDB;User=sa;Password=000000"
     //"OpenAuthDBContext": "server=127.0.0.1;user id=root;database=openauthdb;password=000000" //my sql
+    //"OpenAuthDBContext": "Host=localhost;Port=5432;Database=OpenAuth;Username=postgres;Password=123;"  //PostgreSQL
   },
   "AppSetting": {
     //"IdentityServerUrl": "http://localhost:12796", //IdentityServer服务器地址。如果为空，则不启用OAuth认证
@@ -16,7 +17,7 @@
     "SSOPassport": "http://localhost:52789",
     "Version": "1.0", //如果为demo，则可以防止post提交
     "DbTypes": {
-      "OpenAuthDBContext":"SqlServer" //数据库类型：SqlServer、MySql、Oracle
+      "OpenAuthDBContext": "SqlServer"  //数据库类型：SqlServer、MySql、Oracle、PostgreSQL
     },
     "RedisConf": "redistest.cq-p.com.cn:8001,password=share_redis@123",  //redis配置
     "HttpHost": "http://*:1802" //启动绑定地址及端口

OpenAuth.Mvc/wwwroot/userJs/assignModule.js

@@ -243,9 +243,9 @@ layui.config({
         console.log(obj.type); //如果触发的是全选，则为：all，如果触发的是单选，则为：one
         var ids=[];
         if(obj.type=="all"){
-            ids = layui.table.checkStatus('propList').data.map(function (m) { return m.Key; });
+            ids = layui.table.checkStatus('propList').data.map(function (m) { return m.ColumnName; });
         }else{
-            ids =[obj.data.Key]
+            ids =[obj.data.ColumnName]
         }
 
         var url = "/AccessObjs/AssignDataProperty";

OpenAuth.Repository/OpenAuth.Repository.csproj

@@ -16,6 +16,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.10" />
     <PackageReference Include="Moq" Version="4.13.1" />
     <PackageReference Include="MySql.Data" Version="8.0.13" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.10" />
 
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />

OpenAuth.Repository/OpenAuthDBContext.cs

@@ -1,14 +1,16 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
+
 using Infrastructure;
 using Infrastructure.Extensions;
 using Infrastructure.Utilities;
+
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+
 using OpenAuth.Repository.Domain;
 using OpenAuth.Repository.QueryObj;
 
@@ -65,6 +67,10 @@ namespace OpenAuth.Repository
             {
                 optionsBuilder.UseMySql(connect, new MySqlServerVersion(new Version(8, 0, 11)));
             }
+            else if(dbType == Define.DBTYPE_PostgreSQL)  //PostgreSQL
+            {
+                optionsBuilder.UseNpgsql(connect);
+            }
             else
             {
                 optionsBuilder.UseOracle(connect, options => options.UseOracleSQLCompatibility("11"));

OpenAuth.WebApi/Model/TagByApiExplorerSettingsOperationFilter.cs

@@ -27,7 +27,6 @@ namespace OpenAuth.WebApi.Model
                         {new OpenApiTag {Name = controllerActionDescriptor.ControllerName}};
                 }
             }
-            
         }
     }
 }

OpenAuth.WebApi/appsettings.Production.json

@@ -15,7 +15,7 @@
     "IdentityServerUrl": "", //IdentityServer服务器地址。如果为空，则不启用OAuth认证
     //"IdentityServerUrl": "http://demo.openauth.net.cn:12796", //IdentityServer服务器地址。如果为空，则不启用OAuth认证
     "DbTypes": {
-      "OpenAuthDBContext":"MySql" //数据库类型：SqlServer、MySql、Oracle
+      "OpenAuthDBContext":"MySql" //数据库类型：SqlServer、MySql、Oracle、PostgreSQL
     },
     "UploadPath": "", //附件上传的路径，如果为空则保存在站点根目录
     "RedisConf": "your_redis_server:6379,password=your_redis_password",  //redis配置信息

OpenAuth.WebApi/appsettings.json

@@ -7,7 +7,9 @@
   "AllowedHosts": "*",
   "DataProtection": "temp-keys/",
   "ConnectionStrings": {
-    "OpenAuthDBContext": "Data Source=.;Initial Catalog=OpenAuthPro;User=sa;Password=000000"
+    "OpenAuthDBContext": "Data Source=.;Initial Catalog=OpenAuthDB;User=sa;Password=000000"
+    //"OpenAuthDBContext": "server=127.0.0.1;user id=root;database=openauthdb;password=000000" //my sql
+    //"OpenAuthDBContext": "Host=localhost;Port=5432;Database=OpenAuth;Username=postgres;Password=123;"  //PostgreSQL
     //"OpenAuthDBContext2": "DATA SOURCE=192.168.0.118:1521/YUBAO;PASSWORD=000000;Validate Connection=true;PERSIST SECURITY INFO=True;USER ID=yubaolee;" //Oracle
     //"OpenAuthDBContext3": "server=127.0.0.1;user id=root;database=openauthpro;password=000000" //my sql
   },
@@ -15,7 +17,8 @@
     "IdentityServerUrl": "",  //IdentityServer服务器地址。如果为空，则不启用OAuth认证
     // "IdentityServerUrl": "http://localhost:12796", //IdentityServer服务器地址。如果为空，则不启用OAuth认证
     "DbTypes": {
-        "OpenAuthDBContext":"SqlServer" //数据库类型：SqlServer、MySql、Oracle
+      "OpenAuthDBContext": "SqlServer"  //数据库类型：SqlServer、MySql、Oracle、PostgreSQL
+      //        "OpenAuthDBContext":"PostgreSQL" 
       //        ,"OpenAuthDBContext2":"Oracle"
       //        ,"OpenAuthDBContext3":"MySql"
     },