lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-07-15 14:04:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
yubaolee 2023-05-06 09:19:30 +08:00
commit f18cf9ecc5
17 changed files with 1735 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Infrastructure/Define.cs
View File

@ -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

8
Infrastructure/Extensions/SecurityEncDecryptExtension.cs
View File

@ -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 = "";

4
OpenAuth.App/BuilderTable/BuilderTableColumnApp.cs
View File

@ -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();

1
OpenAuth.App/Category/CategoryApp.cs
View File

@ -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,

11
OpenAuth.Mvc/Controllers/ModuleManagerController.cs
View File

@ -1,12 +1,15 @@
using Infrastructure;
using OpenAuth.App;
using System;
using System;
using System.Collections.Generic;
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
{

4
OpenAuth.Mvc/Controllers/UserSessionController.cs
View File

@ -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
{

2
OpenAuth.Mvc/Models/OpenAuthFilter.cs
View File

@ -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;

2
OpenAuth.Mvc/Views/ModuleManager/Assign.cshtml
View File

@ -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>

2
OpenAuth.Mvc/appsettings.Production.json
View File

@ -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" //启动绑定地址及端口

3
OpenAuth.Mvc/appsettings.json
View File

@ -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" //启动绑定地址及端口

4
OpenAuth.Mvc/wwwroot/userJs/assignModule.js
View File

@ -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";

1
OpenAuth.Repository/OpenAuth.Repository.csproj
View File

@ -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" />

8
OpenAuth.Repository/OpenAuthDBContext.cs
View File

@ -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"));

1
OpenAuth.WebApi/Model/TagByApiExplorerSettingsOperationFilter.cs
View File

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

2
OpenAuth.WebApi/appsettings.Production.json
View File

@ -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配置信息

7
OpenAuth.WebApi/appsettings.json
View File

@ -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"
},

1621
postgresql初始化备份/db_back.sql Normal file
View File

File diff suppressed because it is too large Load Diff