diff --git a/OpenAuth.App/BaseApp/AppManager/AppManager.cs b/OpenAuth.App/AppManager/AppManager.cs similarity index 93% rename from OpenAuth.App/BaseApp/AppManager/AppManager.cs rename to OpenAuth.App/AppManager/AppManager.cs index ff95b0f..3059988 100644 --- a/OpenAuth.App/BaseApp/AppManager/AppManager.cs +++ b/OpenAuth.App/AppManager/AppManager.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; -using OpenAuth.App.Interface; +using OpenAuth.BaseApp; using OpenAuth.App.Request; +using OpenAuth.Auth.Interface; using OpenAuth.Repository; using OpenAuth.Repository.Domain; using SqlSugar; diff --git a/OpenAuth.App/BaseApp/AppManager/Request/QueryAppListReq.cs b/OpenAuth.App/AppManager/Request/QueryAppListReq.cs similarity index 50% rename from OpenAuth.App/BaseApp/AppManager/Request/QueryAppListReq.cs rename to OpenAuth.App/AppManager/Request/QueryAppListReq.cs index 20081a0..177a2c0 100644 --- a/OpenAuth.App/BaseApp/AppManager/Request/QueryAppListReq.cs +++ b/OpenAuth.App/AppManager/Request/QueryAppListReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using Utils.Web.Model; + +namespace OpenAuth.App.Request { public class QueryAppListReq : PageReq { diff --git a/OpenAuth.App/AuthContextFactory.cs b/OpenAuth.App/AuthContextFactory.cs index 759b791..064cba6 100644 --- a/OpenAuth.App/AuthContextFactory.cs +++ b/OpenAuth.App/AuthContextFactory.cs @@ -1,4 +1,6 @@ using Infrastructure; +using OpenAuth.Auth.AuthStrategies; +using OpenAuth.Auth.Interface; using OpenAuth.Repository; using SqlSugar; diff --git a/OpenAuth.App/AutofacExt.cs b/OpenAuth.App/AutofacExt.cs index 838e004..cfb625f 100644 --- a/OpenAuth.App/AutofacExt.cs +++ b/OpenAuth.App/AutofacExt.cs @@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyModel; using OpenAuth.App.Interface; using OpenAuth.App.SSO; +using OpenAuth.Auth.Interface; using OpenAuth.Repository; using SqlSugar; diff --git a/OpenAuth.App/BaseApp/Base/SqlSugarBaseApp.cs b/OpenAuth.App/BaseApp/Base/SqlSugarBaseApp.cs deleted file mode 100644 index 7817199..0000000 --- a/OpenAuth.App/BaseApp/Base/SqlSugarBaseApp.cs +++ /dev/null @@ -1,122 +0,0 @@ -using Microsoft.Extensions.Configuration; -using OpenAuth.App.FormScheme.FormHelpers; -using OpenAuth.App.Interface; -using SqlSugar; - -namespace OpenAuth.App.BaseApp.Base -{ - public abstract class SqlSugarBaseApp - where T : class, new() - where TDbContext : SugarUnitOfWork, new() - { - - /// - /// 用于普通的数据库操作 - /// - protected ISimpleClient Repository; - /// - /// 用于事务操作 - /// - protected ISugarUnitOfWork UnitWork; - - protected IAuth _auth; - - - public SqlSugarBaseApp(ISugarUnitOfWork unitWork, ISimpleClient repository, IAuth auth) - { - UnitWork = unitWork; - Repository = repository; - _auth = auth; - } - - public SqlSugarClient CodeClient(string code, IConfiguration config) - { - if (string.IsNullOrEmpty(code) || code == "hcsystemdb") - { - return new SqlSugarClient(new ConnectionConfig() - { - DbType = SqlSugar.DbType.PostgreSQL, - ConnectionString = config.GetConnectionString("OpenAuthDBContext"), - IsAutoCloseConnection = true, - MoreSettings = new SqlSugar.ConnMoreSettings() - { - //PgSqlIsAutoToLower = false, - //PgSqlIsAutoToLowerCodeFirst = false, - IsAutoToUpper = false, - - DatabaseModel = DbType.PostgreSQL - } - }, - db => - { - //单例参数配置，所有上下文生效 - db.Aop.OnLogExecuting = (sql, pars) => - { - //Console.WriteLine(sql + "\r\n" + - //db.Utilities.SerializeObject(pars.ToDictionary(it => it.ParameterName, it => it.Value))); - //Console.WriteLine(); - }; - }); - } - else - { - var link = UnitWork.Db.Queryable().Where(r => r.DBName == code).First(); - if (link != null) - { - return new SqlSugarClient(new ConnectionConfig() - { - DbType = DBCommonHelper.GetDbType(link.DBType), - ConnectionString = link.DBConnection, - IsAutoCloseConnection = true, - MoreSettings = new SqlSugar.ConnMoreSettings() - { - //PgSqlIsAutoToLower = false, - //PgSqlIsAutoToLowerCodeFirst = false, - IsAutoToUpper = false, - - DatabaseModel = DbType.PostgreSQL - } - }, - db => - { - //单例参数配置，所有上下文生效 - db.Aop.OnLogExecuting = (sql, pars) => - { - //Console.WriteLine(sql + "\r\n" + - //db.Utilities.SerializeObject(pars.ToDictionary(it => it.ParameterName, it => it.Value))); - //Console.WriteLine(); - }; - }); - } - else - { - throw new Exception("此编码找不到对应数据库：" + code); - } - } - } - - public SqlSugarClient TestLinkClient(string conn, string dbtype) - { - var client = new SqlSugarClient(new ConnectionConfig() - { - DbType = DBCommonHelper.GetDbType(dbtype), - ConnectionString = conn, - IsAutoCloseConnection = true, - MoreSettings = new SqlSugar.ConnMoreSettings() - { - IsAutoToUpper = false, - DatabaseModel = DbType.PostgreSQL - } - }, - db => - { - //单例参数配置，所有上下文生效 - db.Aop.OnLogExecuting = (sql, pars) => - { - }; - }); - return client; - } - - } -} diff --git a/OpenAuth.App/BaseApp/DbTable/DbTableApp.cs b/OpenAuth.App/BaseApp/DbTable/DbTableApp.cs deleted file mode 100644 index 79f7b49..0000000 --- a/OpenAuth.App/BaseApp/DbTable/DbTableApp.cs +++ /dev/null @@ -1,99 +0,0 @@ -using Infrastructure; -using Infrastructure.Extensions; -using Microsoft.Extensions.Configuration; -using OpenAuth.App.Base; -using OpenAuth.App.CodeTable; -using OpenAuth.App.Request; -using OpenAuth.App.FormScheme.FormHelpers; -using OpenAuth.Repository; -using OpenAuth.Repository.Domain; -using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; -using static Dm.net.buffer.ByteArrayBuffer; - -namespace OpenAuth.App.DbTable -{ - public class DbTableApp : SqlSugarBaseApp - { - private IConfiguration _configuration; - public DbTableApp(ISugarUnitOfWork unitWork, ISimpleClient repository, IConfiguration configuration) : base(unitWork, repository, null) - { - _configuration = configuration; - } - - /// - /// 创建表信息 - /// - /// 数据库编码 - /// 数据表信息 - /// - public Response AddTable(string dbcode, DbTableReq dbTableReq) - { - if (dbTableReq.DbColumnInfoList == null || !dbTableReq.DbColumnInfoList.Any()) - throw new Exception("请添加数据列"); - using (var db = this.CodeClient(dbcode, _configuration)) - { - var typeBuilder = db.DynamicBuilder().CreateClass(dbTableReq.TableName, new SugarTable() { TableName = dbTableReq.TableName, TableDescription = dbTableReq.Description }); - dbTableReq.DbColumnInfoList.ForEach(u => - { - typeBuilder.CreateProperty(u.DbColumnName, typeof(string), new SugarColumn() - { - IsPrimaryKey = u.IsPrimarykey == 1, - IsIdentity = u.IsIdentity == 1, - ColumnDataType = u.DataType, - Length = u.Length, - IsNullable = u.IsNullable == 1, - DecimalDigits = u.DecimalDigits, - ColumnDescription = u.ColumnDescription, - }); - }); - db.CodeFirst.InitTables(typeBuilder.BuilderType()); - return new Response() - { - Code = 200, - Result = true, - Message = "创建成功" - }; - } - } - /// - /// 创建字段 - /// - /// 数据库编码 - /// 表字段 - /// - public Response AddColumn(string dbcode, DbColumnInput dbColumnInput) - { - using (var db = this.CodeClient(dbcode, _configuration)) - { - var column = new DbColumnInfo - { - ColumnDescription = dbColumnInput.ColumnDescription, - DbColumnName = dbColumnInput.DbColumnName, - IsIdentity = dbColumnInput.IsIdentity == 1, - IsNullable = dbColumnInput.IsNullable == 1, - IsPrimarykey = dbColumnInput.IsPrimarykey == 1, - Length = dbColumnInput.Length, - DecimalDigits = dbColumnInput.DecimalDigits, - DataType = dbColumnInput.DataType - }; - - db.DbMaintenance.AddColumn(dbColumnInput.TableName, column); - db.DbMaintenance.AddColumnRemark(dbColumnInput.DbColumnName, dbColumnInput.TableName, dbColumnInput.ColumnDescription); - if (column.IsPrimarykey) - db.DbMaintenance.AddPrimaryKey(dbColumnInput.TableName, dbColumnInput.DbColumnName); - return new Response() - { - Code = 200, - Result = true, - Message = "创建成功" - }; - } - } - } -} diff --git a/OpenAuth.App/BaseApp/BasicQueryService/CommonDataManager.cs b/OpenAuth.App/BasicQueryService/CommonDataManager.cs similarity index 100% rename from OpenAuth.App/BaseApp/BasicQueryService/CommonDataManager.cs rename to OpenAuth.App/BasicQueryService/CommonDataManager.cs diff --git a/OpenAuth.App/BaseApp/BasicQueryService/PositionManager.cs b/OpenAuth.App/BasicQueryService/PositionManager.cs similarity index 100% rename from OpenAuth.App/BaseApp/BasicQueryService/PositionManager.cs rename to OpenAuth.App/BasicQueryService/PositionManager.cs diff --git a/OpenAuth.App/BaseApp/BasicQueryService/Request/QueryGeoJsonCommonReq.cs b/OpenAuth.App/BasicQueryService/Request/QueryGeoJsonCommonReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/BasicQueryService/Request/QueryGeoJsonCommonReq.cs rename to OpenAuth.App/BasicQueryService/Request/QueryGeoJsonCommonReq.cs diff --git a/OpenAuth.App/BaseApp/BasicQueryService/Request/QueryVectorTileByTableReq.cs b/OpenAuth.App/BasicQueryService/Request/QueryVectorTileByTableReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/BasicQueryService/Request/QueryVectorTileByTableReq.cs rename to OpenAuth.App/BasicQueryService/Request/QueryVectorTileByTableReq.cs diff --git a/OpenAuth.App/BaseApp/BasicQueryService/Request/VectorTileSearchModel.cs b/OpenAuth.App/BasicQueryService/Request/VectorTileSearchModel.cs similarity index 100% rename from OpenAuth.App/BaseApp/BasicQueryService/Request/VectorTileSearchModel.cs rename to OpenAuth.App/BasicQueryService/Request/VectorTileSearchModel.cs diff --git a/OpenAuth.App/BaseApp/BasicQueryService/UserManager.cs b/OpenAuth.App/BasicQueryService/UserManager.cs similarity index 100% rename from OpenAuth.App/BaseApp/BasicQueryService/UserManager.cs rename to OpenAuth.App/BasicQueryService/UserManager.cs diff --git a/OpenAuth.App/BaseApp/BasicQueryService/WorkFlowMangaer.cs b/OpenAuth.App/BasicQueryService/WorkFlowMangaer.cs similarity index 100% rename from OpenAuth.App/BaseApp/BasicQueryService/WorkFlowMangaer.cs rename to OpenAuth.App/BasicQueryService/WorkFlowMangaer.cs diff --git a/OpenAuth.App/BaseApp/Category/CategoryApp.cs b/OpenAuth.App/Category/CategoryApp.cs similarity index 97% rename from OpenAuth.App/BaseApp/Category/CategoryApp.cs rename to OpenAuth.App/Category/CategoryApp.cs index 9c607cd..79a173b 100644 --- a/OpenAuth.App/BaseApp/Category/CategoryApp.cs +++ b/OpenAuth.App/Category/CategoryApp.cs @@ -1,12 +1,17 @@ using Infrastructure; -using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.BaseApp; +using OpenAuth.Auth.Interface; using OpenAuth.App.Interface; using OpenAuth.App.Request; using OpenAuth.App.Response; using OpenAuth.Repository; using OpenAuth.Repository.Domain; using SqlSugar; +using Utils.Web.Model; + + + + namespace OpenAuth.App { diff --git a/OpenAuth.App/BaseApp/Category/CategoryTypeApp.cs b/OpenAuth.App/Category/CategoryTypeApp.cs similarity index 96% rename from OpenAuth.App/BaseApp/Category/CategoryTypeApp.cs rename to OpenAuth.App/Category/CategoryTypeApp.cs index 55b810a..af1a8eb 100644 --- a/OpenAuth.App/BaseApp/Category/CategoryTypeApp.cs +++ b/OpenAuth.App/Category/CategoryTypeApp.cs @@ -3,14 +3,15 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Infrastructure; -using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.BaseApp; +using OpenAuth.Auth.Interface; using OpenAuth.App.Interface; using OpenAuth.App.Request; using OpenAuth.App.Response; using OpenAuth.Repository; using OpenAuth.Repository.Domain; using SqlSugar; +using Utils.Web.Model; namespace OpenAuth.App { diff --git a/OpenAuth.App/BaseApp/Category/Request/AddOrUpdateCategoryReq.cs b/OpenAuth.App/Category/Request/AddOrUpdateCategoryReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/Category/Request/AddOrUpdateCategoryReq.cs rename to OpenAuth.App/Category/Request/AddOrUpdateCategoryReq.cs diff --git a/OpenAuth.App/BaseApp/Category/Request/AddOrUpdateCategoryTypeReq.cs b/OpenAuth.App/Category/Request/AddOrUpdateCategoryTypeReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/Category/Request/AddOrUpdateCategoryTypeReq.cs rename to OpenAuth.App/Category/Request/AddOrUpdateCategoryTypeReq.cs diff --git a/OpenAuth.App/BaseApp/Category/Request/QueryCategoryListReq.cs b/OpenAuth.App/Category/Request/QueryCategoryListReq.cs similarity index 74% rename from OpenAuth.App/BaseApp/Category/Request/QueryCategoryListReq.cs rename to OpenAuth.App/Category/Request/QueryCategoryListReq.cs index 538e63e..bc6f95e 100644 --- a/OpenAuth.App/BaseApp/Category/Request/QueryCategoryListReq.cs +++ b/OpenAuth.App/Category/Request/QueryCategoryListReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using Utils.Web.Model; + +namespace OpenAuth.App.Request { public class QueryCategoryListReq : PageReq { diff --git a/OpenAuth.App/BaseApp/Category/Request/QueryCategoryTypeListReq.cs b/OpenAuth.App/Category/Request/QueryCategoryTypeListReq.cs similarity index 64% rename from OpenAuth.App/BaseApp/Category/Request/QueryCategoryTypeListReq.cs rename to OpenAuth.App/Category/Request/QueryCategoryTypeListReq.cs index 1f27d06..63f8271 100644 --- a/OpenAuth.App/BaseApp/Category/Request/QueryCategoryTypeListReq.cs +++ b/OpenAuth.App/Category/Request/QueryCategoryTypeListReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using Utils.Web.Model; + +namespace OpenAuth.App.Request { public class QueryCategoryTypeListReq : PageReq { diff --git a/OpenAuth.App/BaseApp/Category/Response/CategoryTypeResp.cs b/OpenAuth.App/Category/Response/CategoryTypeResp.cs similarity index 100% rename from OpenAuth.App/BaseApp/Category/Response/CategoryTypeResp.cs rename to OpenAuth.App/Category/Response/CategoryTypeResp.cs diff --git a/OpenAuth.App/BaseApp/CodeTable/CodeColumnsApp.cs b/OpenAuth.App/CodeTable/CodeColumnsApp.cs similarity index 97% rename from OpenAuth.App/BaseApp/CodeTable/CodeColumnsApp.cs rename to OpenAuth.App/CodeTable/CodeColumnsApp.cs index 99758d4..4a2ad6a 100644 --- a/OpenAuth.App/BaseApp/CodeTable/CodeColumnsApp.cs +++ b/OpenAuth.App/CodeTable/CodeColumnsApp.cs @@ -1,4 +1,4 @@ -using OpenAuth.App.Base; +using OpenAuth.BaseApp; using OpenAuth.Repository; using OpenAuth.Repository.Domain; using SqlSugar; @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.Auth.Interface; namespace OpenAuth.App.CodeTable { diff --git a/OpenAuth.App/BaseApp/CodeTable/CodeTableApp.cs b/OpenAuth.App/CodeTable/CodeTableApp.cs similarity index 84% rename from OpenAuth.App/BaseApp/CodeTable/CodeTableApp.cs rename to OpenAuth.App/CodeTable/CodeTableApp.cs index 3874698..e5723e5 100644 --- a/OpenAuth.App/BaseApp/CodeTable/CodeTableApp.cs +++ b/OpenAuth.App/CodeTable/CodeTableApp.cs @@ -3,7 +3,7 @@ using Infrastructure.Extensions; using Infrastructure.Utilities; using Microsoft.Extensions.Configuration; using NUnit.Framework; -using OpenAuth.App.Base; +using OpenAuth.BaseApp; using OpenAuth.App.FormScheme.FormHelpers; using OpenAuth.Repository; using OpenAuth.Repository.Domain; @@ -14,7 +14,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.Auth.Interface; using static Microsoft.Extensions.Logging.EventSource.LoggingEventSource; namespace OpenAuth.App.CodeTable @@ -84,12 +84,13 @@ namespace OpenAuth.App.CodeTable /// public List GetTableColumnList(string code, string tableName) { - using (var db = this.CodeClient(code, _configuration)) - { - //var list= this.Repository.AsSugarClient().DbMaintenance.GetTableInfoList(isCache); - var list = db.DbMaintenance.GetColumnInfosByTableName(tableName,false); - return list; - } + //using (var db = this.CodeClient(code, _configuration)) + //{ + // //var list= this.Repository.AsSugarClient().DbMaintenance.GetTableInfoList(isCache); + // var list = db.DbMaintenance.GetColumnInfosByTableName(tableName,false); + // return list; + //} + return null; } /// @@ -242,36 +243,36 @@ namespace OpenAuth.App.CodeTable /// /// /// - public List GetTableAndViewColumnList(string dbCode, string tableName) - { - using (var db = this.CodeClient(dbCode, _configuration)) - { - string query = $@" - SELECT - c.column_name, - d.description - FROM - information_schema.columns c - LEFT JOIN - pg_catalog.pg_class t ON t.relname = c.table_name - LEFT JOIN - pg_catalog.pg_attribute a ON a.attnum > 0 - AND a.attrelid = t.oid - AND a.attname = c.column_name - LEFT JOIN - pg_catalog.pg_namespace n ON n.oid = t.relnamespace - LEFT JOIN - pg_catalog.pg_description d ON d.objoid = a.attrelid - AND d.objsubid = a.attnum - WHERE - c.table_name = @tableName - AND c.table_schema = 'public';"; - // 执行查询并获取结果 - var viewColumns = db.Ado.SqlQuery(query, new { tableName = tableName }); - return viewColumns; - } + //public List GetTableAndViewColumnList(string dbCode, string tableName) + //{ + // using (var db = this.CodeClient(dbCode, _configuration)) + // { + // string query = $@" + // SELECT + // c.column_name, + // d.description + // FROM + // information_schema.columns c + // LEFT JOIN + // pg_catalog.pg_class t ON t.relname = c.table_name + // LEFT JOIN + // pg_catalog.pg_attribute a ON a.attnum > 0 + // AND a.attrelid = t.oid + // AND a.attname = c.column_name + // LEFT JOIN + // pg_catalog.pg_namespace n ON n.oid = t.relnamespace + // LEFT JOIN + // pg_catalog.pg_description d ON d.objoid = a.attrelid + // AND d.objsubid = a.attnum + // WHERE + // c.table_name = @tableName + // AND c.table_schema = 'public';"; + // // 执行查询并获取结果 + // var viewColumns = db.Ado.SqlQuery(query, new { tableName = tableName }); + // return viewColumns; + // } - } + //} #endregion } } diff --git a/OpenAuth.App/BaseApp/CodeTable/Request/CodeTableReq.cs b/OpenAuth.App/CodeTable/Request/CodeTableReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/CodeTable/Request/CodeTableReq.cs rename to OpenAuth.App/CodeTable/Request/CodeTableReq.cs diff --git a/OpenAuth.App/BaseApp/CodeTable/Response/CodeTableColumnsResp.cs b/OpenAuth.App/CodeTable/Response/CodeTableColumnsResp.cs similarity index 100% rename from OpenAuth.App/BaseApp/CodeTable/Response/CodeTableColumnsResp.cs rename to OpenAuth.App/CodeTable/Response/CodeTableColumnsResp.cs diff --git a/OpenAuth.App/Common/CommonData.cs b/OpenAuth.App/Common/CommonData.cs deleted file mode 100644 index 970116b..0000000 --- a/OpenAuth.App/Common/CommonData.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OpenAuth.App.Common -{ - public class CommonData - { - /// - /// 执行cmd命令 - /// - /// - /// - public static void ExeCmdProcess(string strDir, string _path) - { - Process p = new Process(); - p.StartInfo.FileName = "cmd.exe "; - p.StartInfo.UseShellExecute = false; - p.StartInfo.RedirectStandardInput = true; - p.StartInfo.RedirectStandardOutput = true; - p.StartInfo.RedirectStandardError = true; - p.StartInfo.CreateNoWindow = false; - - //指定执行程序的目录 - p.StartInfo.WorkingDirectory = _path; - //开始执行 - p.Start(); - //Console.WriteLine("command:" + strInput); - p.StandardInput.WriteLine(strDir.ToString() + "&exit"); - - //执行结果返回 - string output = p.StandardOutput.ReadToEnd(); - - //等待执行完成 - p.WaitForExit(); - - //关闭程序 - p.Close(); - } - - } -} diff --git a/OpenAuth.App/Const/TubanZhuanTi.cs b/OpenAuth.App/Const/TubanZhuanTi.cs deleted file mode 100644 index fb3114a..0000000 --- a/OpenAuth.App/Const/TubanZhuanTi.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace OpenAuth.App.Common -{ - public struct TubanZhuanTi { - - public const string weifayongdi = "Subject_WFYD"; - public const string feifacaikuang = "Subject_FFCK"; - public const string zhongdianwenti1 = "Subject_ZDWT1"; - public const string zhongdianwenti2 = "Subject_ZDWT2"; - public const string gdflh = "Subject_GDFLH"; - public const string wfydwp = "Subject_WPWF"; - public const string xcsj = "Subject_XCSJ"; - public const string sthx = "Subject_STHX"; - public const string stxf = "Subject_STXF"; - } -} diff --git a/OpenAuth.App/BaseApp/CreateTable/BasicTableService.cs b/OpenAuth.App/CreateTable/BasicTableService.cs similarity index 96% rename from OpenAuth.App/BaseApp/CreateTable/BasicTableService.cs rename to OpenAuth.App/CreateTable/BasicTableService.cs index 77a77fd..9ca8bde 100644 --- a/OpenAuth.App/BaseApp/CreateTable/BasicTableService.cs +++ b/OpenAuth.App/CreateTable/BasicTableService.cs @@ -1,16 +1,9 @@ using Castle.Core.Internal; using ClosedXML.Excel; -using DocumentFormat.OpenXml.Drawing; -using DocumentFormat.OpenXml.Spreadsheet; -using DocumentFormat.OpenXml.Wordprocessing; using Infrastructure; using Infrastructure.Extensions; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using NUnit.Framework.Internal.Execution; -using OpenAuth.App.Interface; -using OpenAuth.Repository; +using OpenAuth.Auth.Interface; using OpenAuth.Repository.Domain; using SqlSugar; using System; diff --git a/OpenAuth.App/BaseApp/CreateTable/CreateTableReq.cs b/OpenAuth.App/CreateTable/CreateTableReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/CreateTable/CreateTableReq.cs rename to OpenAuth.App/CreateTable/CreateTableReq.cs diff --git a/OpenAuth.App/BaseApp/CreateTable/CreateViewReq.cs b/OpenAuth.App/CreateTable/CreateViewReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/CreateTable/CreateViewReq.cs rename to OpenAuth.App/CreateTable/CreateViewReq.cs diff --git a/OpenAuth.App/BaseApp/CreateTable/TableInfo.cs b/OpenAuth.App/CreateTable/TableInfo.cs similarity index 100% rename from OpenAuth.App/BaseApp/CreateTable/TableInfo.cs rename to OpenAuth.App/CreateTable/TableInfo.cs diff --git a/OpenAuth.App/BaseApp/CreateTable/TableRecordApp.cs b/OpenAuth.App/CreateTable/TableRecordApp.cs similarity index 95% rename from OpenAuth.App/BaseApp/CreateTable/TableRecordApp.cs rename to OpenAuth.App/CreateTable/TableRecordApp.cs index 960fade..7da6f55 100644 --- a/OpenAuth.App/BaseApp/CreateTable/TableRecordApp.cs +++ b/OpenAuth.App/CreateTable/TableRecordApp.cs @@ -1,5 +1,5 @@ using Infrastructure; -using OpenAuth.App.Base; +using OpenAuth.BaseApp; using OpenAuth.Repository; using SqlSugar; using System; @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.Auth.Interface; namespace OpenAuth.App { diff --git a/OpenAuth.App/BaseApp/CreateTable/UploadExcelReq.cs b/OpenAuth.App/CreateTable/UploadExcelReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/CreateTable/UploadExcelReq.cs rename to OpenAuth.App/CreateTable/UploadExcelReq.cs diff --git a/OpenAuth.App/BaseApp/DataCodeRule/CodeRuleApp.cs b/OpenAuth.App/DataCodeRule/CodeRuleApp.cs similarity index 99% rename from OpenAuth.App/BaseApp/DataCodeRule/CodeRuleApp.cs rename to OpenAuth.App/DataCodeRule/CodeRuleApp.cs index 0191a68..3b1df34 100644 --- a/OpenAuth.App/BaseApp/DataCodeRule/CodeRuleApp.cs +++ b/OpenAuth.App/DataCodeRule/CodeRuleApp.cs @@ -1,4 +1,4 @@ -using OpenAuth.App.Base; +using OpenAuth.BaseApp; using OpenAuth.App.DataCodeRule.Response; using OpenAuth.Repository; using OpenAuth.Repository.Domain; @@ -10,7 +10,7 @@ using System.Text; using System.Threading.Tasks; using Infrastructure.Extensions; using Infrastructure.Cache; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.Auth.Interface; namespace OpenAuth.App.DataCodeRule { diff --git a/OpenAuth.App/BaseApp/DataCodeRule/Response/CodeRuleFormatModel.cs b/OpenAuth.App/DataCodeRule/Response/CodeRuleFormatModel.cs similarity index 100% rename from OpenAuth.App/BaseApp/DataCodeRule/Response/CodeRuleFormatModel.cs rename to OpenAuth.App/DataCodeRule/Response/CodeRuleFormatModel.cs diff --git a/OpenAuth.App/BaseApp/DataSource/DataSourceApp.cs b/OpenAuth.App/DataSource/DataSourceApp.cs similarity index 99% rename from OpenAuth.App/BaseApp/DataSource/DataSourceApp.cs rename to OpenAuth.App/DataSource/DataSourceApp.cs index 6b709d9..83cbab3 100644 --- a/OpenAuth.App/BaseApp/DataSource/DataSourceApp.cs +++ b/OpenAuth.App/DataSource/DataSourceApp.cs @@ -1,6 +1,6 @@ using Infrastructure; using Infrastructure.Extensions; -using OpenAuth.App.Base; +using OpenAuth.BaseApp; using OpenAuth.App.FormScheme.FormHelpers; using OpenAuth.Repository; using OpenAuth.Repository.Domain; @@ -11,7 +11,7 @@ using System.Data; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.Auth.Interface; namespace OpenAuth.App.DataSource { diff --git a/OpenAuth.App/DbTable/DbTableApp.cs b/OpenAuth.App/DbTable/DbTableApp.cs new file mode 100644 index 0000000..212aefb --- /dev/null +++ b/OpenAuth.App/DbTable/DbTableApp.cs @@ -0,0 +1,105 @@ +using Infrastructure; +using Infrastructure.Extensions; +using Microsoft.Extensions.Configuration; +using OpenAuth.BaseApp; +using OpenAuth.App.CodeTable; +using OpenAuth.App.Request; +using OpenAuth.App.FormScheme.FormHelpers; +using OpenAuth.Repository; +using OpenAuth.Repository.Domain; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using OpenAuth.Auth.Interface; +using static Dm.net.buffer.ByteArrayBuffer; + +namespace OpenAuth.App.DbTable +{ + public class DbTableApp : SqlSugarBaseApp + { + private IConfiguration _configuration; + public DbTableApp(ISugarUnitOfWork unitWork, ISimpleClient repository, IConfiguration configuration) : base(unitWork, repository, null) + { + _configuration = configuration; + } + + /// + /// 创建表信息 + /// + /// 数据库编码 + /// 数据表信息 + /// + public Response AddTable(string dbcode, DbTableReq dbTableReq) + { + if (dbTableReq.DbColumnInfoList == null || !dbTableReq.DbColumnInfoList.Any()) + throw new Exception("请添加数据列"); + return null; + + //if (dbTableReq.DbColumnInfoList == null || !dbTableReq.DbColumnInfoList.Any()) + // throw new Exception("请添加数据列"); + //using (var db = this.CodeClient(dbcode, _configuration)) + //{ + // var typeBuilder = db.DynamicBuilder().CreateClass(dbTableReq.TableName, new SugarTable() { TableName = dbTableReq.TableName, TableDescription = dbTableReq.Description }); + // dbTableReq.DbColumnInfoList.ForEach(u => + // { + // typeBuilder.CreateProperty(u.DbColumnName, typeof(string), new SugarColumn() + // { + // IsPrimaryKey = u.IsPrimarykey == 1, + // IsIdentity = u.IsIdentity == 1, + // ColumnDataType = u.DataType, + // Length = u.Length, + // IsNullable = u.IsNullable == 1, + // DecimalDigits = u.DecimalDigits, + // ColumnDescription = u.ColumnDescription, + // }); + // }); + // db.CodeFirst.InitTables(typeBuilder.BuilderType()); + // return new Response() + // { + // Code = 200, + // Result = true, + // Message = "创建成功" + // }; + //} + } + /// + /// 创建字段 + /// + /// 数据库编码 + /// 表字段 + /// + public Response AddColumn(string dbcode, DbColumnInput dbColumnInput) + { + return null; + + //using (var db = this.CodeClient(dbcode, _configuration)) + //{ + // var column = new DbColumnInfo + // { + // ColumnDescription = dbColumnInput.ColumnDescription, + // DbColumnName = dbColumnInput.DbColumnName, + // IsIdentity = dbColumnInput.IsIdentity == 1, + // IsNullable = dbColumnInput.IsNullable == 1, + // IsPrimarykey = dbColumnInput.IsPrimarykey == 1, + // Length = dbColumnInput.Length, + // DecimalDigits = dbColumnInput.DecimalDigits, + // DataType = dbColumnInput.DataType + // }; + + // db.DbMaintenance.AddColumn(dbColumnInput.TableName, column); + // db.DbMaintenance.AddColumnRemark(dbColumnInput.DbColumnName, dbColumnInput.TableName, dbColumnInput.ColumnDescription); + // if (column.IsPrimarykey) + // db.DbMaintenance.AddPrimaryKey(dbColumnInput.TableName, dbColumnInput.DbColumnName); + // return new Response() + // { + // Code = 200, + // Result = true, + // Message = "创建成功" + // }; + //} + } + } +} diff --git a/OpenAuth.App/BaseApp/DbTable/Request/DbColumnInput.cs b/OpenAuth.App/DbTable/Request/DbColumnInput.cs similarity index 100% rename from OpenAuth.App/BaseApp/DbTable/Request/DbColumnInput.cs rename to OpenAuth.App/DbTable/Request/DbColumnInput.cs diff --git a/OpenAuth.App/BaseApp/DbTable/Request/DbTableReq.cs b/OpenAuth.App/DbTable/Request/DbTableReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/DbTable/Request/DbTableReq.cs rename to OpenAuth.App/DbTable/Request/DbTableReq.cs diff --git a/OpenAuth.App/BaseApp/Extensions/OpenJobExt.cs b/OpenAuth.App/Extensions/OpenJobExt.cs similarity index 100% rename from OpenAuth.App/BaseApp/Extensions/OpenJobExt.cs rename to OpenAuth.App/Extensions/OpenJobExt.cs diff --git a/OpenAuth.App/BaseApp/Files/FileApp.cs b/OpenAuth.App/Files/FileApp.cs similarity index 98% rename from OpenAuth.App/BaseApp/Files/FileApp.cs rename to OpenAuth.App/Files/FileApp.cs index 93db12b..9e95d4d 100644 --- a/OpenAuth.App/BaseApp/Files/FileApp.cs +++ b/OpenAuth.App/Files/FileApp.cs @@ -9,14 +9,15 @@ using Infrastructure.Helpers; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.BaseApp; +using OpenAuth.Auth.Interface; using OpenAuth.App.Interface; using OpenAuth.App.Request; using OpenAuth.App.Response; using OpenAuth.Repository; using OpenAuth.Repository.Domain; using SqlSugar; +using Utils.Web.Model; namespace OpenAuth.App { diff --git a/OpenAuth.App/BaseApp/Files/Request/QueryFileListReq.cs b/OpenAuth.App/Files/Request/QueryFileListReq.cs similarity index 63% rename from OpenAuth.App/BaseApp/Files/Request/QueryFileListReq.cs rename to OpenAuth.App/Files/Request/QueryFileListReq.cs index 13d2a2b..6cf2b9c 100644 --- a/OpenAuth.App/BaseApp/Files/Request/QueryFileListReq.cs +++ b/OpenAuth.App/Files/Request/QueryFileListReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using Utils.Web.Model; + +namespace OpenAuth.App.Request { public class QueryFileListReq : PageReq { diff --git a/OpenAuth.App/BaseApp/FormModule/FormModuleApp.cs b/OpenAuth.App/FormModule/FormModuleApp.cs similarity index 94% rename from OpenAuth.App/BaseApp/FormModule/FormModuleApp.cs rename to OpenAuth.App/FormModule/FormModuleApp.cs index cc15f16..34a5b00 100644 --- a/OpenAuth.App/BaseApp/FormModule/FormModuleApp.cs +++ b/OpenAuth.App/FormModule/FormModuleApp.cs @@ -3,7 +3,7 @@ using Infrastructure; using Microsoft.Extensions.Configuration; using NPOI.HSSF.UserModel; using NPOI.SS.UserModel; -using OpenAuth.App.Base; +using OpenAuth.BaseApp; using OpenAuth.App.FormModule.Request; using OpenAuth.App.Interface; using OpenAuth.Repository; @@ -13,7 +13,7 @@ using System.Linq.Expressions; using System.Text; using Castle.Core.Internal; using DocumentFormat.OpenXml.Drawing.Charts; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.Auth.Interface; namespace OpenAuth.App.FormModule { @@ -555,26 +555,27 @@ namespace OpenAuth.App.FormModule /// public Response> GetTableList(string code, string key, bool isCache = false) { - using (var db = this.CodeClient(code, _configuration)) - { - var list = db.DbMaintenance.GetTableInfoList(isCache); - //var list = db.DbMaintenance.GetTableInfoList((dbtype, sql) => - //{ - // if (dbtype == SqlSugar.DbType.Kdbndp) - // { - // return sql.Replace(@"where relkind = 'r' and c.oid > 16384 and c.relnamespace != 99 and c.relname not like '%pl_profiler_saved%' order by relname", @" INNER JOIN PG_NAMESPACE AS n ON c.relnamespace = n.oid where relkind = 'r' and c.oid > 16384 and c.relnamespace != 99 and c.relname not like '%pl_profiler_saved%' and n.nspname = 'public' order by relname"); - // } - // return sql; - //}); - var info = list.FindAll(t => - t.DbObjectType == DbObjectType.Table && t.Name.ToLower() != "lr_db_codecolumns" && - t.Name.ToLower() != "lr_db_codetable" && t.Name.ToLower() != "lr_db_history") - .WhereIF(!key.IsNullOrEmpty(), t => t.Name.ToLower().Contains(key.ToLower())).ToList(); - return new Response> - { - Result = info - }; - } + //using (var db = this.CodeClient(code, _configuration)) + //{ + // var list = db.DbMaintenance.GetTableInfoList(isCache); + // //var list = db.DbMaintenance.GetTableInfoList((dbtype, sql) => + // //{ + // // if (dbtype == SqlSugar.DbType.Kdbndp) + // // { + // // return sql.Replace(@"where relkind = 'r' and c.oid > 16384 and c.relnamespace != 99 and c.relname not like '%pl_profiler_saved%' order by relname", @" INNER JOIN PG_NAMESPACE AS n ON c.relnamespace = n.oid where relkind = 'r' and c.oid > 16384 and c.relnamespace != 99 and c.relname not like '%pl_profiler_saved%' and n.nspname = 'public' order by relname"); + // // } + // // return sql; + // //}); + // var info = list.FindAll(t => + // t.DbObjectType == DbObjectType.Table && t.Name.ToLower() != "lr_db_codecolumns" && + // t.Name.ToLower() != "lr_db_codetable" && t.Name.ToLower() != "lr_db_history") + // .WhereIF(!key.IsNullOrEmpty(), t => t.Name.ToLower().Contains(key.ToLower())).ToList(); + // return new Response> + // { + // Result = info + // }; + //} + return null; } #endregion diff --git a/OpenAuth.App/BaseApp/FormModule/Request/FormModuleReq.cs b/OpenAuth.App/FormModule/Request/FormModuleReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/FormModule/Request/FormModuleReq.cs rename to OpenAuth.App/FormModule/Request/FormModuleReq.cs diff --git a/OpenAuth.App/BaseApp/FormModule/Request/FormModuleSchemeReq.cs b/OpenAuth.App/FormModule/Request/FormModuleSchemeReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/FormModule/Request/FormModuleSchemeReq.cs rename to OpenAuth.App/FormModule/Request/FormModuleSchemeReq.cs diff --git a/OpenAuth.App/BaseApp/FormScheme/FormHelpers/DBCommonHelper.cs b/OpenAuth.App/FormScheme/FormHelpers/DBCommonHelper.cs similarity index 100% rename from OpenAuth.App/BaseApp/FormScheme/FormHelpers/DBCommonHelper.cs rename to OpenAuth.App/FormScheme/FormHelpers/DBCommonHelper.cs diff --git a/OpenAuth.App/BaseApp/FormScheme/FormHelpers/FormHelper.cs b/OpenAuth.App/FormScheme/FormHelpers/FormHelper.cs similarity index 100% rename from OpenAuth.App/BaseApp/FormScheme/FormHelpers/FormHelper.cs rename to OpenAuth.App/FormScheme/FormHelpers/FormHelper.cs diff --git a/OpenAuth.App/BaseApp/FormScheme/FormSchemeApp.cs b/OpenAuth.App/FormScheme/FormSchemeApp.cs similarity index 99% rename from OpenAuth.App/BaseApp/FormScheme/FormSchemeApp.cs rename to OpenAuth.App/FormScheme/FormSchemeApp.cs index 9531ec3..2bf5ba3 100644 --- a/OpenAuth.App/BaseApp/FormScheme/FormSchemeApp.cs +++ b/OpenAuth.App/FormScheme/FormSchemeApp.cs @@ -1,4 +1,4 @@ -using OpenAuth.App.Base; +using OpenAuth.BaseApp; using OpenAuth.Repository.Domain; using OpenAuth.Repository; using System; @@ -34,8 +34,9 @@ using NPOI.HSSF.UserModel; using NPOI.SS.UserModel; using OpenAuth.App.FormModule; using Microsoft.Extensions.Logging; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.Auth.Interface; using Castle.Core.Internal; +using Utils.Web.Model; namespace OpenAuth.App.FormScheme { diff --git a/OpenAuth.App/BaseApp/FormScheme/Request/FormDataReq.cs b/OpenAuth.App/FormScheme/Request/FormDataReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/FormScheme/Request/FormDataReq.cs rename to OpenAuth.App/FormScheme/Request/FormDataReq.cs diff --git a/OpenAuth.App/BaseApp/FormScheme/Request/FormQueryReq.cs b/OpenAuth.App/FormScheme/Request/FormQueryReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/FormScheme/Request/FormQueryReq.cs rename to OpenAuth.App/FormScheme/Request/FormQueryReq.cs diff --git a/OpenAuth.App/BaseApp/FormScheme/Request/FormSchemeReq.cs b/OpenAuth.App/FormScheme/Request/FormSchemeReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/FormScheme/Request/FormSchemeReq.cs rename to OpenAuth.App/FormScheme/Request/FormSchemeReq.cs diff --git a/OpenAuth.App/BaseApp/FormScheme/Response/ComponentPropsModel.cs b/OpenAuth.App/FormScheme/Response/ComponentPropsModel.cs similarity index 100% rename from OpenAuth.App/BaseApp/FormScheme/Response/ComponentPropsModel.cs rename to OpenAuth.App/FormScheme/Response/ComponentPropsModel.cs diff --git a/OpenAuth.App/BaseApp/FormScheme/Response/ExecuteType.cs b/OpenAuth.App/FormScheme/Response/ExecuteType.cs similarity index 100% rename from OpenAuth.App/BaseApp/FormScheme/Response/ExecuteType.cs rename to OpenAuth.App/FormScheme/Response/ExecuteType.cs diff --git a/OpenAuth.App/BaseApp/FormScheme/Response/FormComponentModel.cs b/OpenAuth.App/FormScheme/Response/FormComponentModel.cs similarity index 100% rename from OpenAuth.App/BaseApp/FormScheme/Response/FormComponentModel.cs rename to OpenAuth.App/FormScheme/Response/FormComponentModel.cs diff --git a/OpenAuth.App/BaseApp/FormScheme/Response/FormComponentNewModel.cs b/OpenAuth.App/FormScheme/Response/FormComponentNewModel.cs similarity index 100% rename from OpenAuth.App/BaseApp/FormScheme/Response/FormComponentNewModel.cs rename to OpenAuth.App/FormScheme/Response/FormComponentNewModel.cs diff --git a/OpenAuth.App/BaseApp/FormScheme/Response/FormDbTable.cs b/OpenAuth.App/FormScheme/Response/FormDbTable.cs similarity index 100% rename from OpenAuth.App/BaseApp/FormScheme/Response/FormDbTable.cs rename to OpenAuth.App/FormScheme/Response/FormDbTable.cs diff --git a/OpenAuth.App/BaseApp/FormScheme/Response/FormDbTableInfo.cs b/OpenAuth.App/FormScheme/Response/FormDbTableInfo.cs similarity index 100% rename from OpenAuth.App/BaseApp/FormScheme/Response/FormDbTableInfo.cs rename to OpenAuth.App/FormScheme/Response/FormDbTableInfo.cs diff --git a/OpenAuth.App/BaseApp/FormScheme/Response/FormInfoModel.cs b/OpenAuth.App/FormScheme/Response/FormInfoModel.cs similarity index 100% rename from OpenAuth.App/BaseApp/FormScheme/Response/FormInfoModel.cs rename to OpenAuth.App/FormScheme/Response/FormInfoModel.cs diff --git a/OpenAuth.App/BaseApp/FormScheme/Response/FormInfoNewModel.cs b/OpenAuth.App/FormScheme/Response/FormInfoNewModel.cs similarity index 100% rename from OpenAuth.App/BaseApp/FormScheme/Response/FormInfoNewModel.cs rename to OpenAuth.App/FormScheme/Response/FormInfoNewModel.cs diff --git a/OpenAuth.App/BaseApp/FormScheme/Response/FormSchemeModel.cs b/OpenAuth.App/FormScheme/Response/FormSchemeModel.cs similarity index 100% rename from OpenAuth.App/BaseApp/FormScheme/Response/FormSchemeModel.cs rename to OpenAuth.App/FormScheme/Response/FormSchemeModel.cs diff --git a/OpenAuth.App/BaseApp/FormScheme/Response/FormSchemeNewModel.cs b/OpenAuth.App/FormScheme/Response/FormSchemeNewModel.cs similarity index 100% rename from OpenAuth.App/BaseApp/FormScheme/Response/FormSchemeNewModel.cs rename to OpenAuth.App/FormScheme/Response/FormSchemeNewModel.cs diff --git a/OpenAuth.App/BaseApp/FormScheme/Response/FormTabModel.cs b/OpenAuth.App/FormScheme/Response/FormTabModel.cs similarity index 100% rename from OpenAuth.App/BaseApp/FormScheme/Response/FormTabModel.cs rename to OpenAuth.App/FormScheme/Response/FormTabModel.cs diff --git a/OpenAuth.App/BaseApp/FormScheme/Response/FormTabNewModel.cs b/OpenAuth.App/FormScheme/Response/FormTabNewModel.cs similarity index 100% rename from OpenAuth.App/BaseApp/FormScheme/Response/FormTabNewModel.cs rename to OpenAuth.App/FormScheme/Response/FormTabNewModel.cs diff --git a/OpenAuth.App/BaseApp/FormScheme/Response/PaginationInputDto.cs b/OpenAuth.App/FormScheme/Response/PaginationInputDto.cs similarity index 100% rename from OpenAuth.App/BaseApp/FormScheme/Response/PaginationInputDto.cs rename to OpenAuth.App/FormScheme/Response/PaginationInputDto.cs diff --git a/OpenAuth.App/BaseApp/HostedService/QuartzService.cs b/OpenAuth.App/HostedService/QuartzService.cs similarity index 100% rename from OpenAuth.App/BaseApp/HostedService/QuartzService.cs rename to OpenAuth.App/HostedService/QuartzService.cs diff --git a/OpenAuth.App/BaseApp/ImMsgManager/ChatsHub.cs b/OpenAuth.App/ImMsgManager/ChatsHub.cs similarity index 100% rename from OpenAuth.App/BaseApp/ImMsgManager/ChatsHub.cs rename to OpenAuth.App/ImMsgManager/ChatsHub.cs diff --git a/OpenAuth.App/BaseApp/ImMsgManager/ImMsgApp.cs b/OpenAuth.App/ImMsgManager/ImMsgApp.cs similarity index 99% rename from OpenAuth.App/BaseApp/ImMsgManager/ImMsgApp.cs rename to OpenAuth.App/ImMsgManager/ImMsgApp.cs index 188a368..735e2bd 100644 --- a/OpenAuth.App/BaseApp/ImMsgManager/ImMsgApp.cs +++ b/OpenAuth.App/ImMsgManager/ImMsgApp.cs @@ -1,4 +1,4 @@ -using OpenAuth.App.Base; +using OpenAuth.BaseApp; using OpenAuth.Repository.Domain; using OpenAuth.Repository; using System; @@ -16,7 +16,7 @@ using OpenAuth.App.BaseApp.WFTask; using OpenAuth.App.BaseApp.ImMsgManager; using Microsoft.Extensions.Configuration; using DocumentFormat.OpenXml.EMMA; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.Auth.Interface; namespace OpenAuth.App.BaseApp { diff --git a/OpenAuth.App/BaseApp/ImMsgManager/Request/ImMsgReq.cs b/OpenAuth.App/ImMsgManager/Request/ImMsgReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/ImMsgManager/Request/ImMsgReq.cs rename to OpenAuth.App/ImMsgManager/Request/ImMsgReq.cs diff --git a/OpenAuth.App/BaseApp/ImMsgManager/SendHubs.cs b/OpenAuth.App/ImMsgManager/SendHubs.cs similarity index 100% rename from OpenAuth.App/BaseApp/ImMsgManager/SendHubs.cs rename to OpenAuth.App/ImMsgManager/SendHubs.cs diff --git a/OpenAuth.App/BaseApp/Import/ImportApp.cs b/OpenAuth.App/Import/ImportApp.cs similarity index 99% rename from OpenAuth.App/BaseApp/Import/ImportApp.cs rename to OpenAuth.App/Import/ImportApp.cs index aa1f133..3811871 100644 --- a/OpenAuth.App/BaseApp/Import/ImportApp.cs +++ b/OpenAuth.App/Import/ImportApp.cs @@ -1,5 +1,5 @@ using Infrastructure; -using OpenAuth.App.Base; +using OpenAuth.BaseApp; using OpenAuth.App.FormScheme; using OpenAuth.App.Permission; using OpenAuth.Repository; @@ -11,7 +11,7 @@ using System.Data; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.Auth.Interface; namespace OpenAuth.App.Import { diff --git a/OpenAuth.App/BaseApp/Import/Response/ExcelImportDto.cs b/OpenAuth.App/Import/Response/ExcelImportDto.cs similarity index 100% rename from OpenAuth.App/BaseApp/Import/Response/ExcelImportDto.cs rename to OpenAuth.App/Import/Response/ExcelImportDto.cs diff --git a/OpenAuth.App/BaseApp/Interface/ICustomerForm.cs b/OpenAuth.App/Interface/ICustomerForm.cs similarity index 100% rename from OpenAuth.App/BaseApp/Interface/ICustomerForm.cs rename to OpenAuth.App/Interface/ICustomerForm.cs diff --git a/OpenAuth.App/BaseApp/Jobs/OpenJobApp.cs b/OpenAuth.App/Jobs/OpenJobApp.cs similarity index 98% rename from OpenAuth.App/BaseApp/Jobs/OpenJobApp.cs rename to OpenAuth.App/Jobs/OpenJobApp.cs index 0e73753..25e3e8b 100644 --- a/OpenAuth.App/BaseApp/Jobs/OpenJobApp.cs +++ b/OpenAuth.App/Jobs/OpenJobApp.cs @@ -6,8 +6,8 @@ using Infrastructure; using Infrastructure.Const; using Infrastructure.Extensions; using Microsoft.Extensions.Logging; -using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.BaseApp; +using OpenAuth.Auth.Interface; using OpenAuth.App.Extensions; using OpenAuth.App.Interface; using OpenAuth.App.Request; @@ -16,6 +16,7 @@ using OpenAuth.Repository; using OpenAuth.Repository.Domain; using Quartz; using SqlSugar; +using Utils.Web.Model; namespace OpenAuth.App { diff --git a/OpenAuth.App/BaseApp/Jobs/Request/AddOrUpdateOpenJobReq.cs b/OpenAuth.App/Jobs/Request/AddOrUpdateOpenJobReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/Jobs/Request/AddOrUpdateOpenJobReq.cs rename to OpenAuth.App/Jobs/Request/AddOrUpdateOpenJobReq.cs diff --git a/OpenAuth.App/BaseApp/Jobs/Request/ChangeJobStatusReq.cs b/OpenAuth.App/Jobs/Request/ChangeJobStatusReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/Jobs/Request/ChangeJobStatusReq.cs rename to OpenAuth.App/Jobs/Request/ChangeJobStatusReq.cs diff --git a/OpenAuth.App/BaseApp/Jobs/Request/QueryOpenJobListReq.cs b/OpenAuth.App/Jobs/Request/QueryOpenJobListReq.cs similarity index 63% rename from OpenAuth.App/BaseApp/Jobs/Request/QueryOpenJobListReq.cs rename to OpenAuth.App/Jobs/Request/QueryOpenJobListReq.cs index 0753001..657aec2 100644 --- a/OpenAuth.App/BaseApp/Jobs/Request/QueryOpenJobListReq.cs +++ b/OpenAuth.App/Jobs/Request/QueryOpenJobListReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using Utils.Web.Model; + +namespace OpenAuth.App.Request { public class QueryOpenJobListReq : PageReq { diff --git a/OpenAuth.App/BaseApp/Jobs/SysLogJob.cs b/OpenAuth.App/Jobs/SysLogJob.cs similarity index 100% rename from OpenAuth.App/BaseApp/Jobs/SysLogJob.cs rename to OpenAuth.App/Jobs/SysLogJob.cs diff --git a/OpenAuth.App/BaseApp/Jobs/TaskOverTimeJob.cs b/OpenAuth.App/Jobs/TaskOverTimeJob.cs similarity index 98% rename from OpenAuth.App/BaseApp/Jobs/TaskOverTimeJob.cs rename to OpenAuth.App/Jobs/TaskOverTimeJob.cs index 6ea21bf..31ba207 100644 --- a/OpenAuth.App/BaseApp/Jobs/TaskOverTimeJob.cs +++ b/OpenAuth.App/Jobs/TaskOverTimeJob.cs @@ -9,6 +9,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using OpenAuth.Auth.Interface; namespace OpenAuth.App.BaseApp.Jobs { diff --git a/OpenAuth.App/BaseApp/Jobs/TaskTimeoutJob.cs b/OpenAuth.App/Jobs/TaskTimeoutJob.cs similarity index 98% rename from OpenAuth.App/BaseApp/Jobs/TaskTimeoutJob.cs rename to OpenAuth.App/Jobs/TaskTimeoutJob.cs index e8de900..473e1d0 100644 --- a/OpenAuth.App/BaseApp/Jobs/TaskTimeoutJob.cs +++ b/OpenAuth.App/Jobs/TaskTimeoutJob.cs @@ -11,6 +11,7 @@ using OpenAuth.App.BaseApp.WFTask; using DocumentFormat.OpenXml.Drawing.Diagrams; using OpenAuth.Repository.Domain; using OpenAuth.App.Interface; +using OpenAuth.Auth.Interface; namespace OpenAuth.App.BaseApp.Jobs { diff --git a/OpenAuth.App/BaseApp/ModuleManager/ModuleManagerApp.cs b/OpenAuth.App/ModuleManager/ModuleManagerApp.cs similarity index 99% rename from OpenAuth.App/BaseApp/ModuleManager/ModuleManagerApp.cs rename to OpenAuth.App/ModuleManager/ModuleManagerApp.cs index 1e757a4..4f13506 100644 --- a/OpenAuth.App/BaseApp/ModuleManager/ModuleManagerApp.cs +++ b/OpenAuth.App/ModuleManager/ModuleManagerApp.cs @@ -3,7 +3,7 @@ using System.Linq; using Infrastructure; using Microsoft.AspNetCore.Mvc; using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities; -using OpenAuth.App.Base; +using OpenAuth.BaseApp; using OpenAuth.App.Interface; using OpenAuth.App.ModuleManager; using OpenAuth.App.ModuleManager.Response; @@ -12,6 +12,7 @@ using OpenAuth.Repository; using OpenAuth.Repository.Core; using OpenAuth.Repository.Domain; using SqlSugar; +using OpenAuth.Auth.Interface; namespace OpenAuth.App { diff --git a/OpenAuth.App/BaseApp/ModuleManager/Request/QueryElementListReq.cs b/OpenAuth.App/ModuleManager/Request/QueryElementListReq.cs similarity index 92% rename from OpenAuth.App/BaseApp/ModuleManager/Request/QueryElementListReq.cs rename to OpenAuth.App/ModuleManager/Request/QueryElementListReq.cs index fb2512e..32bc669 100644 --- a/OpenAuth.App/BaseApp/ModuleManager/Request/QueryElementListReq.cs +++ b/OpenAuth.App/ModuleManager/Request/QueryElementListReq.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Utils.Web.Model; namespace OpenAuth.App.ModuleManager { diff --git a/OpenAuth.App/BaseApp/ModuleManager/Response/ModuleElementVM.cs b/OpenAuth.App/ModuleManager/Response/ModuleElementVM.cs similarity index 100% rename from OpenAuth.App/BaseApp/ModuleManager/Response/ModuleElementVM.cs rename to OpenAuth.App/ModuleManager/Response/ModuleElementVM.cs diff --git a/OpenAuth.App/BaseApp/ModuleManager/Response/ModuleView.cs b/OpenAuth.App/ModuleManager/Response/ModuleView.cs similarity index 100% rename from OpenAuth.App/BaseApp/ModuleManager/Response/ModuleView.cs rename to OpenAuth.App/ModuleManager/Response/ModuleView.cs diff --git a/OpenAuth.App/BaseApp/ModuleManager/Response/ModulesWithElements.cs b/OpenAuth.App/ModuleManager/Response/ModulesWithElements.cs similarity index 100% rename from OpenAuth.App/BaseApp/ModuleManager/Response/ModulesWithElements.cs rename to OpenAuth.App/ModuleManager/Response/ModulesWithElements.cs diff --git a/OpenAuth.App/OpenAuth.App.csproj b/OpenAuth.App/OpenAuth.App.csproj index 5a2ff4b..c17b102 100644 --- a/OpenAuth.App/OpenAuth.App.csproj +++ b/OpenAuth.App/OpenAuth.App.csproj @@ -43,12 +43,15 @@ + + + - - + + diff --git a/OpenAuth.App/BaseApp/OrgManager/OrgManagerApp.cs b/OpenAuth.App/OrgManager/OrgManagerApp.cs similarity index 99% rename from OpenAuth.App/BaseApp/OrgManager/OrgManagerApp.cs rename to OpenAuth.App/OrgManager/OrgManagerApp.cs index 424ead0..80246fc 100644 --- a/OpenAuth.App/BaseApp/OrgManager/OrgManagerApp.cs +++ b/OpenAuth.App/OrgManager/OrgManagerApp.cs @@ -1,7 +1,6 @@ using Infrastructure; using Infrastructure.Extensions; -using OpenAuth.App.Base; -using OpenAuth.App.Base.Tree; +using OpenAuth.BaseApp; using OpenAuth.App.BasicQueryService; using OpenAuth.App.Interface; using OpenAuth.App.Request; @@ -12,6 +11,7 @@ using SqlSugar; using SqlSugar.Extensions; using System.Collections.Generic; using System.Diagnostics; +using OpenAuth.Auth.Interface; namespace OpenAuth.App { diff --git a/OpenAuth.App/BaseApp/OrgManager/Request/AssignOrgPosGroup.cs b/OpenAuth.App/OrgManager/Request/AssignOrgPosGroup.cs similarity index 100% rename from OpenAuth.App/BaseApp/OrgManager/Request/AssignOrgPosGroup.cs rename to OpenAuth.App/OrgManager/Request/AssignOrgPosGroup.cs diff --git a/OpenAuth.App/BaseApp/OrgManager/Request/OrgForm.cs b/OpenAuth.App/OrgManager/Request/OrgForm.cs similarity index 100% rename from OpenAuth.App/BaseApp/OrgManager/Request/OrgForm.cs rename to OpenAuth.App/OrgManager/Request/OrgForm.cs diff --git a/OpenAuth.App/BaseApp/OrgManager/Request/OrgPos.cs b/OpenAuth.App/OrgManager/Request/OrgPos.cs similarity index 100% rename from OpenAuth.App/BaseApp/OrgManager/Request/OrgPos.cs rename to OpenAuth.App/OrgManager/Request/OrgPos.cs diff --git a/OpenAuth.App/BaseApp/OrgManager/Request/QueryOrgListReq.cs b/OpenAuth.App/OrgManager/Request/QueryOrgListReq.cs similarity index 92% rename from OpenAuth.App/BaseApp/OrgManager/Request/QueryOrgListReq.cs rename to OpenAuth.App/OrgManager/Request/QueryOrgListReq.cs index 29895fd..fb573cb 100644 --- a/OpenAuth.App/BaseApp/OrgManager/Request/QueryOrgListReq.cs +++ b/OpenAuth.App/OrgManager/Request/QueryOrgListReq.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Utils.Web.Model; namespace OpenAuth.App.Request { diff --git a/OpenAuth.App/BaseApp/Permission/BaseDataAuthorizeApp.cs b/OpenAuth.App/Permission/BaseDataAuthorizeApp.cs similarity index 99% rename from OpenAuth.App/BaseApp/Permission/BaseDataAuthorizeApp.cs rename to OpenAuth.App/Permission/BaseDataAuthorizeApp.cs index 8420223..028331b 100644 --- a/OpenAuth.App/BaseApp/Permission/BaseDataAuthorizeApp.cs +++ b/OpenAuth.App/Permission/BaseDataAuthorizeApp.cs @@ -1,7 +1,7 @@ using System.Text; using Infrastructure; -using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.BaseApp; +using OpenAuth.Auth.Interface; using OpenAuth.App.Interface; using OpenAuth.App.Permission.Request; using OpenAuth.Repository; diff --git a/OpenAuth.App/BaseApp/Permission/Request/BaseDataAuthListReq.cs b/OpenAuth.App/Permission/Request/BaseDataAuthListReq.cs similarity index 93% rename from OpenAuth.App/BaseApp/Permission/Request/BaseDataAuthListReq.cs rename to OpenAuth.App/Permission/Request/BaseDataAuthListReq.cs index 1d6ee96..0412d92 100644 --- a/OpenAuth.App/BaseApp/Permission/Request/BaseDataAuthListReq.cs +++ b/OpenAuth.App/Permission/Request/BaseDataAuthListReq.cs @@ -1,4 +1,5 @@ using OpenAuth.App.Request; +using Utils.Web.Model; namespace OpenAuth.App.Permission.Request; diff --git a/OpenAuth.App/BaseApp/Permission/Request/BaseDataAuthReq.cs b/OpenAuth.App/Permission/Request/BaseDataAuthReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/Permission/Request/BaseDataAuthReq.cs rename to OpenAuth.App/Permission/Request/BaseDataAuthReq.cs diff --git a/OpenAuth.App/BaseApp/Permission/Request/Condition.cs b/OpenAuth.App/Permission/Request/Condition.cs similarity index 100% rename from OpenAuth.App/BaseApp/Permission/Request/Condition.cs rename to OpenAuth.App/Permission/Request/Condition.cs diff --git a/OpenAuth.App/BaseApp/Permission/Request/FormulaObject.cs b/OpenAuth.App/Permission/Request/FormulaObject.cs similarity index 100% rename from OpenAuth.App/BaseApp/Permission/Request/FormulaObject.cs rename to OpenAuth.App/Permission/Request/FormulaObject.cs diff --git a/OpenAuth.App/BaseApp/Permission/Request/Group.cs b/OpenAuth.App/Permission/Request/Group.cs similarity index 100% rename from OpenAuth.App/BaseApp/Permission/Request/Group.cs rename to OpenAuth.App/Permission/Request/Group.cs diff --git a/OpenAuth.App/BaseApp/Relevance/Request/AssignDataReq.cs b/OpenAuth.App/Relevance/Request/AssignDataReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/Relevance/Request/AssignDataReq.cs rename to OpenAuth.App/Relevance/Request/AssignDataReq.cs diff --git a/OpenAuth.App/BaseApp/Relevance/Request/AssignOrgUsers.cs b/OpenAuth.App/Relevance/Request/AssignOrgUsers.cs similarity index 100% rename from OpenAuth.App/BaseApp/Relevance/Request/AssignOrgUsers.cs rename to OpenAuth.App/Relevance/Request/AssignOrgUsers.cs diff --git a/OpenAuth.App/BaseApp/Relevance/Request/AssignReq.cs b/OpenAuth.App/Relevance/Request/AssignReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/Relevance/Request/AssignReq.cs rename to OpenAuth.App/Relevance/Request/AssignReq.cs diff --git a/OpenAuth.App/BaseApp/Relevance/Request/AssignRoleUsers.cs b/OpenAuth.App/Relevance/Request/AssignRoleUsers.cs similarity index 100% rename from OpenAuth.App/BaseApp/Relevance/Request/AssignRoleUsers.cs rename to OpenAuth.App/Relevance/Request/AssignRoleUsers.cs diff --git a/OpenAuth.App/BaseApp/Relevance/RevelanceManagerApp.cs b/OpenAuth.App/Relevance/RevelanceManagerApp.cs similarity index 99% rename from OpenAuth.App/BaseApp/Relevance/RevelanceManagerApp.cs rename to OpenAuth.App/Relevance/RevelanceManagerApp.cs index 35c3b54..788b82a 100644 --- a/OpenAuth.App/BaseApp/Relevance/RevelanceManagerApp.cs +++ b/OpenAuth.App/Relevance/RevelanceManagerApp.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Linq; using Infrastructure; using Microsoft.Extensions.Logging; -using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.BaseApp; +using OpenAuth.Auth.Interface; using OpenAuth.App.Interface; using OpenAuth.App.Request; using OpenAuth.Repository; diff --git a/OpenAuth.App/BaseApp/Resources/Request/AddOrUpdateResReq.cs b/OpenAuth.App/Resources/Request/AddOrUpdateResReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/Resources/Request/AddOrUpdateResReq.cs rename to OpenAuth.App/Resources/Request/AddOrUpdateResReq.cs diff --git a/OpenAuth.App/BaseApp/Resources/Request/QueryResourcesReq.cs b/OpenAuth.App/Resources/Request/QueryResourcesReq.cs similarity index 74% rename from OpenAuth.App/BaseApp/Resources/Request/QueryResourcesReq.cs rename to OpenAuth.App/Resources/Request/QueryResourcesReq.cs index f6c3a9b..91857fd 100644 --- a/OpenAuth.App/BaseApp/Resources/Request/QueryResourcesReq.cs +++ b/OpenAuth.App/Resources/Request/QueryResourcesReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using Utils.Web.Model; + +namespace OpenAuth.App.Request { public class QueryResourcesReq : PageReq { diff --git a/OpenAuth.App/BaseApp/Resources/ResourceApp.cs b/OpenAuth.App/Resources/ResourceApp.cs similarity index 97% rename from OpenAuth.App/BaseApp/Resources/ResourceApp.cs rename to OpenAuth.App/Resources/ResourceApp.cs index 8b6ccc3..6accd6b 100644 --- a/OpenAuth.App/BaseApp/Resources/ResourceApp.cs +++ b/OpenAuth.App/Resources/ResourceApp.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using Infrastructure; -using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.BaseApp; +using OpenAuth.Auth.Interface; using OpenAuth.App.Interface; using OpenAuth.Repository; using OpenAuth.Repository.Domain; diff --git a/OpenAuth.App/BaseApp/RoleManager/Request/ModuleElementWithRole.cs b/OpenAuth.App/RoleManager/Request/ModuleElementWithRole.cs similarity index 100% rename from OpenAuth.App/BaseApp/RoleManager/Request/ModuleElementWithRole.cs rename to OpenAuth.App/RoleManager/Request/ModuleElementWithRole.cs diff --git a/OpenAuth.App/BaseApp/RoleManager/Request/QueryRoleListReq.cs b/OpenAuth.App/RoleManager/Request/QueryRoleListReq.cs similarity index 50% rename from OpenAuth.App/BaseApp/RoleManager/Request/QueryRoleListReq.cs rename to OpenAuth.App/RoleManager/Request/QueryRoleListReq.cs index 75e94fc..4a366d1 100644 --- a/OpenAuth.App/BaseApp/RoleManager/Request/QueryRoleListReq.cs +++ b/OpenAuth.App/RoleManager/Request/QueryRoleListReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using Utils.Web.Model; + +namespace OpenAuth.App.Request { public class QueryRoleListReq : PageReq { diff --git a/OpenAuth.App/BaseApp/RoleManager/Response/RoleView.cs b/OpenAuth.App/RoleManager/Response/RoleView.cs similarity index 100% rename from OpenAuth.App/BaseApp/RoleManager/Response/RoleView.cs rename to OpenAuth.App/RoleManager/Response/RoleView.cs diff --git a/OpenAuth.App/BaseApp/RoleManager/RoleApp.cs b/OpenAuth.App/RoleManager/RoleApp.cs similarity index 99% rename from OpenAuth.App/BaseApp/RoleManager/RoleApp.cs rename to OpenAuth.App/RoleManager/RoleApp.cs index 62fd41c..9129744 100644 --- a/OpenAuth.App/BaseApp/RoleManager/RoleApp.cs +++ b/OpenAuth.App/RoleManager/RoleApp.cs @@ -5,8 +5,8 @@ using Infrastructure; using OpenAuth.App.Request; using OpenAuth.Repository; using SqlSugar; -using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.BaseApp; +using OpenAuth.Auth.Interface; using OpenAuth.App.BasicQueryService; namespace OpenAuth.App diff --git a/OpenAuth.App/BaseApp/SSO/LocalAuth.cs b/OpenAuth.App/SSO/LocalAuth.cs similarity index 96% rename from OpenAuth.App/BaseApp/SSO/LocalAuth.cs rename to OpenAuth.App/SSO/LocalAuth.cs index 1c61c08..b9f7237 100644 --- a/OpenAuth.App/BaseApp/SSO/LocalAuth.cs +++ b/OpenAuth.App/SSO/LocalAuth.cs @@ -1,10 +1,11 @@ using Infrastructure.Cache; using Microsoft.AspNetCore.Http; -using OpenAuth.App.Interface; +using OpenAuth.Auth.Interface; using System; using Infrastructure; using Microsoft.Extensions.Options; using OpenAuth.Repository.Domain; +using OpenAuth.Auth.AuthStrategies; namespace OpenAuth.App.SSO { @@ -177,12 +178,12 @@ namespace OpenAuth.App.SSO /// 用户名 /// 密码 /// System.String. - public Response Login(string appKey, string username, string pwd) + public Response Login(string appKey, string username, string pwd) { //throw new Exception("hahah"); if (_appConfiguration.Value.IsIdentityAuth) { - return new Response + return new Response { Code = 500, Message = "接口启动了OAuth认证,暂时不能使用该方式登录" @@ -209,6 +210,8 @@ namespace OpenAuth.App.SSO return result; } + + /// /// 注销，如果是Identity登录，需要在controller处理注销逻辑 /// @@ -238,5 +241,7 @@ namespace OpenAuth.App.SSO { return Define.SYSTEM_USERNAME == GetUserName(); } + + } } \ No newline at end of file diff --git a/OpenAuth.App/BaseApp/SSO/LoginParse.cs b/OpenAuth.App/SSO/LoginParse.cs similarity index 94% rename from OpenAuth.App/BaseApp/SSO/LoginParse.cs rename to OpenAuth.App/SSO/LoginParse.cs index 5f632e7..2f0daa5 100644 --- a/OpenAuth.App/BaseApp/SSO/LoginParse.cs +++ b/OpenAuth.App/SSO/LoginParse.cs @@ -24,9 +24,9 @@ namespace OpenAuth.App.SSO this.configuration = configuration; } - public Response Do(PassportLoginRequest model) + public Response Do(PassportLoginRequest model) { - var result = new Response(); + var result = new Response(); try { model.Trim(); @@ -86,7 +86,7 @@ namespace OpenAuth.App.SSO _cacheContext.Set(currentSession.Token, currentSession, DateTime.Now.AddDays(10)); result.Code = 200; - result.Result = new LoginResult + result.Result = new Auth.Model.LoginResult { Token = currentSession.Token }; diff --git a/OpenAuth.App/BaseApp/SSO/LoginResult.cs b/OpenAuth.App/SSO/LoginResult.cs similarity index 100% rename from OpenAuth.App/BaseApp/SSO/LoginResult.cs rename to OpenAuth.App/SSO/LoginResult.cs diff --git a/OpenAuth.App/BaseApp/SSO/PassportLoginRequest.cs b/OpenAuth.App/SSO/PassportLoginRequest.cs similarity index 100% rename from OpenAuth.App/BaseApp/SSO/PassportLoginRequest.cs rename to OpenAuth.App/SSO/PassportLoginRequest.cs diff --git a/OpenAuth.App/BaseApp/SSO/UserAuthSession.cs b/OpenAuth.App/SSO/UserAuthSession.cs similarity index 100% rename from OpenAuth.App/BaseApp/SSO/UserAuthSession.cs rename to OpenAuth.App/SSO/UserAuthSession.cs diff --git a/OpenAuth.App/BaseApp/SysAppFiles/SysAppFilesApp.cs b/OpenAuth.App/SysAppFiles/SysAppFilesApp.cs similarity index 98% rename from OpenAuth.App/BaseApp/SysAppFiles/SysAppFilesApp.cs rename to OpenAuth.App/SysAppFiles/SysAppFilesApp.cs index a0820be..2f2a5f4 100644 --- a/OpenAuth.App/BaseApp/SysAppFiles/SysAppFilesApp.cs +++ b/OpenAuth.App/SysAppFiles/SysAppFilesApp.cs @@ -1,6 +1,6 @@ using Infrastructure; using Newtonsoft.Json.Linq; -using OpenAuth.App.Base; +using OpenAuth.BaseApp; using OpenAuth.App.Interface; using OpenAuth.Repository; using OpenAuth.Repository.Domain; @@ -10,7 +10,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.Auth.Interface; namespace OpenAuth.App { diff --git a/OpenAuth.App/BaseApp/SysDataItem/SysDataItemApp.cs b/OpenAuth.App/SysDataItem/SysDataItemApp.cs similarity index 97% rename from OpenAuth.App/BaseApp/SysDataItem/SysDataItemApp.cs rename to OpenAuth.App/SysDataItem/SysDataItemApp.cs index e4a58cd..3627b92 100644 --- a/OpenAuth.App/BaseApp/SysDataItem/SysDataItemApp.cs +++ b/OpenAuth.App/SysDataItem/SysDataItemApp.cs @@ -1,10 +1,10 @@ -using OpenAuth.App.Base; +using OpenAuth.BaseApp; using OpenAuth.Repository.Domain; using OpenAuth.Repository; using SqlSugar; using OpenAuth.App.Interface; using Infrastructure; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.Auth.Interface; namespace OpenAuth.App { diff --git a/OpenAuth.App/BaseApp/SysDataItemDetail/SysDataItemDetailApp.cs b/OpenAuth.App/SysDataItemDetail/SysDataItemDetailApp.cs similarity index 98% rename from OpenAuth.App/BaseApp/SysDataItemDetail/SysDataItemDetailApp.cs rename to OpenAuth.App/SysDataItemDetail/SysDataItemDetailApp.cs index 16d790c..2da1aa3 100644 --- a/OpenAuth.App/BaseApp/SysDataItemDetail/SysDataItemDetailApp.cs +++ b/OpenAuth.App/SysDataItemDetail/SysDataItemDetailApp.cs @@ -1,6 +1,6 @@ using Infrastructure; using Infrastructure.Extensions; -using OpenAuth.App.Base; +using OpenAuth.BaseApp; using OpenAuth.App.Interface; using OpenAuth.Repository; using OpenAuth.Repository.Domain; @@ -10,7 +10,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.Auth.Interface; using System.Web; namespace OpenAuth.App diff --git a/OpenAuth.App/BaseApp/SysDatabaseLink/Response/TreeModel.cs b/OpenAuth.App/SysDatabaseLink/Response/TreeModel.cs similarity index 100% rename from OpenAuth.App/BaseApp/SysDatabaseLink/Response/TreeModel.cs rename to OpenAuth.App/SysDatabaseLink/Response/TreeModel.cs diff --git a/OpenAuth.App/BaseApp/SysDatabaseLink/SysDatabaseLinkApp.cs b/OpenAuth.App/SysDatabaseLink/SysDatabaseLinkApp.cs similarity index 97% rename from OpenAuth.App/BaseApp/SysDatabaseLink/SysDatabaseLinkApp.cs rename to OpenAuth.App/SysDatabaseLink/SysDatabaseLinkApp.cs index b837ffd..82a8c23 100644 --- a/OpenAuth.App/BaseApp/SysDatabaseLink/SysDatabaseLinkApp.cs +++ b/OpenAuth.App/SysDatabaseLink/SysDatabaseLinkApp.cs @@ -1,6 +1,6 @@ using Infrastructure; using Infrastructure.Extensions; -using OpenAuth.App.Base; +using OpenAuth.BaseApp; using OpenAuth.App.Interface; using OpenAuth.App.SysDatabaseLink.Response; using OpenAuth.Repository; @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.Auth.Interface; namespace OpenAuth.App.SysDatabaseLink { @@ -197,8 +197,8 @@ namespace OpenAuth.App.SysDatabaseLink { try { - this.TestLinkClient(connection, dbType).BeginTran(); - this.TestLinkClient(connection, dbType).CommitTran(); + //this.TestLinkClient(connection, dbType).BeginTran(); + //this.TestLinkClient(connection, dbType).CommitTran(); return "success"; } catch (Exception ex) diff --git a/OpenAuth.App/BaseApp/SysLogs/Request/QuerySysLogListReq.cs b/OpenAuth.App/SysLogs/Request/QuerySysLogListReq.cs similarity index 63% rename from OpenAuth.App/BaseApp/SysLogs/Request/QuerySysLogListReq.cs rename to OpenAuth.App/SysLogs/Request/QuerySysLogListReq.cs index a3fa012..964eaae 100644 --- a/OpenAuth.App/BaseApp/SysLogs/Request/QuerySysLogListReq.cs +++ b/OpenAuth.App/SysLogs/Request/QuerySysLogListReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using Utils.Web.Model; + +namespace OpenAuth.App.Request { public class QuerySysLogListReq : PageReq { diff --git a/OpenAuth.App/BaseApp/SysLogs/SysLogApp.cs b/OpenAuth.App/SysLogs/SysLogApp.cs similarity index 95% rename from OpenAuth.App/BaseApp/SysLogs/SysLogApp.cs rename to OpenAuth.App/SysLogs/SysLogApp.cs index 5fa8592..e6878db 100644 --- a/OpenAuth.App/BaseApp/SysLogs/SysLogApp.cs +++ b/OpenAuth.App/SysLogs/SysLogApp.cs @@ -1,12 +1,13 @@ using System.Reflection; using System.Threading.Tasks; -using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.BaseApp; +using OpenAuth.Auth.Interface; using OpenAuth.App.Request; using OpenAuth.App.Response; using OpenAuth.Repository; using OpenAuth.Repository.Domain; using SqlSugar; +using Utils.Web.Model; namespace OpenAuth.App { diff --git a/OpenAuth.App/BaseApp/SysMessage/Request/QuerySysMessageListReq.cs b/OpenAuth.App/SysMessage/Request/QuerySysMessageListReq.cs similarity index 78% rename from OpenAuth.App/BaseApp/SysMessage/Request/QuerySysMessageListReq.cs rename to OpenAuth.App/SysMessage/Request/QuerySysMessageListReq.cs index 895c93f..b2f2840 100644 --- a/OpenAuth.App/BaseApp/SysMessage/Request/QuerySysMessageListReq.cs +++ b/OpenAuth.App/SysMessage/Request/QuerySysMessageListReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using Utils.Web.Model; + +namespace OpenAuth.App.Request { public class QuerySysMessageListReq : PageReq { diff --git a/OpenAuth.App/BaseApp/SysMessage/SysMessageApp.cs b/OpenAuth.App/SysMessage/SysMessageApp.cs similarity index 97% rename from OpenAuth.App/BaseApp/SysMessage/SysMessageApp.cs rename to OpenAuth.App/SysMessage/SysMessageApp.cs index f3edc3f..94f15c8 100644 --- a/OpenAuth.App/BaseApp/SysMessage/SysMessageApp.cs +++ b/OpenAuth.App/SysMessage/SysMessageApp.cs @@ -1,13 +1,14 @@ using Infrastructure; using Microsoft.Extensions.Logging; -using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.BaseApp; +using OpenAuth.Auth.Interface; using OpenAuth.App.Interface; using OpenAuth.App.Request; using OpenAuth.App.Response; using OpenAuth.Repository; using OpenAuth.Repository.Domain; using SqlSugar; +using Utils.Web.Model; namespace OpenAuth.App { diff --git a/OpenAuth.App/BaseApp/SysPosGroup/Request/PosGroupForm.cs b/OpenAuth.App/SysPosGroup/Request/PosGroupForm.cs similarity index 100% rename from OpenAuth.App/BaseApp/SysPosGroup/Request/PosGroupForm.cs rename to OpenAuth.App/SysPosGroup/Request/PosGroupForm.cs diff --git a/OpenAuth.App/BaseApp/SysPosGroup/SysPosGroupApp.cs b/OpenAuth.App/SysPosGroup/SysPosGroupApp.cs similarity index 96% rename from OpenAuth.App/BaseApp/SysPosGroup/SysPosGroupApp.cs rename to OpenAuth.App/SysPosGroup/SysPosGroupApp.cs index ff2f208..05dd5f6 100644 --- a/OpenAuth.App/BaseApp/SysPosGroup/SysPosGroupApp.cs +++ b/OpenAuth.App/SysPosGroup/SysPosGroupApp.cs @@ -1,4 +1,4 @@ -using OpenAuth.App.Base; +using OpenAuth.BaseApp; using OpenAuth.Repository.Domain; using OpenAuth.Repository; using System; @@ -10,7 +10,7 @@ using SqlSugar; using OpenAuth.App.Interface; using Infrastructure; using OpenAuth.App; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.Auth.Interface; using OpenAuth.App.Request; namespace OpenAuth.App diff --git a/OpenAuth.App/BaseApp/SysPosition/Request/QueryPositonListReq.cs b/OpenAuth.App/SysPosition/Request/QueryPositonListReq.cs similarity index 92% rename from OpenAuth.App/BaseApp/SysPosition/Request/QueryPositonListReq.cs rename to OpenAuth.App/SysPosition/Request/QueryPositonListReq.cs index 4a42172..2e60ba3 100644 --- a/OpenAuth.App/BaseApp/SysPosition/Request/QueryPositonListReq.cs +++ b/OpenAuth.App/SysPosition/Request/QueryPositonListReq.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Utils.Web.Model; namespace OpenAuth.App { diff --git a/OpenAuth.App/BaseApp/SysPosition/SysPositionApp.cs b/OpenAuth.App/SysPosition/SysPositionApp.cs similarity index 98% rename from OpenAuth.App/BaseApp/SysPosition/SysPositionApp.cs rename to OpenAuth.App/SysPosition/SysPositionApp.cs index aabd0e0..097484f 100644 --- a/OpenAuth.App/BaseApp/SysPosition/SysPositionApp.cs +++ b/OpenAuth.App/SysPosition/SysPositionApp.cs @@ -1,4 +1,4 @@ -using OpenAuth.App.Base; +using OpenAuth.BaseApp; using OpenAuth.Repository.Domain; using OpenAuth.Repository; using System; @@ -9,7 +9,7 @@ using System.Threading.Tasks; using SqlSugar; using OpenAuth.App.Interface; using Infrastructure; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.Auth.Interface; using OpenAuth.Repository.Core; using Oracle.ManagedDataAccess.Types; diff --git a/OpenAuth.App/BaseApp/UserManager/Request/AssignUserOrgs.cs b/OpenAuth.App/UserManager/Request/AssignUserOrgs.cs similarity index 100% rename from OpenAuth.App/BaseApp/UserManager/Request/AssignUserOrgs.cs rename to OpenAuth.App/UserManager/Request/AssignUserOrgs.cs diff --git a/OpenAuth.App/BaseApp/UserManager/Request/AssignUserRoles.cs b/OpenAuth.App/UserManager/Request/AssignUserRoles.cs similarity index 100% rename from OpenAuth.App/BaseApp/UserManager/Request/AssignUserRoles.cs rename to OpenAuth.App/UserManager/Request/AssignUserRoles.cs diff --git a/OpenAuth.App/BaseApp/UserManager/Request/ChangePasswordReq.cs b/OpenAuth.App/UserManager/Request/ChangePasswordReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/UserManager/Request/ChangePasswordReq.cs rename to OpenAuth.App/UserManager/Request/ChangePasswordReq.cs diff --git a/OpenAuth.App/BaseApp/UserManager/Request/ChangeProfileReq.cs b/OpenAuth.App/UserManager/Request/ChangeProfileReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/UserManager/Request/ChangeProfileReq.cs rename to OpenAuth.App/UserManager/Request/ChangeProfileReq.cs diff --git a/OpenAuth.App/BaseApp/UserManager/Request/QueryUserListByOrgReq.cs b/OpenAuth.App/UserManager/Request/QueryUserListByOrgReq.cs similarity index 64% rename from OpenAuth.App/BaseApp/UserManager/Request/QueryUserListByOrgReq.cs rename to OpenAuth.App/UserManager/Request/QueryUserListByOrgReq.cs index 4ced4d5..262c685 100644 --- a/OpenAuth.App/BaseApp/UserManager/Request/QueryUserListByOrgReq.cs +++ b/OpenAuth.App/UserManager/Request/QueryUserListByOrgReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using Utils.Web.Model; + +namespace OpenAuth.App.Request { public class QueryUserListByOrgReq : PageReq { diff --git a/OpenAuth.App/BaseApp/UserManager/Request/QueryUserListByRoleReq.cs b/OpenAuth.App/UserManager/Request/QueryUserListByRoleReq.cs similarity index 64% rename from OpenAuth.App/BaseApp/UserManager/Request/QueryUserListByRoleReq.cs rename to OpenAuth.App/UserManager/Request/QueryUserListByRoleReq.cs index 0cfabc0..eb2cc7d 100644 --- a/OpenAuth.App/BaseApp/UserManager/Request/QueryUserListByRoleReq.cs +++ b/OpenAuth.App/UserManager/Request/QueryUserListByRoleReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using Utils.Web.Model; + +namespace OpenAuth.App.Request { public class QueryUserListByRoleReq : PageReq { diff --git a/OpenAuth.App/BaseApp/UserManager/Request/QueryUserListReq.cs b/OpenAuth.App/UserManager/Request/QueryUserListReq.cs similarity index 63% rename from OpenAuth.App/BaseApp/UserManager/Request/QueryUserListReq.cs rename to OpenAuth.App/UserManager/Request/QueryUserListReq.cs index 88ea0f0..cd39d94 100644 --- a/OpenAuth.App/BaseApp/UserManager/Request/QueryUserListReq.cs +++ b/OpenAuth.App/UserManager/Request/QueryUserListReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using Utils.Web.Model; + +namespace OpenAuth.App.Request { public class QueryUserListReq : PageReq { diff --git a/OpenAuth.App/BaseApp/UserManager/Request/UpdateUserReq.cs b/OpenAuth.App/UserManager/Request/UpdateUserReq.cs similarity index 100% rename from OpenAuth.App/BaseApp/UserManager/Request/UpdateUserReq.cs rename to OpenAuth.App/UserManager/Request/UpdateUserReq.cs diff --git a/OpenAuth.App/BaseApp/UserManager/Response/UserView.cs b/OpenAuth.App/UserManager/Response/UserView.cs similarity index 100% rename from OpenAuth.App/BaseApp/UserManager/Response/UserView.cs rename to OpenAuth.App/UserManager/Response/UserView.cs diff --git a/OpenAuth.App/BaseApp/UserManager/UserManagerApp.cs b/OpenAuth.App/UserManager/UserManagerApp.cs similarity index 99% rename from OpenAuth.App/BaseApp/UserManager/UserManagerApp.cs rename to OpenAuth.App/UserManager/UserManagerApp.cs index 2bcbf99..76a8a93 100644 --- a/OpenAuth.App/BaseApp/UserManager/UserManagerApp.cs +++ b/OpenAuth.App/UserManager/UserManagerApp.cs @@ -14,8 +14,8 @@ using NPOI.HSSF.UserModel; using NPOI.SS.Formula.Functions; using NPOI.SS.UserModel; using NPOI.XSSF.UserModel; -using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.BaseApp; +using OpenAuth.Auth.Interface; using OpenAuth.App.Config; using OpenAuth.App.Interface; using OpenAuth.App.Request; @@ -26,6 +26,7 @@ using SixLabors.ImageSharp; using SqlSugar; using Yitter.IdGenerator; using static ICSharpCode.SharpZipLib.Zip.ExtendedUnixData; +using Utils.Web.Model; namespace OpenAuth.App { diff --git a/OpenAuth.App/BaseApp/WFDelegate/Request/WFDelegateDto.cs b/OpenAuth.App/WFDelegate/Request/WFDelegateDto.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFDelegate/Request/WFDelegateDto.cs rename to OpenAuth.App/WFDelegate/Request/WFDelegateDto.cs diff --git a/OpenAuth.App/BaseApp/WFDelegate/WFDelegateApp.cs b/OpenAuth.App/WFDelegate/WFDelegateApp.cs similarity index 99% rename from OpenAuth.App/BaseApp/WFDelegate/WFDelegateApp.cs rename to OpenAuth.App/WFDelegate/WFDelegateApp.cs index f689450..9fb182d 100644 --- a/OpenAuth.App/BaseApp/WFDelegate/WFDelegateApp.cs +++ b/OpenAuth.App/WFDelegate/WFDelegateApp.cs @@ -1,5 +1,5 @@ using Infrastructure; -using OpenAuth.App.Base; +using OpenAuth.BaseApp; using OpenAuth.App.Interface; using OpenAuth.App.Request; using OpenAuth.Repository; @@ -11,7 +11,8 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.Auth.Interface; +using Utils.Web.Model; namespace OpenAuth.App { diff --git a/OpenAuth.App/BaseApp/WFProcess/Config/WFDelegate.cs b/OpenAuth.App/WFProcess/Config/WFDelegate.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFProcess/Config/WFDelegate.cs rename to OpenAuth.App/WFProcess/Config/WFDelegate.cs diff --git a/OpenAuth.App/BaseApp/WFProcess/Config/WFEngineConfig.cs b/OpenAuth.App/WFProcess/Config/WFEngineConfig.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFProcess/Config/WFEngineConfig.cs rename to OpenAuth.App/WFProcess/Config/WFEngineConfig.cs diff --git a/OpenAuth.App/BaseApp/WFProcess/Config/WFParams.cs b/OpenAuth.App/WFProcess/Config/WFParams.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFProcess/Config/WFParams.cs rename to OpenAuth.App/WFProcess/Config/WFParams.cs diff --git a/OpenAuth.App/BaseApp/WFProcess/Config/WFUserInfo.cs b/OpenAuth.App/WFProcess/Config/WFUserInfo.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFProcess/Config/WFUserInfo.cs rename to OpenAuth.App/WFProcess/Config/WFUserInfo.cs diff --git a/OpenAuth.App/BaseApp/WFProcess/IWFEngine.cs b/OpenAuth.App/WFProcess/IWFEngine.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFProcess/IWFEngine.cs rename to OpenAuth.App/WFProcess/IWFEngine.cs diff --git a/OpenAuth.App/BaseApp/WFProcess/IWorkFlowMethod.cs b/OpenAuth.App/WFProcess/IWorkFlowMethod.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFProcess/IWorkFlowMethod.cs rename to OpenAuth.App/WFProcess/IWorkFlowMethod.cs diff --git a/OpenAuth.App/BaseApp/WFProcess/NodeTypeEnum.cs b/OpenAuth.App/WFProcess/NodeTypeEnum.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFProcess/NodeTypeEnum.cs rename to OpenAuth.App/WFProcess/NodeTypeEnum.cs diff --git a/OpenAuth.App/BaseApp/WFProcess/Request/WFProcessDto.cs b/OpenAuth.App/WFProcess/Request/WFProcessDto.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFProcess/Request/WFProcessDto.cs rename to OpenAuth.App/WFProcess/Request/WFProcessDto.cs diff --git a/OpenAuth.App/BaseApp/WFProcess/Request/WFProcessPointDto.cs b/OpenAuth.App/WFProcess/Request/WFProcessPointDto.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFProcess/Request/WFProcessPointDto.cs rename to OpenAuth.App/WFProcess/Request/WFProcessPointDto.cs diff --git a/OpenAuth.App/BaseApp/WFProcess/Request/WFProcessSearchDto.cs b/OpenAuth.App/WFProcess/Request/WFProcessSearchDto.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFProcess/Request/WFProcessSearchDto.cs rename to OpenAuth.App/WFProcess/Request/WFProcessSearchDto.cs diff --git a/OpenAuth.App/BaseApp/WFProcess/Response/BPMNWFTaskDto.cs b/OpenAuth.App/WFProcess/Response/BPMNWFTaskDto.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFProcess/Response/BPMNWFTaskDto.cs rename to OpenAuth.App/WFProcess/Response/BPMNWFTaskDto.cs diff --git a/OpenAuth.App/BaseApp/WFProcess/WFAuditor.cs b/OpenAuth.App/WFProcess/WFAuditor.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFProcess/WFAuditor.cs rename to OpenAuth.App/WFProcess/WFAuditor.cs diff --git a/OpenAuth.App/BaseApp/WFProcess/WFCondition.cs b/OpenAuth.App/WFProcess/WFCondition.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFProcess/WFCondition.cs rename to OpenAuth.App/WFProcess/WFCondition.cs diff --git a/OpenAuth.App/BaseApp/WFProcess/WFEngine.cs b/OpenAuth.App/WFProcess/WFEngine.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFProcess/WFEngine.cs rename to OpenAuth.App/WFProcess/WFEngine.cs diff --git a/OpenAuth.App/BaseApp/WFProcess/WFProcessApp.cs b/OpenAuth.App/WFProcess/WFProcessApp.cs similarity index 97% rename from OpenAuth.App/BaseApp/WFProcess/WFProcessApp.cs rename to OpenAuth.App/WFProcess/WFProcessApp.cs index e0e2253..a0683dd 100644 --- a/OpenAuth.App/BaseApp/WFProcess/WFProcessApp.cs +++ b/OpenAuth.App/WFProcess/WFProcessApp.cs @@ -3,7 +3,7 @@ using Infrastructure; using Infrastructure.Extensions; using Infrastructure.Helpers; using Microsoft.Extensions.Configuration; -using OpenAuth.App.Base; +using OpenAuth.BaseApp; using OpenAuth.App.BasicQueryService; using OpenAuth.App.Config; using OpenAuth.App.Interface; @@ -19,9 +19,10 @@ using OpenAuth.App.BaseApp.Jobs; using System.Text; using DocumentFormat.OpenXml.Spreadsheet; using Infrastructure.Utilities; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.Auth.Interface; using System.Diagnostics; using NPOI.Util; +using Utils.Web.Model; namespace OpenAuth.App { @@ -1796,51 +1797,52 @@ namespace OpenAuth.App break; //数据库表字段 case "6": - using (var db = this.CodeClient(item.DbCode, _configuration)) - { - DataTable dt = await db.Ado.GetDataTableAsync(string.Format("select {0} from {1} where {2} = @processId ", item.AuditorField, item.Table, item.Rfield), new { processId }); - foreach (DataRow row in dt.Rows) - { - var userIdString = row[0].ToString(); - if (!string.IsNullOrEmpty(userIdString)) - { - var userIdList = userIdString.Split(","); - foreach (var userIdItem in userIdList) - { - userIds.Add(userIdItem); - } - } - } - break; - } + //using (var db = this.CodeClient(item.DbCode, _configuration)) + //{ + // DataTable dt = await db.Ado.GetDataTableAsync(string.Format("select {0} from {1} where {2} = @processId ", item.AuditorField, item.Table, item.Rfield), new { processId }); + // foreach (DataRow row in dt.Rows) + // { + // var userIdString = row[0].ToString(); + // if (!string.IsNullOrEmpty(userIdString)) + // { + // var userIdList = userIdString.Split(","); + // foreach (var userIdItem in userIdList) + // { + // userIds.Add(userIdItem); + // } + // } + // } + // break; + //} //数据库表字段 case "7": - using (var db = this.CodeClient(item.DbCode, _configuration)) - { - //获取数据id - var process = await client.Queryable().FirstAsync(a => a.Id == processId); - WFInstanceInfo instanceInfo = null; - if (process != null) - { - // instanceInfo = Newtonsoft.Json.JsonConvert.DeserializeObject(process.InstanceInfo); - instanceInfo = process.InstanceInfo; - } - DataTable dt = await db.Ado.GetDataTableAsync(string.Format(item.Sql), new { pkeyValue = instanceInfo.pkeyValue }); - foreach (DataRow row in dt.Rows) - { - var userIdString = row[0].ToString(); - if (!string.IsNullOrEmpty(userIdString)) - { - var userIdList = userIdString.Split(","); - foreach (var userIdItem in userIdList) - { - userIds.Add(userIdItem); - } - } - } - break; - } + //using (var db = this.CodeClient(item.DbCode, _configuration)) + //{ + // //获取数据id + // var process = await client.Queryable().FirstAsync(a => a.Id == processId); + // WFInstanceInfo instanceInfo = null; + // if (process != null) + // { + // // instanceInfo = Newtonsoft.Json.JsonConvert.DeserializeObject(process.InstanceInfo); + // instanceInfo = process.InstanceInfo; + // } + // DataTable dt = await db.Ado.GetDataTableAsync(string.Format(item.Sql), new { pkeyValue = instanceInfo.pkeyValue }); + // foreach (DataRow row in dt.Rows) + // { + // var userIdString = row[0].ToString(); + // if (!string.IsNullOrEmpty(userIdString)) + // { + // var userIdList = userIdString.Split(","); + // foreach (var userIdItem in userIdList) + // { + // userIds.Add(userIdItem); + // } + // } + // } + // break; + //} + break; } } var userList = await GetListByKeyValues(userIds.ToArray()); diff --git a/OpenAuth.App/BaseApp/WFProcess/WFProcessApp1.cs b/OpenAuth.App/WFProcess/WFProcessApp1.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFProcess/WFProcessApp1.cs rename to OpenAuth.App/WFProcess/WFProcessApp1.cs diff --git a/OpenAuth.App/BaseApp/WFProcess/WFScheme.cs b/OpenAuth.App/WFProcess/WFScheme.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFProcess/WFScheme.cs rename to OpenAuth.App/WFProcess/WFScheme.cs diff --git a/OpenAuth.App/BaseApp/WFProcess/WFTask.cs b/OpenAuth.App/WFProcess/WFTask.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFProcess/WFTask.cs rename to OpenAuth.App/WFProcess/WFTask.cs diff --git a/OpenAuth.App/BaseApp/WFProcess/WFUnit.cs b/OpenAuth.App/WFProcess/WFUnit.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFProcess/WFUnit.cs rename to OpenAuth.App/WFProcess/WFUnit.cs diff --git a/OpenAuth.App/BaseApp/WFProcess/WfMethodParameter.cs b/OpenAuth.App/WFProcess/WfMethodParameter.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFProcess/WfMethodParameter.cs rename to OpenAuth.App/WFProcess/WfMethodParameter.cs diff --git a/OpenAuth.App/BaseApp/WFSchemeInfo/Response/WFSchemeDto.cs b/OpenAuth.App/WFSchemeInfo/Response/WFSchemeDto.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFSchemeInfo/Response/WFSchemeDto.cs rename to OpenAuth.App/WFSchemeInfo/Response/WFSchemeDto.cs diff --git a/OpenAuth.App/BaseApp/WFSchemeInfo/WFSchemeApp.cs b/OpenAuth.App/WFSchemeInfo/WFSchemeApp.cs similarity index 95% rename from OpenAuth.App/BaseApp/WFSchemeInfo/WFSchemeApp.cs rename to OpenAuth.App/WFSchemeInfo/WFSchemeApp.cs index 53d781b..d771327 100644 --- a/OpenAuth.App/BaseApp/WFSchemeInfo/WFSchemeApp.cs +++ b/OpenAuth.App/WFSchemeInfo/WFSchemeApp.cs @@ -1,4 +1,4 @@ -using OpenAuth.App.Base; +using OpenAuth.BaseApp; using OpenAuth.Repository.Domain; using OpenAuth.Repository; using System; @@ -9,8 +9,9 @@ using System.Threading.Tasks; using SqlSugar; using OpenAuth.App.Interface; using Infrastructure; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.Auth.Interface; using OpenAuth.App.Request; +using Utils.Web.Model; namespace OpenAuth.App { diff --git a/OpenAuth.App/BaseApp/WFSchemeInfo/WFSchemeInfoApp.cs b/OpenAuth.App/WFSchemeInfo/WFSchemeInfoApp.cs similarity index 99% rename from OpenAuth.App/BaseApp/WFSchemeInfo/WFSchemeInfoApp.cs rename to OpenAuth.App/WFSchemeInfo/WFSchemeInfoApp.cs index b872f97..6b7cb9e 100644 --- a/OpenAuth.App/BaseApp/WFSchemeInfo/WFSchemeInfoApp.cs +++ b/OpenAuth.App/WFSchemeInfo/WFSchemeInfoApp.cs @@ -1,12 +1,14 @@ using Infrastructure; using Infrastructure.Helpers; using Microsoft.Extensions.Configuration; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.Auth.Interface; using OpenAuth.App.Interface; using OpenAuth.App.Request; using OpenAuth.Repository; using OpenAuth.Repository.Domain; using SqlSugar; +using Utils.Web.Model; +using OpenAuth.BaseApp; namespace OpenAuth.App { diff --git a/OpenAuth.App/BaseApp/WFStamp/WFStampApp.cs b/OpenAuth.App/WFStamp/WFStampApp.cs similarity index 98% rename from OpenAuth.App/BaseApp/WFStamp/WFStampApp.cs rename to OpenAuth.App/WFStamp/WFStampApp.cs index f13ef01..6fc66b6 100644 --- a/OpenAuth.App/BaseApp/WFStamp/WFStampApp.cs +++ b/OpenAuth.App/WFStamp/WFStampApp.cs @@ -1,6 +1,6 @@ using Infrastructure; using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities; -using OpenAuth.App.Base; +using OpenAuth.BaseApp; using OpenAuth.App.Interface; using OpenAuth.App.Request; using OpenAuth.App.Response; @@ -12,7 +12,8 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.Auth.Interface; +using Utils.Web.Model; namespace OpenAuth.App { diff --git a/OpenAuth.App/BaseApp/WFTask/Request/WFTaskDto.cs b/OpenAuth.App/WFTask/Request/WFTaskDto.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFTask/Request/WFTaskDto.cs rename to OpenAuth.App/WFTask/Request/WFTaskDto.cs diff --git a/OpenAuth.App/BaseApp/WFTask/Response/ExtendInfo.cs b/OpenAuth.App/WFTask/Response/ExtendInfo.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFTask/Response/ExtendInfo.cs rename to OpenAuth.App/WFTask/Response/ExtendInfo.cs diff --git a/OpenAuth.App/BaseApp/WFTask/Response/RetractRes.cs b/OpenAuth.App/WFTask/Response/RetractRes.cs similarity index 100% rename from OpenAuth.App/BaseApp/WFTask/Response/RetractRes.cs rename to OpenAuth.App/WFTask/Response/RetractRes.cs diff --git a/OpenAuth.App/BaseApp/WFTask/WFTaskApp.cs b/OpenAuth.App/WFTask/WFTaskApp.cs similarity index 99% rename from OpenAuth.App/BaseApp/WFTask/WFTaskApp.cs rename to OpenAuth.App/WFTask/WFTaskApp.cs index 1323844..cfac381 100644 --- a/OpenAuth.App/BaseApp/WFTask/WFTaskApp.cs +++ b/OpenAuth.App/WFTask/WFTaskApp.cs @@ -8,7 +8,7 @@ using Moq; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NPOI.SS.Formula.Functions; -using OpenAuth.App.BaseApp.Base; +using OpenAuth.Auth.Interface; using OpenAuth.App.BaseApp.WFTask.Response; using OpenAuth.App.FormScheme; using OpenAuth.App.FormScheme.Response; @@ -17,6 +17,8 @@ using OpenAuth.App.Request; using OpenAuth.Repository; using OpenAuth.Repository.Domain; using SqlSugar; +using Utils.Web.Model; +using OpenAuth.BaseApp; namespace OpenAuth.App.BaseApp.WFTask { diff --git a/OpenAuth.App/BaseApp/AuthStrategies/AuthStrategyContext.cs b/OpenAuth.Auth/AuthStrategies/AuthStrategyContext.cs similarity index 92% rename from OpenAuth.App/BaseApp/AuthStrategies/AuthStrategyContext.cs rename to OpenAuth.Auth/AuthStrategies/AuthStrategyContext.cs index e92db63..15efda2 100644 --- a/OpenAuth.App/BaseApp/AuthStrategies/AuthStrategyContext.cs +++ b/OpenAuth.Auth/AuthStrategies/AuthStrategyContext.cs @@ -1,10 +1,11 @@ using System; using System.Collections.Generic; using Infrastructure; -using OpenAuth.App.Response; +using OpenAuth.Auth.Interface; +using OpenAuth.Auth.Model; using OpenAuth.Repository.Domain; -namespace OpenAuth.App +namespace OpenAuth.Auth.AuthStrategies { /// /// 授权策略上下文，一个典型的策略模式 diff --git a/OpenAuth.App/BaseApp/AuthStrategies/NormalAuthStrategy.cs b/OpenAuth.Auth/AuthStrategies/NormalAuthStrategy.cs similarity index 52% rename from OpenAuth.App/BaseApp/AuthStrategies/NormalAuthStrategy.cs rename to OpenAuth.Auth/AuthStrategies/NormalAuthStrategy.cs index 9ddec30..0332de8 100644 --- a/OpenAuth.App/BaseApp/AuthStrategies/NormalAuthStrategy.cs +++ b/OpenAuth.Auth/AuthStrategies/NormalAuthStrategy.cs @@ -4,21 +4,17 @@ using System.Collections.Generic; using System.Linq; using Infrastructure; using Infrastructure.Extensions; -using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; -using OpenAuth.App.BasicQueryService; -using OpenAuth.App.Response; -using OpenAuth.Repository; +using OpenAuth.Auth.Interface; +using OpenAuth.Auth.Model; using OpenAuth.Repository.Domain; using SqlSugar; -using StackExchange.Redis; -namespace OpenAuth.App +namespace OpenAuth.Auth.AuthStrategies { /// /// 普通用户授权策略 /// - public class NormalAuthStrategy : SqlSugarBaseApp, IAuthStrategy + public class NormalAuthStrategy : IAuthStrategy { ISqlSugarClient client; UserManager manager; @@ -26,12 +22,11 @@ namespace OpenAuth.App private List _userRoleIds; //用户角色ID public NormalAuthStrategy( - ISugarUnitOfWork unitWork, - ISimpleClient repository, + ISqlSugarClient client, UserManager userManager - ) : base(unitWork, repository, null) + ) { - client = base.Repository.AsSugarClient(); + this.client = client; manager = userManager; } @@ -41,24 +36,6 @@ namespace OpenAuth.App { get { - //var moduleIds = Repository.ChangeRepository>().GetList( - // u => - // (_userRoleIds.Contains(u.RoleId))).Select(u => u.ModuleId); - //var modules = Repository.ChangeRepository>().AsQueryable().Where(u => moduleIds.Contains(u.Id)) - // .Select(module => new ModuleView - // { - // SortNo = module.SortNo, - // Name = module.Name, - // Code = module.Code, - // CascadeId = module.CascadeId, - // Id = module.Id, - // IconName = module.IconName, - // Url = module.Url, - // ParentId = module.ParentId, - // ParentName = module.ParentName, - // IsSys = module.IsSys, - // Status = module.Status - // }).ToList(); var modules = manager.RoleModules(_userRoleIds).Distinct().OrderBy((r, m) => m.SortNo).Select().ToList(); @@ -66,7 +43,7 @@ namespace OpenAuth.App foreach (var module in modules) { - module.Elements = usermoduleelements.Where(u => u.ModuleId == module.Id).DistinctBy(u=>u.Id).ToList(); + module.Elements = usermoduleelements.Where(u => u.ModuleId == module.Id).ToList(); } return modules; @@ -90,9 +67,10 @@ namespace OpenAuth.App { get { - var resourceIds = base.Repository.ChangeRepository>() - .GetList(u => _userRoleIds.Contains(u.RoleId)).Select(u => u.ResourceId); - return base.Repository.ChangeRepository>().GetList(u => resourceIds.Contains(u.Id)).ToList(); + var resourceIds = client.Queryable() + .Where(u => _userRoleIds.Contains(u.RoleId)).Select(u => u.ResourceId) + .ToList(); + return client.Queryable().Where(u => resourceIds.Contains(u.Id)).ToList(); } } @@ -118,6 +96,6 @@ namespace OpenAuth.App _userRoleIds = manager.UserRoles(_user.Id).Select((u, r) => r.Id).ToList(); } } - + } } \ No newline at end of file diff --git a/OpenAuth.App/BaseApp/AuthStrategies/SystemAuthStrategy.cs b/OpenAuth.Auth/AuthStrategies/SystemAuthStrategy.cs similarity index 61% rename from OpenAuth.App/BaseApp/AuthStrategies/SystemAuthStrategy.cs rename to OpenAuth.Auth/AuthStrategies/SystemAuthStrategy.cs index 648275e..5977a3b 100644 --- a/OpenAuth.App/BaseApp/AuthStrategies/SystemAuthStrategy.cs +++ b/OpenAuth.Auth/AuthStrategies/SystemAuthStrategy.cs @@ -2,29 +2,42 @@ using System.Collections.Generic; using System.Linq; using Infrastructure; -using OpenAuth.App.Base; -using OpenAuth.App.BaseApp.Base; -using OpenAuth.App.Response; +using OpenAuth.Auth.Interface; +using OpenAuth.Auth.Model; using OpenAuth.Repository; using OpenAuth.Repository.Domain; using SqlSugar; -namespace OpenAuth.App +namespace OpenAuth.Auth.AuthStrategies { /// /// 领域服务 /// 超级管理员权限 /// 超级管理员使用-1，可以根据需要修改 /// - public class SystemAuthStrategy : SqlSugarBaseApp, IAuthStrategy + public class SystemAuthStrategy : IAuthStrategy { + ISqlSugarClient client; + + public SystemAuthStrategy(ISqlSugarClient client) + { + this.client = client; + + _user = new SysUser + { + Account = Define.SYSTEM_USERNAME, + Name = "超级管理员", + Id = -1 + }; + } + protected SysUser _user; public List Modules { get { - return Repository.ChangeRepository>().AsQueryable() + return client.Queryable() .Includes(a => a.Elements) .Select(a => new ModuleView { @@ -36,27 +49,27 @@ namespace OpenAuth.App public List Roles { - get { return Repository.ChangeRepository>().GetList(); } + get { return client.Queryable().ToList(); } } public List ModuleElements { - get { return Repository.ChangeRepository>().GetList(); } + get { return client.Queryable().ToList(); } } public List Resources { - get { return Repository.ChangeRepository>().GetList(); } + get { return client.Queryable < SysResource>().ToList(); } } public List Orgs { - get { return Repository.ChangeRepository>().GetList(); } + get { return client.Queryable < SysOrg>().ToList(); } } public List Positions { - get { return Repository.ChangeRepository>().GetList(); } + get { return client.Queryable < SysPosition>().ToList(); } } public SysUser User @@ -67,17 +80,5 @@ namespace OpenAuth.App throw new Exception("超级管理员，禁止设置用户"); } } - - - - public SystemAuthStrategy(ISugarUnitOfWork unitWork, ISimpleClient repository) : base(unitWork, repository, null) - { - _user = new SysUser - { - Account = Define.SYSTEM_USERNAME, - Name = "超级管理员", - Id = -1 - }; - } } } \ No newline at end of file diff --git a/OpenAuth.App/BaseApp/Interface/IAuth.cs b/OpenAuth.Auth/Interface/IAuth.cs similarity index 92% rename from OpenAuth.App/BaseApp/Interface/IAuth.cs rename to OpenAuth.Auth/Interface/IAuth.cs index 6c5807a..a51d5ed 100644 --- a/OpenAuth.App/BaseApp/Interface/IAuth.cs +++ b/OpenAuth.Auth/Interface/IAuth.cs @@ -5,9 +5,10 @@ */ using Infrastructure; -using OpenAuth.App.SSO; +using OpenAuth.Auth.AuthStrategies; +using OpenAuth.Auth.Model; -namespace OpenAuth.App.Interface +namespace OpenAuth.Auth.Interface { public interface IAuth { diff --git a/OpenAuth.App/BaseApp/Interface/IAuthStrategy.cs b/OpenAuth.Auth/Interface/IAuthStrategy.cs similarity index 88% rename from OpenAuth.App/BaseApp/Interface/IAuthStrategy.cs rename to OpenAuth.Auth/Interface/IAuthStrategy.cs index 8154e06..9a06060 100644 --- a/OpenAuth.App/BaseApp/Interface/IAuthStrategy.cs +++ b/OpenAuth.Auth/Interface/IAuthStrategy.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using Infrastructure; -using OpenAuth.App.Response; +using OpenAuth.Auth.Model; using OpenAuth.Repository.Domain; -namespace OpenAuth.App +namespace OpenAuth.Auth.Interface { public interface IAuthStrategy { diff --git a/OpenAuth.Auth/Model/LoginResult.cs b/OpenAuth.Auth/Model/LoginResult.cs new file mode 100644 index 0000000..0725f5f --- /dev/null +++ b/OpenAuth.Auth/Model/LoginResult.cs @@ -0,0 +1,11 @@ +using Infrastructure; + +namespace OpenAuth.Auth.Model +{ + + public class LoginResult + { + public string ReturnUrl; + public string Token; + } +} \ No newline at end of file diff --git a/OpenAuth.Auth/Model/ModuleView.cs b/OpenAuth.Auth/Model/ModuleView.cs new file mode 100644 index 0000000..0419791 --- /dev/null +++ b/OpenAuth.Auth/Model/ModuleView.cs @@ -0,0 +1,87 @@ +using Infrastructure; +using OpenAuth.Repository.Domain; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace OpenAuth.Auth.Model +{ + public class ModuleView + { + /// + /// ID + /// + /// + public string Id { get; set; } + + /// + /// 节点语义ID + /// + public string CascadeId { get; set; } + + /// + /// 名称 + /// + /// + public string Name { get; set; } + + /// + /// 主页面URL + /// + /// + public string Url { get; set; } + + /// + /// 父节点流水号 + /// + /// + public string ParentId { get; set; } + + /// + /// 父节点流水号 + /// + /// + public string ParentName { get; set; } + + /// + /// 节点图标文件名称 + /// + /// + public string IconName { get; set; } + + + /// + /// 当前状态，0：正常，-1：隐藏，不在导航列表中显示 + /// + public int Status { get; set; } + + + public bool Checked { get; set; } + + /// + /// 排序号 + /// + public int SortNo { get; set; } + + public string Code { get; set; } + + public bool IsSys { get; set; } + + /// + /// 模块中的元素 + /// + public List Elements { get; set; } + + public static implicit operator ModuleView(SysModule module) + { + return module.MapTo(); + } + + public static implicit operator SysModule(ModuleView view) + { + return view.MapTo(); + } + } +} diff --git a/OpenAuth.Auth/OpenAuth.Auth.csproj b/OpenAuth.Auth/OpenAuth.Auth.csproj new file mode 100644 index 0000000..08423aa --- /dev/null +++ b/OpenAuth.Auth/OpenAuth.Auth.csproj @@ -0,0 +1,14 @@ + + + + net6.0 + enable + enable + + + + + + + + diff --git a/OpenAuth.Auth/UserManager.cs b/OpenAuth.Auth/UserManager.cs new file mode 100644 index 0000000..5217585 --- /dev/null +++ b/OpenAuth.Auth/UserManager.cs @@ -0,0 +1,159 @@ +using OpenAuth.Repository.Domain; +using SqlSugar; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Runtime.CompilerServices; +using System.Security.Cryptography; +using System.Text; +using System.Threading.Tasks; + +namespace OpenAuth.Auth +{ + public class UserManager + { + ISqlSugarClient client; + + public UserManager(ISqlSugarClient sqlSugarClient) + { + client = sqlSugarClient; + } + + /// + /// x用户的部门集合 + /// + /// + /// + public ISugarQueryable UserOrgs(long userId) + { + var query = client.Queryable() + .LeftJoin((u, o) => u.OrgId == o.Id) + .Where((u, o) => u.UserId == userId && o.Id != null); + + return query; + } + + /// + /// x用户的角色集合 + /// + /// + /// + public ISugarQueryable UserRoles(long userId) + { + var query = client.Queryable() + .LeftJoin((u, r) => u.RoleId == r.Id) + .Where((u, r) => u.UserId == userId && r.Id != null); + + return query; + } + + + /// + /// x角色集合的菜单集合 + /// + /// + /// + /// + /// + /// + public ISugarQueryable RoleModules(List roleIds) + { + var query = client.Queryable() + .LeftJoin((r, m) => r.ModuleId == m.Id) + .Where((r, m) => roleIds.Contains(r.RoleId) && m.Id != null); + + return query; + } + + /// + /// x角色集合的按钮集合 + /// + /// + /// + /// + /// + /// + public ISugarQueryable RoleModuleElements(List roleIds) + { + var query = client.Queryable() + .LeftJoin((r, m) => r.ElementId == m.Id) + .Where((r, m) => roleIds.Contains(r.RoleId) && m.Id != null); + + return query; + } + + public ISugarQueryable UserPositons(long userId) + { + var query = client.Queryable() + .LeftJoin((u, p) => u.PositionId == p.Id) + .Where((u, p) => u.PositionId != null && u.UserId == userId && p.Id != null); + + return query; + } + + public async Task> UserIdsByPosition(string orgId, string positionId) + { + var list = await client.Queryable() + .Where(a => a.PositionId.ToString() == positionId) + .WhereIF(!string.IsNullOrEmpty(orgId), a => a.OrgId.ToString() == orgId) + .Select(a => a.UserId.ToString()).ToListAsync(); + return list; + } + + public async Task> UserIdsByPositions(List positionIds) + { + var list = await client.Queryable() + .Where(a => positionIds.Contains(a.PositionId.ToString())) + .Select(a => a.UserId.ToString()).ToListAsync(); + return list; + } + + public async Task> UserIdsByRole(string roleId) + { + var list = await client.Queryable() + .Where(a => a.RoleId.ToString() == roleId) + .Select(a => a.UserId.ToString()) + .ToListAsync(); + return list; + } + + public async Task> UserOrgsByUserIds(List userIds) + { + var list1 = await client.Queryable() + .Where(a => userIds.Contains(a.UserId.ToString())) + .GroupBy(a => a.UserId) + .Select(it => new + { + UserId = it.UserId.ToString(), + OrgIds = SqlFunc.Subqueryable().Where(s => s.UserId == it.UserId).ToList(s => s.OrgId.ToString()) + }).ToListAsync(); + //.ToDictionaryAsync(x => x.UserId, x => x.OrgIds); + + //var result = list.GroupBy(a => a.UserId.ToString()) + // .Select(g => new + // { + // UserId = g.Key, + // OrgIds = g.Select(a => a.OrgId.ToString()).ToList() + // }).ToDictionary(x => x.UserId, x => x.OrgIds); + Dictionary list = new Dictionary(); + foreach(var item in list1) + { + list.Add(item.UserId, item.OrgIds); + } + return list; + } + + public async Task> PositonsByUser(string userId) + { + var list = await client.Queryable() + .Where(a => a.UserId.ToString() == userId) + .Select(a => a.PositionId.ToString()) + .ToListAsync(); + return list; + } + + + } +} diff --git a/OpenAuth.BaseApp/OpenAuth.BaseApp.csproj b/OpenAuth.BaseApp/OpenAuth.BaseApp.csproj new file mode 100644 index 0000000..7ed1ca9 --- /dev/null +++ b/OpenAuth.BaseApp/OpenAuth.BaseApp.csproj @@ -0,0 +1,18 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + + diff --git a/OpenAuth.BaseApp/SqlSugarBaseApp.cs b/OpenAuth.BaseApp/SqlSugarBaseApp.cs new file mode 100644 index 0000000..02e61b9 --- /dev/null +++ b/OpenAuth.BaseApp/SqlSugarBaseApp.cs @@ -0,0 +1,34 @@ +using ce.autofac.extension; +using OpenAuth.Auth.Interface; +using SqlSugar; + +namespace OpenAuth.BaseApp +{ + public abstract class SqlSugarBaseApp:BLL + where T : class, new() + where TDbContext : SugarUnitOfWork, new() + { + + /// + /// 用于普通的数据库操作 + /// + protected ISimpleClient Repository; + /// + /// 用于事务操作 + /// + protected ISugarUnitOfWork UnitWork; + + protected IAuth _auth; + + + public SqlSugarBaseApp(ISugarUnitOfWork unitWork, ISimpleClient repository, IAuth auth) + { + UnitWork = unitWork; + Repository = repository; + _auth = auth; + } + + + + } +} diff --git a/OpenAuth.App/BaseApp/Base/Tree/LongTreeApp.cs b/OpenAuth.BaseApp/Tree/LongTreeApp.cs similarity index 93% rename from OpenAuth.App/BaseApp/Base/Tree/LongTreeApp.cs rename to OpenAuth.BaseApp/Tree/LongTreeApp.cs index 23c88f9..198a7f8 100644 --- a/OpenAuth.App/BaseApp/Base/Tree/LongTreeApp.cs +++ b/OpenAuth.BaseApp/Tree/LongTreeApp.cs @@ -1,11 +1,11 @@ using System.Linq; using Infrastructure; -using OpenAuth.App.Interface; +using OpenAuth.Auth.Interface; using OpenAuth.Repository; using OpenAuth.Repository.Core; using SqlSugar; -namespace OpenAuth.App.Base +namespace OpenAuth.BaseApp { public class LongTreeApp : TreeApp where T : TreeEntity, new() diff --git a/OpenAuth.App/BaseApp/Base/Tree/StringTreeApp.cs b/OpenAuth.BaseApp/Tree/StringTreeApp.cs similarity index 94% rename from OpenAuth.App/BaseApp/Base/Tree/StringTreeApp.cs rename to OpenAuth.BaseApp/Tree/StringTreeApp.cs index 787b2cf..b2a3d5e 100644 --- a/OpenAuth.App/BaseApp/Base/Tree/StringTreeApp.cs +++ b/OpenAuth.BaseApp/Tree/StringTreeApp.cs @@ -1,5 +1,5 @@ using Infrastructure.Extensions; -using OpenAuth.App.Interface; +using OpenAuth.Auth.Interface; using OpenAuth.Repository; using OpenAuth.Repository.Core; using SqlSugar; @@ -9,7 +9,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OpenAuth.App.Base +namespace OpenAuth.BaseApp { public class StringTreeApp : TreeApp where T : TreeEntity, new() diff --git a/OpenAuth.App/BaseApp/Base/Tree/TreeApp.cs b/OpenAuth.BaseApp/Tree/TreeApp.cs similarity index 76% rename from OpenAuth.App/BaseApp/Base/Tree/TreeApp.cs rename to OpenAuth.BaseApp/Tree/TreeApp.cs index 2f50aed..e0cd9ff 100644 --- a/OpenAuth.App/BaseApp/Base/Tree/TreeApp.cs +++ b/OpenAuth.BaseApp/Tree/TreeApp.cs @@ -1,6 +1,4 @@ -using DocumentFormat.OpenXml.EMMA; -using Infrastructure.Extensions; -using OpenAuth.App.Interface; +using OpenAuth.Auth.Interface; using OpenAuth.Repository; using OpenAuth.Repository.Core; using OpenAuth.Repository.Domain; @@ -11,9 +9,8 @@ using System.Linq; using System.Reflection; using System.Text; using System.Threading.Tasks; -using OpenAuth.App.BaseApp.Base; -namespace OpenAuth.App.Base +namespace OpenAuth.BaseApp { public abstract class TreeApp : SqlSugarBaseApp where T : TreeEntity, new() @@ -141,6 +138,43 @@ namespace OpenAuth.App.Base //} } - + public void UpdateSysOrg(SysOrg obj) + { + if (obj.ParentId == 0) + { + obj.Level = 0; + obj.CascadeId = "0." + obj.Id; + } + else + { + long parentId = obj.ParentId; + int Level = 0; + string cascade = ""; + while (true) + { + string sql = "select \"ParentId\" from sys_org where \"Id\"=" + parentId; + long id = base.Repository.AsSugarClient().Ado.GetLong(sql); + //long id = base.Repository.AsSugarClient().Queryable().Where(a => a.Id == parentId).Select(a => a.ParentId).ToLong(); + if (!string.IsNullOrEmpty(cascade)) + { + cascade = id + "." + cascade; + } + else + { + cascade = id + cascade; + } + + parentId = id; + Level++; + if (id == 0) + { + break; + } + } + obj.Level = Level; + obj.CascadeId = cascade + "." + obj.ParentId + "." + obj.Id; + } + base.Repository.AsSugarClient().Updateable(obj).ExecuteCommand(); + } } } diff --git a/OpenAuth.App/BaseApp/Base/Tree/TreeExtensions.cs b/OpenAuth.BaseApp/Tree/TreeExtensions.cs similarity index 95% rename from OpenAuth.App/BaseApp/Base/Tree/TreeExtensions.cs rename to OpenAuth.BaseApp/Tree/TreeExtensions.cs index 445a016..6817a0c 100644 --- a/OpenAuth.App/BaseApp/Base/Tree/TreeExtensions.cs +++ b/OpenAuth.BaseApp/Tree/TreeExtensions.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OpenAuth.App.Base.Tree +namespace OpenAuth.BaseApp { public static class TreeExtensions { @@ -21,7 +21,6 @@ namespace OpenAuth.App.Base.Tree Id = rootNode.Id, Name = rootNode.Name, ParentId = rootNode.ParentId, - Level = rootNode.Level, Children = nodes.BuildTree(rootNode.Id).ToList() }; } diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/ApplicationsController.cs b/OpenAuth.Controllers/ApplicationsController.cs similarity index 94% rename from OpenAuth.WebApi/Controllers/BaseControllers/ApplicationsController.cs rename to OpenAuth.Controllers/ApplicationsController.cs index ce8d941..d603dd9 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/ApplicationsController.cs +++ b/OpenAuth.Controllers/ApplicationsController.cs @@ -3,8 +3,9 @@ using Microsoft.AspNetCore.Mvc; using OpenAuth.App; using OpenAuth.App.Request; using OpenAuth.App.Response; +using Utils.Web.Model; -namespace OpenAuth.WebApi.Controllers +namespace OpenAuth.Controllers { /// /// 应用管理 diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/BaseDataAuthController.cs b/OpenAuth.Controllers/BaseDataAuthController.cs similarity index 100% rename from OpenAuth.WebApi/Controllers/BaseControllers/BaseDataAuthController.cs rename to OpenAuth.Controllers/BaseDataAuthController.cs diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/CategoryTypesController.cs b/OpenAuth.Controllers/CategoryTypesController.cs similarity index 98% rename from OpenAuth.WebApi/Controllers/BaseControllers/CategoryTypesController.cs rename to OpenAuth.Controllers/CategoryTypesController.cs index 0579ae0..0e52ad3 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/CategoryTypesController.cs +++ b/OpenAuth.Controllers/CategoryTypesController.cs @@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Mvc; using OpenAuth.App; using OpenAuth.App.Request; using OpenAuth.App.Response; +using Utils.Web.Model; namespace OpenAuth.WebApi.Controllers { diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/CategorysController.cs b/OpenAuth.Controllers/CategorysController.cs similarity index 97% rename from OpenAuth.WebApi/Controllers/BaseControllers/CategorysController.cs rename to OpenAuth.Controllers/CategorysController.cs index c99481e..9891066 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/CategorysController.cs +++ b/OpenAuth.Controllers/CategorysController.cs @@ -1,12 +1,11 @@ -using System; -using System.Threading.Tasks; +using System.Threading.Tasks; using Infrastructure; -using JetBrains.Annotations; using Microsoft.AspNetCore.Mvc; using OpenAuth.App; using OpenAuth.App.Request; using OpenAuth.App.Response; using OpenAuth.Repository.Domain; +using Utils.Web.Model; namespace OpenAuth.WebApi.Controllers { diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/CheckController.cs b/OpenAuth.Controllers/CheckController.cs similarity index 94% rename from OpenAuth.WebApi/Controllers/BaseControllers/CheckController.cs rename to OpenAuth.Controllers/CheckController.cs index b4b79bc..888a80b 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/CheckController.cs +++ b/OpenAuth.Controllers/CheckController.cs @@ -10,6 +10,9 @@ using Infrastructure.Helpers; using SqlSugar; using Infrastructure.Extensions; using Infrastructure.Utilities; +using OpenAuth.Auth.Interface; +using OpenAuth.Auth.AuthStrategies; +using Utils.Web.Model; namespace OpenAuth.WebApi.Controllers { @@ -133,9 +136,9 @@ namespace OpenAuth.WebApi.Controllers /// 获取登录用户的所有可访问的模块及菜单，以列表形式返回结果 /// [HttpGet] - public Response> GetModules() + public Response> GetModules() { - var result = new Response>(); + var result = new Response>(); try { result.Result = _authStrategyContext.Modules; @@ -163,12 +166,12 @@ namespace OpenAuth.WebApi.Controllers /// 菜单类型 /// [HttpGet] - public Response>> GetModulesTree(string typeid) + public Response>> GetModulesTree(string typeid) { - var result = new Response>>(); + var result = new Response>>(); try { - result.Result = _authStrategyContext.Modules.WhereIF(!string.IsNullOrEmpty(typeid), a => a.ModuleTypeId == typeid).OrderBy(a => a.SortNo).GenerateTree(u => u.Id, u => u.ParentId, "0"); + result.Result = _authStrategyContext.Modules.OrderBy(a => a.SortNo).GenerateTree(u => u.Id, u => u.ParentId, "0"); } catch (CommonException ex) { @@ -201,7 +204,7 @@ namespace OpenAuth.WebApi.Controllers /// [HttpPost] [AllowAnonymous] - public Response Login(PassportLoginRequest request) + public Response Login(PassportLoginRequest request) { //var aaaa = Md5Helper.Encrypt(DESEncrypt.Encrypt(Md5Helper.Hash("x9p$E$Bxc$v1kViqZTJ1%#0sORIhf*^3"), "390cbc0b25469cc5").ToLower(), 32).ToLower(); return _authUtil.Login(request.AppKey, request.Account, request.Password); diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/CodeTableController.cs b/OpenAuth.Controllers/CodeTableController.cs similarity index 97% rename from OpenAuth.WebApi/Controllers/BaseControllers/CodeTableController.cs rename to OpenAuth.Controllers/CodeTableController.cs index 3cc4aec..69342fb 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/CodeTableController.cs +++ b/OpenAuth.Controllers/CodeTableController.cs @@ -125,7 +125,8 @@ namespace OpenAuth.WebApi.Controllers var result = new Response>(); try { - result.Result = _app.GetTableAndViewColumnList(dbCode, tableName); + //result.Result = _app.GetTableAndViewColumnList(dbCode, tableName); + result.Result = null; } catch (Exception ex) { diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/CreateTableController.cs b/OpenAuth.Controllers/CreateTableController.cs similarity index 97% rename from OpenAuth.WebApi/Controllers/BaseControllers/CreateTableController.cs rename to OpenAuth.Controllers/CreateTableController.cs index 57a79d1..7cfa236 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/CreateTableController.cs +++ b/OpenAuth.Controllers/CreateTableController.cs @@ -1,9 +1,11 @@ using Infrastructure; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; - +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Logging; using OpenAuth.App; using OpenAuth.App.Interface; +using OpenAuth.Auth.Interface; using OpenAuth.Repository.Domain; namespace OpenAuth.WebApi diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/DataSourceController.cs b/OpenAuth.Controllers/DataSourceController.cs similarity index 100% rename from OpenAuth.WebApi/Controllers/BaseControllers/DataSourceController.cs rename to OpenAuth.Controllers/DataSourceController.cs diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/DbTableController.cs b/OpenAuth.Controllers/DbTableController.cs similarity index 100% rename from OpenAuth.WebApi/Controllers/BaseControllers/DbTableController.cs rename to OpenAuth.Controllers/DbTableController.cs diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/FilesController.cs b/OpenAuth.Controllers/FilesController.cs similarity index 100% rename from OpenAuth.WebApi/Controllers/BaseControllers/FilesController.cs rename to OpenAuth.Controllers/FilesController.cs diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/FormModuleController.cs b/OpenAuth.Controllers/FormModuleController.cs similarity index 100% rename from OpenAuth.WebApi/Controllers/BaseControllers/FormModuleController.cs rename to OpenAuth.Controllers/FormModuleController.cs diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/FormSchemeController.cs b/OpenAuth.Controllers/FormSchemeController.cs similarity index 99% rename from OpenAuth.WebApi/Controllers/BaseControllers/FormSchemeController.cs rename to OpenAuth.Controllers/FormSchemeController.cs index 7233012..60391dd 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/FormSchemeController.cs +++ b/OpenAuth.Controllers/FormSchemeController.cs @@ -11,6 +11,7 @@ using OpenAuth.App.FormScheme.Response; using OpenAuth.App.Request; using OpenAuth.Repository.Domain; using SqlSugar; +using Utils.Web.Model; namespace OpenAuth.WebApi.Controllers { diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/ImMsgController.cs b/OpenAuth.Controllers/ImMsgController.cs similarity index 99% rename from OpenAuth.WebApi/Controllers/BaseControllers/ImMsgController.cs rename to OpenAuth.Controllers/ImMsgController.cs index 25cdc71..96800b2 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/ImMsgController.cs +++ b/OpenAuth.Controllers/ImMsgController.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc; using OpenAuth.App.BaseApp; using OpenAuth.App.BaseApp.Request; using OpenAuth.App.Interface; +using OpenAuth.Auth.Interface; using OpenAuth.Repository.Domain; namespace OpenAuth.WebApi.Controllers.BaseControllers diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/ImportController.cs b/OpenAuth.Controllers/ImportController.cs similarity index 100% rename from OpenAuth.WebApi/Controllers/BaseControllers/ImportController.cs rename to OpenAuth.Controllers/ImportController.cs diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/ModulesController.cs b/OpenAuth.Controllers/ModulesController.cs similarity index 99% rename from OpenAuth.WebApi/Controllers/BaseControllers/ModulesController.cs rename to OpenAuth.Controllers/ModulesController.cs index d2bf41b..b38772f 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/ModulesController.cs +++ b/OpenAuth.Controllers/ModulesController.cs @@ -4,6 +4,7 @@ using OpenAuth.App; using OpenAuth.App.Interface; using OpenAuth.App.ModuleManager; using OpenAuth.App.ModuleManager.Response; +using OpenAuth.Auth.Interface; using OpenAuth.Repository.Core; using OpenAuth.Repository.Domain; diff --git a/OpenAuth.Controllers/OpenAuth.Controllers.csproj b/OpenAuth.Controllers/OpenAuth.Controllers.csproj new file mode 100644 index 0000000..398a4a7 --- /dev/null +++ b/OpenAuth.Controllers/OpenAuth.Controllers.csproj @@ -0,0 +1,16 @@ + + + + net6.0 + enable + enable + True + + + + + + + + + diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/OpenJobsController.cs b/OpenAuth.Controllers/OpenJobsController.cs similarity index 99% rename from OpenAuth.WebApi/Controllers/BaseControllers/OpenJobsController.cs rename to OpenAuth.Controllers/OpenJobsController.cs index 39247f4..b67864b 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/OpenJobsController.cs +++ b/OpenAuth.Controllers/OpenJobsController.cs @@ -7,6 +7,7 @@ using OpenAuth.App; using OpenAuth.App.Request; using OpenAuth.App.Response; using OpenAuth.Repository.Domain; +using Utils.Web.Model; namespace OpenAuth.WebApi.Controllers { diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/OrgsController.cs b/OpenAuth.Controllers/OrgsController.cs similarity index 99% rename from OpenAuth.WebApi/Controllers/BaseControllers/OrgsController.cs rename to OpenAuth.Controllers/OrgsController.cs index 6e4a24c..e2a9b95 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/OrgsController.cs +++ b/OpenAuth.Controllers/OrgsController.cs @@ -4,7 +4,7 @@ using OpenAuth.App; using OpenAuth.App.Request; using OpenAuth.Repository.Core; using OpenAuth.Repository.Domain; -using OpenAuth.WebApi.Model.CustomAttribute; +using Utils.Web.Attrs; namespace OpenAuth.WebApi.Controllers { diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/ResourcesController.cs b/OpenAuth.Controllers/ResourcesController.cs similarity index 98% rename from OpenAuth.WebApi/Controllers/BaseControllers/ResourcesController.cs rename to OpenAuth.Controllers/ResourcesController.cs index 24a7dad..9eff29f 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/ResourcesController.cs +++ b/OpenAuth.Controllers/ResourcesController.cs @@ -8,6 +8,7 @@ using OpenAuth.App; using OpenAuth.App.Interface; using OpenAuth.App.Request; using OpenAuth.App.Response; +using OpenAuth.Auth.Interface; using OpenAuth.Repository.Domain; namespace OpenAuth.WebApi.Controllers diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/RolesController.cs b/OpenAuth.Controllers/RolesController.cs similarity index 99% rename from OpenAuth.WebApi/Controllers/BaseControllers/RolesController.cs rename to OpenAuth.Controllers/RolesController.cs index b2fea4d..6348b47 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/RolesController.cs +++ b/OpenAuth.Controllers/RolesController.cs @@ -9,7 +9,7 @@ using OpenAuth.App; using OpenAuth.App.Request; using OpenAuth.App.Response; using OpenAuth.Repository.Domain; -using OpenAuth.WebApi.Model.CustomAttribute; +using Utils.Web.Attrs; namespace OpenAuth.WebApi.Controllers { diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/SysAppFilesController.cs b/OpenAuth.Controllers/SysAppFilesController.cs similarity index 100% rename from OpenAuth.WebApi/Controllers/BaseControllers/SysAppFilesController.cs rename to OpenAuth.Controllers/SysAppFilesController.cs diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/SysConfController.cs b/OpenAuth.Controllers/SysConfController.cs similarity index 100% rename from OpenAuth.WebApi/Controllers/BaseControllers/SysConfController.cs rename to OpenAuth.Controllers/SysConfController.cs diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/SysDataItemController.cs b/OpenAuth.Controllers/SysDataItemController.cs similarity index 100% rename from OpenAuth.WebApi/Controllers/BaseControllers/SysDataItemController.cs rename to OpenAuth.Controllers/SysDataItemController.cs diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/SysDataItemDetailController.cs b/OpenAuth.Controllers/SysDataItemDetailController.cs similarity index 100% rename from OpenAuth.WebApi/Controllers/BaseControllers/SysDataItemDetailController.cs rename to OpenAuth.Controllers/SysDataItemDetailController.cs diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/SysDatabaseLinkController.cs b/OpenAuth.Controllers/SysDatabaseLinkController.cs similarity index 100% rename from OpenAuth.WebApi/Controllers/BaseControllers/SysDatabaseLinkController.cs rename to OpenAuth.Controllers/SysDatabaseLinkController.cs diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/SysLogsController.cs b/OpenAuth.Controllers/SysLogsController.cs similarity index 99% rename from OpenAuth.WebApi/Controllers/BaseControllers/SysLogsController.cs rename to OpenAuth.Controllers/SysLogsController.cs index 19a9936..2da9280 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/SysLogsController.cs +++ b/OpenAuth.Controllers/SysLogsController.cs @@ -6,6 +6,7 @@ using OpenAuth.App; using OpenAuth.App.Request; using OpenAuth.App.Response; using OpenAuth.Repository.Domain; +using Utils.Web.Model; namespace OpenAuth.WebApi.Controllers { diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/SysMessagesController.cs b/OpenAuth.Controllers/SysMessagesController.cs similarity index 99% rename from OpenAuth.WebApi/Controllers/BaseControllers/SysMessagesController.cs rename to OpenAuth.Controllers/SysMessagesController.cs index f2fe861..4b193a8 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/SysMessagesController.cs +++ b/OpenAuth.Controllers/SysMessagesController.cs @@ -6,6 +6,7 @@ using OpenAuth.App; using OpenAuth.App.Request; using OpenAuth.App.Response; using OpenAuth.Repository.Domain; +using Utils.Web.Model; namespace OpenAuth.WebApi.Controllers { diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/SysPosGroupController.cs b/OpenAuth.Controllers/SysPosGroupController.cs similarity index 100% rename from OpenAuth.WebApi/Controllers/BaseControllers/SysPosGroupController.cs rename to OpenAuth.Controllers/SysPosGroupController.cs diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/SysPositionController.cs b/OpenAuth.Controllers/SysPositionController.cs similarity index 100% rename from OpenAuth.WebApi/Controllers/BaseControllers/SysPositionController.cs rename to OpenAuth.Controllers/SysPositionController.cs diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/UsersController.cs b/OpenAuth.Controllers/UsersController.cs similarity index 99% rename from OpenAuth.WebApi/Controllers/BaseControllers/UsersController.cs rename to OpenAuth.Controllers/UsersController.cs index f20a877..bc45158 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/UsersController.cs +++ b/OpenAuth.Controllers/UsersController.cs @@ -2,11 +2,13 @@ using System.Threading.Tasks; using Infrastructure; using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using OpenAuth.App; using OpenAuth.App.Request; using OpenAuth.App.Response; -using OpenAuth.WebApi.Model.CustomAttribute; +using Utils.Web.Attrs; +using Utils.Web.Model; namespace OpenAuth.WebApi.Controllers { diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/WFDelegateController.cs b/OpenAuth.Controllers/WFDelegateController.cs similarity index 99% rename from OpenAuth.WebApi/Controllers/BaseControllers/WFDelegateController.cs rename to OpenAuth.Controllers/WFDelegateController.cs index 094dc68..4200ac8 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/WFDelegateController.cs +++ b/OpenAuth.Controllers/WFDelegateController.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Mvc; using OpenAuth.App; using OpenAuth.App.Request; using OpenAuth.Repository.Domain; +using Utils.Web.Model; namespace OpenAuth.WebApi.Controllers { diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/WFProcessController.cs b/OpenAuth.Controllers/WFProcessController.cs similarity index 99% rename from OpenAuth.WebApi/Controllers/BaseControllers/WFProcessController.cs rename to OpenAuth.Controllers/WFProcessController.cs index 59acb79..0ce03e3 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/WFProcessController.cs +++ b/OpenAuth.Controllers/WFProcessController.cs @@ -11,6 +11,8 @@ using OpenAuth.App.Response; using OpenAuth.Repository.Domain; using System.Threading.Tasks; using OpenAuth.App.BaseApp.WFTask; +using OpenAuth.Auth.Interface; +using Utils.Web.Model; namespace OpenAuth.WebApi.Controllers { diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/WFSchemeController.cs b/OpenAuth.Controllers/WFSchemeController.cs similarity index 98% rename from OpenAuth.WebApi/Controllers/BaseControllers/WFSchemeController.cs rename to OpenAuth.Controllers/WFSchemeController.cs index d65e206..965b9d6 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/WFSchemeController.cs +++ b/OpenAuth.Controllers/WFSchemeController.cs @@ -5,6 +5,7 @@ using OpenAuth.App; using OpenAuth.App.Request; using OpenAuth.App.Response; using OpenAuth.Repository.Domain; +using Utils.Web.Model; namespace OpenAuth.WebApi.Controllers { diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/WFSchemeInfoController.cs b/OpenAuth.Controllers/WFSchemeInfoController.cs similarity index 99% rename from OpenAuth.WebApi/Controllers/BaseControllers/WFSchemeInfoController.cs rename to OpenAuth.Controllers/WFSchemeInfoController.cs index 7d1cfcd..1b65449 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/WFSchemeInfoController.cs +++ b/OpenAuth.Controllers/WFSchemeInfoController.cs @@ -6,6 +6,7 @@ using OpenAuth.App.Request; using OpenAuth.App.Response; using OpenAuth.Repository.Domain; using System.Text; +using Utils.Web.Model; namespace OpenAuth.WebApi.Controllers { diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/WFStampController.cs b/OpenAuth.Controllers/WFStampController.cs similarity index 99% rename from OpenAuth.WebApi/Controllers/BaseControllers/WFStampController.cs rename to OpenAuth.Controllers/WFStampController.cs index 1a410da..43fa6ba 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/WFStampController.cs +++ b/OpenAuth.Controllers/WFStampController.cs @@ -4,6 +4,7 @@ using NetTaste; using OpenAuth.App; using OpenAuth.App.Request; using OpenAuth.Repository.Domain; +using Utils.Web.Model; namespace OpenAuth.WebApi.Controllers { diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/WFTaskController.cs b/OpenAuth.Controllers/WFTaskController.cs similarity index 99% rename from OpenAuth.WebApi/Controllers/BaseControllers/WFTaskController.cs rename to OpenAuth.Controllers/WFTaskController.cs index f369d0e..a19a34a 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/WFTaskController.cs +++ b/OpenAuth.Controllers/WFTaskController.cs @@ -8,6 +8,8 @@ using OpenAuth.App.Interface; using OpenAuth.App.Response; using Microsoft.AspNetCore.Authorization; using OpenAuth.App.BaseApp.WFTask; +using OpenAuth.Auth.Interface; +using Utils.Web.Model; namespace OpenAuth.WebApi.Controllers { diff --git a/OpenAuth.Net.sln b/OpenAuth.Net.sln index 734894e..1f9bfb3 100644 --- a/OpenAuth.Net.sln +++ b/OpenAuth.Net.sln @@ -19,7 +19,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "03 基础框架", "03 基 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "04 业务开发", "04 业务开发", "{4E2621F7-BAF9-4A80-B4D9-E914C6B0CD2F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "05 业务开发", "05 业务开发", "{A651C0AB-3E8E-4F90-A754-6BE8A1D7E61B}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "05 应用服务", "05 应用服务", "{A651C0AB-3E8E-4F90-A754-6BE8A1D7E61B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenAuth.BaseApp", "OpenAuth.BaseApp\OpenAuth.BaseApp.csproj", "{3466DD71-9623-4704-BA7F-F864F38E73A3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenAuth.Auth", "OpenAuth.Auth\OpenAuth.Auth.csproj", "{68D5B7CD-E897-434F-9EE0-21EF72A92C22}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils.Web", "Utils.Web\Utils.Web.csproj", "{5C927D05-615E-403A-8315-2B9BF39A06D1}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenAuth.Controllers", "OpenAuth.Controllers\OpenAuth.Controllers.csproj", "{0A3C89F2-50F3-45F6-AA0A-C276257552E2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -43,6 +51,22 @@ Global {00D63D11-D95D-4960-9F49-B102344303A7}.Debug|Any CPU.Build.0 = Debug|Any CPU {00D63D11-D95D-4960-9F49-B102344303A7}.Release|Any CPU.ActiveCfg = Release|Any CPU {00D63D11-D95D-4960-9F49-B102344303A7}.Release|Any CPU.Build.0 = Release|Any CPU + {3466DD71-9623-4704-BA7F-F864F38E73A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3466DD71-9623-4704-BA7F-F864F38E73A3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3466DD71-9623-4704-BA7F-F864F38E73A3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3466DD71-9623-4704-BA7F-F864F38E73A3}.Release|Any CPU.Build.0 = Release|Any CPU + {68D5B7CD-E897-434F-9EE0-21EF72A92C22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {68D5B7CD-E897-434F-9EE0-21EF72A92C22}.Debug|Any CPU.Build.0 = Debug|Any CPU + {68D5B7CD-E897-434F-9EE0-21EF72A92C22}.Release|Any CPU.ActiveCfg = Release|Any CPU + {68D5B7CD-E897-434F-9EE0-21EF72A92C22}.Release|Any CPU.Build.0 = Release|Any CPU + {5C927D05-615E-403A-8315-2B9BF39A06D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5C927D05-615E-403A-8315-2B9BF39A06D1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5C927D05-615E-403A-8315-2B9BF39A06D1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5C927D05-615E-403A-8315-2B9BF39A06D1}.Release|Any CPU.Build.0 = Release|Any CPU + {0A3C89F2-50F3-45F6-AA0A-C276257552E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0A3C89F2-50F3-45F6-AA0A-C276257552E2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0A3C89F2-50F3-45F6-AA0A-C276257552E2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0A3C89F2-50F3-45F6-AA0A-C276257552E2}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -51,7 +75,11 @@ Global {A44BD472-84E3-4D70-9DC5-06210617D6EE} = {A651C0AB-3E8E-4F90-A754-6BE8A1D7E61B} {8F9EAD1A-9407-41BA-844A-02282B4646F3} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} {4BD1F522-FC5C-4DEB-ACE9-1242BCE235BD} = {2A791A38-1992-4CDE-9B7F-FDD85B4C5C20} - {00D63D11-D95D-4960-9F49-B102344303A7} = {2A791A38-1992-4CDE-9B7F-FDD85B4C5C20} + {00D63D11-D95D-4960-9F49-B102344303A7} = {91563DFE-D0AA-4780-99EF-D3C941BEF386} + {3466DD71-9623-4704-BA7F-F864F38E73A3} = {2A791A38-1992-4CDE-9B7F-FDD85B4C5C20} + {68D5B7CD-E897-434F-9EE0-21EF72A92C22} = {2A791A38-1992-4CDE-9B7F-FDD85B4C5C20} + {5C927D05-615E-403A-8315-2B9BF39A06D1} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} + {0A3C89F2-50F3-45F6-AA0A-C276257552E2} = {91563DFE-D0AA-4780-99EF-D3C941BEF386} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {88FD47DB-4BD4-4B0F-9E12-49383F5AFFEB} diff --git a/OpenAuth.Repository/SugarDbContext.cs b/OpenAuth.Repository/SugarDbContext.cs index 25a77a6..cdffd42 100644 --- a/OpenAuth.Repository/SugarDbContext.cs +++ b/OpenAuth.Repository/SugarDbContext.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; namespace OpenAuth.Repository { - public class SugarDbContext : SugarUnitOfWork + public partial class SugarDbContext : SugarUnitOfWork { public SugarRepositiry SysAppFiles { get; set; } public SugarRepositiry User { get; set; } diff --git a/OpenAuth.Repository/SugarDbContext_Bus.cs b/OpenAuth.Repository/SugarDbContext_Bus.cs new file mode 100644 index 0000000..fa1d7d4 --- /dev/null +++ b/OpenAuth.Repository/SugarDbContext_Bus.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace OpenAuth.Repository +{ + public partial class SugarDbContext + { + } +} diff --git a/OpenAuth.WebApi/Model/OpenAuthFilter.cs b/OpenAuth.WebApi/Model/OpenAuthFilter.cs index 5fd9c0a..bbe2340 100644 --- a/OpenAuth.WebApi/Model/OpenAuthFilter.cs +++ b/OpenAuth.WebApi/Model/OpenAuthFilter.cs @@ -5,8 +5,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using OpenAuth.App; using OpenAuth.App.Interface; +using OpenAuth.Auth.Interface; using OpenAuth.Repository.Domain; -using OpenAuth.WebApi.Model.CustomAttribute; +using Utils.Web.Attrs; namespace OpenAuth.WebApi.Model { diff --git a/OpenAuth.WebApi/OpenAuth.WebApi.csproj b/OpenAuth.WebApi/OpenAuth.WebApi.csproj index 945d7f1..34dc7b8 100644 --- a/OpenAuth.WebApi/OpenAuth.WebApi.csproj +++ b/OpenAuth.WebApi/OpenAuth.WebApi.csproj @@ -53,8 +53,7 @@ - - + diff --git a/OpenAuth.WebApi/Startup.cs b/OpenAuth.WebApi/Startup.cs index 3f1a4b3..e1ac85e 100644 --- a/OpenAuth.WebApi/Startup.cs +++ b/OpenAuth.WebApi/Startup.cs @@ -1,4 +1,5 @@ using System.Reflection; +using System.Text.RegularExpressions; using Autofac; using Autofac.Extensions.DependencyInjection; using ce.autofac.extension; @@ -11,6 +12,7 @@ using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Server.Kestrel.Core; +using Microsoft.Extensions.DependencyModel; using Microsoft.Extensions.FileProviders; using Microsoft.IdentityModel.Logging; using Microsoft.OpenApi.Models; @@ -95,26 +97,6 @@ namespace OpenAuth.WebApi //添加swagger services.AddSwaggerGen(option => { - #region 注释 - //foreach (var controller in GetControllers()) - //{ - // var groupname = GetSwaggerGroupName(controller); - - // option.SwaggerDoc(groupname, new OpenApiInfo - // { - // Version = "v1", - // Title = groupname, - // Description = "by hopetry" - // }); - //} - - //foreach (var name in Directory.GetFiles(AppContext.BaseDirectory, "*.*", - // SearchOption.AllDirectories).Where(f => Path.GetExtension(f).ToLower() == ".xml")) - //{ - // option.IncludeXmlComments(name, includeControllerXmlComments: true); - - //} - #endregion option.CustomSchemaIds(type => type.FullName); option.SwaggerDoc("v1", new OpenApiInfo { @@ -123,30 +105,15 @@ namespace OpenAuth.WebApi Description = "by hopetry" }); - //option.IncludeXmlComments(Path.Combine(AppContext.BaseDirectory, "OpenAuth.WebApi.xml"), true); - - option.IncludeXmlComments(Path.Combine(AppContext.BaseDirectory, "OpenAuth.WebApi.xml"), true); + foreach (var name in Directory.GetFiles(AppContext.BaseDirectory, "*.*", + SearchOption.AllDirectories).Where(f => Path.GetExtension(f).ToLower() == ".xml")) + { + option.IncludeXmlComments(name, includeControllerXmlComments: true); + } option.OperationFilter(); // 添加httpHeader参数 }); - //services.AddSwaggerGen(option => - //{ - // option.CustomSchemaIds(type => type.FullName); - // option.SwaggerDoc("v1", new OpenApiInfo - // { - // Version = "v1", - // Title = "无人值守 WebAPI", - // Description = "by HopetryTech" - // }); - // option.CustomOperationIds(apiDesc => - // { - // var controllerAction = apiDesc.ActionDescriptor as ControllerActionDescriptor; - // return controllerAction.ControllerName + "-" + controllerAction.ActionName; - // }); - // option.IncludeXmlComments(Path.Combine(AppContext.BaseDirectory, "OpenAuth.WebApi.xml"), true); - - // option.OperationFilter(); // 添加httpHeader参数 - //}); + #endregion #region AppSetting @@ -301,6 +268,13 @@ namespace OpenAuth.WebApi public void ConfigureContainer(ContainerBuilder builder) { + foreach (Assembly assembly in GetAssemblies()) + { + (from t in builder.RegisterAssemblyTypes(assembly) + where IntrospectionExtensions.GetTypeInfo(typeof(BLL)).IsAssignableFrom(t) + select t).InstancePerLifetimeScope(); + } + AutofacExt.InitAutofac(builder); } @@ -378,27 +352,11 @@ namespace OpenAuth.WebApi } }); }); - - - // Enable middleware to serve swagger-ui (HTML, JS, CSS, etc.), - // specifying the Swagger JSON endpoint. - app.UseSwaggerUI(c => - { - //foreach (var controller in GetControllers()) - //{ - // var groupname = GetSwaggerGroupName(controller); - // c.SwaggerEndpoint($"{groupname}/swagger.json", groupname); - //} - c.SwaggerEndpoint("v1/swagger.json", "V1 Docs"); - c.DocExpansion(DocExpansion.List); //默认展开列表 - c.OAuthClientId("OpenAuth.WebApi"); //oauth客户端名称 - c.OAuthAppName("开源版webapi认证"); // 描述 - }); - + app.UseSwaggerUI(c => { c.SwaggerEndpoint("v1/swagger.json", "V1 Docs"); - c.DocExpansion(Swashbuckle.AspNetCore.SwaggerUI.DocExpansion.None); + c.DocExpansion(DocExpansion.List); c.OAuthClientId("OpenAuth.WebApi"); //oauth客户端名称 c.OAuthAppName("开源版webapi认证"); // 描述 }); @@ -412,32 +370,31 @@ namespace OpenAuth.WebApi }); } - /// - /// 获取控制器对应的swagger分组值 - /// - private string GetSwaggerGroupName(Type controller) + private static List _referenceAssembly; + public static IEnumerable GetAssemblies() { - var groupname = controller.Name.Replace("Controller", ""); - var apisetting = controller.GetCustomAttribute(typeof(ApiExplorerSettingsAttribute)); - if (apisetting != null) + if (_referenceAssembly == null) { - groupname = ((ApiExplorerSettingsAttribute)apisetting).GroupName; + _referenceAssembly = new List(); + List list = new List(); + string[] filterAssemblies = GetFilterAssemblies((from p in DependencyContext.Default.GetDefaultAssemblyNames() + select p.Name).ToArray()); + foreach (string assemblyString in filterAssemblies) + { + list.Add(Assembly.Load(assemblyString)); + } + + _referenceAssembly.AddRange(list); } - return groupname; + return _referenceAssembly; } - /// - /// 获取所有的控制器 - /// - private List GetControllers() + private static string[] GetFilterAssemblies(string[] assemblyNames) { - Assembly asm = Assembly.GetExecutingAssembly(); - - var controlleractionlist = asm.GetTypes() - .Where(type => typeof(ControllerBase).IsAssignableFrom(type)) - .OrderBy(x => x.Name).ToList(); - return controlleractionlist; + string pattern = "^Microsoft.\\w*|^System.\\w*|^DotNetty.\\w*|^runtime.\\w*|^ZooKeeperNetEx\\w*|^StackExchange.Redis\\w*|^Consul\\w*|^Newtonsoft.Json.\\w*|^Newtonsoft.Json\\w*|^Autofac.\\w*|^Autofac\\w*|^SOS.NETCore\\w*|^System\\w*|^WindowsBase\\w*|^mscorlib\\w*|^netstandard\\w*"; + Regex notRelatedRegex = new Regex(pattern, RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline); + return assemblyNames.Where((string name) => !notRelatedRegex.IsMatch(name)).ToArray(); } } } \ No newline at end of file diff --git a/OpenAuth.WebApi/appsettings.Production.json b/OpenAuth.WebApi/appsettings.Production.json index 39ae716..79507b4 100644 --- a/OpenAuth.WebApi/appsettings.Production.json +++ b/OpenAuth.WebApi/appsettings.Production.json @@ -8,11 +8,9 @@ "DataProtection": "temp-keys/", "ConnectionStrings": { "OpenAuthDBContext": "PORT=5432;Database=openauthbasedb;HOST=localhost;PASSWORD=123456;USER ID=postgres;" - //"OpenAuthDBContext": "PORT=5432;Database=unattended1;HOST=192.168.10.115;PASSWORD=123456;USER ID=postgres;Pooling=False" //PostgreSQL }, "AppSetting": { - "IdentityServerUrl": "", //IdentityServer服务器地址。如果为空，则不启用OAuth认证 - //"IdentityServerUrl": "http://localhost:12796", //IdentityServer服务器地址。如果为空，则不启用OAuth认证 + "DbTypes": { "OpenAuthDBContext": "PostgreSQL" //数据库类型：SqlServer、MySql、Oracle、PostgreSQL }, @@ -23,10 +21,5 @@ }, //redis配置 "HttpHost": "http://*:10010 ", //启动绑定地址及端口 "SYSTEM_USERPWD": "123456" - }, - "WeChat": { - "AppId": "wx16deccc21a95c9f9", - "AppSecret": "b35f7b9611e0e47a1e7fab57d5399202" } - } diff --git a/OpenAuth.WebApi/appsettings.json b/OpenAuth.WebApi/appsettings.json index af5779a..651a082 100644 --- a/OpenAuth.WebApi/appsettings.json +++ b/OpenAuth.WebApi/appsettings.json @@ -7,20 +7,14 @@ "AllowedHosts": "*", "DataProtection": "temp-keys/", "ConnectionStrings": { - //"OpenAuthDBContext": "PORT=5432;Database=hopetrycore;HOST=192.168.10.124;PASSWORD=123456;USER ID=postgres;", - "OpenAuthDBContext": "PORT=5432;Database=openauthbasedb;HOST=localhost;PASSWORD=123456;USER ID=postgres;" - //"OpenAuthDBContext": "PORT=5432;Database=;HOST=192.168.10.131;PASSWORD=123456;USER ID=postgres;" + "OpenAuthDBContext": "PORT=5432;Database=drone_enforcement_linyi;HOST=192.168.10.163;PASSWORD=123456;USER ID=postgres;" }, "AppSetting": { - "IdentityServerUrl": "", - //IdentityServer服务器地址。如果为空，则不启用OAuth认证 - //"IdentityServerUrl": "http://localhost:12796", //IdentityServer服务器地址。如果为空，则不启用OAuth认证 "DbTypes": { "OpenAuthDBContext": "PostgreSQL" //数据库类型：SqlServer、MySql、Oracle、PostgreSQL }, "UploadPath": "", - //附件上传的路径，如果为空则保存在站点根目录 "RedisConf": { "Conn": "175.27.168.120:6050,password=HopetryRedis1406", //"Conn": "127.0.0.1:6379,password=123456", @@ -31,41 +25,8 @@ //启动绑定地址及端口 "SYSTEM_USERPWD": "123456", "ASECode": "hc", - "TopAreaCode": "371300", - //大屏最高行政区划编码 - "SchemeCode": "0000001", - "SchemeId": "3b01384d-a42e-4772-8752-6fbf40f85959", /*消息推送*/ "IMOpen": true, - //false/true - //"IMUrl": "http://localhost:8989/" - "IMUrl": "", - "LimitShpDistance": 50 - }, - "PgSql": { - "PostGisPath": "E:\\DevelopTools\\PostgreSQL\\14\\bin", - "DataBase": "drone_enforcement_linyi_20240720", - "UserID": "postgres", - "PORT": "5432", - "Host": "192.168.10.102", - "Pwd": "123456" - }, - "WeChat": { - "AppId": "wx16deccc21a95c9f9", - "AppSecret": "b35f7b9611e0e47a1e7fab57d5399202" - //"AppId": "wxafa1e8d0afb3997e", - //"AppSecret": "8f4ba2bf57c360d5b77751fc8a82701b" - }, - "GeoServer": { - "GeoserverUrl": "http://192.168.10.141:8080/geoserver", - "JobwebUrl": "http://192.168.10.125:9023/", - "Workspace": "my_workspace", - "Username": "admin", - "Password": "geoserver", - "DbSchema": "public", - "DbStoreName": "cloud_shp_store", - "TiffStoreNamePrefix": "tiff_store", - "TiffDir": "E:/tiff" - }, - "FlyImageDir": "e:/fly" + "IMUrl": "" + } } diff --git a/OpenAuth.WebApi/Model/CustomAttribute/AllDataAttribute.cs b/Utils.Web/Attrs/AllDataAttribute.cs similarity index 59% rename from OpenAuth.WebApi/Model/CustomAttribute/AllDataAttribute.cs rename to Utils.Web/Attrs/AllDataAttribute.cs index d6264fc..ea12c83 100644 --- a/OpenAuth.WebApi/Model/CustomAttribute/AllDataAttribute.cs +++ b/Utils.Web/Attrs/AllDataAttribute.cs @@ -1,4 +1,10 @@ -namespace OpenAuth.WebApi.Model.CustomAttribute +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Utils.Web.Attrs { public class AllDataAttribute : Attribute { @@ -8,6 +14,6 @@ ActionName = actionName; } public string ControllerName { get; set; } - public string ActionName { get; set; } + public string ActionName { get; set; } } } diff --git a/OpenAuth.App/BaseApp/Base/IdRequest.cs b/Utils.Web/Model/IdRequest.cs similarity index 88% rename from OpenAuth.App/BaseApp/Base/IdRequest.cs rename to Utils.Web/Model/IdRequest.cs index 6f08a2e..5f9fbc8 100644 --- a/OpenAuth.App/BaseApp/Base/IdRequest.cs +++ b/Utils.Web/Model/IdRequest.cs @@ -1,4 +1,4 @@ -namespace OpenAuth.App.Request +namespace Utils.Web.Model { /// /// 请求参数中只有Id diff --git a/OpenAuth.App/BaseApp/Base/PageReq.cs b/Utils.Web/Model/PageReq.cs similarity index 93% rename from OpenAuth.App/BaseApp/Base/PageReq.cs rename to Utils.Web/Model/PageReq.cs index 8fcc1c7..2ec5845 100644 --- a/OpenAuth.App/BaseApp/Base/PageReq.cs +++ b/Utils.Web/Model/PageReq.cs @@ -1,4 +1,4 @@ -namespace OpenAuth.App.Request +namespace Utils.Web.Model { public class PageReq { diff --git a/OpenAuth.App/BaseApp/Base/TableData.cs b/Utils.Web/Model/TableData.cs similarity index 95% rename from OpenAuth.App/BaseApp/Base/TableData.cs rename to Utils.Web/Model/TableData.cs index 7318adf..574a196 100644 --- a/OpenAuth.App/BaseApp/Base/TableData.cs +++ b/Utils.Web/Model/TableData.cs @@ -1,5 +1,5 @@  -namespace OpenAuth.App.Response +namespace Utils.Web.Model { /// /// table的返回数据 diff --git a/OpenAuth.App/BaseApp/Base/TableResp.cs b/Utils.Web/Model/TableResp.cs similarity index 90% rename from OpenAuth.App/BaseApp/Base/TableResp.cs rename to Utils.Web/Model/TableResp.cs index 08cae99..7164d19 100644 --- a/OpenAuth.App/BaseApp/Base/TableResp.cs +++ b/Utils.Web/Model/TableResp.cs @@ -1,7 +1,6 @@ -using System.Collections.Generic; -using Infrastructure; +using Infrastructure; -namespace OpenAuth.App.Response +namespace Utils.Web.Model { /// /// 返回确定类型的表格数据，可以为swagger提供精准的注释 diff --git a/Utils.Web/Utils.Web.csproj b/Utils.Web/Utils.Web.csproj new file mode 100644 index 0000000..a345805 --- /dev/null +++ b/Utils.Web/Utils.Web.csproj @@ -0,0 +1,17 @@ + + + + net6.0 + enable + enable + + + + + + + + + + +