From 1b538b5b6c42c87ed2b0f9055d9b9c31e4fe0ff9 Mon Sep 17 00:00:00 2001 From: sxf359 Date: Sun, 10 Jun 2018 21:44:23 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=88=91=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +++ .../Surging.IModuleServices.Common/IUserService.cs | 2 ++ .../Surging.Modules.Common/Domain/PersonService.cs | 5 ++++- .../Surging.Modules.Common/Domain/UserService.cs | 5 +++++ src/Surging.Services/Surging.Services.Client/Program.cs | 2 +- src/Surging.Services/Surging.Services.Client/Startup.cs | 1 + src/Surging.Services/Surging.Services.Server/Program.cs | 3 +++ .../Surging.Services.Server/Surging.Services.Server.csproj | 2 ++ 8 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3ddda332d..bc6caa778 100644 --- a/.gitignore +++ b/.gitignore @@ -262,3 +262,6 @@ paket-files/ __pycache__/ *.pyc +surging.client.bat +surging.services.bat +新人快速安装入门.docx diff --git a/src/Surging.IModuleServices/Surging.IModuleServices.Common/IUserService.cs b/src/Surging.IModuleServices/Surging.IModuleServices.Common/IUserService.cs index d1569de2e..408d74432 100644 --- a/src/Surging.IModuleServices/Surging.IModuleServices.Common/IUserService.cs +++ b/src/Surging.IModuleServices/Surging.IModuleServices.Common/IUserService.cs @@ -69,5 +69,7 @@ public interface IUserService: IServiceKey [Service(Date = "2017-8-11", Director = "fanly", Name = "获取用户")] Task PublishThroughEventBusAsync(IntegrationEvent evt); + + Task HelloWorld(string username); } } diff --git a/src/Surging.Modules/Surging.Modules.Common/Domain/PersonService.cs b/src/Surging.Modules/Surging.Modules.Common/Domain/PersonService.cs index 5e83938df..b90e4e3da 100644 --- a/src/Surging.Modules/Surging.Modules.Common/Domain/PersonService.cs +++ b/src/Surging.Modules/Surging.Modules.Common/Domain/PersonService.cs @@ -97,7 +97,10 @@ public Task Save(IdentityUser requestData) { return Task.FromResult(requestData); } - + public Task HelloWorld(string username) + { + return Task.FromResult($"'{username}',HelloWorld"); + } #endregion Implementation of IUserService } } diff --git a/src/Surging.Modules/Surging.Modules.Common/Domain/UserService.cs b/src/Surging.Modules/Surging.Modules.Common/Domain/UserService.cs index 07d868f8c..cf9f8d087 100644 --- a/src/Surging.Modules/Surging.Modules.Common/Domain/UserService.cs +++ b/src/Surging.Modules/Surging.Modules.Common/Domain/UserService.cs @@ -100,6 +100,11 @@ public Task Save(IdentityUser requestData) { return Task.FromResult(requestData); } + + public Task HelloWorld(string username) + { + return Task.FromResult($"'{username}',HelloWorld"); + } #endregion Implementation of IUserService } } \ No newline at end of file diff --git a/src/Surging.Services/Surging.Services.Client/Program.cs b/src/Surging.Services/Surging.Services.Client/Program.cs index a0bc01c7f..f3254b52d 100644 --- a/src/Surging.Services/Surging.Services.Client/Program.cs +++ b/src/Surging.Services/Surging.Services.Client/Program.cs @@ -75,7 +75,7 @@ static void Main(string[] args) //var connectionCount = 250000; //var requestThread = new Thread(() => StartRequest(connectionCount)) { IsBackground = true }; //requestThread.Start(); - //Console.ReadLine(); + //Console.ReadLine(); } } diff --git a/src/Surging.Services/Surging.Services.Client/Startup.cs b/src/Surging.Services/Surging.Services.Client/Startup.cs index a644bd603..5b7c1816c 100644 --- a/src/Surging.Services/Surging.Services.Client/Startup.cs +++ b/src/Surging.Services/Surging.Services.Client/Startup.cs @@ -106,6 +106,7 @@ await userProxy.PublishThroughEventBusAsync(new UserEvent } watch.Stop(); Console.WriteLine($"1w次调用结束，执行时间：{watch.ElapsedMilliseconds}ms"); + Console.WriteLine(await userProxy.HelloWorld("盛学飞")); Console.WriteLine("Press any key to continue, q to exit the loop..."); var key = Console.ReadLine(); if (key.ToLower() == "q") diff --git a/src/Surging.Services/Surging.Services.Server/Program.cs b/src/Surging.Services/Surging.Services.Server/Program.cs index 0973747e2..cb3491233 100644 --- a/src/Surging.Services/Surging.Services.Server/Program.cs +++ b/src/Surging.Services/Surging.Services.Server/Program.cs @@ -84,6 +84,9 @@ static void Main(string[] args) using (host.Run()) { + //var user = ServiceLocator.GetService().CreateProxy("User"); + //var model = user.GetUser(new IModuleServices.Common.Models.UserModel { Name = "sxf359", Age = 45 }); + //Console.WriteLine($"获取服务器用户名：" + ); Console.WriteLine($"服务端启动成功，{DateTime.Now}。"); } } diff --git a/src/Surging.Services/Surging.Services.Server/Surging.Services.Server.csproj b/src/Surging.Services/Surging.Services.Server/Surging.Services.Server.csproj index d3cb9f7a6..eea0d19f9 100644 --- a/src/Surging.Services/Surging.Services.Server/Surging.Services.Server.csproj +++ b/src/Surging.Services/Surging.Services.Server/Surging.Services.Server.csproj @@ -52,4 +52,6 @@ + + \ No newline at end of file From fad78fc1890b33edef17a22c7dd791c8ee5f13aa Mon Sep 17 00:00:00 2001 From: sxf359 Date: Mon, 31 Dec 2018 11:30:58 +0800 Subject: [PATCH 2/5] sxf --- src/Surging.ApiGateway/Surging.ApiGateway.csproj | 13 ++++++++++--- .../Surging.Core.Caching.csproj | 2 +- .../Surging.Core.NLog/Surging.Core.Nlog.csproj | 2 +- .../Surging.Core.Swagger.csproj | 2 +- .../Surging.Services.Client/Startup.cs | 1 - .../Surging.Services.Client/surgingSettings.json | 3 ++- .../Surging.Services.Server/surgingSettings.json | 3 ++- 7 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/Surging.ApiGateway/Surging.ApiGateway.csproj b/src/Surging.ApiGateway/Surging.ApiGateway.csproj index e84376d47..7ff4d21c5 100644 --- a/src/Surging.ApiGateway/Surging.ApiGateway.csproj +++ b/src/Surging.ApiGateway/Surging.ApiGateway.csproj @@ -15,16 +15,22 @@ https://github.com/dotnetcore/surging/blob/master/LICENSE https://github.com/dotnetcore/surging MicroService surging - ..\docker-compose.dcproj + ..\docker-compose.dcproj + true + + + + - + - + + @@ -49,6 +55,7 @@ + diff --git a/src/Surging.Core/Surging.Core.Caching/Surging.Core.Caching.csproj b/src/Surging.Core/Surging.Core.Caching/Surging.Core.Caching.csproj index 66d64847d..0b43bd1cf 100644 --- a/src/Surging.Core/Surging.Core.Caching/Surging.Core.Caching.csproj +++ b/src/Surging.Core/Surging.Core.Caching/Surging.Core.Caching.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/Surging.Core/Surging.Core.NLog/Surging.Core.Nlog.csproj b/src/Surging.Core/Surging.Core.NLog/Surging.Core.Nlog.csproj index 1050a7cc5..3bef2bb43 100644 --- a/src/Surging.Core/Surging.Core.NLog/Surging.Core.Nlog.csproj +++ b/src/Surging.Core/Surging.Core.NLog/Surging.Core.Nlog.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/Surging.Core/Surging.Core.Swagger/Surging.Core.Swagger.csproj b/src/Surging.Core/Surging.Core.Swagger/Surging.Core.Swagger.csproj index d5797dbe7..5fa7b2a3e 100644 --- a/src/Surging.Core/Surging.Core.Swagger/Surging.Core.Swagger.csproj +++ b/src/Surging.Core/Surging.Core.Swagger/Surging.Core.Swagger.csproj @@ -46,7 +46,7 @@ - + diff --git a/src/Surging.Services/Surging.Services.Client/Startup.cs b/src/Surging.Services/Surging.Services.Client/Startup.cs index 97370bb3d..a23fd22f8 100644 --- a/src/Surging.Services/Surging.Services.Client/Startup.cs +++ b/src/Surging.Services/Surging.Services.Client/Startup.cs @@ -110,7 +110,6 @@ public static void Test(IServiceProxyFactory serviceProxyFactory) } watch.Stop(); Console.WriteLine($"1w次调用结束，执行时间：{watch.ElapsedMilliseconds}ms"); - Console.WriteLine(await userProxy.HelloWorld("盛学飞")); Console.WriteLine("Press any key to continue, q to exit the loop..."); var key = Console.ReadLine(); if (key.ToLower() == "q") diff --git a/src/Surging.Services/Surging.Services.Client/surgingSettings.json b/src/Surging.Services/Surging.Services.Client/surgingSettings.json index 48dc426b0..30c193438 100644 --- a/src/Surging.Services/Surging.Services.Client/surgingSettings.json +++ b/src/Surging.Services/Surging.Services.Client/surgingSettings.json @@ -7,7 +7,8 @@ "MappingPort": "${Mapping_Port}", "Token": "true", "Protocol": "${Protocol}|Tcp", //HttpTcpNone - "RootPath": "${RootPath}|d:\\microsurging", + //"RootPath": "${RootPath}|d:\\microsurging", + "RootPath": "${RootPath}|F:\\github\\surging\\src\\Surging.Services\\Surging.Services.Client\\bin\\Release\\PublishOutput", "Ports": { "HttpPort": "${HttpPort}|180" }, diff --git a/src/Surging.Services/Surging.Services.Server/surgingSettings.json b/src/Surging.Services/Surging.Services.Server/surgingSettings.json index f6b6b82bf..7edfd98b8 100644 --- a/src/Surging.Services/Surging.Services.Server/surgingSettings.json +++ b/src/Surging.Services/Surging.Services.Server/surgingSettings.json @@ -9,7 +9,8 @@ "MaxConcurrentRequests": 20, "ExecutionTimeoutInMilliseconds": 30000, "Protocol": "${Protocol}|None", //HttpTcpNone - "RootPath": "${RootPath}|D:\\userapp", + //"RootPath": "${RootPath}|D:\\userapp", + "RootPath": "${RootPath}|F:\\github\\surging\\src\\Surging.Services\\Surging.Services.Server\\bin\\Release\\PublishOutput", "Ports": { "HttpPort": "${HttpPort}|280", "WSPort": "${WSPort}|96" From eebd91c227764d43b5c1e26006cd05d51a99167f Mon Sep 17 00:00:00 2001 From: sxf359 Date: Sat, 5 Jan 2019 14:38:55 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=A2=AB=E6=94=B9?= =?UTF-8?q?=E5=8F=98=E7=9A=84=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 268 ------------------ .../Surging.ApiGateway.csproj | 75 ----- 2 files changed, 343 deletions(-) delete mode 100644 .gitignore delete mode 100644 src/Surging.ApiGateway/Surging.ApiGateway.csproj diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 114f38046..000000000 --- a/.gitignore +++ /dev/null @@ -1,268 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs -sffd -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ -wwwroot/dist/ -# Visual Studio 2015 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# DNX -project.lock.json -project.fragment.lock.json -artifacts/ - -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# TODO: Comment the next line if you want to checkin your web deploy settings -# but database connection strings (with potential passwords) will be unencrypted -#*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/packages/* -# Shared Assembly file. -!**/packages/SharedSolutionFiles/ -# except build/, which is used as an MSBuild target. -!**/packages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config -# NuGet v3's project.json files produces more ignoreable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -node_modules/ -!/node_modules/swagger-ui-dist/ -orleans.codegen.cs - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -*.mdf -*.ldf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush -.cr/ - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -surging.client.bat -surging.services.bat -新人快速安装入门.docx diff --git a/src/Surging.ApiGateway/Surging.ApiGateway.csproj b/src/Surging.ApiGateway/Surging.ApiGateway.csproj deleted file mode 100644 index 7ff4d21c5..000000000 --- a/src/Surging.ApiGateway/Surging.ApiGateway.csproj +++ /dev/null @@ -1,75 +0,0 @@ - - - - netcoreapp2.1 - true - $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - aspnet-Surging.ApiGateway-147A234E-A922-4E6A-89B8-DCC64AEA96EE - false - 0.4.8 - fanly - surging Micro Service Framework - - surging is a distributed micro service framework that provides high-performance RPC remote service calls, using Zookeeper, Consul as the registration center for surging services, integrating hash, random, polling as a load balancing algorithm, RPC integration using the netty framework, Using asynchronous transmission. Use json.net, protobuf, messagepack for serialization Codec - Copyright © fanly All Rights Reserved. - https://github.com/dotnetcore/surging/blob/master/LICENSE - https://github.com/dotnetcore/surging - MicroService surging - ..\docker-compose.dcproj - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - From 59efd0066f7094fcabe6d5c70a7589d6572f2b36 Mon Sep 17 00:00:00 2001 From: sxf359 Date: Mon, 7 Jan 2019 19:52:03 +0800 Subject: [PATCH 4/5] update upstream --- README.md | 9 + Statement-of-Income-and-Expense.md | 53 + samples/.gitignore | 17 - .../Application.Interface.Auth.csproj | 19 - .../Dto/LoginReq.cs | 14 - .../Event/CorporationActivated.cs | 15 - .../Event/IAuthEventHandler.cs | 15 - .../IAuthAppService.cs | 32 - .../Application.Service.Auth.csproj | 23 - .../EventHandling/AuthEventHandler.cs | 55 - .../Query/AuthAppService.cs | 32 - .../UseCases/AuthAppService.cs | 65 - .../AuthServer/Domain/Aggregate/SubDomain.cs | 24 - samples/AuthServer/Domain/Aggregate/User.cs | 32 - samples/AuthServer/Domain/Domain.Auth.csproj | 27 - .../Domain/Entity/SubDomainPermission.cs | 40 - .../Domain/Repository/UserRepository.cs | 12 - .../Domain/ValueObject/InquiryParameter.cs | 29 - .../HostService/Configs/log4net.config | 24 - .../AuthServer/HostService/HostService.csproj | 39 - samples/AuthServer/HostService/Program.cs | 66 - samples/AuthServer/HostService/Startup.cs | 71 - .../AuthServer/HostService/cacheSettings.json | 47 - .../AuthServer/HostService/dbSettings.json | 5 - .../HostService/eventBusSettings.json | 6 - .../Repository.Auth/AuthRepository.cs | 48 - .../Repository.Auth/Repository.Auth.csproj | 16 - samples/Common/App.Core/App.Core.csproj | 15 - samples/Common/App.Core/BaseAppService.cs | 17 - .../App.Core/Security/EncryptionService.cs | 159 --- .../App.Core/Security/IEncryptionService.cs | 48 - samples/Common/Config.Core/Config.Core.csproj | 17 - .../Config.Core/DBConfigurationExtensions.cs | 101 -- samples/Common/DDD.Core/BaseEntity.cs | 44 - samples/Common/DDD.Core/BaseValueObject.cs | 24 - .../DDD.Core.Extensions/GenericExtension.cs | 140 -- .../DDD.Core.Extensions/ObjectExtension.cs | 1181 ----------------- .../DDD.Core.Extensions/StringExtensions.cs | 247 ---- samples/Common/DDD.Core/DDD.Core.csproj | 24 - samples/Common/DDD.Core/IAggregate.cs | 29 - .../Common/DDD.Core/IQueryOnlyRepository.cs | 33 - samples/Common/DDD.Core/IRepository.cs | 33 - samples/Common/DDD.Core/IUnitOfWork.cs | 24 - .../Common/DTO.Core/BasePagedRequestDto.cs | 19 - samples/Common/DTO.Core/BaseRequestDto.cs | 55 - samples/Common/DTO.Core/BaseResponseDto.cs | 39 - .../Common/DTO.Core/BaseSearchCriteriaDto.cs | 11 - .../Common/DTO.Core/BaseSortCriteriaDto.cs | 36 - samples/Common/DTO.Core/DTO.Core.csproj | 7 - samples/Common/DTO.Core/IdentifyDto.cs | 89 -- samples/Common/DTO.Core/KeyIdReq.cs | 11 - samples/Common/DTO.Core/OperateResultDto.cs | 15 - .../BaseImpQueryOnlyRepository.cs | 72 - .../BaseImpRepository.cs | 40 - .../DapperExtensions.cs | 567 -------- .../DapperExtensionsConfiguration.cs | 132 -- .../DapperImplementor.cs | 825 ------------ .../Common/Repository.Dapper.Core/Database.cs | 159 --- .../Repository.Dapper.Core/DatabasePartial.cs | 514 ------- .../DatabaseServiceCollectionExtensions.cs | 105 -- .../GetMultiplePredicate.cs | 48 - .../GetMultipleResult.cs | 44 - .../Mapper/AutoClassMapper.cs | 41 - .../Mapper/ClassMapper.cs | 180 --- .../Mapper/PluralizedAutoClassMapper.cs | 67 - .../Mapper/PropertyMap.cs | 162 --- samples/Common/Repository.Dapper.Core/Page.cs | 34 - .../Repository.Dapper.Core/Predicates.cs | 732 ---------- .../ReflectionHelper.cs | 108 -- .../Repository.Dapper.Core.csproj | 34 - .../Repository.Dapper.Core/Sql/DB2Dialect.cs | 138 -- .../Sql/MySqlDialect.cs | 38 - .../Sql/OracleDialect.cs | 80 -- .../Sql/PostgreSqlDialect.cs | 58 - .../Sql/SqlCeDialect.cs | 69 - .../Sql/SqlDialectBase.cs | 156 --- .../Sql/SqlGenerator.cs | 413 ------ .../Sql/SqlServerDialect.cs | 146 -- .../Sql/SqliteDialect.cs | 53 - ...yRepository - \345\244\215\345\210\266.cs" | 150 --- .../BaseImpQueryOnlyRepository.cs | 149 --- .../Repository.EF.Core/BaseImpRepository.cs | 66 - .../Common/Repository.EF.Core/ConfigHelper.cs | 101 -- .../Repository.EF.Core/DbContextOption.cs | 50 - .../Repository.EF.Core/DefaultDbContext.cs | 233 ---- .../Repository.EF.Core/IQueryableExtension.cs | 120 -- .../Repository.EF.Core/InquiryRepository.cs | 22 - .../PublishProfiles/FolderProfile.pubxml | 13 - .../Repository.EF.Core.csproj | 31 - .../Common/Repository.EF.Core/SqlHelper.cs | 135 -- .../Common/Repository.EF.Core/UnitOfWork.cs | 64 - .../AuthManger/Controllers/AuthController.cs | 250 ---- .../Controllers/CorpMangerController.cs | 91 -- .../Controllers/EmployeeController.cs | 47 - .../Controllers/RoleMangerController.cs | 48 - .../Configs/appsettings.Development.json | 10 - .../GateWay.WebApi/Configs/appsettings.json | 15 - .../GateWay.WebApi/Configs/cacheSettings.json | 47 - .../Configs/gatewaySettings.json | 10 - .../Controllers/AuthController.cs | 40 - .../Controllers/BaseApiController.cs | 20 - .../Controllers/ServicesController.cs | 219 --- .../Controllers/ValuesController.cs | 39 - .../CustomExceptionFilterAttribute.cs | 76 -- samples/GateWay.WebApi/GateWay.WebApi.csproj | 51 - samples/GateWay.WebApi/HiddenApiFilter.cs | 45 - samples/GateWay.WebApi/Program.cs | 44 - .../Properties/launchSettings.json | 29 - samples/GateWay.WebApi/ScaffoldingReadMe.txt | 12 - samples/GateWay.WebApi/Startup.cs | 162 --- .../appsettings.Development.json | 10 - samples/GateWay.WebApi/appsettings.json | 15 - .../Application.Interface.SysLog.csproj | 15 - .../ILogAppService.cs | 45 - .../Application.Service.SysLog.csproj | 23 - .../LogAppService.cs | 16 - .../HostService/Configs/log4net.config | 24 - .../LogServer/HostService/HostService.csproj | 30 - samples/LogServer/HostService/Program.cs | 64 - samples/LogServer/HostService/Startup.cs | 62 - .../LogServer/HostService/cacheSettings.json | 47 - .../HostService/eventBusSettings.json | 6 - samples/MicroService.sln | 206 --- .../Application.Interface.Org.csproj | 19 - .../DTO/DeptAddReq.cs | 111 -- .../DTO/EmployeePermission.cs | 10 - .../EVENT/CorporationActivated.cs | 18 - .../EVENT/ICorpEventHandler.cs | 13 - .../IOrgAppService.cs | 142 -- .../Application.Service.Org.csproj | 28 - .../Query/OrgAppService.cs | 85 -- .../UseCases/OrgAppService.cs | 280 ---- .../OrgServer/Domain/Aggregate/Corporation.cs | 79 -- samples/OrgServer/Domain/Domain.Org.csproj | 32 - .../EventHandling/InquiryEditedHandler.cs | 17 - .../PublishEvent/InquiryEditedEvent.cs | 14 - samples/OrgServer/Domain/Entity/CorpRole.cs | 20 - samples/OrgServer/Domain/Entity/Department.cs | 40 - samples/OrgServer/Domain/Entity/Employee.cs | 30 - .../Domain/ValueObject/EmployeeRole.cs | 15 - .../Domain/ValueObject/RolePermission.cs | 32 - .../HostService/Configs/log4net.config | 24 - .../OrgServer/HostService/HostService.csproj | 40 - samples/OrgServer/HostService/Program.cs | 65 - samples/OrgServer/HostService/Startup.cs | 70 - .../OrgServer/HostService/cacheSettings.json | 47 - samples/OrgServer/HostService/dbSettings.json | 5 - .../HostService/eventBusSettings.json | 6 - .../OrgServer/Repository.Org/OrgRepository.cs | 46 - .../Repository.Org/Repository.Org.csproj | 16 - samples/README.md | 0 samples/pack/Surging.Core.ApiGateWay.dll | Bin 30208 -> 0 bytes .../Controllers/HomeController.cs | 2 +- .../Controllers/ServicesController.cs | 7 +- src/Surging.ApiGateway/Program.cs | 11 +- src/Surging.ApiGateway/Startup.cs | 2 +- .../Surging.Core.ApiGateWay.csproj | 16 +- .../Address/AddressModel.cs | 6 +- .../Address/IpAddressModel.cs | 13 + .../CommunicationProtocol.cs | 3 +- .../CPlatformConfigurationExtensions.cs | 18 +- .../CPlatformConfigurationProvider.cs | 5 +- .../CPlatformConfigurationSource.cs | 3 - .../IConfigurationWatchManager.cs | 3 - .../Configurations/ModulePackage.cs | 6 +- .../Configurations/ProtocolPortOptions.cs | 16 +- .../Configurations/SurgingServerOptions.cs | 10 +- .../Watch/ConfigurationWatchManager.cs | 17 +- .../ContainerBuilderExtensions.cs | 98 +- .../EventBus/ISubscriptionAdapt.cs | 2 + .../EventBus/Implementation/IEventBus.cs | 2 + .../InMemoryEventBusSubscriptionsManager.cs | 2 +- .../HashAlgorithms/ConsistentHash.cs | 32 +- .../Logging/ConsoleLogger.cs | 75 -- .../Surging.Core.CPlatform/Logging/ILogger.cs | 142 -- .../Module/EchoService.cs | 18 +- .../Module/IEchoService.cs | 8 +- .../Mqtt/IMqttServiceFactory.cs | 18 + .../Mqtt/IMqttServiceRouteManager.cs | 37 + .../MqttServiceRouteManagerBase.cs | 114 ++ .../Mqtt/MqttDescriptor.cs | 105 ++ .../Mqtt/MqttServiceDescriptor.cs | 55 + .../Mqtt/MqttServiceRoute.cs | 59 + .../DefaultServiceRouteProvider.cs | 2 +- .../Address/Resolvers/IAddressResolver.cs | 2 +- .../Implementation/DefaultAddressResolver.cs | 14 +- .../Selectors/IAddressSelector.cs | 4 +- .../Implementation/FairPollingAdrSelector.cs | 8 + .../HashAlgorithmAdrSelector.cs | 89 +- .../Implementation/PollingAddressSelector.cs | 9 + .../HealthChecks/IHealthCheckService.cs | 6 + .../DefaultHealthCheckService.cs | 41 +- .../Implementation/HealthCheckEventArgs.cs | 25 + .../Client/IServiceHeartbeatManager.cs | 14 + .../DefaultServiceHeartbeatManager.cs | 22 + .../Implementation/RemoteInvokeService.cs | 10 +- .../Runtime/Client/RemoteInvokeContext.cs | 2 +- .../Implementation/DefaultServiceExecutor.cs | 5 +- .../Implementation/ClrServiceEntryFactory.cs | 19 +- .../ServiceDescriptor.cs | 7 +- .../ServiceHostBuilderExtensions.cs | 82 +- .../Support/IBreakeRemoteInvokeService.cs | 2 - .../Support/IClusterInvoker.cs | 4 +- .../BreakeRemoteInvokeService.cs | 31 +- .../Implementation/FailoverHandoverInvoker.cs | 4 +- .../FailoverInjectionInvoker.cs | 7 +- .../Support/ServiceCommand.cs | 3 - .../Support/ServiceCommandDescriptor.cs | 6 +- .../Support/ServiceInvokeListenInfo.cs | 4 +- .../Support/StrategyType.cs | 8 +- .../Transport/IMessageListener.cs | 1 - .../Transport/Implementation/RpcContext.cs | 2 - .../Implementation/TransportClient.cs | 1 + .../Utilities/CancellationTokenExtensions.cs | 15 +- .../Utilities/NetUtils.cs | 108 ++ .../Implementation/DefaultAddressResolver.cs | 56 +- .../CacheConfigurationExtensions.cs | 15 +- .../ConfigurationWatchProvider.cs | 29 +- .../HashAlgorithms/ConsistentHash.cs | 43 +- .../RedisCache/RedisContext.cs | 5 +- .../Surging.Core.Caching.csproj | 8 +- .../Messages/DynamicItem.cs | 2 +- .../MessagePackRemoteInvokeMessage.cs | 5 +- .../Surging.Core.Codec.MessagePack.csproj | 8 +- .../Surging.Core.Codec.ProtoBuffer.csproj | 8 +- .../Surging.Core.Common}/ApiResult.cs | 8 +- .../Surging.Core.Common/CommonModule.cs | 11 + .../Surging.Core.Common.csproj | 8 + .../Configurations/ConfigInfo.cs | 12 +- .../Configurations/ConsulOption.cs | 2 + .../Surging.Core.Consul/ConsulModule.cs | 31 +- .../ConsulMqttServiceRouteManager.cs | 371 ++++++ .../ConsulServiceCacheManager.cs | 2 +- .../ConsulServiceCommandManager.cs | 27 +- .../ConsulServiceRouteManager.cs | 29 +- .../ContainerBuilderExtensions.cs | 28 +- .../Surging.Core.Consul.csproj | 8 +- .../Implementation/NodeMonitorWatcher.cs | 6 +- .../TransportMessageChannelHandlerAdapter.cs | 1 - .../DotNettyServerMessageListener.cs | 27 +- .../DotNettyTransportClientFactory.cs | 15 +- .../Surging.Core.DotNetty.csproj | 12 +- .../EventBusConfigurationExtensions.cs | 17 +- .../IConsumeConfigurator.cs | 2 + .../DefaultConsumeConfigurator.cs | 35 + .../Implementation/EventBusKafka.cs | 2 + .../Implementation/KafkaSubscriptionAdapt.cs | 5 + .../Surging.Core.EventBusKafka.csproj | 8 +- .../EventBusConfigurationExtensions.cs | 16 +- .../EventBusRabbitMQModule.cs | 11 +- .../IConsumeConfigurator.cs | 2 + .../IRabbitMQPersisterConnection.cs | 2 + .../DefaultConsumeConfigurator.cs | 37 +- .../DefaultRabbitMQPersisterConnection.cs | 10 +- .../Implementation/EventBusRabbitMQ.cs | 81 +- .../RabbitMqSubscriptionAdapt.cs | 6 + .../ServiceHostBuilderExtensions.cs | 12 + .../Surging.Core.EventBusRabbitMQ.csproj | 8 +- .../Abstractions/ActionContext.cs | 22 + .../Abstractions/ActionResult.cs | 15 +- .../Abstractions/ContentResult.cs | 2 +- .../Abstractions/FileContentResult.cs | 90 ++ .../Abstractions/FileResult.cs | 2 +- .../Abstractions/IActionResult.cs | 13 + .../MvcApplicationBuilderExtensions.cs | 49 - .../HttpMessageListener.cs | 3 +- .../HttpServerMessageSender.cs | 60 +- .../Internal/StreamCopyOperation.cs | 239 ++++ .../KestrelHttpMessageListener.cs | 19 +- .../Surging.Core.KestrelHttpServer.csproj | 16 +- .../Surging.Core.Log4net.csproj | 8 +- .../Surging.Core.Nlog.csproj | 8 +- .../DotNettyHttpServerMessageListener.cs | 11 +- .../Surging.Core.Protocol.Http.csproj | 12 +- .../DotNettyMqttServerMessageListener.cs | 195 +++ .../DefaultMqttServiceFactory.cs | 61 + .../ServerMqttHandlerService.cs | 187 +++ .../Internal/Channel/MqttChannel.cs | 70 + .../Internal/Enums/Behavior.cs | 12 + .../Internal/Enums/ConfirmStatus.cs | 14 + .../Internal/Enums/ConnReturnCode.cs | 16 + .../Internal/Enums/MessageType.cs | 24 + .../Internal/Enums/SessionStatus.cs | 12 + .../Internal/Enums/SubscribeStatus.cs | 12 + .../Internal/Messages/ConnectMessage.cs | 38 + .../Internal/Messages/MqttMessage.cs | 22 + .../Internal/Messages/MqttWillMessage.cs | 18 + .../Internal/Messages/RetainMessage.cs | 14 + .../Internal/Messages/SendMqttMessage.cs | 27 + .../Internal/Messages/SessionMessage.cs | 16 + .../Internal/Runtime/IMqttBehaviorProvider.cs | 12 + .../Runtime/IMqttBrokerEntryManger.cs | 17 + .../Runtime/IMqttRemoteInvokeService.cs | 19 + .../Runtime/IMqttRomtePublishService.cs | 19 + .../DefaultMqttBehaviorProvider.cs | 38 + .../DefaultMqttBrokerEntryManager.cs | 83 ++ .../Implementation/MqttRemoteInvokeService.cs | 111 ++ .../Implementation/MqttRomtePublishService.cs | 19 + .../Runtime/MqttRemoteInvokeContext.cs | 13 + .../Internal/Runtime/Runnable.cs | 24 + .../Internal/Runtime/SacnScheduled.cs | 73 + .../Internal/Runtime/ScanRunnable.cs | 41 + .../Services/AbstractChannelService.cs | 195 +++ .../Internal/Services/IChannelService.cs | 29 + .../Services/IClientSessionService.cs | 15 + .../Internal/Services/IMessagePushService.cs | 28 + .../Internal/Services/IWillService.cs | 17 + .../Implementation/ClientSessionService.cs | 28 + .../Implementation/MessagePushService.cs | 149 +++ .../Implementation/MqttChannelService.cs | 428 ++++++ .../Services/Implementation/WillService.cs | 52 + .../Internal/Services/MqttBehavior.cs | 26 + .../MqttHandlerServiceBase.cs | 48 + .../MqttProtocolModule.cs | 119 ++ .../MqttServiceHost.cs | 56 + .../Surging.Core.Protocol.Mqtt.csproj | 31 + .../Util/MessageIdGenerater.cs | 32 + .../Attributes/BehaviorContractAttribute.cs | 16 + .../Configurations/BehaviorOption.cs | 15 + .../Configurations/WebSocketOptions.cs | 39 + .../DefaultWSServerMessageListener.cs | 10 +- .../DefaultWSServiceEntryProvider.cs | 33 +- .../Runtime/WSServiceEntry.cs | 3 +- .../Surging.Core.Protocol.WS.csproj | 8 +- .../WSProtocolModule.cs | 33 +- .../Implementation/ServiceProxyBase.cs | 5 +- .../Surging.Core.ProxyGenerator.csproj | 9 +- .../Surging.Core.ServiceHosting.csproj | 10 +- .../Surging.Core.Swagger.csproj | 14 + .../Swagger/Model/SwaggerDocument.cs | 2 +- .../SwaggerGen/Generator/ISchemaRegistry.cs | 2 + .../SwaggerGen/Generator/SchemaRegistry.cs | 31 +- .../SwaggerGen/Generator/SwaggerGenerator.cs | 44 +- .../Configurations/ConfigInfo.cs | 13 +- .../Configurations/ZookeeperOption.cs | 2 + .../ContainerBuilderExtensions.cs | 24 +- .../Surging.Core.Zookeeper.csproj | 8 +- .../ZooKeeperMqttServiceRouteManager.cs | 410 ++++++ .../ZooKeeperServiceRouteManager.cs | 3 +- .../Surging.Core.Zookeeper/ZookeeperModule.cs | 24 + .../IChatService.cs | 2 + .../IControllerService.cs | 23 + .../IUserService.cs | 25 +- .../Models/WillMessage.cs | 18 + .../Surging.IModuleServices.Common.csproj | 1 + .../Domain/ControllerService.cs | 40 + .../Domain/PersonService.cs | 27 + .../Domain/UserService.cs | 30 +- .../UserLoginDateChangeHandler.cs | 19 +- .../UserLogoutDataChangeHandler.cs | 3 - .../Surging.Modules.Common.csproj | 1 + .../Surging.Services.Client/Program.cs | 6 +- .../Surging.Services.Client/Startup.cs | 14 +- .../Surging.Services.Client.csproj | 1 + .../cacheSettings.json | 164 ++- .../Surging.Services.Client/nLog.config | 13 +- .../surgingSettings.json | 4 +- .../Surging.Services.Server/NLog.config | 2 +- .../Surging.Services.Server/Program.cs | 5 +- .../Surging.Services.Server/Startup.cs | 4 +- .../Surging.Services.Server.csproj | 3 + .../cacheSettings.json | 149 ++- .../surgingSettings.json | 23 +- src/Surging.sln | 7 + .../WebSocketCore/WebSocketCore.csproj | 6 +- "\346\215\220\350\265\240.png" | Bin 0 -> 55248 bytes 366 files changed, 5994 insertions(+), 13400 deletions(-) create mode 100644 Statement-of-Income-and-Expense.md delete mode 100644 samples/.gitignore delete mode 100644 samples/AuthServer/Application.Interface.Auth/Application.Interface.Auth.csproj delete mode 100644 samples/AuthServer/Application.Interface.Auth/Dto/LoginReq.cs delete mode 100644 samples/AuthServer/Application.Interface.Auth/Event/CorporationActivated.cs delete mode 100644 samples/AuthServer/Application.Interface.Auth/Event/IAuthEventHandler.cs delete mode 100644 samples/AuthServer/Application.Interface.Auth/IAuthAppService.cs delete mode 100644 samples/AuthServer/Application.Service.Auth/Application.Service.Auth.csproj delete mode 100644 samples/AuthServer/Application.Service.Auth/EventHandling/AuthEventHandler.cs delete mode 100644 samples/AuthServer/Application.Service.Auth/Query/AuthAppService.cs delete mode 100644 samples/AuthServer/Application.Service.Auth/UseCases/AuthAppService.cs delete mode 100644 samples/AuthServer/Domain/Aggregate/SubDomain.cs delete mode 100644 samples/AuthServer/Domain/Aggregate/User.cs delete mode 100644 samples/AuthServer/Domain/Domain.Auth.csproj delete mode 100644 samples/AuthServer/Domain/Entity/SubDomainPermission.cs delete mode 100644 samples/AuthServer/Domain/Repository/UserRepository.cs delete mode 100644 samples/AuthServer/Domain/ValueObject/InquiryParameter.cs delete mode 100644 samples/AuthServer/HostService/Configs/log4net.config delete mode 100644 samples/AuthServer/HostService/HostService.csproj delete mode 100644 samples/AuthServer/HostService/Program.cs delete mode 100644 samples/AuthServer/HostService/Startup.cs delete mode 100644 samples/AuthServer/HostService/cacheSettings.json delete mode 100644 samples/AuthServer/HostService/dbSettings.json delete mode 100644 samples/AuthServer/HostService/eventBusSettings.json delete mode 100644 samples/AuthServer/Repository.Auth/AuthRepository.cs delete mode 100644 samples/AuthServer/Repository.Auth/Repository.Auth.csproj delete mode 100644 samples/Common/App.Core/App.Core.csproj delete mode 100644 samples/Common/App.Core/BaseAppService.cs delete mode 100644 samples/Common/App.Core/Security/EncryptionService.cs delete mode 100644 samples/Common/App.Core/Security/IEncryptionService.cs delete mode 100644 samples/Common/Config.Core/Config.Core.csproj delete mode 100644 samples/Common/Config.Core/DBConfigurationExtensions.cs delete mode 100644 samples/Common/DDD.Core/BaseEntity.cs delete mode 100644 samples/Common/DDD.Core/BaseValueObject.cs delete mode 100644 samples/Common/DDD.Core/DDD.Core.Extensions/GenericExtension.cs delete mode 100644 samples/Common/DDD.Core/DDD.Core.Extensions/ObjectExtension.cs delete mode 100644 samples/Common/DDD.Core/DDD.Core.Extensions/StringExtensions.cs delete mode 100644 samples/Common/DDD.Core/DDD.Core.csproj delete mode 100644 samples/Common/DDD.Core/IAggregate.cs delete mode 100644 samples/Common/DDD.Core/IQueryOnlyRepository.cs delete mode 100644 samples/Common/DDD.Core/IRepository.cs delete mode 100644 samples/Common/DDD.Core/IUnitOfWork.cs delete mode 100644 samples/Common/DTO.Core/BasePagedRequestDto.cs delete mode 100644 samples/Common/DTO.Core/BaseRequestDto.cs delete mode 100644 samples/Common/DTO.Core/BaseResponseDto.cs delete mode 100644 samples/Common/DTO.Core/BaseSearchCriteriaDto.cs delete mode 100644 samples/Common/DTO.Core/BaseSortCriteriaDto.cs delete mode 100644 samples/Common/DTO.Core/DTO.Core.csproj delete mode 100644 samples/Common/DTO.Core/IdentifyDto.cs delete mode 100644 samples/Common/DTO.Core/KeyIdReq.cs delete mode 100644 samples/Common/DTO.Core/OperateResultDto.cs delete mode 100644 samples/Common/Repository.Dapper.Core/BaseImpQueryOnlyRepository.cs delete mode 100644 samples/Common/Repository.Dapper.Core/BaseImpRepository.cs delete mode 100644 samples/Common/Repository.Dapper.Core/DapperExtensions.cs delete mode 100644 samples/Common/Repository.Dapper.Core/DapperExtensionsConfiguration.cs delete mode 100644 samples/Common/Repository.Dapper.Core/DapperImplementor.cs delete mode 100644 samples/Common/Repository.Dapper.Core/Database.cs delete mode 100644 samples/Common/Repository.Dapper.Core/DatabasePartial.cs delete mode 100644 samples/Common/Repository.Dapper.Core/DatabaseServiceCollectionExtensions.cs delete mode 100644 samples/Common/Repository.Dapper.Core/GetMultiplePredicate.cs delete mode 100644 samples/Common/Repository.Dapper.Core/GetMultipleResult.cs delete mode 100644 samples/Common/Repository.Dapper.Core/Mapper/AutoClassMapper.cs delete mode 100644 samples/Common/Repository.Dapper.Core/Mapper/ClassMapper.cs delete mode 100644 samples/Common/Repository.Dapper.Core/Mapper/PluralizedAutoClassMapper.cs delete mode 100644 samples/Common/Repository.Dapper.Core/Mapper/PropertyMap.cs delete mode 100644 samples/Common/Repository.Dapper.Core/Page.cs delete mode 100644 samples/Common/Repository.Dapper.Core/Predicates.cs delete mode 100644 samples/Common/Repository.Dapper.Core/ReflectionHelper.cs delete mode 100644 samples/Common/Repository.Dapper.Core/Repository.Dapper.Core.csproj delete mode 100644 samples/Common/Repository.Dapper.Core/Sql/DB2Dialect.cs delete mode 100644 samples/Common/Repository.Dapper.Core/Sql/MySqlDialect.cs delete mode 100644 samples/Common/Repository.Dapper.Core/Sql/OracleDialect.cs delete mode 100644 samples/Common/Repository.Dapper.Core/Sql/PostgreSqlDialect.cs delete mode 100644 samples/Common/Repository.Dapper.Core/Sql/SqlCeDialect.cs delete mode 100644 samples/Common/Repository.Dapper.Core/Sql/SqlDialectBase.cs delete mode 100644 samples/Common/Repository.Dapper.Core/Sql/SqlGenerator.cs delete mode 100644 samples/Common/Repository.Dapper.Core/Sql/SqlServerDialect.cs delete mode 100644 samples/Common/Repository.Dapper.Core/Sql/SqliteDialect.cs delete mode 100644 "samples/Common/Repository.EF.Core/BaseImpQueryOnlyRepository - \345\244\215\345\210\266.cs" delete mode 100644 samples/Common/Repository.EF.Core/BaseImpQueryOnlyRepository.cs delete mode 100644 samples/Common/Repository.EF.Core/BaseImpRepository.cs delete mode 100644 samples/Common/Repository.EF.Core/ConfigHelper.cs delete mode 100644 samples/Common/Repository.EF.Core/DbContextOption.cs delete mode 100644 samples/Common/Repository.EF.Core/DefaultDbContext.cs delete mode 100644 samples/Common/Repository.EF.Core/IQueryableExtension.cs delete mode 100644 samples/Common/Repository.EF.Core/InquiryRepository.cs delete mode 100644 samples/Common/Repository.EF.Core/Properties/PublishProfiles/FolderProfile.pubxml delete mode 100644 samples/Common/Repository.EF.Core/Repository.EF.Core.csproj delete mode 100644 samples/Common/Repository.EF.Core/SqlHelper.cs delete mode 100644 samples/Common/Repository.EF.Core/UnitOfWork.cs delete mode 100644 samples/GateWay.WebApi/Areas/AuthManger/Controllers/AuthController.cs delete mode 100644 samples/GateWay.WebApi/Areas/OrgManger/Controllers/CorpMangerController.cs delete mode 100644 samples/GateWay.WebApi/Areas/OrgManger/Controllers/EmployeeController.cs delete mode 100644 samples/GateWay.WebApi/Areas/OrgManger/Controllers/RoleMangerController.cs delete mode 100644 samples/GateWay.WebApi/Configs/appsettings.Development.json delete mode 100644 samples/GateWay.WebApi/Configs/appsettings.json delete mode 100644 samples/GateWay.WebApi/Configs/cacheSettings.json delete mode 100644 samples/GateWay.WebApi/Configs/gatewaySettings.json delete mode 100644 samples/GateWay.WebApi/Controllers/AuthController.cs delete mode 100644 samples/GateWay.WebApi/Controllers/BaseApiController.cs delete mode 100644 samples/GateWay.WebApi/Controllers/ServicesController.cs delete mode 100644 samples/GateWay.WebApi/Controllers/ValuesController.cs delete mode 100644 samples/GateWay.WebApi/CustomExceptionFilterAttribute.cs delete mode 100644 samples/GateWay.WebApi/GateWay.WebApi.csproj delete mode 100644 samples/GateWay.WebApi/HiddenApiFilter.cs delete mode 100644 samples/GateWay.WebApi/Program.cs delete mode 100644 samples/GateWay.WebApi/Properties/launchSettings.json delete mode 100644 samples/GateWay.WebApi/ScaffoldingReadMe.txt delete mode 100644 samples/GateWay.WebApi/Startup.cs delete mode 100644 samples/GateWay.WebApi/appsettings.Development.json delete mode 100644 samples/GateWay.WebApi/appsettings.json delete mode 100644 samples/LogServer/Application.Interface.SysLog/Application.Interface.SysLog.csproj delete mode 100644 samples/LogServer/Application.Interface.SysLog/ILogAppService.cs delete mode 100644 samples/LogServer/Application.Service.SysLog/Application.Service.SysLog.csproj delete mode 100644 samples/LogServer/Application.Service.SysLog/LogAppService.cs delete mode 100644 samples/LogServer/HostService/Configs/log4net.config delete mode 100644 samples/LogServer/HostService/HostService.csproj delete mode 100644 samples/LogServer/HostService/Program.cs delete mode 100644 samples/LogServer/HostService/Startup.cs delete mode 100644 samples/LogServer/HostService/cacheSettings.json delete mode 100644 samples/LogServer/HostService/eventBusSettings.json delete mode 100644 samples/MicroService.sln delete mode 100644 samples/OrgServer/Application.Interface.Org/Application.Interface.Org.csproj delete mode 100644 samples/OrgServer/Application.Interface.Org/DTO/DeptAddReq.cs delete mode 100644 samples/OrgServer/Application.Interface.Org/DTO/EmployeePermission.cs delete mode 100644 samples/OrgServer/Application.Interface.Org/EVENT/CorporationActivated.cs delete mode 100644 samples/OrgServer/Application.Interface.Org/EVENT/ICorpEventHandler.cs delete mode 100644 samples/OrgServer/Application.Interface.Org/IOrgAppService.cs delete mode 100644 samples/OrgServer/Application.Service.Org/Application.Service.Org.csproj delete mode 100644 samples/OrgServer/Application.Service.Org/Query/OrgAppService.cs delete mode 100644 samples/OrgServer/Application.Service.Org/UseCases/OrgAppService.cs delete mode 100644 samples/OrgServer/Domain/Aggregate/Corporation.cs delete mode 100644 samples/OrgServer/Domain/Domain.Org.csproj delete mode 100644 samples/OrgServer/Domain/DomainEvents/EventHandling/InquiryEditedHandler.cs delete mode 100644 samples/OrgServer/Domain/DomainEvents/PublishEvent/InquiryEditedEvent.cs delete mode 100644 samples/OrgServer/Domain/Entity/CorpRole.cs delete mode 100644 samples/OrgServer/Domain/Entity/Department.cs delete mode 100644 samples/OrgServer/Domain/Entity/Employee.cs delete mode 100644 samples/OrgServer/Domain/ValueObject/EmployeeRole.cs delete mode 100644 samples/OrgServer/Domain/ValueObject/RolePermission.cs delete mode 100644 samples/OrgServer/HostService/Configs/log4net.config delete mode 100644 samples/OrgServer/HostService/HostService.csproj delete mode 100644 samples/OrgServer/HostService/Program.cs delete mode 100644 samples/OrgServer/HostService/Startup.cs delete mode 100644 samples/OrgServer/HostService/cacheSettings.json delete mode 100644 samples/OrgServer/HostService/dbSettings.json delete mode 100644 samples/OrgServer/HostService/eventBusSettings.json delete mode 100644 samples/OrgServer/Repository.Org/OrgRepository.cs delete mode 100644 samples/OrgServer/Repository.Org/Repository.Org.csproj delete mode 100644 samples/README.md delete mode 100644 samples/pack/Surging.Core.ApiGateWay.dll delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Logging/ConsoleLogger.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Logging/ILogger.cs create mode 100644 src/Surging.Core/Surging.Core.CPlatform/Mqtt/IMqttServiceFactory.cs create mode 100644 src/Surging.Core/Surging.Core.CPlatform/Mqtt/IMqttServiceRouteManager.cs create mode 100644 src/Surging.Core/Surging.Core.CPlatform/Mqtt/Implementation/MqttServiceRouteManagerBase.cs create mode 100644 src/Surging.Core/Surging.Core.CPlatform/Mqtt/MqttDescriptor.cs create mode 100644 src/Surging.Core/Surging.Core.CPlatform/Mqtt/MqttServiceDescriptor.cs create mode 100644 src/Surging.Core/Surging.Core.CPlatform/Mqtt/MqttServiceRoute.cs create mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/HealthChecks/Implementation/HealthCheckEventArgs.cs create mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/IServiceHeartbeatManager.cs create mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Implementation/DefaultServiceHeartbeatManager.cs create mode 100644 src/Surging.Core/Surging.Core.CPlatform/Utilities/NetUtils.cs rename src/{Surging.IModuleServices/Surging.IModuleServices.Common/Models => Surging.Core/Surging.Core.Common}/ApiResult.cs (69%) create mode 100644 src/Surging.Core/Surging.Core.Common/CommonModule.cs create mode 100644 src/Surging.Core/Surging.Core.Consul/ConsulMqttServiceRouteManager.cs create mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/ActionContext.cs create mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/FileContentResult.cs create mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/IActionResult.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/Builder/MvcApplicationBuilderExtensions.cs create mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/Internal/StreamCopyOperation.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/DotNettyMqttServerMessageListener.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Implementation/DefaultMqttServiceFactory.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Implementation/ServerMqttHandlerService.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Channel/MqttChannel.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/Behavior.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/ConfirmStatus.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/ConnReturnCode.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/MessageType.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/SessionStatus.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/SubscribeStatus.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/ConnectMessage.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/MqttMessage.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/MqttWillMessage.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/RetainMessage.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/SendMqttMessage.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/SessionMessage.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/IMqttBehaviorProvider.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/IMqttBrokerEntryManger.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/IMqttRemoteInvokeService.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/IMqttRomtePublishService.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Implementation/DefaultMqttBehaviorProvider.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Implementation/DefaultMqttBrokerEntryManager.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Implementation/MqttRemoteInvokeService.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Implementation/MqttRomtePublishService.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/MqttRemoteInvokeContext.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Runnable.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/SacnScheduled.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/ScanRunnable.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/AbstractChannelService.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/IChannelService.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/IClientSessionService.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/IMessagePushService.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/IWillService.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/Implementation/ClientSessionService.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/Implementation/MessagePushService.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/Implementation/MqttChannelService.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/Implementation/WillService.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/MqttBehavior.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/MqttHandlerServiceBase.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/MqttProtocolModule.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/MqttServiceHost.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Surging.Core.Protocol.Mqtt.csproj create mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Util/MessageIdGenerater.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.WS/Attributes/BehaviorContractAttribute.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.WS/Configurations/BehaviorOption.cs create mode 100644 src/Surging.Core/Surging.Core.Protocol.WS/Configurations/WebSocketOptions.cs create mode 100644 src/Surging.Core/Surging.Core.Zookeeper/ZooKeeperMqttServiceRouteManager.cs create mode 100644 src/Surging.IModuleServices/Surging.IModuleServices.Common/IControllerService.cs create mode 100644 src/Surging.IModuleServices/Surging.IModuleServices.Common/Models/WillMessage.cs create mode 100644 src/Surging.Modules/Surging.Modules.Common/Domain/ControllerService.cs create mode 100644 "\346\215\220\350\265\240.png" diff --git a/README.md b/README.md index 7357671b4..3130ea037 100644 --- a/README.md +++ b/README.md @@ -261,6 +261,15 @@ Task.FromResult(new Surging.IModuleServices.Common.Models.UserModel ```C# .AddClientIntercepted(typeof(CacheProviderInterceptor)) ``` +### 捐赠基金 +如果觉得这个框架不错，可以支持surging开源，请fanly喝一杯咖啡或吃一顿午餐或者是更好的社区发展，扫描下方二维码进行捐赠，并在付款说明填写您的改进意见。 + +![](https://github.com/dotnetcore/surging/blob/master/%E6%8D%90%E8%B5%A0.png) + + +## 捐赠明细 + +surging 接受来自社区的捐赠，所有款项将通过 [捐赠明细表](Statement-of-Income-and-Expense.md) 进行公示，接受社区监督。 IDE:Visual Studio 2017 15.5,vscode
diff --git a/Statement-of-Income-and-Expense.md b/Statement-of-Income-and-Expense.md new file mode 100644 index 000000000..afbd62a8f --- /dev/null +++ b/Statement-of-Income-and-Expense.md @@ -0,0 +1,53 @@ +# 收支明细表 + +说明：为保证surging财务公开透明，决定将每一笔捐赠和支出记录于本表，资金由 [fanly](https://github.com/fanliang11) 托管，并且受社区人员监督用于surging的生态发展 + + +## 汇总 + +截止到 2018 年 12 月 28 日： ++ 共获得捐赠 `38` 笔计 `8250.4` 元人民币 ++ 暂无支出项 + +## 明细 + +| 序号 | 捐赠人 | 时间 | 金额 | 说明 | 留言 | 类型 | +|------------|:------------:|-------------|--------------------|-------------------|--------------------|-----| +| 1 | Murphy | 2018-12-19 | 100 | Murphy 个人捐赠 | 这家伙很懒 |获赠 | +| 2 | 宗国 | 2018-12-19 | 20 | 宗国 个人捐赠 | 这家伙很懒 |获赠 | +| 3 | 紫能 | 2018-12-19 | 50 | 紫能 个人捐赠 | 这家伙很懒 |获赠 | +| 4 | Damon | 2018-12-19 | 18.8 | Damon 个人捐赠 | 支持一下 |获赠 | +| 5 | 悉路 | 2018-12-19 | 10 | 悉路 个人捐赠 | 感谢作者的付出，希望能完善文档 |获赠 | +| 6 | jiang | 2018-12-19 | 16.66 | jiang 个人捐赠 | 这家伙很懒 |获赠 | +| 7 | 伯锰 z.l | 2018-12-19 | 20 | 伯锰 z.l 个人捐赠 | 期待1.0 |获赠 | +| 8 | 匿名 | 2018-12-19 | 5000 | 匿名个人捐赠 | 这家伙很懒 |获赠 | +| 9 | 爱吃牛排的牛仔 | 2018-12-19 | 66.66 | 爱吃牛排的牛仔个人捐赠 | 这家伙很懒 |获赠 | +| 10 | siyue | 2018-12-20 | 50 | siyue个人捐赠 | 这家伙很懒 |获赠 | +| 11 | 学飞 | 2018-12-20 | 200 | 学飞个人捐赠 | 还在学习，期待surging越来越好 |获赠 | +| 12 | 昵称bai | 2018-12-21 | 10 | 昵称bai个人捐赠 | 这家伙很懒 |获赠 | +| 13 | 半碗的彩霞 | 2018-12-21 | 10 | 半碗的彩霞个人捐赠 | 这家伙很懒 |获赠 | +| 14 | 虎牙 | 2018-12-21 | 1000 | 虎牙个人捐赠 | 这家伙很懒 |获赠 | +| 15 | 寸草无心 | 2018-12-21 | 100 | 寸草无心个人捐赠 | 关注surging已有大半年了 默默支持 |获赠 | +| 16 | 洋 | 2018-12-24 | 1 | 洋个人捐赠 | dotnetty支持websocket了 |获赠 | +| 17 | 高文 | 2018-12-24 | 10 | 高文个人捐赠 | 庆祝1.0 |获赠 | +| 18 | 培根 | 2018-12-24 | 36 | 培根个人捐赠 | 捐赠一杯咖啡 |获赠 | +| 19 | gesneriana | 2018-12-24 | 26 | gesneriana个人捐赠 | 这家伙很懒 |获赠 | +| 20 | 学军 | 2018-12-27 | 100 | 学军个人捐赠 | 这家伙很懒 |获赠 | +| 21 | 高立哲 | 2018-12-27 | 30 | 高立哲个人捐赠 | 这家伙很懒 |获赠 | +| 22 | 俊文 | 2018-12-27 | 10 | 俊文个人捐赠 | 这家伙很懒 |获赠 | +| 23 | 根堂 | 2018-12-28 | 100 | 根堂个人捐赠 | 这家伙很懒 |获赠 | +| 24 | 东周 | 2018-12-28 | 5 | 东周个人捐赠 | 辛苦 |获赠 | +| 25 | 纯 | 2018-12-28 | 20 | 纯个人捐赠 | 这家伙很懒 |获赠 | +| 26 | 夏志行 | 2018-12-28 | 88 | 夏志行个人捐赠 | 这家伙很懒 |获赠 | +| 27 | 勇 | 2018-12-28 | 88.88 | 勇个人捐赠 | 这家伙很懒 |获赠 | +| 28 | 启旺 | 2018-12-28 | 10 | 勇个人捐赠 | 这家伙很懒 |获赠 | +| 29 | 雯昌 | 2018-12-28 | 20 | 雯昌个人捐赠 | 支持surging |获赠 | +| 30 | 宏伟 | 2018-12-28 | 500 | 宏伟个人捐赠 | 这家伙很懒 |获赠 | +| 31 | 伟 | 2018-12-28 | 20 | 伟个人捐赠 | 这家伙很懒 |获赠 | +| 32 | 建 | 2018-12-28 | 10 |建个人捐赠 | 希望大佬搞好文档，在下尽点微薄之力 |获赠 | +| 33 | 林 | 2018-12-29 | 30 |林个人捐赠 | 这家伙很懒 |获赠 | +| 34 | 俊强 | 2018-12-29 | 100 | 俊强个人捐赠 | 这家伙很懒 |获赠 | +| 35 | 彪 | 2018-01-02 | 10 | 彪个人捐赠 | 支持一下surging |获赠 | +| 36 | 忠全 | 2018-01-02 | 200 | 忠全个人捐赠 | 学习一下 |获赠 | +| 37 | 思恒 | 2018-01-03 | 10 | 思恒个人捐赠 | 这家伙很懒 |获赠 | +| 38 | 松波 | 2018-01-04 | 100 | 松波个人捐赠 | 出精品 |获赠 | diff --git a/samples/.gitignore b/samples/.gitignore deleted file mode 100644 index befad6a88..000000000 --- a/samples/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -/Centa.Agency.HostService/bin -/Centa.Agency.HostService/obj -/Centa.Agency.Application.Service/bin -/Centa.Agency.Application.Service/obj -/DDD.Core/bin -/DDD.Core/obj -/Centa.Agency.Web/bin -bin -obj -/Centa.HostService.SysLog/obj -/Centa.HostService.SysLog/bin -/Centa.Agency.Application.Interface/obj -/Centa.Agency.Domain/obj -/Centa.Agency.Domain/bin -/Centa.Agency.Query/bin -/Centa.Agency.Query/obj -/Centa.Agency.Web/obj diff --git a/samples/AuthServer/Application.Interface.Auth/Application.Interface.Auth.csproj b/samples/AuthServer/Application.Interface.Auth/Application.Interface.Auth.csproj deleted file mode 100644 index 8c27115ea..000000000 --- a/samples/AuthServer/Application.Interface.Auth/Application.Interface.Auth.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - netcoreapp2.0 - - - - ..\HostService\bin\Debug - - - - - - - - - - - diff --git a/samples/AuthServer/Application.Interface.Auth/Dto/LoginReq.cs b/samples/AuthServer/Application.Interface.Auth/Dto/LoginReq.cs deleted file mode 100644 index acbad5813..000000000 --- a/samples/AuthServer/Application.Interface.Auth/Dto/LoginReq.cs +++ /dev/null @@ -1,14 +0,0 @@ -using DTO.Core; -using System; -using System.Collections.Generic; -using System.Text; - -namespace Application.Service.Auth.Dto -{ - public class LoginReq : BaseDto - { - public string UserName { get; set; } - public string Pwd { get; set; } - public Guid CorporationKeyId { get; set; } - } -} diff --git a/samples/AuthServer/Application.Interface.Auth/Event/CorporationActivated.cs b/samples/AuthServer/Application.Interface.Auth/Event/CorporationActivated.cs deleted file mode 100644 index 11f421dad..000000000 --- a/samples/AuthServer/Application.Interface.Auth/Event/CorporationActivated.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Surging.Core.CPlatform.EventBus.Events; -using System; -using System.Collections.Generic; -using System.Text; - -namespace Application.Interface.Auth.EVENT -{ - // /// - // /// 新注册公司被激活的事件 - // /// - //public class CorporationActivatedEvent: IntegrationEvent - // { - - // } -} diff --git a/samples/AuthServer/Application.Interface.Auth/Event/IAuthEventHandler.cs b/samples/AuthServer/Application.Interface.Auth/Event/IAuthEventHandler.cs deleted file mode 100644 index 93ae5b0b7..000000000 --- a/samples/AuthServer/Application.Interface.Auth/Event/IAuthEventHandler.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Application.Interface.Org.EVENT; -using Surging.Core.CPlatform.EventBus.Events; -using System; -using System.Collections.Generic; -using System.Text; - -namespace Application.Interface.Auth.EVENT -{ - /// - /// 事件处理器 - /// - public interface IAuthEventHandler : IIntegrationEventHandler - { - } -} diff --git a/samples/AuthServer/Application.Interface.Auth/IAuthAppService.cs b/samples/AuthServer/Application.Interface.Auth/IAuthAppService.cs deleted file mode 100644 index 3b899c1ea..000000000 --- a/samples/AuthServer/Application.Interface.Auth/IAuthAppService.cs +++ /dev/null @@ -1,32 +0,0 @@ -using Application.Service.Auth.Dto; -using DTO.Core; -using Surging.Core.CPlatform.Ioc; -using Surging.Core.CPlatform.Runtime.Server.Implementation.ServiceDiscovery.Attributes; -using System; -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace Application.Interface.Auth -{ - [ServiceBundle("api/{Service}")] - public interface IAuthAppService : IServiceKey - { - - /// - /// 登录系统 - /// - /// - [Service(Date = "2018-1-30", Director = "刘旭东", Name = "登录系统")] - Task SignIn( LoginReq req); - - /// - /// 退出系统 - /// - /// - [Service(Date = "2018-1-30", Director = "刘旭东", Name = "退出系统")] - Task SignUp(CommonCMDReq req); - - [Service(Date = "2018-1-30", Director = "刘旭东", Name = "查询系统模块下的所有权限")] - Task FindDomainPermissions(CommonCMDReq req); - } -} diff --git a/samples/AuthServer/Application.Service.Auth/Application.Service.Auth.csproj b/samples/AuthServer/Application.Service.Auth/Application.Service.Auth.csproj deleted file mode 100644 index 0e9898f87..000000000 --- a/samples/AuthServer/Application.Service.Auth/Application.Service.Auth.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - netcoreapp2.0 - - - - ..\HostService\bin\Debug - - - - - - - - - - - - - - - diff --git a/samples/AuthServer/Application.Service.Auth/EventHandling/AuthEventHandler.cs b/samples/AuthServer/Application.Service.Auth/EventHandling/AuthEventHandler.cs deleted file mode 100644 index ab81150ff..000000000 --- a/samples/AuthServer/Application.Service.Auth/EventHandling/AuthEventHandler.cs +++ /dev/null @@ -1,55 +0,0 @@ -using App.Core.Security; -using Application.Interface.Auth.EVENT; -using Application.Interface.Org.EVENT; -using Domain.Auth.Aggregate; -using Repository.Auth; -using Surging.Core.ProxyGenerator; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; - -namespace Application.Service.Auth.EventHandling -{ - //[QueueConsumerAttribute] - public class AuthEventHandler : IAuthEventHandler - { - private readonly UserRepository _userRepository; - private readonly SubDomainRepository _subDomainRepository; - private readonly UserQueryRepository _queryUserRepository; - private readonly SubDomainQueryRepository _querySubDomainRepository; - // private ICacheProvider _cacheProvider; - public AuthEventHandler(UserRepository userRepository, UserQueryRepository queryUserRepository, - SubDomainRepository subDomainRepository, SubDomainQueryRepository querySubDomainRepository) - { - _userRepository = userRepository; - _subDomainRepository = subDomainRepository; - _queryUserRepository = queryUserRepository; - _querySubDomainRepository = querySubDomainRepository; - } - - - public Task Handle(CorporationActivatedEvent @event) - { - //需要为企业管理做初始化，并生成管理员账号 - return Task.Run(() => - { - var encryptionService = new EncryptionService(); - _userRepository.Add(new User - { - CorporationKeyId = @event.CorpId, - IsDelete = false, - EmployeeKeyID = Guid.Parse(@event.EmpId), - KeyId = Guid.NewGuid(), - Name = "超级管理员", - No = "SuperMan", - Version = 1, - Pwd = encryptionService.EncryptText("123456") - }); - - _userRepository.Commit(); - }); - - } - } -} diff --git a/samples/AuthServer/Application.Service.Auth/Query/AuthAppService.cs b/samples/AuthServer/Application.Service.Auth/Query/AuthAppService.cs deleted file mode 100644 index d6db7d3de..000000000 --- a/samples/AuthServer/Application.Service.Auth/Query/AuthAppService.cs +++ /dev/null @@ -1,32 +0,0 @@ -using DTO.Core; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Application.Service.Auth -{ - public partial class AuthAppService - { - public Task FindDomainPermissions(CommonCMDReq req) - { - BaseListResponseDto rsp = new BaseListResponseDto(); - var rows= _querySubDomainRepository.Get(a => !a.IsDelete,b=>b.SubDomainPermissions).ToList(); - rsp.Result = rows.Select(a => new { - keyId = a.KeyId, - domainNmae = a.Name, - action = a.SubDomainPermissions.Where(b=>b.PermissionType== Domain.Auth.Entity.PermissionCategory.Action)?.GroupBy(b => b.GroupName, c => new { - name=c.Name, - no=c.No - }).ToDictionary(b=>b.Key,c=>c), - page = a.SubDomainPermissions.Where(b => b.PermissionType == Domain.Auth.Entity.PermissionCategory.Page)?.Select(c => new { - name = c.Name, - no = c.No - }).ToList() - }).ToList(); - return Task.FromResult(rsp); - } - - } -} diff --git a/samples/AuthServer/Application.Service.Auth/UseCases/AuthAppService.cs b/samples/AuthServer/Application.Service.Auth/UseCases/AuthAppService.cs deleted file mode 100644 index f3d351d92..000000000 --- a/samples/AuthServer/Application.Service.Auth/UseCases/AuthAppService.cs +++ /dev/null @@ -1,65 +0,0 @@ -using App.Core.Security; -using Application.Interface.Auth; -using Application.Service.Auth.Dto; -using Domain.Auth.Aggregate; -using DTO.Core; -using Repository.Auth; -using Surging.Core.Caching; -using Surging.Core.CPlatform.Ioc; -using Surging.Core.ProxyGenerator; - -using System; -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace Application.Service.Auth -{ - [ModuleName("Auth")] - public partial class AuthAppService : ProxyServiceBase, IAuthAppService - { - private readonly UserRepository _userRepository; - private readonly SubDomainRepository _subDomainRepository; - private readonly UserQueryRepository _queryUserRepository; - private readonly SubDomainQueryRepository _querySubDomainRepository; - // private ICacheProvider _cacheProvider; - public AuthAppService(UserRepository userRepository, UserQueryRepository queryUserRepository, - SubDomainRepository subDomainRepository, SubDomainQueryRepository querySubDomainRepository) - { - _userRepository = userRepository; - _subDomainRepository = subDomainRepository; - _queryUserRepository = queryUserRepository; - _querySubDomainRepository = querySubDomainRepository; - } - - public Task SignIn(LoginReq req) - { - User user=null; - try { - //缓存增加当前用户相关信息 - //_cacheProvider= CacheContainer.GetInstances("Redis"); - //_cacheProvider.Add("UserKeyId=22", "{ UserKeyId=22,TenantId=3}"); - var encryptionService = new EncryptionService(); - var pwde = encryptionService.EncryptText(req.Pwd); - user = _queryUserRepository.GetSingle(a => a.CorporationKeyId == req.CorporationKeyId && !a.IsDelete && a.Pwd == pwde && a.No == req.UserName); - } - catch (Exception ex) - { - string ss = ex.Message; - } - if (user != null) - { - return Task.FromResult(new TokenDto { CorporationKeyId = user.CorporationKeyId, Token = user.EmployeeKeyID.ToString() }); - - } - else - { - return Task.FromResult(null); - } - } - - public Task SignUp(CommonCMDReq req) - { - throw new NotImplementedException(); - } - } -} diff --git a/samples/AuthServer/Domain/Aggregate/SubDomain.cs b/samples/AuthServer/Domain/Aggregate/SubDomain.cs deleted file mode 100644 index ba5963c54..000000000 --- a/samples/AuthServer/Domain/Aggregate/SubDomain.cs +++ /dev/null @@ -1,24 +0,0 @@ -using DDD.Core; -using Domain.Auth.Entity; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Text; - -namespace Domain.Auth.Aggregate -{ - /// - /// 服务模块(子领域) - /// - [Table("Auth_SubDomains")] - public class SubDomain : IAggregate - { - - /// - /// 模块下的权限 - /// - public virtual List SubDomainPermissions { get; set; } - - } -} diff --git a/samples/AuthServer/Domain/Aggregate/User.cs b/samples/AuthServer/Domain/Aggregate/User.cs deleted file mode 100644 index 2135d1a39..000000000 --- a/samples/AuthServer/Domain/Aggregate/User.cs +++ /dev/null @@ -1,32 +0,0 @@ -using DDD.Core; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Text; - -namespace Domain.Auth.Aggregate -{ - /// - /// 平台用户(账号) - /// - [Table("Auth_Users")] - public class User : IAggregate - { - - /// - /// 密码 - /// - public string Pwd { get; set; } - - - /// - /// 归属员工 - /// - public Guid EmployeeKeyID { get; set; } - - - //public virtual List Departments { get; set; } - - } -} diff --git a/samples/AuthServer/Domain/Domain.Auth.csproj b/samples/AuthServer/Domain/Domain.Auth.csproj deleted file mode 100644 index 557735dc9..000000000 --- a/samples/AuthServer/Domain/Domain.Auth.csproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - netcoreapp2.0 - - - - ..\HostService\bin\Debug - - - - - - - - - - - - - - - - - - - diff --git a/samples/AuthServer/Domain/Entity/SubDomainPermission.cs b/samples/AuthServer/Domain/Entity/SubDomainPermission.cs deleted file mode 100644 index b34a3e9dc..000000000 --- a/samples/AuthServer/Domain/Entity/SubDomainPermission.cs +++ /dev/null @@ -1,40 +0,0 @@ -using DDD.Core; -using Domain.Auth.Aggregate; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Text; - -namespace Domain.Auth.Entity -{ - /// - /// 模块下的权限 - /// - [Table("Auth_SubDomain_Permissions")] - public class SubDomainPermission : BaseEntity - { - public string GroupName { get; set; } - public string GroupNo { get; set; } - - public PermissionCategory PermissionType { get; set; } - - public Guid SubDomainKeyId { get; set; } - - [ForeignKey("SubDomainKeyId")] - public SubDomain SubDomain { get; set; } - } - - public enum PermissionCategory - { - /// - /// 页面 - /// - Page=1, - - /// - /// 动作 - /// - Action=2 - } -} diff --git a/samples/AuthServer/Domain/Repository/UserRepository.cs b/samples/AuthServer/Domain/Repository/UserRepository.cs deleted file mode 100644 index 00c3f69c7..000000000 --- a/samples/AuthServer/Domain/Repository/UserRepository.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Domain.Auth.Aggregate; -using Microsoft.EntityFrameworkCore; -using Repository.EF.Core; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Domain.Auth.Repository -{ - -} diff --git a/samples/AuthServer/Domain/ValueObject/InquiryParameter.cs b/samples/AuthServer/Domain/ValueObject/InquiryParameter.cs deleted file mode 100644 index 4dcf8b670..000000000 --- a/samples/AuthServer/Domain/ValueObject/InquiryParameter.cs +++ /dev/null @@ -1,29 +0,0 @@ -using DDD.Core; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Text; - -namespace Domain.ValueObject.Inquiry -{ - - public class InquiryParameter: BaseValueObject - { - // [Column("InquiryKeyId")] - public Guid InquiryKeyId { get; set; } - // [ForeignKey("InquiryKeyId")] - // public CusInquiry OwnCusInquiry { get; set; } - - public Guid SysParameterItemKeyId { get; set; } - public int ParameterType { get; set; } - public int Seq { get; set; } - /* - [InverseProperty("Author")] - public List AuthoredPosts { get; set; } - - [InverseProperty("Contributor")] - public List ContributedToPosts { get; set; } - */ - - } -} diff --git a/samples/AuthServer/HostService/Configs/log4net.config b/samples/AuthServer/HostService/Configs/log4net.config deleted file mode 100644 index 42fd16880..000000000 --- a/samples/AuthServer/HostService/Configs/log4net.config +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/AuthServer/HostService/HostService.csproj b/samples/AuthServer/HostService/HostService.csproj deleted file mode 100644 index 6fc04dddc..000000000 --- a/samples/AuthServer/HostService/HostService.csproj +++ /dev/null @@ -1,39 +0,0 @@ - - - - Exe - netcoreapp2.0 - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - diff --git a/samples/AuthServer/HostService/Program.cs b/samples/AuthServer/HostService/Program.cs deleted file mode 100644 index fd254ab5b..000000000 --- a/samples/AuthServer/HostService/Program.cs +++ /dev/null @@ -1,66 +0,0 @@ -using Autofac; -using Surging.Core.Codec.MessagePack; -using Surging.Core.Consul; -using Surging.Core.Consul.Configurations; -using Surging.Core.CPlatform; -using Surging.Core.CPlatform.Utilities; -using Surging.Core.DotNetty; -using Surging.Core.EventBusRabbitMQ; -using Surging.Core.ServiceHosting; -using Surging.Core.ServiceHosting.Internal.Implementation; -using System; -using System.Text; -using Surging.Core.Log4net; -using Surging.Core.ProxyGenerator; - -namespace Centa.HostService.Auth -{ - public class Program - { - static void Main(string[] args) - { - Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); - var host = new ServiceHostBuilder() - .RegisterServices(builder => - { - // builder.RegisterAssemblyModules(); - //这里写自己的注册 - }) - .RegisterServices(builder => - { - builder.AddMicroService(option => - { - option.AddServiceRuntime(); - option.AddRelateService(); - option.UseConsulManager(new ConfigInfo("127.0.0.1:8500")); - option.UseDotNettyTransport(); - option.UseRabbitMQTransport(); - option.AddRabbitMQAdapt(); - //option.UseMessagePackCodec(); - option.UseJsonCodec(); - builder.Register(p => new CPlatformContainer(ServiceLocator.Current)); - }); - }) - .SubscribeAt() - .UseLog4net("Configs/log4net.config") - .UseServer(options => - { - options.Ip = "127.0.0.1"; - options.Port = 10241; - options.Token = "True"; - options.ExecutionTimeoutInMilliseconds = 30000; - options.MaxConcurrentRequests = 200; - }) - .UseProxy() - .UseStartup() - .Build(); - - using (host.Run()) - { - Console.Title = "认证授权"; - Console.WriteLine($"认证授权——服务端启动成功，{DateTime.Now}。"); - Console.ReadLine(); - } - } - } -} diff --git a/samples/AuthServer/HostService/Startup.cs b/samples/AuthServer/HostService/Startup.cs deleted file mode 100644 index 84043e018..000000000 --- a/samples/AuthServer/HostService/Startup.cs +++ /dev/null @@ -1,71 +0,0 @@ -using Autofac; -using Autofac.Extensions.DependencyInjection; -using Config.Core.Extensions; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using Surging.Core.Caching.Configurations; -using Surging.Core.CPlatform.Utilities; -using Surging.Core.EventBusRabbitMQ.Configurations; -using System; - -namespace Centa.HostService.Auth -{ - public class Startup - { - public Startup() - { - var config = new ConfigurationBuilder() - .SetBasePath(AppContext.BaseDirectory); - ConfigureEventBus(config); - ConfigureCache(config); - ConfigureDB(config); - - } - - public IContainer ConfigureServices(ContainerBuilder builder) - { - var services = new ServiceCollection(); - ConfigureLogging(services); - builder.Populate(services); - ServiceLocator.Current = builder.Build(); - return ServiceLocator.Current; - } - - public void Configure(IContainer app) - { - app.Resolve().AddConsole((c, l) => (int)l >= 3); - } - - #region 私有方法 - /// - /// 配置日志服务 - /// - /// - private void ConfigureLogging(IServiceCollection services) - { - services.AddLogging(); - } - - private static void ConfigureEventBus(IConfigurationBuilder build) - { - build - .AddEventBusFile("eventBusSettings.json", optional: false); - } - - /// - /// 配置缓存服务 - /// - private void ConfigureCache(IConfigurationBuilder build) - { - build.AddCacheFile("cacheSettings.json", optional: false); - } - - private void ConfigureDB(IConfigurationBuilder build) - { - build.AddDBFile("dbSettings.json", optional: false); - } - #endregion - - } -} diff --git a/samples/AuthServer/HostService/cacheSettings.json b/samples/AuthServer/HostService/cacheSettings.json deleted file mode 100644 index ab9c7e43d..000000000 --- a/samples/AuthServer/HostService/cacheSettings.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "CachingSettings": [ - { - "Id": "ddlCache", - "Class": "Surging.Core.Caching.RedisCache.RedisContext,Surging.Core.Caching", - "Properties": [ - { - "Name": "appRuleFile", - "Ref": "rule" - }, - { - "Name": "dataContextPool", - "Ref": "ddls_sample", - "Maps": [ - { - "Name": "Redis", - "Properties": [ - { - "value": "127.0.0.1:6379::1" - } - ] - }, - { - "Name": "MemoryCache" - } - ] - }, - { - "Name": "defaultExpireTime", - "value": "120" - }, - { - "Name": "connectTimeout", - "Value": "120" - }, - { - "Name": "minSize", - "Value": "1" - }, - { - "Name": "maxSize", - "Value": "10" - } - ] - } - ] -} diff --git a/samples/AuthServer/HostService/dbSettings.json b/samples/AuthServer/HostService/dbSettings.json deleted file mode 100644 index 9903dfd68..000000000 --- a/samples/AuthServer/HostService/dbSettings.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ConnectionString": "Data Source=(localdb)\\MSSQLLocalDB;Initial Catalog=Web_A2;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=True;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", - "ModelAssemblyName": "Domain.Auth" -} - diff --git a/samples/AuthServer/HostService/eventBusSettings.json b/samples/AuthServer/HostService/eventBusSettings.json deleted file mode 100644 index d5d4487b7..000000000 --- a/samples/AuthServer/HostService/eventBusSettings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "EventBusConnection": "localhost", - "EventBusUserName": "guest", - "EventBusPassword": "guest" -} - diff --git a/samples/AuthServer/Repository.Auth/AuthRepository.cs b/samples/AuthServer/Repository.Auth/AuthRepository.cs deleted file mode 100644 index 25ce7ba6c..000000000 --- a/samples/AuthServer/Repository.Auth/AuthRepository.cs +++ /dev/null @@ -1,48 +0,0 @@ -using DDD.Core; -using Domain.Auth.Aggregate; -using Microsoft.EntityFrameworkCore; -using Repository.EF.Core; -using Surging.Core.CPlatform.Ioc; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Text; - -namespace Repository.Auth -{ - - - - public class UserRepository : BaseImpRepository - { - public override User FindBy(Guid key) - { - return _set //.Include(a => a.Departments).ThenInclude(a => a.Employees) - .SingleOrDefault(a => a.KeyId == key); - } - } - - public class SubDomainRepository : BaseImpRepository - { - public override SubDomain FindBy(Guid key) - { - return _set //.Include(a => a.Departments).ThenInclude(a => a.Employees) - .SingleOrDefault(a => a.KeyId == key); - } - } - - public class UserQueryRepository : BaseImpQueryOnlyRepository - { - } - - public class SubDomainQueryRepository : BaseImpQueryOnlyRepository - { - - public override IQueryable Get(Expression> where = null) - { - return _set.Include(a => a.SubDomainPermissions).Where(where); - } - } - -} diff --git a/samples/AuthServer/Repository.Auth/Repository.Auth.csproj b/samples/AuthServer/Repository.Auth/Repository.Auth.csproj deleted file mode 100644 index 9fb3bffee..000000000 --- a/samples/AuthServer/Repository.Auth/Repository.Auth.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netcoreapp2.0 - - - - ..\HostService\bin\Debug - - - - - - - - diff --git a/samples/Common/App.Core/App.Core.csproj b/samples/Common/App.Core/App.Core.csproj deleted file mode 100644 index df1909e24..000000000 --- a/samples/Common/App.Core/App.Core.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - netcoreapp2.0 - - - - - - - - - - - diff --git a/samples/Common/App.Core/BaseAppService.cs b/samples/Common/App.Core/BaseAppService.cs deleted file mode 100644 index a7b6e682c..000000000 --- a/samples/Common/App.Core/BaseAppService.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Repository.EF.Core; -using Surging.Core.ProxyGenerator; -using System; - -namespace App.Core -{ - public class BaseAppService : ProxyServiceBase - { - // protected BaseImpRepository _repository; - //protected QueryOrgRepository _queryOnlyRepository; - public BaseAppService()//(BaseImpRepository repository)//, QueryOrgRepository queryOnlyRepository) - { - // _repository = repository; - //_queryOnlyRepository = queryOnlyRepository; - } - } -} diff --git a/samples/Common/App.Core/Security/EncryptionService.cs b/samples/Common/App.Core/Security/EncryptionService.cs deleted file mode 100644 index 36159e03e..000000000 --- a/samples/Common/App.Core/Security/EncryptionService.cs +++ /dev/null @@ -1,159 +0,0 @@ -using System; -using System.IO; -using System.Security.Cryptography; -using System.Text; - -namespace App.Core.Security -{ - /// - /// Encryption service - /// - public class EncryptionService : IEncryptionService - { - #region Fields - - private readonly dynamic _securitySettings ; - private readonly string EncryptionKey = "loveC#loveC#loveC#"; - #endregion - - #region Ctor - public EncryptionService() - { - //_securitySettings.EncryptionKey = "loveC#"; - } - - - #endregion - - #region Utilities - - private byte[] EncryptTextToMemory(string data, byte[] key, byte[] iv) - { - using (var ms = new MemoryStream()) { - using (var cs = new CryptoStream(ms, new TripleDESCryptoServiceProvider().CreateEncryptor(key, iv), CryptoStreamMode.Write)) { - var toEncrypt = Encoding.Unicode.GetBytes(data); - cs.Write(toEncrypt, 0, toEncrypt.Length); - cs.FlushFinalBlock(); - } - - return ms.ToArray(); - } - } - - private string DecryptTextFromMemory(byte[] data, byte[] key, byte[] iv) - { - using (var ms = new MemoryStream(data)) { - using (var cs = new CryptoStream(ms, new TripleDESCryptoServiceProvider().CreateDecryptor(key, iv), CryptoStreamMode.Read)) - { - using (var sr = new StreamReader(cs, Encoding.Unicode)) - { - return sr.ReadToEnd(); - } - } - } - } - - #endregion - - #region Methods - - /// - /// Create salt key - /// - /// Key size - /// Salt key - public virtual string CreateSaltKey(int size) - { - //generate a cryptographic random number - using (var provider = new RNGCryptoServiceProvider()) - { - var buff = new byte[size]; - provider.GetBytes(buff); - - // Return a Base64 string representation of the random number - return Convert.ToBase64String(buff); - } - } - - /// - /// Create a password hash - /// - /// Password - /// Salk key - /// Password format (hash algorithm) - /// Password hash - public virtual string CreatePasswordHash(string password, string saltkey, string passwordFormat) - { - return CreateHash(Encoding.UTF8.GetBytes(string.Concat(password, saltkey)), passwordFormat); - } - - /// - /// Create a data hash - /// - /// The data for calculating the hash - /// Hash algorithm - /// Data hash - public virtual string CreateHash(byte[] data, string hashAlgorithm) - { - if (string.IsNullOrEmpty(hashAlgorithm)) - throw new ArgumentNullException(nameof(hashAlgorithm)); - - var algorithm = HashAlgorithm.Create(hashAlgorithm); - if (algorithm == null) - throw new ArgumentException("Unrecognized hash name"); - - var hashByteArray = algorithm.ComputeHash(data); - return BitConverter.ToString(hashByteArray).Replace("-", ""); - } - - /// - /// Encrypt text - /// - /// Text to encrypt - /// Encryption private key - /// Encrypted text - public virtual string EncryptText(string plainText, string encryptionPrivateKey = "") - { - if (string.IsNullOrEmpty(plainText)) - return plainText; - - if (string.IsNullOrEmpty(encryptionPrivateKey)) - encryptionPrivateKey = EncryptionKey;// _securitySettings.EncryptionKey; - - using (var provider = new TripleDESCryptoServiceProvider()) - { - provider.Key = Encoding.ASCII.GetBytes(encryptionPrivateKey.Substring(0, 16)); - provider.IV = Encoding.ASCII.GetBytes(encryptionPrivateKey.Substring(8, 8)); - - var encryptedBinary = EncryptTextToMemory(plainText, provider.Key, provider.IV); - return Convert.ToBase64String(encryptedBinary); - } - } - - /// - /// Decrypt text - /// - /// Text to decrypt - /// Encryption private key - /// Decrypted text - public virtual string DecryptText(string cipherText, string encryptionPrivateKey = "") - { - if (string.IsNullOrEmpty(cipherText)) - return cipherText; - - if (string.IsNullOrEmpty(encryptionPrivateKey)) - encryptionPrivateKey = EncryptionKey;// _securitySettings.EncryptionKey; - - using (var provider = new TripleDESCryptoServiceProvider()) - { - provider.Key = Encoding.ASCII.GetBytes(encryptionPrivateKey.Substring(0, 16)); - provider.IV = Encoding.ASCII.GetBytes(encryptionPrivateKey.Substring(8, 8)); - - var buffer = Convert.FromBase64String(cipherText); - return DecryptTextFromMemory(buffer, provider.Key, provider.IV); - } - } - - #endregion - } -} diff --git a/samples/Common/App.Core/Security/IEncryptionService.cs b/samples/Common/App.Core/Security/IEncryptionService.cs deleted file mode 100644 index 57c6af36c..000000000 --- a/samples/Common/App.Core/Security/IEncryptionService.cs +++ /dev/null @@ -1,48 +0,0 @@ -namespace App.Core.Security -{ - /// - /// Encryption service - /// - public interface IEncryptionService - { - /// - /// Create salt key - /// - /// Key size - /// Salt key - string CreateSaltKey(int size); - - /// - /// Create a password hash - /// - /// Password - /// Salk key - /// Password format (hash algorithm) - /// Password hash - string CreatePasswordHash(string password, string saltkey, string passwordFormat); - - /// - /// Create a data hash - /// - /// The data for calculating the hash - /// Hash algorithm - /// Data hash - string CreateHash(byte [] data, string hashAlgorithm); - - /// - /// Encrypt text - /// - /// Text to encrypt - /// Encryption private key - /// Encrypted text - string EncryptText(string plainText, string encryptionPrivateKey = ""); - - /// - /// Decrypt text - /// - /// Text to decrypt - /// Encryption private key - /// Decrypted text - string DecryptText(string cipherText, string encryptionPrivateKey = ""); - } -} diff --git a/samples/Common/Config.Core/Config.Core.csproj b/samples/Common/Config.Core/Config.Core.csproj deleted file mode 100644 index 89c8baf3a..000000000 --- a/samples/Common/Config.Core/Config.Core.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - netcoreapp2.0 - - - - - - - - - C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.extensions.configuration.fileextensions\2.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.FileExtensions.dll - - - - diff --git a/samples/Common/Config.Core/DBConfigurationExtensions.cs b/samples/Common/Config.Core/DBConfigurationExtensions.cs deleted file mode 100644 index 15a651324..000000000 --- a/samples/Common/Config.Core/DBConfigurationExtensions.cs +++ /dev/null @@ -1,101 +0,0 @@ -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.FileProviders; -using Surging.Core.CPlatform.Configurations.Remote; -using Surging.Core.CPlatform.Utilities; -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; - -namespace Config.Core.Extensions -{ - public static class DBConfigurationExtensions - { - public static IConfigurationBuilder AddDBFile(this IConfigurationBuilder builder, string path) - { - return AddDBFile(builder, provider: null, path: path, optional: false, reloadOnChange: false); - } - - public static IConfigurationBuilder AddDBFile(this IConfigurationBuilder builder, string path, bool optional) - { - return AddDBFile(builder, provider: null, path: path, optional: optional, reloadOnChange: false); - } - - public static IConfigurationBuilder AddDBFile(this IConfigurationBuilder builder, string path, bool optional, bool reloadOnChange) - { - return AddDBFile(builder, provider: null, path: path, optional: optional, reloadOnChange: reloadOnChange); - } - - public static IConfigurationBuilder AddDBFile(this IConfigurationBuilder builder, IFileProvider provider, string path, bool optional, bool reloadOnChange) - { - Check.NotNull(builder, "builder"); - Check.CheckCondition(() => string.IsNullOrEmpty(path), "path"); - if (provider == null && Path.IsPathRooted(path)) - { - provider = new PhysicalFileProvider(Path.GetDirectoryName(path)); - path = Path.GetFileName(path); - } - var source = new DBConfigurationSource - { - FileProvider = provider, - Path = path, - Optional = optional, - ReloadOnChange = reloadOnChange - }; - builder.Add(source); - DBConfig.Configuration = builder.Build(); - return builder; - } - } - public class DBConfig - { - - public static IConfiguration Configuration { get; set; } - /* static ConfigHelper() - { - configuration = AutofacContainer.Resolve(); - } - - public static IConfigurationSection GetSection(string key) - { - return configuration.GetSection(key); - } - - public static string GetConfigurationValue(string key) - { - return configuration[key]; - } - - public static string GetConfigurationValue(string section, string key) - { - return GetSection(section)?[key]; - } - - public static string GetConnectionString(string key) - { - return configuration.GetConnectionString(key); - } - */ - } - - public class DBConfigurationSource : FileConfigurationSource - { - public string ConfigurationKeyPrefix { get; set; } - - public override IConfigurationProvider Build(IConfigurationBuilder builder) - { - FileProvider = FileProvider ?? builder.GetFileProvider(); - return new DBConfigurationProvider(this); - } - } - public class DBConfigurationProvider : FileConfigurationProvider - { - public DBConfigurationProvider(DBConfigurationSource source) : base(source) { } - - public override void Load(Stream stream) - { - var parser = new JsonConfigurationParser(); - this.Data = parser.Parse(stream, null); - } - } -} diff --git a/samples/Common/DDD.Core/BaseEntity.cs b/samples/Common/DDD.Core/BaseEntity.cs deleted file mode 100644 index 9093f51b4..000000000 --- a/samples/Common/DDD.Core/BaseEntity.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Text; - -namespace DDD.Core -{ - public abstract class BaseEntity : IDBModel - { - [Key] - public Guid KeyId { get; set; } - public virtual Guid CorporationKeyId { get; set; } - public virtual DateTime CreateTime { get; set; } - public virtual Guid CreateUserKeyId { get; set; } - public virtual DateTime UpdateTime { get; set; } - public virtual Guid UpdateUserKeyId { get; set; } - public virtual bool IsDelete { get; set; } - public virtual int Version { get; set; } - - //2-12增加名字、编号 - public string Name { get; set; } - - public string No { get; set; } - - public virtual void SetEditer(Guid? editer) - { - if(this.KeyId==Guid.Empty) - { - this.CreateTime = DateTime.Now; - this.CreateUserKeyId = Guid.Empty; - this.UpdateUserKeyId = Guid.Empty; - this.UpdateTime = DateTime.Now; - } - else - { - if (editer.HasValue) - { - this.UpdateUserKeyId = editer.Value; - this.UpdateTime = DateTime.Now; - } - } - } - } -} diff --git a/samples/Common/DDD.Core/BaseValueObject.cs b/samples/Common/DDD.Core/BaseValueObject.cs deleted file mode 100644 index 91399b62b..000000000 --- a/samples/Common/DDD.Core/BaseValueObject.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Text; - -namespace DDD.Core -{ - public abstract class BaseValueObject : IDBModel - { - [Key] - public Guid KeyId { get; set; } - public virtual Guid CorporationKeyId { get; set; } - public virtual DateTime CreateTime { get; set; } - public virtual Guid CreateUserKeyId { get; set; } - public virtual DateTime UpdateTime { get; set; } - public virtual Guid UpdateUserKeyId { get; set; } - public virtual bool IsDelete { get; set; } - public virtual int Version { get; set; } - - public string Name { get; set; } - - public string No { get; set; } - } -} diff --git a/samples/Common/DDD.Core/DDD.Core.Extensions/GenericExtension.cs b/samples/Common/DDD.Core/DDD.Core.Extensions/GenericExtension.cs deleted file mode 100644 index 35919f27c..000000000 --- a/samples/Common/DDD.Core/DDD.Core.Extensions/GenericExtension.cs +++ /dev/null @@ -1,140 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Reflection; - -namespace DDD.Core.Extensions -{ - /// - /// 泛型扩展 - /// - public static class GenericExtension - { - public static bool Equal(this T x, T y) - { - return ((IComparable)(x)).CompareTo(y) == 0; - } - - #region ToDictionary - - public static Dictionary ToDictionary(this T t, Dictionary dic = null) where T : class - { - if (dic == null) - dic = new Dictionary(); - var properties = t.GetType().GetProperties(); - foreach (var property in properties) - { - var value = property.GetValue(t, null); - dic.Add(property.Name, value?.ToString() ?? ""); - } - return dic; - } - - public static Dictionary ToDictionary(this TInterface t, Dictionary dic = null) where T : class, TInterface - { - if (dic == null) - dic = new Dictionary(); - var properties = typeof(T).GetProperties(); - foreach (var property in properties) - { - var value = property.GetValue(t, null); - if (value == null) continue; - dic.Add(property.Name, value?.ToString() ?? ""); - } - return dic; - } - - #endregion - - /// - /// 将字符串转换为指定的类型，如果转换不成功，返回默认值。 - /// - /// 结构体类型或枚举类型 - /// 需要转换的字符串 - /// 返回指定的类型。 - public static T ParseTo(this string str) where T : struct - { - return str.ParseTo(default(T)); - } - - /// - /// 将字符串转换为指定的类型，如果转换不成功，返回默认值。 - /// - /// 结构体类型或枚举类型 - /// 需要转换的字符串 - /// 如果转换失败，需要使用的默认值 - /// 返回指定的类型。 - public static T ParseTo(this string str, T defaultValue) where T : struct - { - var t = str.ParseToNullable(); - if (t.HasValue) - { - return t.Value; - } - return defaultValue; - } - - /// - /// 将字符串转换为指定的类型，如果转换不成功，返回null - /// - /// 结构体类型或枚举类型 - /// 需要转换的字符串 - /// 返回指定的类型 - public static T? ParseToNullable(this string str) where T : struct - { - if (string.IsNullOrEmpty(str)) - { - return null; - } - var typeFromHandle = typeof(T); - if (typeFromHandle.IsEnum) - { - return str.ToEnum(); - } - return (T?)str.ParseTo(typeFromHandle.FullName); - } - - public static DataTable ToDataTable(this IEnumerable source) - { - DataTable dtReturn = new DataTable(); - - // column names - PropertyInfo[] oProps = null; - - if (source == null) return dtReturn; - - foreach (var rec in source) - { - // Use reflection to get property names, to create table, Only first time, others will follow - if (oProps == null) - { - oProps = rec.GetType().GetProperties(); - foreach (var pi in oProps) - { - var colType = pi.PropertyType; - - if ((colType.IsGenericType) && (colType.GetGenericTypeDefinition() == typeof(Nullable<>))) - { - colType = colType.GetGenericArguments()[0]; - } - - dtReturn.Columns.Add(new DataColumn(pi.Name, colType)); - } - } - - var dr = dtReturn.NewRow(); - - foreach (var pi in oProps) - { - dr[pi.Name] = pi.GetValue(rec, null) == null - ? DBNull.Value - : pi.GetValue - (rec, null); - } - - dtReturn.Rows.Add(dr); - } - return dtReturn; - } - } -} diff --git a/samples/Common/DDD.Core/DDD.Core.Extensions/ObjectExtension.cs b/samples/Common/DDD.Core/DDD.Core.Extensions/ObjectExtension.cs deleted file mode 100644 index 306776e06..000000000 --- a/samples/Common/DDD.Core/DDD.Core.Extensions/ObjectExtension.cs +++ /dev/null @@ -1,1181 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Data; -using System.IO; -using System.Linq; -using System.Linq.Expressions; -using System.Runtime.Serialization.Formatters.Binary; -using System.Text; -using System.Text.RegularExpressions; -using System.Web; -using System.Xml; -using System.Xml.Linq; - -namespace DDD.Core.Extensions -{ - public static class ObjectExtension - { - /// - /// 将集合转换为数据集。 - /// - /// 转换的元素类型。 - /// 集合。 - /// 是否生成泛型数据集。 - /// 数据集。 - public static DataSet ToDataSet(this IEnumerable list, bool generic = true) - { - return ListToDataSet(list, generic); - } - - /// - /// 将集合转换为数据集。 - /// - /// 集合。 - /// 是否生成泛型数据集。 - /// 数据集。 - public static DataSet ToDataSet(this IEnumerable list, bool generic = true) - { - return ListToDataSet(list, generic); - } - - /// - /// 将集合转换为数据集。 - /// - /// 转换的元素类型。 - /// 集合。 - /// 是否生成泛型数据集。 - /// 数据集。 - public static DataSet ToDataSet(this IEnumerable list, bool generic = true) - { - return ListToDataSet(list, typeof(T), generic); - } - - /// - /// 将实例转换为集合数据集。 - /// - /// 实例类型。 - /// 实例。 - /// 是否生成泛型数据集。 - /// 数据集。 - public static DataSet ToListSet(this T o, bool generic = true) - { - if (o is IEnumerable) - { - return ListToDataSet(o as IEnumerable, generic); - } - else - { - return ListToDataSet(new T[] { o }, generic); - } - } - - /// - /// 将可序列化实例转换为XmlDocument。 - /// - /// 实例类型。 - /// 实例。 - /// XmlDocument。 - public static XmlDocument ToXmlDocument(this T o) - { - XmlDocument xmlDocument = new XmlDocument(); - xmlDocument.InnerXml = o.ToListSet().GetXml(); - return xmlDocument; - } - - /// - /// 将集合转换为数据集。 - /// - /// 集合。 - /// 转换的元素类型。 - /// 是否生成泛型数据集。 - /// 转换后的数据集。 - private static DataSet ListToDataSet(IEnumerable list, Type t, bool generic) - { - DataSet ds = new DataSet("Data"); - if (t == null) - { - if (list != null) - { - foreach (var i in list) - { - if (i == null) - { - continue; - } - t = i.GetType(); - break; - } - } - if (t == null) - { - return ds; - } - } - ds.Tables.Add(t.Name); - //如果集合中元素为DataSet扩展涉及到的基本类型时，进行特殊转换。 - if (t.IsValueType || t == typeof(string)) - { - ds.Tables[0].TableName = "Info"; - ds.Tables[0].Columns.Add(t.Name); - if (list != null) - { - foreach (var i in list) - { - DataRow addRow = ds.Tables[0].NewRow(); - addRow[t.Name] = i; - ds.Tables[0].Rows.Add(addRow); - } - } - return ds; - } - //处理模型的字段和属性。 - var fields = t.GetFields(); - var properties = t.GetProperties(); - foreach (var j in fields) - { - if (!ds.Tables[0].Columns.Contains(j.Name)) - { - if (generic) - { - ds.Tables[0].Columns.Add(j.Name, j.FieldType); - } - else - { - ds.Tables[0].Columns.Add(j.Name); - } - } - } - foreach (var j in properties) - { - if (!ds.Tables[0].Columns.Contains(j.Name)) - { - if (generic) - { - ds.Tables[0].Columns.Add(j.Name, j.PropertyType); - } - else - { - ds.Tables[0].Columns.Add(j.Name); - } - } - } - if (list == null) - { - return ds; - } - //读取list中元素的值。 - foreach (var i in list) - { - if (i == null) - { - continue; - } - DataRow addRow = ds.Tables[0].NewRow(); - foreach (var j in fields) - { - MemberExpression field = Expression.Field(Expression.Constant(i), j.Name); - LambdaExpression lambda = Expression.Lambda(field, new ParameterExpression[] { }); - Delegate func = lambda.Compile(); - object value = func.DynamicInvoke(); - addRow[j.Name] = value; - } - foreach (var j in properties) - { - MemberExpression property = Expression.Property(Expression.Constant(i), j); - LambdaExpression lambda = Expression.Lambda(property, new ParameterExpression[] { }); - Delegate func = lambda.Compile(); - object value = func.DynamicInvoke(); - addRow[j.Name] = value; - } - ds.Tables[0].Rows.Add(addRow); - } - return ds; - } - - /// - /// 将集合转换为数据集。 - /// - /// 转换的元素类型。 - /// 集合。 - /// 是否生成泛型数据集。 - /// 数据集。 - private static DataSet ListToDataSet(IEnumerable list, bool generic) - { - return ListToDataSet(list, typeof(T), generic); - } - - /// - /// 将集合转换为数据集。 - /// - /// 集合。 - /// 是否转换为字符串形式。 - /// 转换后的数据集。 - private static DataSet ListToDataSet(IEnumerable list, bool generic) - { - return ListToDataSet(list, null, generic); - } - - /// - /// 获取DataSet第一表，第一行，第一列的值。 - /// - /// DataSet数据集。 - /// 值。 - public static object GetData(this DataSet ds) - { - if ( - ds == null - || ds.Tables.Count == 0 - ) - { - return string.Empty; - } - else - { - return ds.Tables[0].GetData(); - } - } - - /// - /// 获取DataTable第一行，第一列的值。 - /// - /// DataTable数据集表。 - /// 值。 - public static object GetData(this DataTable dt) - { - if ( - dt.Columns.Count == 0 - || dt.Rows.Count == 0 - ) - { - return string.Empty; - } - else - { - return dt.Rows[0][0]; - } - } - - /// - /// 获取DataSet第一个匹配columnName的值。 - /// - /// 数据集。 - /// 列名。 - /// 值。 - public static object GetData(this DataSet ds, string columnName) - { - if ( - ds == null - || ds.Tables.Count == 0 - ) - { - return string.Empty; - } - foreach (DataTable dt in ds.Tables) - { - object o = dt.GetData(columnName); - if (!string.IsNullOrEmpty(o.ToString())) - { - return o; - } - } - return string.Empty; - } - - /// - /// 获取DataTable第一个匹配columnName的值。 - /// - /// 数据表。 - /// 列名。 - /// 值。 - public static object GetData(this DataTable dt, string columnName) - { - if (string.IsNullOrEmpty(columnName)) - { - return GetData(dt); - } - if ( - dt.Columns.Count == 0 - || dt.Columns.IndexOf(columnName) == -1 - || dt.Rows.Count == 0 - ) - { - return string.Empty; - } - return dt.Rows[0][columnName]; - } - - /// - /// 将object转换为string类型信息。 - /// - /// object。 - /// 默认值。 - /// string。 - public static string ToString(this object o, string t) - { - string info = string.Empty; - if (o == null) - { - info = t; - } - else - { - info = o.ToString(); - } - return info; - } - - /// - /// 将DateTime?转换为string类型信息。 - /// - /// DateTime?。 - /// 标准或自定义日期和时间格式的字符串。 - /// 默认值。 - /// string。 - public static string ToString(this DateTime? o, string format, string t) - { - string info = string.Empty; - if (o == null) - { - info = t; - } - else - { - info = o.Value.ToString(format); - } - return info; - } - - /// - /// 将TimeSpan?转换为string类型信息。 - /// - /// TimeSpan?。 - /// 标准或自定义时间格式的字符串。 - /// 默认值。 - /// string。 - public static string ToString(this TimeSpan? o, string format, string t) - { - string info = string.Empty; - if (o == null) - { - info = t; - } - else - { - info = o.Value.ToString(format); - } - return info; - } - - /// - /// 将object转换为截取后的string类型信息。 - /// - /// object。 - /// 此实例中子字符串的起始字符位置（从零开始）。 - /// 子字符串中的字符数。 - /// 后缀。如果没有截取则不添加。 - /// 截取后的string类型信息。 - public static string ToSubString(this object o, int startIndex, int length, string suffix = null) - { - string inputString = o.ToString(string.Empty); - startIndex = Math.Max(startIndex, 0); - startIndex = Math.Min(startIndex, (inputString.Length - 1)); - length = Math.Max(length, 1); - if (startIndex + length > inputString.Length) - { - length = inputString.Length - startIndex; - } - if (inputString.Length == startIndex + length) - { - return inputString; - } - else - { - return inputString.Substring(startIndex, length) + suffix; - } - } - - /// - /// 将object转换为byte类型信息。 - /// - /// object。 - /// 默认值。 - /// byte。 - public static byte ToByte(this object o, byte t = default(byte)) - { - byte info; - if (!byte.TryParse(o.ToString(string.Empty), out info)) - { - info = t; - } - return info; - } - - public static byte[] ToBytes(this object obj) - { - if (obj == null) - return null; - var bf = new BinaryFormatter(); - using (var ms = new MemoryStream()) - { - bf.Serialize(ms, obj); - return ms.ToArray(); - } - } - - public static object ToObject(this byte[] source) - { - using (var memStream = new MemoryStream()) - { - var bf = new BinaryFormatter(); - memStream.Write(source, 0, source.Length); - memStream.Seek(0, SeekOrigin.Begin); - var obj = bf.Deserialize(memStream); - return obj; - } - } - - /// - /// 将object转换为char类型信息。 - /// - /// object。 - /// 默认值。 - /// char。 - public static char ToChar(this object o, char t = default(char)) - { - char info; - if (!char.TryParse(o.ToString(string.Empty), out info)) - { - info = t; - } - return info; - } - - /// - /// 将object转换为int类型信息。 - /// - /// object。 - /// 默认值。 - /// int。 - public static int ToInt(this object o, int t = default(int)) - { - int info; - if (!int.TryParse(o.ToString(string.Empty), out info)) - { - info = t; - } - return info; - } - - /// - /// 将object转换为double类型信息。 - /// - /// object。 - /// 默认值。 - /// double。 - public static double ToDouble(this object o, double t = default(double)) - { - double info; - if (!double.TryParse(o.ToString(string.Empty), out info)) - { - info = t; - } - return info; - } - - /// - /// 将object转换为decimal类型信息。 - /// - /// object。 - /// 默认值。 - /// decimal。 - public static decimal ToDecimal(this object o, decimal t = default(decimal)) - { - decimal info; - if (!decimal.TryParse(o.ToString(string.Empty), out info)) - { - info = t; - } - return info; - } - - /// - /// 将object转换为float类型信息。 - /// - /// object。 - /// 默认值。 - /// float。 - public static float ToFloat(this object o, float t = default(float)) - { - float info; - if (!float.TryParse(o.ToString(string.Empty), out info)) - { - info = t; - } - return info; - } - - /// - /// 将object转换为long类型信息。 - /// - /// object。 - /// 默认值。 - /// long。 - public static long ToLong(this object o, long t = default(long)) - { - long info; - if (!long.TryParse(o.ToString(string.Empty), out info)) - { - info = t; - } - return info; - } - - /// - /// 将object转换为bool类型信息。 - /// - /// object。 - /// 默认值。 - /// bool。 - public static bool ToBool(this object o, bool t = default(bool)) - { - bool info; - if (!bool.TryParse(o.ToString(string.Empty), out info)) - { - info = t; - } - return info; - } - - /// - /// 将object转换为sbyte类型信息。 - /// - /// object。 - /// 默认值。 - /// sbyte。 - public static sbyte ToSbyte(this object o, sbyte t = default(sbyte)) - { - sbyte info; - if (!sbyte.TryParse(o.ToString(string.Empty), out info)) - { - info = t; - } - return info; - } - - /// - /// 将object转换为short类型信息。 - /// - /// object。 - /// 默认值。 - /// short。 - public static short ToShort(this object o, short t = default(short)) - { - short info; - if (!short.TryParse(o.ToString(string.Empty), out info)) - { - info = t; - } - return info; - } - - /// - /// 将object转换为ushort类型信息。 - /// - /// object。 - /// 默认值。 - /// ushort。 - public static ushort ToUShort(this object o, ushort t = default(ushort)) - { - ushort info; - if (!ushort.TryParse(o.ToString(string.Empty), out info)) - { - info = t; - } - return info; - } - - /// - /// 将object转换为ulong类型信息。 - /// - /// object。 - /// 默认值。 - /// ulong。 - public static ulong ToULong(this object o, ulong t = default(ulong)) - { - ulong info; - if (!ulong.TryParse(o.ToString(string.Empty), out info)) - { - info = t; - } - return info; - } - - /// - /// 将object转换为Enum[T]类型信息。 - /// - /// object。 - /// 默认值。 - /// Enum[T]。 - public static T ToEnum(this object o, T t = default(T)) - where T : struct - { - T info; - if (!Enum.TryParse(o.ToString(string.Empty), out info)) - { - info = t; - } - return info; - } - - /// - /// 将object转换为DateTime类型信息。 - /// - /// object。 - /// 默认值。 - /// DateTime。 - public static DateTime ToDateTime(this object o, DateTime t = default(DateTime)) - { - if (t == default(DateTime)) - { - t = new DateTime(1753, 1, 1); - } - DateTime info; - if (!DateTime.TryParse(o.ToString(string.Empty), out info)) - { - info = t; - } - return info; - } - - /// - /// 将object转换为TimeSpan类型信息。 - /// - /// object。 - /// 默认值。 - /// TimeSpan。 - public static TimeSpan ToTimeSpan(this object o, TimeSpan t = default(TimeSpan)) - { - if (t == default(TimeSpan)) - { - t = new TimeSpan(0, 0, 0); - } - TimeSpan info; - if (!TimeSpan.TryParse(o.ToString(string.Empty), out info)) - { - info = t; - } - return info; - } - - /// - /// 将object转换为Guid类型信息。 - /// - /// object。 - /// 默认值。 - /// Guid。 - public static Guid ToGuid(this object o, Guid t = default(Guid)) - { - Guid info; - if (!Guid.TryParse(o.ToString(string.Empty), out info)) - { - info = t; - } - return info; - } - - private static Regex BoolRegex = new Regex("(?(true|false))", RegexOptions.IgnoreCase | RegexOptions.Singleline); - - /// - /// 从object中获取bool类型信息。 - /// - /// object。 - /// bool。 - public static bool? GetBool(this object o) - { - bool info; - if (!bool.TryParse(BoolRegex.Match(o.ToString(string.Empty)).Groups["info"].Value, out info)) - { - return null; - } - return info; - } - - private static Regex IntRegex = new Regex("(?-?\\d+)", RegexOptions.IgnoreCase | RegexOptions.Singleline); - - /// - /// 从object中获取int类型信息。 - /// - /// object。 - /// int。 - public static int? GetInt(this object o) - { - int info; - if (!int.TryParse(IntRegex.Match(o.ToString(string.Empty)).Groups["info"].Value, out info)) - { - return null; - } - return info; - } - - private static Regex DecimalRegex = new Regex("(?-?\\d+(\\.\\d+)?)", RegexOptions.IgnoreCase | RegexOptions.Singleline); - - /// - /// 从object中获取decimal类型信息。 - /// - /// object。 - /// decimal。 - public static decimal? GetDecimal(this object o) - { - decimal info; - if (!decimal.TryParse(DecimalRegex.Match(o.ToString(string.Empty)).Groups["info"].Value, out info)) - { - return null; - } - return info; - } - - /// - /// 从object中获取double类型信息。 - /// - /// object。 - /// double。 - public static double? GetDouble(this object o) - { - double info; - if (!double.TryParse(DecimalRegex.Match(o.ToString(string.Empty)).Groups["info"].Value, out info)) - { - return null; - } - return info; - } - - /// - /// 从object中获取正数信息。 - /// - /// object。 - /// decimal。 - public static decimal? GetPositiveNumber(this object o) - { - decimal info; - if (!decimal.TryParse(DecimalRegex.Match(o.ToString(string.Empty)).Groups["info"].Value, out info)) - { - return null; - } - return Math.Abs(info); - } - - private static Regex DateTimeRegex = new Regex("(?(((\\d+)[/年-](0?[13578]|1[02])[/月-](3[01]|[12]\\d|0?\\d)[日]?)|((\\d+)[/年-](0?[469]|11)[/月-](30|[12]\\d|0?\\d)[日]?)|((\\d+)[/年-]0?2[/月-](2[0-8]|1\\d|0?\\d)[日]?))(\\s((2[0-3]|[0-1]\\d)):[0-5]\\d:[0-5]\\d)?)", RegexOptions.IgnoreCase | RegexOptions.Singleline); - - /// - /// 从object中获取DateTime?类型信息。 - /// - /// object。 - /// DateTime?。 - public static DateTime? GetDateTime(this object o) - { - DateTime info; - if (!DateTime.TryParse(DateTimeRegex.Match(o.ToString(string.Empty)).Groups["info"].Value.Replace("年", "-").Replace("月", "-").Replace("/", "-").Replace("日", ""), out info)) - { - return null; - } - return info; - } - - private static Regex TimeSpanRegex = new Regex("(?-?(\\d+\\.(([0-1]\\d)|(2[0-3])):[0-5]\\d:[0-5]\\d)|((([0-1]\\d)|(2[0-3])):[0-5]\\d:[0-5]\\d)|(\\d+))", RegexOptions.IgnoreCase | RegexOptions.Singleline); - - /// - /// 从object中获取TimeSpan?类型信息。 - /// - /// object。 - /// TimeSpan?。 - public static TimeSpan? GetTimeSpan(this object o) - { - TimeSpan info; - if (!TimeSpan.TryParse(TimeSpanRegex.Match(o.ToString(string.Empty)).Groups["info"].Value, out info)) - { - return null; - } - return info; - } - - private static Regex GuidRegex = new Regex("(?\\{{0,1}([0-9a-fA-F]){8}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){12}\\}{0,1})", RegexOptions.IgnoreCase | RegexOptions.Singleline); - - /// - /// 从object中获取Guid?类型信息。 - /// - /// object。 - /// Guid?。 - public static Guid? GetGuid(this object o) - { - Guid info; - if (!Guid.TryParse(GuidRegex.Match(o.ToString(string.Empty)).Groups["info"].Value, out info)) - { - return null; - } - return info; - } - - /// - /// 将object转换为SqlServer中的DateTime?类型信息。 - /// - /// object。 - /// 默认值。 - /// DateTime?。 - public static DateTime? GetSqlDateTime(this object o, DateTime t = default(DateTime)) - { - DateTime info; - if (!DateTime.TryParse(o.ToString(string.Empty), out info)) - { - info = t; - } - if (info < new DateTime(1753, 1, 1) || info > new DateTime(9999, 12, 31)) - { - return null; - } - return info; - } - - /// - /// 读取XElement节点的文本内容。 - /// - /// XElement节点。 - /// 默认值。 - /// 文本内容。 - public static string Value(this XElement xElement, string t = default(string)) - { - if (xElement == null) - { - return t; - } - else - { - return xElement.Value; - } - } - - /// - /// 获取与指定键相关的值。 - /// - /// 键类型。 - /// 值类型。 - /// 表示键/值对象的泛型集合。 - /// 键。 - /// 默认值。 - /// 值。 - public static TValue GetValue(this IDictionary dictionary, TKey key, TValue t = default(TValue)) - { - TValue value = default(TValue); - if (dictionary == null || key == null) - { - return t; - } - if (!dictionary.TryGetValue(key, out value)) - { - value = t; - } - return value; - } - - /// - /// 获取与指定键相关或者第一个的值。 - /// - /// 键类型。 - /// 值类型。 - /// 表示键/值对象的泛型集合。 - /// 键。 - /// 默认值。 - /// 值。 - public static TValue GetFirstOrDefaultValue(this IDictionary dictionary, TKey key, TValue t = default(TValue)) - { - TValue value = default(TValue); - if (dictionary == null || key == null) - { - return t; - } - if (!dictionary.TryGetValue(key, out value)) - { - if (dictionary.Count() == 0) - { - value = t; - } - else - { - value = dictionary.FirstOrDefault().Value; - } - } - return value; - } - - /// - /// 获取具有指定 System.Xml.Linq.XName 的第一个（按文档顺序）子元素。 - /// - /// XContainer。 - /// 要匹配的 System.Xml.Linq.XName。 - /// 是否返回同名默认值。 - /// 与指定 System.Xml.Linq.XName 匹配的 System.Xml.Linq.XElement，或者为 null。 - public static XElement Element(this XContainer xContainer, XName xName, bool t) - { - XElement info; - if (xContainer == null) - { - info = null; - } - else - { - info = xContainer.Element(xName); - } - if (t && info == null) - { - info = new XElement(xName); - } - return info; - } - - /// - /// 按文档顺序返回此元素或文档的子元素集合。 - /// - /// XContainer。 - /// 是否返回非空默认值。 - /// System.Xml.Linq.XElement 的按文档顺序包含此System.Xml.Linq.XContainer 的子元素，或者非空默认值。 - public static IEnumerable Elements(this XContainer xContainer, bool t) - { - IEnumerable info; - if (xContainer == null) - { - info = null; - } - else - { - info = xContainer.Elements(); - } - if (t && info == null) - { - info = new List(); - } - return info; - } - - /// - /// 按文档顺序返回此元素或文档的经过筛选的子元素集合。集合中只包括具有匹配 System.Xml.Linq.XName 的元素。 - /// - /// XContainer。 - /// 要匹配的 System.Xml.Linq.XName。 - /// 是否返回非空默认值。 - /// System.Xml.Linq.XElement 的按文档顺序包含具有匹配System.Xml.Linq.XName 的 System.Xml.Linq.XContainer 的子级，或者非空默认值。 - public static IEnumerable Elements(this XContainer xContainer, XName xName, bool t) - { - IEnumerable info; - if (xContainer == null) - { - info = null; - } - else - { - info = xContainer.Elements(xName); - } - if (t && info == null) - { - info = new List(); - } - return info; - } - - /// - /// 删除html标签。 - /// - /// 输入的字符串。 - /// 没有html标签的字符串。 - public static string RemoveHTMLTags(this string html) - { - return Regex.Replace(Regex.Replace(Regex.Replace((html ?? string.Empty).Replace(" ", " ").Replace("\r\n", " ").Replace("\n", " ").Replace("\r", " ").Replace("\t", " "), "<\\/?[^>]+>", "\r\n"), "(\r\n)+", "\r\n"), "(\\s)+", " ").Trim(); - } - - /// - /// 字符串转换为文件名。 - /// - /// 字符串。 - /// 文件名。 - public static string ToFileName(this string s) - { - return Regex.Replace(s.ToString(string.Empty), @"[\\/:*?<>|]", "_").Replace("\t", " ").Replace("\r\n", " ").Replace("\"", " "); - } - - /// - /// 获取星期一的日期。 - /// - /// 日期。 - /// 星期一的日期。 - public static DateTime? GetMonday(this DateTime dateTime) - { - return dateTime.AddDays(-1 * (int)dateTime.AddDays(-1).DayOfWeek).ToString("yyyy-MM-dd").GetDateTime(); - } - - /// - /// 获取默认非空字符串。 - /// - /// 首选默认非空字符串。 - /// 依次非空字符串可选项。 - /// 默认非空字符串。若无可选项则返回string.Empty。 - public static string DefaultStringIfEmpty(this string s, params string[] args) - { - if (string.IsNullOrEmpty(s)) - { - foreach (string i in args) - { - if (!string.IsNullOrEmpty(i) && !string.IsNullOrEmpty(i.Trim())) - { - return i; - } - } - } - return (s ?? string.Empty); - } - - /// - /// 对 URL 字符串进行编码。 - /// - /// 要编码的文本。 - /// 匹配要编码的文本。 - /// 指定编码方案的 System.Text.Encoding 对象。 - /// 一个已编码的字符串。 - public static string ToUrlEncodeString(this string s, Regex regex = default(Regex), Encoding encoding = null) - { - if (encoding == null) - { - encoding = Encoding.UTF8; - } - if (regex == null) - { - return HttpUtility.UrlEncode(s, encoding); - } - List l = new List(); - foreach (char i in s) - { - string t = i.ToString(); - l.Add(regex.IsMatch(t) ? HttpUtility.UrlEncode(t, encoding) : t); - } - return string.Join(string.Empty, l); - } - - /// - /// 对 URL 字符串进行编码。 - /// - /// 要编码的文本。 - /// 匹配要编码的文本。 - /// 指定编码方案的 System.Text.Encoding 对象。 - /// 一个已编码的字符串。 - public static string ToUrlEncodeString(this string s, string regex, Encoding encoding = null) - { - return ToUrlEncodeString(s, new Regex(regex), encoding); - } - - /// - /// 将日期转换为UNIX时间戳字符串 - /// - /// - /// - public static string ToUnixTimeStamp(this DateTime date) - { - DateTime startTime = TimeZoneInfo.ConvertTimeToUtc(new DateTime(1970, 1, 1)); - string timeStamp = date.Subtract(startTime).Ticks.ToString(); - return timeStamp.Substring(0, timeStamp.Length - 7); - } - - private static Regex MobileRegex = new Regex("^1[3|4|5|7|8][0-9]\\d{4,8}$"); - private static Regex EmailRegex = new Regex("^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((\\.[a-zA-Z0-9_-]{2,3}){1,2})$"); - - /// - /// 判断当前字符串是否是移动电话号码 - /// - /// - /// - public static bool IsMobile(this string mobile) - { - return MobileRegex.IsMatch(mobile); - } - - /// - /// 判断当前字符串是否为邮箱 - /// - /// - /// - public static bool IsEmail(this string email) - { - return EmailRegex.IsMatch(email); - } - } - - /// - /// 结果。 - /// - /// 结果返回值类型。 - public class Result - { - /// - /// 标记。 - /// - public Flag Flag { get; set; } - - /// - /// 返回值。 - /// - public T Return { get; set; } - - /// - /// 消息。 - /// - public string Message { get; set; } - - /// - /// 异常。 - /// - public Exception Exception { get; set; } - - /// - /// 时间。 - /// - public DateTime DateTime { get; set; } - - /// - /// 整型数据。 - /// - public int Int { get; set; } - - /// - /// 浮点数据。 - /// - public decimal Decimal { get; set; } - - /// - /// 布尔数据。 - /// - public bool Bool { get; set; } - - /// - /// 对象。 - /// - public object Object { get; set; } - } - - /// - /// 标记。 - /// - public enum Flag - { - /// - /// 默认。 - /// - Default, - - /// - /// 真。 - /// - True, - - /// - /// 假。 - /// - False - } -} \ No newline at end of file diff --git a/samples/Common/DDD.Core/DDD.Core.Extensions/StringExtensions.cs b/samples/Common/DDD.Core/DDD.Core.Extensions/StringExtensions.cs deleted file mode 100644 index b1c191880..000000000 --- a/samples/Common/DDD.Core/DDD.Core.Extensions/StringExtensions.cs +++ /dev/null @@ -1,247 +0,0 @@ -using System; -using System.Text.RegularExpressions; - -namespace DDD.Core.Extensions -{ - public static class StringExtensions - { - public static object ParseTo(this string str, string type) - { - switch (type) - { - case "System.Boolean": - return ToBoolean(str); - case "System.SByte": - return ToSByte(str); - case "System.Byte": - return ToByte(str); - case "System.UInt16": - return ToUInt16(str); - case "System.Int16": - return ToInt16(str); - case "System.uInt32": - return ToUInt32(str); - case "System.Int32": - return str.ToInt32(); - case "System.UInt64": - return ToUInt64(str); - case "System.Int64": - return ToInt64(str); - case "System.Single": - return ToSingle(str); - case "System.Double": - return ToDouble(str); - case "System.Decimal": - return ToDecimal(str); - case "System.DateTime": - return ToDateTime(str); - case "System.Guid": - return ToGuid(str); - } - throw new NotSupportedException(string.Format("The string of \"{0}\" can not be parsed to {1}", str, type)); - } - - public static sbyte? ToSByte(this string value) - { - sbyte value2; - if (sbyte.TryParse(value, out value2)) - { - return value2; - } - return null; - } - - public static byte? ToByte(this string value) - { - byte value2; - if (byte.TryParse(value, out value2)) - { - return value2; - } - return null; - } - - public static ushort? ToUInt16(this string value) - { - ushort value2; - if (ushort.TryParse(value, out value2)) - { - return value2; - } - return null; - } - - public static short? ToInt16(this string value) - { - short value2; - if (short.TryParse(value, out value2)) - { - return value2; - } - return null; - } - - public static uint? ToUInt32(this string value) - { - uint value2; - if (uint.TryParse(value, out value2)) - { - return value2; - } - return null; - } - - public static ulong? ToUInt64(this string value) - { - ulong value2; - if (ulong.TryParse(value, out value2)) - { - return value2; - } - return null; - } - - public static long? ToInt64(this string value) - { - long value2; - if (long.TryParse(value, out value2)) - { - return value2; - } - return null; - } - - public static float? ToSingle(this string value) - { - float value2; - if (float.TryParse(value, out value2)) - { - return value2; - } - return null; - } - - public static double? ToDouble(this string value) - { - double value2; - if (double.TryParse(value, out value2)) - { - return value2; - } - return null; - } - - public static decimal? ToDecimal(this string value) - { - decimal value2; - if (decimal.TryParse(value, out value2)) - { - return value2; - } - return null; - } - - public static bool? ToBoolean(this string value) - { - bool value2; - if (bool.TryParse(value, out value2)) - { - return value2; - } - return null; - } - - public static T? ToEnum(this string str) where T : struct - { - T t; - if (Enum.TryParse(str, true, out t) && Enum.IsDefined(typeof(T), t)) - { - return t; - } - return null; - } - - public static Guid? ToGuid(this string str) - { - Guid value; - if (Guid.TryParse(str, out value)) - { - return value; - } - return null; - } - - public static DateTime? ToDateTime(this string value) - { - DateTime value2; - if (DateTime.TryParse(value, out value2)) - { - return value2; - } - return null; - } - - public static int? ToInt32(this string input) - { - if (string.IsNullOrEmpty(input)) - { - return null; - } - int value; - if (int.TryParse(input, out value)) - { - return value; - } - return null; - } - - /// - /// 替换空格字符 - /// - /// - /// 替换为该字符 - /// 替换后的字符串 - public static string ReplaceWhitespace(this string input, string replacement = "") - { - return string.IsNullOrEmpty(input) ? null : Regex.Replace(input, "\\s", replacement, RegexOptions.Compiled); - } - - /// - /// 返回一个值，该值指示指定的 String 对象是否出现在此字符串中。 - /// - /// - /// 要搜寻的字符串。 - /// 指定搜索规则的枚举值之一。 - /// 如果 value 参数出现在此字符串中则为 true；否则为 false。 - public static bool Contains(this string source, string value, - StringComparison comparisonType = StringComparison.OrdinalIgnoreCase) - { - return source.IndexOf(value, comparisonType) >= 0; - } - - /// - /// 清除 Html 代码，并返回指定长度的文本。(连续空行或空格会被替换为一个) - /// - /// - /// 返回的文本长度（为0返回所有文本） - /// - public static string StripHtml(this string text, int maxLength = 0) - { - if (string.IsNullOrEmpty(text)) return string.Empty; - text = text.Trim(); - - text = Regex.Replace(text, "[\\r\\n]{2,}", "<&rn>"); //替换回车和换行为<&rn>，防止下一行代码替换空格的时候被替换掉 - text = Regex.Replace(text, "[\\s]{2,}", " "); //替换 2 个以上的空格为 1 个 - text = Regex.Replace(text, "(<&rn>)+", "\n"); //还原 <&rn> 为 \n - text = Regex.Replace(text, "(\\s*&[n|N][b|B][s|S][p|P];\\s*)+", " "); //  - - text = Regex.Replace(text, "(<[b|B][r|R]/*>)+|(<[p|P](.|\\n)*?>)", "\n"); //
- text = Regex.Replace(text, "<(.|\n)+?>", " ", RegexOptions.IgnoreCase); //any other tags - - if (maxLength > 0 && text.Length > maxLength) - text = text.Substring(0, maxLength); - - return text; - } - } -} diff --git a/samples/Common/DDD.Core/DDD.Core.csproj b/samples/Common/DDD.Core/DDD.Core.csproj deleted file mode 100644 index 3cfd4024c..000000000 --- a/samples/Common/DDD.Core/DDD.Core.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - netstandard2.0 - - - - - - - - - - - - - C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.extensions.configuration.abstractions\2.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll - - - C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.extensions.fileproviders.physical\2.0.0\lib\netstandard2.0\Microsoft.Extensions.FileProviders.Physical.dll - - - - diff --git a/samples/Common/DDD.Core/IAggregate.cs b/samples/Common/DDD.Core/IAggregate.cs deleted file mode 100644 index 0edd419b1..000000000 --- a/samples/Common/DDD.Core/IAggregate.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; - -namespace DDD.Core -{ - - /// Represents an aggregate root. - /// - public abstract class IAggregate: IDBModel - { - [Key] - public virtual Guid KeyId { get; set; } - /// - /// 归属公司 - /// - public virtual Guid CorporationKeyId { get; set; } - public DateTime CreateTime { get; set; } - public Guid CreateUserKeyId { get; set; } - public DateTime UpdateTime { get; set; } - public Guid UpdateUserKeyId { get; set; } - public bool IsDelete { get; set; } - public int Version { get; set; } - - public string Name { get; set; } - - public string No { get; set; } - } -} diff --git a/samples/Common/DDD.Core/IQueryOnlyRepository.cs b/samples/Common/DDD.Core/IQueryOnlyRepository.cs deleted file mode 100644 index 0d17da9b7..000000000 --- a/samples/Common/DDD.Core/IQueryOnlyRepository.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Text; - -namespace DDD.Core -{ - /// - /// 只读的查询资源库接口 - /// - public interface IQueryOnlyRepository where T : class,IDBModel - { - - int Count(Expression> @where = null); - - bool Exist(Expression> @where = null); - bool Exist(Expression> @where = null, params Expression>[] includes); - int ExecuteSqlWithNonQuery(string sql, params object[] parameters); - T GetSingle(TKey key); - T GetSingle(TKey key, params Expression>[] includes); - T GetSingle(Expression> @where = null); - T GetSingle(Expression> @where = null, params Expression>[] includes); - IQueryable Get(Expression> @where = null); - IQueryable Get(Expression> @where = null, params Expression>[] includes); - IEnumerable GetByPagination(Expression> @where, int pageSize, int pageIndex, - Expression>[] include,bool asc = true, params Func[] @orderby); - - IList SqlQuery(string sql, params object[] parameters) where TView : class, new(); - - - } -} diff --git a/samples/Common/DDD.Core/IRepository.cs b/samples/Common/DDD.Core/IRepository.cs deleted file mode 100644 index 8d0d5ac01..000000000 --- a/samples/Common/DDD.Core/IRepository.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; - -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Text; - -namespace DDD.Core -{ - public interface IDBModel - { - TKey KeyId { get; set; } - - TKey CorporationKeyId { get; set; } - DateTime CreateTime { get; set; } - TKey CreateUserKeyId { get; set; } - DateTime UpdateTime { get; set; } - TKey UpdateUserKeyId { get; set; } - bool IsDelete { get; set; } - int Version { get; set; } - - - } - public interface IRepository: IUnitOfWork where T : IAggregate - { - void Add(T aggregate); //where T : IAggregate; - T FindBy(TKey key); //where T : IAggregate; - void Update(T aggregate); //where T : IAggregate; - void Delete(TKey key); - - - } -} diff --git a/samples/Common/DDD.Core/IUnitOfWork.cs b/samples/Common/DDD.Core/IUnitOfWork.cs deleted file mode 100644 index d687b586b..000000000 --- a/samples/Common/DDD.Core/IUnitOfWork.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; - -namespace DDD.Core -{ - public interface IUnitOfWork: IDisposable - { - #region for transaction - /// - /// 提交一个聚合内的所有变更 - /// - /// - /// If the entity have fixed properties and any optimistic concurrency problem exists, - /// then an exception is thrown - /// - int Commit(); - - - #endregion - - // int SaveChanges(); - //int SaveChangesAsync(); - - } -} diff --git a/samples/Common/DTO.Core/BasePagedRequestDto.cs b/samples/Common/DTO.Core/BasePagedRequestDto.cs deleted file mode 100644 index 03a9bbd71..000000000 --- a/samples/Common/DTO.Core/BasePagedRequestDto.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace DTO.Core -{ - public class BasePagedRequestDto: BaseRequestDto - { - /// - /// 页码号，从1开始，可空(返回全部记录) - /// - public int PageIndex { get; set; } - - /// - /// 每页显示的记录数，可空(返回全部记录) - /// - public int PageSize { get; set; } - } -} diff --git a/samples/Common/DTO.Core/BaseRequestDto.cs b/samples/Common/DTO.Core/BaseRequestDto.cs deleted file mode 100644 index 9220bf810..000000000 --- a/samples/Common/DTO.Core/BaseRequestDto.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace DTO.Core -{ - /// - /// 接口参数 dto抽象基类 - /// - public abstract class BaseRequestDto : BaseDto - { - /// - /// 服务访问身份信息 - /// - public TokenDto Identify { get; set; } - - - } - /// - /// 实体的增、删、改 - /// - public class EntityCUDReq : BaseRequestDto - { - public Guid? KeyId { get; set; } - } - /// - /// 实体上的命令 - /// - public class EntityCMDReq : BaseRequestDto - { - - } - - /// - /// 简单的请求 - /// 参数不确定 - /// - public class CommonCMDReq : BaseRequestDto - { - public string CommonCMD { get; set; } - } - - - /// - /// 树形列表的搜索 - /// - public class BaseTreeSearchReq : BaseRequestDto - { - /// - /// 搜索条件 - /// - public string SearchKey { get; set; } - - } -} diff --git a/samples/Common/DTO.Core/BaseResponseDto.cs b/samples/Common/DTO.Core/BaseResponseDto.cs deleted file mode 100644 index 4cada02d1..000000000 --- a/samples/Common/DTO.Core/BaseResponseDto.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace DTO.Core -{ - public class BaseResponseDto:BaseDto - { - /// - /// 请求结果,请求成功/失败 - /// - public bool OperateFlag { get; set; } - - /// - /// 服务端错误信息 - /// - public string FlagErrorMsg { get; set; } - - - } - - public class BaseTreeResponseDto: BaseResponseDto - { - public List Tree { get; set; } - } - - public class BaseTreeDto - { - public string Id { get; set; } - public string PId { get; set; } - public string Name { get; set; } - } - - public class BaseListResponseDto : BaseResponseDto - { - public dynamic Result { get; set; } - } - -} diff --git a/samples/Common/DTO.Core/BaseSearchCriteriaDto.cs b/samples/Common/DTO.Core/BaseSearchCriteriaDto.cs deleted file mode 100644 index a9e983098..000000000 --- a/samples/Common/DTO.Core/BaseSearchCriteriaDto.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace DTO.Core -{ - public abstract class BaseSearchCriteriaDto : BaseDto - { - - } -} diff --git a/samples/Common/DTO.Core/BaseSortCriteriaDto.cs b/samples/Common/DTO.Core/BaseSortCriteriaDto.cs deleted file mode 100644 index bb0b01142..000000000 --- a/samples/Common/DTO.Core/BaseSortCriteriaDto.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace DTO.Core -{ - /// - /// 搜索条件排序基类Dto。 - /// - public abstract class BaseSortCriteriaDto : BaseDto - { - /// - /// 创建时间 - /// - - public static readonly string CREATE_TIME = "CreateTime"; - - /// - /// 修改时间 - /// - - public static readonly string UPDATE_TIME = "UpdateTime"; - - /// - /// 正向/反向排序 - /// - - public bool Ascending { set; get; } - - /// - /// 排序名称 - /// - - public string SortPropertyName { set; get; } - } -} diff --git a/samples/Common/DTO.Core/DTO.Core.csproj b/samples/Common/DTO.Core/DTO.Core.csproj deleted file mode 100644 index 5766db614..000000000 --- a/samples/Common/DTO.Core/DTO.Core.csproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - netcoreapp2.0 - - - diff --git a/samples/Common/DTO.Core/IdentifyDto.cs b/samples/Common/DTO.Core/IdentifyDto.cs deleted file mode 100644 index 61a276b6e..000000000 --- a/samples/Common/DTO.Core/IdentifyDto.cs +++ /dev/null @@ -1,89 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace DTO.Core -{ - public abstract class BaseDto - { - - } - public class TokenDto: BaseDto - { - /// - /// 员工编号 - /// - public string Token { get; set; } - public Guid CorporationKeyId { get; set; } - - } - public class IdentifyDto : BaseDto - { - /// - /// 当前用户keyId - /// - - public Guid UserKeyId { get; set; } - - /// - /// 当前用户名 - /// - - public string UserName { get; set; } - - /// - /// 当前用户部门keyId - /// - - public Guid DepartmentKeyId { get; set; } - - /// - /// 部门编号 - /// - - public string DepartmentNo { get; set; } - - /// - /// 当前用户部门名称 - /// - - public string DepartmentName { get; set; } - - /// - /// 当前用户所属公司keyId - /// - - public Guid CorporationKeyId { get; set; } - - - /// - /// 用户登录方式 - /// - - public string LoginType { get; set; } - - /// - /// 用户账号 - /// - - public string UserNo { get; set; } - - /// - /// 当前用户手机号 - /// - - public string UserPhone { get; set; } - - /// - /// 角色code - /// - - public string RoleCode { get; set; } - - /// - /// 角色名称 - /// - - public string RoleName { get; set; } - } - } diff --git a/samples/Common/DTO.Core/KeyIdReq.cs b/samples/Common/DTO.Core/KeyIdReq.cs deleted file mode 100644 index aebc1b302..000000000 --- a/samples/Common/DTO.Core/KeyIdReq.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace DTO.Core -{ - public class KeyIdReq:BaseRequestDto - { - public Guid KeyId { get; set; } - } -} diff --git a/samples/Common/DTO.Core/OperateResultDto.cs b/samples/Common/DTO.Core/OperateResultDto.cs deleted file mode 100644 index a8a88f3f4..000000000 --- a/samples/Common/DTO.Core/OperateResultDto.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace DTO.Core -{ - public class OperateResultRsp : BaseResponseDto - { - /// - /// 操作结果 - /// - public string OperateResult { get; set; } - - } -} diff --git a/samples/Common/Repository.Dapper.Core/BaseImpQueryOnlyRepository.cs b/samples/Common/Repository.Dapper.Core/BaseImpQueryOnlyRepository.cs deleted file mode 100644 index 614dbd9a3..000000000 --- a/samples/Common/Repository.Dapper.Core/BaseImpQueryOnlyRepository.cs +++ /dev/null @@ -1,72 +0,0 @@ -using DDD.Core; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Text; - -namespace Repository.Dapper.Core -{ - public class BaseImpQueryOnlyRepository : IQueryOnlyRepository where T : class, IDBModel - { - public int Count(Expression> where = null) - { - throw new NotImplementedException(); - } - - public int ExecuteSqlWithNonQuery(string sql, params object[] parameters) - { - throw new NotImplementedException(); - } - - public bool Exist(Expression> where = null) - { - throw new NotImplementedException(); - } - - public bool Exist(Expression> where = null, params Expression>[] includes) - { - throw new NotImplementedException(); - } - - public IQueryable Get(Expression> where = null) - { - throw new NotImplementedException(); - } - - public IQueryable Get(Expression> where = null, params Expression>[] includes) - { - throw new NotImplementedException(); - } - - public IEnumerable GetByPagination(Expression> where, int pageSize, int pageIndex, Expression>[] include, bool asc = true, params Func[] orderby) - { - throw new NotImplementedException(); - } - - public T GetSingle(Guid key) - { - throw new NotImplementedException(); - } - - public T GetSingle(Guid key, params Expression>[] includes) - { - throw new NotImplementedException(); - } - - public T GetSingle(Expression> where = null) - { - throw new NotImplementedException(); - } - - public T GetSingle(Expression> where = null, params Expression>[] includes) - { - throw new NotImplementedException(); - } - - public IList SqlQuery(string sql, params object[] parameters) where TView : class, new() - { - throw new NotImplementedException(); - } - } -} diff --git a/samples/Common/Repository.Dapper.Core/BaseImpRepository.cs b/samples/Common/Repository.Dapper.Core/BaseImpRepository.cs deleted file mode 100644 index a22e182ad..000000000 --- a/samples/Common/Repository.Dapper.Core/BaseImpRepository.cs +++ /dev/null @@ -1,40 +0,0 @@ -using DDD.Core; -using System; -using System.Collections.Generic; -using System.Text; - -namespace Repository.Dapper.Core -{ - public class BaseImpRepository : IRepository where T : IAggregate - { - public void Add(T aggregate) - { - throw new NotImplementedException(); - } - - public int Commit() - { - throw new NotImplementedException(); - } - - public void Delete(Guid key) - { - throw new NotImplementedException(); - } - - public void Dispose() - { - throw new NotImplementedException(); - } - - public T FindBy(Guid key) - { - throw new NotImplementedException(); - } - - public void Update(T aggregate) - { - throw new NotImplementedException(); - } - } -} diff --git a/samples/Common/Repository.Dapper.Core/DapperExtensions.cs b/samples/Common/Repository.Dapper.Core/DapperExtensions.cs deleted file mode 100644 index 61b4a2146..000000000 --- a/samples/Common/Repository.Dapper.Core/DapperExtensions.cs +++ /dev/null @@ -1,567 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Linq; -using System.Reflection; -using System.Text; -using Repository.Dapper.Core.Sql; -using Repository.Dapper.Core.Mapper; -using System.Text.RegularExpressions; -using System.Threading.Tasks; - -namespace Repository.Dapper.Core -{ - public static class DapperExtensions - { - #region other - private readonly static object _lock = new object(); - - private static Func _instanceFactory; - private static IDapperImplementor _instance; - private static IDapperExtensionsConfiguration _configuration; - - /// - /// Gets or sets the default class mapper to use when generating class maps. If not specified, AutoClassMapper is used. - /// Repository.Dapper.Core.Configure(Type, IList, ISqlDialect) can be used instead to set all values at once - /// - public static Type DefaultMapper - { - get - { - return _configuration.DefaultMapper; - } - - set - { - Configure(value, _configuration.MappingAssemblies, _configuration.Dialect); - } - } - - /// - /// Gets or sets the type of sql to be generated. - /// DapperExtensions.Configure(Type, IList, ISqlDialect) can be used instead to set all values at once - /// - public static ISqlDialect SqlDialect - { - get - { - return _configuration.Dialect; - } - - set - { - Configure(_configuration.DefaultMapper, _configuration.MappingAssemblies, value); - } - } - - /// - /// Get or sets the Dapper Extensions Implementation Factory. - /// - public static Func InstanceFactory - { - get - { - if (_instanceFactory == null) - { - _instanceFactory = config => new DapperImplementor(new SqlGeneratorImpl(config)); - } - - return _instanceFactory; - } - set - { - _instanceFactory = value; - Configure(_configuration.DefaultMapper, _configuration.MappingAssemblies, _configuration.Dialect); - } - } - - /// - /// Gets the Dapper Extensions Implementation - /// - private static IDapperImplementor Instance - { - get - { - if (_instance == null) - { - lock (_lock) - { - if (_instance == null) - { - _instance = InstanceFactory(_configuration); - } - } - } - - return _instance; - } - } - - //static DapperExtensions() - //{ - // Configure(typeof(AutoClassMapper<>), new List(), new SqlServerDialect()); - //} - - /// - /// Add other assemblies that Dapper Extensions will search if a mapping is not found in the same assembly of the POCO. - /// - /// - public static void SetMappingAssemblies(IList assemblies) - { - Configure(_configuration.DefaultMapper, assemblies, _configuration.Dialect); - } - - /// - /// Configure DapperExtensions extension methods. - /// - /// - /// - /// - public static void Configure(IDapperExtensionsConfiguration configuration) - { - _instance = null; - _configuration = configuration; - } - - /// - /// Configure DapperExtensions extension methods. - /// - /// - /// - /// - public static void Configure(Type defaultMapper, IList mappingAssemblies, ISqlDialect sqlDialect) - { - Configure(new DapperExtensionsConfiguration(defaultMapper, mappingAssemblies, sqlDialect)); - } - - public static void Configure(ISqlDialect sqlDialect, Type defaultMapper = null, IList mappingAssemblies = null) - { - defaultMapper = defaultMapper ?? typeof(AutoClassMapper<>); - mappingAssemblies = mappingAssemblies ?? new List(); - Configure(new DapperExtensionsConfiguration(defaultMapper, mappingAssemblies, sqlDialect)); - } - - #endregion - - #region Get - /// - /// Executes a query for the specified id, returning the data typed as per T - /// - public static T Get(this IDbConnection connection, dynamic id, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => Get(connection, null, id, transaction, commandTimeout); - - public static T Get(this IDbConnection connection, string tableName, dynamic id, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => Get(connection, tableName, null, id, transaction, commandTimeout); - - public static T Get(this IDbConnection connection, string tableName, string schemaName, dynamic id, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => (T)Instance.Get(connection, id, transaction, commandTimeout, tableName, schemaName, null, null); - - public static async Task GetAsync(this IDbConnection connection, dynamic id, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await GetAsync(connection, null, id, transaction, commandTimeout); - - public static async Task GetAsync(this IDbConnection connection, string tableName, dynamic id, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await GetAsync(connection, tableName, null, id, transaction, commandTimeout); - - public static async Task GetAsync(this IDbConnection connection, string tableName, string schemaName, dynamic id, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await Instance.GetAsync(connection, id, transaction, commandTimeout, tableName, schemaName, null, null); - - public static T Get(this IDbConnection connection, IList join, dynamic id, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => Get(connection, join, null, id, transaction, commandTimeout); - - public static T Get(this IDbConnection connection, IList join, IList alias, dynamic id, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => (T)Instance.Get(connection, id, transaction, commandTimeout, null, null, join, alias); - - public static async Task GetAsync(this IDbConnection connection, IList join, dynamic id, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await GetAsync(connection, join, null, id, transaction, commandTimeout); - - public static async Task GetAsync(this IDbConnection connection, IList join, IList alias, dynamic id, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await Instance.GetAsync(connection, id, transaction, commandTimeout, null, null, join, alias); - - #endregion - - #region Insert - /// - /// Executes an insert query for the specified entity. - /// - public static void Insert(this IDbConnection connection, IEnumerable entities, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => Insert(connection, null, entities, transaction, commandTimeout); - - public static void Insert(this IDbConnection connection, string tableName, IEnumerable entities, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => Insert(connection, tableName, null, entities, transaction, commandTimeout); - - public static void Insert(this IDbConnection connection, string tableName, string schemaName, IEnumerable entities, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => Instance.Insert(connection, entities, transaction, commandTimeout, tableName, schemaName); - - - /// - /// Executes an insert query for the specified entity, returning the primary key. - /// If the entity has a single key, just the value is returned. - /// If the entity has a composite key, an IDictionary<string, object> is returned with the key values. - /// The key value for the entity will also be updated if the KeyType is a Guid or Identity. - /// - public static dynamic Insert(this IDbConnection connection, T entity, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => Insert(connection, null, entity, transaction, commandTimeout); - - public static dynamic Insert(this IDbConnection connection, string tableName, T entity, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => Insert(connection, tableName, null, entity, transaction, commandTimeout); - - public static dynamic Insert(this IDbConnection connection, string tableName, string schemaName, T entity, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => Instance.Insert(connection, entity, transaction, commandTimeout, tableName, schemaName); - - #endregion - - #region Update - /// - /// Executes an update query for the specified entity. - /// - public static bool Update(this IDbConnection connection, T entity, IDbTransaction transaction = null, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class - => Update(connection, null, entity, transaction, commandTimeout, ignoreAllKeyProperties); - - public static bool Update(this IDbConnection connection, string tableName, T entity, IDbTransaction transaction = null, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class - => Update(connection, tableName, null, entity, transaction, commandTimeout, ignoreAllKeyProperties); - - public static bool Update(this IDbConnection connection, string tableName, string schemaName, T entity, IDbTransaction transaction = null, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class - => Instance.Update(connection, entity, null, transaction, commandTimeout, tableName, schemaName, ignoreAllKeyProperties); - - - public static bool Update(this IDbConnection connection, T entity, object predicate, IDbTransaction transaction = null, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class - => Update(connection, null, entity, predicate, transaction, commandTimeout, ignoreAllKeyProperties); - - public static bool Update(this IDbConnection connection, string tableName, T entity, object predicate, IDbTransaction transaction = null, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class - => Update(connection, tableName, null, entity, predicate, transaction, commandTimeout, ignoreAllKeyProperties); - - public static bool Update(this IDbConnection connection, string tableName, string schemaName, T entity, object predicate, IDbTransaction transaction = null, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class - => Instance.Update(connection, entity, predicate, transaction, commandTimeout, tableName, schemaName, ignoreAllKeyProperties); - - - public static async Task UpdateAsync(this IDbConnection connection, T entity, IDbTransaction transaction = null, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class - => await UpdateAsync(connection, null, entity, transaction, commandTimeout, ignoreAllKeyProperties); - - public static async Task UpdateAsync(this IDbConnection connection, string tableName, T entity, IDbTransaction transaction = null, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class - => await UpdateAsync(connection, tableName, null, entity, transaction, commandTimeout, ignoreAllKeyProperties); - - public static async Task UpdateAsync(this IDbConnection connection, string tableName, string schemaName, T entity, IDbTransaction transaction = null, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class - => await Instance.UpdateAsync(connection, entity, null, transaction, commandTimeout, tableName, schemaName, ignoreAllKeyProperties); - - public static async Task UpdateAsync(this IDbConnection connection, T entity, object predicate, IDbTransaction transaction = null, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class - => await UpdateAsync(connection, null, entity, predicate, transaction, commandTimeout, ignoreAllKeyProperties); - - public static async Task UpdateAsync(this IDbConnection connection, string tableName, T entity, object predicate, IDbTransaction transaction = null, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class - => await UpdateAsync(connection, tableName, null, entity, predicate, transaction, commandTimeout, ignoreAllKeyProperties); - - public static async Task UpdateAsync(this IDbConnection connection, string tableName, string schemaName, T entity, object predicate, IDbTransaction transaction = null, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class - => await Instance.UpdateAsync(connection, entity, predicate, transaction, commandTimeout, tableName, schemaName, ignoreAllKeyProperties); - - - - public static bool UpdateSet(this IDbConnection connection, object entity, object predicate = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => UpdateSet(connection, null, entity, predicate, transaction, commandTimeout); - - public static bool UpdateSet(this IDbConnection connection, string tableName, object entity, object predicate = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => UpdateSet(connection, tableName, null, entity, predicate, transaction, commandTimeout); - - public static bool UpdateSet(this IDbConnection connection, string tableName, string schemaName, object entity, object predicate = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => Instance.UpdateSet(connection, entity, predicate, transaction, commandTimeout, tableName, schemaName); - - - public static async Task UpdateSetAsync(this IDbConnection connection, object entity, object predicate = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await UpdateSetAsync(connection, null, entity, predicate, transaction, commandTimeout); - - public static async Task UpdateSetAsync(this IDbConnection connection, string tableName, object entity, object predicate = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await UpdateSetAsync(connection, tableName, null, entity, predicate, transaction, commandTimeout); - - public static async Task UpdateSetAsync(this IDbConnection connection, string tableName, string schemaName, object entity, object predicate = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await Instance.UpdateSetAsync(connection, entity, predicate, transaction, commandTimeout, tableName, schemaName); - - - #endregion - - #region Delete - /// - /// Executes a delete query for the specified entity. - /// - public static bool Delete(this IDbConnection connection, T entity, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => Delete(connection, null, entity, transaction, commandTimeout); - - public static bool Delete(this IDbConnection connection, string tableName, T entity, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => Delete(connection, tableName, null, entity, transaction, commandTimeout); - - public static bool Delete(this IDbConnection connection, string tableName, string schemaName, T entity, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => Instance.Delete(connection, entity, transaction, commandTimeout, tableName, schemaName); - - - public static async Task DeleteAsync(this IDbConnection connection, T entity, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await DeleteAsync(connection, null, entity, transaction, commandTimeout); - - public static async Task DeleteAsync(this IDbConnection connection, string tableName, T entity, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await DeleteAsync(connection, tableName, null, entity, transaction, commandTimeout); - - public static async Task DeleteAsync(this IDbConnection connection, string tableName, string schemaName, T entity, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await Instance.DeleteAsync(connection, entity, transaction, commandTimeout, tableName, schemaName); - - - /// - /// Executes a delete query using the specified predicate. - /// - public static bool Delete(this IDbConnection connection, object predicate, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => Delete(connection, null, predicate, transaction, commandTimeout); - - public static bool Delete(this IDbConnection connection, string tableName, object predicate, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => Delete(connection, tableName, null, predicate, transaction, commandTimeout); - - public static bool Delete(this IDbConnection connection, string tableName, string schemaName, object predicate, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => Instance.Delete(connection, predicate, transaction, commandTimeout, tableName, schemaName); - - public static async Task DeleteAsync(this IDbConnection connection, object predicate, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await DeleteAsync(connection, null, predicate, transaction, commandTimeout); - - public static async Task DeleteAsync(this IDbConnection connection, string tableName, object predicate, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await DeleteAsync(connection, tableName, null, predicate, transaction, commandTimeout); - - public static async Task DeleteAsync(this IDbConnection connection, string tableName, string schemaName, object predicate, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await Instance.DeleteAsync(connection, predicate, transaction, commandTimeout, tableName, schemaName); - - - #endregion - - #region GetList - /// - /// Executes a select query using the specified predicate, returning an IEnumerable data typed as per T. - /// - public static IEnumerable GetList(this IDbConnection connection, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null, bool buffered = false) where T : class - => GetList(connection, (string)null, null, predicate, sort, transaction, commandTimeout, buffered); - - public static IEnumerable GetList(this IDbConnection connection, string tableName, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null, bool buffered = false) where T : class - => GetList(connection, tableName, null, predicate, sort, transaction, commandTimeout, buffered); - - public static IEnumerable GetList(this IDbConnection connection, string tableName, string schemaName, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null, bool buffered = false) where T : class - => Instance.GetList(connection, predicate, sort, transaction, commandTimeout, buffered, tableName, schemaName, null, null); - - - public static async Task> GetListAsync(this IDbConnection connection, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await GetListAsync(connection, (string)null, null, predicate, sort, transaction, commandTimeout); - - public static async Task> GetListAsync(this IDbConnection connection, string tableName, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await GetListAsync(connection, tableName, null, predicate, sort, transaction, commandTimeout); - - public static async Task> GetListAsync(this IDbConnection connection, string tableName, string schemaName, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await Instance.GetListAsync(connection, predicate, sort, transaction, commandTimeout, tableName, schemaName, null, null); - - - public static IEnumerable GetList(this IDbConnection connection, IList join, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null, bool buffered = false) where T : class - => GetList(connection, join, null, predicate, sort, transaction, commandTimeout, buffered); - - public static IEnumerable GetList(this IDbConnection connection, IList join, IList alias, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null, bool buffered = false) where T : class - => Instance.GetList(connection, predicate, sort, transaction, commandTimeout, buffered, null, null, join, alias); - - public static async Task> GetListAsync(this IDbConnection connection, IList join, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await GetListAsync(connection, join, null, predicate, sort, transaction, commandTimeout); - - public static async Task> GetListAsync(this IDbConnection connection, IList join, IList alias, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await Instance.GetListAsync(connection, predicate, sort, transaction, commandTimeout, null, null, join, alias); - - - #endregion - - #region GetPage - /// - /// Executes a select query using the specified predicate, returning an IEnumerable data typed as per T. - /// Data returned is dependent upon the specified page and resultsPerPage. - /// - public static IEnumerable GetPage(this IDbConnection connection, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null, bool buffered = false) where T : class - => GetPage(connection, (string)null, page, resultsPerPage, predicate, sort, transaction, commandTimeout, buffered); - - public static IEnumerable GetPage(this IDbConnection connection, string tableName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null, bool buffered = false) where T : class - => GetPage(connection, tableName, null, page, resultsPerPage, predicate, sort, transaction, commandTimeout, buffered); - - public static IEnumerable GetPage(this IDbConnection connection, string tableName, string schemaName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null, bool buffered = false) where T : class - => Instance.GetPage(connection, predicate, sort, page, resultsPerPage, transaction, commandTimeout, buffered, tableName, schemaName, null, null); - - - public static async Task> GetPageAsync(this IDbConnection connection, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await GetPageAsync(connection, (string)null, page, resultsPerPage, predicate, sort, transaction, commandTimeout); - - public static async Task> GetPageAsync(this IDbConnection connection, string tableName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await GetPageAsync(connection, tableName, null, page, resultsPerPage, predicate, sort, transaction, commandTimeout); - - public static async Task> GetPageAsync(this IDbConnection connection, string tableName, string schemaName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await Instance.GetPageAsync(connection, predicate, sort, page, resultsPerPage, transaction, commandTimeout, tableName, schemaName, null, null); - - public static IEnumerable GetPage(this IDbConnection connection, IList join, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null, bool buffered = false) where T : class - => GetPage(connection, join, null, page, resultsPerPage, predicate, sort, transaction, commandTimeout, buffered); - - public static IEnumerable GetPage(this IDbConnection connection, IList join, IList alias, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null, bool buffered = false) where T : class - => Instance.GetPage(connection, predicate, sort, page, resultsPerPage, transaction, commandTimeout, buffered, null, null, join, alias); - - public static async Task> GetPageAsync(this IDbConnection connection, IList join, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await GetPageAsync(connection, join, null, page, resultsPerPage, predicate, sort, transaction, commandTimeout); - - public static async Task> GetPageAsync(this IDbConnection connection, IList join, IList alias, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await Instance.GetPageAsync(connection, predicate, sort, page, resultsPerPage, transaction, commandTimeout, null, null, join, alias); - #endregion - - #region GetPages - - /// - /// Executes a select query using the specified predicate, returning an IEnumerable data typed as per T. - /// Data returned is dependent upon the specified page and resultsPerPage. - /// - public static Page GetPages(this IDbConnection connection, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => GetPages(connection, (string)null, page, resultsPerPage, predicate, sort, transaction, commandTimeout); - - public static Page GetPages(this IDbConnection connection, string tableName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => GetPages(connection, tableName, null, page, resultsPerPage, predicate, sort, transaction, commandTimeout); - - public static Page GetPages(this IDbConnection connection, string tableName, string schemaName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => Instance.GetPages(connection, predicate, sort, page, resultsPerPage, transaction, commandTimeout, tableName, schemaName, null, null); - - public static async Task> GetPagesAsync(this IDbConnection connection, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await GetPagesAsync(connection, (string)null, page, resultsPerPage, predicate, sort, transaction, commandTimeout); - - public static async Task> GetPagesAsync(this IDbConnection connection, string tableName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await GetPagesAsync(connection, tableName, null, page, resultsPerPage, predicate, sort, transaction, commandTimeout); - - public static async Task> GetPagesAsync(this IDbConnection connection, string tableName, string schemaName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await Instance.GetPagesAsync(connection, predicate, sort, page, resultsPerPage, transaction, commandTimeout, tableName, schemaName, null, null); - - public static Page GetPages(this IDbConnection connection, IList join, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => GetPages(connection, join, null, page, resultsPerPage, predicate, sort, transaction, commandTimeout); - - public static Page GetPages(this IDbConnection connection, IList join, IList alias, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => Instance.GetPages(connection, predicate, sort, page, resultsPerPage, transaction, commandTimeout, null, null, join, alias); - - public static async Task> GetPagesAsync(this IDbConnection connection, IList join, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await GetPagesAsync(connection, join, null, page, resultsPerPage, predicate, sort, transaction, commandTimeout); - - public static async Task> GetPagesAsync(this IDbConnection connection, IList join, IList alias, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await Instance.GetPagesAsync(connection, predicate, sort, page, resultsPerPage, transaction, commandTimeout, null, null, join, alias); - - - #endregion - - #region GetSet - /// - /// Executes a select query using the specified predicate, returning an IEnumerable data typed as per T. - /// Data returned is dependent upon the specified firstResult and maxResults. - /// - public static IEnumerable GetSet(this IDbConnection connection, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, IDbTransaction transaction = null, int? commandTimeout = null, bool buffered = false) where T : class - => GetSet(connection, (string)null, predicate, sort, firstResult, maxResults, transaction, commandTimeout, buffered); - - public static IEnumerable GetSet(this IDbConnection connection, string tableName, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, IDbTransaction transaction = null, int? commandTimeout = null, bool buffered = false) where T : class - => GetSet(connection, tableName, null, predicate, sort, firstResult, maxResults, transaction, commandTimeout, buffered); - - public static IEnumerable GetSet(this IDbConnection connection, string tableName, string schemaName, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, IDbTransaction transaction = null, int? commandTimeout = null, bool buffered = false) where T : class - => Instance.GetSet(connection, predicate, sort, firstResult, maxResults, transaction, commandTimeout, buffered, tableName, schemaName, null, null); - - public static async Task> GetSetAsync(this IDbConnection connection, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await GetSetAsync(connection, (string)null, predicate, sort, firstResult, maxResults, transaction, commandTimeout); - - public static async Task> GetSetAsync(this IDbConnection connection, string tableName, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await GetSetAsync(connection, tableName, null, predicate, sort, firstResult, maxResults, transaction, commandTimeout); - - public static async Task> GetSetAsync(this IDbConnection connection, string tableName, string schemaName, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await Instance.GetSetAsync(connection, predicate, sort, firstResult, maxResults, transaction, commandTimeout, tableName, schemaName, null, null); - - public static IEnumerable GetSet(this IDbConnection connection, IList join, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, IDbTransaction transaction = null, int? commandTimeout = null, bool buffered = false) where T : class - => GetSet(connection, join, null, predicate, sort, firstResult, maxResults, transaction, commandTimeout, buffered); - - public static IEnumerable GetSet(this IDbConnection connection, IList join, IList alias, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, IDbTransaction transaction = null, int? commandTimeout = null, bool buffered = false) where T : class - => Instance.GetSet(connection, predicate, sort, firstResult, maxResults, transaction, commandTimeout, buffered, null, null, join, alias); - - public static async Task> GetSetAsync(this IDbConnection connection, IList join, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await GetSetAsync(connection, join, null, predicate, sort, firstResult, maxResults, transaction, commandTimeout); - - public static async Task> GetSetAsync(this IDbConnection connection, IList join, IList alias, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await Instance.GetSetAsync(connection, predicate, sort, firstResult, maxResults, transaction, commandTimeout, null, null, join, alias); - - #endregion - - #region Count - /// - /// Executes a query using the specified predicate, returning an integer that represents the number of rows that match the query. - /// - public static long Count(this IDbConnection connection, object predicate = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => Count(connection, (string)null, predicate, transaction, commandTimeout); - - public static long Count(this IDbConnection connection, string tableName, object predicate = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => Count(connection, tableName, null, predicate, transaction, commandTimeout); - - public static long Count(this IDbConnection connection, string tableName, string schemaName, object predicate = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => Instance.Count(connection, predicate, transaction, commandTimeout, tableName, schemaName, null); - - - public static async Task CountAsync(this IDbConnection connection, object predicate = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await CountAsync(connection, (string)null, predicate, transaction, commandTimeout); - - public static async Task CountAsync(this IDbConnection connection, string tableName, object predicate = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await CountAsync(connection, tableName, null, predicate, transaction, commandTimeout); - - public static async Task CountAsync(this IDbConnection connection, string tableName, string schemaName, object predicate = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await Instance.CountAsync(connection, predicate, transaction, commandTimeout, tableName, schemaName, null); - - public static long Count(this IDbConnection connection, IList join, object predicate = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => Instance.Count(connection, predicate, transaction, commandTimeout, null, null, join); - - public static async Task CountAsync(this IDbConnection connection, IList join, object predicate = null, IDbTransaction transaction = null, int? commandTimeout = null) where T : class - => await Instance.CountAsync(connection, predicate, transaction, commandTimeout, null, null, join); - #endregion - - #region GetMultiple - - /// - /// Executes a select query for multiple objects, returning IMultipleResultReader for each predicate. - /// - public static IMultipleResultReader GetMultiple(this IDbConnection connection, GetMultiplePredicate predicate = null, IDbTransaction transaction = null, int? commandTimeout = null) - => GetMultiple(connection, null, null, predicate, transaction, commandTimeout); - - public static IMultipleResultReader GetMultiple(this IDbConnection connection, string tableName, GetMultiplePredicate predicate = null, IDbTransaction transaction = null, int? commandTimeout = null) - => GetMultiple(connection, tableName, null, predicate, transaction, commandTimeout); - - public static IMultipleResultReader GetMultiple(this IDbConnection connection, string tableName, string schemaName, GetMultiplePredicate predicate = null, IDbTransaction transaction = null, int? commandTimeout = null) - { - return Instance.GetMultiple(connection, predicate, transaction, commandTimeout, tableName, schemaName); - } - - public static async Task GetMultipleAsync(this IDbConnection connection, GetMultiplePredicate predicate = null, IDbTransaction transaction = null, int? commandTimeout = null) - => await GetMultipleAsync(connection, null, null, predicate, transaction, commandTimeout); - - public static async Task GetMultipleAsync(this IDbConnection connection, string tableName, GetMultiplePredicate predicate = null, IDbTransaction transaction = null, int? commandTimeout = null) - => await GetMultipleAsync(connection, tableName, null, predicate, transaction, commandTimeout); - - public static async Task GetMultipleAsync(this IDbConnection connection, string tableName, string schemaName, GetMultiplePredicate predicate = null, IDbTransaction transaction = null, int? commandTimeout = null) - { - return await Instance.GetMultipleAsync(connection, predicate, transaction, commandTimeout, tableName, schemaName); - } - #endregion - - #region - /// - /// Gets the appropriate mapper for the specified type T. - /// If the mapper for the type is not yet created, a new mapper is generated from the mapper type specifed by DefaultMapper. - /// - public static IClassMapper GetMap() where T : class - { - return Instance.SqlGenerator.Configuration.GetMap(); - } - - /// - /// Clears the ClassMappers for each type. - /// - public static void ClearCache() - { - Instance.SqlGenerator.Configuration.ClearCache(); - } - - /// - /// Generates a COMB Guid which solves the fragmented index issue. - /// See: http://davybrion.com/blog/2009/05/using-the-guidcomb-identifier-strategy - /// - public static Guid GetNextGuid() - { - return Instance.SqlGenerator.Configuration.GetNextGuid(); - } - - - #endregion - } -} diff --git a/samples/Common/Repository.Dapper.Core/DapperExtensionsConfiguration.cs b/samples/Common/Repository.Dapper.Core/DapperExtensionsConfiguration.cs deleted file mode 100644 index 8ae8b3df5..000000000 --- a/samples/Common/Repository.Dapper.Core/DapperExtensionsConfiguration.cs +++ /dev/null @@ -1,132 +0,0 @@ -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Text; -using Repository.Dapper.Core.Mapper; -using Repository.Dapper.Core.Sql; -using Microsoft.Extensions.Options; - -namespace Repository.Dapper.Core -{ - public interface IDapperExtensionsConfiguration - { - Type DefaultMapper { get; } - IList MappingAssemblies { get; } - ISqlDialect Dialect { get; } - IClassMapper GetMap(Type entityType); - IClassMapper GetMap() where T : class; - void ClearCache(); - Guid GetNextGuid(); - } - - public class DapperExtensionsConfiguration : IDapperExtensionsConfiguration - { - public DateTime NowTime { get; set; } - - private readonly ConcurrentDictionary _classMaps = new ConcurrentDictionary(); - - public DapperExtensionsConfiguration() - : this(typeof(AutoClassMapper<>), new List(), new SqlServerDialect()) - { - } - public DapperExtensionsConfiguration(IOptions options) - : this(typeof(AutoClassMapper<>), new List(), options.Value.sqlDialect) - { - NowTime = DateTime.Now; - } - public DapperExtensionsConfiguration(ISqlDialect sqlDialect) - : this(typeof(AutoClassMapper<>), new List(), sqlDialect) - { - NowTime = DateTime.Now; - } - - - public DapperExtensionsConfiguration(Type defaultMapper, IList mappingAssemblies, ISqlDialect sqlDialect) - { - DefaultMapper = defaultMapper; - MappingAssemblies = mappingAssemblies ?? new List(); - Dialect = sqlDialect; - } - - public Type DefaultMapper { get; private set; } - public IList MappingAssemblies { get; private set; } - public ISqlDialect Dialect { get; private set; } - - public IClassMapper GetMap(Type entityType) - { - IClassMapper map; - if (!_classMaps.TryGetValue(entityType, out map)) - { - Type mapType = GetMapType(entityType); - if (mapType == null) - { - mapType = DefaultMapper.MakeGenericType(entityType); - } - - map = Activator.CreateInstance(mapType) as IClassMapper; - _classMaps[entityType] = map; - } - - return map; - } - - public IClassMapper GetMap() where T : class - { - return GetMap(typeof (T)); - } - - public void ClearCache() - { - _classMaps.Clear(); - } - - public Guid GetNextGuid() - { - byte[] b = Guid.NewGuid().ToByteArray(); - DateTime dateTime = new DateTime(1900, 1, 1); - DateTime now = DateTime.Now; - TimeSpan timeSpan = new TimeSpan(now.Ticks - dateTime.Ticks); - TimeSpan timeOfDay = now.TimeOfDay; - byte[] bytes1 = BitConverter.GetBytes(timeSpan.Days); - byte[] bytes2 = BitConverter.GetBytes((long)(timeOfDay.TotalMilliseconds / 3.333333)); - Array.Reverse(bytes1); - Array.Reverse(bytes2); - Array.Copy(bytes1, bytes1.Length - 2, b, b.Length - 6, 2); - Array.Copy(bytes2, bytes2.Length - 4, b, b.Length - 4, 4); - return new Guid(b); - } - - protected virtual Type GetMapType(Type entityType) - { - Func getType = a => - { - Type[] types = a.GetTypes(); - return (from type in types - let interfaceType = type.GetInterface(typeof(IClassMapper<>).FullName) - where - interfaceType != null && - interfaceType.GetGenericArguments()[0] == entityType - select type).SingleOrDefault(); - }; - - Type result = getType(entityType.Assembly); - if (result != null) - { - return result; - } - - foreach (var mappingAssembly in MappingAssemblies) - { - result = getType(mappingAssembly); - if (result != null) - { - return result; - } - } - - return getType(entityType.Assembly); - } - } -} \ No newline at end of file diff --git a/samples/Common/Repository.Dapper.Core/DapperImplementor.cs b/samples/Common/Repository.Dapper.Core/DapperImplementor.cs deleted file mode 100644 index 8b4162036..000000000 --- a/samples/Common/Repository.Dapper.Core/DapperImplementor.cs +++ /dev/null @@ -1,825 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Dynamic; -using System.Linq; -using System.Reflection; -using System.Text; -using Dapper; -using Repository.Dapper.Core.Mapper; -using Repository.Dapper.Core.Sql; -using System.Threading.Tasks; - -namespace Repository.Dapper.Core -{ - public interface IDapperImplementor - { - ISqlGenerator SqlGenerator { get; } - - #region Get - T Get(IDbConnection connection, dynamic id, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName, IList join, IList alias) where T : class; - Task GetAsync(IDbConnection connection, dynamic id, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName, IList join, IList alias) where T : class; - - #endregion - - #region Insert - void Insert(IDbConnection connection, IEnumerable entities, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName) where T : class; - dynamic Insert(IDbConnection connection, T entity, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName) where T : class; - - #endregion - - #region Update - bool Update(IDbConnection connection, T entity, object predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName, bool ignoreAllKeyProperties) where T : class; - Task UpdateAsync(IDbConnection connection, T entity, object predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName, bool ignoreAllKeyProperties) where T : class; - bool UpdateSet(IDbConnection connection, object entity, object predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName) where T : class; - Task UpdateSetAsync(IDbConnection connection, object entity, object predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName) where T : class; - - #endregion - - #region Delete - bool Delete(IDbConnection connection, T entity, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName) where T : class; - Task DeleteAsync(IDbConnection connection, T entity, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName) where T : class; - bool Delete(IDbConnection connection, object predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName) where T : class; - Task DeleteAsync(IDbConnection connection, object predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName) where T : class; - #endregion - - #region GetList - IEnumerable GetList(IDbConnection connection, object predicate, IList sort, IDbTransaction transaction, int? commandTimeout, bool buffered, string tableName, string schemaName, IList join, IList alias) where T : class; - - Task> GetListAsync(IDbConnection connection, object predicate, IList sort, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName, IList join, IList alias) where T : class; - #endregion - - #region GetPage - IEnumerable GetPage(IDbConnection connection, object predicate, IList sort, int page, int resultsPerPage, IDbTransaction transaction, int? commandTimeout, bool buffered, string tableName, string schemaName, IList join, IList alias) where T : class; - Task> GetPageAsync(IDbConnection connection, object predicate, IList sort, int page, int resultsPerPage, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName, IList join, IList alias) where T : class; - #endregion - - #region GetPages - Page GetPages(IDbConnection connection, object predicate, IList sort, int page, int resultsPerPage, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName, IList join, IList alias) where T : class; - Task> GetPagesAsync(IDbConnection connection, object predicate, IList sort, int page, int resultsPerPage, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName, IList join, IList alias) where T : class; - #endregion - - #region GetSet - IEnumerable GetSet(IDbConnection connection, object predicate, IList sort, int firstResult, int maxResults, IDbTransaction transaction, int? commandTimeout, bool buffered, string tableName, string schemaName, IList join, IList alias) where T : class; - Task> GetSetAsync(IDbConnection connection, object predicate, IList sort, int firstResult, int maxResults, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName, IList join, IList alias) where T : class; - #endregion - - #region Count - long Count(IDbConnection connection, object predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName, IList join) where T : class; - Task CountAsync(IDbConnection connection, object predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName, IList join) where T : class; - #endregion - - #region GetMultiple - IMultipleResultReader GetMultiple(IDbConnection connection, GetMultiplePredicate predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName); - - Task GetMultipleAsync(IDbConnection connection, GetMultiplePredicate predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName); - #endregion - - } - - public class DapperImplementor : IDapperImplementor - { - public DapperImplementor(ISqlGenerator sqlGenerator) - { - SqlGenerator = sqlGenerator; - } - - public ISqlGenerator SqlGenerator { get; private set; } - - #region Get - - public T Get(IDbConnection connection, dynamic id, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName, IList join, IList alias) where T : class - { - IClassMapper classMap = SqlGenerator.Configuration.GetMap(); - IPredicate predicate = GetIdPredicate(classMap, id); - T result = GetList(connection, predicate, null, transaction, commandTimeout, true, tableName,schemaName, join, alias).SingleOrDefault(); - return result; - } - public async Task GetAsync(IDbConnection connection, dynamic id, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName, IList join, IList alias) where T : class - { - IClassMapper classMap = SqlGenerator.Configuration.GetMap(); - IPredicate predicate = GetIdPredicate(classMap, id); - return (await GetListAsync(connection, predicate, null, transaction, commandTimeout, tableName, schemaName, join, alias)).SingleOrDefault(); - } - - #endregion - - #region Insert - public void Insert(IDbConnection connection, IEnumerable entities, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName) where T : class - { - IEnumerable properties = null; - IClassMapper classMap = SqlGenerator.Configuration.GetMap(); - var notKeyProperties = classMap.Properties.Where(p => p.KeyType != KeyType.NotAKey); - var triggerIdentityColumn = classMap.Properties.SingleOrDefault(p => p.KeyType == KeyType.TriggerIdentity); - - var parameters = new List(); - if (triggerIdentityColumn != null) - { - properties = typeof(T).GetProperties(BindingFlags.GetProperty | BindingFlags.Instance | BindingFlags.Public) - .Where(p => p.Name != triggerIdentityColumn.PropertyInfo.Name); - } - - foreach (var e in entities) - { - foreach (var column in notKeyProperties) - { - if (column.KeyType == KeyType.Guid && (Guid)column.PropertyInfo.GetValue(e, null) == Guid.Empty) - { - Guid comb = SqlGenerator.Configuration.GetNextGuid(); - column.PropertyInfo.SetValue(e, comb, null); - } - } - - if (triggerIdentityColumn != null) - { - var dynamicParameters = new DynamicParameters(); - foreach (var prop in properties) - { - dynamicParameters.Add(prop.Name, prop.GetValue(e, null)); - } - - // defaultValue need for identify type of parameter - var defaultValue = typeof(T).GetProperty(triggerIdentityColumn.PropertyInfo.Name).GetValue(e, null); - dynamicParameters.Add("IdOutParam", direction: ParameterDirection.Output, value: defaultValue); - - parameters.Add(dynamicParameters); - } - } - - string sql = SqlGenerator.Insert(classMap,schemaName, tableName); - - if (triggerIdentityColumn == null) - { - connection.Execute(sql, entities, transaction, commandTimeout, CommandType.Text); - } - else - { - connection.Execute(sql, parameters, transaction, commandTimeout, CommandType.Text); - } - } - - public dynamic Insert(IDbConnection connection, T entity, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName = null) where T : class - { - IClassMapper classMap = SqlGenerator.Configuration.GetMap(); - List nonIdentityKeyProperties = classMap.Properties.Where(p => p.KeyType == KeyType.Guid || p.KeyType == KeyType.Assigned).ToList(); - var identityColumn = classMap.Properties.SingleOrDefault(p => p.KeyType == KeyType.Identity); - var triggerIdentityColumn = classMap.Properties.SingleOrDefault(p => p.KeyType == KeyType.TriggerIdentity); - foreach (var column in nonIdentityKeyProperties) - { - if (column.KeyType == KeyType.Guid && (Guid)column.PropertyInfo.GetValue(entity, null) == Guid.Empty) - { - Guid comb = SqlGenerator.Configuration.GetNextGuid(); - column.PropertyInfo.SetValue(entity, comb, null); - } - } - - IDictionary keyValues = new ExpandoObject(); - string sql = SqlGenerator.Insert(classMap,schemaName, tableName); - if (identityColumn != null) - { - IEnumerable result; - if (SqlGenerator.SupportsMultipleStatements()) - { - sql += SqlGenerator.Configuration.Dialect.BatchSeperator + SqlGenerator.IdentitySql(classMap,schemaName, tableName); - result = connection.Query(sql, entity, transaction, false, commandTimeout, CommandType.Text); - } - else - { - connection.Execute(sql, entity, transaction, commandTimeout, CommandType.Text); - sql = SqlGenerator.IdentitySql(classMap,schemaName, tableName); - result = connection.Query(sql, entity, transaction, false, commandTimeout, CommandType.Text); - } - - // We are only interested in the first identity, but we are iterating over all resulting items (if any). - // This makes sure that ADO.NET drivers (like MySql) won't actively terminate the query. - bool hasResult = false; - int identityInt = 0; - foreach (var identityValue in result) - { - if (hasResult) - { - continue; - } - identityInt = Convert.ToInt32(identityValue); - hasResult = true; - } - if (!hasResult) - { - throw new InvalidOperationException("The source sequence is empty."); - } - - keyValues.Add(identityColumn.Name, identityInt); - identityColumn.PropertyInfo.SetValue(entity, identityInt, null); - } - else if (triggerIdentityColumn != null) - { - var dynamicParameters = new DynamicParameters(); - foreach (var prop in entity.GetType().GetProperties(BindingFlags.GetProperty | BindingFlags.Instance | BindingFlags.Public) - .Where(p => p.Name != triggerIdentityColumn.PropertyInfo.Name)) - { - dynamicParameters.Add(prop.Name, prop.GetValue(entity, null)); - } - - // defaultValue need for identify type of parameter - var defaultValue = entity.GetType().GetProperty(triggerIdentityColumn.PropertyInfo.Name).GetValue(entity, null); - dynamicParameters.Add("IdOutParam", direction: ParameterDirection.Output, value: defaultValue); - - connection.Execute(sql, dynamicParameters, transaction, commandTimeout, CommandType.Text); - - var value = dynamicParameters.Get(SqlGenerator.Configuration.Dialect.ParameterPrefix + "IdOutParam"); - keyValues.Add(triggerIdentityColumn.Name, value); - triggerIdentityColumn.PropertyInfo.SetValue(entity, value, null); - } - else - { - connection.Execute(sql, entity, transaction, commandTimeout, CommandType.Text); - } - - foreach (var column in nonIdentityKeyProperties) - { - keyValues.Add(column.Name, column.PropertyInfo.GetValue(entity, null)); - } - - if (keyValues.Count == 1) - { - return keyValues.First().Value; - } - - return keyValues; - } - - - #endregion - - #region Update - - public bool Update(IDbConnection connection, T entity, object predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName = null, bool ignoreAllKeyProperties = false) where T : class - { - IClassMapper classMap = SqlGenerator.Configuration.GetMap(); - IPredicate wherePredicate = predicate == null ? GetKeyPredicate(classMap, entity) : GetPredicate(classMap, predicate); - Dictionary parameters = new Dictionary(); - string sql = SqlGenerator.Update(classMap, wherePredicate, parameters, schemaName, tableName); - DynamicParameters dynamicParameters = new DynamicParameters(); - - var columns = ignoreAllKeyProperties - ? classMap.Properties.Where(p => !(p.Ignored || p.IsReadOnly) && p.KeyType == KeyType.NotAKey) - : classMap.Properties.Where(p => !(p.Ignored || p.IsReadOnly || p.KeyType == KeyType.Identity || p.KeyType == KeyType.Assigned)); - - foreach (var property in ReflectionHelper.GetObjectValues(entity).Where(property => columns.Any(c => c.Name == property.Key))) - { - dynamicParameters.Add(property.Key, property.Value); - } - - foreach (var parameter in parameters) - { - dynamicParameters.Add(parameter.Key, parameter.Value); - } - - return connection.Execute(sql, dynamicParameters, transaction, commandTimeout, CommandType.Text) > 0; - } - public async Task UpdateAsync(IDbConnection connection, T entity, object predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName, bool ignoreAllKeyProperties) where T : class - { - IClassMapper classMap = SqlGenerator.Configuration.GetMap(); - IPredicate wherePredicate = predicate == null ? GetKeyPredicate(classMap, entity) : GetPredicate(classMap, predicate); - Dictionary parameters = new Dictionary(); - string sql = SqlGenerator.Update(classMap, wherePredicate, parameters, schemaName, tableName); - DynamicParameters dynamicParameters = new DynamicParameters(); - - var columns = ignoreAllKeyProperties - ? classMap.Properties.Where(p => !(p.Ignored || p.IsReadOnly) && p.KeyType == KeyType.NotAKey) - : classMap.Properties.Where(p => !(p.Ignored || p.IsReadOnly || p.KeyType == KeyType.Identity || p.KeyType == KeyType.Assigned)); - - foreach (var property in ReflectionHelper.GetObjectValues(entity).Where(property => columns.Any(c => c.Name == property.Key))) - { - dynamicParameters.Add(property.Key, property.Value); - } - - foreach (var parameter in parameters) - { - dynamicParameters.Add(parameter.Key, parameter.Value); - } - - return await connection.ExecuteAsync(sql, dynamicParameters, transaction, commandTimeout, CommandType.Text) > 0; - } - - public bool UpdateSet(IDbConnection connection, object entity, object predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName = null) where T : class - { - IClassMapper classMap = SqlGenerator.Configuration.GetMap(); - IPredicate wherePredicate = predicate == null ? GetSetKeyPredicate(classMap, entity) : GetPredicate(classMap, predicate); - Dictionary parameters = new Dictionary(); - string sql = SqlGenerator.UpdateSet(classMap, entity, wherePredicate, parameters, schemaName, tableName); - DynamicParameters dynamicParameters = new DynamicParameters(); - - var columns = classMap.Properties.Where(p => !(p.Ignored || p.IsReadOnly || p.KeyType == KeyType.Identity || p.KeyType == KeyType.Assigned)); - - foreach (var property in ReflectionHelper.GetObjectValues(entity).Where(property => columns.Any(c => c.Name.Equals(property.Key)))) - { - dynamicParameters.Add(property.Key, property.Value); - } - - foreach (var parameter in parameters) - { - dynamicParameters.Add(parameter.Key, parameter.Value); - } - - return connection.Execute(sql, dynamicParameters, transaction, commandTimeout, CommandType.Text) > 0; - } - public async Task UpdateSetAsync(IDbConnection connection, object entity, object predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName) where T : class - { - IClassMapper classMap = SqlGenerator.Configuration.GetMap(); - IPredicate wherePredicate = predicate == null ? GetSetKeyPredicate(classMap, entity) : GetPredicate(classMap, predicate); - Dictionary parameters = new Dictionary(); - string sql = SqlGenerator.UpdateSet(classMap, entity, wherePredicate, parameters, schemaName, tableName); - DynamicParameters dynamicParameters = new DynamicParameters(); - - var columns = classMap.Properties.Where(p => !(p.Ignored || p.IsReadOnly || p.KeyType == KeyType.Identity || p.KeyType == KeyType.Assigned)); - - foreach (var property in ReflectionHelper.GetObjectValues(entity).Where(property => columns.Any(c => c.Name.Equals(property.Key)))) - { - dynamicParameters.Add(property.Key, property.Value); - } - - foreach (var parameter in parameters) - { - dynamicParameters.Add(parameter.Key, parameter.Value); - } - - return await connection.ExecuteAsync(sql, dynamicParameters, transaction, commandTimeout, CommandType.Text) > 0; - } - #endregion - - #region Delete - public bool Delete(IDbConnection connection, T entity, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName = null) where T : class - { - var build = BuildDelete(entity, null, tableName, schemaName); - return connection.Execute(build.sql, build.dynamicParameters, transaction, commandTimeout, CommandType.Text) > 0; - } - public bool Delete(IDbConnection connection, object predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName) where T : class - { - var build = BuildDelete(null, predicate, tableName, schemaName); - return connection.Execute(build.sql, build.dynamicParameters, transaction, commandTimeout, CommandType.Text) > 0; - } - - public async Task DeleteAsync(IDbConnection connection, T entity, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName) where T : class - { - var build = BuildDelete(entity, null, tableName, schemaName); - return await connection.ExecuteAsync(build.sql, build.dynamicParameters, transaction, commandTimeout, CommandType.Text) > 0; - } - - - public async Task DeleteAsync(IDbConnection connection, object predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName) where T : class - { - var build = BuildDelete(null, predicate, tableName, schemaName); - return await connection.ExecuteAsync(build.sql, build.dynamicParameters, transaction, commandTimeout, CommandType.Text) > 0; - } - - - protected (string sql, DynamicParameters dynamicParameters) BuildDelete(T entity, object predicate, string tableName, string schemaName) where T : class - { - IClassMapper classMap = SqlGenerator.Configuration.GetMap(); - IPredicate wherePredicate = entity == null && predicate != null ? GetPredicate(classMap, predicate) : GetKeyPredicate(classMap, entity); - - Dictionary parameters = new Dictionary(); - string sql = SqlGenerator.Delete(classMap, wherePredicate, parameters, schemaName, tableName); - DynamicParameters dynamicParameters = new DynamicParameters(); - foreach (var parameter in parameters) - { - dynamicParameters.Add(parameter.Key, parameter.Value); - } - return (sql, dynamicParameters); - } - - - #endregion - - #region GetList - public IEnumerable GetList(IDbConnection connection, object predicate, IList sort, IDbTransaction transaction, int? commandTimeout, bool buffered, string tableName, string schemaName, IList join, IList alias) where T : class - { - var build = BuildList(predicate, sort, tableName, schemaName, join, alias); - return connection.Query(build.sql, build.dynamicParameters, transaction, buffered, commandTimeout, CommandType.Text); - } - - public async Task> GetListAsync(IDbConnection connection, object predicate, IList sort, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName, IList join, IList alias) where T : class - { - var build = BuildList(predicate, sort, tableName, schemaName, join, alias); - return await connection.QueryAsync(build.sql, build.dynamicParameters, transaction, commandTimeout, CommandType.Text); - } - - protected (string sql, DynamicParameters dynamicParameters) BuildList(object predicate, IList sort, string tableName, string schemaName, IList join, IList alias) where T : class - { - VerifyJoinPredicate(join, predicate); - - IClassMapper classMap = SqlGenerator.Configuration.GetMap(); - Dictionary parameters = new Dictionary(); - IPredicate wherePredicate = GetPredicate(classMap, predicate); - string sql = SqlGenerator.Select(classMap, wherePredicate, sort, parameters, schemaName, tableName, join, alias); - - - DynamicParameters dynamicParameters = new DynamicParameters(); - foreach (var parameter in parameters) - { - dynamicParameters.Add(parameter.Key, parameter.Value); - } - return (sql, dynamicParameters); - } - - - #endregion - - #region GetPage - public IEnumerable GetPage(IDbConnection connection, object predicate, IList sort, int page, int resultsPerPage, IDbTransaction transaction, int? commandTimeout, bool buffered, string tableName, string schemaName, IList join, IList alias) where T : class - { - var build = BuildPage(predicate, sort, page, resultsPerPage, tableName, schemaName, join, alias); - return connection.Query(build.sql, build.dynamicParameters, transaction, buffered, commandTimeout, CommandType.Text); - } - - public async Task> GetPageAsync(IDbConnection connection, object predicate, IList sort, int page, int resultsPerPage, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName, IList join, IList alias) where T : class - { - var build = BuildPage(predicate, sort, page, resultsPerPage, tableName, schemaName, join, alias); - return await connection.QueryAsync(build.sql, build.dynamicParameters, transaction, commandTimeout, CommandType.Text); - } - - protected (string sql, DynamicParameters dynamicParameters) BuildPage(object predicate, IList sort, int page, int resultsPerPage, string tableName, string schemaName, IList join, IList alias) where T : class - { - VerifyJoinPredicate(join, predicate); - - IClassMapper classMap = SqlGenerator.Configuration.GetMap(); - IPredicate wherePredicate = GetPredicate(classMap, predicate); - Dictionary parameters = new Dictionary(); - - string sql = SqlGenerator.SelectPaged(classMap, wherePredicate, sort, page, resultsPerPage, parameters, schemaName, tableName, join, alias); - DynamicParameters dynamicParameters = new DynamicParameters(); - foreach (var parameter in parameters) - { - dynamicParameters.Add(parameter.Key, parameter.Value); - } - return (sql, dynamicParameters); - } - - - #endregion - - #region GetPages - - public Page GetPages(IDbConnection connection, object predicate, IList sort, int page, int resultsPerPage, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName, IList join, IList alias) where T : class - { - var PageResult = new Page() { CurrentPage = page, ItemsPerPage = resultsPerPage }; - PageResult.TotalItems = Count(connection, predicate, transaction, commandTimeout, tableName, schemaName, join); - if (PageResult.TotalItems == 0) - { - PageResult.Items = new List(); - return PageResult; - } - var build = BuildPage(predicate, sort, page, resultsPerPage, tableName, schemaName, join, alias); - PageResult.Items = connection.Query(build.sql, build.dynamicParameters, transaction, false, commandTimeout, CommandType.Text); - return PageResult; - } - public async Task> GetPagesAsync(IDbConnection connection, object predicate, IList sort, int page, int resultsPerPage, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName, IList join, IList alias) where T : class - { - var PageResult = new Page() { CurrentPage = page, ItemsPerPage = resultsPerPage }; - PageResult.TotalItems = await CountAsync(connection, predicate, transaction, commandTimeout, tableName, schemaName, join); - if (PageResult.TotalItems == 0) - { - PageResult.Items = new List(); - return PageResult; - } - var build = BuildPage(predicate, sort, page, resultsPerPage, tableName, schemaName, join, alias); - PageResult.Items = await connection.QueryAsync(build.sql, build.dynamicParameters, transaction, commandTimeout, CommandType.Text); - return PageResult; - } - #endregion - - #region GetSet - public IEnumerable GetSet(IDbConnection connection, object predicate, IList sort, int firstResult, int maxResults, IDbTransaction transaction, int? commandTimeout, bool buffered, string tableName, string schemaName, IList join, IList alias) where T : class - { - var build = BuildPage(predicate, sort, firstResult, maxResults, tableName, schemaName, join, alias); - return connection.Query(build.sql, build.dynamicParameters, transaction, buffered, commandTimeout, CommandType.Text); - } - - public async Task> GetSetAsync(IDbConnection connection, object predicate, IList sort, int firstResult, int maxResults, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName, IList join, IList alias) where T : class - { - var build = BuildPage(predicate, sort, firstResult, maxResults, tableName, schemaName, join, alias); - return await connection.QueryAsync(build.sql, build.dynamicParameters, transaction, commandTimeout, CommandType.Text); - } - - protected (string sql, DynamicParameters dynamicParameters) BuildGetSet(object predicate, IList sort, int firstResult, int maxResults, string tableName, string schemaName, IList join, IList alias) where T : class - { - VerifyJoinPredicate(join, predicate); - - IClassMapper classMap = SqlGenerator.Configuration.GetMap(); - IPredicate wherePredicate = GetPredicate(classMap, predicate); - Dictionary parameters = new Dictionary(); - string sql = SqlGenerator.SelectSet(classMap, wherePredicate, sort, firstResult, maxResults, parameters, schemaName, tableName, join, alias); - DynamicParameters dynamicParameters = new DynamicParameters(); - foreach (var parameter in parameters) - { - dynamicParameters.Add(parameter.Key, parameter.Value); - } - return (sql, dynamicParameters); - } - - #endregion - - #region Count - public long Count(IDbConnection connection, object predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName, IList join) where T : class - { - var build = BuildCount(predicate, tableName, schemaName, join); - return (long)(connection.Query(build.sql, build.dynamicParameters, transaction, false, commandTimeout, CommandType.Text).Single().Total); - } - - public async Task CountAsync(IDbConnection connection, object predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName, IList join) where T : class - { - var build = BuildCount(predicate, tableName, schemaName, join); - return (int)(await connection.QueryAsync(build.sql, build.dynamicParameters, transaction, commandTimeout, CommandType.Text)).Single().Total; - } - - protected (string sql, DynamicParameters dynamicParameters) BuildCount(object predicate, string tableName, string schemaName, IList join) where T : class - { - VerifyJoinPredicate(join, predicate); - - IClassMapper classMap = SqlGenerator.Configuration.GetMap(); - IPredicate wherePredicate = GetPredicate(classMap, predicate); - Dictionary parameters = new Dictionary(); - string sql = SqlGenerator.Count(classMap, wherePredicate, parameters, schemaName, tableName, join); - DynamicParameters dynamicParameters = new DynamicParameters(); - foreach (var parameter in parameters) - { - dynamicParameters.Add(parameter.Key, parameter.Value); - } - return (sql, dynamicParameters); - } - - #endregion - - #region GetMultiple - - public IMultipleResultReader GetMultiple(IDbConnection connection, GetMultiplePredicate predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName) - { - if (SqlGenerator.SupportsMultipleStatements()) - { - return GetMultipleByBatch(connection, predicate, transaction, commandTimeout, tableName, schemaName); - } - - return GetMultipleBySequence(connection, predicate, transaction, commandTimeout, tableName, schemaName); - } - public async Task GetMultipleAsync(IDbConnection connection, GetMultiplePredicate predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName) - { - if (SqlGenerator.SupportsMultipleStatements()) - { - return await GetMultipleByBatchAsync(connection, predicate, transaction, commandTimeout, tableName, schemaName); - } - - return await GetMultipleBySequenceAsync(connection, predicate, transaction, commandTimeout, tableName, schemaName); - } - - #endregion - - #region Helpers - - protected IPredicate GetPredicate(IClassMapper classMap, object predicate) - { - IPredicate wherePredicate = predicate as IPredicate; - if (wherePredicate == null && predicate != null) - { - wherePredicate = GetEntityPredicate(classMap, predicate); - } - - return wherePredicate; - } - - protected IPredicate GetIdPredicate(IClassMapper classMap, object id) - { - bool isSimpleType = ReflectionHelper.IsSimpleType(id.GetType()); - var keys = classMap.Properties.Where(p => p.KeyType != KeyType.NotAKey); - IDictionary paramValues = null; - IList predicates = new List(); - if (!isSimpleType) - { - paramValues = ReflectionHelper.GetObjectValues(id); - } - - foreach (var key in keys) - { - object value = id; - if (!isSimpleType) - { - value = paramValues[key.Name]; - } - - Type predicateType = typeof(FieldPredicate<>).MakeGenericType(classMap.EntityType); - - IFieldPredicate fieldPredicate = Activator.CreateInstance(predicateType) as IFieldPredicate; - fieldPredicate.Not = false; - fieldPredicate.Operator = Operator.Eq; - fieldPredicate.PropertyName = key.Name; - fieldPredicate.Value = value; - predicates.Add(fieldPredicate); - } - - return predicates.Count == 1 - ? predicates[0] - : new PredicateGroup - { - Operator = GroupOperator.And, - Predicates = predicates - }; - } - - protected IPredicate GetKeyPredicate(IClassMapper classMap, T entity) where T : class - { - var whereFields = classMap.Properties.Where(p => p.KeyType != KeyType.NotAKey); - if (!whereFields.Any()) - { - throw new ArgumentException("At least one Key column must be defined."); - } - - IList predicates = (from field in whereFields - select new FieldPredicate - { - Not = false, - Operator = Operator.Eq, - PropertyName = field.Name, - Value = field.PropertyInfo.GetValue(entity, null) - }).Cast().ToList(); - - return predicates.Count == 1 - ? predicates[0] - : new PredicateGroup - { - Operator = GroupOperator.And, - Predicates = predicates - }; - } - - protected IPredicate GetSetKeyPredicate(IClassMapper classMap, object entity) where T : class - { - var whereFields = classMap.Properties.Where(p => p.KeyType != KeyType.NotAKey); - if (!whereFields.Any()) - { - throw new ArgumentException("At least one Key column must be defined."); - } - var vKeyValue = ReflectionHelper.GetObjectValues(entity); - IList predicates = (from field in whereFields - select new FieldPredicate - { - Not = false, - Operator = Operator.Eq, - PropertyName = field.Name, - Value = vKeyValue.Where(w => w.Key.Equals(field.Name, StringComparison.OrdinalIgnoreCase)).First().Value - }).Cast().ToList(); - - return predicates.Count == 1 - ? predicates[0] - : new PredicateGroup - { - Operator = GroupOperator.And, - Predicates = predicates - }; - } - - protected IPredicate GetEntityPredicate(IClassMapper classMap, object entity) - { - Type predicateType = typeof(FieldPredicate<>).MakeGenericType(classMap.EntityType); - IList predicates = new List(); - foreach (var kvp in ReflectionHelper.GetObjectValues(entity)) - { - IFieldPredicate fieldPredicate = Activator.CreateInstance(predicateType) as IFieldPredicate; - fieldPredicate.Not = false; - fieldPredicate.Operator = Operator.Eq; - fieldPredicate.PropertyName = kvp.Key; - fieldPredicate.Value = kvp.Value; - predicates.Add(fieldPredicate); - } - - return predicates.Count == 1 - ? predicates[0] - : new PredicateGroup - { - Operator = GroupOperator.And, - Predicates = predicates - }; - } - - protected GridReaderResultReader GetMultipleByBatch(IDbConnection connection, GetMultiplePredicate predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName) - { - Dictionary parameters = new Dictionary(); - StringBuilder sql = new StringBuilder(); - foreach (var item in predicate.Items) - { - IClassMapper classMap = SqlGenerator.Configuration.GetMap(item.Type); - IPredicate itemPredicate = item.Value as IPredicate; - if (itemPredicate == null && item.Value != null) - { - itemPredicate = GetPredicate(classMap, item.Value); - } - - sql.AppendLine(SqlGenerator.Select(classMap, itemPredicate, item.Sort, parameters,schemaName, tableName) + SqlGenerator.Configuration.Dialect.BatchSeperator); - } - - DynamicParameters dynamicParameters = new DynamicParameters(); - foreach (var parameter in parameters) - { - dynamicParameters.Add(parameter.Key, parameter.Value); - } - - SqlMapper.GridReader grid = connection.QueryMultiple(sql.ToString(), dynamicParameters, transaction, commandTimeout, CommandType.Text); - return new GridReaderResultReader(grid); - } - - protected SequenceReaderResultReader GetMultipleBySequence(IDbConnection connection, GetMultiplePredicate predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName) - { - IList items = new List(); - foreach (var item in predicate.Items) - { - Dictionary parameters = new Dictionary(); - IClassMapper classMap = SqlGenerator.Configuration.GetMap(item.Type); - IPredicate itemPredicate = item.Value as IPredicate; - if (itemPredicate == null && item.Value != null) - { - itemPredicate = GetPredicate(classMap, item.Value); - } - - string sql = SqlGenerator.Select(classMap, itemPredicate, item.Sort, parameters,schemaName, tableName); - DynamicParameters dynamicParameters = new DynamicParameters(); - foreach (var parameter in parameters) - { - dynamicParameters.Add(parameter.Key, parameter.Value); - } - - SqlMapper.GridReader queryResult = connection.QueryMultiple(sql, dynamicParameters, transaction, commandTimeout, CommandType.Text); - items.Add(queryResult); - } - - return new SequenceReaderResultReader(items); - } - - - protected async Task GetMultipleByBatchAsync(IDbConnection connection, GetMultiplePredicate predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName) - { - Dictionary parameters = new Dictionary(); - StringBuilder sql = new StringBuilder(); - foreach (var item in predicate.Items) - { - IClassMapper classMap = SqlGenerator.Configuration.GetMap(item.Type); - IPredicate itemPredicate = item.Value as IPredicate; - if (itemPredicate == null && item.Value != null) - { - itemPredicate = GetPredicate(classMap, item.Value); - } - - sql.AppendLine(SqlGenerator.Select(classMap, itemPredicate, item.Sort, parameters, schemaName, tableName) + SqlGenerator.Configuration.Dialect.BatchSeperator); - } - - DynamicParameters dynamicParameters = new DynamicParameters(); - foreach (var parameter in parameters) - { - dynamicParameters.Add(parameter.Key, parameter.Value); - } - - SqlMapper.GridReader grid = await connection.QueryMultipleAsync(sql.ToString(), dynamicParameters, transaction, commandTimeout, CommandType.Text); - return new GridReaderResultReader(grid); - } - - protected async Task GetMultipleBySequenceAsync(IDbConnection connection, GetMultiplePredicate predicate, IDbTransaction transaction, int? commandTimeout, string tableName, string schemaName) - { - IList items = new List(); - foreach (var item in predicate.Items) - { - Dictionary parameters = new Dictionary(); - IClassMapper classMap = SqlGenerator.Configuration.GetMap(item.Type); - IPredicate itemPredicate = item.Value as IPredicate; - if (itemPredicate == null && item.Value != null) - { - itemPredicate = GetPredicate(classMap, item.Value); - } - - string sql = SqlGenerator.Select(classMap, itemPredicate, item.Sort, parameters, schemaName, tableName); - DynamicParameters dynamicParameters = new DynamicParameters(); - foreach (var parameter in parameters) - { - dynamicParameters.Add(parameter.Key, parameter.Value); - } - - SqlMapper.GridReader queryResult = await connection.QueryMultipleAsync(sql, dynamicParameters, transaction, commandTimeout, CommandType.Text); - items.Add(queryResult); - } - - return new SequenceReaderResultReader(items); - } - - /// - /// 检测join模式下的条件参数类型 - /// - /// - /// - protected void VerifyJoinPredicate(IList join, object predicate) - { - //联合查询时，参数必须是IPredicate格式，不能是anonymoustype、IEnumerable> - if (join != null && join.Count > 0 && predicate != null && (predicate as IPredicate) == null) - { - throw new Exception(" join predicate = IPredicate"); - } - } - #endregion - } -} diff --git a/samples/Common/Repository.Dapper.Core/Database.cs b/samples/Common/Repository.Dapper.Core/Database.cs deleted file mode 100644 index 2bf0145bb..000000000 --- a/samples/Common/Repository.Dapper.Core/Database.cs +++ /dev/null @@ -1,159 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Linq; -using System.Text; -using Repository.Dapper.Core.Mapper; -using Repository.Dapper.Core.Sql; -using System.Threading.Tasks; -using Microsoft.Extensions.Options; - -namespace Repository.Dapper.Core -{ - public partial interface IDatabase : IDisposable - { - bool HasActiveTransaction { get; } - IDbConnection Connection { get; } - void BeginTransaction(IsolationLevel isolationLevel = IsolationLevel.ReadCommitted); - void Commit(); - void Rollback(); - void RunInTransaction(Action action); - T RunInTransaction(Func func); - void ClearCache(); - Guid GetNextGuid(); - IClassMapper GetMap() where T : class; - - } - - public partial class Database : IDatabase - { - - private readonly IDapperImplementor _dapper; - - private IDbTransaction _transaction; - - public Database(IDbConnection connection, ISqlGenerator sqlGenerator) - { - _dapper = new DapperImplementor(sqlGenerator); - Connection = connection; - - if (Connection.State != ConnectionState.Open) - { - Connection.Open(); - } - } - public Database(IOptions options, IDapperExtensionsConfiguration Configuration) - { - _dapper = new DapperImplementor(new SqlGeneratorImpl(Configuration)); - Connection = options.Value.DbConnection(); - - if (Connection.State != ConnectionState.Open) - { - Connection.Open(); - } - } - - public bool HasActiveTransaction - { - get - { - return _transaction != null; - } - } - - public IDbConnection Connection { get; private set; } - - public void Dispose() - { - if (Connection.State != ConnectionState.Closed) - { - if (_transaction != null) - { - _transaction.Rollback(); - } - - Connection.Close(); - } - } - - public void BeginTransaction(IsolationLevel isolationLevel = IsolationLevel.ReadCommitted) - { - _transaction = Connection.BeginTransaction(isolationLevel); - } - - public void Commit() - { - _transaction.Commit(); - _transaction = null; - } - - public void Rollback() - { - _transaction.Rollback(); - _transaction = null; - } - - public void RunInTransaction(Action action) - { - BeginTransaction(); - try - { - action(); - Commit(); - } - catch (Exception ex) - { - if (HasActiveTransaction) - { - Rollback(); - } - - throw ex; - } - } - - public T RunInTransaction(Func func) - { - BeginTransaction(); - try - { - T result = func(); - Commit(); - return result; - } - catch (Exception ex) - { - if (HasActiveTransaction) - { - Rollback(); - } - - throw ex; - } - } - - public void ClearCache() - { - _dapper.SqlGenerator.Configuration.ClearCache(); - } - - public Guid GetNextGuid() - { - return _dapper.SqlGenerator.Configuration.GetNextGuid(); - } - - public IClassMapper GetMap() where T : class - { - return _dapper.SqlGenerator.Configuration.GetMap(); - } - - - } - - public class DataBaseOptions - { - public ISqlDialect sqlDialect { get; set; } - - public Func DbConnection { get; set; } - } -} diff --git a/samples/Common/Repository.Dapper.Core/DatabasePartial.cs b/samples/Common/Repository.Dapper.Core/DatabasePartial.cs deleted file mode 100644 index 4cd8ba6dd..000000000 --- a/samples/Common/Repository.Dapper.Core/DatabasePartial.cs +++ /dev/null @@ -1,514 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Text; -using System.Threading.Tasks; - -namespace Repository.Dapper.Core -{ - public partial interface IDatabase - { - #region Count - long Count(object predicate = null, int? commandTimeout = null) where T : class; - long Count(string tableName, object predicate = null, int? commandTimeout = null) where T : class; - long Count(string tableName, string schemaName, object predicate = null, int? commandTimeout = null) where T : class; - - Task CountAsync(object predicate = null, int? commandTimeout = null) where T : class; - Task CountAsync(string tableName, object predicate = null, int? commandTimeout = null) where T : class; - Task CountAsync(string tableName, string schemaName, object predicate = null, int? commandTimeout = null) where T : class; - - - long Count(IList join, object predicate = null, int? commandTimeout = null) where T : class; - - Task CountAsync(IList join, object predicate = null, int? commandTimeout = null) where T : class; - - #endregion - - #region Delete - bool Delete(T entity, int? commandTimeout = null) where T : class; - bool Delete(string tableName, T entity, int? commandTimeout = null) where T : class; - bool Delete(string tableName, string schemaName, T entity, int? commandTimeout = null) where T : class; - - bool Delete(object predicate, int? commandTimeout = null) where T : class; - bool Delete(string tableName, object predicate, int? commandTimeout = null) where T : class; - bool Delete(string tableName, string schemaName, object predicate, int? commandTimeout = null) where T : class; - - Task DeleteAsync(T entity, int? commandTimeout = null) where T : class; - Task DeleteAsync(string tableName, T entity, int? commandTimeout = null) where T : class; - Task DeleteAsync(string tableName, string schemaName, T entity, int? commandTimeout = null) where T : class; - - Task DeleteAsync(object predicate, int? commandTimeout = null) where T : class; - Task DeleteAsync(string tableName, object predicate, int? commandTimeout = null) where T : class; - Task DeleteAsync(string tableName, string schemaName, object predicate, int? commandTimeout = null) where T : class; - #endregion - - #region Get - T Get(dynamic id, int? commandTimeout = null) where T : class; - T Get(dynamic id, string tableName, int? commandTimeout = null) where T : class; - T Get(dynamic id, string tableName, string schemaName, int? commandTimeout = null) where T : class; - - Task GetAsync(dynamic id, int? commandTimeout = null) where T : class; - Task GetAsync(dynamic id, string tableName, int? commandTimeout = null) where T : class; - Task GetAsync(dynamic id, string tableName, string schemaName, int? commandTimeout = null) where T : class; - - T Get(IList join, dynamic id, int? commandTimeout = null) where T : class; - T Get(IList join, IList alias, dynamic id, int? commandTimeout = null) where T : class; - - Task GetAsync(IList join, dynamic id, int? commandTimeout = null) where T : class; - Task GetAsync(IList join, IList alias, dynamic id, int? commandTimeout = null) where T : class; - #endregion - - #region GetList - IEnumerable GetList(object predicate = null, IList sort = null, int? commandTimeout = null, bool buffered = true) where T : class; - IEnumerable GetList(string tableName, object predicate = null, IList sort = null, int? commandTimeout = null, bool buffered = true) where T : class; - IEnumerable GetList(string tableName, string schemaName, object predicate = null, IList sort = null, int? commandTimeout = null, bool buffered = true) where T : class; - - Task> GetListAsync(object predicate = null, IList sort = null, int? commandTimeout = null) where T : class; - Task> GetListAsync(string tableName, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class; - Task> GetListAsync(string tableName, string schemaName, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class; - - - IEnumerable GetList(IList join, object predicate = null, IList sort = null, int? commandTimeout = null, bool buffered = true) where T : class; - - IEnumerable GetList(IList join, IList alias = null, object predicate = null, IList sort = null, int? commandTimeout = null, bool buffered = true) where T : class; - - Task> GetListAsync(IList join, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class; - - Task> GetListAsync(IList join, IList alias = null, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class; - - #endregion - - #region GetMultiple - IMultipleResultReader GetMultiple(GetMultiplePredicate predicate = null, int? commandTimeout = null); - IMultipleResultReader GetMultiple(string tableName, GetMultiplePredicate predicate = null, int? commandTimeout = null); - IMultipleResultReader GetMultiple(string tableName, string schemaName, GetMultiplePredicate predicate = null, int? commandTimeout = null); - Task GetMultipleAsync(GetMultiplePredicate predicate = null, int? commandTimeout = null); - Task GetMultipleAsync(string tableName, GetMultiplePredicate predicate = null, int? commandTimeout = null); - Task GetMultipleAsync(string tableName, string schemaName, GetMultiplePredicate predicate = null, int? commandTimeout = null); - #endregion - - #region GetPage - IEnumerable GetPage(int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null, bool buffered = true) where T : class; - IEnumerable GetPage(string tableName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null, bool buffered = true) where T : class; - IEnumerable GetPage(string tableName, string schemaName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null, bool buffered = true) where T : class; - - - Task> GetPageAsync(int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class; - Task> GetPageAsync(string tableName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class; - Task> GetPageAsync(string tableName, string schemaName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class; - - IEnumerable GetPage(IList join, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null, bool buffered = true) where T : class; - - IEnumerable GetPage(IList join, IList alias, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null, bool buffered = true) where T : class; - - Task> GetPageAsync(IList join, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class; - - Task> GetPageAsync(IList join, IList alias, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class; - - #endregion - - - #region GetPages - Page GetPages(int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class; - Page GetPages(string tableName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class; - Page GetPages(string tableName, string schemaName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class; - - Task> GetPagesAsync(int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class; - Task> GetPagesAsync(string tableName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class; - Task> GetPagesAsync(string tableName, string schemaName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class; - - Page GetPages(IList join, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class; - Page GetPages(IList join, IList alias, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class; - Task> GetPagesAsync(IList join, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class; - - Task> GetPagesAsync(IList join, IList alias, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class; - - #endregion - - #region GetSet - IEnumerable GetSet(object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, int? commandTimeout = null, bool buffered = true) where T : class; - IEnumerable GetSet(string tableName, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, int? commandTimeout = null, bool buffered = true) where T : class; - IEnumerable GetSet(string tableName, string schemaName, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, int? commandTimeout = null, bool buffered = true) where T : class; - Task> GetSetAsync(object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, int? commandTimeout = null) where T : class; - Task> GetSetAsync(string tableName, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, int? commandTimeout = null) where T : class; - Task> GetSetAsync(string tableName, string schemaName, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, int? commandTimeout = null) where T : class; - - IEnumerable GetSet(IList join, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, int? commandTimeout = null, bool buffered = true) where T : class; - - IEnumerable GetSet(IList join, IList alias, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, int? commandTimeout = null, bool buffered = true) where T : class; - Task> GetSetAsync(IList join, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, int? commandTimeout = null) where T : class; - - Task> GetSetAsync(IList join, IList alias, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, int? commandTimeout = null) where T : class; - - #endregion - - #region Insert - void Insert(IEnumerable entities, int? commandTimeout = null) where T : class; - void Insert(string tableName, IEnumerable entities, int? commandTimeout = null) where T : class; - void Insert(string tableName, string schemaName, IEnumerable entities, int? commandTimeout = null) where T : class; - - dynamic Insert(T entity, int? commandTimeout = null) where T : class; - dynamic Insert(string tableName, T entity, int? commandTimeout = null) where T : class; - dynamic Insert(string tableName, string schemaName, T entity, int? commandTimeout = null) where T : class; - #endregion - - #region Update - - bool Update(T entity, object predicate = null, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class; - bool Update(string tableName, T entity, object predicate = null, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class; - bool Update(string tableName, string schemaName, T entity, object predicate = null, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class; - - - bool UpdateSet(object entity, object predicate = null, int? commandTimeout = null) where T : class; - bool UpdateSet(string tableName, object entity, object predicate = null, int? commandTimeout = null) where T : class; - bool UpdateSet(string tableName, string schemaName, object entity, object predicate = null, int? commandTimeout = null) where T : class; - - - - - Task UpdateAsync(T entity, object predicate = null, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class; - Task UpdateAsync(string tableName, T entity, object predicate = null, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class; - Task UpdateAsync(string tableName, string schemaName, T entity, object predicate = null, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class; - - Task UpdateSetAsync(object entity, object predicate = null, int? commandTimeout = null) where T : class; - Task UpdateSetAsync(string tableName, object entity, object predicate = null, int? commandTimeout = null) where T : class; - Task UpdateSetAsync(string tableName, string schemaName, object entity, object predicate = null, int? commandTimeout = null) where T : class; - - - #endregion - - } - public partial class Database - { - #region Count - public long Count(object predicate = null, int? commandTimeout = null) where T : class - => Count((string)null, predicate, commandTimeout); - - public long Count(string tableName, object predicate = null, int? commandTimeout = null) where T : class - => Count(tableName, null, predicate, commandTimeout); - - public long Count(string tableName, string schemaName, object predicate = null, int? commandTimeout = null) where T : class - => _dapper.Count(Connection, predicate, _transaction, commandTimeout, tableName, schemaName, null); - - public async Task CountAsync(object predicate = null, int? commandTimeout = null) where T : class - => await CountAsync((string)null, predicate, commandTimeout); - - public async Task CountAsync(string tableName, object predicate = null, int? commandTimeout = null) where T : class - => await CountAsync(tableName, null, predicate, commandTimeout); - - public async Task CountAsync(string tableName, string schemaName, object predicate = null, int? commandTimeout = null) where T : class - => await _dapper.CountAsync(Connection, predicate, _transaction, commandTimeout, tableName, schemaName, null); - - public long Count(IList join, object predicate = null, int? commandTimeout = null) where T : class - => _dapper.Count(Connection, predicate, _transaction, commandTimeout, null, null, join); - - public async Task CountAsync(IList join, object predicate = null, int? commandTimeout = null) where T : class - => await _dapper.CountAsync(Connection, predicate, _transaction, commandTimeout, null, null, join); - #endregion - - #region Delete - public bool Delete(T entity, int? commandTimeout = null) where T : class - => Delete(null, entity, commandTimeout); - - public bool Delete(string tableName, T entity, int? commandTimeout = null) where T : class - => Delete(tableName, null, entity, commandTimeout); - - public bool Delete(string tableName, string schemaName, T entity, int? commandTimeout = null) where T : class - => _dapper.Delete(Connection, entity, _transaction, commandTimeout, tableName, schemaName); - - - public bool Delete(object predicate, int? commandTimeout = null) where T : class - => Delete(null, predicate, commandTimeout); - - public bool Delete(string tableName, object predicate, int? commandTimeout = null) where T : class - => Delete(tableName, null, predicate, commandTimeout); - - public bool Delete(string tableName, string schemaName, object predicate, int? commandTimeout = null) where T : class - => _dapper.Delete(Connection, predicate, _transaction, commandTimeout, tableName, schemaName); - - - public async Task DeleteAsync(T entity, int? commandTimeout = null) where T : class - => await DeleteAsync(null, entity, commandTimeout); - - public async Task DeleteAsync(string tableName, T entity, int? commandTimeout = null) where T : class - => await DeleteAsync(tableName, null, entity, commandTimeout); - - public async Task DeleteAsync(string tableName, string schemaName, T entity, int? commandTimeout = null) where T : class - => await _dapper.DeleteAsync(Connection, entity, _transaction, commandTimeout, tableName, schemaName); - - - public async Task DeleteAsync(object predicate, int? commandTimeout = null) where T : class - => await DeleteAsync(null, predicate, commandTimeout); - - public async Task DeleteAsync(string tableName, object predicate, int? commandTimeout = null) where T : class - => await DeleteAsync(tableName, null, predicate, commandTimeout); - - public async Task DeleteAsync(string tableName, string schemaName, object predicate, int? commandTimeout = null) where T : class - => await _dapper.DeleteAsync(Connection, predicate, _transaction, commandTimeout, tableName, schemaName); - - #endregion - - #region Get - public T Get(dynamic id, int? commandTimeout = null) where T : class - => Get(id, (string)null, commandTimeout); - - public T Get(dynamic id, string tableName, int? commandTimeout = null) where T : class - => Get(id, tableName, (string)null, commandTimeout); - - public T Get(dynamic id, string tableName, string schemaName, int? commandTimeout = null) where T : class - => (T)_dapper.Get(Connection, id, _transaction, commandTimeout, tableName, schemaName, null, null); - - - public async Task GetAsync(dynamic id, int? commandTimeout = null) where T : class - => await GetAsync(id, (string)null, commandTimeout); - - public async Task GetAsync(dynamic id, string tableName, int? commandTimeout = null) where T : class - => await GetAsync(id, tableName, (string)null, commandTimeout); - - public async Task GetAsync(dynamic id, string tableName, string schemaName, int? commandTimeout = null) where T : class - => await _dapper.GetAsync(Connection, id, _transaction, commandTimeout, tableName, schemaName, null, null); - - - - public T Get(IList join, dynamic id, int? commandTimeout = null) where T : class - => Get(join, null, id, commandTimeout); - - public T Get(IList join, IList alias, dynamic id, int? commandTimeout = null) where T : class - => (T)_dapper.Get(Connection, id, _transaction, commandTimeout, null, null, join, alias); - - public async Task GetAsync(IList join, dynamic id, int? commandTimeout = null) where T : class - => await GetAsync(join, null, id, commandTimeout); - public async Task GetAsync(IList join, IList alias, dynamic id, int? commandTimeout = null) where T : class - => await _dapper.GetAsync(Connection, id, _transaction, commandTimeout, null, null, join, alias); - #endregion - - #region GetList - - public IEnumerable GetList(object predicate = null, IList sort = null, int? commandTimeout = null, bool buffered = true) where T : class - => GetList((string)null, predicate, sort, commandTimeout, buffered); - - public IEnumerable GetList(string tableName, object predicate = null, IList sort = null, int? commandTimeout = null, bool buffered = true) where T : class - => GetList(tableName, null, predicate, sort, commandTimeout, buffered); - - public IEnumerable GetList(string tableName, string schemaName, object predicate = null, IList sort = null, int? commandTimeout = null, bool buffered = true) where T : class - => _dapper.GetList(Connection, predicate, sort, _transaction, commandTimeout, buffered, tableName, schemaName, null, null); - - - public async Task> GetListAsync(object predicate = null, IList sort = null, int? commandTimeout = null) where T : class - => await GetListAsync((string)null, predicate, sort, commandTimeout); - - public async Task> GetListAsync(string tableName, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class - => await GetListAsync(tableName, null, predicate, sort, commandTimeout); - - public async Task> GetListAsync(string tableName, string schemaName, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class - => await _dapper.GetListAsync(Connection, predicate, sort, _transaction, commandTimeout, tableName, schemaName, null, null); - - - - public IEnumerable GetList(IList join, object predicate = null, IList sort = null, int? commandTimeout = null, bool buffered = true) where T : class - => GetList(join, null, predicate, sort, commandTimeout, buffered); - - public IEnumerable GetList(IList join, IList alias = null, object predicate = null, IList sort = null, int? commandTimeout = null, bool buffered = true) where T : class - => _dapper.GetList(Connection, predicate, sort, _transaction, commandTimeout, buffered, null, null, join, alias); - - public async Task> GetListAsync(IList join, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class - => await GetListAsync(join, null, predicate, sort, commandTimeout); - - public async Task> GetListAsync(IList join, IList alias = null, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class - => await _dapper.GetListAsync(Connection, predicate, sort, _transaction, commandTimeout, null, null, join, alias); - - #endregion - - #region GetMultiple - - public IMultipleResultReader GetMultiple(GetMultiplePredicate predicate = null, int? commandTimeout = null) - => GetMultiple(null, predicate, commandTimeout); - public IMultipleResultReader GetMultiple(string tableName, GetMultiplePredicate predicate = null, int? commandTimeout = null) - => GetMultiple(tableName, null, predicate, commandTimeout); - public IMultipleResultReader GetMultiple(string tableName, string schemaName, GetMultiplePredicate predicate = null, int? commandTimeout = null) - => _dapper.GetMultiple(Connection, predicate, _transaction, commandTimeout, tableName, schemaName); - - - - - public async Task GetMultipleAsync(GetMultiplePredicate predicate = null, int? commandTimeout = null) - => await GetMultipleAsync(null, predicate, commandTimeout); - - public async Task GetMultipleAsync(string tableName, GetMultiplePredicate predicate = null, int? commandTimeout = null) - => await GetMultipleAsync(tableName, null, predicate, commandTimeout); - - public async Task GetMultipleAsync(string tableName, string schemaName, GetMultiplePredicate predicate = null, int? commandTimeout = null) - => await _dapper.GetMultipleAsync(Connection, predicate, _transaction, commandTimeout, tableName, schemaName); - - #endregion - - - #region GetPage - public IEnumerable GetPage(int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null, bool buffered = true) where T : class - => GetPage((string)null, page, resultsPerPage, predicate, sort, commandTimeout); - - public IEnumerable GetPage(string tableName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null, bool buffered = true) where T : class - => GetPage(tableName, null, page, resultsPerPage, predicate, sort, commandTimeout); - - public IEnumerable GetPage(string tableName, string schemaName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null, bool buffered = true) where T : class - => _dapper.GetPage(Connection, predicate, sort, page, resultsPerPage, _transaction, commandTimeout, buffered, tableName, schemaName, null, null); - - - public async Task> GetPageAsync(int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class - => await GetPageAsync((string)null, page, resultsPerPage, predicate, sort, commandTimeout); - - public async Task> GetPageAsync(string tableName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class - => await GetPageAsync(tableName, null, page, resultsPerPage, predicate, sort, commandTimeout); - - public async Task> GetPageAsync(string tableName, string schemaName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class - => await _dapper.GetPageAsync(Connection, predicate, sort, page, resultsPerPage, _transaction, commandTimeout, tableName, schemaName, null, null); - - public IEnumerable GetPage(IList join, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null, bool buffered = true) where T : class - => GetPage(join, null, page, resultsPerPage, predicate, sort, commandTimeout); - public IEnumerable GetPage(IList join, IList alias, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null, bool buffered = true) where T : class - => _dapper.GetPage(Connection, predicate, sort, page, resultsPerPage, _transaction, commandTimeout, buffered, null, null, join, alias); - public async Task> GetPageAsync(IList join, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class - => await GetPageAsync(join, null, page, resultsPerPage, predicate, sort, commandTimeout); - public async Task> GetPageAsync(IList join, IList alias, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class - => await _dapper.GetPageAsync(Connection, predicate, sort, page, resultsPerPage, _transaction, commandTimeout, null, null, join, alias); - - #endregion - - #region GetPages - - public Page GetPages(int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class - => GetPages((string)null, page, resultsPerPage, predicate, sort, commandTimeout); - - public Page GetPages(string tableName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class - => GetPages(tableName, null, page, resultsPerPage, predicate, sort, commandTimeout); - - public Page GetPages(string tableName, string schemaName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class - => _dapper.GetPages(Connection, predicate, sort, page, resultsPerPage, _transaction, commandTimeout, tableName, schemaName, null, null); - - - public async Task> GetPagesAsync(int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class - => await GetPagesAsync((string)null, page, resultsPerPage, predicate, sort, commandTimeout); - - public async Task> GetPagesAsync(string tableName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class - => await GetPagesAsync(tableName, null, page, resultsPerPage, predicate, sort, commandTimeout); - - public async Task> GetPagesAsync(string tableName, string schemaName, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class - => await _dapper.GetPagesAsync(Connection, predicate, sort, page, resultsPerPage, _transaction, commandTimeout, tableName, schemaName, null, null); - - public Page GetPages(IList join, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class - => GetPages(join, null, page, resultsPerPage, predicate, sort, commandTimeout); - - public Page GetPages(IList join, IList alias, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class - => _dapper.GetPages(Connection, predicate, sort, page, resultsPerPage, _transaction, commandTimeout, null, null, join, alias); - public async Task> GetPagesAsync(IList join, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class - => await GetPagesAsync(join, null, page, resultsPerPage, predicate, sort, commandTimeout); - public async Task> GetPagesAsync(IList join, IList alias, int page = 1, int resultsPerPage = 10, object predicate = null, IList sort = null, int? commandTimeout = null) where T : class - => await _dapper.GetPagesAsync(Connection, predicate, sort, page, resultsPerPage, _transaction, commandTimeout, null, null, join, alias); - - - #endregion - - #region GetSet - public IEnumerable GetSet(object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, int? commandTimeout = null, bool buffered = true) where T : class - => GetSet((string)null, predicate, sort, firstResult, maxResults, commandTimeout, buffered); - - public IEnumerable GetSet(string tableName, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, int? commandTimeout = null, bool buffered = true) where T : class - => GetSet(tableName, null, predicate, sort, firstResult, maxResults, commandTimeout, buffered); - - public IEnumerable GetSet(string tableName, string schemaName, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, int? commandTimeout = null, bool buffered = true) where T : class - => _dapper.GetSet(Connection, predicate, sort, firstResult, maxResults, _transaction, commandTimeout, buffered, tableName, schemaName, null, null); - - - public async Task> GetSetAsync(object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, int? commandTimeout = null) where T : class - => await GetSetAsync((string)null, predicate, sort, firstResult, maxResults, commandTimeout); - - public async Task> GetSetAsync(string tableName, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, int? commandTimeout = null) where T : class - => await GetSetAsync(tableName, null, predicate, sort, firstResult, maxResults, commandTimeout); - - public async Task> GetSetAsync(string tableName, string schemaName, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, int? commandTimeout = null) where T : class - => await _dapper.GetSetAsync(Connection, predicate, sort, firstResult, maxResults, _transaction, commandTimeout, tableName, schemaName, null, null); - - public IEnumerable GetSet(IList join, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, int? commandTimeout = null, bool buffered = true) where T : class - => GetSet(join, null, predicate, sort, firstResult, maxResults, commandTimeout, buffered); - - public IEnumerable GetSet(IList join, IList alias, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, int? commandTimeout = null, bool buffered = true) where T : class - => _dapper.GetSet(Connection, predicate, sort, firstResult, maxResults, _transaction, commandTimeout, buffered, null, null, join, alias); - - public async Task> GetSetAsync(IList join, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, int? commandTimeout = null) where T : class - => await GetSetAsync(join, null, predicate, sort, firstResult, maxResults, commandTimeout); - - public async Task> GetSetAsync(IList join, IList alias, object predicate = null, IList sort = null, int firstResult = 1, int maxResults = 10, int? commandTimeout = null) where T : class - => await _dapper.GetSetAsync(Connection, predicate, sort, firstResult, maxResults, _transaction, commandTimeout, null, null, join, alias); - - #endregion - - #region Insert - public void Insert(IEnumerable entities, int? commandTimeout = null) where T : class - => Insert(null, entities, commandTimeout); - - public void Insert(string tableName, IEnumerable entities, int? commandTimeout = null) where T : class - => Insert(tableName, null, entities, commandTimeout); - - public void Insert(string tableName, string schemaName, IEnumerable entities, int? commandTimeout = null) where T : class - => _dapper.Insert(Connection, entities, _transaction, commandTimeout, tableName, schemaName); - - public dynamic Insert(T entity, int? commandTimeout = null) where T : class - => Insert(null, entity, commandTimeout); - - public dynamic Insert(string tableName, T entity, int? commandTimeout = null) where T : class - => Insert(tableName, null, entity, commandTimeout); - - public dynamic Insert(string tableName, string schemaName, T entity, int? commandTimeout = null) where T : class - => _dapper.Insert(Connection, entity, _transaction, commandTimeout, tableName, schemaName); - #endregion - - #region Update - - public bool Update(T entity, object predicate = null, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class - => Update(null, entity, predicate, commandTimeout, ignoreAllKeyProperties); - - public bool Update(string tableName, T entity, object predicate = null, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class - => Update(tableName, null, entity, predicate, commandTimeout, ignoreAllKeyProperties); - - public bool Update(string tableName, string schemaName, T entity, object predicate = null, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class - => _dapper.Update(Connection, entity, predicate, _transaction, commandTimeout, tableName, schemaName, ignoreAllKeyProperties); - - - - public bool UpdateSet(object entity, object predicate = null, int? commandTimeout = null) where T : class - => UpdateSet(null, entity, predicate, commandTimeout); - - public bool UpdateSet(string tableName, object entity, object predicate = null, int? commandTimeout = null) where T : class - => UpdateSet(tableName, null, entity, predicate, commandTimeout); - - public bool UpdateSet(string tableName, string schemaName, object entity, object predicate = null, int? commandTimeout = null) where T : class - => _dapper.UpdateSet(Connection, entity, predicate, _transaction, commandTimeout, tableName, schemaName); - - - - - public async Task UpdateAsync(T entity, object predicate, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class - => await UpdateAsync(null, entity, predicate, commandTimeout, ignoreAllKeyProperties); - - public async Task UpdateAsync(string tableName, T entity, object predicate, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class - => await UpdateAsync(tableName, null, entity, predicate, commandTimeout, ignoreAllKeyProperties); - - public async Task UpdateAsync(string tableName, string schemaName, T entity, object predicate, int? commandTimeout = null, bool ignoreAllKeyProperties = false) where T : class - => await _dapper.UpdateAsync(Connection, entity, predicate, _transaction, commandTimeout, tableName, schemaName, ignoreAllKeyProperties); - - - - public async Task UpdateSetAsync(object entity, object predicate = null, int? commandTimeout = null) where T : class - => await UpdateSetAsync(null, entity, predicate, commandTimeout); - - public async Task UpdateSetAsync(string tableName, object entity, object predicate = null, int? commandTimeout = null) where T : class - => await UpdateSetAsync(tableName, null, entity, predicate, commandTimeout); - - public async Task UpdateSetAsync(string tableName, string schemaName, object entity, object predicate = null, int? commandTimeout = null) where T : class - => await _dapper.UpdateSetAsync(Connection, entity, predicate, _transaction, commandTimeout, tableName, schemaName); - - - #endregion - - } -} diff --git a/samples/Common/Repository.Dapper.Core/DatabaseServiceCollectionExtensions.cs b/samples/Common/Repository.Dapper.Core/DatabaseServiceCollectionExtensions.cs deleted file mode 100644 index ea01dcf60..000000000 --- a/samples/Common/Repository.Dapper.Core/DatabaseServiceCollectionExtensions.cs +++ /dev/null @@ -1,105 +0,0 @@ -using Repository.Dapper.Core.Sql; -using Microsoft.Extensions.DependencyInjection; -using System; -using System.Collections.Generic; -using System.Data; -using System.Text; - -namespace Repository.Dapper.Core -{ - public enum ESqlDialect - { - DB2, - MySQL, - Oracle, - PostgreSql, - SqlCe, - Sqlite, - SqlServer - } - public class SqlDialectUtil - { - public static ISqlDialect ConvertESqlDialect(ESqlDialect sqlDialect) - { - ISqlDialect SqlDialect = null; - switch (sqlDialect) - { - case ESqlDialect.DB2: - SqlDialect = new DB2Dialect(); - break; - case ESqlDialect.MySQL: - SqlDialect = new MySqlDialect(); - break; - case ESqlDialect.Oracle: - SqlDialect = new OracleDialect(); - break; - case ESqlDialect.PostgreSql: - SqlDialect = new PostgreSqlDialect(); - break; - case ESqlDialect.SqlCe: - SqlDialect = new SqlCeDialect(); - break; - case ESqlDialect.Sqlite: - SqlDialect = new SqliteDialect(); - break; - case ESqlDialect.SqlServer: - SqlDialect = new SqlServerDialect(); - break; - } - return SqlDialect; - } - } - public static class DatabaseServiceCollectionExtensions - { - - /// - /// 设置SqlDialect,使用默认用法 - /// - /// - /// - /// - /// using(var con=new SqlConnection(Configuration.GetConnectionString("DefaultConnection")) - /// { - /// con.Insert(data); - /// } - /// - /// - public static IServiceCollection AddDapper(this IServiceCollection services, ESqlDialect SqlDialect) - { - DapperExtensions.Configure(SqlDialectUtil.ConvertESqlDialect(SqlDialect)); - - return services; - } - - /// - /// 使用IDatabase用法 - /// - /// - /// - /// - /// 是否同时使用扩展方法 - /// - public static IServiceCollection AddDapperDataBase(this IServiceCollection services, ESqlDialect sqlDialect, Func CreateConnection, bool UseExtension = false) - { - var SqlDialect = SqlDialectUtil.ConvertESqlDialect(sqlDialect); - services.AddOptions(); - services.Configure(opt => - { - opt.DbConnection = CreateConnection; - opt.sqlDialect = SqlDialectUtil.ConvertESqlDialect(sqlDialect); - }); - - if (UseExtension) - { - var Configuration = new DapperExtensionsConfiguration(SqlDialect); - DapperExtensions.Configure(Configuration); - services.AddSingleton(Configuration); - } - else - services.AddSingleton(); - - services.AddTransient(); - return services; - } - } -} diff --git a/samples/Common/Repository.Dapper.Core/GetMultiplePredicate.cs b/samples/Common/Repository.Dapper.Core/GetMultiplePredicate.cs deleted file mode 100644 index e931c2423..000000000 --- a/samples/Common/Repository.Dapper.Core/GetMultiplePredicate.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Repository.Dapper.Core -{ - public class GetMultiplePredicate - { - private readonly List _items; - - public GetMultiplePredicate() - { - _items = new List(); - } - - public IEnumerable Items - { - get { return _items.AsReadOnly(); } - } - - public void Add(IPredicate predicate, IList sort = null) where T : class - { - _items.Add(new GetMultiplePredicateItem - { - Value = predicate, - Type = typeof(T), - Sort = sort - }); - } - - public void Add(object id) where T : class - { - _items.Add(new GetMultiplePredicateItem - { - Value = id, - Type = typeof (T) - }); - } - - public class GetMultiplePredicateItem - { - public object Value { get; set; } - public Type Type { get; set; } - public IList Sort { get; set; } - } - } -} \ No newline at end of file diff --git a/samples/Common/Repository.Dapper.Core/GetMultipleResult.cs b/samples/Common/Repository.Dapper.Core/GetMultipleResult.cs deleted file mode 100644 index 752a8f1d6..000000000 --- a/samples/Common/Repository.Dapper.Core/GetMultipleResult.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Dapper; - -namespace Repository.Dapper.Core -{ - public interface IMultipleResultReader - { - IEnumerable Read(); - } - - public class GridReaderResultReader : IMultipleResultReader - { - private readonly SqlMapper.GridReader _reader; - - public GridReaderResultReader(SqlMapper.GridReader reader) - { - _reader = reader; - } - - public IEnumerable Read() - { - return _reader.Read(); - } - } - - public class SequenceReaderResultReader : IMultipleResultReader - { - private readonly Queue _items; - - public SequenceReaderResultReader(IEnumerable items) - { - _items = new Queue(items); - } - - public IEnumerable Read() - { - SqlMapper.GridReader reader = _items.Dequeue(); - return reader.Read(); - } - } -} \ No newline at end of file diff --git a/samples/Common/Repository.Dapper.Core/Mapper/AutoClassMapper.cs b/samples/Common/Repository.Dapper.Core/Mapper/AutoClassMapper.cs deleted file mode 100644 index 29b1cc6c7..000000000 --- a/samples/Common/Repository.Dapper.Core/Mapper/AutoClassMapper.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System.Text; -using System.Linq; -using System.Collections.Generic; -using System; -using System.Reflection; -using System.ComponentModel.DataAnnotations.Schema; - -namespace Repository.Dapper.Core.Mapper -{ - /// - /// Automatically maps an entity to a table using a combination of reflection and naming conventions for keys. - /// - public class AutoClassMapper : ClassMapper where T : class - { - public AutoClassMapper() - { - Type type = typeof(T); - var vTable = type.GetTypeInfo().GetCustomAttributes(typeof(TableAttribute), true).ToArray(); - var TableName = vTable.Length == 0 ? type.Name : (vTable[0] as TableAttribute).Name; - Table(TableName);// Table(type.Name); - if (vTable.Length > 0 && !string.IsNullOrWhiteSpace((vTable[0] as TableAttribute).Schema)) - Schema((vTable[0] as TableAttribute).Schema); - - var vNotKey = type.GetTypeInfo().GetCustomAttributes(typeof(NotKeyAttribute), true).ToArray(); - if (vNotKey.Length > 0) - DefinedKey(false); - AutoMap(); - } - } - - [AttributeUsage(AttributeTargets.Class)] - public sealed class NotKeyAttribute : Attribute - { - public NotKeyAttribute() - { - NoDefinedKey = true; - } - - public bool NoDefinedKey { get; set; } - } -} \ No newline at end of file diff --git a/samples/Common/Repository.Dapper.Core/Mapper/ClassMapper.cs b/samples/Common/Repository.Dapper.Core/Mapper/ClassMapper.cs deleted file mode 100644 index 4ba847cab..000000000 --- a/samples/Common/Repository.Dapper.Core/Mapper/ClassMapper.cs +++ /dev/null @@ -1,180 +0,0 @@ -using System.Numerics; -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Linq.Expressions; -using System.Reflection; -using System.ComponentModel.DataAnnotations; - -namespace Repository.Dapper.Core.Mapper -{ - public interface IClassMapper - { - string SchemaName { get; } - string TableName { get; } - IList Properties { get; } - Type EntityType { get; } - } - - public interface IClassMapper : IClassMapper where T : class - { - } - - /// - /// Maps an entity to a table through a collection of property maps. - /// - public class ClassMapper : IClassMapper where T : class - { - /// - /// Gets or sets the schema to use when referring to the corresponding table name in the database. - /// - public string SchemaName { get; protected set; } - - /// - /// Gets or sets the table to use in the database. - /// - public string TableName { get; protected set; } - private bool _HasDefinedKey = true; - public bool HasDefinedKey { get { return _HasDefinedKey; } protected set { _HasDefinedKey = value; } } - - /// - /// A collection of properties that will map to columns in the database table. - /// - public IList Properties { get; private set; } - - public Type EntityType - { - get { return typeof(T); } - } - - public ClassMapper() - { - PropertyTypeKeyTypeMapping = new Dictionary - { - { typeof(byte), KeyType.Identity }, { typeof(byte?), KeyType.Identity }, - { typeof(sbyte), KeyType.Identity }, { typeof(sbyte?), KeyType.Identity }, - { typeof(short), KeyType.Identity }, { typeof(short?), KeyType.Identity }, - { typeof(ushort), KeyType.Identity }, { typeof(ushort?), KeyType.Identity }, - { typeof(int), KeyType.Identity }, { typeof(int?), KeyType.Identity }, - { typeof(uint), KeyType.Identity}, { typeof(uint?), KeyType.Identity }, - { typeof(long), KeyType.Identity }, { typeof(long?), KeyType.Identity }, - { typeof(ulong), KeyType.Identity }, { typeof(ulong?), KeyType.Identity }, - { typeof(BigInteger), KeyType.Identity }, { typeof(BigInteger?), KeyType.Identity }, - { typeof(Guid), KeyType.Guid }, { typeof(Guid?), KeyType.Guid }, - }; - - Properties = new List(); - Table(typeof(T).Name); - } - - protected Dictionary PropertyTypeKeyTypeMapping { get; private set; } - - public virtual void Schema(string schemaName) - { - SchemaName = schemaName; - } - - public virtual void Table(string tableName) - { - TableName = tableName; - } - public virtual void DefinedKey(bool hasDefinedKey) - { - HasDefinedKey = hasDefinedKey; - } - - protected virtual void AutoMap() - { - AutoMap(null); - } - - protected virtual void AutoMap(Func canMap) - { - Type type = typeof(T); - bool hasDefinedKey = Properties.Any(p => p.KeyType != KeyType.NotAKey); - PropertyMap keyMap = null; - foreach (var propertyInfo in type.GetProperties()) - { - if (Properties.Any(p => p.Name.Equals(propertyInfo.Name, StringComparison.InvariantCultureIgnoreCase))) - { - continue; - } - - if ((canMap != null && !canMap(type, propertyInfo))) - { - continue; - } - - PropertyMap map = Map(propertyInfo); - if (!hasDefinedKey && _HasDefinedKey) - { - if (string.Equals(map.PropertyInfo.Name, "id", StringComparison.InvariantCultureIgnoreCase) && !map.Ignored && !map.IsReadOnly) - { - keyMap = map; - } - - if (keyMap == null && map.PropertyInfo.Name.EndsWith("id", true, CultureInfo.InvariantCulture) && !map.Ignored && !map.IsReadOnly) - { - keyMap = map; - } - var KeyAttr = propertyInfo.GetCustomAttributes(typeof(KeyAttribute), true).ToArray(); - if (KeyAttr.Length > 0) - keyMap = map; - } - } - - if (keyMap != null) - { - keyMap.Key(PropertyTypeKeyTypeMapping.ContainsKey(keyMap.PropertyInfo.PropertyType) - ? PropertyTypeKeyTypeMapping[keyMap.PropertyInfo.PropertyType] - : KeyType.Assigned); - } - } - - /// - /// Fluently, maps an entity property to a column - /// - protected PropertyMap Map(Expression> expression) - { - PropertyInfo propertyInfo = ReflectionHelper.GetProperty(expression) as PropertyInfo; - return Map(propertyInfo); - } - - /// - /// Fluently, maps an entity property to a column - /// - protected PropertyMap Map(PropertyInfo propertyInfo) - { - PropertyMap result = new PropertyMap(propertyInfo); - this.GuardForDuplicatePropertyMap(result); - Properties.Add(result); - return result; - } - - /// - /// Removes a propertymap entry - /// - /// - protected void UnMap(Expression> expression) - { - var propertyInfo = ReflectionHelper.GetProperty(expression) as PropertyInfo; - var mapping = this.Properties.Where(w => w.Name == propertyInfo.Name).SingleOrDefault(); - - if (mapping == null) - { - throw new ApplicationException("Unable to UnMap because mapping does not exist."); - } - - this.Properties.Remove(mapping); - } - - private void GuardForDuplicatePropertyMap(PropertyMap result) - { - if (Properties.Any(p => p.Name.Equals(result.Name))) - { - throw new ArgumentException(string.Format("Duplicate mapping for property {0} detected.",result.Name)); - } - } - } -} \ No newline at end of file diff --git a/samples/Common/Repository.Dapper.Core/Mapper/PluralizedAutoClassMapper.cs b/samples/Common/Repository.Dapper.Core/Mapper/PluralizedAutoClassMapper.cs deleted file mode 100644 index 19c74af0e..000000000 --- a/samples/Common/Repository.Dapper.Core/Mapper/PluralizedAutoClassMapper.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System.Text; -using System.Linq; -using System.Collections.Generic; -using System; -using System.Text.RegularExpressions; - -namespace Repository.Dapper.Core.Mapper -{ - /// - /// Automatically maps an entity to a table using a combination of reflection and naming conventions for keys. - /// Identical to AutoClassMapper, but attempts to pluralize table names automatically. - /// Example: Person entity maps to People table - /// - public class PluralizedAutoClassMapper : AutoClassMapper where T : class - { - public override void Table(string tableName) - { - base.Table(Formatting.Pluralize(tableName)); - } - - // Adapted from: http://mattgrande.wordpress.com/2009/10/28/pluralization-helper-for-c/ - public static class Formatting - { - private static readonly IList Unpluralizables = new List { "equipment", "information", "rice", "money", "species", "series", "fish", "sheep", "deer" }; - private static readonly IDictionary Pluralizations = new Dictionary - { - // Start with the rarest cases, and move to the most common - { "person", "people" }, - { "ox", "oxen" }, - { "child", "children" }, - { "foot", "feet" }, - { "tooth", "teeth" }, - { "goose", "geese" }, - // And now the more standard rules. - { "(.*)fe?$", "$1ves" }, // ie, wolf, wife - { "(.*)man$", "$1men" }, - { "(.+[aeiou]y)$", "$1s" }, - { "(.+[^aeiou])y$", "$1ies" }, - { "(.+z)$", "$1zes" }, - { "([m|l])ouse$", "$1ice" }, - { "(.+)(e|i)x$", @"$1ices"}, // ie, Matrix, Index - { "(octop|vir)us$", "$1i"}, - { "(.+(s|x|sh|ch))$", @"$1es"}, - { "(.+)", @"$1s" } - }; - - public static string Pluralize(string singular) - { - if (Unpluralizables.Contains(singular)) - return singular; - - var plural = string.Empty; - - foreach (var pluralization in Pluralizations) - { - if (Regex.IsMatch(singular, pluralization.Key)) - { - plural = Regex.Replace(singular, pluralization.Key, pluralization.Value); - break; - } - } - - return plural; - } - } - } -} \ No newline at end of file diff --git a/samples/Common/Repository.Dapper.Core/Mapper/PropertyMap.cs b/samples/Common/Repository.Dapper.Core/Mapper/PropertyMap.cs deleted file mode 100644 index ab5b14ba3..000000000 --- a/samples/Common/Repository.Dapper.Core/Mapper/PropertyMap.cs +++ /dev/null @@ -1,162 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Reflection; - -namespace Repository.Dapper.Core.Mapper -{ - /// - /// Maps an entity property to its corresponding column in the database. - /// - public interface IPropertyMap - { - string Name { get; } - string ColumnName { get; } - bool Ignored { get; } - bool IsReadOnly { get; } - KeyType KeyType { get; } - PropertyInfo PropertyInfo { get; } - } - - /// - /// Maps an entity property to its corresponding column in the database. - /// - public class PropertyMap : IPropertyMap - { - public PropertyMap(PropertyInfo propertyInfo) - { - PropertyInfo = propertyInfo; - var ColumnAttr = propertyInfo.GetCustomAttributes(typeof(ColumnAttribute), true).ToArray(); - ColumnName = ColumnAttr.Length == 0 ? PropertyInfo.Name : (ColumnAttr[0] as ColumnAttribute).Name; // PropertyInfo.Name; - - var cIgnore = propertyInfo.GetCustomAttributes(typeof(NotMappedAttribute), true).ToArray(); - Ignored = cIgnore.Length > 0; - - //var cReadOnly = propertyInfo.GetCustomAttributes(typeof(DatabaseGeneratedAttribute), true).ToArray(); - //IsReadOnly = cReadOnly.Length > 0; - } - - /// - /// Gets the name of the property by using the specified propertyInfo. - /// - public string Name - { - get { return PropertyInfo.Name; } - } - - /// - /// Gets the column name for the current property. - /// - public string ColumnName { get; private set; } - - /// - /// Gets the key type for the current property. - /// - public KeyType KeyType { get; private set; } - - /// - /// Gets the ignore status of the current property. If ignored, the current property will not be included in queries. - /// - public bool Ignored { get; private set; } - - /// - /// Gets the read-only status of the current property. If read-only, the current property will not be included in INSERT and UPDATE queries. - /// - public bool IsReadOnly { get; private set; } - - /// - /// Gets the property info for the current property. - /// - public PropertyInfo PropertyInfo { get; private set; } - - /// - /// Fluently sets the column name for the property. - /// - /// The column name as it exists in the database. - public PropertyMap Column(string columnName) - { - ColumnName = columnName; - return this; - } - - /// - /// Fluently sets the key type of the property. - /// - /// The column name as it exists in the database. - public PropertyMap Key(KeyType keyType) - { - if (Ignored) - { - throw new ArgumentException(string.Format("'{0}' is ignored and cannot be made a key field. ", Name)); - } - - if (IsReadOnly) - { - throw new ArgumentException(string.Format("'{0}' is readonly and cannot be made a key field. ", Name)); - } - - KeyType = keyType; - return this; - } - - /// - /// Fluently sets the ignore status of the property. - /// - public PropertyMap Ignore() - { - if (KeyType != KeyType.NotAKey) - { - throw new ArgumentException(string.Format("'{0}' is a key field and cannot be ignored.", Name)); - } - - Ignored = true; - return this; - } - - /// - /// Fluently sets the read-only status of the property. - /// - public PropertyMap ReadOnly() - { - if (KeyType != KeyType.NotAKey) - { - throw new ArgumentException(string.Format("'{0}' is a key field and cannot be marked readonly.", Name)); - } - - IsReadOnly = true; - return this; - } - } - - /// - /// Used by ClassMapper to determine which entity property represents the key. - /// - public enum KeyType - { - /// - /// The property is not a key and is not automatically managed. - /// - NotAKey, - - /// - /// The property is an integery-based identity generated from the database. - /// - Identity, - - /// - /// The property is an identity generated by the database trigger. - /// - TriggerIdentity, - - /// - /// The property is a Guid identity which is automatically managed. - /// - Guid, - - /// - /// The property is a key that is not automatically managed. - /// - Assigned - } -} \ No newline at end of file diff --git a/samples/Common/Repository.Dapper.Core/Page.cs b/samples/Common/Repository.Dapper.Core/Page.cs deleted file mode 100644 index 4788c368d..000000000 --- a/samples/Common/Repository.Dapper.Core/Page.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Repository.Dapper.Core -{ - public class Page - { - - /// - /// Ŀ - /// - public long TotalItems { get; set; } - - /// - /// ÿҳĿ - /// - public long ItemsPerPage { get; set; } - - /// - /// ǰҳ - /// - public long CurrentPage { get; set; } - - public IEnumerable Items { get; set; } - - /// - /// ҳ - /// - public long TotalPages - { - get { return (long)Math.Ceiling((decimal)TotalItems / ItemsPerPage); } - } - } -} \ No newline at end of file diff --git a/samples/Common/Repository.Dapper.Core/Predicates.cs b/samples/Common/Repository.Dapper.Core/Predicates.cs deleted file mode 100644 index be96f22eb..000000000 --- a/samples/Common/Repository.Dapper.Core/Predicates.cs +++ /dev/null @@ -1,732 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Reflection; -using System.Text; -using Repository.Dapper.Core.Mapper; -using Repository.Dapper.Core.Sql; - -namespace Repository.Dapper.Core -{ - public static class Predicates - { - /// - /// 创建条件 - /// Factory method that creates a new IFieldPredicate predicate: [FieldName] [Operator] [Value]. - /// Example: WHERE FirstName = 'Foo' - /// - /// The type of the entity. - /// An expression that returns the left operand [FieldName]. - /// The comparison operator. - /// The value for the predicate. - /// Effectively inverts the comparison operator. Example: WHERE FirstName <> 'Foo'. - /// An instance of IFieldPredicate. - public static IFieldPredicate Field(Expression> expression, Operator op, object value, string tableName = null, string schemaName = null, bool not = false) where T : class - { - PropertyInfo propertyInfo = ReflectionHelper.GetProperty(expression) as PropertyInfo; - return new FieldPredicate - { - PropertyName = propertyInfo.Name, - Operator = op, - Value = value, - Not = not, - SchemaName = schemaName, - TableName = tableName - }; - } - - public static IFieldPredicate Field(Type type,string PropertyName, Operator op, object value, string tableName = null, string schemaName = null, bool not = false) - { - PropertyInfo propertyInfo = type.GetProperties().Where(w => w.Name == PropertyName).First(); - return new FieldPredicate - { - FieldType = type, - PropertyName = propertyInfo.Name, - Operator = op, - Value = value, - Not = not, - SchemaName = schemaName, - TableName = tableName - }; - } - - /// - /// Factory method that creates a new IPropertyPredicate predicate: [FieldName1] [Operator] [FieldName2] - /// Example: WHERE FirstName = LastName - /// - /// The type of the entity for the left operand. - /// The type of the entity for the right operand. - /// An expression that returns the left operand [FieldName1]. - /// The comparison operator. - /// An expression that returns the right operand [FieldName2]. - /// Effectively inverts the comparison operator. Example: WHERE FirstName <> LastName - /// An instance of IPropertyPredicate. - public static IPropertyPredicate Property(Expression> expression, Operator op, Expression> expression2, string tableName = null, string tableName2 = null, string schemaName = null, string schemaName2 = null, bool not = false) - where T : class - where T2 : class - { - PropertyInfo propertyInfo = ReflectionHelper.GetProperty(expression) as PropertyInfo; - PropertyInfo propertyInfo2 = ReflectionHelper.GetProperty(expression2) as PropertyInfo; - return new PropertyPredicate - { - SchemaName = schemaName, - TableName = tableName, - SchemaName2 = schemaName2, - TableName2 = tableName2, - PropertyName = propertyInfo.Name, - PropertyName2 = propertyInfo2.Name, - Operator = op, - Not = not - }; - } - - /// - /// 关联查询列表重复设置 - /// - /// - /// - /// - /// - /// - public static IJoinAliasPredicate JoinAlia(Expression> expression, Expression> expression2) - where T : class - where T2 : class - { - PropertyInfo propertyInfo = ReflectionHelper.GetProperty(expression) as PropertyInfo; - PropertyInfo propertyInfo2 = ReflectionHelper.GetProperty(expression2) as PropertyInfo; - return new JoinAliasPredicate - { - PropertyName = propertyInfo.Name, - PropertyName2 = propertyInfo2.Name - }; - } - - /// - /// 设置关联查询 - /// - /// - /// - /// - /// - /// - /// - /// - /// - public static IJoinPredicate Join(Expression> expression, Operator op, Expression> expression2, JoinOperator join = JoinOperator.Inner, string tableName = null, string tableName2 = null, string schemaName = null, string schemaName2 = null, bool not = false) - where T : class - where T2 : class - { - PropertyInfo propertyInfo = ReflectionHelper.GetProperty(expression) as PropertyInfo; - PropertyInfo propertyInfo2 = ReflectionHelper.GetProperty(expression2) as PropertyInfo; - return new JoinPredicate - { - SchemaName = schemaName, - TableName = tableName, - SchemaName2 = schemaName2, - TableName2 = tableName2, - Join = join, - PropertyName = propertyInfo.Name, - PropertyName2 = propertyInfo2.Name, - Operator = op, - Not = not - }; - } - - /// - /// Factory method that creates a new IPredicateGroup predicate. - /// Predicate groups can be joined together with other predicate groups. - /// - /// The grouping operator to use when joining the predicates (AND / OR). - /// A list of predicates to group. - /// An instance of IPredicateGroup. - public static IPredicateGroup Group(GroupOperator op, params IPredicate[] predicate) - { - return new PredicateGroup - { - Operator = op, - Predicates = predicate - }; - } - - /// - /// Factory method that creates a new IExistsPredicate predicate. - /// - public static IExistsPredicate Exists(IPredicate predicate, bool not = false) - where TSub : class - { - return new ExistsPredicate - { - Not = not, - Predicate = predicate - }; - } - - /// - /// Factory method that creates a new IBetweenPredicate predicate. - /// - public static IBetweenPredicate Between(Expression> expression, BetweenValues values, string tableName = null, string schemaName = null, bool not = false) - where T : class - { - PropertyInfo propertyInfo = ReflectionHelper.GetProperty(expression) as PropertyInfo; - return new BetweenPredicate - { - Not = not, - PropertyName = propertyInfo.Name, - Value = values, - SchemaName = schemaName, - TableName = tableName - }; - } - - /// - /// Factory method that creates a new Sort which controls how the results will be sorted. - /// - public static ISort Sort(Expression> expression, bool ascending = true, string tableName = null, string schemaName = null) - { - PropertyInfo propertyInfo = ReflectionHelper.GetProperty(expression) as PropertyInfo; - return new Sort - { - PropertyName = propertyInfo.Name, - Ascending = ascending, - SchemaName = schemaName, - TableName = tableName - }; - } - } - - /// - /// 条件 - /// - public interface IPredicate - { - /// - /// 返回条件的类 - /// - /// - Type GetPredicateType(); - - /// - /// 返回条件的sql - /// - /// - /// - /// - /// - /// - string GetSql(bool prefix, ISqlGenerator sqlGenerator, IDictionary parameters, string schemaName, string tableName); - } - - /// - /// 基本条件 - /// - public interface IBasePredicate : IPredicate - { - /// - /// 前缀 - /// - string SchemaName { get; set; } - /// - /// 表名 - /// - string TableName { get; set; } - - /// - /// 条件属性 - /// - string PropertyName { get; set; } - - } - - /// - /// 基本条件 - /// - public abstract class BasePredicate : IBasePredicate - { - public abstract Type GetPredicateType(); - - /// - /// 返回sql - /// - /// - /// - /// - /// - /// - public abstract string GetSql(bool prefix, ISqlGenerator sqlGenerator, IDictionary parameters, string schemaName, string tableName); - /// - /// 条件属性 - /// - public string PropertyName { get; set; } - /// - /// 前缀 - /// - public string SchemaName { get; set; } - /// - /// 表名 - /// - public string TableName { get; set; } - - /// - /// 返回列名 - /// - /// - /// - /// - /// - /// - /// - protected virtual string GetColumnName(bool prefix, Type entityType, ISqlGenerator sqlGenerator, string propertyName, string schemaName, string tableName) - { - IClassMapper map = GetMapper(entityType, sqlGenerator); - if (map == null) - { - throw new NullReferenceException(string.Format("Map was not found for {0}", entityType)); - } - - IPropertyMap propertyMap = map.Properties.SingleOrDefault(p => p.Name == propertyName); - if (propertyMap == null) - { - throw new NullReferenceException(string.Format("{0} was not found for {1}", propertyName, entityType)); - } - return sqlGenerator.GetColumnName(prefix,map, propertyMap, false, schemaName, tableName); - } - - protected virtual IClassMapper GetMapper(Type entityType, ISqlGenerator sqlGenerator) - { - return sqlGenerator.Configuration.GetMap(entityType); - } - } - - /// - /// 比较条件 - /// - public interface IComparePredicate : IBasePredicate - { - /// - /// 操作符 - /// - Operator Operator { get; set; } - /// - /// 操作符取反 - /// - bool Not { get; set; } - } - - public abstract class ComparePredicate : BasePredicate - { - public Operator Operator { get; set; } - public bool Not { get; set; } - - public virtual string GetOperatorString(ISqlGenerator sqlGenerator) => sqlGenerator.GetOperatorString(Operator, Not); - } - - public interface IFieldPredicate : IComparePredicate - { - object Value { get; set; } - } - - public class FieldPredicate : ComparePredicate, IFieldPredicate - where T : class - { - public override Type GetPredicateType() - { - return typeof(T); - } - public object Value { get; set; } - - public override string GetSql(bool prefix, ISqlGenerator sqlGenerator, IDictionary parameters, string schemaName, string tableName) - { - string columnName = GetColumnName(prefix,typeof(T), sqlGenerator, PropertyName, SchemaName ?? schemaName, TableName ?? tableName); - if (Value == null) - { - return string.Format("({0} IS {1}NULL)", columnName, Not ? "NOT " : string.Empty); - } - - if (Value is IEnumerable && !(Value is string)) - { - if (Operator != Operator.Eq) - { - throw new ArgumentException("Operator must be set to Eq for Enumerable types"); - } - - List @params = new List(); - foreach (var value in (IEnumerable)Value) - { - string valueParameterName = parameters.SetParameterName(this.PropertyName, value, sqlGenerator.Configuration.Dialect.ParameterPrefix); - @params.Add(valueParameterName); - } - - string paramStrings = @params.Aggregate(new StringBuilder(), (sb, s) => sb.Append((sb.Length != 0 ? ", " : string.Empty) + s), sb => sb.ToString()); - return string.Format("({0} {1}IN ({2}))", columnName, Not ? "NOT " : string.Empty, paramStrings); - } - - string parameterName = parameters.SetParameterName(this.PropertyName, this.Value, sqlGenerator.Configuration.Dialect.ParameterPrefix); - return string.Format("({0} {1} {2})", columnName, GetOperatorString(sqlGenerator), parameterName); - } - } - - public class FieldPredicate : ComparePredicate, IFieldPredicate - { - public override Type GetPredicateType() - { - return FieldType; - } - public Type FieldType { get; set; } - - public object Value { get; set; } - - public override string GetSql(bool prefix, ISqlGenerator sqlGenerator, IDictionary parameters, string schemaName, string tableName) - { - string columnName = GetColumnName(prefix,FieldType, sqlGenerator, PropertyName, SchemaName ?? schemaName, TableName ?? tableName); - if (Value == null) - { - return string.Format("({0} IS {1}NULL)", columnName, Not ? "NOT " : string.Empty); - } - - if (Value is IEnumerable && !(Value is string)) - { - if (Operator != Operator.Eq) - { - throw new ArgumentException("Operator must be set to Eq for Enumerable types"); - } - - List @params = new List(); - foreach (var value in (IEnumerable)Value) - { - string valueParameterName = parameters.SetParameterName(this.PropertyName, value, sqlGenerator.Configuration.Dialect.ParameterPrefix); - @params.Add(valueParameterName); - } - - string paramStrings = @params.Aggregate(new StringBuilder(), (sb, s) => sb.Append((sb.Length != 0 ? ", " : string.Empty) + s), sb => sb.ToString()); - return string.Format("({0} {1}IN ({2}))", columnName, Not ? "NOT " : string.Empty, paramStrings); - } - - string parameterName = parameters.SetParameterName(this.PropertyName, this.Value, sqlGenerator.Configuration.Dialect.ParameterPrefix); - return string.Format("({0} {1} {2})", columnName, GetOperatorString(sqlGenerator), parameterName); - } - } - - public interface IJoinPredicate : IComparePredicate - { - - string SchemaName2 { get; set; } - string TableName2 { get; set; } - string PropertyName2 { get; set; } - JoinOperator Join { get; set; } - IClassMapper GetLeftMapper(ISqlGenerator sqlGenerator); - IClassMapper GetRightMapper(ISqlGenerator sqlGenerator); - } - - public class JoinPredicate : ComparePredicate, IJoinPredicate - where T : class - where T2 : class - { - public override Type GetPredicateType() - { - return typeof(T); - } - public string PropertyName2 { get; set; } - - public JoinOperator Join { get; set; } - - public string SchemaName2 { get; set; } - public string TableName2 { get; set; } - - public IClassMapper GetLeftMapper(ISqlGenerator sqlGenerator) - { - return GetMapper(typeof(T), sqlGenerator); - } - - public IClassMapper GetRightMapper(ISqlGenerator sqlGenerator) - { - return GetMapper(typeof(T2), sqlGenerator); - } - - public override string GetSql(bool prefix, ISqlGenerator sqlGenerator, IDictionary parameters, string schemaName, string tableName) - { - string righttable = sqlGenerator.GetTableName(GetRightMapper(sqlGenerator), SchemaName2, TableName2); - string columnName = GetColumnName(true,typeof(T), sqlGenerator, PropertyName, SchemaName ?? schemaName, TableName ?? tableName); - string columnName2 = GetColumnName(true,typeof(T2), sqlGenerator, PropertyName2, SchemaName2, TableName2); - string vjoin = Join == JoinOperator.Full ? "full join" : Join == JoinOperator.Left ? "left join" : Join == JoinOperator.Right ? "right join" : "inner join"; - return $" {vjoin} {righttable} on {columnName} {GetOperatorString(sqlGenerator)} {columnName2}"; - } - } - - public interface IJoinAliasPredicate : IComparePredicate - { - string PropertyName2 { get; set; } - - IClassMapper GetRightMapper(ISqlGenerator sqlGenerator); - IPropertyMap GetPropertyMap(ISqlGenerator sqlGenerator); - } - public class JoinAliasPredicate : ComparePredicate, IJoinAliasPredicate - where T : class - where T2 : class - { - public override Type GetPredicateType() - { - return typeof(T); - } - public string PropertyName2 { get; set; } - - public IClassMapper GetRightMapper(ISqlGenerator sqlGenerator) - { - return GetMapper(typeof(T2), sqlGenerator); - } - - public IPropertyMap GetPropertyMap(ISqlGenerator sqlGenerator) - { - var rightMap = GetRightMapper(sqlGenerator); - var property = rightMap.Properties.Where(w => w.Name.Equals(PropertyName2)).First(); - return property; - } - - public override string GetSql(bool prefix, ISqlGenerator sqlGenerator, IDictionary parameters, string schemaName, string tableName) - { - return string.Empty; - } - } - - public interface IPropertyPredicate : IComparePredicate - { - string SchemaName2 { get; set; } - string TableName2 { get; set; } - string PropertyName2 { get; set; } - } - - - public class PropertyPredicate : ComparePredicate, IPropertyPredicate - where T : class - where T2 : class - { - public override Type GetPredicateType() - { - return typeof(T); - } - public string PropertyName2 { get; set; } - public string SchemaName2 { get; set; } - public string TableName2 { get; set; } - - public override string GetSql(bool prefix, ISqlGenerator sqlGenerator, IDictionary parameters, string schemaName, string tableName) - { - string columnName = GetColumnName(prefix,typeof(T), sqlGenerator, PropertyName, SchemaName ?? schemaName, TableName ?? tableName); - string columnName2 = GetColumnName(prefix, typeof(T2), sqlGenerator, PropertyName2, schemaName, tableName); - return string.Format("({0} {1} {2})", columnName, GetOperatorString(sqlGenerator), columnName2); - } - } - - public struct BetweenValues - { - public object Value1 { get; set; } - public object Value2 { get; set; } - } - - public interface IBetweenPredicate : IPredicate - { - string PropertyName { get; set; } - BetweenValues Value { get; set; } - bool Not { get; set; } - - } - - public class BetweenPredicate : BasePredicate, IBetweenPredicate - where T : class - { - public override Type GetPredicateType() - { - return typeof(T); - } - public override string GetSql(bool prefix, ISqlGenerator sqlGenerator, IDictionary parameters, string schemaName, string tableName) - { - string columnName = GetColumnName(prefix, typeof(T), sqlGenerator, PropertyName, SchemaName ?? schemaName, TableName ?? tableName); - string propertyName1 = parameters.SetParameterName(this.PropertyName, this.Value.Value1, sqlGenerator.Configuration.Dialect.ParameterPrefix); - string propertyName2 = parameters.SetParameterName(this.PropertyName, this.Value.Value2, sqlGenerator.Configuration.Dialect.ParameterPrefix); - return string.Format("({0} {1}BETWEEN {2} AND {3})", columnName, Not ? "NOT " : string.Empty, propertyName1, propertyName2); - } - - public BetweenValues Value { get; set; } - - public bool Not { get; set; } - } - - /// - /// Comparison operator for predicates. - /// - public enum Operator - { - /// - /// Equal to = - /// - Eq, - - /// - /// Greater than > - /// - Gt, - - /// - /// Greater than or equal to >= - /// - Ge, - - /// - /// Less than < - /// - Lt, - - /// - /// Less than or equal to <= - /// - Le, - - /// - /// Like (You can use % in the value to do wilcard searching) - /// - Like - } - - public interface IPredicateGroup : IPredicate - { - GroupOperator Operator { get; set; } - IList Predicates { get; set; } - } - - /// - /// Groups IPredicates together using the specified group operator. - /// - public class PredicateGroup : IPredicateGroup - { - public Type GetPredicateType() - { - return null; - } - public GroupOperator Operator { get; set; } - public IList Predicates { get; set; } - public string GetSql(bool prefix, ISqlGenerator sqlGenerator, IDictionary parameters, string schemaName, string tableName) - { - string seperator = Operator == GroupOperator.And ? " AND " : " OR "; - return "(" + Predicates.Aggregate(new StringBuilder(), - (sb, p) => (sb.Length == 0 ? sb : sb.Append(seperator)).Append(p.GetSql(prefix, sqlGenerator, parameters, schemaName, tableName)), - sb => - { - var s = sb.ToString(); - if (s.Length == 0) return sqlGenerator.Configuration.Dialect.EmptyExpression; - return s; - } - ) + ")"; - } - } - - public interface IExistsPredicate : IPredicate - { - IPredicate Predicate { get; set; } - bool Not { get; set; } - } - - public class ExistsPredicate : IExistsPredicate - where TSub : class - { - public Type GetPredicateType() - { - return typeof(TSub); - } - public IPredicate Predicate { get; set; } - public bool Not { get; set; } - - public string GetSql(bool prefix, ISqlGenerator sqlGenerator, IDictionary parameters, string schemaName, string tableName) - { - IClassMapper mapSub = sqlGenerator.Configuration.GetMap(typeof(TSub)); - string sql = string.Format("({0}EXISTS (SELECT 1 FROM {1} WHERE {2}))", - Not ? "NOT " : string.Empty, - sqlGenerator.GetTableName(mapSub, schemaName, tableName), - Predicate.GetSql(prefix, sqlGenerator, parameters, schemaName, tableName)); - return sql; - } - } - - public interface ISort - { - string SchemaName { get; set; } - /// - /// 表名 - /// - string TableName { get; set; } - string PropertyName { get; set; } - bool Ascending { get; set; } - string GetSql(bool prefix, ISqlGenerator sqlGenerator, string schemaName, string tableName); - } - - public class Sort : ISort - { - /// - /// 前缀 - /// - public string SchemaName { get; set; } - /// - /// 表名 - /// - public string TableName { get; set; } - public string PropertyName { get; set; } - public bool Ascending { get; set; } - - public string GetSql(bool prefix, ISqlGenerator sqlGenerator, string schemaName, string tableName) - { - return sqlGenerator.GetColumnName(prefix,sqlGenerator.Configuration.GetMap(typeof(T)), PropertyName, false, SchemaName ?? schemaName, TableName ?? tableName) + (Ascending ? " ASC" : " DESC"); - } - } - internal class SortKey : ISort - { - private IClassMapper classMapper { get; set; } - public SortKey(IClassMapper classMapper) - { - this.classMapper = classMapper; - } - - /// - /// 前缀 - /// - public string SchemaName { get; set; } - /// - /// 表名 - /// - public string TableName { get; set; } - public string PropertyName { get; set; } - public bool Ascending { get; set; } - - public string GetSql(bool prefix, ISqlGenerator sqlGenerator, string schemaName, string tableName) - { - return sqlGenerator.GetColumnName(prefix,classMapper, PropertyName, false, SchemaName ?? schemaName, TableName ?? tableName) + (Ascending ? " ASC" : " DESC"); - } - } - - /// - /// 在条件组中的操作符 Operator to use when joining predicates in a PredicateGroup. - /// - public enum GroupOperator - { - And, - Or - } - - public enum JoinOperator - { - /// - /// 内关联 - /// - Inner, - /// - /// 左关联 - /// - Left, - /// - /// 右关联 - /// - Right, - /// - /// 全关联 - /// - Full - } -} \ No newline at end of file diff --git a/samples/Common/Repository.Dapper.Core/ReflectionHelper.cs b/samples/Common/Repository.Dapper.Core/ReflectionHelper.cs deleted file mode 100644 index ab21ff211..000000000 --- a/samples/Common/Repository.Dapper.Core/ReflectionHelper.cs +++ /dev/null @@ -1,108 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Reflection; -using System.Text; - -namespace Repository.Dapper.Core -{ - public static class ReflectionHelper - { - private static List _simpleTypes = new List - { - typeof(byte), - typeof(sbyte), - typeof(short), - typeof(ushort), - typeof(int), - typeof(uint), - typeof(long), - typeof(ulong), - typeof(float), - typeof(double), - typeof(decimal), - typeof(bool), - typeof(string), - typeof(char), - typeof(Guid), - typeof(DateTime), - typeof(DateTimeOffset), - typeof(byte[]) - }; - - public static MemberInfo GetProperty(LambdaExpression lambda) - { - Expression expr = lambda; - for (; ; ) - { - switch (expr.NodeType) - { - case ExpressionType.Lambda: - expr = ((LambdaExpression)expr).Body; - break; - case ExpressionType.Convert: - expr = ((UnaryExpression)expr).Operand; - break; - case ExpressionType.MemberAccess: - MemberExpression memberExpression = (MemberExpression)expr; - MemberInfo mi = memberExpression.Member; - return mi; - default: - return null; - } - } - } - - public static IDictionary GetObjectValues(object obj) - { - IDictionary result = new Dictionary(); - if (obj == null) - { - return result; - } - if (obj is IDictionary) - return obj as IDictionary; - - foreach (var propertyInfo in obj.GetType().GetProperties()) - { - string name = propertyInfo.Name; - object value = propertyInfo.GetValue(obj, null); - result[name] = value; - } - - return result; - } - - public static string AppendStrings(this IEnumerable list, string seperator = ", ") - { - return list.Aggregate( - new StringBuilder(), - (sb, s) => (sb.Length == 0 ? sb : sb.Append(seperator)).Append(s), - sb => sb.ToString()); - } - - public static bool IsSimpleType(Type type) - { - Type actualType = type; - if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>)) - { - actualType = type.GetGenericArguments()[0]; - } - - return _simpleTypes.Contains(actualType); - } - - public static string GetParameterName(this IDictionary parameters, string parameterName, char parameterPrefix) - { - return string.Format("{0}{1}_{2}", parameterPrefix, parameterName, parameters.Count); - } - - public static string SetParameterName(this IDictionary parameters, string parameterName, object value, char parameterPrefix) - { - string name = parameters.GetParameterName(parameterName, parameterPrefix); - parameters.Add(name, value); - return name; - } - } -} \ No newline at end of file diff --git a/samples/Common/Repository.Dapper.Core/Repository.Dapper.Core.csproj b/samples/Common/Repository.Dapper.Core/Repository.Dapper.Core.csproj deleted file mode 100644 index fac8c0a0b..000000000 --- a/samples/Common/Repository.Dapper.Core/Repository.Dapper.Core.csproj +++ /dev/null @@ -1,34 +0,0 @@ - - - - - DapperExtensions - Xakep - netstandard2.0 - DapperExtensions - Xakep.DapperExtensions - 1.6.2.91 - true - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/Common/Repository.Dapper.Core/Sql/DB2Dialect.cs b/samples/Common/Repository.Dapper.Core/Sql/DB2Dialect.cs deleted file mode 100644 index 836960bbd..000000000 --- a/samples/Common/Repository.Dapper.Core/Sql/DB2Dialect.cs +++ /dev/null @@ -1,138 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Repository.Dapper.Core.Sql -{ - public class DB2Dialect : SqlDialectBase - { - public override string GetIdentitySql(string tableName) - { - return "SELECT CAST(IDENTITY_VAL_LOCAL() AS BIGINT) AS \"ID\" FROM SYSIBM.SYSDUMMY1"; - } - - public override string GetPagingSql(string sql, int page, int resultsPerPage, IDictionary parameters) - { - var startValue = ((page - 1) * resultsPerPage) + 1; - var endValue = (page * resultsPerPage); - return GetSetSql(sql, startValue, endValue, parameters); - } - - public override string GetSetSql(string sql, int firstResult, int maxResults, IDictionary parameters) - { - if (string.IsNullOrEmpty(sql)) - { - throw new ArgumentNullException("SQL"); - } - - if (parameters == null) - { - throw new ArgumentNullException("Parameters"); - } - - int selectIndex = GetSelectEnd(sql) + 1; - string orderByClause = GetOrderByClause(sql); - if (orderByClause == null) - { - orderByClause = "ORDER BY CURRENT_TIMESTAMP"; - } - - - string projectedColumns = GetColumnNames(sql).Aggregate(new StringBuilder(), (sb, s) => (sb.Length == 0 ? sb : sb.Append(", ")).Append(GetColumnName("_TEMP", s, null)), sb => sb.ToString()); - string newSql = sql - .Replace(" " + orderByClause, string.Empty) - .Insert(selectIndex, string.Format("ROW_NUMBER() OVER(ORDER BY {0}) AS {1}, ", orderByClause.Substring(9), GetColumnName(null, "_ROW_NUMBER", null))); - - string result = string.Format("SELECT {0} FROM ({1}) AS \"_TEMP\" WHERE {2} BETWEEN @_pageStartRow AND @_pageEndRow", - projectedColumns.Trim(), newSql, GetColumnName("_TEMP", "_ROW_NUMBER", null)); - - parameters.Add("@_pageStartRow", firstResult); - parameters.Add("@_pageEndRow", maxResults); - return result; - } - - protected string GetOrderByClause(string sql) - { - int orderByIndex = sql.LastIndexOf(" ORDER BY ", StringComparison.InvariantCultureIgnoreCase); - if (orderByIndex == -1) - { - return null; - } - - string result = sql.Substring(orderByIndex).Trim(); - - int whereIndex = result.IndexOf(" WHERE ", StringComparison.InvariantCultureIgnoreCase); - if (whereIndex == -1) - { - return result; - } - - return result.Substring(0, whereIndex).Trim(); - } - - protected int GetFromStart(string sql) - { - int selectCount = 0; - string[] words = sql.Split(' '); - int fromIndex = 0; - foreach (var word in words) - { - if (word.Equals("SELECT", StringComparison.InvariantCultureIgnoreCase)) - { - selectCount++; - } - - if (word.Equals("FROM", StringComparison.InvariantCultureIgnoreCase)) - { - selectCount--; - if (selectCount == 0) - { - break; - } - } - - fromIndex += word.Length + 1; - } - - return fromIndex; - } - - protected virtual int GetSelectEnd(string sql) - { - if (sql.StartsWith("SELECT DISTINCT", StringComparison.InvariantCultureIgnoreCase)) - { - return 15; - } - - if (sql.StartsWith("SELECT", StringComparison.InvariantCultureIgnoreCase)) - { - return 6; - } - - throw new ArgumentException("SQL must be a SELECT statement.", "sql"); - } - - protected virtual IList GetColumnNames(string sql) - { - int start = GetSelectEnd(sql); - int stop = GetFromStart(sql); - string[] columnSql = sql.Substring(start, stop - start).Split(','); - List result = new List(); - foreach (string c in columnSql) - { - int index = c.IndexOf(" AS ", StringComparison.InvariantCultureIgnoreCase); - if (index > 0) - { - result.Add(c.Substring(index + 4).Trim()); - continue; - } - - string[] colParts = c.Split('.'); - result.Add(colParts[colParts.Length - 1].Trim()); - } - - return result; - } - } -} \ No newline at end of file diff --git a/samples/Common/Repository.Dapper.Core/Sql/MySqlDialect.cs b/samples/Common/Repository.Dapper.Core/Sql/MySqlDialect.cs deleted file mode 100644 index a8adde9b5..000000000 --- a/samples/Common/Repository.Dapper.Core/Sql/MySqlDialect.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -namespace Repository.Dapper.Core.Sql -{ - public class MySqlDialect : SqlDialectBase - { - public override char OpenQuote - { - get { return '`'; } - } - - public override char CloseQuote - { - get { return '`'; } - } - - public override string GetIdentitySql(string tableName) - { - return "SELECT CONVERT(LAST_INSERT_ID(), SIGNED INTEGER) AS ID"; - } - - public override string GetPagingSql(string sql, int page, int resultsPerPage, IDictionary parameters) - { - int startValue = page * resultsPerPage; - return GetSetSql(sql, startValue, resultsPerPage, parameters); - } - - public override string GetSetSql(string sql, int firstResult, int maxResults, IDictionary parameters) - { - string result = string.Format("{0} LIMIT @firstResult, @maxResults", sql); - parameters.Add("@firstResult", firstResult); - parameters.Add("@maxResults", maxResults); - return result; - } - } -} \ No newline at end of file diff --git a/samples/Common/Repository.Dapper.Core/Sql/OracleDialect.cs b/samples/Common/Repository.Dapper.Core/Sql/OracleDialect.cs deleted file mode 100644 index 336cf7720..000000000 --- a/samples/Common/Repository.Dapper.Core/Sql/OracleDialect.cs +++ /dev/null @@ -1,80 +0,0 @@ -using System.Collections.Generic; -using System.Text; - -namespace Repository.Dapper.Core.Sql -{ - public class OracleDialect : SqlDialectBase - { - public OracleDialect() { } - - public override string GetIdentitySql(string tableName) - { - throw new System.NotImplementedException("Oracle does not support get last inserted identity."); - } - - public override bool SupportsMultipleStatements - { - get { return false; } - } - - //from Simple.Data.Oracle implementation https://github.com/flq/Simple.Data.Oracle/blob/master/Simple.Data.Oracle/OraclePager.cs - public override string GetPagingSql(string sql, int page, int resultsPerPage, IDictionary parameters) - { - var toSkip = page * resultsPerPage; - var topLimit = (page + 1) * resultsPerPage; - - var sb = new StringBuilder(); - sb.AppendLine("SELECT * FROM ("); - sb.AppendLine("SELECT \"_ss_dapper_1_\".*, ROWNUM RNUM FROM ("); - sb.Append(sql); - sb.AppendLine(") \"_ss_dapper_1_\""); - sb.AppendLine("WHERE ROWNUM <= :topLimit) \"_ss_dapper_2_\" "); - sb.AppendLine("WHERE \"_ss_dapper_2_\".RNUM > :toSkip"); - - parameters.Add(":topLimit", topLimit); - parameters.Add(":toSkip", toSkip); - - return sb.ToString(); - } - - public override string GetSetSql(string sql, int firstResult, int maxResults, IDictionary parameters) - { - var sb = new StringBuilder(); - sb.AppendLine("SELECT * FROM ("); - sb.AppendLine("SELECT \"_ss_dapper_1_\".*, ROWNUM RNUM FROM ("); - sb.Append(sql); - sb.AppendLine(") \"_ss_dapper_1_\""); - sb.AppendLine("WHERE ROWNUM <= :topLimit) \"_ss_dapper_2_\" "); - sb.AppendLine("WHERE \"_ss_dapper_2_\".RNUM > :toSkip"); - - parameters.Add(":topLimit", maxResults + firstResult); - parameters.Add(":toSkip", firstResult); - - return sb.ToString(); - } - - public override string QuoteString(string value) - { - if (value != null && value[0]=='`') - { - return string.Format("{0}{1}{2}", OpenQuote, value.Substring(1, value.Length - 2), CloseQuote); - } - return value.ToUpper(); - } - - public override char ParameterPrefix - { - get { return ':'; } - } - - public override char OpenQuote - { - get { return '"'; } - } - - public override char CloseQuote - { - get { return '"'; } - } - } -} \ No newline at end of file diff --git a/samples/Common/Repository.Dapper.Core/Sql/PostgreSqlDialect.cs b/samples/Common/Repository.Dapper.Core/Sql/PostgreSqlDialect.cs deleted file mode 100644 index 9af35d41d..000000000 --- a/samples/Common/Repository.Dapper.Core/Sql/PostgreSqlDialect.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Repository.Dapper.Core.Sql -{ - public class PostgreSqlDialect : SqlDialectBase - { - public override string GetIdentitySql(string tableName) - { - return "SELECT LASTVAL() AS Id"; - } - - public override string GetPagingSql(string sql, int page, int resultsPerPage, IDictionary parameters) - { - int startValue = (page-1) * resultsPerPage; - return GetSetSql(sql, startValue < 0 ? 0 : startValue, resultsPerPage, parameters); - } - - public override string GetSetSql(string sql, int firstResult, int maxResults, IDictionary parameters) - { - string result = string.Format("{0} LIMIT @maxResults OFFSET @pageStartRowNbr", sql); - parameters.Add("@maxResults", maxResults); - parameters.Add("@pageStartRowNbr", firstResult); - return result; - } - - public override string GetColumnName(string prefix, string columnName, string alias) - { - return base.GetColumnName(prefix, columnName, alias);//.ToLower(); - } - - public override string GetTableName(string schemaName, string tableName, string alias) - { - return base.GetTableName(schemaName, tableName, alias);//.ToLower(); - } - public override string GetOperatorString(Operator Operator, bool Not) - { - switch (Operator) - { - case Operator.Gt: - return Not ? "<=" : ">"; - case Operator.Ge: - return Not ? "<" : ">="; - case Operator.Lt: - return Not ? ">=" : "<"; - case Operator.Le: - return Not ? ">" : "<="; - case Operator.Like: - return Not ? "NOT ILIKE" : "ILIKE"; - default: - return Not ? "<>" : "="; - } - } - } - -} diff --git a/samples/Common/Repository.Dapper.Core/Sql/SqlCeDialect.cs b/samples/Common/Repository.Dapper.Core/Sql/SqlCeDialect.cs deleted file mode 100644 index e5a74145a..000000000 --- a/samples/Common/Repository.Dapper.Core/Sql/SqlCeDialect.cs +++ /dev/null @@ -1,69 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Repository.Dapper.Core.Sql -{ - public class SqlCeDialect : SqlDialectBase - { - public override char OpenQuote - { - get { return '['; } - } - - public override char CloseQuote - { - get { return ']'; } - } - - public override bool SupportsMultipleStatements - { - get { return false; } - } - - public override string GetTableName(string schemaName, string tableName, string alias) - { - if (string.IsNullOrWhiteSpace(tableName)) - { - throw new ArgumentNullException("TableName"); - } - - StringBuilder result = new StringBuilder(); - result.Append(OpenQuote); - if (!string.IsNullOrWhiteSpace(schemaName)) - { - result.AppendFormat("{0}_", schemaName); - } - - result.AppendFormat("{0}{1}", tableName, CloseQuote); - - - if (!string.IsNullOrWhiteSpace(alias)) - { - result.AppendFormat(" AS {0}{1}{2}", OpenQuote, alias, CloseQuote); - } - - return result.ToString(); - } - - public override string GetIdentitySql(string tableName) - { - return "SELECT CAST(@@IDENTITY AS BIGINT) AS [Id]"; - } - - public override string GetPagingSql(string sql, int page, int resultsPerPage, IDictionary parameters) - { - int startValue = (page * resultsPerPage); - return GetSetSql(sql, startValue, resultsPerPage, parameters); - } - - public override string GetSetSql(string sql, int firstResult, int maxResults, IDictionary parameters) - { - string result = string.Format("{0} OFFSET @firstResult ROWS FETCH NEXT @maxResults ROWS ONLY", sql); - parameters.Add("@firstResult", firstResult); - parameters.Add("@maxResults", maxResults); - return result; - } - } -} \ No newline at end of file diff --git a/samples/Common/Repository.Dapper.Core/Sql/SqlDialectBase.cs b/samples/Common/Repository.Dapper.Core/Sql/SqlDialectBase.cs deleted file mode 100644 index 339111991..000000000 --- a/samples/Common/Repository.Dapper.Core/Sql/SqlDialectBase.cs +++ /dev/null @@ -1,156 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Repository.Dapper.Core.Sql -{ - public interface ISqlDialect - { - char OpenQuote { get; } - char CloseQuote { get; } - string BatchSeperator { get; } - bool SupportsMultipleStatements { get; } - char ParameterPrefix { get; } - string EmptyExpression { get; } - string GetTableName(string schemaName, string tableName, string alias); - string GetColumnName(string prefix, string columnName, string alias); - string GetIdentitySql(string tableName); - string GetPagingSql(string sql, int page, int resultsPerPage, IDictionary parameters); - string GetSetSql(string sql, int firstResult, int maxResults, IDictionary parameters); - bool IsQuoted(string value); - string QuoteString(string value); - string GetOperatorString(Operator Operator, bool Not); - } - - public abstract class SqlDialectBase : ISqlDialect - { - public virtual char OpenQuote - { - get { return '"'; } - } - - public virtual char CloseQuote - { - get { return '"'; } - } - - public virtual string BatchSeperator - { - get { return ";" + Environment.NewLine; } - } - - public virtual bool SupportsMultipleStatements - { - get { return true; } - } - - public virtual char ParameterPrefix - { - get - { - return '@'; - } - } - - public string EmptyExpression - { - get - { - return "1=1"; - } - } - - public virtual string GetTableName(string schemaName, string tableName, string alias) - { - if (string.IsNullOrWhiteSpace(tableName)) - { - throw new ArgumentNullException("TableName", "tableName cannot be null or empty."); - } - - StringBuilder result = new StringBuilder(); - if (!string.IsNullOrWhiteSpace(schemaName)) - { - result.AppendFormat(QuoteString(schemaName) + "."); - } - - result.AppendFormat(QuoteString(tableName)); - - if (!string.IsNullOrWhiteSpace(alias)) - { - result.AppendFormat(" AS {0}", QuoteString(alias)); - } - return result.ToString(); - } - - public virtual string GetColumnName(string prefix, string columnName, string alias) - { - if (string.IsNullOrWhiteSpace(columnName)) - { - throw new ArgumentNullException("ColumnName", "columnName cannot be null or empty."); - } - - StringBuilder result = new StringBuilder(); - if (!string.IsNullOrWhiteSpace(prefix)) - { - result.AppendFormat(QuoteString(prefix) + "."); - } - - result.AppendFormat(QuoteString(columnName)); - - if (!string.IsNullOrWhiteSpace(alias)) - { - result.AppendFormat(" AS {0}", QuoteString(alias)); - } - - return result.ToString(); - } - - public abstract string GetIdentitySql(string tableName); - public abstract string GetPagingSql(string sql, int page, int resultsPerPage, IDictionary parameters); - public abstract string GetSetSql(string sql, int firstResult, int maxResults, IDictionary parameters); - - public virtual bool IsQuoted(string value) - { - if (value.Trim()[0] == OpenQuote) - { - return value.Trim().Last() == CloseQuote; - } - - return false; - } - - public virtual string QuoteString(string value) - { - if (IsQuoted(value) || value == "*") - { - return value; - } - return string.Format("{0}{1}{2}", OpenQuote, value.Trim(), CloseQuote); - } - - public virtual string UnQuoteString(string value) - { - return IsQuoted(value) ? value.Substring(1, value.Length - 2) : value; - } - - public virtual string GetOperatorString(Operator Operator, bool Not) - { - switch (Operator) - { - case Operator.Gt: - return Not ? "<=" : ">"; - case Operator.Ge: - return Not ? "<" : ">="; - case Operator.Lt: - return Not ? ">=" : "<"; - case Operator.Le: - return Not ? ">" : "<="; - case Operator.Like: - return Not ? "NOT LIKE" : "LIKE"; - default: - return Not ? "<>" : "="; - } - } - } -} diff --git a/samples/Common/Repository.Dapper.Core/Sql/SqlGenerator.cs b/samples/Common/Repository.Dapper.Core/Sql/SqlGenerator.cs deleted file mode 100644 index dfd5379e0..000000000 --- a/samples/Common/Repository.Dapper.Core/Sql/SqlGenerator.cs +++ /dev/null @@ -1,413 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Repository.Dapper.Core.Mapper; - -namespace Repository.Dapper.Core.Sql -{ - public interface ISqlGenerator - { - IDapperExtensionsConfiguration Configuration { get; } - - string Select(IClassMapper classMap, IPredicate predicate, IList sort, IDictionary parameters, string schemaName, string tableName, IList join=null, IList alias = null); - - string SelectPaged(IClassMapper classMap, IPredicate predicate, IList sort, int page, int resultsPerPage, IDictionary parameters, string schemaName, string tableName, IList join, IList alias); - string SelectSet(IClassMapper classMap, IPredicate predicate, IList sort, int firstResult, int maxResults, IDictionary parameters, string schemaName, string tableName, IList join, IList alias); - string Count(IClassMapper classMap, IPredicate predicate, IDictionary parameters, string schemaName, string tableName, IList join); - - string Insert(IClassMapper classMap, string schemaName, string tableName); - string Update(IClassMapper classMap, IPredicate predicate, IDictionary parameters, string schemaName, string tableName); - string UpdateSet(IClassMapper classMap,object entity, IPredicate predicate, IDictionary parameters, string schemaName, string tableName); - string Delete(IClassMapper classMap, IPredicate predicate, IDictionary parameters, string schemaName, string tableName); - - string IdentitySql(IClassMapper classMap, string schemaName, string tableName); - string GetTableName(IClassMapper map, string schemaName, string tableName, IList join = null); - string GetColumnName(bool prefix,IClassMapper map, IPropertyMap property, bool includeAlias, string schemaName, string tableName, string aliasName = null); - string GetColumnName(bool prefix, IClassMapper map, string propertyName, bool includeAlias, string schemaName, string tableName); - bool SupportsMultipleStatements(); - string GetOperatorString(Operator Operator, bool Not); - } - - public class SqlGeneratorImpl : ISqlGenerator - { - public SqlGeneratorImpl(IDapperExtensionsConfiguration configuration) - { - Configuration = configuration; - } - - public IDapperExtensionsConfiguration Configuration { get; private set; } - - public virtual string Select(IClassMapper classMap, IPredicate predicate, IList sort, IDictionary parameters, string schemaName, string tableName, IList join=null, IList alias=null) - { - if (parameters == null) - { - throw new ArgumentNullException("Parameters"); - } - - StringBuilder sql = new StringBuilder(string.Format("SELECT {0} FROM {1}", - BuildSelectColumns(classMap, schemaName, tableName,join,alias), - GetTableName(classMap, schemaName, tableName,join))); - - if (predicate != null) - { - sql.Append(" WHERE ") - .Append(predicate.GetSql(join!=null,this, parameters,schemaName,tableName)); - } - - if (sort != null && sort.Any()) - { - sql.Append(" ORDER BY ") - .Append(sort.Select(s => s.GetSql(join != null,this, schemaName,tableName)).AppendStrings()); - } - - return sql.ToString(); - } - - public virtual string SelectPaged(IClassMapper classMap, IPredicate predicate, IList sort, int page, int resultsPerPage, IDictionary parameters, string schemaName, string tableName, IList join, IList alias) - { - if (sort == null || !sort.Any()) - { - sort = classMap.Properties.Where(w => w.KeyType != KeyType.NotAKey).Select(w => (ISort)new SortKey(classMap) { PropertyName = w.Name, Ascending = true }).ToList(); - //throw new ArgumentNullException("Sort", "Sort cannot be null or empty."); - } - - if (parameters == null) - { - throw new ArgumentNullException("Parameters"); - } - - StringBuilder innerSql = new StringBuilder(string.Format("SELECT {0} FROM {1}", - BuildSelectColumns(classMap, schemaName, tableName,join,alias), - GetTableName(classMap, schemaName, tableName,join))); - if (predicate != null) - { - innerSql.Append(" WHERE ") - .Append(predicate.GetSql(join!=null,this, parameters,schemaName,tableName)); - } - - string orderBy = sort.Select(s => s.GetSql(join != null, this, schemaName, tableName)).AppendStrings(); - innerSql.Append(" ORDER BY " + orderBy); - - string sql = Configuration.Dialect.GetPagingSql(innerSql.ToString(), page, resultsPerPage, parameters); - return sql; - } - - public virtual string SelectSet(IClassMapper classMap, IPredicate predicate, IList sort, int firstResult, int maxResults, IDictionary parameters, string schemaName, string tableName, IList join, IList alias) - { - if (sort == null || !sort.Any()) - { - sort = classMap.Properties.Where(w => w.KeyType != KeyType.NotAKey).Select(w => (ISort)new SortKey(classMap) { PropertyName = w.Name, Ascending = true }).ToList(); - //throw new ArgumentNullException("Sort", "Sort cannot be null or empty."); - } - - if (parameters == null) - { - throw new ArgumentNullException("Parameters"); - } - - StringBuilder innerSql = new StringBuilder(string.Format("SELECT {0} FROM {1}", - BuildSelectColumns(classMap, schemaName, tableName,join,alias), - GetTableName(classMap, schemaName, tableName,join))); - if (predicate != null) - { - innerSql.Append(" WHERE ") - .Append(predicate.GetSql(join != null, this, parameters,schemaName,tableName)); - } - - string orderBy = sort.Select(s => s.GetSql(join != null, this, schemaName, tableName)).AppendStrings(); - innerSql.Append(" ORDER BY " + orderBy); - - string sql = Configuration.Dialect.GetSetSql(innerSql.ToString(), firstResult, maxResults, parameters); - return sql; - } - - - public virtual string Count(IClassMapper classMap, IPredicate predicate, IDictionary parameters, string schemaName, string tableName, IList join) - { - if (parameters == null) - { - throw new ArgumentNullException("Parameters"); - } - - StringBuilder sql = new StringBuilder(string.Format("SELECT COUNT(*) AS {0}Total{1} FROM {2}", - Configuration.Dialect.OpenQuote, - Configuration.Dialect.CloseQuote, - GetTableName(classMap, schemaName, tableName,join))); - if (predicate != null) - { - sql.Append(" WHERE ") - .Append(predicate.GetSql(join != null, this, parameters,schemaName,tableName)); - } - - return sql.ToString(); - } - - public virtual string Insert(IClassMapper classMap, string schemaName, string tableName) - { - var columns = classMap.Properties.Where(p => !(p.Ignored || p.IsReadOnly || p.KeyType == KeyType.Identity || p.KeyType == KeyType.TriggerIdentity)); - if (!columns.Any()) - { - throw new ArgumentException("No columns were mapped."); - } - - var columnNames = columns.Select(p => GetColumnName(false,classMap, p, false, schemaName, tableName)); - var parameters = columns.Select(p => Configuration.Dialect.ParameterPrefix + p.Name); - - string sql = string.Format("INSERT INTO {0} ({1}) VALUES ({2})", - GetTableName(classMap, schemaName, tableName), - columnNames.AppendStrings(), - parameters.AppendStrings()); - - var triggerIdentityColumn = classMap.Properties.Where(p => p.KeyType == KeyType.TriggerIdentity).ToList(); - - if (triggerIdentityColumn.Count > 0) - { - if (triggerIdentityColumn.Count > 1) - throw new ArgumentException("TriggerIdentity generator cannot be used with multi-column keys"); - - sql += string.Format(" RETURNING {0} INTO {1}IdOutParam", triggerIdentityColumn.Select(p => GetColumnName(false,classMap, p, false, schemaName, tableName)).First(), Configuration.Dialect.ParameterPrefix); - } - - return sql; - } - - public virtual string Update(IClassMapper classMap, IPredicate predicate, IDictionary parameters, string schemaName, string tableName) - { - if (predicate == null) - { - throw new ArgumentNullException("Predicate"); - } - - if (parameters == null) - { - throw new ArgumentNullException("Parameters"); - } - - var columns = classMap.Properties.Where(p => !(p.Ignored || p.IsReadOnly || p.KeyType == KeyType.Identity || p.KeyType == KeyType.Assigned)); - if (!columns.Any()) - { - throw new ArgumentException("No columns were mapped."); - } - - var setSql = - columns.Select( - p => - string.Format( - "{0} = {1}{2}", GetColumnName(false,classMap, p, false, schemaName, tableName), Configuration.Dialect.ParameterPrefix, p.Name)); - - return string.Format("UPDATE {0} SET {1} WHERE {2}", - GetTableName(classMap, schemaName, tableName), - setSql.AppendStrings(), - predicate.GetSql(false,this, parameters,schemaName,tableName)); - } - - public virtual string UpdateSet(IClassMapper classMap, object entity, IPredicate predicate, IDictionary parameters, string schemaName, string tableName) - { - if (predicate == null) - { - throw new ArgumentNullException("Predicate"); - } - - if (parameters == null) - { - throw new ArgumentNullException("Parameters"); - } - - var columns = classMap.Properties.Where(p => !(p.Ignored || p.IsReadOnly || p.KeyType == KeyType.Identity || p.KeyType == KeyType.Assigned)); - if (!columns.Any()) - { - throw new ArgumentException("No columns were mapped."); - } - var vColName = ReflectionHelper.GetObjectValues(entity).Select(w => w.Key); - var setSql = - columns.Where(w => vColName.Contains(w.Name)).Select( - p => - string.Format( - "{0} = {1}{2}", GetColumnName(false,classMap, p, false, schemaName, tableName), Configuration.Dialect.ParameterPrefix, p.Name)); - - return string.Format("UPDATE {0} SET {1} WHERE {2}", - GetTableName(classMap, schemaName, tableName), - setSql.AppendStrings(), - predicate.GetSql(false,this, parameters, schemaName, tableName)); - } - - public virtual string Delete(IClassMapper classMap, IPredicate predicate, IDictionary parameters, string schemaName, string tableName) - { - if (predicate == null) - { - throw new ArgumentNullException("Predicate"); - } - - if (parameters == null) - { - throw new ArgumentNullException("Parameters"); - } - - StringBuilder sql = new StringBuilder(string.Format("DELETE FROM {0}", GetTableName(classMap, schemaName, tableName))); - sql.Append(" WHERE ").Append(predicate.GetSql(false,this, parameters,schemaName,tableName)); - return sql.ToString(); - } - - public virtual string IdentitySql(IClassMapper classMap, string schemaName, string tableName) - { - return Configuration.Dialect.GetIdentitySql(GetTableName(classMap, schemaName, tableName)); - } - - public virtual string GetTableName(IClassMapper map, string schemaName, string tableName, IList join = null) - { - if (join != null && join.Count > 0) - { - var baseClassMap = join[0].GetLeftMapper(this); - var baseTable = GetTableName(baseClassMap, join[0].SchemaName, join[0].TableName); - return $"{baseTable} {string.Join(" ", join.Select(w => w.GetSql(join != null, this, null, null, null)))}"; - } - - schemaName = string.IsNullOrWhiteSpace(schemaName) ? map.SchemaName : schemaName; - tableName = string.IsNullOrWhiteSpace(tableName) ? map.TableName : tableName; - return Configuration.Dialect.GetTableName(schemaName, tableName, null); - } - - public virtual string GetColumnName(bool prefix, IClassMapper map, IPropertyMap property, bool includeAlias, string schemaName, string tableName, string aliasName = null) - { - string alias = null; - string propertyName = property.Name; - if (aliasName != null) - { - propertyName = aliasName; - } - if (property.ColumnName != propertyName && includeAlias) - { - alias = propertyName; - } - - return Configuration.Dialect.GetColumnName(prefix ? GetTableName(map, schemaName, tableName) : null, property.ColumnName, alias); - } - - public virtual string GetColumnName(bool prefix, IClassMapper map, string propertyName, bool includeAlias, string schemaName, string tableName) - { - IPropertyMap propertyMap = map.Properties.SingleOrDefault(p => p.Name.Equals(propertyName, StringComparison.InvariantCultureIgnoreCase)); - if (propertyMap == null) - { - throw new ArgumentException(string.Format("Could not find '{0}' in Mapping.", propertyName)); - } - - return GetColumnName(prefix,map, propertyMap, includeAlias,schemaName, tableName); - } - - public virtual bool SupportsMultipleStatements() - { - return Configuration.Dialect.SupportsMultipleStatements; - } - - public virtual string BuildSelectColumns(IClassMapper classMap, string schemaName, string tableName, IList join = null, IList alias = null) - { - if (join != null && join.Count > 0) - { - Dictionary joinMap = new Dictionary(); - - foreach (var itemJoin in join) - { - var leftMap = itemJoin.GetLeftMapper(this); - var tablename = $"{leftMap.SchemaName}.{leftMap.TableName}"; - if (!joinMap.ContainsKey(tablename)) - joinMap.Add(tablename, new JoinMapper() - { - Mapper = leftMap, - SchemaName = itemJoin.SchemaName, - TableName = itemJoin.TableName - }); - var rightMap = itemJoin.GetRightMapper(this); - tablename = $"{rightMap.SchemaName}.{rightMap.TableName}"; - if (!joinMap.ContainsKey(tablename)) - joinMap.Add(tablename, new JoinMapper() - { - Mapper = rightMap, - SchemaName = itemJoin.SchemaName2, - TableName = itemJoin.TableName2 - }); - } - - var vMapPro = classMap.Properties.Select(w => w.Name).ToList(); - - List ListColumn = new List(); - - foreach (var itemMap in joinMap) - { - if (vMapPro.Count == 0) - break; - var vAllProperty = itemMap.Value.Mapper.Properties.Where(w => !w.Ignored); - for (int i = vMapPro.Count - 1; i >= 0; i--) - { - var jitem = vAllProperty.Where(w => w.Name.Equals(vMapPro[i], StringComparison.OrdinalIgnoreCase)); - if (jitem.Count() > 0) - { - ListColumn.Add(new JoinMapper() - { - AliasName = null, - Mapper = itemMap.Value.Mapper, - Propertry = jitem.First(), - SchemaName = itemMap.Value.SchemaName, - TableName = itemMap.Value.TableName - }); - vMapPro.RemoveAt(i); - } - } - } - - if (alias != null && vMapPro.Count > 0) - { - foreach (var itemAlia in alias) - { - if (vMapPro.Count == 0) - break; - - var rightMap = itemAlia.GetRightMapper(this); - var tablename = $"{rightMap.SchemaName}.{rightMap.TableName}"; - if (!joinMap.ContainsKey(tablename)) - break; - - var vrightSchemaMap = joinMap[tablename]; - var propertyMap = itemAlia.GetPropertyMap(this); - for (int i = vMapPro.Count - 1; i >= 0; i--) - { - if (itemAlia.PropertyName.Equals(vMapPro[i])) - { - ListColumn.Add(new JoinMapper() - { - AliasName = itemAlia.PropertyName, - Mapper = vrightSchemaMap.Mapper, - Propertry = propertyMap, - SchemaName = vrightSchemaMap.SchemaName, - TableName = vrightSchemaMap.TableName - }); - vMapPro.RemoveAt(i); - break; - } - } - } - } - - var jcolumns = ListColumn.Select(p => GetColumnName(true,p.Mapper, p.Propertry, true, p.SchemaName, p.TableName, p.AliasName)); - return jcolumns.AppendStrings(); - } - - var columns = classMap.Properties - .Where(p => !p.Ignored) - .Select(p => GetColumnName(false,classMap, p, true, schemaName, tableName)); - return columns.AppendStrings(); - } - - public string GetOperatorString(Operator Operator, bool Not) => Configuration.Dialect.GetOperatorString(Operator, Not); - - internal class JoinMapper - { - public IPropertyMap Propertry { get; set; } - public IClassMapper Mapper { get; set; } - public string SchemaName { get; set; } - public string TableName { get; set; } - - public string AliasName { get; set; } - } - } -} \ No newline at end of file diff --git a/samples/Common/Repository.Dapper.Core/Sql/SqlServerDialect.cs b/samples/Common/Repository.Dapper.Core/Sql/SqlServerDialect.cs deleted file mode 100644 index 53e09f788..000000000 --- a/samples/Common/Repository.Dapper.Core/Sql/SqlServerDialect.cs +++ /dev/null @@ -1,146 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Repository.Dapper.Core.Sql -{ - public class SqlServerDialect : SqlDialectBase - { - public override char OpenQuote - { - get { return '['; } - } - - public override char CloseQuote - { - get { return ']'; } - } - - public override string GetIdentitySql(string tableName) - { - return string.Format("SELECT CAST(SCOPE_IDENTITY() AS BIGINT) AS [Id]"); - } - - public override string GetPagingSql(string sql, int page, int resultsPerPage, IDictionary parameters) - { - int startValue = ((page-1) * resultsPerPage) + 1; - return GetSetSql(sql, startValue < 1 ? 1 : startValue, resultsPerPage, parameters); - } - - public override string GetSetSql(string sql, int firstResult, int maxResults, IDictionary parameters) - { - if (string.IsNullOrEmpty(sql)) - { - throw new ArgumentNullException("SQL"); - } - - if (parameters == null) - { - throw new ArgumentNullException("Parameters"); - } - - int selectIndex = GetSelectEnd(sql) + 1; - string orderByClause = GetOrderByClause(sql); - if (orderByClause == null) - { - orderByClause = "ORDER BY CURRENT_TIMESTAMP"; - } - - - string projectedColumns = GetColumnNames(sql).Aggregate(new StringBuilder(), (sb, s) => (sb.Length == 0 ? sb : sb.Append(", ")).Append(GetColumnName("_proj", s, null)), sb => sb.ToString()); - string newSql = sql - .Replace(" " + orderByClause, string.Empty) - .Insert(selectIndex, string.Format("ROW_NUMBER() OVER(ORDER BY {0}) AS {1}, ", orderByClause.Substring(9), GetColumnName(null, "_row_number", null))); - - string result = string.Format("SELECT TOP({0}) {1} FROM ({2}) [_proj] WHERE {3} >= @_pageStartRow ORDER BY {3}", - maxResults, projectedColumns.Trim(), newSql, GetColumnName("_proj", "_row_number", null)); - - parameters.Add("@_pageStartRow", firstResult); - return result; - } - - protected string GetOrderByClause(string sql) - { - int orderByIndex = sql.LastIndexOf(" ORDER BY ", StringComparison.InvariantCultureIgnoreCase); - if (orderByIndex == -1) - { - return null; - } - - string result = sql.Substring(orderByIndex).Trim(); - - int whereIndex = result.IndexOf(" WHERE ", StringComparison.InvariantCultureIgnoreCase); - if (whereIndex == -1) - { - return result; - } - - return result.Substring(0, whereIndex).Trim(); - } - - protected int GetFromStart(string sql) - { - int selectCount = 0; - string[] words = sql.Split(' '); - int fromIndex = 0; - foreach (var word in words) - { - if (word.Equals("SELECT", StringComparison.InvariantCultureIgnoreCase)) - { - selectCount++; - } - - if (word.Equals("FROM", StringComparison.InvariantCultureIgnoreCase)) - { - selectCount--; - if (selectCount == 0) - { - break; - } - } - - fromIndex += word.Length + 1; - } - - return fromIndex; - } - - protected virtual int GetSelectEnd(string sql) - { - if (sql.StartsWith("SELECT DISTINCT", StringComparison.InvariantCultureIgnoreCase)) - { - return 15; - } - - if (sql.StartsWith("SELECT", StringComparison.InvariantCultureIgnoreCase)) - { - return 6; - } - - throw new ArgumentException("SQL must be a SELECT statement.", "sql"); - } - - protected virtual IList GetColumnNames(string sql) - { - int start = GetSelectEnd(sql); - int stop = GetFromStart(sql); - string[] columnSql = sql.Substring(start, stop - start).Split(','); - List result = new List(); - foreach (string c in columnSql) - { - int index = c.IndexOf(" AS ", StringComparison.InvariantCultureIgnoreCase); - if (index > 0) - { - result.Add(c.Substring(index + 4).Trim()); - continue; - } - - string[] colParts = c.Split('.'); - result.Add(colParts[colParts.Length - 1].Trim()); - } - - return result; - } - } -} \ No newline at end of file diff --git a/samples/Common/Repository.Dapper.Core/Sql/SqliteDialect.cs b/samples/Common/Repository.Dapper.Core/Sql/SqliteDialect.cs deleted file mode 100644 index e21bbba56..000000000 --- a/samples/Common/Repository.Dapper.Core/Sql/SqliteDialect.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Repository.Dapper.Core.Sql -{ - public class SqliteDialect : SqlDialectBase - { - public override string GetIdentitySql(string tableName) - { - return "SELECT LAST_INSERT_ROWID() AS [Id]"; - } - - public override string GetPagingSql(string sql, int page, int resultsPerPage, IDictionary parameters) - { - int startValue = (page - 1) * resultsPerPage; - return GetSetSql(sql, startValue < 0 ? 0 : startValue, resultsPerPage, parameters); - } - - public override string GetSetSql(string sql, int firstResult, int maxResults, IDictionary parameters) - { - if (string.IsNullOrEmpty(sql)) - { - throw new ArgumentNullException("SQL"); - } - - if (parameters == null) - { - throw new ArgumentNullException("Parameters"); - } - - var result = string.Format("{0} LIMIT @Offset, @Count", sql); - parameters.Add("@Offset", firstResult); - parameters.Add("@Count", maxResults); - return result; - } - - public override string GetColumnName(string prefix, string columnName, string alias) - { - if (string.IsNullOrWhiteSpace(columnName)) - { - throw new ArgumentNullException(columnName, "columnName cannot be null or empty."); - } - var result = new StringBuilder(); - result.AppendFormat(columnName); - if (!string.IsNullOrWhiteSpace(alias)) - { - result.AppendFormat(" AS {0}", QuoteString(alias)); - } - return result.ToString(); - } - } -} diff --git "a/samples/Common/Repository.EF.Core/BaseImpQueryOnlyRepository - \345\244\215\345\210\266.cs" "b/samples/Common/Repository.EF.Core/BaseImpQueryOnlyRepository - \345\244\215\345\210\266.cs" deleted file mode 100644 index a5cb78318..000000000 --- "a/samples/Common/Repository.EF.Core/BaseImpQueryOnlyRepository - \345\244\215\345\210\266.cs" +++ /dev/null @@ -1,150 +0,0 @@ -using DDD.Core; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Query; -using Surging.Core.CPlatform.Ioc; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Text; - -namespace Repository.EF.Core -{ - public class BaseImpQueryOnlyRepository: BaseRepository,IQueryOnlyRepository //where T : class, IDBModel - { - private readonly DefaultDbContext _dbContext; - private readonly DbSet _set; - public BaseImpQueryOnlyRepository(string modelAssemblyName)//DefaultDbContext dbContext) - { - //if (dbContext == null) throw new ArgumentNullException(nameof(dbContext)); - - _dbContext = new DefaultDbContext(modelAssemblyName); - _dbContext.Database.EnsureCreated(); - _set = _dbContext.Set(); - } - - - - #region 所有跟添加/修改/删除无关的界面查询，也不包含报表查询 - - public virtual int Count(Expression> @where = null) where T : class, IDBModel - { - return where == null ? _set.Count() : _set.Count(@where); - } - - public virtual bool Exist(Expression> @where = null) where T : class, IDBModel - { - return Get(where).Any(); - } - - public virtual bool Exist(Expression> @where = null, params Expression>[] includes) - { - return Get(where, includes).Any(); - } - - public virtual int ExecuteSqlWithNonQuery(string sql, params object[] parameters) - { - return _dbContext.ExecuteSqlWithNonQuery(sql, parameters); - } - - public virtual T GetSingle(Guid key) - { - return _set.Find(key); - } - - public T GetSingle(Guid key, params Expression>[] includes) - { - if (includes == null) return GetSingle(key); - var query = _set.AsQueryable(); - foreach (var include in includes) - { - query = query.Include(include); - } - Expression> filter = m => m.KeyId.Equals(key); - return query.SingleOrDefault(filter.Compile()); - } - - public T GetSingle(Expression> @where = null) - { - if (where == null) return _set.SingleOrDefault(); - return _set.SingleOrDefault(@where); - } - - public T GetSingle(Expression> @where = null, params Expression>[] includes) - { - if (includes == null) return GetSingle(where); - var query = _set.AsQueryable(); - foreach (var include in includes) - { - query = query.Include(include); - } - if (where == null) return query.SingleOrDefault(); - return query.SingleOrDefault(where); - } - - public virtual IQueryable Get(Expression> @where = null) - { - return @where != null ? _set.AsNoTracking().Where(@where) : _set.AsNoTracking(); - } - - - public virtual IQueryable Get(Expression> @where = null, params Expression>[] includes) - { - if (includes == null) - return Get(where); - var query = _set.AsQueryable(); - foreach (var include in includes) - { - query = query.Include(include); - } - return @where != null ? query.AsNoTracking().Where(@where) : query.AsNoTracking(); - } - public class IncludeTree - { - public Expression> Property { get; set; } - public Expression>[] navigationPropertyPath { get; set; } - - public List< IncludeTree>[] Childs { get; set; } - } - - //static IIncludableQueryable IncludeTable( IIncludableQueryable queryable, List< IncludeTree> includeTrees) - // { - // foreach (var includeTree in includeTrees) - // { - // queryable.Include(includeTree.Property).ThenInclude((includeTree.ChildInclude)); - - // } - // } - - - - - - public virtual IList SqlQuery(string sql, params object[] parameters) where TView : class, new() - { - return _dbContext.SqlQuery(sql, parameters); - } - - - public virtual IEnumerable GetByPagination(Expression> @where, int pageSize, int pageIndex, Expression>[] includes, bool asc = true, params Func[] @orderby) - { - var filter = Get(where).AsQueryable(); - if (includes != null) - { - foreach (var include in includes) - { - filter = filter.Include(include); - } - } - if (orderby != null) - { - foreach (var func in orderby) - { - filter = asc ? filter.OrderBy(func).AsQueryable() : filter.OrderByDescending(func).AsQueryable(); - } - } - return filter.Skip(pageSize * (pageIndex - 1)).Take(pageSize); - } - #endregion - } -} diff --git a/samples/Common/Repository.EF.Core/BaseImpQueryOnlyRepository.cs b/samples/Common/Repository.EF.Core/BaseImpQueryOnlyRepository.cs deleted file mode 100644 index 82c9efda4..000000000 --- a/samples/Common/Repository.EF.Core/BaseImpQueryOnlyRepository.cs +++ /dev/null @@ -1,149 +0,0 @@ -using DDD.Core; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Query; -using Surging.Core.CPlatform.Ioc; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Text; - -namespace Repository.EF.Core -{ - public class BaseImpQueryOnlyRepository: BaseRepository,IQueryOnlyRepository where T : class, IDBModel - { - protected readonly DefaultDbContext _dbContext; - protected readonly DbSet _set; - public BaseImpQueryOnlyRepository()//DefaultDbContext dbContext) - { - //if (dbContext == null) throw new ArgumentNullException(nameof(dbContext)); - - _dbContext = new DefaultDbContext(); - _set = _dbContext.Set(); - } - - - - #region 所有跟添加/修改/删除无关的界面查询，也不包含报表查询 - - public virtual int Count(Expression> @where = null) - { - return where == null ? _set.Count() : _set.Count(@where); - } - - public virtual bool Exist(Expression> @where = null) - { - return Get(where).Any(); - } - - public virtual bool Exist(Expression> @where = null, params Expression>[] includes) - { - return Get(where, includes).Any(); - } - - public virtual int ExecuteSqlWithNonQuery(string sql, params object[] parameters) - { - return _dbContext.ExecuteSqlWithNonQuery(sql, parameters); - } - - public virtual T GetSingle(Guid key) - { - return _set.Find(key); - } - - public T GetSingle(Guid key, params Expression>[] includes) - { - if (includes == null) return GetSingle(key); - var query = _set.AsQueryable(); - foreach (var include in includes) - { - query = query.Include(include); - } - Expression> filter = m => m.KeyId.Equals(key); - return query.SingleOrDefault(filter.Compile()); - } - - public T GetSingle(Expression> @where = null) - { - if (where == null) return _set.SingleOrDefault(); - return _set.SingleOrDefault(@where); - } - - public T GetSingle(Expression> @where = null, params Expression>[] includes) - { - if (includes == null) return GetSingle(where); - var query = _set.AsQueryable(); - foreach (var include in includes) - { - query = query.Include(include); - } - if (where == null) return query.SingleOrDefault(); - return query.SingleOrDefault(where); - } - - public virtual IQueryable Get(Expression> @where = null) - { - return @where != null ? _set.AsNoTracking().Where(@where) : _set.AsNoTracking(); - } - - - public virtual IQueryable Get(Expression> @where = null, params Expression>[] includes) - { - if (includes == null) - return Get(where); - var query = _set.AsQueryable(); - foreach (var include in includes) - { - query = query.Include(include); - } - return @where != null ? query.AsNoTracking().Where(@where) : query.AsNoTracking(); - } - public class IncludeTree - { - public Expression> Property { get; set; } - public Expression>[] navigationPropertyPath { get; set; } - - public List< IncludeTree>[] Childs { get; set; } - } - - //static IIncludableQueryable IncludeTable( IIncludableQueryable queryable, List< IncludeTree> includeTrees) - // { - // foreach (var includeTree in includeTrees) - // { - // queryable.Include(includeTree.Property).ThenInclude((includeTree.ChildInclude)); - - // } - // } - - - - - - public virtual IList SqlQuery(string sql, params object[] parameters) where TView : class, new() - { - return _dbContext.SqlQuery(sql, parameters); - } - - - public virtual IEnumerable GetByPagination(Expression> @where, int pageSize, int pageIndex, Expression>[] includes, bool asc = true, params Func[] @orderby) - { - var filter = Get(where).AsQueryable(); - if (includes != null) - { - foreach (var include in includes) - { - filter = filter.Include(include); - } - } - if (orderby != null) - { - foreach (var func in orderby) - { - filter = asc ? filter.OrderBy(func).AsQueryable() : filter.OrderByDescending(func).AsQueryable(); - } - } - return filter.Skip(pageSize * (pageIndex - 1)).Take(pageSize); - } - #endregion - } -} diff --git a/samples/Common/Repository.EF.Core/BaseImpRepository.cs b/samples/Common/Repository.EF.Core/BaseImpRepository.cs deleted file mode 100644 index 8a8312319..000000000 --- a/samples/Common/Repository.EF.Core/BaseImpRepository.cs +++ /dev/null @@ -1,66 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using DDD.Core; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Query; -using Surging.Core.CPlatform.Ioc; - -namespace Repository.EF.Core -{ - public class BaseImpRepository : BaseRepository,IRepository where T : IAggregate - { - private readonly string _modelAssemblyName; - private readonly DefaultDbContext _dbContext; - protected readonly DbSet _set; - public BaseImpRepository()//DefaultDbContext dbContext) - { - //if (dbContext == null) throw new ArgumentNullException(nameof(dbContext)); - - _dbContext = new DefaultDbContext(); - //_dbContext.Database.EnsureCreated(); - _set = _dbContext.Set(); - } - - - - public virtual void Delete(Guid key) - { - } - - - - public virtual void Dispose() - { - if (_dbContext != null) - { - _dbContext.Dispose(); - } - } - - public virtual T FindBy(Guid key) //where T : IAggregate - { - //TODO:想要动态地加载聚合的所有数据 - return null;// _dbContext.Set().First(a => a.KeyId == key); - } - - public void Add(T aggregate)// where T : IAggregate - { - // using (var _dbContext=new DefaultDbContext(_modelAssemblyName)) - // { - _dbContext.Set().Add(aggregate); - // _dbContext.SaveChanges(); - // } - } - public void Update(T aggregate)// where T : IAggregate - { - _dbContext.Set().Update(aggregate); - } - - public int Commit() - { - return _dbContext.SaveChanges(); - } - } -} diff --git a/samples/Common/Repository.EF.Core/ConfigHelper.cs b/samples/Common/Repository.EF.Core/ConfigHelper.cs deleted file mode 100644 index 41670aff7..000000000 --- a/samples/Common/Repository.EF.Core/ConfigHelper.cs +++ /dev/null @@ -1,101 +0,0 @@ -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.FileProviders; -using Surging.Core.CPlatform.Configurations.Remote; -using Surging.Core.CPlatform.Utilities; -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; - -namespace Repository.EF.Extensions -{ - public static class DBConfigurationExtensions - { - public static IConfigurationBuilder AddDBFile(this IConfigurationBuilder builder, string path) - { - return AddDBFile(builder, provider: null, path: path, optional: false, reloadOnChange: false); - } - - public static IConfigurationBuilder AddDBFile(this IConfigurationBuilder builder, string path, bool optional) - { - return AddDBFile(builder, provider: null, path: path, optional: optional, reloadOnChange: false); - } - - public static IConfigurationBuilder AddDBFile(this IConfigurationBuilder builder, string path, bool optional, bool reloadOnChange) - { - return AddDBFile(builder, provider: null, path: path, optional: optional, reloadOnChange: reloadOnChange); - } - - public static IConfigurationBuilder AddDBFile(this IConfigurationBuilder builder, IFileProvider provider, string path, bool optional, bool reloadOnChange) - { - Check.NotNull(builder, "builder"); - Check.CheckCondition(() => string.IsNullOrEmpty(path), "path"); - if (provider == null && Path.IsPathRooted(path)) - { - provider = new PhysicalFileProvider(Path.GetDirectoryName(path)); - path = Path.GetFileName(path); - } - var source = new DBConfigurationSource - { - FileProvider = provider, - Path = path, - Optional = optional, - ReloadOnChange = reloadOnChange - }; - builder.Add(source); - DBConfig.Configuration = builder.Build(); - return builder; - } - } - public class DBConfig - { - - public static IConfiguration Configuration { get; set; } - /* static ConfigHelper() - { - configuration = AutofacContainer.Resolve(); - } - - public static IConfigurationSection GetSection(string key) - { - return configuration.GetSection(key); - } - - public static string GetConfigurationValue(string key) - { - return configuration[key]; - } - - public static string GetConfigurationValue(string section, string key) - { - return GetSection(section)?[key]; - } - - public static string GetConnectionString(string key) - { - return configuration.GetConnectionString(key); - } - */ - } - - public class DBConfigurationSource : FileConfigurationSource - { - public string ConfigurationKeyPrefix { get; set; } - - public override IConfigurationProvider Build(IConfigurationBuilder builder) - { - FileProvider = FileProvider ?? builder.GetFileProvider(); - return new DBConfigurationProvider(this); - } - } - public class DBConfigurationProvider : FileConfigurationProvider - { - public DBConfigurationProvider(DBConfigurationSource source) : base(source) { } - - public override void Load(Stream stream) - { - var parser = new JsonConfigurationParser(); - this.Data = parser.Parse(stream, null); - } - } -} diff --git a/samples/Common/Repository.EF.Core/DbContextOption.cs b/samples/Common/Repository.EF.Core/DbContextOption.cs deleted file mode 100644 index 9f11e290b..000000000 --- a/samples/Common/Repository.EF.Core/DbContextOption.cs +++ /dev/null @@ -1,50 +0,0 @@ -namespace Repository.EF.Core -{ - - public class DbContextOption - { - /// - /// 数据库连接字符串 - /// - public string ConnectionString { get; set; } - /// - /// 实体程序集名称 - /// - public string ModelAssemblyName { get; set; } - /// - /// 数据库类型 - /// - public DbType DbType { get; set; } = DbType.MSSQLSERVER; - } - - /// - /// 数据库类型枚举 - /// - public enum DbType - { - /// - /// MS SQL Server - /// - MSSQLSERVER=0, - /// - /// Oracle - /// - ORACLE, - /// - /// MySQL - /// - MYSQL, - /// - /// Sqlite - /// - SQLITE, - /// - /// in-memory database - /// - MEMORY, - /// - /// PostgreSQL - /// - NPGSQL - } -} diff --git a/samples/Common/Repository.EF.Core/DefaultDbContext.cs b/samples/Common/Repository.EF.Core/DefaultDbContext.cs deleted file mode 100644 index c15bc3696..000000000 --- a/samples/Common/Repository.EF.Core/DefaultDbContext.cs +++ /dev/null @@ -1,233 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Data.SqlClient; -using System.Linq; -using System.Linq.Expressions; -using System.Reflection; -using System.Threading; -using Config.Core.Extensions; -using DDD.Core; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Extensions; -using Microsoft.Extensions.Configuration; -using Surging.Core.CPlatform; -using Z.EntityFramework.Plus; - -namespace Repository.EF.Core -{ - public sealed class DefaultDbContext : DbContext - { - private DbContextOption _option; - - - public DefaultDbContext() - { - _option = new DbContextOption - { - ConnectionString = DBConfig.Configuration["ConnectionString"], - ModelAssemblyName = DBConfig.Configuration["ModelAssemblyName"], - DbType = DbType.MSSQLSERVER - }; - } - /// - /// 构造函数 - /// - /// - public DefaultDbContext(DbContextOption option) - { - if(option==null) - throw new ArgumentNullException(nameof(option)); - if(string.IsNullOrEmpty(option.ConnectionString)) - throw new ArgumentNullException(nameof(option.ConnectionString)); - if (string.IsNullOrEmpty(option.ModelAssemblyName)) - throw new ArgumentNullException(nameof(option.ModelAssemblyName)); - _option = option; - } - - protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) - { - switch (_option.DbType) - { - case DbType.ORACLE: - throw new NotSupportedException("Oracle EF Core Database Provider is not yet available."); - //case DbType.MYSQL: - // optionsBuilder.UseMySql(_option.ConnectionString); - // break; - //case DbType.SQLITE: - // optionsBuilder.UseSqlite(_option.ConnectionString); - // break; - //case DbType.MEMORY: - // optionsBuilder.UseInMemoryDatabase(_option.ConnectionString); - // break; - //case DbType.NPGSQL: - // optionsBuilder.UseNpgsql(_option.ConnectionString); - // break; - default: - optionsBuilder.UseSqlServer(_option.ConnectionString); - break; - } - base.OnConfiguring(optionsBuilder); - } - - protected override void OnModelCreating(ModelBuilder modelBuilder) - { - AddEntityTypes(modelBuilder); - base.OnModelCreating(modelBuilder); - } - - private void AddEntityTypes(ModelBuilder modelBuilder) - { - var assembly = Assembly.Load(_option.ModelAssemblyName); - var types = assembly?.GetTypes(); - var list = types?.Where(t => - t.IsClass && !t.IsGenericType && !t.IsAbstract&& - t.GetInterfaces().Any(m => m.IsGenericType && m.GetGenericTypeDefinition() == typeof(IDBModel<>))).ToList(); - if (list != null && list.Any()) - { - list.ForEach(t => - { - if (modelBuilder.Model.FindEntityType(t) == null) - modelBuilder.Model.AddEntityType(t); - }); - } - } - - /// - /// ExecuteSqlWithNonQuery - /// - /// - /// - /// - public int ExecuteSqlWithNonQuery(string sql, params object[] parameters) - { - return Database.ExecuteSqlCommand(sql, - CancellationToken.None, - parameters); - } - - /// - /// edit an entity. - /// - /// - /// - /// - public int Edit(T entity) where T : class - { - Entry(entity).State = EntityState.Modified; - return SaveChanges(); - } - - /// - /// edit entities. - /// - /// - /// - /// - public int EditRange(ICollection entities) where T : class - { - Set().AttachRange(entities.ToArray()); - return SaveChanges(); - } - - /// - /// update query datas by columns. - /// - /// - /// - /// - /// - public int Update(Expression> @where, Expression> updateExp) - where T : class - { - return Set().Where(@where).Update(updateExp); - } - - /// - /// update data by columns. - /// - /// - /// - /// - /// - public int Update(T model, params string[] updateColumns) where T : class - { - if (updateColumns != null && updateColumns.Length > 0) - { - if (Entry(model).State == EntityState.Added || - Entry(model).State == EntityState.Detached) Set().Attach(model); - foreach (var propertyName in updateColumns) - { - Entry(model).Property(propertyName).IsModified = true; - } - } - else - { - Entry(model).State = EntityState.Modified; - } - return SaveChanges(); - } - - /// - /// delete by query. - /// - /// - /// - /// - public int Delete(Expression> @where) where T : class - { - Set().Where(@where).Delete(); - return SaveChanges(); - } - - /* - /// - /// bulk insert by sqlbulkcopy, and with transaction. - /// - /// - /// - /// - public void BulkInsert(IList entities, string destinationTableName = null) where T : class - { - if (entities == null || !entities.Any()) return; - if (string.IsNullOrEmpty(destinationTableName)) - { - var mappingTableName = typeof(T).GetCustomAttribute()?.Name; - destinationTableName = string.IsNullOrEmpty(mappingTableName) ? typeof(T).Name : mappingTableName; - } - using (var dt = entities.ToDataTable()) - { - using (var conn = new SqlConnection(_option.ConnectionString)) - { - conn.Open(); - using (var tran = conn.BeginTransaction()) - { - try - { - var bulk = new SqlBulkCopy(conn, SqlBulkCopyOptions.Default, tran); - bulk.BatchSize = entities.Count; - bulk.DestinationTableName = destinationTableName; - bulk.EnableStreaming = true; - bulk.WriteToServerAsync(dt); - tran.Commit(); - } - catch (Exception) - { - tran.Rollback(); - throw; - } - } - conn.Close(); - } - } - } - */ - public List SqlQuery(string sql, params object[] parameters) - where T : class - where TView : class - { - return Set().FromSql(sql, parameters).Cast().ToList(); - } - - } -} \ No newline at end of file diff --git a/samples/Common/Repository.EF.Core/IQueryableExtension.cs b/samples/Common/Repository.EF.Core/IQueryableExtension.cs deleted file mode 100644 index 6a9b9ef56..000000000 --- a/samples/Common/Repository.EF.Core/IQueryableExtension.cs +++ /dev/null @@ -1,120 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Linq.Expressions; -using System.Text; -using System.Data.Entity.Infrastructure.DbQuery; -namespace Centa.Agency.Repository.EF -{ - /// - /// Class for IQuerable extensions methods - /// - /// Include method in IQueryable ( base contract for IObjectSet ) is - /// intended for mock Include method in ObjectQuery{T}. - /// Paginate solve not parametrized queries issues with skip and take L2E methods - /// - /// - public static class IQueryableExtensions - { - - #region Extension Methods - - /// - /// Include method for IQueryable - /// - /// Type of elements - /// Queryable object - /// Path to include - /// Queryable object with include path information - public static IQueryable Include(this IQueryable queryable, string path) - where TEntity : class - { - if (String.IsNullOrEmpty(path)) - throw new ArgumentNullException("path can not empty"); - // var query = queryable as ObjectQuery;//ObjectContext時用 - var query = queryable as DbQuery;//DbContext時用 - - if (query != null)//if is a EF ObjectQuery object - return query.Include(path); - return null; - } - - /// - /// Include extension method for IQueryable - /// - /// Type of elements in IQueryable - /// Queryable object - /// Expression with path to include - /// Queryable object with include path information - public static IQueryable Include(this IQueryable queryable, Expression> path) - where TEntity : class - { - return Include(queryable, AnalyzeExpressionPath(path)); - } - - /// - /// Paginate query in a specific page range - /// - /// Typeof entity in underlying query - /// Typeof ordered data value - /// Query to paginate - /// Order by expression used in paginate method - /// - /// At this moment Order by expression only support simple order by c=>c.CustomerCode. If you need - /// add more complex order functionality don't use this extension method - /// - /// - /// Page index - /// Page count - /// order direction - /// A paged queryable - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")] - public static IQueryable Paginate(this IQueryable queryable, Expression> orderBy, int pageIndex, int pageCount, bool ascending) - where TEntity : class - { - ObjectQuery query = queryable as ObjectQuery; - - if (query != null) - { - //this paginate method use ESQL for solve problems with Parametrized queries - //in L2E and Skip/Take methods - - string orderPath = AnalyzeExpressionPath(orderBy); - - return query.Skip(string.Format(CultureInfo.InvariantCulture, "it.{0} {1}", orderPath, (ascending) ? "asc" : "desc"), "@skip", new ObjectParameter("skip", (pageIndex) * pageCount)) - .Top("@limit", new ObjectParameter("limit", pageCount)); - - } - else // for In-Memory object set - return queryable.OrderBy(orderBy).Skip((pageIndex * pageCount)).Take(pageCount); - } - - #endregion - - #region Private Methods - - static string AnalyzeExpressionPath(Expression> expression) - where TEntity : class - { - if (expression == (Expression>)null) - throw new ArgumentNullException("Argument error"); - - MemberExpression body = expression.Body as MemberExpression; - if ( - ( - (body == null) - || - !body.Member.DeclaringType.IsAssignableFrom(typeof(TEntity)) - ) - || - (body.Expression.NodeType != ExpressionType.Parameter)) - { - throw new ArgumentException("Argument error"); - } - else - return body.Member.Name; - } - #endregion - } - } diff --git a/samples/Common/Repository.EF.Core/InquiryRepository.cs b/samples/Common/Repository.EF.Core/InquiryRepository.cs deleted file mode 100644 index 1c79f86c0..000000000 --- a/samples/Common/Repository.EF.Core/InquiryRepository.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Microsoft.EntityFrameworkCore; -using System.Linq.Expressions; -using System.Linq; -using Microsoft.EntityFrameworkCore.Query; - - - -namespace Repository.EF.Core.Inquiry -{ - //public class InquiryRepository : BaseImpRepository - //{ - - // public override Customer FindBy(Guid key) - // { - // return _set.Include(a => a.CusInquirys).ThenInclude(b => b.InquiryParameters).Where(a => a.KeyId == key).FirstOrDefault(); - // } - - //} -} diff --git a/samples/Common/Repository.EF.Core/Properties/PublishProfiles/FolderProfile.pubxml b/samples/Common/Repository.EF.Core/Properties/PublishProfiles/FolderProfile.pubxml deleted file mode 100644 index 6c005a7a9..000000000 --- a/samples/Common/Repository.EF.Core/Properties/PublishProfiles/FolderProfile.pubxml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - FileSystem - Debug - netcoreapp2.0 - bin\Release\PublishOutput - - \ No newline at end of file diff --git a/samples/Common/Repository.EF.Core/Repository.EF.Core.csproj b/samples/Common/Repository.EF.Core/Repository.EF.Core.csproj deleted file mode 100644 index a7952b432..000000000 --- a/samples/Common/Repository.EF.Core/Repository.EF.Core.csproj +++ /dev/null @@ -1,31 +0,0 @@ - - - - netcoreapp2.0 - - - - bin\Debug\netstandard2.0\ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/Common/Repository.EF.Core/SqlHelper.cs b/samples/Common/Repository.EF.Core/SqlHelper.cs deleted file mode 100644 index aede601d6..000000000 --- a/samples/Common/Repository.EF.Core/SqlHelper.cs +++ /dev/null @@ -1,135 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Data.SqlClient; -using System.Linq; -using System.Text; -using System.Text.RegularExpressions; -using System.Threading.Tasks; - -namespace Repository.EF.Core -{ - public class SqlHelper - { - /// - /// 参数拼装 - /// - /// 参数名称 - /// 参数类型 - /// 参数值 - /// 拼装后的参数对象 - public static SqlParameter MakeParam(string parameterName, SqlDbType parameterType, object parameterValue) - { - SqlParameter p = new SqlParameter(); - p.ParameterName = parameterName; - p.SqlDbType = parameterType; - if (parameterValue == null) - { - p.Value = DBNull.Value; - } - else - { - if (parameterType == SqlDbType.Structured) - { - Type type = parameterValue.GetType(); - if (type.IsGenericType)//判断是否是泛型 - { - string t = type.GetGenericArguments()[0].Name; //泛型的类型 - switch (t) - { - case "Guid": - p.TypeName = "GuidCollectionTVP"; - p.Value = InitialCollectionTVP(parameterValue as List); - break; - case "Int32": - p.TypeName = "IntCollectionTVP"; - p.Value = InitialCollectionTVP(parameterValue as List); - break; - case "String": - p.TypeName = "StringCollectionTVP"; - p.Value = InitialCollectionTVP(parameterValue as List); - break; - default: - p.Value = parameterValue; - break; - } - } - else - { - p.Value = parameterValue; - } - - } - else - { - p.Value = parameterValue; - } - } - - return p; - } - - /* - /// - /// 参数拼装 - /// - /// 参数名称 - /// 参数类型 - /// 参数值 - /// 拼装后的参数对象 - public static SqlParameter MakeParam(string parameterName, DbType parameterType, object parameterValue) - { - SqlParameter p = new SqlParameter(); - p.ParameterName = parameterName; - p.DbType = parameterType; - if (parameterValue == null) - { - p.Value = DBNull.Value; - } - else - { - p.Value = parameterValue; - } - - return p; - } - - */ - /// - /// 初始化CollectionTVP - /// - /// 数据列表 - /// DataTable - public static DataTable InitialCollectionTVP(List list) - { - DataTable dt = new DataTable(); - dt.Columns.Add("Item", typeof(T)); - if (list == null | list.Count == 0) - { - return dt; - } - - foreach (T item in list) - { - dt.Rows.Add(item); - } - - return dt; - } - /// - /// 过滤sql注入2015/7/25 xingyongkang - /// - /// - /// - public static string CheckKeyWord(string keyWord) - { - //过滤关键字 - string StrKeyWord = @"select|insert|delete|from|count\(|drop table|update|truncate|asc\(|mid\(|char\(|xp_cmdshell|exec master|netlocalgroup administrators|:|net user|""|or|and"; - if (Regex.IsMatch(keyWord, StrKeyWord, RegexOptions.IgnoreCase)) - { - return ""; - } - return keyWord; - } - } -} diff --git a/samples/Common/Repository.EF.Core/UnitOfWork.cs b/samples/Common/Repository.EF.Core/UnitOfWork.cs deleted file mode 100644 index 4a12170a3..000000000 --- a/samples/Common/Repository.EF.Core/UnitOfWork.cs +++ /dev/null @@ -1,64 +0,0 @@ -using DDD.Core; -using System; -using System.Collections.Generic; -using System.Text; - -namespace Centa.Agency.Repository.EF -{ - public class UnitOfWork : IUnitOfWork - { - private bool disposed = false; - private DefaultDbContext _context; - public UnitOfWork()//DefaultDbContext context) - { - _context = new DefaultDbContext();// context; - } - /* - dbContext = CallContext.GetData(provider.ConnectionStringName) as AppDbContext; - if (dbContext == null) - { - dbContext = new AppDbContext(provider.ConnectionString); - dbContext.Configuration.ValidateOnSaveEnabled = false; - //将新创建的 ef上下文对象 存入线程 - CallContext.SetData(provider.ConnectionStringName, dbContext); - } - - */ - public int Commit() - { - using (var tran = _context.Database.CurrentTransaction ?? _context.Database.BeginTransaction()) - { - try - { - var result = _context.SaveChanges(); - tran.Commit(); - return result; - } - catch (Exception) - { - tran.Rollback(); - throw; - } - } - } - - protected virtual void Dispose(bool disposing) - { - if (!this.disposed) - { - if (disposing) - { - _context.Dispose(); - } - } - this.disposed = true; - } - - public void Dispose() - { - Dispose(true); - GC.SuppressFinalize(this); - } - - } -} diff --git a/samples/GateWay.WebApi/Areas/AuthManger/Controllers/AuthController.cs b/samples/GateWay.WebApi/Areas/AuthManger/Controllers/AuthController.cs deleted file mode 100644 index 665bcbd7b..000000000 --- a/samples/GateWay.WebApi/Areas/AuthManger/Controllers/AuthController.cs +++ /dev/null @@ -1,250 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Security.Cryptography; -using System.Text; -using System.Threading.Tasks; -using Application.Interface.Auth; -using Application.Interface.Org; -using Application.Service.Auth.Dto; -using DTO.Core; -using GateWay.WebApi.Controllers; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Newtonsoft.Json; -using Surging.Core.ApiGateWay; -using Surging.Core.ApiGateWay.OAuth; -using Surging.Core.Caching.DependencyResolution; -using Surging.Core.CPlatform; -using Surging.Core.CPlatform.Filters.Implementation; -using Surging.Core.CPlatform.Routing; -using Surging.Core.CPlatform.Utilities; -using Surging.Core.ProxyGenerator; -using Surging.Core.ProxyGenerator.Implementation; -using GateWayAppConfig = Surging.Core.ApiGateWay.AppConfig; - -namespace GateWay.WebApi.Areas.OrgManger.Controllers -{ - - [Produces("application/json")] - [Route("api/[controller]")] - public class AuthController : BaseApiController - { - private readonly IServiceProxyProvider _serviceProxyProvider; - private readonly IServiceRouteProvider _serviceRouteProvider; - private readonly IAuthorizationServerProvider _authorizationServerProvider; - - private IAuthAppService _authProxy; - public AuthController() - { - _authProxy = serviceProxyFactory.CreateProxy(); - _serviceProxyProvider = ServiceLocator.GetService(); - _serviceRouteProvider = ServiceLocator.GetService(); //serviceRouteProvider; - _authorizationServerProvider = ServiceLocator.GetService();// authorizationServerProvider; - - } - #region 角色 - [HttpGet] - private async Task Get() - { - Dictionary model = new Dictionary(); - model.Add("req",JsonConvert.SerializeObject( new { - UserName= "SuperMan", - Pwd= "123456", - CorporationKeyId= Guid.Parse("8C100FEE-2D1D-4B70-A27D-13D65DCD5E38") - })); - string path = "api/authapp/signin"; - string serviceKey = "Auth"; - var serviceProxyProvider = ServiceLocator.GetService(); - var res = await serviceProxyProvider.Invoke(model, path, serviceKey); - return res; - } - - [HttpGet] - public async Task> DomainPermissions(CommonCMDReq req) - { - var result = await _authProxy.FindDomainPermissions(req); - return ServiceResult.Create(true, result); - } - - - [HttpPost("SignIn")] - public async Task> SignIn(LoginReq req) - { - //要注意参数类型 - var model = new Dictionary(); - model.Add("req", JsonConvert.SerializeObject(req)); - var serviceKey = "Auth"; - ServiceResult result = ServiceResult.Create(false, null); - var path = GateWayAppConfig.AuthorizationRoutePath; - if (OnAuthorization(path, model, ref result)) - { - if (path == GateWayAppConfig.AuthorizationRoutePath) - { - var token = await _authorizationServerProvider.GenerateTokenCredential(model); - if (token != null) - { - //查询当前用户的权限，返回给客户端 - var tmp = JsonConvert.DeserializeObject(_authorizationServerProvider.GetPayloadString(token)); - var identify = JsonConvert.DeserializeObject(tmp); - Dictionary reqQueryUserPermission = new Dictionary(); - reqQueryUserPermission.Add("req", JsonConvert.SerializeObject(new - { - Identify = identify - })); - string servicePath = "api/orgapp/QueryUserPermission"; - var res = await _serviceProxyProvider.Invoke(reqQueryUserPermission, servicePath); - if (res!=null&&res.OperateFlag) - { - result = ServiceResult.Create(true,new { token = token, auth=res.Result }); - result.StatusCode = (int)ServiceStatusCode.Success; - } - else - { - result = new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.AuthorizationFailed, Message = "Invalid authentication credentials" }; - } - } - else - { - result = new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.AuthorizationFailed, Message = "Invalid authentication credentials" }; - } - } - else - { - if (!string.IsNullOrEmpty(serviceKey)) - { - - result = ServiceResult.Create(true, await _serviceProxyProvider.Invoke(model, path, serviceKey)); - result.StatusCode = (int)ServiceStatusCode.Success; - } - else - { - result = ServiceResult.Create(true, await _serviceProxyProvider.Invoke(model, path)); - result.StatusCode = (int)ServiceStatusCode.Success; - } - } - } - return result; - } - #endregion - - #region Private - private bool OnAuthorization(string path, Dictionary model, ref ServiceResult result) - { - bool isSuccess = true; - var route = _serviceRouteProvider.GetRouteByPath(path).Result; - if (route.ServiceDescriptor.EnableAuthorization()) - { - if (route.ServiceDescriptor.AuthType() == AuthorizationType.JWT.ToString()) - { - isSuccess = ValidateJwtAuthentication(route, model, ref result); - } - else - { - isSuccess = ValidateAppSecretAuthentication(route, path, model, ref result); - } - - } - return isSuccess; - } - - private bool ValidateJwtAuthentication(ServiceRoute route, Dictionary model, ref ServiceResult result) - { - bool isSuccess = true; - var author = HttpContext.Request.Headers["Authorization"]; - if (author.Count > 0) - { - if (route.Address.Any(p => p.DisableAuth == false)) - { - isSuccess = _authorizationServerProvider.ValidateClientAuthentication(author).Result; - if (!isSuccess) - { - result = new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.AuthorizationFailed, Message = "Invalid authentication credentials" }; - } - else - { - var keyValue = model.FirstOrDefault(); - if (!(keyValue.Value is IConvertible) || !typeof(IConvertible).GetTypeInfo().IsAssignableFrom(keyValue.Value.GetType())) - { - dynamic instance = keyValue.Value; - instance.Payload = _authorizationServerProvider.GetPayloadString(author); - model.Remove(keyValue.Key); - model.Add(keyValue.Key, instance); - } - } - } - } - else - { - result = new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.RequestError, Message = "Request error" }; - isSuccess = false; - } - return isSuccess; - } - - private bool ValidateAppSecretAuthentication(ServiceRoute route, string path, - Dictionary model, ref ServiceResult result) - { - bool isSuccess = true; - DateTime time; - var author = HttpContext.Request.Headers["Authorization"]; - if (route.Address.Any(p => p.DisableAuth == false)) - { - if (!string.IsNullOrEmpty(path) && model.ContainsKey("timeStamp") && author.Count > 0) - { - if (DateTime.TryParse(model["timeStamp"].ToString(), out time)) - { - var seconds = (DateTime.Now - time).TotalSeconds; - if (seconds <= 3560 && seconds >= 0) - { - if (!route.Address.Any(p => GetMD5($"{p.Token}{time.ToString("yyyy-MM-dd hh:mm:ss") }") == author.ToString())) - { - result = new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.AuthorizationFailed, Message = "Invalid authentication credentials" }; - isSuccess = false; - } - } - else - { - result = new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.AuthorizationFailed, Message = "Invalid authentication credentials" }; - isSuccess = false; - } - } - else - { - result = new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.AuthorizationFailed, Message = "Invalid authentication credentials" }; - isSuccess = false; - } - } - else - { - result = new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.RequestError, Message = "Request error" }; - isSuccess = false; - } - } - return isSuccess; - } - - private string GetMD5(string encypStr) - { - try - { - var md5 = MD5.Create(); - var bs = md5.ComputeHash(Encoding.UTF8.GetBytes(encypStr)); - var sb = new StringBuilder(); - foreach (byte b in bs) - { - sb.Append(b.ToString("X2")); - } - //所有字符转为大写 - return sb.ToString().ToLower(); - } - catch (Exception e) - { - Console.Error.WriteLine(e.StackTrace); - return null; - } - } - #endregion - } -} \ No newline at end of file diff --git a/samples/GateWay.WebApi/Areas/OrgManger/Controllers/CorpMangerController.cs b/samples/GateWay.WebApi/Areas/OrgManger/Controllers/CorpMangerController.cs deleted file mode 100644 index bdcd0cd9e..000000000 --- a/samples/GateWay.WebApi/Areas/OrgManger/Controllers/CorpMangerController.cs +++ /dev/null @@ -1,91 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Application.Interface.Org; -using DTO.Core; -using GateWay.WebApi.Controllers; -using Microsoft.AspNetCore.Mvc; -using Surging.Core.ApiGateWay; -using Surging.Core.CPlatform.Utilities; -using Surging.Core.ProxyGenerator; - -namespace GateWay.WebApi -{ - [Route("api/corp"), CustomAuthorizeFilter] - public class CorpController : BaseApiController - { - private IOrgAppService _orgProxy; - - public CorpController() - { - _orgProxy = serviceProxyFactory.CreateProxy(); - } - - - #region 公司 - [HttpPost] - public async Task> RegisterCorporation(CorpEditReq req) - { - var result = await _orgProxy.RegisterCorporation(req); - return ServiceResult.Create(result.OperateFlag, result.OperateResult); - } - - [HttpPut("activate")] - public async Task> ActivateCorporation(CommonCMDReq req) - { - var result = await _orgProxy.ActivateCorporation(req); - return ServiceResult.Create(result.OperateFlag, result.OperateResult); - } - - [HttpGet("tree")] - public async Task> GetCorpTree(BaseTreeSearchReq req) - { - - var result = await _orgProxy.FindCorps(req); - return ServiceResult.Create(true, result); - } - - #endregion - #region 部门管理 - [HttpGet("org/tree")] - public async Task> GetOrgTree(BaseTreeSearchReq req) - { - - var result = await _orgProxy.FindDepartments(req); - return ServiceResult.Create(true, result); - } - - [HttpGet("org/info")] - public ServiceResult GetInfo(KeyIdReq req) - { - return ServiceResult.Create(true, ""); - } - - [HttpPost("org")] - public async Task> Post(DeptEditReq req) - { - - var result = await _orgProxy.CreateDepartment(req); - return ServiceResult.Create(result.OperateFlag, result.OperateResult); - } - - [HttpPut("org")] - public async Task> Put(DeptEditReq req) - { - - var result = await _orgProxy.ModifyDepartment(req); - return ServiceResult.Create(result.OperateFlag, result.OperateResult); - } - - [HttpDelete("org")] - public async Task> Delete(KeyIdReq req) - { - var result = await _orgProxy.RemoveDepartment(req); - return ServiceResult.Create(result.OperateFlag, result.OperateResult); - } - - #endregion - - } -} diff --git a/samples/GateWay.WebApi/Areas/OrgManger/Controllers/EmployeeController.cs b/samples/GateWay.WebApi/Areas/OrgManger/Controllers/EmployeeController.cs deleted file mode 100644 index 94e923900..000000000 --- a/samples/GateWay.WebApi/Areas/OrgManger/Controllers/EmployeeController.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Application.Interface.Org; -using DTO.Core; -using GateWay.WebApi.Controllers; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Surging.Core.ApiGateWay; - -namespace GateWay.WebApi.Areas.OrgManger.Controllers -{ - //[Produces("application/json")] - [Route("api/[controller]")] - public class EmployeeController : BaseApiController - { - private IOrgAppService _orgProxy; - - public EmployeeController() - { - _orgProxy = serviceProxyFactory.CreateProxy(); - } - - - #region 员工 - [HttpPost] - public async Task> Post(EmployeeEditReq req) - { - //HttpContext.Request.Headers - var result = await _orgProxy.CreateEmployee(req); - return ServiceResult.Create(result.OperateFlag, result.OperateResult); - } - - [HttpGet("list")] - public async Task> GetRoleTree(BasePagedRequestDto req) - { - var result = await _orgProxy.FindEmployeePageBy(req); - return ServiceResult.Create(true, result); - } - - - #endregion - - - } -} \ No newline at end of file diff --git a/samples/GateWay.WebApi/Areas/OrgManger/Controllers/RoleMangerController.cs b/samples/GateWay.WebApi/Areas/OrgManger/Controllers/RoleMangerController.cs deleted file mode 100644 index b1fd0dfc0..000000000 --- a/samples/GateWay.WebApi/Areas/OrgManger/Controllers/RoleMangerController.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Application.Interface.Org; -using DTO.Core; -using GateWay.WebApi.Controllers; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Surging.Core.ApiGateWay; - -namespace GateWay.WebApi.Areas.OrgManger.Controllers -{ - //[Produces("application/json")] - [Route("api/[controller]")] - public class RoleController : BaseApiController - { - private IOrgAppService _orgProxy; - - public RoleController() - { - _orgProxy = serviceProxyFactory.CreateProxy(); - } - - - #region 角色 - [HttpPost] - public async Task> Post(RoleEditReq req) - { - var result = await _orgProxy.CreateRole(req); - return ServiceResult.Create(result.OperateFlag, result.OperateResult); - } - - [HttpGet("list")] - public async Task> GetRoleTree(CommonCMDReq req) - { - var result = await _orgProxy.FindCorpRoles(req); - return ServiceResult.Create(true, result); - } - - - #endregion - - #region 角色包含的权限 - - #endregion - } -} \ No newline at end of file diff --git a/samples/GateWay.WebApi/Configs/appsettings.Development.json b/samples/GateWay.WebApi/Configs/appsettings.Development.json deleted file mode 100644 index fa8ce71a9..000000000 --- a/samples/GateWay.WebApi/Configs/appsettings.Development.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Logging": { - "IncludeScopes": false, - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - } -} diff --git a/samples/GateWay.WebApi/Configs/appsettings.json b/samples/GateWay.WebApi/Configs/appsettings.json deleted file mode 100644 index 26bb0ac7a..000000000 --- a/samples/GateWay.WebApi/Configs/appsettings.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "Logging": { - "IncludeScopes": false, - "Debug": { - "LogLevel": { - "Default": "Warning" - } - }, - "Console": { - "LogLevel": { - "Default": "Warning" - } - } - } -} diff --git a/samples/GateWay.WebApi/Configs/cacheSettings.json b/samples/GateWay.WebApi/Configs/cacheSettings.json deleted file mode 100644 index ab9c7e43d..000000000 --- a/samples/GateWay.WebApi/Configs/cacheSettings.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "CachingSettings": [ - { - "Id": "ddlCache", - "Class": "Surging.Core.Caching.RedisCache.RedisContext,Surging.Core.Caching", - "Properties": [ - { - "Name": "appRuleFile", - "Ref": "rule" - }, - { - "Name": "dataContextPool", - "Ref": "ddls_sample", - "Maps": [ - { - "Name": "Redis", - "Properties": [ - { - "value": "127.0.0.1:6379::1" - } - ] - }, - { - "Name": "MemoryCache" - } - ] - }, - { - "Name": "defaultExpireTime", - "value": "120" - }, - { - "Name": "connectTimeout", - "Value": "120" - }, - { - "Name": "minSize", - "Value": "1" - }, - { - "Name": "maxSize", - "Value": "10" - } - ] - } - ] -} diff --git a/samples/GateWay.WebApi/Configs/gatewaySettings.json b/samples/GateWay.WebApi/Configs/gatewaySettings.json deleted file mode 100644 index 24fa1cba2..000000000 --- a/samples/GateWay.WebApi/Configs/gatewaySettings.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "AccessTokenExpireTimeSpan": "30", - "AuthorizationRoutePath": "api/authapp/signin", - "AuthorizationServiceKey": "Auth", - "TokenEndpointPath": "api/Auth", - "Register": { - "Provider": "Consul", - "Address": "127.0.0.1:8500" - } -} diff --git a/samples/GateWay.WebApi/Controllers/AuthController.cs b/samples/GateWay.WebApi/Controllers/AuthController.cs deleted file mode 100644 index 93e141624..000000000 --- a/samples/GateWay.WebApi/Controllers/AuthController.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Newtonsoft.Json; -using Surging.Core.CPlatform.Utilities; -using Surging.Core.ProxyGenerator; - -namespace Centa.Agency.WebApi.Controllers -{ - /// - /// 身份认证 - /// - [Route("api/[controller]")] - public class AuthController : Controller - { - /// - /// 登录 - /// - /// - [HttpPost("token")] - public object SignIn( [FromBody]Dictionary model) - { - model.Add("user", JsonConvert.SerializeObject(new - { - Name = "fanly", - Age = 18, - UserId = 1 - })); - string path = "api/AuthApp/SignIn"; - string serviceKey = "Auth"; - - - var serviceProxyProvider = ServiceLocator.GetService(); - return serviceProxyProvider.Invoke(model, path, serviceKey).Result; - - } - } -} diff --git a/samples/GateWay.WebApi/Controllers/BaseApiController.cs b/samples/GateWay.WebApi/Controllers/BaseApiController.cs deleted file mode 100644 index d484b5799..000000000 --- a/samples/GateWay.WebApi/Controllers/BaseApiController.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Caching.Distributed; -using Surging.Core.CPlatform.Utilities; -using Surging.Core.ProxyGenerator; - -namespace GateWay.WebApi.Controllers -{ - [Produces("application/json")] - [Route("api/BaseApi")] - public class BaseApiController : Controller //ControllerBase - { - protected IServiceProxyFactory serviceProxyFactory = ServiceLocator.GetService(); - protected readonly IDistributedCache _cache; - } -} \ No newline at end of file diff --git a/samples/GateWay.WebApi/Controllers/ServicesController.cs b/samples/GateWay.WebApi/Controllers/ServicesController.cs deleted file mode 100644 index c298b28fb..000000000 --- a/samples/GateWay.WebApi/Controllers/ServicesController.cs +++ /dev/null @@ -1,219 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using Surging.Core.ApiGateWay; -using Surging.Core.ApiGateWay.OAuth; -using Surging.Core.CPlatform; -using Surging.Core.CPlatform.Filters.Implementation; -using Surging.Core.CPlatform.Routing; -using Surging.Core.ProxyGenerator; -using Surging.Core.ProxyGenerator.Utilitys; -using System; -using System.Collections.Generic; -using System.Security.Cryptography; -using System.Text; -using System.Threading.Tasks; -using System.Linq; -using GateWayAppConfig = Surging.Core.ApiGateWay.AppConfig; -using System.Reflection; -using Surging.Core.CPlatform.Utilities; - -namespace GateWay.WebApi -{ - /// - /// 身份认证 - /// - [Route("api/[controller]")] - public class AuthController : Controller - { - private readonly IServiceProxyProvider _serviceProxyProvider; - private readonly IServiceRouteProvider _serviceRouteProvider; - private readonly IAuthorizationServerProvider _authorizationServerProvider; - - - public AuthController() - /* IServiceProxyProvider serviceProxyProvider, - IServiceRouteProvider serviceRouteProvider, - IAuthorizationServerProvider authorizationServerProvider) - */ - { - // ServiceLocator.GetService(); // - //_serviceProxyProvider = serviceProxyProvider; - //_serviceRouteProvider = serviceRouteProvider; - //_authorizationServerProvider = authorizationServerProvider; - - _serviceProxyProvider = ServiceLocator.GetService(); - _serviceRouteProvider = ServiceLocator.GetService(); //serviceRouteProvider; - _authorizationServerProvider = ServiceLocator.GetService();// authorizationServerProvider; - - - } - - [HttpGet] - public IEnumerable Get() - { - return new string[] { "value1", "value2" }; - } - - /// - /// 登录 - /// - /// - /// - /// - /// - [HttpPost] - public async Task> Post(string path, string serviceKey, Dictionary model) - { - model = model ?? new Dictionary(); - ServiceResult result = ServiceResult.Create(false, null); - path = string.IsNullOrEmpty(path) ? - GateWayAppConfig.AuthorizationRoutePath : path.ToLower(); - if (OnAuthorization(path, model, ref result)) - { - if (path == GateWayAppConfig.AuthorizationRoutePath) - { - var token = await _authorizationServerProvider.GenerateTokenCredential(model); - if (token != null) - { - result = ServiceResult.Create(true, token); - result.StatusCode = (int)ServiceStatusCode.Success; - } - else - { - result = new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.AuthorizationFailed, Message = "Invalid authentication credentials" }; - } - } - else - { - if (!string.IsNullOrEmpty(serviceKey)) - { - - result = ServiceResult.Create(true, await _serviceProxyProvider.Invoke(model, path, serviceKey)); - result.StatusCode = (int)ServiceStatusCode.Success; - } - else - { - result = ServiceResult.Create(true, await _serviceProxyProvider.Invoke(model, path)); - result.StatusCode = (int)ServiceStatusCode.Success; - } - } - } - return result; - } - - private bool OnAuthorization(string path, Dictionary model, ref ServiceResult result) - { - bool isSuccess = true; - var route = _serviceRouteProvider.GetRouteByPath(path).Result; - if (route.ServiceDescriptor.EnableAuthorization()) - { - if (route.ServiceDescriptor.AuthType() == AuthorizationType.JWT.ToString()) - { - isSuccess = ValidateJwtAuthentication(route, model, ref result); - } - else - { - isSuccess = ValidateAppSecretAuthentication(route, path, model, ref result); - } - - } - return isSuccess; - } - - public bool ValidateJwtAuthentication(ServiceRoute route, Dictionary model, ref ServiceResult result) - { - bool isSuccess = true; - var author = HttpContext.Request.Headers["Authorization"]; - if (author.Count > 0) - { - if (route.Address.Any(p => p.DisableAuth == false)) - { - isSuccess = _authorizationServerProvider.ValidateClientAuthentication(author).Result; - if (!isSuccess) - { - result = new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.AuthorizationFailed, Message = "Invalid authentication credentials" }; - } - else - { - var keyValue = model.FirstOrDefault(); - if (!(keyValue.Value is IConvertible) || !typeof(IConvertible).GetTypeInfo().IsAssignableFrom(keyValue.Value.GetType())) - { - dynamic instance = keyValue.Value; - instance.Payload = _authorizationServerProvider.GetPayloadString(author); - model.Remove(keyValue.Key); - model.Add(keyValue.Key, instance); - } - } - } - } - else - { - result = new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.RequestError, Message = "Request error" }; - isSuccess = false; - } - return isSuccess; - } - - private bool ValidateAppSecretAuthentication(ServiceRoute route, string path, - Dictionary model, ref ServiceResult result) - { - bool isSuccess = true; - DateTime time; - var author = HttpContext.Request.Headers["Authorization"]; - if (route.Address.Any(p => p.DisableAuth == false)) - { - if (!string.IsNullOrEmpty(path) && model.ContainsKey("timeStamp") && author.Count > 0) - { - if (DateTime.TryParse(model["timeStamp"].ToString(), out time)) - { - var seconds = (DateTime.Now - time).TotalSeconds; - if (seconds <= 3560 && seconds >= 0) - { - if (!route.Address.Any(p => GetMD5($"{p.Token}{time.ToString("yyyy-MM-dd hh:mm:ss") }") == author.ToString())) - { - result = new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.AuthorizationFailed, Message = "Invalid authentication credentials" }; - isSuccess = false; - } - } - else - { - result = new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.AuthorizationFailed, Message = "Invalid authentication credentials" }; - isSuccess = false; - } - } - else - { - result = new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.AuthorizationFailed, Message = "Invalid authentication credentials" }; - isSuccess = false; - } - } - else - { - result = new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.RequestError, Message = "Request error" }; - isSuccess = false; - } - } - return isSuccess; - } - - public static string GetMD5(string encypStr) - { - try - { - var md5 = MD5.Create(); - var bs = md5.ComputeHash(Encoding.UTF8.GetBytes(encypStr)); - var sb = new StringBuilder(); - foreach (byte b in bs) - { - sb.Append(b.ToString("X2")); - } - //所有字符转为大写 - return sb.ToString().ToLower(); - } - catch (Exception e) - { - Console.Error.WriteLine(e.StackTrace); - return null; - } - } - } -} diff --git a/samples/GateWay.WebApi/Controllers/ValuesController.cs b/samples/GateWay.WebApi/Controllers/ValuesController.cs deleted file mode 100644 index f09497629..000000000 --- a/samples/GateWay.WebApi/Controllers/ValuesController.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; - -namespace GateWay.WebApi -{ - [Route("api/[controller]")] - public class ValuesController : Controller - { - [HttpGet] - public IEnumerable Get() - { - return new string[] { "value1", "value2" }; - } - - [HttpGet("{id}")] - public string Get(int id) - { - return "value"; - } - - [HttpPost] - public void Post([FromBody]string value) - { - } - - [HttpPut("{id}")] - public void Put(int id, [FromBody]string value) - { - } - - [HttpDelete("{id}")] - public void Delete(int id) - { - } - } -} diff --git a/samples/GateWay.WebApi/CustomExceptionFilterAttribute.cs b/samples/GateWay.WebApi/CustomExceptionFilterAttribute.cs deleted file mode 100644 index 93393e9e7..000000000 --- a/samples/GateWay.WebApi/CustomExceptionFilterAttribute.cs +++ /dev/null @@ -1,76 +0,0 @@ -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.Filters; -using Microsoft.AspNetCore.Mvc.ModelBinding; -using Surging.Core.ApiGateWay; -using Surging.Core.ApiGateWay.OAuth; -using Surging.Core.CPlatform.Utilities; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace GateWay.WebApi -{ - public class ResponeMsg - { - public string IsSucceed { get; set; } - public int StatusCode { get; set; } - public string Message { get; set; } - } - - public class CustomExceptionFilterAttribute : ExceptionFilterAttribute - { - private readonly IHostingEnvironment _hostingEnvironment; - private readonly IModelMetadataProvider _modelMetadataProvider; - - public CustomExceptionFilterAttribute( - IHostingEnvironment hostingEnvironment, - IModelMetadataProvider modelMetadataProvider) - { - _hostingEnvironment = hostingEnvironment; - _modelMetadataProvider = modelMetadataProvider; - } - - public override void OnException(ExceptionContext context) - { - if (!_hostingEnvironment.IsDevelopment()) - { - return; - } - var result = ServiceResult.Create(false, errorMessage: "request fail"); - result.StatusCode = 400; - context.Result = new JsonResult(result); - } - } - - public class CustomAuthorizeFilter : Attribute, IAuthorizationFilter - { - public void OnAuthorization(AuthorizationFilterContext context) - { - var isSuccess = false; - var _authorizationServerProvider = ServiceLocator.GetService(); - var author = context.HttpContext.Request.Headers["Authorization"]; - if(author.Count > 0) - { - isSuccess = _authorizationServerProvider.ValidateClientAuthentication(author).Result; - } - if (true||!isSuccess) - { - context.Result = new UnauthorizedResult(); - } - - /* var entry = - Dns.GetHostEntryAsync(context.HttpContext.Connection.RemoteIpAddress) - .GetAwaiter() - .GetResult(); - if (!entry.HostName.EndsWith(".MyDomain", - StringComparison.OrdinalIgnoreCase)) - { - context.Result = new UnauthorizedResult(); - } - */ - } - } -} - diff --git a/samples/GateWay.WebApi/GateWay.WebApi.csproj b/samples/GateWay.WebApi/GateWay.WebApi.csproj deleted file mode 100644 index b97ec5f3d..000000000 --- a/samples/GateWay.WebApi/GateWay.WebApi.csproj +++ /dev/null @@ -1,51 +0,0 @@ - - - - netcoreapp2.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ..\pack\Surging.Core.ApiGateWay.dll - - - - diff --git a/samples/GateWay.WebApi/HiddenApiFilter.cs b/samples/GateWay.WebApi/HiddenApiFilter.cs deleted file mode 100644 index bc9021507..000000000 --- a/samples/GateWay.WebApi/HiddenApiFilter.cs +++ /dev/null @@ -1,45 +0,0 @@ -using Microsoft.AspNetCore.Mvc.ApiExplorer; -using Swashbuckle.AspNetCore.Swagger; -using Swashbuckle.AspNetCore.SwaggerGen; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace GateWay.WebApi -{ - /// - /// 隐藏接口，不生成到swagger文档展示 - /// - [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class)] - - public partial class HiddenApiAttribute : Attribute { } - public class HiddenApiFilter : IDocumentFilter - { - /// - /// 重写Apply方法，移除隐藏接口的生成 - /// - /// - /// - public void Apply(SwaggerDocument swaggerDoc, DocumentFilterContext context) - { - foreach (ApiDescriptionGroup apiDescriptionGroup in context.ApiDescriptionsGroups.Items) - { - foreach (var apiDescription in apiDescriptionGroup.Items) - { - if(apiDescription.ControllerAttributes().First(c => c is HiddenApiAttribute)!=null) //if (Enumerable.OfType(apiDescription.ControllerAttributes().Where(c=>c is HiddenApiAttribute).ToList()) - { - string key = "/" + apiDescription.RelativePath; - if (key.Contains("?")) - { - int idx = key.IndexOf("?", StringComparison.Ordinal); - key = key.Substring(0, idx); - } - swaggerDoc.Paths.Remove(key); - } - } - - } - } - } -} diff --git a/samples/GateWay.WebApi/Program.cs b/samples/GateWay.WebApi/Program.cs deleted file mode 100644 index 42bc45609..000000000 --- a/samples/GateWay.WebApi/Program.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Server.Kestrel.Core; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Logging; - -namespace GateWay.WebApi -{ - public class Program - { - public static void Main(string[] args) - { - var host = new WebHostBuilder() - .UseUrls("http://*:729") - .UseKestrel(options => - { - options.Limits.MaxConcurrentConnections = 100; - options.Limits.MaxConcurrentUpgradedConnections = 100; - options.Limits.MaxRequestBodySize = 10 * 1024; - options.Limits.MinRequestBodyDataRate = - new MinDataRate(bytesPerSecond: 100, gracePeriod: TimeSpan.FromSeconds(10)); - options.Limits.MinResponseDataRate = - new MinDataRate(bytesPerSecond: 100, gracePeriod: TimeSpan.FromSeconds(10)); - }) - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISIntegration() - .UseStartup() - .UseApplicationInsights() - .Build(); - host.Run(); - // BuildWebHost(args).Run(); - } - - public static IWebHost BuildWebHost(string[] args) => - WebHost.CreateDefaultBuilder(args) - .UseStartup() - .Build(); - } -} diff --git a/samples/GateWay.WebApi/Properties/launchSettings.json b/samples/GateWay.WebApi/Properties/launchSettings.json deleted file mode 100644 index c5d069c3f..000000000 --- a/samples/GateWay.WebApi/Properties/launchSettings.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:729/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "launchUrl": "api/values", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "Centa.Agency.WebApi": { - "commandName": "Project", - "launchBrowser": true, - "launchUrl": "api/values", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "http://localhost:56956/" - } - } -} \ No newline at end of file diff --git a/samples/GateWay.WebApi/ScaffoldingReadMe.txt b/samples/GateWay.WebApi/ScaffoldingReadMe.txt deleted file mode 100644 index 19b66d8a3..000000000 --- a/samples/GateWay.WebApi/ScaffoldingReadMe.txt +++ /dev/null @@ -1,12 +0,0 @@ -Scaffolding has generated all the files and added the required dependencies. - -However the Application's Startup code may required additional changes for things to work end to end. -Add the following code to the Configure method in your Application's Startup class if not already done: - - app.UseMvc(routes => - { - route.MapRoute( - name : "areas", - template : "{area:exists}/{controller=Home}/{action=Index}/{id?}" - ); - }); diff --git a/samples/GateWay.WebApi/Startup.cs b/samples/GateWay.WebApi/Startup.cs deleted file mode 100644 index 942233503..000000000 --- a/samples/GateWay.WebApi/Startup.cs +++ /dev/null @@ -1,162 +0,0 @@ -using System; -using Autofac; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Swashbuckle.AspNetCore.Swagger; -using Newtonsoft.Json.Serialization; -using ApiGateWayConfig = Surging.Core.ApiGateWay.AppConfig; -using Surging.Core.CPlatform; -using Surging.Core.ProxyGenerator; -using Surging.Core.Consul; -using Surging.Core.CPlatform.Utilities; -using Surging.Core.DotNetty; -using Surging.Core.Consul.Configurations; -using Surging.Core.ApiGateWay.OAuth.Implementation.Configurations; -using Autofac.Extensions.DependencyInjection; -using Surging.Core.ApiGateWay; -using Surging.Core.Caching.Configurations; -using Surging.Core.Codec.MessagePack; -using Microsoft.AspNetCore.Mvc; - -namespace GateWay.WebApi -{ - public class Startup - { - public IConfiguration Configuration { get; } - public IContainer ApplicationContainer { get; private set; } - - public Startup(IHostingEnvironment env) - { - var builder = new ConfigurationBuilder() - .SetBasePath(env.ContentRootPath) - .AddCacheFile("Configs/cacheSettings.json", optional: false) - .AddJsonFile("Configs/appsettings.json", optional: true, reloadOnChange: true) - .AddGatewayFile("Configs/gatewaySettings.json", optional: false) - .AddJsonFile($"Configs/appsettings.{env.EnvironmentName}.json", optional: true); - Configuration = builder.Build(); - } - - - // This method gets called by the runtime. Use this method to add services to the container. - public void ConfigureServices(IServiceCollection services) - { - RegisterAutofac(services); - // Register the Swagger generator, defining one or more Swagger documents - services.AddSwaggerGen(c => - { - c.SwaggerDoc("v1", new Info { Title = "网关 API", Version = "v1" }); - c.DescribeAllParametersInCamelCase(); - }); - - // services.AddResponseCaching(); - - //分布式缓存 Microsoft.Extensions.Caching.Redis NuGet package - /*services.AddDistributedRedisCache(options => - { - options.Configuration = "servername"; - options.InstanceName = "Shopping"; - });*/ - //基于 的身份认证 - /* services.AddCookieAuthentication(CookieAuthenticationDefaults.Authenticatio - nScheme, options => - { - options.LoginPath = "/Account/Login/"; - options.AccessDeniedPath = "/Account/Forbidden/"; - options.LogoutPath = "/Account/Logout"; - options.ReturnUrlParameter = "ReturnUrl"; - }); - - Microsoft.AspNetCore.Identity.EntityFrameworkCore - - services.AddEntityFramework() -.AddSqlServer() -.AddDbContext(options => -options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString -"])); -services.AddIdentity() -.AddEntityFrameworkStores() -.AddDefaultTokenProviders(); - - - services.AddCors(); - - - - - - - - */ - } - - private IServiceProvider RegisterAutofac(IServiceCollection services) - { - var registerConfig = ApiGateWayConfig.Register; - services.AddMvc(options => - { - options.Filters.Add(typeof(CustomExceptionFilterAttribute)); - //options.CacheProfiles.Add("5minutes", new CacheProfile - //{ - // Duration = 5 * 60, - // Location = ResponseCacheLocation.Any, - // VaryByHeader = "Accept-Language" - //}); - //[ResponseCache(CacheProfileName = "5minutes")] - }).AddJsonOptions(options => - { - options.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss"; - options.SerializerSettings.ContractResolver = new DefaultContractResolver(); - }); - services.AddLogging(); - var builder = new ContainerBuilder(); - builder.Populate(services); - builder.AddMicroService(option => - { - option.AddClient(); - // option.AddClientIntercepted(typeof(CacheProviderInterceptor)); - option.UseConsulManager(new ConfigInfo(registerConfig.Address)); - option.UseDotNettyTransport(); - option.AddApiGateWay(); - option.UseJsonCodec(); - // option.UseMessagePackCodec(); - builder.Register(m => new CPlatformContainer(ServiceLocator.Current)); - }); - ServiceLocator.Current = builder.Build(); - return new AutofacServiceProvider(ServiceLocator.Current); - - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - - - } - else - { - app.UseExceptionHandler("/Home/Error"); - } - app.UseStaticFiles(); - - // app.UseAuthentication(); - //app.UseCors(builder => builder.WithOrigins("http://mysite.com")); - //app.UseResponseCaching(); - app.UseMvc(); - - // Enable middleware to serve generated Swagger as a JSON endpoint. - app.UseSwagger(); - - // Enable middleware to serve swagger-ui (HTML, JS, CSS, etc.), specifying the Swagger JSON endpoint. - app.UseSwaggerUI(c => - { - c.SwaggerEndpoint("/swagger/v1/swagger.json", "网关 API V1"); - }); - - } - } -} diff --git a/samples/GateWay.WebApi/appsettings.Development.json b/samples/GateWay.WebApi/appsettings.Development.json deleted file mode 100644 index fa8ce71a9..000000000 --- a/samples/GateWay.WebApi/appsettings.Development.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Logging": { - "IncludeScopes": false, - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - } -} diff --git a/samples/GateWay.WebApi/appsettings.json b/samples/GateWay.WebApi/appsettings.json deleted file mode 100644 index 26bb0ac7a..000000000 --- a/samples/GateWay.WebApi/appsettings.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "Logging": { - "IncludeScopes": false, - "Debug": { - "LogLevel": { - "Default": "Warning" - } - }, - "Console": { - "LogLevel": { - "Default": "Warning" - } - } - } -} diff --git a/samples/LogServer/Application.Interface.SysLog/Application.Interface.SysLog.csproj b/samples/LogServer/Application.Interface.SysLog/Application.Interface.SysLog.csproj deleted file mode 100644 index 8b977eded..000000000 --- a/samples/LogServer/Application.Interface.SysLog/Application.Interface.SysLog.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - netcoreapp2.0 - - - - ..\HostService\bin\Debug - - - - - - - diff --git a/samples/LogServer/Application.Interface.SysLog/ILogAppService.cs b/samples/LogServer/Application.Interface.SysLog/ILogAppService.cs deleted file mode 100644 index db0c2c0aa..000000000 --- a/samples/LogServer/Application.Interface.SysLog/ILogAppService.cs +++ /dev/null @@ -1,45 +0,0 @@ -using Surging.Core.CPlatform.Ioc; -using Surging.Core.CPlatform.Runtime.Server.Implementation.ServiceDiscovery.Attributes; -using System; -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace Application.Interface.SysLog -{ - public class LogListViewDto - { - /// - /// 日志类型 - /// - public string LogType { get; set; } - - /// - /// 日志类型 - /// - public DateTime CreateTime { get; set; } - - /// - /// 操作部门 - /// - public string OpDept { get; set; } - - /// - /// 操作人 - /// - public string OpUser { get; set; } - } - [ServiceBundle("api/{Service}")] - public interface ILogAppService : IServiceKey - { - /// - /// 列表分页查询 - /// - /// - [Service(Date = "2018-1-20", Director = "刘旭东", Name = "查询日志")] - //[Authorization(AuthType = AuthorizationType.JWT)] - // [BindEvent("修改系统参数的事件|订单支付的事件")] - Task> PagedQuery(int pageIndex,int pageSize); - - - } -} diff --git a/samples/LogServer/Application.Service.SysLog/Application.Service.SysLog.csproj b/samples/LogServer/Application.Service.SysLog/Application.Service.SysLog.csproj deleted file mode 100644 index 72bd41272..000000000 --- a/samples/LogServer/Application.Service.SysLog/Application.Service.SysLog.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - netcoreapp2.0 - - - - ..\HostService\bin\Debug - - - - - - - - - - - - - - - diff --git a/samples/LogServer/Application.Service.SysLog/LogAppService.cs b/samples/LogServer/Application.Service.SysLog/LogAppService.cs deleted file mode 100644 index 717e0794e..000000000 --- a/samples/LogServer/Application.Service.SysLog/LogAppService.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Application.Interface.SysLog; -using Surging.Core.ProxyGenerator; -using System; -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace Application.Service.SysLog -{ - public class LogAppService : ProxyServiceBase, ILogAppService - { - public Task> PagedQuery(int pageIndex, int pageSize) - { - throw new NotImplementedException(); - } - } -} diff --git a/samples/LogServer/HostService/Configs/log4net.config b/samples/LogServer/HostService/Configs/log4net.config deleted file mode 100644 index 42fd16880..000000000 --- a/samples/LogServer/HostService/Configs/log4net.config +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/LogServer/HostService/HostService.csproj b/samples/LogServer/HostService/HostService.csproj deleted file mode 100644 index 2339f49f1..000000000 --- a/samples/LogServer/HostService/HostService.csproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - Exe - netcoreapp2.0 - - - - - - - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - - diff --git a/samples/LogServer/HostService/Program.cs b/samples/LogServer/HostService/Program.cs deleted file mode 100644 index 0b4ed6bc8..000000000 --- a/samples/LogServer/HostService/Program.cs +++ /dev/null @@ -1,64 +0,0 @@ -using Autofac; -using Surging.Core.Codec.MessagePack; -using Surging.Core.Consul; -using Surging.Core.Consul.Configurations; -using Surging.Core.CPlatform; -using Surging.Core.CPlatform.Utilities; -using Surging.Core.DotNetty; -using Surging.Core.EventBusRabbitMQ; -using Surging.Core.ServiceHosting; -using Surging.Core.ServiceHosting.Internal.Implementation; -using System; -using System.Text; -using Surging.Core.Log4net; -using Surging.Core.ProxyGenerator; - -namespace Centa.HostService.SysLog -{ - public class Program - { - static void Main(string[] args) - { - Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); - var host = new ServiceHostBuilder() - //.RegisterServices(provider => - //{ - // //这里写自己的注册 - //}) - .RegisterServices(builder => - { - builder.AddMicroService(option => - { - option.AddServiceRuntime(); - option.AddRelateService(); - option.UseConsulManager(new ConfigInfo("127.0.0.1:8500")); - option.UseDotNettyTransport(); - option.UseRabbitMQTransport(); - option.AddRabbitMQAdapt(); - // option.UseMessagePackCodec(); - option.UseJsonCodec(); - builder.Register(p => new CPlatformContainer(ServiceLocator.Current)); - }); - }) - .SubscribeAt() - .UseLog4net("Configs/log4net.config") - .UseServer(options => - { - options.Ip = "127.0.0.1"; - options.Port = 2018; - options.Token = "True"; - options.ExecutionTimeoutInMilliseconds = 30000; - options.MaxConcurrentRequests = 200; - }) - // .UseProxy() - .UseStartup() - .Build(); - - using (host.Run()) - { - Console.WriteLine($"服务端启动成功，{DateTime.Now}。"); - Console.ReadLine(); - } - } - } -} diff --git a/samples/LogServer/HostService/Startup.cs b/samples/LogServer/HostService/Startup.cs deleted file mode 100644 index 1b90c95a5..000000000 --- a/samples/LogServer/HostService/Startup.cs +++ /dev/null @@ -1,62 +0,0 @@ -using Autofac; -using Autofac.Extensions.DependencyInjection; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using Surging.Core.CPlatform.Utilities; -using Surging.Core.EventBusRabbitMQ.Configurations; -using System; - -namespace Centa.HostService.SysLog -{ - public class Startup - { - public Startup() - { - var config = new ConfigurationBuilder() - .SetBasePath(AppContext.BaseDirectory); - ConfigureEventBus(config); - ConfigureCache(config); - } - - public IContainer ConfigureServices(ContainerBuilder builder) - { - var services = new ServiceCollection(); - ConfigureLogging(services); - builder.Populate(services); - ServiceLocator.Current = builder.Build(); - return ServiceLocator.Current; - } - - public void Configure(IContainer app) - { - app.Resolve().AddConsole((c, l) => (int)l >= 3); - } - - #region 私有方法 - /// - /// 配置日志服务 - /// - /// - private void ConfigureLogging(IServiceCollection services) - { - services.AddLogging(); - } - - private static void ConfigureEventBus(IConfigurationBuilder build) - { - build - .AddEventBusFile("eventBusSettings.json", optional: false); - } - - /// - /// 配置缓存服务 - /// - private void ConfigureCache(IConfigurationBuilder build) - { - // build.AddCacheFile("cacheSettings.json", optional: false); - } - #endregion - - } -} diff --git a/samples/LogServer/HostService/cacheSettings.json b/samples/LogServer/HostService/cacheSettings.json deleted file mode 100644 index ab9c7e43d..000000000 --- a/samples/LogServer/HostService/cacheSettings.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "CachingSettings": [ - { - "Id": "ddlCache", - "Class": "Surging.Core.Caching.RedisCache.RedisContext,Surging.Core.Caching", - "Properties": [ - { - "Name": "appRuleFile", - "Ref": "rule" - }, - { - "Name": "dataContextPool", - "Ref": "ddls_sample", - "Maps": [ - { - "Name": "Redis", - "Properties": [ - { - "value": "127.0.0.1:6379::1" - } - ] - }, - { - "Name": "MemoryCache" - } - ] - }, - { - "Name": "defaultExpireTime", - "value": "120" - }, - { - "Name": "connectTimeout", - "Value": "120" - }, - { - "Name": "minSize", - "Value": "1" - }, - { - "Name": "maxSize", - "Value": "10" - } - ] - } - ] -} diff --git a/samples/LogServer/HostService/eventBusSettings.json b/samples/LogServer/HostService/eventBusSettings.json deleted file mode 100644 index d5d4487b7..000000000 --- a/samples/LogServer/HostService/eventBusSettings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "EventBusConnection": "localhost", - "EventBusUserName": "guest", - "EventBusPassword": "guest" -} - diff --git a/samples/MicroService.sln b/samples/MicroService.sln deleted file mode 100644 index 64818f727..000000000 --- a/samples/MicroService.sln +++ /dev/null @@ -1,206 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2010 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FrontEnd", "FrontEnd", "{16D922E9-E971-4E09-8957-2BEC03950B59}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Doc", "Doc", "{6B3A06FA-EF30-4CB4-955F-AF7FE2E9C60D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{24CC1A19-D3EE-4B3E-89EC-012BA4AFD112}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LogServer", "LogServer", "{11EC931F-CFB3-4395-BB64-1295DBA7CC3D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1-Distributed Services", "1-Distributed Services", "{7B1CB514-E30D-4D9D-B0DD-AC31AD7BB543}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2-Application Services", "2-Application Services", "{4AE3BF33-FE59-4FD2-BB67-E4CB313708C5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "4-Repository", "4-Repository", "{7ED005CB-4A0C-4E2A-8723-EF98EDC58037}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Repository.Dapper.Core", "Common\Repository.Dapper.Core\Repository.Dapper.Core.csproj", "{52B3EA74-1B2C-44B2-A617-9F32B3135818}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Repository.EF.Core", "Common\Repository.EF.Core\Repository.EF.Core.csproj", "{2F30368D-2ECE-4833-AE7B-0FDC34BA3102}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DDD.Core", "Common\DDD.Core\DDD.Core.csproj", "{FABAFCF3-4A9A-4853-8178-CFA7FC93E8BB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DTO.Core", "Common\DTO.Core\DTO.Core.csproj", "{93CC491E-83CD-47B6-8142-5F4CD28AC614}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostService", "LogServer\HostService\HostService.csproj", "{FBB4AF83-CD4A-4428-8C10-676B2658006A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Application.Interface.SysLog", "LogServer\Application.Interface.SysLog\Application.Interface.SysLog.csproj", "{631D7361-D683-4909-91F1-5C3324DCA282}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Application.Service.SysLog", "LogServer\Application.Service.SysLog\Application.Service.SysLog.csproj", "{53D00367-E40B-472A-935F-4C27B5762128}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AuthServer", "AuthServer", "{1AFE40BE-F129-457C-AA23-C9A19D6ADF4F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1-Distributed Services", "1-Distributed Services", "{0AB757EA-7849-4461-9849-40D49B3E86ED}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostService", "AuthServer\HostService\HostService.csproj", "{6313CF74-D8EE-4D18-93FD-6F2DAC33D90E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2-Application Services", "2-Application Services", "{904FEED6-3597-4BFB-9BF3-5DA54DC705A3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Application.Interface.Auth", "AuthServer\Application.Interface.Auth\Application.Interface.Auth.csproj", "{936B0D84-8B2A-4DEA-A287-0290EC64C017}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Application.Service.Auth", "AuthServer\Application.Service.Auth\Application.Service.Auth.csproj", "{6E4677D6-60A5-4868-B92A-6FE8FF1714D2}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "4-Repository", "4-Repository", "{95507E5B-2725-4263-93A0-4DF88A32C9D1}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OrgServer", "OrgServer", "{6850BB45-B72B-45FD-969B-58A5852FE52D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1-Distributed Services", "1-Distributed Services", "{977B9CD7-FA17-417F-8577-2A13E7D6AFB9}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2-Application Services", "2-Application Services", "{7F1BD8CD-4F80-4586-B3BE-B8B159E224A5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "4-Repository", "4-Repository", "{27935240-E1E5-4D55-AFA2-27AA92681789}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostService", "OrgServer\HostService\HostService.csproj", "{C19A5D2C-8E75-41AE-A1FF-D63D25CB98A0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Application.Interface.Org", "OrgServer\Application.Interface.Org\Application.Interface.Org.csproj", "{F47E8649-62A3-4B7F-8B81-13E995D17DAF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Application.Service.Org", "OrgServer\Application.Service.Org\Application.Service.Org.csproj", "{797C2369-5E7D-4CA3-8AAC-15BE4604E7C7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App.Core", "Common\App.Core\App.Core.csproj", "{027BA86B-43EE-4825-A3E3-A988F847A1CA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3-Domain", "3-Domain", "{9924D2D9-6D66-44CA-B5F8-9A46ACD637C5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Domain.Org", "OrgServer\Domain\Domain.Org.csproj", "{F44DCA50-03E6-46CF-9694-E15915C9F443}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3-Domain", "3-Domain", "{13D4465F-E298-46DD-822D-048BCF99CC47}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Domain.Auth", "AuthServer\Domain\Domain.Auth.csproj", "{2D571933-83F7-4D36-A0DB-3A47EAC64930}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Repository.Auth", "AuthServer\Repository.Auth\Repository.Auth.csproj", "{543EEE3D-7A8D-44F1-86AB-B5EADB3579B2}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Repository.Org", "OrgServer\Repository.Org\Repository.Org.csproj", "{B884CB7A-70E7-4710-A49A-3F22E90BBF1E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Config.Core", "Common\Config.Core\Config.Core.csproj", "{91E42C03-C901-4085-A89F-B6BEED95E25F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GateWay.WebApi", "GateWay.WebApi\GateWay.WebApi.csproj", "{49370CFD-21BC-4B4E-8AB9-8CC8B18C3180}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {52B3EA74-1B2C-44B2-A617-9F32B3135818}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52B3EA74-1B2C-44B2-A617-9F32B3135818}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52B3EA74-1B2C-44B2-A617-9F32B3135818}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52B3EA74-1B2C-44B2-A617-9F32B3135818}.Release|Any CPU.Build.0 = Release|Any CPU - {2F30368D-2ECE-4833-AE7B-0FDC34BA3102}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F30368D-2ECE-4833-AE7B-0FDC34BA3102}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F30368D-2ECE-4833-AE7B-0FDC34BA3102}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F30368D-2ECE-4833-AE7B-0FDC34BA3102}.Release|Any CPU.Build.0 = Release|Any CPU - {FABAFCF3-4A9A-4853-8178-CFA7FC93E8BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FABAFCF3-4A9A-4853-8178-CFA7FC93E8BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FABAFCF3-4A9A-4853-8178-CFA7FC93E8BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FABAFCF3-4A9A-4853-8178-CFA7FC93E8BB}.Release|Any CPU.Build.0 = Release|Any CPU - {93CC491E-83CD-47B6-8142-5F4CD28AC614}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93CC491E-83CD-47B6-8142-5F4CD28AC614}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93CC491E-83CD-47B6-8142-5F4CD28AC614}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93CC491E-83CD-47B6-8142-5F4CD28AC614}.Release|Any CPU.Build.0 = Release|Any CPU - {FBB4AF83-CD4A-4428-8C10-676B2658006A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBB4AF83-CD4A-4428-8C10-676B2658006A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBB4AF83-CD4A-4428-8C10-676B2658006A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBB4AF83-CD4A-4428-8C10-676B2658006A}.Release|Any CPU.Build.0 = Release|Any CPU - {631D7361-D683-4909-91F1-5C3324DCA282}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {631D7361-D683-4909-91F1-5C3324DCA282}.Debug|Any CPU.Build.0 = Debug|Any CPU - {631D7361-D683-4909-91F1-5C3324DCA282}.Release|Any CPU.ActiveCfg = Release|Any CPU - {631D7361-D683-4909-91F1-5C3324DCA282}.Release|Any CPU.Build.0 = Release|Any CPU - {53D00367-E40B-472A-935F-4C27B5762128}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {53D00367-E40B-472A-935F-4C27B5762128}.Debug|Any CPU.Build.0 = Debug|Any CPU - {53D00367-E40B-472A-935F-4C27B5762128}.Release|Any CPU.ActiveCfg = Release|Any CPU - {53D00367-E40B-472A-935F-4C27B5762128}.Release|Any CPU.Build.0 = Release|Any CPU - {6313CF74-D8EE-4D18-93FD-6F2DAC33D90E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6313CF74-D8EE-4D18-93FD-6F2DAC33D90E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6313CF74-D8EE-4D18-93FD-6F2DAC33D90E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6313CF74-D8EE-4D18-93FD-6F2DAC33D90E}.Release|Any CPU.Build.0 = Release|Any CPU - {936B0D84-8B2A-4DEA-A287-0290EC64C017}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {936B0D84-8B2A-4DEA-A287-0290EC64C017}.Debug|Any CPU.Build.0 = Debug|Any CPU - {936B0D84-8B2A-4DEA-A287-0290EC64C017}.Release|Any CPU.ActiveCfg = Release|Any CPU - {936B0D84-8B2A-4DEA-A287-0290EC64C017}.Release|Any CPU.Build.0 = Release|Any CPU - {6E4677D6-60A5-4868-B92A-6FE8FF1714D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E4677D6-60A5-4868-B92A-6FE8FF1714D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E4677D6-60A5-4868-B92A-6FE8FF1714D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E4677D6-60A5-4868-B92A-6FE8FF1714D2}.Release|Any CPU.Build.0 = Release|Any CPU - {C19A5D2C-8E75-41AE-A1FF-D63D25CB98A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C19A5D2C-8E75-41AE-A1FF-D63D25CB98A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C19A5D2C-8E75-41AE-A1FF-D63D25CB98A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C19A5D2C-8E75-41AE-A1FF-D63D25CB98A0}.Release|Any CPU.Build.0 = Release|Any CPU - {F47E8649-62A3-4B7F-8B81-13E995D17DAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F47E8649-62A3-4B7F-8B81-13E995D17DAF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F47E8649-62A3-4B7F-8B81-13E995D17DAF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F47E8649-62A3-4B7F-8B81-13E995D17DAF}.Release|Any CPU.Build.0 = Release|Any CPU - {797C2369-5E7D-4CA3-8AAC-15BE4604E7C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {797C2369-5E7D-4CA3-8AAC-15BE4604E7C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {797C2369-5E7D-4CA3-8AAC-15BE4604E7C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {797C2369-5E7D-4CA3-8AAC-15BE4604E7C7}.Release|Any CPU.Build.0 = Release|Any CPU - {027BA86B-43EE-4825-A3E3-A988F847A1CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {027BA86B-43EE-4825-A3E3-A988F847A1CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {027BA86B-43EE-4825-A3E3-A988F847A1CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {027BA86B-43EE-4825-A3E3-A988F847A1CA}.Release|Any CPU.Build.0 = Release|Any CPU - {F44DCA50-03E6-46CF-9694-E15915C9F443}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F44DCA50-03E6-46CF-9694-E15915C9F443}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F44DCA50-03E6-46CF-9694-E15915C9F443}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F44DCA50-03E6-46CF-9694-E15915C9F443}.Release|Any CPU.Build.0 = Release|Any CPU - {2D571933-83F7-4D36-A0DB-3A47EAC64930}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D571933-83F7-4D36-A0DB-3A47EAC64930}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D571933-83F7-4D36-A0DB-3A47EAC64930}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D571933-83F7-4D36-A0DB-3A47EAC64930}.Release|Any CPU.Build.0 = Release|Any CPU - {543EEE3D-7A8D-44F1-86AB-B5EADB3579B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {543EEE3D-7A8D-44F1-86AB-B5EADB3579B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {543EEE3D-7A8D-44F1-86AB-B5EADB3579B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {543EEE3D-7A8D-44F1-86AB-B5EADB3579B2}.Release|Any CPU.Build.0 = Release|Any CPU - {B884CB7A-70E7-4710-A49A-3F22E90BBF1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B884CB7A-70E7-4710-A49A-3F22E90BBF1E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B884CB7A-70E7-4710-A49A-3F22E90BBF1E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B884CB7A-70E7-4710-A49A-3F22E90BBF1E}.Release|Any CPU.Build.0 = Release|Any CPU - {91E42C03-C901-4085-A89F-B6BEED95E25F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91E42C03-C901-4085-A89F-B6BEED95E25F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91E42C03-C901-4085-A89F-B6BEED95E25F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91E42C03-C901-4085-A89F-B6BEED95E25F}.Release|Any CPU.Build.0 = Release|Any CPU - {49370CFD-21BC-4B4E-8AB9-8CC8B18C3180}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49370CFD-21BC-4B4E-8AB9-8CC8B18C3180}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49370CFD-21BC-4B4E-8AB9-8CC8B18C3180}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49370CFD-21BC-4B4E-8AB9-8CC8B18C3180}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {7B1CB514-E30D-4D9D-B0DD-AC31AD7BB543} = {11EC931F-CFB3-4395-BB64-1295DBA7CC3D} - {4AE3BF33-FE59-4FD2-BB67-E4CB313708C5} = {11EC931F-CFB3-4395-BB64-1295DBA7CC3D} - {7ED005CB-4A0C-4E2A-8723-EF98EDC58037} = {11EC931F-CFB3-4395-BB64-1295DBA7CC3D} - {52B3EA74-1B2C-44B2-A617-9F32B3135818} = {24CC1A19-D3EE-4B3E-89EC-012BA4AFD112} - {2F30368D-2ECE-4833-AE7B-0FDC34BA3102} = {24CC1A19-D3EE-4B3E-89EC-012BA4AFD112} - {FABAFCF3-4A9A-4853-8178-CFA7FC93E8BB} = {24CC1A19-D3EE-4B3E-89EC-012BA4AFD112} - {93CC491E-83CD-47B6-8142-5F4CD28AC614} = {24CC1A19-D3EE-4B3E-89EC-012BA4AFD112} - {FBB4AF83-CD4A-4428-8C10-676B2658006A} = {7B1CB514-E30D-4D9D-B0DD-AC31AD7BB543} - {631D7361-D683-4909-91F1-5C3324DCA282} = {4AE3BF33-FE59-4FD2-BB67-E4CB313708C5} - {53D00367-E40B-472A-935F-4C27B5762128} = {4AE3BF33-FE59-4FD2-BB67-E4CB313708C5} - {0AB757EA-7849-4461-9849-40D49B3E86ED} = {1AFE40BE-F129-457C-AA23-C9A19D6ADF4F} - {6313CF74-D8EE-4D18-93FD-6F2DAC33D90E} = {0AB757EA-7849-4461-9849-40D49B3E86ED} - {904FEED6-3597-4BFB-9BF3-5DA54DC705A3} = {1AFE40BE-F129-457C-AA23-C9A19D6ADF4F} - {936B0D84-8B2A-4DEA-A287-0290EC64C017} = {904FEED6-3597-4BFB-9BF3-5DA54DC705A3} - {6E4677D6-60A5-4868-B92A-6FE8FF1714D2} = {904FEED6-3597-4BFB-9BF3-5DA54DC705A3} - {95507E5B-2725-4263-93A0-4DF88A32C9D1} = {1AFE40BE-F129-457C-AA23-C9A19D6ADF4F} - {977B9CD7-FA17-417F-8577-2A13E7D6AFB9} = {6850BB45-B72B-45FD-969B-58A5852FE52D} - {7F1BD8CD-4F80-4586-B3BE-B8B159E224A5} = {6850BB45-B72B-45FD-969B-58A5852FE52D} - {27935240-E1E5-4D55-AFA2-27AA92681789} = {6850BB45-B72B-45FD-969B-58A5852FE52D} - {C19A5D2C-8E75-41AE-A1FF-D63D25CB98A0} = {977B9CD7-FA17-417F-8577-2A13E7D6AFB9} - {F47E8649-62A3-4B7F-8B81-13E995D17DAF} = {7F1BD8CD-4F80-4586-B3BE-B8B159E224A5} - {797C2369-5E7D-4CA3-8AAC-15BE4604E7C7} = {7F1BD8CD-4F80-4586-B3BE-B8B159E224A5} - {027BA86B-43EE-4825-A3E3-A988F847A1CA} = {24CC1A19-D3EE-4B3E-89EC-012BA4AFD112} - {9924D2D9-6D66-44CA-B5F8-9A46ACD637C5} = {6850BB45-B72B-45FD-969B-58A5852FE52D} - {F44DCA50-03E6-46CF-9694-E15915C9F443} = {9924D2D9-6D66-44CA-B5F8-9A46ACD637C5} - {13D4465F-E298-46DD-822D-048BCF99CC47} = {1AFE40BE-F129-457C-AA23-C9A19D6ADF4F} - {2D571933-83F7-4D36-A0DB-3A47EAC64930} = {13D4465F-E298-46DD-822D-048BCF99CC47} - {543EEE3D-7A8D-44F1-86AB-B5EADB3579B2} = {95507E5B-2725-4263-93A0-4DF88A32C9D1} - {B884CB7A-70E7-4710-A49A-3F22E90BBF1E} = {27935240-E1E5-4D55-AFA2-27AA92681789} - {91E42C03-C901-4085-A89F-B6BEED95E25F} = {24CC1A19-D3EE-4B3E-89EC-012BA4AFD112} - {49370CFD-21BC-4B4E-8AB9-8CC8B18C3180} = {16D922E9-E971-4E09-8957-2BEC03950B59} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {9536404C-EF7E-42FF-A785-CAADEA7C08A5} - EndGlobalSection -EndGlobal diff --git a/samples/OrgServer/Application.Interface.Org/Application.Interface.Org.csproj b/samples/OrgServer/Application.Interface.Org/Application.Interface.Org.csproj deleted file mode 100644 index e4da24ad5..000000000 --- a/samples/OrgServer/Application.Interface.Org/Application.Interface.Org.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - netcoreapp2.0 - - - - ..\HostService\bin\Debug - - - - - - - - - - - diff --git a/samples/OrgServer/Application.Interface.Org/DTO/DeptAddReq.cs b/samples/OrgServer/Application.Interface.Org/DTO/DeptAddReq.cs deleted file mode 100644 index ab9879432..000000000 --- a/samples/OrgServer/Application.Interface.Org/DTO/DeptAddReq.cs +++ /dev/null @@ -1,111 +0,0 @@ -using DTO.Core; -using System; -using System.Collections.Generic; -using System.Text; - -namespace Application.Interface.Org -{ - public class DeptEditReq : EntityCUDReq - { - /// - /// 所属公司ID - /// - - public Guid CorporationKeyId { get; set; } - public Guid? DepartmentKeyId { get; set; } - - /// - /// 部门名称 - /// - - public string DepartmentName { get; set; } - - /// - /// 部门名称简拼 - /// - - public string NameSpell { get; set; } - - /// - /// 部门编号 - /// - - public string DepartmentNo { get; set; } - - - - /// - /// 部门负责人KeyId - /// - - public Guid? DeptCheifKeyId { get; set; } - /// - /// 部门上一级负责人 - /// - - public Guid? ParentDeptCheifKeyId { get; set; } - /// - /// 部门上一级负责人部门ID - /// - - public Guid? ParentDeptCheifDeptId { get; set; } - /// - /// 父部门KeyId - /// - - public Guid? ParentDeptKeyId { get; set; } - - /// - /// 部门电话 - /// - - public string Telephone { get; set; } - - /// - /// 部门来源（null为A+系统新增，1为CCAI系统新增） - /// - - public int? SourceObjectFlag { get; set; } - - /// - /// 纬度 - /// - - public string Latitude { get; set; } - /// - /// 经度 - /// - - public string Longitude { get; set; } - - /// - /// 部门类型（普通额外公客池、客源市场） - /// - - // public DepartmentTypeEnum? DepartmentType { get; set; } - } - - public class CorpEditReq: EntityCUDReq - { - public string CorpName { get; set; } - - } - - public class RoleEditReq : EntityCUDReq - { - public string RoleName { get; set; } - - } - - public class EmployeeEditReq : EntityCUDReq - { - public string Name { get; set; } - public string Mobile { get; set; } - public Guid DeptKeyId { get; set; } - public Guid RoleKeyId { get; set; } - public string RoleName { get; set; } - - - - } -} diff --git a/samples/OrgServer/Application.Interface.Org/DTO/EmployeePermission.cs b/samples/OrgServer/Application.Interface.Org/DTO/EmployeePermission.cs deleted file mode 100644 index 71978f5a5..000000000 --- a/samples/OrgServer/Application.Interface.Org/DTO/EmployeePermission.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Application.Interface.Org.DTO -{ - class EmployeePermission - { - } -} diff --git a/samples/OrgServer/Application.Interface.Org/EVENT/CorporationActivated.cs b/samples/OrgServer/Application.Interface.Org/EVENT/CorporationActivated.cs deleted file mode 100644 index a157e80bd..000000000 --- a/samples/OrgServer/Application.Interface.Org/EVENT/CorporationActivated.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Surging.Core.CPlatform.EventBus.Events; -using System; -using System.Collections.Generic; -using System.Text; - -namespace Application.Interface.Org.EVENT -{ - /// - /// 新注册公司被激活的事件 - /// - public class CorporationActivatedEvent: IntegrationEvent - { - public Guid CorpId { get; set; } - public string Email { get; set; } - public string EmpId { get; set; } - - } -} diff --git a/samples/OrgServer/Application.Interface.Org/EVENT/ICorpEventHandler.cs b/samples/OrgServer/Application.Interface.Org/EVENT/ICorpEventHandler.cs deleted file mode 100644 index 2d1ae5637..000000000 --- a/samples/OrgServer/Application.Interface.Org/EVENT/ICorpEventHandler.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Application.Interface.Org -{ - /// - /// 事件处理器 - /// - public interface ICorpEventHandler //: IIntegrationEventHandler - { - } -} diff --git a/samples/OrgServer/Application.Interface.Org/IOrgAppService.cs b/samples/OrgServer/Application.Interface.Org/IOrgAppService.cs deleted file mode 100644 index e4ff25a6a..000000000 --- a/samples/OrgServer/Application.Interface.Org/IOrgAppService.cs +++ /dev/null @@ -1,142 +0,0 @@ -using DTO.Core; -using Surging.Core.CPlatform.Ioc; -using Surging.Core.CPlatform.Runtime.Server.Implementation.ServiceDiscovery.Attributes; -using Surging.Core.CPlatform.Support; -using Surging.Core.CPlatform.Support.Attributes; -using System; -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace Application.Interface.Org -{ - [ServiceBundle("api/{Service}")] - public interface IOrgAppService : IServiceKey - { - #region CMD - #region 公司管理 - - /// - /// 注册一个新公司 - /// - /// - /// - [Service(Date = "2018-2-12", Director = "刘旭东", Name = "注册一个新公司")] - Task RegisterCorporation(CorpEditReq req); - - /// - /// 激活一个新公司 - /// 手机短信或者邮箱确认 - /// - /// - /// - [Service(Date = "2018-2-12", Director = "刘旭东", Name = "激活一个新公司")] - Task ActivateCorporation(CommonCMDReq req); - - /// - /// 修改公司信息 - /// - /// - /// - [Service(Date = "2018-2-12", Director = "刘旭东", Name = "修改公司信息")] - Task EditCorporation(CorpEditReq req); - #endregion - - #region 权限管理 - - #endregion - - #endregion - - - #region Query - - #region 公司 - /// - /// 所有公司列表 - /// - /// - /// - [Service(Date = "2018-1-30", Director = "刘旭东", Name = "所有公司列表")] - Task FindCorps(BaseTreeSearchReq req); - #endregion - - #region 部门管理 - - /// - /// 当前用户所在公司全部部门列表 - /// 使用场景：部门树加载显示 - /// - /// - /// 全部部门列表 - //[Command(Strategy = StrategyType.Failover, RequestCacheEnabled = false)] - [Service(Date = "2018-1-30", Director = "刘旭东", Name = "当前用户所在公司全部部门列表")] - Task FindDepartments(BaseTreeSearchReq req); - - /// - /// 添加一个新部门 - /// - /// - /// 操作结果 - [Service(Date = "2018-2-1", Director = "刘旭东", Name = "添加一个新部门")] - Task CreateDepartment(DeptEditReq req); - - /// - /// 修改一个部门 - /// - /// - /// - [Service(Date = "2018-2-1", Director = "刘旭东", Name = "修改一个部门")] - Task ModifyDepartment(DeptEditReq req); - - /// - /// 删除一个部门 - /// - /// - /// - [Service(Date = "2018-2-1", Director = "刘旭东", Name = "删除一个部门")] - Task RemoveDepartment(KeyIdReq req); - - #endregion 部门管理 - - #region 权限管理 - /// - /// 添加一个新角色 - /// - /// - /// - [Service(Date = "2018-2-1", Director = "刘旭东", Name = "添加一个新角色")] - Task CreateRole(RoleEditReq req); - - /// - /// 查询用户的所有权限 - /// - /// - /// - [Service(Date = "2018-2-14", Director = "刘旭东", Name = "查询用户的所有权限")] - Task QueryUserPermission(CommonCMDReq req); - - [Service(Date = "2018-2-14", Director = "刘旭东", Name = "查询公司的所有角色")] - Task FindCorpRoles(CommonCMDReq req); - - #endregion - - #region 员工管理 - /// - /// 添加一个新员工 - /// - /// - /// - [Service(Date = "2018-2-1", Director = "刘旭东", Name = "添加一个新员工")] - Task CreateEmployee(EmployeeEditReq req); - - /// - /// 分页查询员工 - /// - /// - /// - [Service(Date = "2018-2-1", Director = "刘旭东", Name = "分页查询员工")] - Task FindEmployeePageBy(BasePagedRequestDto req); - #endregion - #endregion - } -} diff --git a/samples/OrgServer/Application.Service.Org/Application.Service.Org.csproj b/samples/OrgServer/Application.Service.Org/Application.Service.Org.csproj deleted file mode 100644 index d80fece76..000000000 --- a/samples/OrgServer/Application.Service.Org/Application.Service.Org.csproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - netcoreapp2.0 - - - - ..\HostService\bin\Debug - - - - - - - - - - - - - - - - - - - - diff --git a/samples/OrgServer/Application.Service.Org/Query/OrgAppService.cs b/samples/OrgServer/Application.Service.Org/Query/OrgAppService.cs deleted file mode 100644 index b1613de4a..000000000 --- a/samples/OrgServer/Application.Service.Org/Query/OrgAppService.cs +++ /dev/null @@ -1,85 +0,0 @@ -using Application.Interface.Org; -using DTO.Core; -using Surging.Core.Caching; -using Surging.Core.CPlatform.Ioc; -using Surging.Core.ProxyGenerator; -using System; -using System.Linq; -using System.Collections.Generic; -using System.Threading.Tasks; -using System.Linq.Expressions; -using Domain.Org.Entity; - -namespace Application.Service.Org -{ - public partial class OrgAppService - { - public Task FindCorps(BaseTreeSearchReq req) - { - BaseTreeResponseDto rsp = new BaseTreeResponseDto(); - rsp.Tree = _queryCorpRepository.Get(a => !a.IsDelete).Select(a => new BaseTreeDto - { - Id = a.CorporationKeyId.ToString(), - Name = a.Name, - PId = Guid.Empty.ToString() - }).ToList(); - - return Task.FromResult(rsp); - } - - public Task FindDepartments(BaseTreeSearchReq req) - { - BaseTreeResponseDto rsp = new BaseTreeResponseDto(); - var rows = _queryOrgRepository.Get(a => !a.IsDelete && a.CorporationKeyId == req.Identify.CorporationKeyId).Select(a => new BaseTreeDto - { - Id = a.CorporationKeyId.ToString(), - Name = a.Name, - PId = a.ParentKeyId.ToString() - }).ToList(); - rsp.Tree = rows; - return Task.FromResult(rsp); - } - - public Task QueryUserPermission(CommonCMDReq req) - { - var rsp = new BaseListResponseDto(); - var rows = _queryEmployeeRepository.FindUserRolePermission(Guid.Parse(req.Identify.Token)); - rsp.Result = new - { - pages = rows.Where(a => a.PermissionType == 1)?.Select(a => new - { - name = a.Name, - no = a.No, - }), - actions = rows.Where(a => a.PermissionType == 2)?.Select(a => new - { - name = a.Name, - no = a.No, - }) - }; - rsp.OperateFlag = true; - return Task.FromResult(rsp); - - } - - - public Task FindCorpRoles(CommonCMDReq req) - { - var rsp = new BaseListResponseDto(); - var rows = _queryCorpRepository.Get(a=>a.CorporationKeyId== req.Identify.CorporationKeyId,a=>a.CorpRoles).FirstOrDefault()?.CorpRoles.ToList(); - rsp.Result = rows?.Select(a=>new { roleName=a.Name,roleId=a.KeyId }).ToList(); - rsp.OperateFlag = true; - return Task.FromResult(rsp); - - } - - public Task FindEmployeePageBy(BasePagedRequestDto req) - { - var rsp = new BaseListResponseDto(); - var rows = _queryEmployeeRepository.GetByPagination(a => !a.IsDelete&&a.CorporationKeyId==req.Identify.CorporationKeyId, req.PageSize, req.PageIndex,null).ToList(); - rsp.Result = rows; - rsp.OperateFlag = true; - return Task.FromResult(rsp); - } - } -} diff --git a/samples/OrgServer/Application.Service.Org/UseCases/OrgAppService.cs b/samples/OrgServer/Application.Service.Org/UseCases/OrgAppService.cs deleted file mode 100644 index 191bbc943..000000000 --- a/samples/OrgServer/Application.Service.Org/UseCases/OrgAppService.cs +++ /dev/null @@ -1,280 +0,0 @@ -using App.Core; -using Application.Interface.Org; -using Domain.Org.Entity; -using DTO.Core; -using Repository.EF.Core; -using Surging.Core.Caching; -using Surging.Core.CPlatform.Ioc; -using Surging.Core.ProxyGenerator; -using System; -using System.Linq; -using System.Collections.Generic; -using System.Threading.Tasks; -using Domain.Org.Aggregate; -using Application.Interface.Org.EVENT; -using Repository.Org; - -namespace Application.Service.Org -{ - [ModuleName("Org")] - public partial class OrgAppService : BaseAppService, IOrgAppService - { - private readonly OrgRepository _repository; - private readonly CorpQueryRepository _queryCorpRepository; - private readonly OrgQueryRepository _queryOrgRepository; - private readonly EmployeeQueryRepository _queryEmployeeRepository; - - // private ICacheProvider _cacheProvider; - public OrgAppService(OrgRepository repository, OrgQueryRepository queryOrgRepository, CorpQueryRepository queryCorpRepository, EmployeeQueryRepository queryEmployeeRepository) - // : base(repository)//, queryOnlyRepository) - { - _repository = repository; - _queryCorpRepository = queryCorpRepository; - _queryOrgRepository = queryOrgRepository; - _queryEmployeeRepository = queryEmployeeRepository; - } - #region 公司 - - public Task RegisterCorporation(CorpEditReq req) - { - //是否已经被注册？ - var existCorp = _queryCorpRepository.Exist(a => !a.IsDelete && a.Name == req.CorpName); - if (!existCorp) - { - var aCorp = new Corporation - { - CorporationKeyId = Guid.NewGuid(), - Name = req.CorpName, - No = req.CorpName, - Version = 1, - CreateTime = DateTime.Now, - UpdateTime = DateTime.Now, - IsDelete = false - }; - _repository.Add(aCorp); - _repository.Commit(); - return Task.FromResult(new OperateResultRsp - { - OperateFlag = true, - OperateResult = "注册成功" - }); - } - else - { - return Task.FromResult(new OperateResultRsp - { - OperateFlag = false, - OperateResult = "该企业已经被注册" - }); - } - - } - - public Task ActivateCorporation(CommonCMDReq req) - { - var rsp = new OperateResultRsp - { - OperateFlag = false, - OperateResult = "参数错误" - }; - try - { - if (!string.IsNullOrEmpty(req.CommonCMD)) - { - var corp = _queryCorpRepository.Get(a => a.CorporationKeyId == req.Identify.CorporationKeyId).FirstOrDefault(); - corp.IsDelete = false; - var empId = corp.Activate(); - - _repository.Commit(); - rsp.OperateFlag = true; - rsp.OperateResult = "激活成功"; - Publish(new CorporationActivatedEvent() - { - CorpId = req.Identify.CorporationKeyId, - Email = req.CommonCMD, - EmpId = empId - }); - } - } - catch (Exception ex) - { - string msg = ex.Message; - } - return Task.FromResult(rsp); - - // return rsp; - } - - public Task EditCorporation(CorpEditReq req) - { - throw new NotImplementedException(); - } - #endregion - - #region 部门 - - public Task CreateDepartment(DeptEditReq req) - { - if (req.CorporationKeyId != Guid.Empty) - { - var corp = _repository.FindBy(req.CorporationKeyId); - if (corp != null) - { - corp.Departments.Add(new Department() - { - Name = req.DepartmentName, - No = req.DepartmentNo, - DepartmentType = DepartmentCategory.Bizz, - ParentKeyId = req.ParentDeptKeyId.GetValueOrDefault(), - Version = 1, - CreateTime = DateTime.Now, - UpdateTime = DateTime.Now, - IsDelete = false - }); - } - else - { - - } - } - else - { - return Task.FromResult(new OperateResultRsp - { - OperateFlag = false, - OperateResult = string.Empty - }); - } - _repository.Commit(); - return Task.FromResult(new OperateResultRsp - { - OperateFlag = true, - OperateResult = string.Empty - }); - } - - - - public Task ModifyDepartment(DeptEditReq req) - { - var corp = _repository.FindBy(req.CorporationKeyId); - if (corp != null) - { - var dept = corp.Departments.FirstOrDefault(c => c.KeyId == req.DepartmentKeyId.Value); - if (dept != null) - { - dept.Name = req.DepartmentName; - dept.No = req.DepartmentNo; - } - } - _repository.Commit(); - return Task.FromResult(new OperateResultRsp - { - OperateFlag = true, - OperateResult = string.Empty - }); - - } - - - - public Task RemoveDepartment(KeyIdReq req) - { - var corporation = _repository.FindBy(req.Identify.CorporationKeyId); - var dept = corporation.Departments.FirstOrDefault(c => c.KeyId == req.KeyId); - if (dept != null) - { - dept.IsDelete = true; - } - _repository.Commit(); - return Task.FromResult(new OperateResultRsp - { - OperateFlag = true, - OperateResult = string.Empty - }); - } - - - #endregion - - #region 角色 - public Task CreateRole(RoleEditReq req) - { - OperateResultRsp rsp = new OperateResultRsp(); - var corporation = _repository.FindBy(req.Identify.CorporationKeyId); - if (corporation != null) - { - if (!corporation.CorpRoles.Exists(a => a.Name == req.RoleName.Trim())) - { - var corpRole = new CorpRole - { - Name = req.RoleName, - CorporationKeyId = req.Identify.CorporationKeyId, - - }; - corpRole.SetEditer(null); - corpRole.KeyId = Guid.NewGuid(); - corporation.CorpRoles.Add(corpRole); - _repository.Commit(); - rsp.OperateFlag = true; - } - else - { - rsp.OperateFlag = false; - rsp.FlagErrorMsg = "角色名字已经存在"; - } - } - else - { - rsp.OperateFlag = false; - rsp.FlagErrorMsg = "当前公司编号错误"; - } - return Task.FromResult(rsp); - } - - - #endregion - - #region 员工 - public Task CreateEmployee(EmployeeEditReq req) - { - OperateResultRsp rsp = new OperateResultRsp(); - var corporation = _repository.FindBy(req.Identify.CorporationKeyId); - if (corporation != null) - { - var dept = corporation.Departments.FirstOrDefault(a => a.KeyId == req.DeptKeyId); - if (dept != null) - { - var emp = new Employee - { - Name = req.Name, - CorporationKeyId = req.Identify.CorporationKeyId, - DepartmentKeyId=req.DeptKeyId, - RoleKeyId = req.RoleKeyId, - RoleName = req.RoleName - - }; - emp.SetEditer(null); - emp.KeyId = Guid.NewGuid(); - dept.Employees.Add(emp); - _repository.Commit(); - rsp.OperateFlag = true; - } - else - { - rsp.OperateFlag = false; - rsp.FlagErrorMsg = "角色名字已经存在"; - } - } - else - { - rsp.OperateFlag = false; - rsp.FlagErrorMsg = "当前公司编号错误"; - } - return Task.FromResult(rsp); - } - - - #endregion - } -} diff --git a/samples/OrgServer/Domain/Aggregate/Corporation.cs b/samples/OrgServer/Domain/Aggregate/Corporation.cs deleted file mode 100644 index 95cc29c56..000000000 --- a/samples/OrgServer/Domain/Aggregate/Corporation.cs +++ /dev/null @@ -1,79 +0,0 @@ -using DDD.Core; -using Domain.Org.Entity; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Text; - -namespace Domain.Org.Aggregate -{ - [Table("Org_Corporations")] - public class Corporation : IAggregate - { - /// - /// 这个字段没有用，禁止使用 - /// - [NotMapped] - public override Guid KeyId { get => base.KeyId; set => base.KeyId = value; } - - [Key] - public override Guid CorporationKeyId { get; set; } - - public virtual List Departments { get; set; } - public virtual List CorpRoles { get; set; } - - /// - /// 注册后激活，初始化管理员数据 - /// - public string Activate() - { - //是否已经存在虚拟部门 - var dept = this.Departments.Find(a => !a.IsDelete && a.Name == "" && a.ParentKeyId == CorporationKeyId); - if(dept==null) - { - //添加虚拟部门 - dept = new Department() - { - Name=string.Empty, - CorporationKeyId=CorporationKeyId, - KeyId=Guid.NewGuid(), - CreateTime=DateTime.Now, - CreateUserKeyId=Guid.Empty, - No="000000", - ParentKeyId=CorporationKeyId, - UpdateTime=DateTime.Now, - UpdateUserKeyId=Guid.Empty, - Address=string.Empty, - NameSpell=string.Empty, - Telephone=string.Empty, - DepartmentType= DepartmentCategory.Sysinternal, - Employees=new List (), - IsDelete=false, - Version=1 - - }; - //添加管理员对应的员工 - var empid = Guid.NewGuid(); - dept.Employees.Add(new Employee() - { - Name="超级管理员", - No = "SuperManger", - KeyId=empid, - CorporationKeyId=CorporationKeyId, - CreateTime=DateTime.Now, - CreateUserKeyId=Guid.Empty, - DepartmentKeyId= dept.KeyId, - UpdateTime=DateTime.Now, - UpdateUserKeyId=Guid.Empty, - Version=1 - }); - return empid.ToString(); - } - else - { - return string.Empty; - } - } - } -} diff --git a/samples/OrgServer/Domain/Domain.Org.csproj b/samples/OrgServer/Domain/Domain.Org.csproj deleted file mode 100644 index 3ca3b9dd8..000000000 --- a/samples/OrgServer/Domain/Domain.Org.csproj +++ /dev/null @@ -1,32 +0,0 @@ - - - - netcoreapp2.0 - - - - ..\HostService\bin\Debug - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/OrgServer/Domain/DomainEvents/EventHandling/InquiryEditedHandler.cs b/samples/OrgServer/Domain/DomainEvents/EventHandling/InquiryEditedHandler.cs deleted file mode 100644 index 8f8b1e201..000000000 --- a/samples/OrgServer/Domain/DomainEvents/EventHandling/InquiryEditedHandler.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Surging.Core.CPlatform.EventBus.Events; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; - -namespace Domain.DomainEvents.Inquiry -{ - public class InquiryEditedHandler : IIntegrationEventHandler - { - public async Task Handle(InquiryEditedEvent @event) - { - - await Task.FromResult("InquiryEditedEvent更改名字》"+@event.CustomerName+"请进行下一步操作"); - } - } -} diff --git a/samples/OrgServer/Domain/DomainEvents/PublishEvent/InquiryEditedEvent.cs b/samples/OrgServer/Domain/DomainEvents/PublishEvent/InquiryEditedEvent.cs deleted file mode 100644 index 3807072ae..000000000 --- a/samples/OrgServer/Domain/DomainEvents/PublishEvent/InquiryEditedEvent.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Surging.Core.CPlatform.EventBus.Events; -using System; -using System.Collections.Generic; -using System.Text; - -namespace Domain.DomainEvents.Inquiry -{ - public class InquiryEditedEvent: IntegrationEvent - { - public Guid CustomerKeyId { get; set; } - public string CustomerName { get; set; } - - } -} diff --git a/samples/OrgServer/Domain/Entity/CorpRole.cs b/samples/OrgServer/Domain/Entity/CorpRole.cs deleted file mode 100644 index eb58fd86a..000000000 --- a/samples/OrgServer/Domain/Entity/CorpRole.cs +++ /dev/null @@ -1,20 +0,0 @@ -using DDD.Core; -using Domain.Org.ValueObject; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Text; - -namespace Domain.Org.Entity -{ - /// - /// 公司下的角色 - /// - [Table("Org_CorpRoles")] - public class CorpRole: BaseEntity - { - - public virtual List RolePermissions { get; set; } - - } -} diff --git a/samples/OrgServer/Domain/Entity/Department.cs b/samples/OrgServer/Domain/Entity/Department.cs deleted file mode 100644 index f10a8738a..000000000 --- a/samples/OrgServer/Domain/Entity/Department.cs +++ /dev/null @@ -1,40 +0,0 @@ -using DDD.Core; -using Domain.Org.Aggregate; -using Domain.Org.Entity; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Text; - -namespace Domain.Org.Entity -{ - [Table("Org_Departments")] - public class Department : BaseEntity - { - public Guid ParentKeyId { get; set; } - - public string NameSpell { get; set; } - - public string Telephone { get; set; } - public string Address { get; set; } - public DepartmentCategory DepartmentType { get; set; } - - - [ForeignKey("CorporationKeyId")] - public Corporation OwnCorporation { get; set; } - public virtual List Employees { get; set; } - } - - public enum DepartmentCategory - { - /// - /// 系统为企业内置的虚拟部门 - /// - Sysinternal=0, - /// - /// 公司自己添加维护的部门 - /// - Bizz =1 - } -} diff --git a/samples/OrgServer/Domain/Entity/Employee.cs b/samples/OrgServer/Domain/Entity/Employee.cs deleted file mode 100644 index bf28259cb..000000000 --- a/samples/OrgServer/Domain/Entity/Employee.cs +++ /dev/null @@ -1,30 +0,0 @@ -using DDD.Core; -using Domain.Org.ValueObject; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Text; - -namespace Domain.Org.Entity -{ - [Table("Org_Employees")] - public class Employee : BaseEntity - { - public string NameSpell { get; set; } - public string Mobile { get; set; } - public string WxNo { get; set; } - public string Email { get; set; } - public string PhotoPath { get; set; } - public string Sex { get; set; } - public string Signature { get; set; } - - public Guid DepartmentKeyId { get; set; } - [ForeignKey("DepartmentKeyId")] - public Department OwnDepartment { get; set; } - /// - /// 员工拥有的角色 - /// - public Guid RoleKeyId{ get;set;} - public string RoleName{ get;set; } - } -} diff --git a/samples/OrgServer/Domain/ValueObject/EmployeeRole.cs b/samples/OrgServer/Domain/ValueObject/EmployeeRole.cs deleted file mode 100644 index 64cd5616a..000000000 --- a/samples/OrgServer/Domain/ValueObject/EmployeeRole.cs +++ /dev/null @@ -1,15 +0,0 @@ -using DDD.Core; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Text; - -namespace Domain.Org.ValueObject -{ - public class EmployeeRole: BaseValueObject - { - [ForeignKey("Employee")] - public Guid EmployeeKeyId { get; set; } - - } -} diff --git a/samples/OrgServer/Domain/ValueObject/RolePermission.cs b/samples/OrgServer/Domain/ValueObject/RolePermission.cs deleted file mode 100644 index 7abe11323..000000000 --- a/samples/OrgServer/Domain/ValueObject/RolePermission.cs +++ /dev/null @@ -1,32 +0,0 @@ -using DDD.Core; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Text; - -namespace Domain.Org.ValueObject -{ - /// - /// 角色下的权限 - /// - [Table("Org_Role_Permissions")] - public class RolePermission : BaseValueObject - { - /// - /// 服务ID（模块） - /// - public Guid SubDomainKeyId { get; set; } - /// - /// 具体的权限，页面和动作 - /// - public Guid SubDomainPermissionKeyId { get; set; } - - public int PermissionType { get; set; } - - - - [ForeignKey("CorpRole")] - public Guid CorpRoleKeyId { get; set; } - - } -} diff --git a/samples/OrgServer/HostService/Configs/log4net.config b/samples/OrgServer/HostService/Configs/log4net.config deleted file mode 100644 index 42fd16880..000000000 --- a/samples/OrgServer/HostService/Configs/log4net.config +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/OrgServer/HostService/HostService.csproj b/samples/OrgServer/HostService/HostService.csproj deleted file mode 100644 index 6af0a37d2..000000000 --- a/samples/OrgServer/HostService/HostService.csproj +++ /dev/null @@ -1,40 +0,0 @@ - - - - Exe - netcoreapp2.0 - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - diff --git a/samples/OrgServer/HostService/Program.cs b/samples/OrgServer/HostService/Program.cs deleted file mode 100644 index 5133ac408..000000000 --- a/samples/OrgServer/HostService/Program.cs +++ /dev/null @@ -1,65 +0,0 @@ -using Autofac; -using Surging.Core.Codec.MessagePack; -using Surging.Core.Consul; -using Surging.Core.Consul.Configurations; -using Surging.Core.CPlatform; -using Surging.Core.CPlatform.Utilities; -using Surging.Core.DotNetty; -using Surging.Core.EventBusRabbitMQ; -using Surging.Core.ServiceHosting; -using Surging.Core.ServiceHosting.Internal.Implementation; -using System; -using System.Text; -using Surging.Core.Log4net; -using Surging.Core.ProxyGenerator; - -namespace Centa.HostService.Org -{ - public class Program - { - static void Main(string[] args) - { - Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); - var host = new ServiceHostBuilder() - //.RegisterServices(provider => - //{ - // //这里写自己的注册 - //}) - .RegisterServices(builder => - { - builder.AddMicroService(option => - { - option.AddServiceRuntime(); - option.AddRelateService(); - option.UseConsulManager(new ConfigInfo("127.0.0.1:8500")); - option.UseDotNettyTransport(); - option.UseRabbitMQTransport(); - option.AddRabbitMQAdapt(); - //option.UseMessagePackCodec(); - option.UseJsonCodec(); - builder.Register(p => new CPlatformContainer(ServiceLocator.Current)); - }); - }) - .SubscribeAt() - .UseLog4net("Configs/log4net.config") - .UseServer(options => - { - options.Ip = "127.0.0.1"; - options.Port = 10242; - options.Token = "True"; - options.ExecutionTimeoutInMilliseconds = 30000; - options.MaxConcurrentRequests = 200; - }) - .UseProxy() - .UseStartup() - .Build(); - - using (host.Run()) - { - Console.Title = "组织管理"; - Console.WriteLine($"组织管理——服务端启动成功，{DateTime.Now}。"); - Console.ReadLine(); - } - } - } -} diff --git a/samples/OrgServer/HostService/Startup.cs b/samples/OrgServer/HostService/Startup.cs deleted file mode 100644 index 3f488ae1a..000000000 --- a/samples/OrgServer/HostService/Startup.cs +++ /dev/null @@ -1,70 +0,0 @@ -using Autofac; -using Autofac.Extensions.DependencyInjection; -using Config.Core.Extensions; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using Surging.Core.CPlatform.Utilities; -using Surging.Core.EventBusRabbitMQ.Configurations; -using System; - -namespace Centa.HostService.Org -{ - public class Startup - { - public Startup() - { - var config = new ConfigurationBuilder() - .SetBasePath(AppContext.BaseDirectory); - ConfigureEventBus(config); - ConfigureCache(config); - ConfigureDB(config); - - } - - public IContainer ConfigureServices(ContainerBuilder builder) - { - var services = new ServiceCollection(); - ConfigureLogging(services); - builder.Populate(services); - ServiceLocator.Current = builder.Build(); - return ServiceLocator.Current; - } - - public void Configure(IContainer app) - { - app.Resolve().AddConsole((c, l) => (int)l >= 3); - } - - #region 私有方法 - /// - /// 配置日志服务 - /// - /// - private void ConfigureLogging(IServiceCollection services) - { - services.AddLogging(); - } - - private static void ConfigureEventBus(IConfigurationBuilder build) - { - build - .AddEventBusFile("eventBusSettings.json", optional: false); - } - - /// - /// 配置缓存服务 - /// - private void ConfigureCache(IConfigurationBuilder build) - { - // build.AddCacheFile("cacheSettings.json", optional: false); - } - - private void ConfigureDB(IConfigurationBuilder build) - { - build.AddDBFile("dbSettings.json", optional: false); - } - #endregion - - } -} diff --git a/samples/OrgServer/HostService/cacheSettings.json b/samples/OrgServer/HostService/cacheSettings.json deleted file mode 100644 index ab9c7e43d..000000000 --- a/samples/OrgServer/HostService/cacheSettings.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "CachingSettings": [ - { - "Id": "ddlCache", - "Class": "Surging.Core.Caching.RedisCache.RedisContext,Surging.Core.Caching", - "Properties": [ - { - "Name": "appRuleFile", - "Ref": "rule" - }, - { - "Name": "dataContextPool", - "Ref": "ddls_sample", - "Maps": [ - { - "Name": "Redis", - "Properties": [ - { - "value": "127.0.0.1:6379::1" - } - ] - }, - { - "Name": "MemoryCache" - } - ] - }, - { - "Name": "defaultExpireTime", - "value": "120" - }, - { - "Name": "connectTimeout", - "Value": "120" - }, - { - "Name": "minSize", - "Value": "1" - }, - { - "Name": "maxSize", - "Value": "10" - } - ] - } - ] -} diff --git a/samples/OrgServer/HostService/dbSettings.json b/samples/OrgServer/HostService/dbSettings.json deleted file mode 100644 index 35262d07c..000000000 --- a/samples/OrgServer/HostService/dbSettings.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ConnectionString": "Data Source=(localdb)\\MSSQLLocalDB;Initial Catalog=Web_A2;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=True;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", - "ModelAssemblyName": "Domain.Org" -} - diff --git a/samples/OrgServer/HostService/eventBusSettings.json b/samples/OrgServer/HostService/eventBusSettings.json deleted file mode 100644 index d5d4487b7..000000000 --- a/samples/OrgServer/HostService/eventBusSettings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "EventBusConnection": "localhost", - "EventBusUserName": "guest", - "EventBusPassword": "guest" -} - diff --git a/samples/OrgServer/Repository.Org/OrgRepository.cs b/samples/OrgServer/Repository.Org/OrgRepository.cs deleted file mode 100644 index e30e44e3e..000000000 --- a/samples/OrgServer/Repository.Org/OrgRepository.cs +++ /dev/null @@ -1,46 +0,0 @@ -using Microsoft.EntityFrameworkCore; -using Repository.EF.Core; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Domain.Org.Entity; -using Domain.Org.ValueObject; -using System.Data.SqlClient; -using System.Data; -using Domain.Org.Aggregate; - -namespace Repository.Org -{ - public class OrgRepository : BaseImpRepository - { - public override Corporation FindBy(Guid key) - { - return _set.Include(a => a.Departments).ThenInclude(a => a.Employees) - .Include(a=>a.CorpRoles) - .SingleOrDefault(a => a.CorporationKeyId == key); - } - } - - public class CorpQueryRepository : BaseImpQueryOnlyRepository - { - - } - - public class OrgQueryRepository : BaseImpQueryOnlyRepository - { - } - - public class EmployeeQueryRepository : BaseImpQueryOnlyRepository - { - - public List FindUserRolePermission(Guid empId) - { - return _dbContext.Set().AsNoTracking().Where(a=>a.KeyId==empId).Join(_dbContext.Set().AsNoTracking(), a => a.RoleKeyId, b => b.CorpRoleKeyId,(a,b)=>b).ToList(); - } - } - - public class RolePermissionQueryRepository : BaseImpQueryOnlyRepository - { - } -} diff --git a/samples/OrgServer/Repository.Org/Repository.Org.csproj b/samples/OrgServer/Repository.Org/Repository.Org.csproj deleted file mode 100644 index 3ed970561..000000000 --- a/samples/OrgServer/Repository.Org/Repository.Org.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netcoreapp2.0 - - - - ..\HostService\bin\Debug - - - - - - - - diff --git a/samples/README.md b/samples/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/samples/pack/Surging.Core.ApiGateWay.dll b/samples/pack/Surging.Core.ApiGateWay.dll deleted file mode 100644 index 8d68e8355528e2b720149660c28dd5c882c04f67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30208 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 diff --git a/src/Surging.ApiGateway/Controllers/HomeController.cs b/src/Surging.ApiGateway/Controllers/HomeController.cs index 744d5d9e0..e81047ba8 100644 --- a/src/Surging.ApiGateway/Controllers/HomeController.cs +++ b/src/Surging.ApiGateway/Controllers/HomeController.cs @@ -10,7 +10,7 @@ public IActionResult Index() { return View(); } - + public IActionResult Error() { return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); diff --git a/src/Surging.ApiGateway/Controllers/ServicesController.cs b/src/Surging.ApiGateway/Controllers/ServicesController.cs index e3fc8b7ca..734287873 100644 --- a/src/Surging.ApiGateway/Controllers/ServicesController.cs +++ b/src/Surging.ApiGateway/Controllers/ServicesController.cs @@ -39,6 +39,7 @@ public ServicesController(IServiceProxyProvider serviceProxyProvider, public async Task> Path([FromServices]IServicePartProvider servicePartProvider, string path, [FromBody]Dictionary model) { string serviceKey = this.Request.Query["servicekey"]; + path = path.IndexOf("/") < 0 ? $"/{path}" : path; if (model == null) { model = new Dictionary(); @@ -48,7 +49,7 @@ public async Task> Path([FromServices]IServicePartProvider model[n] = this.Request.Query[n].ToString(); } ServiceResult result = ServiceResult.Create(false,null); - path = path.ToLower() == GateWayAppConfig.TokenEndpointPath.ToLower() ? + path = String.Compare(path,GateWayAppConfig.TokenEndpointPath,true) ==0 ? GateWayAppConfig.AuthorizationRoutePath : path.ToLower(); if( await GetAllowRequest(path)==false) return new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.RequestError, Message = "Request error" }; if (servicePartProvider.IsPart(path)) @@ -82,7 +83,7 @@ public async Task> Path([FromServices]IServicePartProvider } else { - result = ServiceResult.Create(true, await _serviceProxyProvider.Invoke(model, path)); + result = ServiceResult.Create(true, await _serviceProxyProvider.Invoke(model, path)); result.StatusCode = (int)ServiceStatusCode.Success; } } @@ -99,7 +100,7 @@ private async Task GetAllowRequest(string path) private bool OnAuthorization(string path, Dictionary model, ref ServiceResult result) { bool isSuccess = true; - var route = _serviceRouteProvider.GetRouteByPath(path).Result; + var route = _serviceRouteProvider.GetRouteByPath(path).GetAwaiter().GetResult(); if (route.ServiceDescriptor.EnableAuthorization()) { if(route.ServiceDescriptor.AuthType()== AuthorizationType.JWT.ToString()) diff --git a/src/Surging.ApiGateway/Program.cs b/src/Surging.ApiGateway/Program.cs index 134669977..b0f8eb85c 100644 --- a/src/Surging.ApiGateway/Program.cs +++ b/src/Surging.ApiGateway/Program.cs @@ -25,16 +25,7 @@ public static void Main(string[] args) { var host = new WebHostBuilder() .UseUrls("http://*:729") - .UseKestrel(options => - { - options.Limits.MaxRequestBodySize = null; - options.Limits.MaxConcurrentConnections =100; - options.Limits.MaxConcurrentUpgradedConnections = 100; - options.Limits.MinRequestBodyDataRate = - new MinDataRate(bytesPerSecond: 100, gracePeriod: TimeSpan.FromSeconds(10)); - options.Limits.MinResponseDataRate = - new MinDataRate(bytesPerSecond: 100, gracePeriod: TimeSpan.FromSeconds(10)); - }) + .UseKestrel() .UseContentRoot(Directory.GetCurrentDirectory()) .UseIISIntegration() .UseStartup() diff --git a/src/Surging.ApiGateway/Startup.cs b/src/Surging.ApiGateway/Startup.cs index 5bef0a625..0ad34f9d2 100644 --- a/src/Surging.ApiGateway/Startup.cs +++ b/src/Surging.ApiGateway/Startup.cs @@ -72,7 +72,7 @@ private IServiceProvider RegisterAutofac(IServiceCollection services) option.AddClientIntercepted(typeof(CacheProviderInterceptor)); //option.UseZooKeeperManager(new ConfigInfo("127.0.0.1:2181")); if(registerConfig.Provider== RegisterProvider.Consul) - option.UseConsulManager(new ConfigInfo(registerConfig.Address,enableChildrenMonitor:true)); + option.UseConsulManager(new ConfigInfo(registerConfig.Address,enableChildrenMonitor:false)); else if(registerConfig.Provider == RegisterProvider.Zookeeper) option.UseZooKeeperManager(new ZookeeperConfigInfo(registerConfig.Address, enableChildrenMonitor: true)); option.UseDotNettyTransport(); diff --git a/src/Surging.Core/Surging.Core.ApiGateWay/Surging.Core.ApiGateWay.csproj b/src/Surging.Core/Surging.Core.ApiGateWay/Surging.Core.ApiGateWay.csproj index 4f5f21e10..3652c6110 100644 --- a/src/Surging.Core/Surging.Core.ApiGateWay/Surging.Core.ApiGateWay.csproj +++ b/src/Surging.Core/Surging.Core.ApiGateWay/Surging.Core.ApiGateWay.csproj @@ -2,7 +2,7 @@ netcoreapp2.1 - 0.6.6 + 1.0.0.0 fanly surging Micro Service Framework @@ -11,17 +11,9 @@ https://github.com/dotnetcore/surging/blob/master/LICENSE https://github.com/dotnetcore/surging MicroService surging - 1.Fix does not support multiple interceptors -2.Fix NLog file path configuration (Download Surging.Core.Nlog V0.6.6) -3.Optimize zookeeper connection(Download Surging.Core.Zookeeper V0.6.6) -4. Consul,zookeeper add reloadOnChange configuration(Download Surging.Core.Zookeeper or -Surging.Core.Consul V0.6.6) -5.Fix Service Router heartbeat registration failed(Download Surging.Core.Zookeeper or -Surging.Core.Consul V0.6.6) -6.add Exception Filter(Download Surging.Core.Zookeeper 0.6.6) -7.Upgrade netty version to repair transmission of big data(Download Surging.Core.DotNetty 0.6.6) - 0.6.6.0 - 0.6.6.0 + 1.Fix bug + 1.0.0.0 + 1.0.0.0 diff --git a/src/Surging.Core/Surging.Core.CPlatform/Address/AddressModel.cs b/src/Surging.Core/Surging.Core.CPlatform/Address/AddressModel.cs index d140f5c4f..ce5591a8b 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Address/AddressModel.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Address/AddressModel.cs @@ -1,4 +1,5 @@ -using System; +using Newtonsoft.Json; +using System; using System.Net; namespace Surging.Core.CPlatform.Address @@ -13,7 +14,8 @@ public abstract class AddressModel /// /// public abstract EndPoint CreateEndPoint(); - + + [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)] public decimal ProcessorTime { get; set; } /// /// 重写后的标识。 diff --git a/src/Surging.Core/Surging.Core.CPlatform/Address/IpAddressModel.cs b/src/Surging.Core/Surging.Core.CPlatform/Address/IpAddressModel.cs index a4d2144c1..0d9fc3641 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Address/IpAddressModel.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Address/IpAddressModel.cs @@ -1,3 +1,4 @@ +using Newtonsoft.Json; using System; using System.Net; using System.Text; @@ -43,6 +44,18 @@ public IpAddressModel(string ip, int port) /// public int Port { get; set; } + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public string WanIp { get; set; } + + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public int? WsPort { get; set; } + + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public int? MqttPort { get; set; } + + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] + public int? HttpPort { get; set; } + #endregion Property #region Overrides of AddressModel diff --git a/src/Surging.Core/Surging.Core.CPlatform/CommunicationProtocol.cs b/src/Surging.Core/Surging.Core.CPlatform/CommunicationProtocol.cs index 8403135b5..49edff25f 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/CommunicationProtocol.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/CommunicationProtocol.cs @@ -9,6 +9,7 @@ public enum CommunicationProtocol None, Tcp, Http, - WS + WS, + Mqtt } } diff --git a/src/Surging.Core/Surging.Core.CPlatform/Configurations/CPlatformConfigurationExtensions.cs b/src/Surging.Core/Surging.Core.CPlatform/Configurations/CPlatformConfigurationExtensions.cs index 35b53ba8a..0442b6abd 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Configurations/CPlatformConfigurationExtensions.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Configurations/CPlatformConfigurationExtensions.cs @@ -12,20 +12,25 @@ public static class CacheConfigurationExtensionsstatic { public static IConfigurationBuilder AddCPlatformFile(this IConfigurationBuilder builder, string path) { - return AddCPlatformFile(builder, provider: null, path: path, optional: false, reloadOnChange: false); + return AddCPlatformFile(builder, provider: null, path: path,basePath: null, optional: false, reloadOnChange: false); } public static IConfigurationBuilder AddCPlatformFile(this IConfigurationBuilder builder, string path, bool optional) { - return AddCPlatformFile(builder, provider: null, path: path, optional: optional, reloadOnChange: false); + return AddCPlatformFile(builder, provider: null, path: path,basePath: null, optional: optional, reloadOnChange: false); } public static IConfigurationBuilder AddCPlatformFile(this IConfigurationBuilder builder, string path, bool optional, bool reloadOnChange) { - return AddCPlatformFile(builder, provider: null, path: path, optional: optional, reloadOnChange: reloadOnChange); + return AddCPlatformFile(builder, provider: null, path: path, basePath:null, optional: optional, reloadOnChange: reloadOnChange); } - public static IConfigurationBuilder AddCPlatformFile(this IConfigurationBuilder builder, IFileProvider provider, string path, bool optional, bool reloadOnChange) + public static IConfigurationBuilder AddCPlatformFile(this IConfigurationBuilder builder, string path, string basePath, bool optional, bool reloadOnChange) + { + return AddCPlatformFile(builder, provider: null, path: path, basePath:basePath, optional: optional, reloadOnChange: reloadOnChange); + } + + public static IConfigurationBuilder AddCPlatformFile(this IConfigurationBuilder builder, IFileProvider provider, string path,string basePath, bool optional, bool reloadOnChange) { Check.NotNull(builder, "builder"); Check.CheckCondition(() => string.IsNullOrEmpty(path), "path"); @@ -36,7 +41,7 @@ public static IConfigurationBuilder AddCPlatformFile(this IConfigurationBuilder { provider = new PhysicalFileProvider(Path.GetDirectoryName(path)); path = Path.GetFileName(path); - } + } var source = new CPlatformConfigurationSource { FileProvider = provider, @@ -44,7 +49,10 @@ public static IConfigurationBuilder AddCPlatformFile(this IConfigurationBuilder Optional = optional, ReloadOnChange = reloadOnChange }; + builder.Add(source); + if (!string.IsNullOrEmpty(basePath)) + builder.SetBasePath(basePath); AppConfig.Configuration = builder.Build(); AppConfig.ServerOptions = AppConfig.Configuration.Get(); var section = AppConfig.Configuration.GetSection("Surging"); diff --git a/src/Surging.Core/Surging.Core.CPlatform/Configurations/CPlatformConfigurationProvider.cs b/src/Surging.Core/Surging.Core.CPlatform/Configurations/CPlatformConfigurationProvider.cs index e805a6817..a45528373 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Configurations/CPlatformConfigurationProvider.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Configurations/CPlatformConfigurationProvider.cs @@ -1,13 +1,10 @@ using Microsoft.Extensions.Configuration; using Surging.Core.CPlatform.Configurations.Remote; -using System; -using System.Collections.Generic; using System.IO; -using System.Text; namespace Surging.Core.CPlatform.Configurations { - public class CPlatformConfigurationProvider : FileConfigurationProvider + public class CPlatformConfigurationProvider : FileConfigurationProvider { public CPlatformConfigurationProvider(CPlatformConfigurationSource source) : base(source) { } diff --git a/src/Surging.Core/Surging.Core.CPlatform/Configurations/CPlatformConfigurationSource.cs b/src/Surging.Core/Surging.Core.CPlatform/Configurations/CPlatformConfigurationSource.cs index 0983f6238..4a6413edc 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Configurations/CPlatformConfigurationSource.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Configurations/CPlatformConfigurationSource.cs @@ -1,7 +1,4 @@ using Microsoft.Extensions.Configuration; -using System; -using System.Collections.Generic; -using System.Text; namespace Surging.Core.CPlatform.Configurations { diff --git a/src/Surging.Core/Surging.Core.CPlatform/Configurations/IConfigurationWatchManager.cs b/src/Surging.Core/Surging.Core.CPlatform/Configurations/IConfigurationWatchManager.cs index 32dc9e494..74c99ffcd 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Configurations/IConfigurationWatchManager.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Configurations/IConfigurationWatchManager.cs @@ -1,7 +1,4 @@ using Surging.Core.CPlatform.Configurations.Watch; -using System; -using System.Collections.Generic; -using System.Text; namespace Surging.Core.CPlatform.Configurations { diff --git a/src/Surging.Core/Surging.Core.CPlatform/Configurations/ModulePackage.cs b/src/Surging.Core/Surging.Core.CPlatform/Configurations/ModulePackage.cs index b139fe6f9..13b2414f9 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Configurations/ModulePackage.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Configurations/ModulePackage.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Surging.Core.CPlatform.Configurations +namespace Surging.Core.CPlatform.Configurations { public class ModulePackage { diff --git a/src/Surging.Core/Surging.Core.CPlatform/Configurations/ProtocolPortOptions.cs b/src/Surging.Core/Surging.Core.CPlatform/Configurations/ProtocolPortOptions.cs index db1a5b3de..ade12ab73 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Configurations/ProtocolPortOptions.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Configurations/ProtocolPortOptions.cs @@ -1,15 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Surging.Core.CPlatform.Configurations +namespace Surging.Core.CPlatform.Configurations { - public class ProtocolPortOptions + public class ProtocolPortOptions { - public int MQTTPort { get; set; } = 97; - - public int HttpPort { get; set; } = 80; + public int MQTTPort { get; set; } + + public int HttpPort { get; set; } - public int WSPort { get; set; } = 96; + public int WSPort { get; set; } } } diff --git a/src/Surging.Core/Surging.Core.CPlatform/Configurations/SurgingServerOptions.cs b/src/Surging.Core/Surging.Core.CPlatform/Configurations/SurgingServerOptions.cs index 379d5f448..0c3383564 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Configurations/SurgingServerOptions.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Configurations/SurgingServerOptions.cs @@ -1,8 +1,6 @@ using Surging.Core.CPlatform.Support; -using System; using System.Collections.Generic; using System.Net; -using System.Text; namespace Surging.Core.CPlatform.Configurations { @@ -14,8 +12,16 @@ public partial class SurgingServerOptions: ServiceCommand public int MappingPort { get; set; } + public string WanIp { get; set; } + public double WatchInterval { get; set; } = 20d; + public bool Libuv { get; set; } = false; + + public int SoBacklog { get; set; } = 8192; + + public bool EnableRouteWatch { get; set; } + public IPEndPoint IpEndpoint { get; set; } public List Packages { get; set; } = new List(); diff --git a/src/Surging.Core/Surging.Core.CPlatform/Configurations/Watch/ConfigurationWatchManager.cs b/src/Surging.Core/Surging.Core.CPlatform/Configurations/Watch/ConfigurationWatchManager.cs index 4d6ffbad0..7ca0fd478 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Configurations/Watch/ConfigurationWatchManager.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Configurations/Watch/ConfigurationWatchManager.cs @@ -1,4 +1,5 @@ -using System; +using Microsoft.Extensions.Logging; +using System; using System.Collections.Generic; using System.Text; using System.Threading; @@ -11,9 +12,11 @@ public class ConfigurationWatchManager: IConfigurationWatchManager internal HashSet dataWatches = new HashSet(); private readonly Timer _timer; + private readonly ILogger _logger; - public ConfigurationWatchManager() + public ConfigurationWatchManager(ILogger logger) { + _logger = logger; var timeSpan = TimeSpan.FromSeconds(AppConfig.ServerOptions.WatchInterval); _timer = new Timer(async s => { @@ -46,7 +49,15 @@ private async Task Watching() { foreach (var watch in dataWatches) { - await watch.Process(); + try + { + await watch.Process(); + } + catch(Exception ex) + { + if (_logger.IsEnabled(LogLevel.Error)) + _logger.LogError($"message:{ex.Message},Source:{ex.Source},Trace:{ex.StackTrace}"); + } } } } diff --git a/src/Surging.Core/Surging.Core.CPlatform/ContainerBuilderExtensions.cs b/src/Surging.Core/Surging.Core.CPlatform/ContainerBuilderExtensions.cs index 8fdfe4e96..3804f41cc 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/ContainerBuilderExtensions.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/ContainerBuilderExtensions.cs @@ -17,6 +17,7 @@ using Surging.Core.CPlatform.Ids.Implementation; using Surging.Core.CPlatform.Ioc; using Surging.Core.CPlatform.Module; +using Surging.Core.CPlatform.Mqtt; using Surging.Core.CPlatform.Routing; using Surging.Core.CPlatform.Routing.Implementation; using Surging.Core.CPlatform.Runtime.Client; @@ -86,6 +87,7 @@ public static class ContainerBuilderExtensions { private static List _referenceAssembly = new List(); private static List _modules = new List(); + /// /// 添加Json序列化支持。 /// @@ -173,6 +175,18 @@ public static IServiceBuilder UseRouteManager(this IServiceBuilder builder, ISer return builder; } + /// + /// 设置mqtt服务路由管理者。 + /// + /// mqtt服务构建者。 + /// mqtt服务路由管理者实例工厂。 + /// 服务构建者。 + public static IServiceBuilder UseMqttRouteManager(this IServiceBuilder builder, Func factory) + { + builder.Services.RegisterAdapter(factory).InstancePerLifetimeScope(); + return builder; + } + #endregion RouteManager /// @@ -427,6 +441,7 @@ public static IServiceBuilder AddCoreService(this ContainerBuilder services) services.RegisterType(typeof(ServiceTokenGenerator)).As(typeof(IServiceTokenGenerator)).SingleInstance(); services.RegisterType(typeof(HashAlgorithm)).As(typeof(IHashAlgorithm)).SingleInstance(); services.RegisterType(typeof(ServiceEngineLifetime)).As(typeof(IServiceEngineLifetime)).SingleInstance(); + services.RegisterType(typeof(DefaultServiceHeartbeatManager)).As(typeof(IServiceHeartbeatManager)).SingleInstance(); return new ServiceBuilder(services) .AddJsonSerialization() .UseJsonCodec(); @@ -472,7 +487,7 @@ public static IServiceBuilder RegisterServices(this IServiceBuilder builder, par try { var services = builder.Services; - var referenceAssemblies = GetReferenceAssembly(virtualPaths); + var referenceAssemblies = GetAssemblies(virtualPaths); foreach (var assembly in referenceAssemblies) { services.RegisterAssemblyTypes(assembly) @@ -513,7 +528,7 @@ public static IServiceBuilder RegisterServiceBus (this IServiceBuilder builder, params string[] virtualPaths) { var services = builder.Services; - var referenceAssemblies = GetReferenceAssembly(virtualPaths); + var referenceAssemblies = GetAssemblies(virtualPaths); foreach (var assembly in referenceAssemblies) { @@ -534,7 +549,7 @@ public static IServiceBuilder RegisterRepositories (this IServiceBuilder builder, params string[] virtualPaths) { var services = builder.Services; - var referenceAssemblies = GetReferenceAssembly(virtualPaths); + var referenceAssemblies = GetAssemblies(virtualPaths); foreach (var assembly in referenceAssemblies) { @@ -548,19 +563,7 @@ public static IServiceBuilder RegisterModules( this IServiceBuilder builder, params string[] virtualPaths) { var services = builder.Services; - List referenceAssemblies = new List(); - if (virtualPaths.Any()) - { - referenceAssemblies = GetReferenceAssembly(virtualPaths); - } - else - { - string[] assemblyNames = DependencyContext - .Default.GetDefaultAssemblyNames().Select(p => p.Name).ToArray(); - assemblyNames = GetFilterAssemblies(assemblyNames); - foreach (var name in assemblyNames) - referenceAssemblies.Add(Assembly.Load(name)); - } + var referenceAssemblies = GetAssemblies(virtualPaths); if (builder == null) throw new ArgumentNullException("builder"); var packages = ConvertDictionary(AppConfig.ServerOptions.Packages); foreach (var moduleAssembly in referenceAssemblies) @@ -599,17 +602,22 @@ public static List GetInterfaceService(this IServiceBuilder builder) public static IEnumerable GetDataContractName(this IServiceBuilder builder) { var namespaces = new List(); - var referenceAssemblies = builder.GetInterfaceService(); - referenceAssemblies.ForEach(p => + var assemblies = builder.GetInterfaceService() + .Select(p => p.Assembly) + .Union(GetSystemModules()) + .Distinct() + .ToList(); + + assemblies.ForEach(assembly => { - namespaces.AddRange(p.Assembly.GetTypes().Where(t => t.GetCustomAttribute() != null).Select(n => n.Namespace)); + namespaces.AddRange(assembly.GetTypes().Where(t => t.GetCustomAttribute() != null).Select(n => n.Namespace)); }); - return namespaces.Distinct(); + return namespaces; } private static IDictionary ConvertDictionary(List list) { - var result = new Dictionary(); + var result = new Dictionary(); list.ForEach(p => { result.Add(p.TypeName, p.Using); @@ -632,7 +640,7 @@ private static List GetReferenceAssembly(params string[] virtualPaths) paths.ForEach(path => { var assemblyFiles = GetAllAssemblyFiles(path); - + foreach (var referencedAssemblyFile in assemblyFiles) { var referencedAssembly = Assembly.LoadFrom(referencedAssemblyFile); @@ -640,12 +648,46 @@ private static List GetReferenceAssembly(params string[] virtualPaths) _referenceAssembly.Add(referencedAssembly); refAssemblies.Add(referencedAssembly); } - result = existsPath ? refAssemblies: _referenceAssembly; + result = existsPath ? refAssemblies : _referenceAssembly; }); } return result; } - + + private static List GetSystemModules() + { + var assemblies = new List(); + var referenceAssemblies = GetReferenceAssembly(); + foreach (var referenceAssembly in referenceAssemblies) + { + var abstractModules = GetAbstractModules(referenceAssembly); + if (abstractModules.Any(p => p.GetType().IsSubclassOf(typeof(SystemModule)))) + { + assemblies.Add(referenceAssembly); + } + } + return assemblies; + } + + private static List GetAssemblies(params string[] virtualPaths) + { + var referenceAssemblies = new List(); + if (virtualPaths.Any()) + { + referenceAssemblies = GetReferenceAssembly(virtualPaths); + } + else + { + string[] assemblyNames = DependencyContext + .Default.GetDefaultAssemblyNames().Select(p => p.Name).ToArray(); + assemblyNames = GetFilterAssemblies(assemblyNames); + foreach (var name in assemblyNames) + referenceAssemblies.Add(Assembly.Load(name)); + _referenceAssembly.AddRange(referenceAssemblies.Except(_referenceAssembly)); + } + return referenceAssemblies; + } + private static List GetAbstractModules(Assembly assembly) { var abstractModules = new List(); @@ -660,9 +702,9 @@ private static List GetAbstractModules(Assembly assembly) return abstractModules; } - private static string[] GetFilterAssemblies(string[] assemblyNames) + private static string[] GetFilterAssemblies(string[] assemblyNames) { - var notRelatedFile = AppConfig.ServerOptions.NotRelatedAssemblyFiles; + var notRelatedFile = AppConfig.ServerOptions.NotRelatedAssemblyFiles; var relatedFile = AppConfig.ServerOptions.RelatedAssemblyFiles; var pattern = string.Format("^Microsoft.\\w*|^System.\\w*|^DotNetty.\\w*|^runtime.\\w*|^ZooKeeperNetEx\\w*|^StackExchange.Redis\\w*|^Consul\\w*|^Newtonsoft.Json.\\w*|^Autofac.\\w*{0}", string.IsNullOrEmpty(notRelatedFile) ? "" : $"|{notRelatedFile}"); @@ -679,7 +721,7 @@ private static string[] GetFilterAssemblies(string[] assemblyNames) return assemblyNames.Where( name => !notRelatedRegex.IsMatch(name)).ToArray(); - } +} } private static List GetAllAssemblyFiles(string parentDir) @@ -700,7 +742,7 @@ private static List GetAllAssemblyFiles(string parentDir) { return Directory.GetFiles(parentDir, "*.dll").Select(Path.GetFullPath).Where( - a => !notRelatedRegex.IsMatch(a)).ToList(); + a => !notRelatedRegex.IsMatch(Path.GetFileName(a))).ToList(); } } } diff --git a/src/Surging.Core/Surging.Core.CPlatform/EventBus/ISubscriptionAdapt.cs b/src/Surging.Core/Surging.Core.CPlatform/EventBus/ISubscriptionAdapt.cs index c01896cd6..f7adefd76 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/EventBus/ISubscriptionAdapt.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/EventBus/ISubscriptionAdapt.cs @@ -7,5 +7,7 @@ namespace Surging.Core.CPlatform.EventBus public interface ISubscriptionAdapt { void SubscribeAt(); + + void Unsubscribe(); } } diff --git a/src/Surging.Core/Surging.Core.CPlatform/EventBus/Implementation/IEventBus.cs b/src/Surging.Core/Surging.Core.CPlatform/EventBus/Implementation/IEventBus.cs index b182df949..005fd765d 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/EventBus/Implementation/IEventBus.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/EventBus/Implementation/IEventBus.cs @@ -13,5 +13,7 @@ void Unsubscribe() where TH : IIntegrationEventHandler; void Publish(IntegrationEvent @event); + + event EventHandler OnShutdown; } } diff --git a/src/Surging.Core/Surging.Core.CPlatform/EventBus/InMemoryEventBusSubscriptionsManager.cs b/src/Surging.Core/Surging.Core.CPlatform/EventBus/InMemoryEventBusSubscriptionsManager.cs index 83266580f..fdb930561 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/EventBus/InMemoryEventBusSubscriptionsManager.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/EventBus/InMemoryEventBusSubscriptionsManager.cs @@ -74,7 +74,7 @@ private void RaiseOnEventRemoved(string eventName,string consumerName) var handler = OnEventRemoved; if (handler != null) { - OnEventRemoved(this,new ValueTuple(consumerName, eventName)); + handler(this,new ValueTuple(consumerName, eventName)); } } diff --git a/src/Surging.Core/Surging.Core.CPlatform/HashAlgorithms/ConsistentHash.cs b/src/Surging.Core/Surging.Core.CPlatform/HashAlgorithms/ConsistentHash.cs index 5576384df..ea8574321 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/HashAlgorithms/ConsistentHash.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/HashAlgorithms/ConsistentHash.cs @@ -45,23 +45,7 @@ public int VirtualNodeReplicationFactor get { return _virtualNodeReplicationFactor; } } #endregion - - /// - /// 初始化节点服务器 - /// - /// 节点 - /// - /// 创建：范亮 - /// 日期：2016/4/2 - /// - public void Initialize(IEnumerable nodes) - { - foreach (var node in nodes) - { - AddNode(node); - } - _nodeKeysInRing = _ring.Keys.ToArray(); - } + /// /// 添加节点 @@ -71,9 +55,9 @@ public void Initialize(IEnumerable nodes) /// 创建：范亮 /// 日期：2016/4/2 /// - public void Add(T node) + public void Add(T node,string value) { - AddNode(node); + AddNode(node,value); _nodeKeysInRing = _ring.Keys.ToArray(); } @@ -85,7 +69,7 @@ public void Add(T node) /// 创建：范亮 /// 日期：2016/4/2 /// - public void Remove(T node) + public void Remove(string node) { RemoveNode(node); _nodeKeysInRing = _ring.Keys.ToArray(); @@ -115,11 +99,11 @@ public T GetItemNode(string item) /// 创建：范亮 /// 日期：2016/4/2 /// - private void AddNode(T node) + private void AddNode(T node,string value) { for (var i = 0; i < _virtualNodeReplicationFactor; i++) { - var hashOfVirtualNode = _hashAlgorithm.Hash(node.GetHashCode().ToString(CultureInfo.InvariantCulture) + i); + var hashOfVirtualNode = _hashAlgorithm.Hash(value.ToString(CultureInfo.InvariantCulture) + i); _ring[hashOfVirtualNode] = node; } } @@ -132,11 +116,11 @@ private void AddNode(T node) /// 创建：范亮 /// 日期：2016/4/2 /// - private void RemoveNode(T node) + private void RemoveNode(string value) { for (var i = 0; i < _virtualNodeReplicationFactor; i++) { - var hashOfVirtualNode = _hashAlgorithm.Hash(node.GetHashCode().ToString() + i); + var hashOfVirtualNode = _hashAlgorithm.Hash(value.ToString() + i); _ring.Remove(hashOfVirtualNode); } } diff --git a/src/Surging.Core/Surging.Core.CPlatform/Logging/ConsoleLogger.cs b/src/Surging.Core/Surging.Core.CPlatform/Logging/ConsoleLogger.cs deleted file mode 100644 index 2e2c8a124..000000000 --- a/src/Surging.Core/Surging.Core.CPlatform/Logging/ConsoleLogger.cs +++ /dev/null @@ -1,75 +0,0 @@ -/*using System; - -namespace Surging.Core.CPlatform.Logging -{ - public class ConsoleLogger : ConsoleLogger, ILogger - { - } - - public class ConsoleLogger : ILogger - { - #region Implementation of ILogger - - /// - /// 判断日志记录器是否开启。 - /// - /// 日志等级。 - /// 如果开启返回true，否则返回false。 - public bool IsEnabled(LogLevel level) - { - return (int)level > 2; - } - - /// - /// 记录日志。 - /// - /// 日志等级。 - /// 消息。 - /// 异常。 - /// 任务。 - public void Log(LogLevel level, string message, Exception exception = null) - { - Console.ResetColor(); - var color = Console.ForegroundColor; - - switch (level) - { - case LogLevel.Trace: - color = ConsoleColor.DarkGray; - break; - - case LogLevel.Debug: - color = ConsoleColor.Gray; - break; - - case LogLevel.Information: - color = ConsoleColor.DarkBlue; - break; - - case LogLevel.Warning: - color = ConsoleColor.Yellow; - break; - - case LogLevel.Error: - color = ConsoleColor.DarkRed; - break; - - case LogLevel.Fatal: - color = ConsoleColor.Red; - break; - } - - Console.ForegroundColor = color; - - Console.WriteLine($"level：{level}"); - Console.WriteLine($"message：{message}"); - if (exception != null) - Console.WriteLine($"exception：{exception}"); - Console.WriteLine("========================================"); - - Console.ResetColor(); - } - - #endregion Implementation of ILogger - } -}*/ \ No newline at end of file diff --git a/src/Surging.Core/Surging.Core.CPlatform/Logging/ILogger.cs b/src/Surging.Core/Surging.Core.CPlatform/Logging/ILogger.cs deleted file mode 100644 index 285fb38b0..000000000 --- a/src/Surging.Core/Surging.Core.CPlatform/Logging/ILogger.cs +++ /dev/null @@ -1,142 +0,0 @@ -/*using System; - -namespace Surging.Core.CPlatform.Logging -{ - /// - /// 日志等级。 - /// - public enum LogLevel - { - /// - /// 追踪。 - /// - Trace = 0, - - /// - /// 调试。 - /// - Debug = 1, - - /// - /// 信息。 - /// - Information = 2, - - /// - /// 警告。 - /// - Warning = 3, - - /// - /// 错误。 - /// - Error = 4, - - /// - /// 致命错误。 - /// - Fatal = 5 - } - - /// - /// 一个抽象的日志记录器。 - /// - /// 日志记录器类型。 - public interface ILogger : ILogger - { - } - - /// - /// 一个抽象的日志记录器。 - /// - public interface ILogger - { - /// - /// 判断日志记录器是否开启。 - /// - /// 日志等级。 - /// 如果开启返回true，否则返回false。 - bool IsEnabled(LogLevel level); - - /// - /// 记录日志。 - /// - /// 日志等级。 - /// 消息。 - /// 异常。 - /// 任务。 - void Log(LogLevel level, string message, Exception exception = null); - } - - /// - /// 日志记录器扩展。 - /// - public static class LoggerExtensions - { - /// - /// 追踪。 - /// - /// 日志记录器。 - /// 消息。 - /// 异常信息。 - public static void Trace(this ILogger logger, string message, Exception exception = null) - { - logger.Log(LogLevel.Trace, message, exception); - } - - /// - /// 调试。 - /// - /// 日志记录器。 - /// 消息。 - /// 异常信息。 - public static void Debug(this ILogger logger, string message, Exception exception = null) - { - logger.Log(LogLevel.Debug, message, exception); - } - - /// - /// 信息。 - /// - /// 日志记录器。 - /// 消息。 - /// 异常信息。 - public static void Information(this ILogger logger, string message, Exception exception = null) - { - logger.Log(LogLevel.Information, message, exception); - } - - /// - /// 警告。 - /// - /// 日志记录器。 - /// 消息。 - /// 异常信息。 - public static void Warning(this ILogger logger, string message, Exception exception = null) - { - logger.Log(LogLevel.Warning, message, exception); - } - - /// - /// 错误。 - /// - /// 日志记录器。 - /// 消息。 - /// 异常信息。 - public static void Error(this ILogger logger, string message, Exception exception = null) - { - logger.Log(LogLevel.Error, message, exception); - } - - /// - /// 失败。 - /// - /// 日志记录器。 - /// 消息。 - /// 异常信息。 - public static void Fatal(this ILogger logger, string message, Exception exception = null) - { - logger.Log(LogLevel.Fatal, message, exception); - } - } -}*/ \ No newline at end of file diff --git a/src/Surging.Core/Surging.Core.CPlatform/Module/EchoService.cs b/src/Surging.Core/Surging.Core.CPlatform/Module/EchoService.cs index 134fcf0da..c819b8484 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Module/EchoService.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Module/EchoService.cs @@ -2,6 +2,7 @@ using Surging.Core.CPlatform.HashAlgorithms; using Surging.Core.CPlatform.Ioc; using Surging.Core.CPlatform.Routing; +using Surging.Core.CPlatform.Runtime.Client; using Surging.Core.CPlatform.Runtime.Client.Address.Resolvers.Implementation.Selectors; using Surging.Core.CPlatform.Runtime.Client.Address.Resolvers.Implementation.Selectors.Implementation; using System.Threading.Tasks; @@ -13,14 +14,19 @@ public class EchoService : ServiceBase, IEchoService private readonly IHashAlgorithm _hashAlgorithm; private readonly IAddressSelector _addressSelector; private readonly IServiceRouteProvider _serviceRouteProvider; - public EchoService(IHashAlgorithm hashAlgorithm, IServiceRouteProvider serviceRouteProvider, CPlatformContainer container) + private readonly IServiceHeartbeatManager _serviceHeartbeatManager; + + public EchoService(IHashAlgorithm hashAlgorithm, IServiceRouteProvider serviceRouteProvider, + CPlatformContainer container, IServiceHeartbeatManager serviceHeartbeatManager) { _hashAlgorithm = hashAlgorithm; _addressSelector =container.GetInstances(AddressSelectorMode.HashAlgorithm.ToString()); _serviceRouteProvider = serviceRouteProvider; + + _serviceHeartbeatManager = serviceHeartbeatManager; } - public async Task Locate(string routePath,string key) + public async Task Locate(string key,string routePath) { var route= await _serviceRouteProvider.SearchRoute(routePath); AddressModel result = new IpAddressModel(); @@ -30,10 +36,12 @@ public async Task Locate(string routePath,string key) { Address = route.Address, Descriptor = route.ServiceDescriptor, - HashCode = _hashAlgorithm.Hash(key) + Item = key, }); - } - return result.ToString(); + _serviceHeartbeatManager.AddWhitelist(route.ServiceDescriptor.Id); + } + var ipAddress = result as IpAddressModel; + return ipAddress; } } } diff --git a/src/Surging.Core/Surging.Core.CPlatform/Module/IEchoService.cs b/src/Surging.Core/Surging.Core.CPlatform/Module/IEchoService.cs index 48008d7a4..175b0d258 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Module/IEchoService.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Module/IEchoService.cs @@ -1,5 +1,8 @@ -using Surging.Core.CPlatform.Ioc; +using Surging.Core.CPlatform.Address; +using Surging.Core.CPlatform.Ioc; +using Surging.Core.CPlatform.Runtime.Client.Address.Resolvers.Implementation.Selectors.Implementation; using Surging.Core.CPlatform.Runtime.Server.Implementation.ServiceDiscovery.Attributes; +using Surging.Core.CPlatform.Support.Attributes; using System.Threading.Tasks; namespace Surging.Core.CPlatform.Module @@ -7,6 +10,7 @@ namespace Surging.Core.CPlatform.Module [ServiceBundle("")] public interface IEchoService: IServiceKey { - Task Locate(string routePath, string key); + [Command(ShuntStrategy = AddressSelectorMode.HashAlgorithm)] + Task Locate(string key,string routePath); } } diff --git a/src/Surging.Core/Surging.Core.CPlatform/Mqtt/IMqttServiceFactory.cs b/src/Surging.Core/Surging.Core.CPlatform/Mqtt/IMqttServiceFactory.cs new file mode 100644 index 000000000..2249cd0dc --- /dev/null +++ b/src/Surging.Core/Surging.Core.CPlatform/Mqtt/IMqttServiceFactory.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Surging.Core.CPlatform.Mqtt +{ + public interface IMqttServiceFactory + { + + /// + /// 根据Mqtt服务路由描述符创建Mqtt服务路由。 + /// + /// Mqtt服务路由描述符。 + /// Mqtt服务路由集合。 + Task> CreateMqttServiceRoutesAsync(IEnumerable descriptors); + } +} diff --git a/src/Surging.Core/Surging.Core.CPlatform/Mqtt/IMqttServiceRouteManager.cs b/src/Surging.Core/Surging.Core.CPlatform/Mqtt/IMqttServiceRouteManager.cs new file mode 100644 index 000000000..27325cf6e --- /dev/null +++ b/src/Surging.Core/Surging.Core.CPlatform/Mqtt/IMqttServiceRouteManager.cs @@ -0,0 +1,37 @@ +using Surging.Core.CPlatform.Address; +using Surging.Core.CPlatform.Mqtt.Implementation; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Surging.Core.CPlatform.Mqtt +{ + public interface IMqttServiceRouteManager + { + event EventHandler Created; + + event EventHandler Removed; + + event EventHandler Changed; + + Task> GetRoutesAsync(); + + /// + /// 设置服务路由。 + /// + /// 服务路由集合。 + /// 一个任务。 + Task SetRoutesAsync(IEnumerable routes); + + Task RemoveByTopicAsync(string topic, IEnumerable endpoint); + + + Task RemveAddressAsync(IEnumerable addresses); + /// + /// 清空所有的服务路由。 + /// + /// 一个任务。 + Task ClearAsync(); + } +} diff --git a/src/Surging.Core/Surging.Core.CPlatform/Mqtt/Implementation/MqttServiceRouteManagerBase.cs b/src/Surging.Core/Surging.Core.CPlatform/Mqtt/Implementation/MqttServiceRouteManagerBase.cs new file mode 100644 index 000000000..ab25bf068 --- /dev/null +++ b/src/Surging.Core/Surging.Core.CPlatform/Mqtt/Implementation/MqttServiceRouteManagerBase.cs @@ -0,0 +1,114 @@ +using Surging.Core.CPlatform.Address; +using Surging.Core.CPlatform.Serialization; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Surging.Core.CPlatform.Mqtt.Implementation +{ + public class MqttServiceRouteEventArgs + { + public MqttServiceRouteEventArgs(MqttServiceRoute route) + { + Route = route; + } + + public MqttServiceRoute Route { get; private set; } + } + + public class MqttServiceRouteChangedEventArgs : MqttServiceRouteEventArgs + { + public MqttServiceRouteChangedEventArgs(MqttServiceRoute route, MqttServiceRoute oldRoute) : base(route) + { + OldRoute = oldRoute; + } + + public MqttServiceRoute OldRoute { get; set; } + } + + public abstract class MqttServiceRouteManagerBase : IMqttServiceRouteManager + { + private readonly ISerializer _serializer; + private EventHandler _created; + private EventHandler _removed; + private EventHandler _changed; + + protected MqttServiceRouteManagerBase(ISerializer serializer) + { + _serializer = serializer; + } + + public event EventHandler Created + { + add { _created += value; } + remove { _created -= value; } + } + + public event EventHandler Removed + { + add { _removed += value; } + remove { _removed -= value; } + } + + public event EventHandler Changed + { + add { _changed += value; } + remove { _changed -= value; } + } + + public abstract Task ClearAsync(); + public abstract Task> GetRoutesAsync(); + + public abstract Task RemveAddressAsync(IEnumerable addresses); + + public abstract Task RemoveByTopicAsync(string topic, IEnumerable endpoint); + + + public virtual Task SetRoutesAsync(IEnumerable routes) + { + if (routes == null) + throw new ArgumentNullException(nameof(routes)); + + var descriptors = routes.Where(route => route != null).Select(route => new MqttServiceDescriptor + { + AddressDescriptors = route.MqttEndpoint?.Select(address => new MqttEndpointDescriptor + { + Type = address.GetType().FullName, + Value = _serializer.Serialize(address) + }) ?? Enumerable.Empty(), + MqttDescriptor = route.MqttDescriptor + }); + return SetRoutesAsync(descriptors); + } + protected abstract Task SetRoutesAsync(IEnumerable descriptors); + + protected void OnCreated(params MqttServiceRouteEventArgs[] args) + { + if (_created == null) + return; + + foreach (var arg in args) + _created(this, arg); + } + + protected void OnChanged(params MqttServiceRouteChangedEventArgs[] args) + { + if (_changed == null) + return; + + foreach (var arg in args) + _changed(this, arg); + } + + protected void OnRemoved(params MqttServiceRouteEventArgs[] args) + { + if (_removed == null) + return; + + foreach (var arg in args) + _removed(this, arg); + } + } +} diff --git a/src/Surging.Core/Surging.Core.CPlatform/Mqtt/MqttDescriptor.cs b/src/Surging.Core/Surging.Core.CPlatform/Mqtt/MqttDescriptor.cs new file mode 100644 index 000000000..48693b634 --- /dev/null +++ b/src/Surging.Core/Surging.Core.CPlatform/Mqtt/MqttDescriptor.cs @@ -0,0 +1,105 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Surging.Core.CPlatform.Mqtt +{ + /// + /// 服务描述符扩展方法。 + /// + public static class MqttDescriptorExtensions + { + + } + + /// + /// 服务描述符。 + /// + [Serializable] + public class MqttDescriptor + { + /// + /// 初始化一个新的服务描述符。 + /// + public MqttDescriptor() + { + Metadatas = new Dictionary(StringComparer.OrdinalIgnoreCase); + } + + /// + /// Topic。 + /// + public string Topic { get; set; } + /// + /// 元数据。 + /// + public IDictionary Metadatas { get; set; } + + /// + /// 获取一个元数据。 + /// + /// 元数据类型。 + /// 元数据名称。 + /// 如果指定名称的元数据不存在则返回这个参数。 + /// 元数据值。 + public T GetMetadata(string name, T def = default(T)) + { + if (!Metadatas.ContainsKey(name)) + return def; + + return (T)Metadatas[name]; + } + + #region Equality members + + /// Determines whether the specified object is equal to the current object. + /// true if the specified object is equal to the current object; otherwise, false. + /// The object to compare with the current object. + public override bool Equals(object obj) + { + var model = obj as MqttDescriptor; + if (model == null) + return false; + + if (obj.GetType() != GetType()) + return false; + + if (model.Topic != Topic) + return false; + + return model.Metadatas.Count == Metadatas.Count && model.Metadatas.All(metadata => + { + object value; + if (!Metadatas.TryGetValue(metadata.Key, out value)) + return false; + + if (metadata.Value == null && value == null) + return true; + if (metadata.Value == null || value == null) + return false; + + return metadata.Value.Equals(value); + }); + } + + /// Serves as the default hash function. + /// A hash code for the current object. + public override int GetHashCode() + { + return ToString().GetHashCode(); + } + + public static bool operator ==(MqttDescriptor model1, MqttDescriptor model2) + { + return Equals(model1, model2); + } + + public static bool operator !=(MqttDescriptor model1, MqttDescriptor model2) + { + return !Equals(model1, model2); + } + + #endregion Equality members + } +} diff --git a/src/Surging.Core/Surging.Core.CPlatform/Mqtt/MqttServiceDescriptor.cs b/src/Surging.Core/Surging.Core.CPlatform/Mqtt/MqttServiceDescriptor.cs new file mode 100644 index 000000000..aac8c3063 --- /dev/null +++ b/src/Surging.Core/Surging.Core.CPlatform/Mqtt/MqttServiceDescriptor.cs @@ -0,0 +1,55 @@ +using Newtonsoft.Json; +using Surging.Core.CPlatform.Address; +using Surging.Core.CPlatform.Serialization; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.CPlatform.Mqtt +{ + /// + /// Mqtt地址描述符。 + /// + public class MqttEndpointDescriptor + { + /// + /// 地址类型。 + /// + [JsonIgnore] + public string Type { get; set; } + + /// + /// 地址值。 + /// + public string Value { get; set; } + + /// + /// 创建一个描述符。 + /// + /// 地址模型类型。 + /// 地址模型实例。 + /// 序列化器。 + /// Mqtt地址描述符。 + public static MqttEndpointDescriptor CreateDescriptor(T address, ISerializer serializer) where T : AddressModel, new() + { + return new MqttEndpointDescriptor + { + Type = typeof(T).FullName, + Value = serializer.Serialize(address) + }; + } + } + + public class MqttServiceDescriptor + { + /// + /// Mqtt地址描述符集合。 + /// + public IEnumerable AddressDescriptors { get; set; } + + /// + /// Mqtt描述符。 + /// + public MqttDescriptor MqttDescriptor { get; set; } + } +} diff --git a/src/Surging.Core/Surging.Core.CPlatform/Mqtt/MqttServiceRoute.cs b/src/Surging.Core/Surging.Core.CPlatform/Mqtt/MqttServiceRoute.cs new file mode 100644 index 000000000..49e56e6fc --- /dev/null +++ b/src/Surging.Core/Surging.Core.CPlatform/Mqtt/MqttServiceRoute.cs @@ -0,0 +1,59 @@ +using Surging.Core.CPlatform.Address; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Surging.Core.CPlatform.Mqtt +{ + public class MqttServiceRoute + { + /// + /// Mqtt服务可用地址。 + /// + public IEnumerable MqttEndpoint { get; set; } + /// + /// Mqtt服务描述符。 + /// + public MqttDescriptor MqttDescriptor { get; set; } + + #region Equality members + + /// Determines whether the specified object is equal to the current object. + /// true if the specified object is equal to the current object; otherwise, false. + /// The object to compare with the current object. + public override bool Equals(object obj) + { + var model = obj as MqttServiceRoute; + if (model == null) + return false; + + if (obj.GetType() != GetType()) + return false; + + if (model.MqttDescriptor != MqttDescriptor) + return false; + + return model.MqttEndpoint.Count() == MqttEndpoint.Count() && model.MqttEndpoint.All(addressModel => MqttEndpoint.Contains(addressModel)); + } + + /// Serves as the default hash function. + /// A hash code for the current object. + public override int GetHashCode() + { + return ToString().GetHashCode(); + } + + public static bool operator ==(MqttServiceRoute model1, MqttServiceRoute model2) + { + return Equals(model1, model2); + } + + public static bool operator != (MqttServiceRoute model1, MqttServiceRoute model2) + { + return !Equals(model1, model2); + } + + #endregion Equality members + } +} diff --git a/src/Surging.Core/Surging.Core.CPlatform/Routing/Implementation/DefaultServiceRouteProvider.cs b/src/Surging.Core/Surging.Core.CPlatform/Routing/Implementation/DefaultServiceRouteProvider.cs index a5f558b96..27bad5f20 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Routing/Implementation/DefaultServiceRouteProvider.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Routing/Implementation/DefaultServiceRouteProvider.cs @@ -90,7 +90,7 @@ private void ServiceRouteManager_Add(object sender, ServiceRouteEventArgs e) private async Task SearchRouteAsync(string path) { var routes = await _serviceRouteManager.GetRoutesAsync(); - var route = routes.FirstOrDefault(i => i.ServiceDescriptor.RoutePath.Contains(path)); + var route = routes.FirstOrDefault(i => i.ServiceDescriptor.RoutePath.ToLower()== path.ToLower()); if (route == null) { if (_logger.IsEnabled(LogLevel.Warning)) diff --git a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/IAddressResolver.cs b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/IAddressResolver.cs index f4b93911c..57045a465 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/IAddressResolver.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/IAddressResolver.cs @@ -13,6 +13,6 @@ public interface IAddressResolver /// /// 服务Id。 /// 服务地址模型。 - ValueTask Resolver(string serviceId, int hashCode); + ValueTask Resolver(string serviceId, string item); } } \ No newline at end of file diff --git a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/DefaultAddressResolver.cs b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/DefaultAddressResolver.cs index b991700d8..713160989 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/DefaultAddressResolver.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/DefaultAddressResolver.cs @@ -15,7 +15,7 @@ namespace Surging.Core.CPlatform.Runtime.Client.Address.Resolvers.Implementation { /// - /// 一个人默认的服务地址解析器。 + /// 默认的服务地址解析器。 /// public class DefaultAddressResolver : IAddressResolver { @@ -30,11 +30,14 @@ public class DefaultAddressResolver : IAddressResolver private readonly IServiceCommandProvider _commandProvider; private readonly ConcurrentDictionary _concurrent = new ConcurrentDictionary(); + private readonly IServiceHeartbeatManager _serviceHeartbeatManager; #endregion Field #region Constructor - public DefaultAddressResolver(IServiceCommandProvider commandProvider, IServiceRouteManager serviceRouteManager, ILogger logger, CPlatformContainer container, IHealthCheckService healthCheckService) + public DefaultAddressResolver(IServiceCommandProvider commandProvider, IServiceRouteManager serviceRouteManager, ILogger logger, CPlatformContainer container, + IHealthCheckService healthCheckService, + IServiceHeartbeatManager serviceHeartbeatManager) { _container = container; _serviceRouteManager = serviceRouteManager; @@ -42,6 +45,7 @@ public DefaultAddressResolver(IServiceCommandProvider commandProvider, IServiceR LoadAddressSelectors(); _commandProvider = commandProvider; _healthCheckService = healthCheckService; + _serviceHeartbeatManager = serviceHeartbeatManager; serviceRouteManager.Changed += ServiceRouteManager_Removed; serviceRouteManager.Removed += ServiceRouteManager_Removed; serviceRouteManager.Created += ServiceRouteManager_Add; @@ -56,7 +60,7 @@ public DefaultAddressResolver(IServiceCommandProvider commandProvider, IServiceR /// /// 服务Id。 /// 服务地址模型。 - public async ValueTask Resolver(string serviceId, int hashCode) + public async ValueTask Resolver(string serviceId, string item) { if (_logger.IsEnabled(LogLevel.Debug)) _logger.LogDebug($"准备为服务id：{serviceId}，解析可用地址。"); @@ -69,6 +73,7 @@ public async ValueTask Resolver(string serviceId, int hashCode) if (descriptor != null) { _concurrent.GetOrAdd(serviceId, descriptor); + _serviceHeartbeatManager.AddWhitelist(serviceId); } else { @@ -102,11 +107,12 @@ public async ValueTask Resolver(string serviceId, int hashCode) _logger.LogInformation($"根据服务id：{serviceId}，找到以下可用地址：{string.Join(",", address.Select(i => i.ToString()))}。"); var command = await _commandProvider.GetCommand(serviceId); var addressSelector = _addressSelectors[command.ShuntStrategy.ToString()]; + return await addressSelector.SelectAsync(new AddressSelectContext { Descriptor = descriptor.ServiceDescriptor, Address = address, - HashCode = hashCode + Item = item }); } diff --git a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/Selectors/IAddressSelector.cs b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/Selectors/IAddressSelector.cs index 3aab76598..b0479e86f 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/Selectors/IAddressSelector.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/Selectors/IAddressSelector.cs @@ -15,9 +15,9 @@ public class AddressSelectContext public ServiceDescriptor Descriptor { get; set; } /// - /// 参数的哈希值 + /// 哈希参数 /// - public int HashCode { get; set; } + public string Item { get; set; } /// /// 服务可用地址。 /// diff --git a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/Selectors/Implementation/FairPollingAdrSelector.cs b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/Selectors/Implementation/FairPollingAdrSelector.cs index 31bf8d53a..a920d4852 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/Selectors/Implementation/FairPollingAdrSelector.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/Selectors/Implementation/FairPollingAdrSelector.cs @@ -44,9 +44,17 @@ protected override async Task SelectAsync(AddressSelectContext con //根据服务id缓存服务地址。 var addressEntry = _concurrent.GetOrAdd(key, k => new Lazy(() => new AddressEntry(context.Address))).Value; AddressModel addressModel; + var index = 0; + var len = context.Address.Count(); do { addressModel = addressEntry.GetAddress(); + if (len <= index) + { + addressModel = null; + break; + } + index++; } while (await _healthCheckService.IsHealth(addressModel) == false); return addressModel; } diff --git a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/Selectors/Implementation/HashAlgorithmAdrSelector.cs b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/Selectors/Implementation/HashAlgorithmAdrSelector.cs index 65143c885..f9155648c 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/Selectors/Implementation/HashAlgorithmAdrSelector.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/Selectors/Implementation/HashAlgorithmAdrSelector.cs @@ -1,7 +1,9 @@ using Surging.Core.CPlatform.Address; +using Surging.Core.CPlatform.HashAlgorithms; using Surging.Core.CPlatform.Routing; using Surging.Core.CPlatform.Routing.Implementation; using Surging.Core.CPlatform.Runtime.Client.HealthChecks; +using Surging.Core.CPlatform.Runtime.Client.HealthChecks.Implementation; using System; using System.Collections.Concurrent; using System.Collections.Generic; @@ -14,8 +16,19 @@ namespace Surging.Core.CPlatform.Runtime.Client.Address.Resolvers.Implementation { public class HashAlgorithmAdrSelector : AddressSelectorBase { - public HashAlgorithmAdrSelector() - { + private readonly IHealthCheckService _healthCheckService; + private readonly ConcurrentDictionary> _concurrent = + new ConcurrentDictionary>(); + private readonly List> _unHealths = + new List>(); + private readonly IHashAlgorithm _hashAlgorithm; + public HashAlgorithmAdrSelector(IServiceRouteManager serviceRouteManager, IHealthCheckService healthCheckService, IHashAlgorithm hashAlgorithm) + { + _healthCheckService = healthCheckService; + _hashAlgorithm = hashAlgorithm; + //路由发生变更时重建地址条目。 + serviceRouteManager.Changed += ServiceRouteManager_Removed; + serviceRouteManager.Removed += ServiceRouteManager_Removed; } #region Overrides of AddressSelectorBase @@ -24,12 +37,76 @@ public HashAlgorithmAdrSelector() /// /// 地址选择上下文。 /// 地址模型。 - protected override Task SelectAsync(AddressSelectContext context) + protected override async Task SelectAsync(AddressSelectContext context) { - var address = context.Address.ToArray(); - var index = context.HashCode%address.Length; - return Task.FromResult(address[index]); + var key = GetCacheKey(context.Descriptor); + var addressEntry = _concurrent.GetOrAdd(key, k => + { + var len = context.Address.Count(); + len = len > 1 && len < 10 ? len * 10 : len; + var hash = new ConsistentHash(_hashAlgorithm, len); + foreach (var address in context.Address) + { + hash.Add(address,address.ToString()); + } + return hash; + }); + AddressModel addressModel; + var IsHealth = false; + var index = 0; + var count = context.Address.Count(); + do + { + addressModel = addressEntry.GetItemNode(context.Item); + if (count <= index) + { + addressModel = null; + break; + } + index++; + IsHealth = await _healthCheckService.IsHealth(addressModel); + if(!IsHealth) + { + addressEntry.Remove(addressModel.ToString()); + _unHealths.Add(new ValueTuple(key,addressModel)); + _healthCheckService.Changed += ItemNode_Changed; + } + } while (!IsHealth); + return addressModel; } #endregion Overrides of AddressSelectorBase + + #region Private Method + + private void ItemNode_Changed(object sender, HealthCheckEventArgs e) + { + var list= _unHealths.Where(p=>p.Item2.ToString()==e.Address.ToString()).ToList(); + foreach (var item in list) + { + if (item.Item1 != null && e.Health) + { + var addressEntry = _concurrent.GetValueOrDefault(item.Item1); + addressEntry.Add(item.Item2, item.Item2.ToString()); + _unHealths.Remove(item); + } + } + if(_unHealths.Count==0) + _healthCheckService.Changed -= ItemNode_Changed; + } + + private static string GetCacheKey(ServiceDescriptor descriptor) + { + return descriptor.Id; + } + + private void ServiceRouteManager_Removed(object sender, ServiceRouteEventArgs e) + { + var key = GetCacheKey(e.Route.ServiceDescriptor); + var item = _unHealths.Where(p => e.Route.Address.Select(addr=> addr.ToString()).Contains(p.Item2.ToString())).ToList(); + item.ForEach(p => _unHealths.Remove(p)); + _concurrent.TryRemove(key, out ConsistentHash value); + } + + #endregion } } diff --git a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/Selectors/Implementation/PollingAddressSelector.cs b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/Selectors/Implementation/PollingAddressSelector.cs index 6efcd4a0f..ce13ad2a8 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/Selectors/Implementation/PollingAddressSelector.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/Selectors/Implementation/PollingAddressSelector.cs @@ -42,9 +42,18 @@ protected override async Task SelectAsync(AddressSelectContext con //根据服务id缓存服务地址。 var addressEntry = _concurrent.GetOrAdd(key, k => new Lazy(() => new AddressEntry(context.Address))).Value; AddressModel addressModel; + var index = 0; + var len = context.Address.Count(); do { + addressModel = addressEntry.GetAddress(); + if (len <= index) + { + addressModel = null; + break; + } + index++; } while (await _healthCheckService.IsHealth(addressModel) == false); return addressModel; } diff --git a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/HealthChecks/IHealthCheckService.cs b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/HealthChecks/IHealthCheckService.cs index 40ee7970c..32577d4a1 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/HealthChecks/IHealthCheckService.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/HealthChecks/IHealthCheckService.cs @@ -1,4 +1,6 @@ using Surging.Core.CPlatform.Address; +using Surging.Core.CPlatform.Runtime.Client.HealthChecks.Implementation; +using System; using System.Threading.Tasks; namespace Surging.Core.CPlatform.Runtime.Client.HealthChecks @@ -29,5 +31,9 @@ public interface IHealthCheckService /// 地址模型。 /// 一个任务。 Task MarkFailure(AddressModel address); + + event EventHandler Removed; + + event EventHandler Changed; } } \ No newline at end of file diff --git a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/HealthChecks/Implementation/DefaultHealthCheckService.cs b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/HealthChecks/Implementation/DefaultHealthCheckService.cs index 8bbe668f3..518cf798d 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/HealthChecks/Implementation/DefaultHealthCheckService.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/HealthChecks/Implementation/DefaultHealthCheckService.cs @@ -18,6 +18,21 @@ public class DefaultHealthCheckService : IHealthCheckService, IDisposable private readonly IServiceRouteManager _serviceRouteManager; private readonly int _timeout = 30000; private readonly Timer _timer; + private EventHandler _removed; + + private EventHandler _changed; + + public event EventHandler Removed + { + add { _removed += value; } + remove { _removed -= value; } + } + + public event EventHandler Changed + { + add { _changed += value; } + remove { _changed -= value; } + } public DefaultHealthCheckService(IServiceRouteManager serviceRouteManager) { @@ -75,11 +90,13 @@ public void Monitor(AddressModel address) /// /// 地址模型。 /// 健康返回true，否则返回false。 - public ValueTask IsHealth(AddressModel address) + public async ValueTask IsHealth(AddressModel address) { var ipAddress = address as IpAddressModel; MonitorEntry entry; - return !_dictionary.TryGetValue(new ValueTuple(ipAddress.Ip, ipAddress.Port), out entry) ? new ValueTask(Check(address, _timeout)) : new ValueTask(entry.Health); + var isHealth= !_dictionary.TryGetValue(new ValueTuple(ipAddress.Ip, ipAddress.Port), out entry) ? await Check(address, _timeout) :entry.Health; + OnChanged(new HealthCheckEventArgs(address,isHealth)); + return isHealth; } /// @@ -97,6 +114,24 @@ public Task MarkFailure(AddressModel address) }); } + protected void OnRemoved(params HealthCheckEventArgs[] args) + { + if (_removed == null) + return; + + foreach (var arg in args) + _removed(this, arg); + } + + protected void OnChanged(params HealthCheckEventArgs[] args) + { + if (_changed == null) + return; + + foreach (var arg in args) + _changed(this, arg); + } + #endregion Implementation of IHealthCheckService #region Implementation of IDisposable @@ -135,7 +170,7 @@ private void RemoveUnhealthyAddress(IEnumerable monitorEntry) var ipAddress = p as IpAddressModel; _dictionary.TryRemove(new ValueTuple(ipAddress.Ip, ipAddress.Port), out MonitorEntry value); }); - + OnRemoved(addresses.Select(p => new HealthCheckEventArgs(p)).ToArray()); } } diff --git a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/HealthChecks/Implementation/HealthCheckEventArgs.cs b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/HealthChecks/Implementation/HealthCheckEventArgs.cs new file mode 100644 index 000000000..6d5b553a7 --- /dev/null +++ b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/HealthChecks/Implementation/HealthCheckEventArgs.cs @@ -0,0 +1,25 @@ +using Surging.Core.CPlatform.Address; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.CPlatform.Runtime.Client.HealthChecks.Implementation +{ + public class HealthCheckEventArgs + { + public HealthCheckEventArgs(AddressModel address) + { + Address = address; + } + + public HealthCheckEventArgs(AddressModel address,bool health) + { + Address = address; + Health = health; + } + + public AddressModel Address { get; private set; } + + public bool Health { get; private set; } + } +} diff --git a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/IServiceHeartbeatManager.cs b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/IServiceHeartbeatManager.cs new file mode 100644 index 000000000..1f9bd741f --- /dev/null +++ b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/IServiceHeartbeatManager.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Surging.Core.CPlatform.Runtime.Client +{ + public interface IServiceHeartbeatManager + { + void AddWhitelist(string serviceId); + + bool ExistsWhitelist(string serviceId); + } +} diff --git a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Implementation/DefaultServiceHeartbeatManager.cs b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Implementation/DefaultServiceHeartbeatManager.cs new file mode 100644 index 000000000..7a5e5a251 --- /dev/null +++ b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Implementation/DefaultServiceHeartbeatManager.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Concurrent; +using System.Linq; + +namespace Surging.Core.CPlatform.Runtime.Client.Implementation +{ + public class DefaultServiceHeartbeatManager : IServiceHeartbeatManager + { + private readonly ConcurrentBag _whitelist = new ConcurrentBag(); + + public void AddWhitelist(string serviceId) + { + if(!_whitelist.Contains(serviceId)) + _whitelist.Add(serviceId); + } + + public bool ExistsWhitelist(string serviceId) + { + return _whitelist.Contains(serviceId); + } + } +} diff --git a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Implementation/RemoteInvokeService.cs b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Implementation/RemoteInvokeService.cs index f1d5fc9b4..f6ede5130 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Implementation/RemoteInvokeService.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Implementation/RemoteInvokeService.cs @@ -38,7 +38,7 @@ public async Task InvokeAsync(RemoteInvokeContext con public async Task InvokeAsync(RemoteInvokeContext context, CancellationToken cancellationToken) { var invokeMessage = context.InvokeMessage; - var address = await ResolverAddress(context,context.HashCode); + var address = await ResolverAddress(context,context.Item); try { var endPoint = address.CreateEndPoint(); @@ -62,7 +62,7 @@ public async Task InvokeAsync(RemoteInvokeContext con public async Task InvokeAsync(RemoteInvokeContext context, int requestTimeout) { var invokeMessage = context.InvokeMessage; - var address = await ResolverAddress(context,context.HashCode); + var address = await ResolverAddress(context,context.Item); try { var endPoint = address.CreateEndPoint(); @@ -78,12 +78,12 @@ public async Task InvokeAsync(RemoteInvokeContext con } catch (Exception exception) { - _logger.LogError(exception, $"发起请求中发生了错误，服务Id：{invokeMessage.ServiceId}。"); + _logger.LogError(exception, $"发起请求中发生了错误，服务Id：{invokeMessage.ServiceId}。错误信息：{exception.Message}"); throw; } } - private async ValueTask ResolverAddress(RemoteInvokeContext context,int hashCode) + private async ValueTask ResolverAddress(RemoteInvokeContext context,string item) { if (context == null) throw new ArgumentNullException(nameof(context)); @@ -94,7 +94,7 @@ private async ValueTask ResolverAddress(RemoteInvokeContext contex if (string.IsNullOrEmpty(context.InvokeMessage.ServiceId)) throw new ArgumentException("服务Id不能为空。", nameof(context.InvokeMessage.ServiceId)); var invokeMessage = context.InvokeMessage; - var address = await _addressResolver.Resolver(invokeMessage.ServiceId, hashCode); + var address = await _addressResolver.Resolver(invokeMessage.ServiceId, item); if (address == null) throw new CPlatformException($"无法解析服务Id：{invokeMessage.ServiceId}的地址信息。"); return address; diff --git a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/RemoteInvokeContext.cs b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/RemoteInvokeContext.cs index 2a7cab8ee..4384f417d 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/RemoteInvokeContext.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/RemoteInvokeContext.cs @@ -12,6 +12,6 @@ public class RemoteInvokeContext /// public RemoteInvokeMessage InvokeMessage { get; set; } - public int HashCode { get; set; } + public string Item { get; set; } } } \ No newline at end of file diff --git a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/Implementation/DefaultServiceExecutor.cs b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/Implementation/DefaultServiceExecutor.cs index fbbca97bb..2b15ea054 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/Implementation/DefaultServiceExecutor.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/Implementation/DefaultServiceExecutor.cs @@ -3,6 +3,7 @@ using Surging.Core.CPlatform.Filters; using Surging.Core.CPlatform.Messages; using Surging.Core.CPlatform.Routing; +using Surging.Core.CPlatform.Runtime.Client; using Surging.Core.CPlatform.Transport; using Surging.Core.CPlatform.Transport.Implementation; using Surging.Core.CPlatform.Utilities; @@ -53,7 +54,7 @@ public async Task ExecuteAsync(IMessageSender sender, TransportMessage message) if (!message.IsInvokeMessage()) return; - + RemoteInvokeMessage remoteInvokeMessage; try { @@ -79,7 +80,6 @@ public async Task ExecuteAsync(IMessageSender sender, TransportMessage message) foreach(var attachment in remoteInvokeMessage.Attachments) RpcContext.GetContext().SetAttachment(attachment.Key,attachment.Value); } - if (_logger.IsEnabled(LogLevel.Debug)) _logger.LogDebug("准备执行本地逻辑。"); @@ -115,7 +115,6 @@ private async Task LocalExecuteAsync(ServiceEntry entry, RemoteInvokeMessage rem { try { - var cancelTokenSource = new CancellationTokenSource(); var result = await entry.Func(remoteInvokeMessage.ServiceKey, remoteInvokeMessage.Parameters); var task = result as Task; diff --git a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/Implementation/ServiceDiscovery/Implementation/ClrServiceEntryFactory.cs b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/Implementation/ServiceDiscovery/Implementation/ClrServiceEntryFactory.cs index 3a21c607d..0208d48b0 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/Implementation/ServiceDiscovery/Implementation/ClrServiceEntryFactory.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/Implementation/ServiceDiscovery/Implementation/ClrServiceEntryFactory.cs @@ -45,10 +45,10 @@ public ClrServiceEntryFactory(CPlatformContainer serviceProvider, IServiceIdGene /// Ŀϡ public IEnumerable CreateServiceEntry(Type service) { - var routeTemplate = service.GetCustomAttribute() ; + var routeTemplate = service.GetCustomAttribute(); foreach (var methodInfo in service.GetTypeInfo().GetMethods()) { - yield return Create(methodInfo,service.Name, routeTemplate.RouteTemplate); + yield return Create(methodInfo, service.Name, routeTemplate.RouteTemplate); } } #endregion Implementation of IClrServiceEntryFactory @@ -64,17 +64,16 @@ private ServiceEntry Create(MethodInfo method, string serviceName, string routeT Id = serviceId, RoutePath = RoutePatternParser.Parse(routeTemplate, serviceName, method.Name) }; - var descriptorAttributes = method.GetCustomAttributes(); foreach (var descriptorAttribute in descriptorAttributes) { descriptorAttribute.Apply(serviceDescriptor); } var authorization = attributes.Where(p => p is AuthorizationFilterAttribute).FirstOrDefault(); - if(authorization != null) - serviceDescriptor.EnableAuthorization(true); if (authorization != null) - { + serviceDescriptor.EnableAuthorization(true); + if (authorization != null) + { serviceDescriptor.AuthType(((authorization as AuthorizationAttribute)?.AuthType) ?? AuthorizationType.AppSecret); } @@ -82,9 +81,9 @@ private ServiceEntry Create(MethodInfo method, string serviceName, string routeT return new ServiceEntry { Descriptor = serviceDescriptor, - RoutePath= serviceDescriptor.RoutePath, - MethodName=method.Name, - Type= method.DeclaringType, + RoutePath = serviceDescriptor.RoutePath, + MethodName = method.Name, + Type = method.DeclaringType, Attributes = attributes, Func = (key, parameters) => { @@ -109,7 +108,7 @@ private ServiceEntry Create(MethodInfo method, string serviceName, string routeT } }; } - + private FastInvokeHandler GetHandler(string key, MethodInfo method) { var objInstance = ServiceResolver.Current.GetService(null, key); diff --git a/src/Surging.Core/Surging.Core.CPlatform/ServiceDescriptor.cs b/src/Surging.Core/Surging.Core.CPlatform/ServiceDescriptor.cs index 3c20cd16f..680e20c5e 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/ServiceDescriptor.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/ServiceDescriptor.cs @@ -1,4 +1,5 @@ -using Surging.Core.CPlatform.Filters.Implementation; +using Newtonsoft.Json; +using Surging.Core.CPlatform.Filters.Implementation; using System; using System.Collections.Generic; using System.Linq; @@ -111,6 +112,7 @@ public static string AuthType(this ServiceDescriptor descriptor) { return descriptor.GetMetadata("AuthType", AuthorizationType.AppSecret.ToString()); } + /// /// 设置授权类型 @@ -196,9 +198,10 @@ public ServiceDescriptor() /// public string RoutePath { get; set; } + /// /// 元数据。 - /// + /// public IDictionary Metadatas { get; set; } /// diff --git a/src/Surging.Core/Surging.Core.CPlatform/ServiceHostBuilderExtensions.cs b/src/Surging.Core/Surging.Core.CPlatform/ServiceHostBuilderExtensions.cs index 51e0ff4f5..7eeeee308 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/ServiceHostBuilderExtensions.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/ServiceHostBuilderExtensions.cs @@ -33,35 +33,13 @@ public static IServiceHostBuilder UseServer(this IServiceHostBuilder hostBuilder BuildServiceEngine(mapper); mapper.Resolve().SetServiceCommandsAsync(); string serviceToken = mapper.Resolve().GeneratorToken(token); - int _port = AppConfig.ServerOptions.Port == 0 ? port : AppConfig.ServerOptions.Port; - string _ip = AppConfig.ServerOptions.Ip ?? ip; - _port = AppConfig.ServerOptions.IpEndpoint?.Port ?? _port; - _ip = AppConfig.ServerOptions.IpEndpoint?.Address.ToString() ?? _ip; - if (_ip.IndexOf(".") < 0 || _ip == "" || _ip == "0.0.0.0") - { - NetworkInterface[] nics = NetworkInterface.GetAllNetworkInterfaces(); - foreach (NetworkInterface adapter in nics) - { - if (adapter.NetworkInterfaceType == NetworkInterfaceType.Ethernet && (_ip == "" || _ip == "0.0.0.0" || _ip == adapter.Name)) - { - IPInterfaceProperties ipxx = adapter.GetIPProperties(); - UnicastIPAddressInformationCollection ipCollection = ipxx.UnicastAddresses; - foreach (UnicastIPAddressInformation ipadd in ipCollection) - { - if (ipadd.Address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) - { - _ip = ipadd.Address.ToString(); - } - } - } - } - } - var mappingIp = AppConfig.ServerOptions.MappingIP ?? _ip; - var mappingPort = AppConfig.ServerOptions.MappingPort; - if (mappingPort == 0) - mappingPort = _port; + int _port = AppConfig.ServerOptions.Port= AppConfig.ServerOptions.Port == 0 ? port : AppConfig.ServerOptions.Port; + string _ip = AppConfig.ServerOptions.Ip = AppConfig.ServerOptions.Ip ?? ip; + _port = AppConfig.ServerOptions.Port = AppConfig.ServerOptions.IpEndpoint?.Port ?? _port; + _ip = AppConfig.ServerOptions.Ip =AppConfig.ServerOptions.IpEndpoint?.Address.ToString() ?? _ip; + _ip = NetUtils.GetHostAddress(_ip); - ConfigureRoute(mapper, mappingIp, mappingPort, serviceToken); + ConfigureRoute(mapper, serviceToken); mapper.Resolve().Initialize(); var serviceHosts = mapper.Resolve>(); Task.Factory.StartNew(async () => @@ -117,31 +95,37 @@ public static void BuildServiceEngine(IContainer container) } } - public static void ConfigureRoute(IContainer mapper,string mappingIp,int mappingPort,string serviceToken) + public static void ConfigureRoute(IContainer mapper,string serviceToken) { - var serviceEntryManager = mapper.Resolve(); if (AppConfig.ServerOptions.Protocol == CommunicationProtocol.Tcp || AppConfig.ServerOptions.Protocol == CommunicationProtocol.None) - new ServiceRouteWatch(mapper.Resolve(), () => + { + if (AppConfig.ServerOptions.EnableRouteWatch) + new ServiceRouteWatch(mapper.Resolve(), + () => RegisterRoutes(mapper, serviceToken, + Math.Round(Convert.ToDecimal(Process.GetCurrentProcess().TotalProcessorTime.TotalSeconds), 2, MidpointRounding.AwayFromZero))); + else + RegisterRoutes(mapper, serviceToken,0); + } + } + + public static void RegisterRoutes(IContainer mapper, string serviceToken,decimal processorTime) + { + var serviceEntryManager = mapper.Resolve(); + var ports = AppConfig.ServerOptions.Ports; + var addess = NetUtils.GetHostAddress(); + addess.ProcessorTime = processorTime; + RpcContext.GetContext().SetAttachment("Host", addess); + var addressDescriptors = serviceEntryManager.GetEntries().Select(i => + { + i.Descriptor.Token = serviceToken; + return new ServiceRoute { - var addess = new IpAddressModel - { - Ip = mappingIp, - Port = mappingPort, - ProcessorTime = Math.Round(Convert.ToDecimal(Process.GetCurrentProcess().TotalProcessorTime.TotalSeconds), 2, MidpointRounding.AwayFromZero), - }; - RpcContext.GetContext().SetAttachment("Host", addess); - var addressDescriptors = serviceEntryManager.GetEntries().Select(i => - { - i.Descriptor.Token = serviceToken; - return new ServiceRoute - { - Address = new[] { addess }, - ServiceDescriptor = i.Descriptor - }; - }).ToList(); - mapper.Resolve().SetRoutesAsync(addressDescriptors).Wait(); - }); + Address = new[] { addess }, + ServiceDescriptor = i.Descriptor + }; + }).ToList(); + mapper.Resolve().SetRoutesAsync(addressDescriptors).Wait(); } } } diff --git a/src/Surging.Core/Surging.Core.CPlatform/Support/IBreakeRemoteInvokeService.cs b/src/Surging.Core/Surging.Core.CPlatform/Support/IBreakeRemoteInvokeService.cs index 22883d07c..5dfc059e3 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Support/IBreakeRemoteInvokeService.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Support/IBreakeRemoteInvokeService.cs @@ -1,7 +1,5 @@ using Surging.Core.CPlatform.Messages; -using System; using System.Collections.Generic; -using System.Text; using System.Threading.Tasks; namespace Surging.Core.CPlatform.Support diff --git a/src/Surging.Core/Surging.Core.CPlatform/Support/IClusterInvoker.cs b/src/Surging.Core/Surging.Core.CPlatform/Support/IClusterInvoker.cs index 55774d068..421528473 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Support/IClusterInvoker.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Support/IClusterInvoker.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; +using System.Collections.Generic; using System.Threading.Tasks; namespace Surging.Core.CPlatform.Support diff --git a/src/Surging.Core/Surging.Core.CPlatform/Support/Implementation/BreakeRemoteInvokeService.cs b/src/Surging.Core/Surging.Core.CPlatform/Support/Implementation/BreakeRemoteInvokeService.cs index 3539b6e84..f1cc05019 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Support/Implementation/BreakeRemoteInvokeService.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Support/Implementation/BreakeRemoteInvokeService.cs @@ -49,7 +49,7 @@ bool reachRequestVolumeThreshold() => intervalSeconds <= 10 && serviceInvokeInfos.SinceFaultRemoteServiceRequests > command.BreakerRequestVolumeThreshold; bool reachErrorThresholdPercentage() => (double)serviceInvokeInfos.FaultRemoteServiceRequests / (double)(serviceInvokeInfos.RemoteServiceRequests ?? 1) * 100 > command.BreakeErrorThresholdPercentage; - var hashCode = GetHashCode(command,parameters); + var item = GetHashItem(command,parameters); if (command.BreakerForceClosed) { _serviceInvokeListenInfo.AddOrUpdate(serviceId, new ServiceInvokeListenInfo(), (k, v) => { v.LocalServiceRequests++; return v; }); @@ -61,7 +61,7 @@ bool reachErrorThresholdPercentage() => { if (intervalSeconds * 1000 > command.BreakeSleepWindowInMilliseconds) { - return await MonitorRemoteInvokeAsync(parameters, serviceId, serviceKey, decodeJOject, command.ExecutionTimeoutInMilliseconds, hashCode); + return await MonitorRemoteInvokeAsync(parameters, serviceId, serviceKey, decodeJOject, command.ExecutionTimeoutInMilliseconds, item); } else { @@ -71,14 +71,13 @@ bool reachErrorThresholdPercentage() => } else { - return await MonitorRemoteInvokeAsync(parameters, serviceId, serviceKey, decodeJOject, command.ExecutionTimeoutInMilliseconds, hashCode); + return await MonitorRemoteInvokeAsync(parameters, serviceId, serviceKey, decodeJOject, command.ExecutionTimeoutInMilliseconds, item); } } } - private async Task MonitorRemoteInvokeAsync(IDictionary parameters, string serviceId, string serviceKey, bool decodeJOject, int requestTimeout,int hashCode) + private async Task MonitorRemoteInvokeAsync(IDictionary parameters, string serviceId, string serviceKey, bool decodeJOject, int requestTimeout,string item) { - var serviceInvokeInfo = _serviceInvokeListenInfo.GetOrAdd(serviceId, new ServiceInvokeListenInfo()); CancellationTokenSource source = new CancellationTokenSource(); var token = source.Token; var invokeMessage = new RemoteInvokeMessage @@ -100,7 +99,7 @@ private async Task MonitorRemoteInvokeAsync(IDictiona }); var message = await _remoteInvokeService.InvokeAsync(new RemoteInvokeContext { - HashCode=hashCode , + Item=item , InvokeMessage = invokeMessage }, requestTimeout); _serviceInvokeListenInfo.AddOrUpdate(serviceId, new ServiceInvokeListenInfo(), (k, v) => @@ -126,23 +125,23 @@ private async Task MonitorRemoteInvokeAsync(IDictiona private async Task ExecuteExceptionFilter(Exception ex, RemoteInvokeMessage invokeMessage, CancellationToken token) { - foreach (var filter in exceptionFilters) + foreach (var filter in exceptionFilters) + { + await filter.ExecuteExceptionFilterAsync(new RpcActionExecutedContext { - await filter.ExecuteExceptionFilterAsync(new RpcActionExecutedContext - { - Exception = ex, - InvokeMessage = invokeMessage - }, token); - } + Exception = ex, + InvokeMessage = invokeMessage + }, token); + } } - private int GetHashCode(ServiceCommand command, IDictionary parameters) + private string GetHashItem(ServiceCommand command, IDictionary parameters) { - var result = 0; + string result = ""; if(command.ShuntStrategy==AddressSelectorMode.HashAlgorithm) { var parameter = parameters.Values.FirstOrDefault(); - result= _hashAlgorithm.Hash(parameter?.ToString()); + result= parameter?.ToString(); } return result; } diff --git a/src/Surging.Core/Surging.Core.CPlatform/Support/Implementation/FailoverHandoverInvoker.cs b/src/Surging.Core/Surging.Core.CPlatform/Support/Implementation/FailoverHandoverInvoker.cs index a8ef3b660..7d094dcc1 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Support/Implementation/FailoverHandoverInvoker.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Support/Implementation/FailoverHandoverInvoker.cs @@ -1,14 +1,12 @@ using Surging.Core.CPlatform.Convertibles; using Surging.Core.CPlatform.Messages; using Surging.Core.CPlatform.Runtime.Client; -using System; using System.Collections.Generic; -using System.Text; using System.Threading.Tasks; namespace Surging.Core.CPlatform.Support.Implementation { - public class FailoverHandoverInvoker: IClusterInvoker + public class FailoverHandoverInvoker: IClusterInvoker { #region Field private readonly IRemoteInvokeService _remoteInvokeService; diff --git a/src/Surging.Core/Surging.Core.CPlatform/Support/Implementation/FailoverInjectionInvoker.cs b/src/Surging.Core/Surging.Core.CPlatform/Support/Implementation/FailoverInjectionInvoker.cs index 6ac9d56fe..fe81fc1d6 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Support/Implementation/FailoverInjectionInvoker.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Support/Implementation/FailoverInjectionInvoker.cs @@ -1,10 +1,9 @@ -using Surging.Core.CPlatform.Runtime.Server; +using Surging.Core.CPlatform.Convertibles; +using Surging.Core.CPlatform.Runtime.Server; using System; using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; using System.Linq; -using Surging.Core.CPlatform.Convertibles; +using System.Threading.Tasks; namespace Surging.Core.CPlatform.Support.Implementation { diff --git a/src/Surging.Core/Surging.Core.CPlatform/Support/ServiceCommand.cs b/src/Surging.Core/Surging.Core.CPlatform/Support/ServiceCommand.cs index 052955467..23a68ed13 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Support/ServiceCommand.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Support/ServiceCommand.cs @@ -1,9 +1,6 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; using Surging.Core.CPlatform.Runtime.Client.Address.Resolvers.Implementation.Selectors.Implementation; -using System; -using System.Collections.Generic; -using System.Text; namespace Surging.Core.CPlatform.Support { diff --git a/src/Surging.Core/Surging.Core.CPlatform/Support/ServiceCommandDescriptor.cs b/src/Surging.Core/Surging.Core.CPlatform/Support/ServiceCommandDescriptor.cs index 45ee809a9..da42ed5cb 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Support/ServiceCommandDescriptor.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Support/ServiceCommandDescriptor.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Surging.Core.CPlatform.Support +namespace Surging.Core.CPlatform.Support { public class ServiceCommandDescriptor:ServiceCommand { diff --git a/src/Surging.Core/Surging.Core.CPlatform/Support/ServiceInvokeListenInfo.cs b/src/Surging.Core/Surging.Core.CPlatform/Support/ServiceInvokeListenInfo.cs index 295e165c9..c4a984adc 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Support/ServiceInvokeListenInfo.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Support/ServiceInvokeListenInfo.cs @@ -1,10 +1,8 @@ using System; -using System.Collections.Generic; -using System.Text; namespace Surging.Core.CPlatform.Support { - public class ServiceInvokeListenInfo + public class ServiceInvokeListenInfo { /// diff --git a/src/Surging.Core/Surging.Core.CPlatform/Support/StrategyType.cs b/src/Surging.Core/Surging.Core.CPlatform/Support/StrategyType.cs index 7be6f7d2d..ff9a8f85d 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Support/StrategyType.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Support/StrategyType.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Surging.Core.CPlatform.Support +namespace Surging.Core.CPlatform.Support { - public enum StrategyType + public enum StrategyType { Failover=0, Injection=1, diff --git a/src/Surging.Core/Surging.Core.CPlatform/Transport/IMessageListener.cs b/src/Surging.Core/Surging.Core.CPlatform/Transport/IMessageListener.cs index a81727f9c..6f4e146c0 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Transport/IMessageListener.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Transport/IMessageListener.cs @@ -1,5 +1,4 @@ using Surging.Core.CPlatform.Messages; -using System.Net; using System.Threading.Tasks; namespace Surging.Core.CPlatform.Transport diff --git a/src/Surging.Core/Surging.Core.CPlatform/Transport/Implementation/RpcContext.cs b/src/Surging.Core/Surging.Core.CPlatform/Transport/Implementation/RpcContext.cs index be9a05072..7edb76d26 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Transport/Implementation/RpcContext.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Transport/Implementation/RpcContext.cs @@ -1,7 +1,5 @@ using System; using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Text; using System.Threading; namespace Surging.Core.CPlatform.Transport.Implementation diff --git a/src/Surging.Core/Surging.Core.CPlatform/Transport/Implementation/TransportClient.cs b/src/Surging.Core/Surging.Core.CPlatform/Transport/Implementation/TransportClient.cs index 9bf1b4ae2..2c93a906d 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Transport/Implementation/TransportClient.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Transport/Implementation/TransportClient.cs @@ -122,6 +122,7 @@ private async Task RegisterResultCallbackAsync(string //删除回调任务 TaskCompletionSource value; _resultDictionary.TryRemove(id, out value); + value.TrySetCanceled(); } } diff --git a/src/Surging.Core/Surging.Core.CPlatform/Utilities/CancellationTokenExtensions.cs b/src/Surging.Core/Surging.Core.CPlatform/Utilities/CancellationTokenExtensions.cs index cfe1ff231..feb179024 100644 --- a/src/Surging.Core/Surging.Core.CPlatform/Utilities/CancellationTokenExtensions.cs +++ b/src/Surging.Core/Surging.Core.CPlatform/Utilities/CancellationTokenExtensions.cs @@ -22,16 +22,23 @@ public static async Task WithCancellation( using (cancellationToken.Register( s => ((TaskCompletionSource)s).TrySetResult(true), tcs)) if (task != await Task.WhenAny(task, tcs.Task)) - throw new OperationCanceledException("请求超时", cancellationToken); + throw new TimeoutException(); return await task; } public static async Task WithCancellation( this Task task, int requestTimeout) { - if (task != await Task.WhenAny(task, Task.Delay(requestTimeout))) - throw new OperationCanceledException("请求超时"); - return await task; + using (var cts = new CancellationTokenSource()) + { + if (task == await Task.WhenAny(task, Task.Delay(requestTimeout, cts.Token))) + { + cts.Cancel(); + return await task; + } + } + + throw new TimeoutException(); } } } diff --git a/src/Surging.Core/Surging.Core.CPlatform/Utilities/NetUtils.cs b/src/Surging.Core/Surging.Core.CPlatform/Utilities/NetUtils.cs new file mode 100644 index 000000000..624479d4b --- /dev/null +++ b/src/Surging.Core/Surging.Core.CPlatform/Utilities/NetUtils.cs @@ -0,0 +1,108 @@ +using Surging.Core.CPlatform.Address; +using System; +using System.Collections.Generic; +using System.Net.NetworkInformation; +using System.Text; + +namespace Surging.Core.CPlatform.Utilities +{ + public class NetUtils + { + public const string LOCALHOST = "127.0.0.1"; + public const string ANYHOST = "0.0.0.0"; + private const int MIN_PORT = 0; + private const int MAX_PORT = 65535; + private const string LOCAL_IP_PATTERN = "127(\\.\\d{1,3}){3}$"; + private const string IP_PATTERN = "\\d{1,3}(\\.\\d{1,3}){3,5}$"; + private static AddressModel _host=null; + + public static bool IsInvalidPort(int port) + { + return port <= MIN_PORT || port > MAX_PORT; + } + + public static bool IsLocalHost(string host) + { + return host != null + && (host.IsMatch(LOCAL_IP_PATTERN) + || host.Equals("localhost", StringComparison.OrdinalIgnoreCase)); + } + + public static bool IsAnyHost(String host) + { + return "0.0.0.0".Equals(host); + } + + private static bool IsValidAddress(string address) + { + return (address != null + && !ANYHOST.Equals(address) + && !LOCALHOST.Equals(address) + && address.IsMatch(IP_PATTERN)); + } + + public static bool IsInvalidLocalHost(String host) + { + return host == null + || host.Length == 0 + || host.Equals("localhost", StringComparison.OrdinalIgnoreCase) + || host.Equals("0.0.0.0") + || (host.IsMatch(LOCAL_IP_PATTERN)); + } + + public static string GetAnyHostAddress() + { + string result = ""; + NetworkInterface[] nics = NetworkInterface.GetAllNetworkInterfaces(); + foreach (NetworkInterface adapter in nics) + { + if (adapter.NetworkInterfaceType == NetworkInterfaceType.Ethernet) + { + IPInterfaceProperties ipxx = adapter.GetIPProperties(); + UnicastIPAddressInformationCollection ipCollection = ipxx.UnicastAddresses; + foreach (UnicastIPAddressInformation ipadd in ipCollection) + { + if (ipadd.Address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) + { + result = ipadd.Address.ToString(); + } + } + } + } + return result; + } + + public static string GetHostAddress(string hostAddress) + { + var result = hostAddress; + if(IsValidAddress(hostAddress) || IsAnyHost(hostAddress)) + { + result = GetAnyHostAddress(); + } + return result; + } + + public static AddressModel GetHostAddress() + { + if (_host != null) + return _host; + var ports = AppConfig.ServerOptions.Ports; + string address = GetHostAddress(AppConfig.ServerOptions.Ip); + int port = AppConfig.ServerOptions.Port; + var mappingIp = AppConfig.ServerOptions.MappingIP ?? address; + var mappingPort = AppConfig.ServerOptions.MappingPort; + if (mappingPort == 0) + mappingPort = port; + _host= new IpAddressModel + { + HttpPort = ports.HttpPort, + Ip = mappingIp, + Port = mappingPort, + MqttPort = ports.MQTTPort, + WanIp = AppConfig.ServerOptions.WanIp, + WsPort = ports.WSPort + }; + return _host; + } + } +} diff --git a/src/Surging.Core/Surging.Core.Caching/AddressResolvers/Implementation/DefaultAddressResolver.cs b/src/Surging.Core/Surging.Core.Caching/AddressResolvers/Implementation/DefaultAddressResolver.cs index bf230eb61..20cfc30fd 100644 --- a/src/Surging.Core/Surging.Core.Caching/AddressResolvers/Implementation/DefaultAddressResolver.cs +++ b/src/Surging.Core/Surging.Core.Caching/AddressResolvers/Implementation/DefaultAddressResolver.cs @@ -92,35 +92,43 @@ private static string GetKey(CacheDescriptor descriptor) private void ServiceCacheManager_Removed(object sender, ServiceCacheEventArgs e) { var key = GetKey(e.Cache.CacheDescriptor); - var redisContext = CacheContainer.GetService(e.Cache.CacheDescriptor.Prefix); - ServiceCache value; - _concurrent.TryRemove(key, out value); - ConsistentHash hash; - redisContext.dicHash.TryGetValue(e.Cache.CacheDescriptor.Type, out hash); - if (hash != null) - foreach (var node in e.Cache.CacheEndpoint) - { - var hashNode = node as ConsistentHashNode; - hash.Remove(hashNode); - hash.Add(hashNode); - } - + if (CacheContainer.IsRegistered(e.Cache.CacheDescriptor.Prefix)) + { + var redisContext = CacheContainer.GetService(e.Cache.CacheDescriptor.Prefix); + ServiceCache value; + _concurrent.TryRemove(key, out value); + ConsistentHash hash; + redisContext.dicHash.TryGetValue(e.Cache.CacheDescriptor.Type, out hash); + if (hash != null) + foreach (var node in e.Cache.CacheEndpoint) + { + + var hashNode = node as ConsistentHashNode; + var addr = string.Format("{0}:{1}", hashNode.Host, hashNode.Port); + hash.Remove(addr); + hash.Add(hashNode, addr); + } + } } private void ServiceCacheManager_Add(object sender, ServiceCacheEventArgs e) { var key = GetKey(e.Cache.CacheDescriptor); - var redisContext = CacheContainer.GetService(e.Cache.CacheDescriptor.Prefix); - _concurrent.GetOrAdd(key, e.Cache); - ConsistentHash hash; - redisContext.dicHash.TryGetValue(e.Cache.CacheDescriptor.Type, out hash); - if (hash != null) - foreach (var node in e.Cache.CacheEndpoint) - { - var hashNode = node as ConsistentHashNode; - hash.Remove(hashNode); - hash.Add(hashNode); - } + if (CacheContainer.IsRegistered(e.Cache.CacheDescriptor.Prefix)) + { + var redisContext = CacheContainer.GetService(e.Cache.CacheDescriptor.Prefix); + _concurrent.GetOrAdd(key, e.Cache); + ConsistentHash hash; + redisContext.dicHash.TryGetValue(e.Cache.CacheDescriptor.Type, out hash); + if (hash != null) + foreach (var node in e.Cache.CacheEndpoint) + { + var hashNode = node as ConsistentHashNode; + var addr = string.Format("{0}:{1}", hashNode.Host, hashNode.Port); + hash.Remove(addr); + hash.Add(hashNode, addr); + } + } } } } diff --git a/src/Surging.Core/Surging.Core.Caching/Configurations/CacheConfigurationExtensions.cs b/src/Surging.Core/Surging.Core.Caching/Configurations/CacheConfigurationExtensions.cs index eab7df3d6..7b5e00531 100644 --- a/src/Surging.Core/Surging.Core.Caching/Configurations/CacheConfigurationExtensions.cs +++ b/src/Surging.Core/Surging.Core.Caching/Configurations/CacheConfigurationExtensions.cs @@ -12,20 +12,25 @@ public static class CacheConfigurationExtensionsstatic { public static IConfigurationBuilder AddCacheFile(this IConfigurationBuilder builder, string path) { - return AddCacheFile(builder, provider: null, path: path, optional: false, reloadOnChange: false); + return AddCacheFile(builder, provider: null, path: path, basePath: null, optional: false, reloadOnChange: false); } public static IConfigurationBuilder AddCacheFile(this IConfigurationBuilder builder, string path, bool optional) { - return AddCacheFile(builder, provider: null, path: path, optional: optional, reloadOnChange: false); + return AddCacheFile(builder, provider: null, path: path, basePath: null, optional: optional, reloadOnChange: false); } public static IConfigurationBuilder AddCacheFile(this IConfigurationBuilder builder, string path, bool optional, bool reloadOnChange) { - return AddCacheFile(builder, provider: null, path: path, optional: optional, reloadOnChange: reloadOnChange); + return AddCacheFile(builder, provider: null, path: path, basePath: null, optional: optional, reloadOnChange: reloadOnChange); } - public static IConfigurationBuilder AddCacheFile(this IConfigurationBuilder builder, IFileProvider provider, string path, bool optional, bool reloadOnChange) + public static IConfigurationBuilder AddCacheFile(this IConfigurationBuilder builder, string path, string basePath, bool optional, bool reloadOnChange) + { + return AddCacheFile(builder, provider: null, path: path, basePath: basePath, optional: optional, reloadOnChange: reloadOnChange); + } + + public static IConfigurationBuilder AddCacheFile(this IConfigurationBuilder builder, IFileProvider provider, string path, string basePath, bool optional, bool reloadOnChange) { Check.NotNull(builder, "builder"); Check.CheckCondition(() => string.IsNullOrEmpty(path), "path"); @@ -43,6 +48,8 @@ public static IConfigurationBuilder AddCacheFile(this IConfigurationBuilder buil ReloadOnChange = reloadOnChange }; builder.Add(source); + if (!string.IsNullOrEmpty(basePath)) + builder.SetBasePath(basePath); AppConfig.Path = path; AppConfig.Configuration = builder.Build(); return builder; diff --git a/src/Surging.Core/Surging.Core.Caching/Configurations/Implementation/ConfigurationWatchProvider.cs b/src/Surging.Core/Surging.Core.Caching/Configurations/Implementation/ConfigurationWatchProvider.cs index 2d4ac3f09..d2ce0224e 100644 --- a/src/Surging.Core/Surging.Core.Caching/Configurations/Implementation/ConfigurationWatchProvider.cs +++ b/src/Surging.Core/Surging.Core.Caching/Configurations/Implementation/ConfigurationWatchProvider.cs @@ -54,23 +54,26 @@ private void SaveConfiguration(ServiceCache cache) { if (this.queue.Count > 0) this.queue.Dequeue(); var setting = _cachingProvider.CachingSettings.Where(p => p.Id == cache.CacheDescriptor.Prefix).FirstOrDefault(); - setting.Properties.ForEach(p => + if (setting != null) { - if (p.Maps != null) - p.Maps.ForEach(m => + setting.Properties.ForEach(p => { - if (m.Name == cache.CacheDescriptor.Type) - m.Properties = cache.CacheEndpoint.Select(n => - { - var hashNode = n as ConsistentHashNode; - return new Property + if (p.Maps != null) + p.Maps.ForEach(m => + { + if (m.Name == cache.CacheDescriptor.Type) + m.Properties = cache.CacheEndpoint.Select(n => { - Value = $"{hashNode.Host}:{hashNode.Port}::{hashNode.Db}" - }; - }).ToList(); + var hashNode = n as ConsistentHashNode; + return new Property + { + Value = $"{hashNode.Host}:{hashNode.Port}::{hashNode.Db}" + }; + }).ToList(); + }); }); - }); - this.queue.Enqueue(true); + this.queue.Enqueue(true); + } } public override async Task Process() diff --git a/src/Surging.Core/Surging.Core.Caching/HashAlgorithms/ConsistentHash.cs b/src/Surging.Core/Surging.Core.Caching/HashAlgorithms/ConsistentHash.cs index 03cfc68bb..33a852505 100644 --- a/src/Surging.Core/Surging.Core.Caching/HashAlgorithms/ConsistentHash.cs +++ b/src/Surging.Core/Surging.Core.Caching/HashAlgorithms/ConsistentHash.cs @@ -46,22 +46,6 @@ public int VirtualNodeReplicationFactor } #endregion - /// - /// 初始化节点服务器 - /// - /// 节点 - /// - /// 创建：范亮 - /// 日期：2016/4/2 - /// - public void Initialize(IEnumerable nodes) - { - foreach (var node in nodes) - { - AddNode(node); - } - _nodeKeysInRing = _ring.Keys.ToArray(); - } /// /// 添加节点 @@ -71,12 +55,17 @@ public void Initialize(IEnumerable nodes) /// 创建：范亮 /// 日期：2016/4/2 /// - public void Add(T node) + public void Add(T node, string value) { - AddNode(node); + AddNode(node, value); _nodeKeysInRing = _ring.Keys.ToArray(); } + public IEnumerable GetNodes() + { + return _ring.Values.Distinct().ToList(); + } + /// /// 删除节点 /// @@ -85,7 +74,7 @@ public void Add(T node) /// 创建：范亮 /// 日期：2016/4/2 /// - public void Remove(T node) + public void Remove(string node) { RemoveNode(node); _nodeKeysInRing = _ring.Keys.ToArray(); @@ -107,11 +96,6 @@ public T GetItemNode(string item) return _ring[_nodeKeysInRing[nearestNodePosition]]; } - public IEnumerable GetNodes() - { - return _ring.Values.Distinct().ToList(); - } - /// /// 添加节点 /// @@ -120,11 +104,11 @@ public IEnumerable GetNodes() /// 创建：范亮 /// 日期：2016/4/2 /// - private void AddNode(T node) + private void AddNode(T node, string value) { for (var i = 0; i < _virtualNodeReplicationFactor; i++) { - var hashOfVirtualNode = _hashAlgorithm.Hash(node.GetHashCode().ToString(CultureInfo.InvariantCulture) + i); + var hashOfVirtualNode = _hashAlgorithm.Hash(value.ToString(CultureInfo.InvariantCulture) + i); _ring[hashOfVirtualNode] = node; } } @@ -137,13 +121,12 @@ private void AddNode(T node) /// 创建：范亮 /// 日期：2016/4/2 /// - private void RemoveNode(T node) + private void RemoveNode(string value) { for (var i = 0; i < _virtualNodeReplicationFactor; i++) { - var hashOfVirtualNode = _hashAlgorithm.Hash(node.GetHashCode().ToString() + i); - if (_ring.ContainsKey(hashOfVirtualNode)) - _ring.Remove(hashOfVirtualNode); + var hashOfVirtualNode = _hashAlgorithm.Hash(value.ToString() + i); + _ring.Remove(hashOfVirtualNode); } } diff --git a/src/Surging.Core/Surging.Core.Caching/RedisCache/RedisContext.cs b/src/Surging.Core/Surging.Core.Caching/RedisCache/RedisContext.cs index 18f948d21..238d3e0a4 100644 --- a/src/Surging.Core/Surging.Core.Caching/RedisCache/RedisContext.cs +++ b/src/Surging.Core/Surging.Core.Caching/RedisCache/RedisContext.cs @@ -206,7 +206,7 @@ private void InitSettingHashStorage() { db = dbs[dbs.Length - 1]; } - hash.Add(new ConsistentHashNode() + var node = new ConsistentHashNode() { Type = targetType, Host = endpoints[0], @@ -216,7 +216,8 @@ private void InitSettingHashStorage() MaxSize = this._maxSize, MinSize = this._minSize, Db = db.ToString() - }); + }; + hash.Add(node,string.Format("{0}:{1}",node.Host,node.Port)); dicHash.GetOrAdd(targetType.ToString(), hash); }); } diff --git a/src/Surging.Core/Surging.Core.Caching/Surging.Core.Caching.csproj b/src/Surging.Core/Surging.Core.Caching/Surging.Core.Caching.csproj index 0b43bd1cf..ead9f4dad 100644 --- a/src/Surging.Core/Surging.Core.Caching/Surging.Core.Caching.csproj +++ b/src/Surging.Core/Surging.Core.Caching/Surging.Core.Caching.csproj @@ -2,7 +2,7 @@ netcoreapp2.1 - 0.9.0.2 + 1.0.0.0 fanly surging Micro Service Framework @@ -11,9 +11,9 @@ https://github.com/dotnetcore/surging/blob/master/LICENSE https://github.com/dotnetcore/surging MicroService surging - 0.9.0.2 - 0.9.0.2 - 1.Support for hot-swap engine components + 1.0.0.0 + 1.0.0.0 + 1. fix bug diff --git a/src/Surging.Core/Surging.Core.Codec.MessagePack/Messages/DynamicItem.cs b/src/Surging.Core/Surging.Core.Codec.MessagePack/Messages/DynamicItem.cs index 255841e20..8d4152ea3 100644 --- a/src/Surging.Core/Surging.Core.Codec.MessagePack/Messages/DynamicItem.cs +++ b/src/Surging.Core/Surging.Core.Codec.MessagePack/Messages/DynamicItem.cs @@ -55,7 +55,7 @@ public object Get() if (typeName == UtilityType.JObjectType || typeName == UtilityType.JArrayType) { var content = SerializerUtilitys.Deserialize(Content); - return JsonConvert.DeserializeObject(content,typeName); + return JsonConvert.DeserializeObject(content, typeName); } else { diff --git a/src/Surging.Core/Surging.Core.Codec.MessagePack/Messages/MessagePackRemoteInvokeMessage.cs b/src/Surging.Core/Surging.Core.Codec.MessagePack/Messages/MessagePackRemoteInvokeMessage.cs index e22da7618..c8069698f 100644 --- a/src/Surging.Core/Surging.Core.Codec.MessagePack/Messages/MessagePackRemoteInvokeMessage.cs +++ b/src/Surging.Core/Surging.Core.Codec.MessagePack/Messages/MessagePackRemoteInvokeMessage.cs @@ -1,5 +1,6 @@ using MessagePack; using Surging.Core.CPlatform.Messages; +using System; using System.Collections.Generic; using System.Linq; @@ -34,7 +35,7 @@ public class MessagePackRemoteInvokeMessage { public MessagePackRemoteInvokeMessage(RemoteInvokeMessage message) { - ServiceId = message.ServiceId; + ServiceId = message.ServiceId; DecodeJOject = message.DecodeJOject; ServiceKey = message.ServiceKey; Parameters = message.Parameters?.Select(i => new ParameterItem(i)).ToArray(); @@ -71,7 +72,7 @@ public RemoteInvokeMessage GetRemoteInvokeMessage() Attachments = Attachments?.ToDictionary(i => i.Key, i => i.Value?.Get()), ServiceId = ServiceId, DecodeJOject = DecodeJOject, - ServiceKey = ServiceKey, + ServiceKey = ServiceKey, }; } } diff --git a/src/Surging.Core/Surging.Core.Codec.MessagePack/Surging.Core.Codec.MessagePack.csproj b/src/Surging.Core/Surging.Core.Codec.MessagePack/Surging.Core.Codec.MessagePack.csproj index 1502bacec..3628da1bf 100644 --- a/src/Surging.Core/Surging.Core.Codec.MessagePack/Surging.Core.Codec.MessagePack.csproj +++ b/src/Surging.Core/Surging.Core.Codec.MessagePack/Surging.Core.Codec.MessagePack.csproj @@ -2,7 +2,7 @@ netcoreapp2.1 - 0.9.0.2 + 1.0.0.0 fanly surging Micro Service Framework @@ -11,9 +11,9 @@ https://github.com/dotnetcore/surging/blob/master/LICENSE https://github.com/dotnetcore/surging MicroService surging - 1.Support for hot-swap engine components - 0.9.0.2 - 0.9.0.2 + 1.fix bug + 1.0.0.0 + 1.0.0.0 diff --git a/src/Surging.Core/Surging.Core.Codec.ProtoBuffer/Surging.Core.Codec.ProtoBuffer.csproj b/src/Surging.Core/Surging.Core.Codec.ProtoBuffer/Surging.Core.Codec.ProtoBuffer.csproj index 9f12621cb..e98bd8b79 100644 --- a/src/Surging.Core/Surging.Core.Codec.ProtoBuffer/Surging.Core.Codec.ProtoBuffer.csproj +++ b/src/Surging.Core/Surging.Core.Codec.ProtoBuffer/Surging.Core.Codec.ProtoBuffer.csproj @@ -3,7 +3,7 @@ netcoreapp2.1 surging is a distributed micro service framework that provides high-performance RPC remote service calls, using Zookeeper, Consul as the registration center for surging services, integrating hash, random, polling as a load balancing algorithm, RPC integration using the netty framework, Using asynchronous transmission. Use json.net, protobuf, messagepack for serialization Codec - 0.9.0.2 + 1.0.0.0 fanly surging Micro Service Framework @@ -11,9 +11,9 @@ https://github.com/dotnetcore/surging/blob/master/LICENSE https://github.com/dotnetcore/surging MicroService surging - 1.Support for hot-swap engine components - 0.9.0.2 - 0.9.0.2 + 1. fix bug + 1.0.0.0 + 1.0.0.0 diff --git a/src/Surging.IModuleServices/Surging.IModuleServices.Common/Models/ApiResult.cs b/src/Surging.Core/Surging.Core.Common/ApiResult.cs similarity index 69% rename from src/Surging.IModuleServices/Surging.IModuleServices.Common/Models/ApiResult.cs rename to src/Surging.Core/Surging.Core.Common/ApiResult.cs index f39d7149a..95f2ff913 100644 --- a/src/Surging.IModuleServices/Surging.IModuleServices.Common/Models/ApiResult.cs +++ b/src/Surging.Core/Surging.Core.Common/ApiResult.cs @@ -1,12 +1,14 @@ - - +using System; +using System.Collections.Generic; using System.Runtime.Serialization; +using System.Text; -namespace Surging.IModuleServices.Common.Models +namespace Surging.Core.Common { [DataContract] public class ApiResult { + [DataMember] public int StatusCode { get; set; } diff --git a/src/Surging.Core/Surging.Core.Common/CommonModule.cs b/src/Surging.Core/Surging.Core.Common/CommonModule.cs new file mode 100644 index 000000000..32900cda3 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Common/CommonModule.cs @@ -0,0 +1,11 @@ +using Surging.Core.CPlatform.Module; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.Common +{ + public class CommonModule:SystemModule + { + } +} diff --git a/src/Surging.Core/Surging.Core.Common/Surging.Core.Common.csproj b/src/Surging.Core/Surging.Core.Common/Surging.Core.Common.csproj index 6ba969fcd..7d9adabed 100644 --- a/src/Surging.Core/Surging.Core.Common/Surging.Core.Common.csproj +++ b/src/Surging.Core/Surging.Core.Common/Surging.Core.Common.csproj @@ -4,4 +4,12 @@ netcoreapp2.1 + + + + + + + + \ No newline at end of file diff --git a/src/Surging.Core/Surging.Core.Consul/Configurations/ConfigInfo.cs b/src/Surging.Core/Surging.Core.Consul/Configurations/ConfigInfo.cs index 17e6c1f98..084ef88b7 100644 --- a/src/Surging.Core/Surging.Core.Consul/Configurations/ConfigInfo.cs +++ b/src/Surging.Core/Surging.Core.Consul/Configurations/ConfigInfo.cs @@ -18,8 +18,9 @@ public ConfigInfo(string connectionString,string routePath = "services/serviceRo string subscriberPath = "services/serviceSubscribers/", string commandPath = "services/serviceCommands/", string cachePath="services/serviceCaches/", + string mqttRoutePath = "services/mqttServiceRoutes/", bool reloadOnChange=false, bool enableChildrenMonitor = false) : - this(connectionString, TimeSpan.FromSeconds(20), routePath, subscriberPath,commandPath, cachePath, reloadOnChange, enableChildrenMonitor) + this(connectionString, TimeSpan.FromSeconds(20), routePath, subscriberPath,commandPath, cachePath, mqttRoutePath, reloadOnChange, enableChildrenMonitor) { } @@ -32,11 +33,13 @@ public ConfigInfo(string connectionString,string routePath = "services/serviceRo /// 订阅者配置命令。 /// 路由路径配置路径 /// 缓存中心配置路径 + /// Mqtt路由路径配置路径 public ConfigInfo(string connectionString, TimeSpan sessionTimeout, string routePath = "services/serviceRoutes/", string subscriberPath = "services/serviceSubscribers/", string commandPath = "services/serviceCommands/", string cachePath= "services/serviceCaches/", + string mqttRoutePath= "services/mqttServiceRoutes/", bool reloadOnChange=false, bool enableChildrenMonitor = false) { CachePath = cachePath; @@ -45,6 +48,7 @@ public ConfigInfo(string connectionString, TimeSpan sessionTimeout, RoutePath = routePath; SubscriberPath = subscriberPath; CommandPath = commandPath; + MqttRoutePath = mqttRoutePath; EnableChildrenMonitor = enableChildrenMonitor; if (!string.IsNullOrEmpty(connectionString)) { @@ -94,6 +98,12 @@ public ConfigInfo(string host, int port, TimeSpan sessionTimeout) /// public string RoutePath { get; set; } + + /// + /// Mqtt路由配置路径。 + /// + public string MqttRoutePath { get; set; } + /// /// 缓存中心配置中心 /// diff --git a/src/Surging.Core/Surging.Core.Consul/Configurations/ConsulOption.cs b/src/Surging.Core/Surging.Core.Consul/Configurations/ConsulOption.cs index 37ba88253..f650678d3 100644 --- a/src/Surging.Core/Surging.Core.Consul/Configurations/ConsulOption.cs +++ b/src/Surging.Core/Surging.Core.Consul/Configurations/ConsulOption.cs @@ -18,6 +18,8 @@ public class ConsulOption public string CachePath { get; set; } + public string MqttRoutePath { get; set; } + public string ReloadOnChange { get; set; } public string EnableChildrenMonitor { get; set; } diff --git a/src/Surging.Core/Surging.Core.Consul/ConsulModule.cs b/src/Surging.Core/Surging.Core.Consul/ConsulModule.cs index 206986d6f..aeecd676e 100644 --- a/src/Surging.Core/Surging.Core.Consul/ConsulModule.cs +++ b/src/Surging.Core/Surging.Core.Consul/ConsulModule.cs @@ -7,6 +7,7 @@ using Surging.Core.CPlatform; using Surging.Core.CPlatform.Cache; using Surging.Core.CPlatform.Module; +using Surging.Core.CPlatform.Mqtt; using Surging.Core.CPlatform.Routing; using Surging.Core.CPlatform.Runtime.Client; using Surging.Core.CPlatform.Runtime.Server; @@ -37,7 +38,8 @@ protected override void RegisterBuilder(ContainerBuilderWrapper builder) .UseConsulServiceSubscribeManager(builder, configInfo) .UseConsulCommandManager(builder, configInfo) .UseConsulCacheManager(builder, configInfo) - .UseConsulWatch(builder, configInfo); + .UseConsulWatch(builder, configInfo) + .UseConsulMqttRouteManager(builder,configInfo); } public ConsulModule UseConsulRouteManager(ContainerBuilderWrapper builder, ConfigInfo configInfo) @@ -49,7 +51,8 @@ public ConsulModule UseConsulRouteManager(ContainerBuilderWrapper builder, Confi provider.GetRequiredService>(), provider.GetRequiredService(), provider.GetRequiredService(), - provider.GetRequiredService>())); + provider.GetRequiredService>(), + provider.GetRequiredService())); return this; } @@ -83,7 +86,8 @@ public ConsulModule UseConsulCommandManager(ContainerBuilderWrapper builder, Con provider.GetRequiredService(), provider.GetRequiredService(), provider.GetRequiredService(), - provider.GetRequiredService>()); + provider.GetRequiredService>(), + provider.GetRequiredService()); return result; }); return this; @@ -105,6 +109,20 @@ public ConsulModule UseConsulServiceSubscribeManager(ContainerBuilderWrapper bui return this; } + public ConsulModule UseConsulMqttRouteManager(ContainerBuilderWrapper builder, ConfigInfo configInfo) + { + UseMqttRouteManager(builder, provider => + new ConsulMqttServiceRouteManager( + GetConfigInfo(configInfo), + provider.GetRequiredService>(), + provider.GetRequiredService>(), + provider.GetRequiredService(), + provider.GetRequiredService(), + provider.GetRequiredService>(), + provider.GetRequiredService())); + return this; + } + /// /// 设置使用基于Consul的Watch机制 /// @@ -143,6 +161,12 @@ public ContainerBuilderWrapper UseRouteManager(ContainerBuilderWrapper builder, return builder; } + public ContainerBuilderWrapper UseMqttRouteManager(ContainerBuilderWrapper builder, Func factory) + { + builder.RegisterAdapter(factory).InstancePerLifetimeScope(); + return builder; + } + private ConfigInfo GetConfigInfo(ConfigInfo config) { ConsulOption option = null; @@ -162,6 +186,7 @@ private ConfigInfo GetConfigInfo(ConfigInfo config) option.SubscriberPath ?? config.SubscriberPath, option.CommandPath ?? config.CommandPath, option.CachePath ?? config.CachePath, + option.MqttRoutePath ?? config.MqttRoutePath, option.ReloadOnChange != null ? bool.Parse(option.ReloadOnChange) : config.ReloadOnChange, option.EnableChildrenMonitor != null ? bool.Parse(option.EnableChildrenMonitor) : diff --git a/src/Surging.Core/Surging.Core.Consul/ConsulMqttServiceRouteManager.cs b/src/Surging.Core/Surging.Core.Consul/ConsulMqttServiceRouteManager.cs new file mode 100644 index 000000000..921eca381 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Consul/ConsulMqttServiceRouteManager.cs @@ -0,0 +1,371 @@ +using Consul; +using Microsoft.Extensions.Logging; +using Surging.Core.Consul.Configurations; +using Surging.Core.Consul.Utilitys; +using Surging.Core.Consul.WatcherProvider; +using Surging.Core.Consul.WatcherProvider.Implementation; +using Surging.Core.CPlatform.Address; +using Surging.Core.CPlatform.Mqtt; +using Surging.Core.CPlatform.Mqtt.Implementation; +using Surging.Core.CPlatform.Runtime.Client; +using Surging.Core.CPlatform.Serialization; +using Surging.Core.CPlatform.Transport.Implementation; +using Surging.Core.CPlatform.Utilities; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Surging.Core.Consul +{ + public class ConsulMqttServiceRouteManager : MqttServiceRouteManagerBase, IDisposable + { + private readonly ConsulClient _consul; + private readonly ConfigInfo _configInfo; + private readonly ISerializer _serializer; + private readonly IMqttServiceFactory _mqttServiceFactory; + private readonly ILogger _logger; + private readonly ISerializer _stringSerializer; + private readonly IClientWatchManager _manager; + private MqttServiceRoute[] _routes; + private readonly IServiceHeartbeatManager _serviceHeartbeatManager; + + public ConsulMqttServiceRouteManager(ConfigInfo configInfo, ISerializer serializer, + ISerializer stringSerializer, IClientWatchManager manager, IMqttServiceFactory mqttServiceFactory, + ILogger logger,IServiceHeartbeatManager serviceHeartbeatManager) : base(stringSerializer) + { + _configInfo = configInfo; + _serializer = serializer; + _stringSerializer = stringSerializer; + _mqttServiceFactory = mqttServiceFactory; + _logger = logger; + _manager = manager; + _serviceHeartbeatManager = serviceHeartbeatManager; + _consul = new ConsulClient(config => + { + config.Address = new Uri($"http://{configInfo.Host}:{configInfo.Port}"); + }, null, h => { h.UseProxy = false; h.Proxy = null; }); + EnterRoutes().Wait(); + } + + public override async Task ClearAsync() + { + var queryResult = await _consul.KV.List(_configInfo.MqttRoutePath); + var response = queryResult.Response; + if (response != null) + { + foreach (var result in response) + { + await _consul.KV.DeleteCAS(result); + } + } + } + + public void Dispose() + { + _consul.Dispose(); + } + + /// + /// 获取所有可用的服务路由信息。 + /// + /// 服务路由集合。 + public override async Task> GetRoutesAsync() + { + await EnterRoutes(); + return _routes; + } + + public override async Task SetRoutesAsync(IEnumerable routes) + { + var hostAddr = NetUtils.GetHostAddress(); + var mqttServiceRoutes = await GetRoutes(routes.Select(p => $"{ _configInfo.MqttRoutePath}{p.MqttDescriptor.Topic}")); + foreach (var route in routes) + { + var mqttServiceRoute = mqttServiceRoutes.Where(p => p.MqttDescriptor.Topic == route.MqttDescriptor.Topic).FirstOrDefault(); + + if (mqttServiceRoute != null) + { + var addresses = mqttServiceRoute.MqttEndpoint.Concat( + route.MqttEndpoint.Except(mqttServiceRoute.MqttEndpoint)).ToList(); + + foreach (var address in route.MqttEndpoint) + { + addresses.Remove(addresses.Where(p => p.ToString() == address.ToString()).FirstOrDefault()); + addresses.Add(address); + } + route.MqttEndpoint = addresses; + } + } + + await base.SetRoutesAsync(routes); + } + + public override async Task RemveAddressAsync(IEnumerable endpoint) + { + var routes = await GetRoutesAsync(); + try + { + foreach (var route in routes) + { + route.MqttEndpoint = route.MqttEndpoint.Except(endpoint); + } + } + catch (Exception ex) + { + throw ex; + } + await base.SetRoutesAsync(routes); + } + + public override async Task RemoveByTopicAsync(string topic, IEnumerable endpoint) + { + var routes = await GetRoutesAsync(); + try + { + var route = routes.Where(p => p.MqttDescriptor.Topic == topic).SingleOrDefault(); + if(route !=null) + { + route.MqttEndpoint = route.MqttEndpoint.Except(endpoint); + await base.SetRoutesAsync(new MqttServiceRoute[] { route }); + } + } + catch (Exception ex) + { + throw ex; + } + + } + + protected override async Task SetRoutesAsync(IEnumerable routes) + { + + foreach (var serviceRoute in routes) + { + var nodeData = _serializer.Serialize(serviceRoute); + var keyValuePair = new KVPair($"{_configInfo.MqttRoutePath}{serviceRoute.MqttDescriptor.Topic}") { Value = nodeData }; + await _consul.KV.Put(keyValuePair); + } + } + + #region 私有方法 + + private async Task RemoveExceptRoutesAsync(IEnumerable routes, AddressModel hostAddr) + { + routes = routes.ToArray(); + + if (_routes != null) + { + var oldRouteTopics = _routes.Select(i => i.MqttDescriptor.Topic).ToArray(); + var newRouteTopics = routes.Select(i => i.MqttDescriptor.Topic).ToArray(); + var deletedRouteTopics = oldRouteTopics.Except(newRouteTopics).ToArray(); + foreach (var deletedRouteTopic in deletedRouteTopics) + { + var addresses = _routes.Where(p => p.MqttDescriptor.Topic == deletedRouteTopic).Select(p => p.MqttEndpoint).FirstOrDefault(); + if (addresses.Contains(hostAddr)) + await _consul.KV.Delete($"{_configInfo.MqttRoutePath}{deletedRouteTopic}"); + } + } + } + + private async Task GetRoute(byte[] data) + { + if (_logger.IsEnabled(Microsoft.Extensions.Logging.LogLevel.Debug)) + _logger.LogDebug($"准备转换mqtt服务路由，配置内容：{Encoding.UTF8.GetString(data)}。"); + + if (data == null) + return null; + + var descriptor = _serializer.Deserialize(data); + return (await _mqttServiceFactory.CreateMqttServiceRoutesAsync(new[] { descriptor })).First(); + } + + private async Task GetRouteDatas(string[] routes) + { + List serviceRoutes = new List(); + foreach (var route in routes) + { + var serviceRoute = await GetRouteData(route); + serviceRoutes.Add(serviceRoute); + } + return serviceRoutes.ToArray(); + } + + private async Task GetRouteData(string data) + { + if (data == null) + return null; + + var descriptor = _stringSerializer.Deserialize(data, typeof(MqttServiceDescriptor)) as MqttServiceDescriptor; + return (await _mqttServiceFactory.CreateMqttServiceRoutesAsync(new[] { descriptor })).First(); + } + + private async Task GetRoutes(IEnumerable childrens) + { + + childrens = childrens.ToArray(); + var routes = new List(childrens.Count()); + + foreach (var children in childrens) + { + if (_logger.IsEnabled(Microsoft.Extensions.Logging.LogLevel.Debug)) + _logger.LogDebug($"准备从节点：{children}中获取mqtt路由信息。"); + + var route = await GetRoute(children); + if (route != null) + routes.Add(route); + } + + return routes.ToArray(); + } + + private async Task GetRoute(string path) + { + MqttServiceRoute result = null; + var watcher = new NodeMonitorWatcher(_consul, _manager, path, + async (oldData, newData) => await NodeChange(oldData, newData),tmpPath=> { + var index = tmpPath.LastIndexOf("/"); + return _serviceHeartbeatManager.ExistsWhitelist(tmpPath.Substring(index + 1)); + }); + + var queryResult = await _consul.KV.Keys(path); + if (queryResult.Response != null) + { + var data = (await _consul.GetDataAsync(path)); + if (data != null) + { + watcher.SetCurrentData(data); + result = await GetRoute(data); + } + } + return result; + } + + private async Task EnterRoutes() + { + if (_routes != null && _routes.Length > 0) + return; + Action action = null; + if (_configInfo.EnableChildrenMonitor) + { + var watcher = new ChildrenMonitorWatcher(_consul, _manager, _configInfo.MqttRoutePath, + async (oldChildrens, newChildrens) => await ChildrenChange(oldChildrens, newChildrens), + (result) => ConvertPaths(result).Result); + action = currentData => watcher.SetCurrentData(currentData); + } + if (_consul.KV.Keys(_configInfo.MqttRoutePath).Result.Response?.Count() > 0) + { + var result = await _consul.GetChildrenAsync(_configInfo.MqttRoutePath); + var keys = await _consul.KV.Keys(_configInfo.MqttRoutePath); + var childrens = result; + action?.Invoke(ConvertPaths(childrens).Result.Select(key => $"{_configInfo.MqttRoutePath}{key}").ToArray()); + _routes = await GetRoutes(keys.Response); + } + else + { + if (_logger.IsEnabled(Microsoft.Extensions.Logging.LogLevel.Warning)) + _logger.LogWarning($"无法获取路由信息，因为节点：{_configInfo.MqttRoutePath}，不存在。"); + _routes = new MqttServiceRoute[0]; + } + } + + private static bool DataEquals(IReadOnlyList data1, IReadOnlyList data2) + { + if (data1.Count != data2.Count) + return false; + for (var i = 0; i < data1.Count; i++) + { + var b1 = data1[i]; + var b2 = data2[i]; + if (b1 != b2) + return false; + } + return true; + } + + /// + /// 转化topic集合 + /// + /// 信息数据集合 + /// 返回路径集合 + private async Task ConvertPaths(string[] datas) + { + List topics = new List(); + foreach (var data in datas) + { + var result = await GetRouteData(data); + var topic = result?.MqttDescriptor.Topic; + if (!string.IsNullOrEmpty(topic)) + topics.Add(topic); + } + return topics.ToArray(); + } + + private async Task NodeChange(byte[] oldData, byte[] newData) + { + if (DataEquals(oldData, newData)) + return; + + var newRoute = await GetRoute(newData); + //得到旧的路由。 + var oldRoute = _routes.FirstOrDefault(i => i.MqttDescriptor.Topic == newRoute.MqttDescriptor.Topic); + + lock (_routes) + { + //删除旧路由，并添加上新的路由。 + _routes = + _routes + .Where(i => i.MqttDescriptor.Topic != newRoute.MqttDescriptor.Topic) + .Concat(new[] { newRoute }).ToArray(); + } + + //触发路由变更事件。 + OnChanged(new MqttServiceRouteChangedEventArgs(newRoute, oldRoute)); + } + + private async Task ChildrenChange(string[] oldChildrens, string[] newChildrens) + { + if (_logger.IsEnabled(Microsoft.Extensions.Logging.LogLevel.Debug)) + _logger.LogDebug($"最新的mqtt节点信息：{string.Join(",", newChildrens)}"); + + if (_logger.IsEnabled(Microsoft.Extensions.Logging.LogLevel.Debug)) + _logger.LogDebug($"旧的mqtt节点信息：{string.Join(",", oldChildrens)}"); + + //计算出已被删除的节点。 + var deletedChildrens = oldChildrens.Except(newChildrens).ToArray(); + //计算出新增的节点。 + var createdChildrens = newChildrens.Except(oldChildrens).ToArray(); + + if (_logger.IsEnabled(Microsoft.Extensions.Logging.LogLevel.Debug)) + _logger.LogDebug($"需要被删除的mqtt路由节点：{string.Join(",", deletedChildrens)}"); + if (_logger.IsEnabled(Microsoft.Extensions.Logging.LogLevel.Debug)) + _logger.LogDebug($"需要被添加的mqtt路由节点：{string.Join(",", createdChildrens)}"); + + //获取新增的路由信息。 + var newRoutes = (await GetRoutes(createdChildrens)).ToArray(); + + var routes = _routes.ToArray(); + lock (_routes) + { + _routes = _routes + //删除无效的节点路由。 + .Where(i => !deletedChildrens.Contains($"{_configInfo.MqttRoutePath}{i.MqttDescriptor.Topic}")) + //连接上新的路由。 + .Concat(newRoutes) + .ToArray(); + } + //需要删除的路由集合。 + var deletedRoutes = routes.Where(i => deletedChildrens.Contains($"{_configInfo.MqttRoutePath}{i.MqttDescriptor.Topic}")).ToArray(); + //触发删除事件。 + OnRemoved(deletedRoutes.Select(route => new MqttServiceRouteEventArgs(route)).ToArray()); + + //触发路由被创建事件。 + OnCreated(newRoutes.Select(route => new MqttServiceRouteEventArgs(route)).ToArray()); + + if (_logger.IsEnabled(Microsoft.Extensions.Logging.LogLevel.Information)) + _logger.LogInformation("mqtt路由数据更新成功。"); + } + #endregion + } +} diff --git a/src/Surging.Core/Surging.Core.Consul/ConsulServiceCacheManager.cs b/src/Surging.Core/Surging.Core.Consul/ConsulServiceCacheManager.cs index 94b7165ea..7646c702e 100644 --- a/src/Surging.Core/Surging.Core.Consul/ConsulServiceCacheManager.cs +++ b/src/Surging.Core/Surging.Core.Consul/ConsulServiceCacheManager.cs @@ -134,7 +134,7 @@ private async Task GetCache(string path) { ServiceCache result = null; var watcher = new NodeMonitorWatcher(_consul, _manager, path, - async (oldData, newData) => await NodeChange(oldData, newData)); + async (oldData, newData) => await NodeChange(oldData, newData),null); var queryResult = await _consul.KV.Keys(path); if (queryResult.Response != null) { diff --git a/src/Surging.Core/Surging.Core.Consul/ConsulServiceCommandManager.cs b/src/Surging.Core/Surging.Core.Consul/ConsulServiceCommandManager.cs index e9a9538fe..205abd97b 100644 --- a/src/Surging.Core/Surging.Core.Consul/ConsulServiceCommandManager.cs +++ b/src/Surging.Core/Surging.Core.Consul/ConsulServiceCommandManager.cs @@ -16,6 +16,7 @@ using Surging.Core.Consul.WatcherProvider.Implementation; using Surging.Core.CPlatform.Routing; using Surging.Core.CPlatform.Routing.Implementation; +using Surging.Core.CPlatform.Runtime.Client; namespace Surging.Core.Consul { @@ -29,10 +30,12 @@ public class ConsulServiceCommandManager : ServiceCommandManagerBase, IDisposabl private ServiceCommandDescriptor[] _serviceCommands; private readonly ISerializer _stringSerializer; private readonly IServiceRouteManager _serviceRouteManager; + private readonly IServiceHeartbeatManager _serviceHeartbeatManager; public ConsulServiceCommandManager(ConfigInfo configInfo, ISerializer serializer, ISerializer stringSerializer, IServiceRouteManager serviceRouteManager, IClientWatchManager manager, IServiceEntryManager serviceEntryManager, - ILogger logger, bool enableChildrenMonitor = false) : base(stringSerializer, serviceEntryManager) + ILogger logger, + IServiceHeartbeatManager serviceHeartbeatManager) : base(stringSerializer, serviceEntryManager) { _configInfo = configInfo; _serializer = serializer; @@ -40,6 +43,7 @@ public ConsulServiceCommandManager(ConfigInfo configInfo, ISerializer se _stringSerializer = stringSerializer; _manager = manager; _serviceRouteManager = serviceRouteManager; + _serviceHeartbeatManager = serviceHeartbeatManager; _consul = new ConsulClient(config => { config.Address = new Uri($"http://{configInfo.Host}:{configInfo.Port}"); @@ -190,7 +194,11 @@ private async Task GetServiceCommand(string path) { ServiceCommandDescriptor result = null; var watcher = new NodeMonitorWatcher(_consul, _manager, path, - (oldData, newData) => NodeChange(oldData, newData)); + (oldData, newData) => NodeChange(oldData, newData), tmpPath => + { + var index = tmpPath.LastIndexOf("/"); + return _serviceHeartbeatManager.ExistsWhitelist(tmpPath.Substring(index + 1)); + }); var queryResult = await _consul.KV.Keys(path); if (queryResult.Response != null) { @@ -228,16 +236,21 @@ private async Task GetServiceCommands(IEnumerable action = null; + if (_configInfo.EnableChildrenMonitor) + { + var watcher = new ChildrenMonitorWatcher(_consul, _manager, _configInfo.CommandPath, async (oldChildrens, newChildrens) => await ChildrenChange(oldChildrens, newChildrens), - (result) => ConvertPaths(result)); + (result) => ConvertPaths(result)); + action = currentData => watcher.SetCurrentData(currentData); + } if (_consul.KV.Keys(_configInfo.CommandPath).Result.Response?.Count() > 0) { var result = await _consul.GetChildrenAsync(_configInfo.CommandPath); var keys = await _consul.KV.Keys(_configInfo.CommandPath); - var childrens = result; - watcher.SetCurrentData(ConvertPaths(childrens).Select(key => $"{_configInfo.CommandPath}{key}").ToArray()); + var childrens = result; + action?.Invoke(ConvertPaths(childrens).Select(key => $"{_configInfo.CommandPath}{key}").ToArray()); _serviceCommands = await GetServiceCommands(keys.Response); } else diff --git a/src/Surging.Core/Surging.Core.Consul/ConsulServiceRouteManager.cs b/src/Surging.Core/Surging.Core.Consul/ConsulServiceRouteManager.cs index 9c98def3f..8acc5957a 100644 --- a/src/Surging.Core/Surging.Core.Consul/ConsulServiceRouteManager.cs +++ b/src/Surging.Core/Surging.Core.Consul/ConsulServiceRouteManager.cs @@ -15,6 +15,8 @@ using Surging.Core.Consul.WatcherProvider.Implementation; using Surging.Core.CPlatform.Address; using Surging.Core.CPlatform.Transport.Implementation; +using Surging.Core.CPlatform.Runtime.Client; +using Surging.Core.CPlatform.Utilities; namespace Surging.Core.Consul { @@ -27,12 +29,13 @@ public class ConsulServiceRouteManager : ServiceRouteManagerBase, IDisposable private readonly ILogger _logger; private readonly ISerializer _stringSerializer; private readonly IClientWatchManager _manager; - private ServiceRoute[] _routes; - private readonly bool _enableChildrenMonitor; + private ServiceRoute[] _routes; + private readonly IServiceHeartbeatManager _serviceHeartbeatManager; public ConsulServiceRouteManager(ConfigInfo configInfo, ISerializer serializer, ISerializer stringSerializer, IClientWatchManager manager, IServiceRouteFactory serviceRouteFactory, - ILogger logger) : base(stringSerializer) + ILogger logger, + IServiceHeartbeatManager serviceHeartbeatManager) : base(stringSerializer) { _configInfo = configInfo; _serializer = serializer; @@ -40,6 +43,7 @@ public ConsulServiceRouteManager(ConfigInfo configInfo, ISerializer seri _serviceRouteFactory = serviceRouteFactory; _logger = logger; _manager = manager; + _serviceHeartbeatManager = serviceHeartbeatManager; _consul = new ConsulClient(config => { config.Address = new Uri($"http://{configInfo.Host}:{configInfo.Port}"); @@ -77,7 +81,7 @@ public override async Task> GetRoutesAsync() public override async Task SetRoutesAsync(IEnumerable routes) { - var hostAddr = RpcContext.GetContext().GetAttachment("Host") as AddressModel; + var hostAddr = NetUtils.GetHostAddress(); var serviceRoutes = await GetRoutes(routes.Select(p => $"{ _configInfo.RoutePath}{p.ServiceDescriptor.Id}")); foreach (var route in routes) { @@ -201,9 +205,13 @@ private async Task GetRoutes(IEnumerable childrens) private async Task GetRoute(string path) { - ServiceRoute result = null; + ServiceRoute result = null; var watcher = new NodeMonitorWatcher(_consul, _manager, path, - async (oldData, newData) => await NodeChange(oldData, newData)); + async (oldData, newData) => await NodeChange(oldData, newData),tmpPath=> { + var index = tmpPath.LastIndexOf("/"); + return _serviceHeartbeatManager.ExistsWhitelist(tmpPath.Substring(index + 1)); + }); + var queryResult = await _consul.KV.Keys(path); if (queryResult.Response != null) { @@ -221,15 +229,20 @@ private async Task EnterRoutes() { if (_routes != null && _routes.Length > 0) return; - var watcher = new ChildrenMonitorWatcher(_consul, _manager, _configInfo.RoutePath, + Action action = null ; + if (_configInfo.EnableChildrenMonitor) + { + var watcher = new ChildrenMonitorWatcher(_consul, _manager, _configInfo.RoutePath, async (oldChildrens, newChildrens) => await ChildrenChange(oldChildrens, newChildrens), (result) => ConvertPaths(result).Result); + action = currentData => watcher.SetCurrentData(currentData); + } if (_consul.KV.Keys(_configInfo.RoutePath).Result.Response?.Count() > 0) { var result = await _consul.GetChildrenAsync(_configInfo.RoutePath); var keys = await _consul.KV.Keys(_configInfo.RoutePath); var childrens = result; - watcher.SetCurrentData(ConvertPaths(childrens).Result.Select(key => $"{_configInfo.RoutePath}{key}").ToArray()); + action?.Invoke(ConvertPaths(childrens).Result.Select(key => $"{_configInfo.RoutePath}{key}").ToArray()); _routes = await GetRoutes(keys.Response); } else diff --git a/src/Surging.Core/Surging.Core.Consul/ContainerBuilderExtensions.cs b/src/Surging.Core/Surging.Core.Consul/ContainerBuilderExtensions.cs index 6e586e4f2..598865f84 100644 --- a/src/Surging.Core/Surging.Core.Consul/ContainerBuilderExtensions.cs +++ b/src/Surging.Core/Surging.Core.Consul/ContainerBuilderExtensions.cs @@ -12,6 +12,7 @@ using Surging.Core.CPlatform.Serialization; using System; using Microsoft.Extensions.Configuration; +using Surging.Core.CPlatform.Mqtt; namespace Surging.Core.Consul { @@ -32,7 +33,8 @@ public static IServiceBuilder UseConsulRouteManager(this IServiceBuilder builder provider.GetRequiredService>(), provider.GetRequiredService(), provider.GetRequiredService(), - provider.GetRequiredService>())); + provider.GetRequiredService>(), + provider.GetRequiredService())); } public static IServiceBuilder UseConsulCacheManager(this IServiceBuilder builder, ConfigInfo configInfo) @@ -64,11 +66,25 @@ public static IServiceBuilder UseConsulCommandManager(this IServiceBuilder build provider.GetRequiredService (), provider.GetRequiredService(), provider.GetRequiredService(), - provider.GetRequiredService>()); + provider.GetRequiredService>(), + provider.GetRequiredService()); return result; }); } + public static IServiceBuilder UseConsulMqttRouteManager(this IServiceBuilder builder, ConfigInfo configInfo) + { + return builder.UseMqttRouteManager(provider => + new ConsulMqttServiceRouteManager( + GetConfigInfo(configInfo), + provider.GetRequiredService>(), + provider.GetRequiredService>(), + provider.GetRequiredService(), + provider.GetRequiredService(), + provider.GetRequiredService>(), + provider.GetRequiredService())); + } + public static IServiceBuilder UseConsulServiceSubscribeManager(this IServiceBuilder builder, ConfigInfo configInfo) { return builder.UseSubscribeManager(provider => @@ -104,7 +120,9 @@ public static IServiceBuilder UseConsulManager(this IServiceBuilder builder, Con return builder.UseConsulRouteManager(configInfo) .UseConsulServiceSubscribeManager(configInfo) .UseConsulCommandManager(configInfo) - .UseConsulCacheManager(configInfo).UseConsulWatch(configInfo); + .UseConsulCacheManager(configInfo) + .UseConsulWatch(configInfo) + .UseConsulMqttRouteManager(configInfo); } [Obsolete] @@ -114,7 +132,8 @@ public static IServiceBuilder UseConsulManager(this IServiceBuilder builder) return builder.UseConsulRouteManager(configInfo) .UseConsulServiceSubscribeManager(configInfo) .UseConsulCommandManager(configInfo) - .UseConsulCacheManager(configInfo).UseConsulWatch(configInfo); + .UseConsulCacheManager(configInfo).UseConsulWatch(configInfo) + .UseConsulMqttRouteManager(configInfo); } @@ -137,6 +156,7 @@ private static ConfigInfo GetConfigInfo(ConfigInfo config) option.SubscriberPath ?? config.SubscriberPath, option.CommandPath ?? config.CommandPath, option.CachePath ?? config.CachePath, + option.MqttRoutePath ?? config.MqttRoutePath, option.ReloadOnChange != null ? bool.Parse(option.ReloadOnChange) : config.ReloadOnChange, option.EnableChildrenMonitor != null ? bool.Parse(option.EnableChildrenMonitor) : diff --git a/src/Surging.Core/Surging.Core.Consul/Surging.Core.Consul.csproj b/src/Surging.Core/Surging.Core.Consul/Surging.Core.Consul.csproj index a50871eb4..31a686c30 100644 --- a/src/Surging.Core/Surging.Core.Consul/Surging.Core.Consul.csproj +++ b/src/Surging.Core/Surging.Core.Consul/Surging.Core.Consul.csproj @@ -3,17 +3,17 @@ netcoreapp2.1 fanly - 0.9.0.2 + 1.0.0.0 surging Micro Service Framework Copyright © fanly All Rights Reserved - 1.Support for hot-swap engine components + 1. fix bug surging is a distributed micro service framework that provides high-performance RPC remote service calls, using Zookeeper, Consul as the registration center for surging services, integrating hash, random, polling as a load balancing algorithm, RPC integration using the netty framework, Using asynchronous transmission. Use json.net, protobuf, messagepack for serialization Codec https://github.com/dotnetcore/surging/blob/master/LICENSE https://github.com/dotnetcore/surging MicroService surging - 0.9.0.2 - 0.9.0.2 + 1.0.0.0 + 1.0.0.0 diff --git a/src/Surging.Core/Surging.Core.Consul/WatcherProvider/Implementation/NodeMonitorWatcher.cs b/src/Surging.Core/Surging.Core.Consul/WatcherProvider/Implementation/NodeMonitorWatcher.cs index f4ea43d54..0a40a0e4d 100644 --- a/src/Surging.Core/Surging.Core.Consul/WatcherProvider/Implementation/NodeMonitorWatcher.cs +++ b/src/Surging.Core/Surging.Core.Consul/WatcherProvider/Implementation/NodeMonitorWatcher.cs @@ -14,12 +14,15 @@ class NodeMonitorWatcher : WatcherBase private readonly ConsulClient _client; private readonly string _path; private byte[] _currentData = new byte[0]; - public NodeMonitorWatcher(ConsulClient client, IClientWatchManager manager, string path, Action action) + Func _allowChange; + public NodeMonitorWatcher(ConsulClient client, IClientWatchManager manager, string path, + Action action,Func allowChange) { this._action = action; _manager = manager; _client = client; _path = path; + _allowChange = allowChange; RegisterWatch(); } @@ -32,6 +35,7 @@ public NodeMonitorWatcher SetCurrentData(byte[] currentData) protected override async Task ProcessImpl() { RegisterWatch(this); + if (_allowChange!=null&&! _allowChange(_path)) return; var result = await _client.GetDataAsync(_path); if (result != null) { diff --git a/src/Surging.Core/Surging.Core.DotNetty/Adapter/TransportMessageChannelHandlerAdapter.cs b/src/Surging.Core/Surging.Core.DotNetty/Adapter/TransportMessageChannelHandlerAdapter.cs index 975f790a3..ae6b76c9c 100644 --- a/src/Surging.Core/Surging.Core.DotNetty/Adapter/TransportMessageChannelHandlerAdapter.cs +++ b/src/Surging.Core/Surging.Core.DotNetty/Adapter/TransportMessageChannelHandlerAdapter.cs @@ -1,5 +1,4 @@ using DotNetty.Buffers; -using DotNetty.Codecs.Http; using DotNetty.Common.Utilities; using DotNetty.Transport.Channels; using Surging.Core.CPlatform.Transport.Codec; diff --git a/src/Surging.Core/Surging.Core.DotNetty/DotNettyServerMessageListener.cs b/src/Surging.Core/Surging.Core.DotNetty/DotNettyServerMessageListener.cs index a2fbb1652..6e3d94ef4 100644 --- a/src/Surging.Core/Surging.Core.DotNetty/DotNettyServerMessageListener.cs +++ b/src/Surging.Core/Surging.Core.DotNetty/DotNettyServerMessageListener.cs @@ -3,7 +3,9 @@ using DotNetty.Transport.Bootstrapping; using DotNetty.Transport.Channels; using DotNetty.Transport.Channels.Sockets; +using DotNetty.Transport.Libuv; using Microsoft.Extensions.Logging; +using Surging.Core.CPlatform; using Surging.Core.CPlatform.Messages; using Surging.Core.CPlatform.Transport; using Surging.Core.CPlatform.Transport.Codec; @@ -60,15 +62,28 @@ public async Task StartAsync(EndPoint endPoint) if (_logger.IsEnabled(LogLevel.Debug)) _logger.LogDebug($"准备启动服务主机，监听地址：{endPoint}。"); - var bossGroup = new MultithreadEventLoopGroup(1); - var workerGroup = new MultithreadEventLoopGroup();//Default eventLoopCount is Environment.ProcessorCount * 2 + IEventLoopGroup bossGroup = new MultithreadEventLoopGroup(1); + IEventLoopGroup workerGroup = new MultithreadEventLoopGroup();//Default eventLoopCount is Environment.ProcessorCount * 2 var bootstrap = new ServerBootstrap(); + + if (AppConfig.ServerOptions.Libuv) + { + var dispatcher = new DispatcherEventLoopGroup(); + bossGroup = dispatcher; + workerGroup = new WorkerEventLoopGroup(dispatcher); + bootstrap.Channel(); + } + else + { + bossGroup = new MultithreadEventLoopGroup(1); + workerGroup = new MultithreadEventLoopGroup(); + bootstrap.Channel(); + } bootstrap - .Group(bossGroup, workerGroup) - .Channel() - .Option(ChannelOption.SoBacklog, 100) + .Option(ChannelOption.SoBacklog, AppConfig.ServerOptions.SoBacklog) .ChildOption(ChannelOption.Allocator, PooledByteBufferAllocator.Default) - .ChildHandler(new ActionChannelInitializer(channel => + .Group(bossGroup, workerGroup) + .ChildHandler(new ActionChannelInitializer(channel => { var pipeline = channel.Pipeline; pipeline.AddLast(new LengthFieldPrepender(4)); diff --git a/src/Surging.Core/Surging.Core.DotNetty/DotNettyTransportClientFactory.cs b/src/Surging.Core/Surging.Core.DotNetty/DotNettyTransportClientFactory.cs index 5d711b922..47889fac1 100644 --- a/src/Surging.Core/Surging.Core.DotNetty/DotNettyTransportClientFactory.cs +++ b/src/Surging.Core/Surging.Core.DotNetty/DotNettyTransportClientFactory.cs @@ -4,6 +4,7 @@ using DotNetty.Transport.Bootstrapping; using DotNetty.Transport.Channels; using DotNetty.Transport.Channels.Sockets; +using DotNetty.Transport.Libuv; using Microsoft.Extensions.Logging; using Surging.Core.CPlatform; using Surging.Core.CPlatform.Messages; @@ -120,12 +121,24 @@ public void Dispose() private static Bootstrap GetBootstrap() { + IEventLoopGroup group; + var bootstrap = new Bootstrap(); + if (AppConfig.ServerOptions.Libuv) + { + group = new EventLoopGroup(); + bootstrap.Channel(); + } + else + { + group = new MultithreadEventLoopGroup(); + bootstrap.Channel(); + } bootstrap .Channel() .Option(ChannelOption.TcpNodelay, true) .Option(ChannelOption.Allocator, PooledByteBufferAllocator.Default) - .Group(new MultithreadEventLoopGroup(1)); + .Group(group); return bootstrap; } diff --git a/src/Surging.Core/Surging.Core.DotNetty/Surging.Core.DotNetty.csproj b/src/Surging.Core/Surging.Core.DotNetty/Surging.Core.DotNetty.csproj index 8294ac123..4abc8bf06 100644 --- a/src/Surging.Core/Surging.Core.DotNetty/Surging.Core.DotNetty.csproj +++ b/src/Surging.Core/Surging.Core.DotNetty/Surging.Core.DotNetty.csproj @@ -2,24 +2,24 @@ netcoreapp2.1 - 0.9.0.2 + 1.0.0.0 surging Micro Service Framework fanly Copyright © fanly All Rights Reserved. https://github.com/dotnetcore/surging/blob/master/LICENSE https://github.com/dotnetcore/surging - 1.Support for hot-swap engine components + 1. fix bug MicroService surging surging is a distributed micro service framework that provides high-performance RPC remote service calls, using Zookeeper, Consul as the registration center for surging services, integrating hash, random, polling as a load balancing algorithm, RPC integration using the netty framework, Using asynchronous transmission. Use json.net, protobuf, messagepack for serialization Codec - 0.9.0.2 - 0.9.0.2 + 1.0.0.0 + 1.0.0.0 - - + + diff --git a/src/Surging.Core/Surging.Core.EventBusKafka/Configurations/EventBusConfigurationExtensions.cs b/src/Surging.Core/Surging.Core.EventBusKafka/Configurations/EventBusConfigurationExtensions.cs index f7aa6f972..93dda75d2 100644 --- a/src/Surging.Core/Surging.Core.EventBusKafka/Configurations/EventBusConfigurationExtensions.cs +++ b/src/Surging.Core/Surging.Core.EventBusKafka/Configurations/EventBusConfigurationExtensions.cs @@ -12,20 +12,25 @@ public static class EventBusConfigurationExtensions { public static IConfigurationBuilder AddEventBusFile(this IConfigurationBuilder builder, string path) { - return AddEventBusFile(builder, provider: null, path: path, optional: false, reloadOnChange: false); + return AddEventBusFile(builder, provider: null, path: path, basePath: null, optional: false, reloadOnChange: false); } public static IConfigurationBuilder AddEventBusFile(this IConfigurationBuilder builder, string path, bool optional) { - return AddEventBusFile(builder, provider: null, path: path, optional: optional, reloadOnChange: false); + return AddEventBusFile(builder, provider: null, path: path, basePath: null, optional: optional, reloadOnChange: false); } public static IConfigurationBuilder AddEventBusFile(this IConfigurationBuilder builder, string path, bool optional, bool reloadOnChange) { - return AddEventBusFile(builder, provider: null, path: path, optional: optional, reloadOnChange: reloadOnChange); + return AddEventBusFile(builder, provider: null, path: path, basePath:null, optional: optional, reloadOnChange: reloadOnChange); } - public static IConfigurationBuilder AddEventBusFile(this IConfigurationBuilder builder, IFileProvider provider, string path, bool optional, bool reloadOnChange) + public static IConfigurationBuilder AddEventBusFile(this IConfigurationBuilder builder, string path,string basePath, bool optional, bool reloadOnChange) + { + return AddEventBusFile(builder, provider: null, path: path, basePath:basePath, optional: optional, reloadOnChange: reloadOnChange); + } + + public static IConfigurationBuilder AddEventBusFile(this IConfigurationBuilder builder, IFileProvider provider, string path,string basePath, bool optional, bool reloadOnChange) { Check.NotNull(builder, "builder"); Check.CheckCondition(() => string.IsNullOrEmpty(path), "path"); @@ -34,7 +39,7 @@ public static IConfigurationBuilder AddEventBusFile(this IConfigurationBuilder b { provider = new PhysicalFileProvider(Path.GetDirectoryName(path)); path = Path.GetFileName(path); - } + } var source = new EventBusConfigurationSource { FileProvider = provider, @@ -43,6 +48,8 @@ public static IConfigurationBuilder AddEventBusFile(this IConfigurationBuilder b ReloadOnChange = reloadOnChange }; builder.Add(source); + if (!string.IsNullOrEmpty(basePath)) + builder.SetBasePath(basePath); AppConfig.Configuration = builder.Build(); return builder; } diff --git a/src/Surging.Core/Surging.Core.EventBusKafka/IConsumeConfigurator.cs b/src/Surging.Core/Surging.Core.EventBusKafka/IConsumeConfigurator.cs index f63a3ee24..1bda6e9dc 100644 --- a/src/Surging.Core/Surging.Core.EventBusKafka/IConsumeConfigurator.cs +++ b/src/Surging.Core/Surging.Core.EventBusKafka/IConsumeConfigurator.cs @@ -7,5 +7,7 @@ namespace Surging.Core.EventBusKafka public interface IConsumeConfigurator { void Configure(List consumers); + + void Unconfigure(List consumers); } } diff --git a/src/Surging.Core/Surging.Core.EventBusKafka/Implementation/DefaultConsumeConfigurator.cs b/src/Surging.Core/Surging.Core.EventBusKafka/Implementation/DefaultConsumeConfigurator.cs index 66f75d4b1..93e5e1b8f 100644 --- a/src/Surging.Core/Surging.Core.EventBusKafka/Implementation/DefaultConsumeConfigurator.cs +++ b/src/Surging.Core/Surging.Core.EventBusKafka/Implementation/DefaultConsumeConfigurator.cs @@ -48,6 +48,34 @@ public void Configure(List consumers) } } + public void Unconfigure(List consumers) + { + foreach (var consumer in consumers) + { + if (consumer.GetTypeInfo().IsGenericType) + { + continue; + } + var consumerType = consumer.GetInterfaces() + .Where( + d => + d.GetTypeInfo().IsGenericType && + d.GetGenericTypeDefinition() == typeof(IIntegrationEventHandler<>)) + .Select(d => d.GetGenericArguments().Single()) + .First(); + try + { + var type = consumer; + this.FastInvoke(new[] { consumerType, consumer }, + x => x.RemoveConsumer>()); + } + catch (Exception ex) + { + throw ex; + } + } + } + protected void ConsumerTo() where TConsumer : IIntegrationEventHandler where TEvent : class @@ -55,6 +83,13 @@ protected void ConsumerTo() _eventBus.Subscribe (() => (TConsumer)_container.GetInstances(typeof(TConsumer))); } + + protected void RemoveConsumer() + where TConsumer : IIntegrationEventHandler + where TEvent : class + { + _eventBus.Unsubscribe(); + } } } diff --git a/src/Surging.Core/Surging.Core.EventBusKafka/Implementation/EventBusKafka.cs b/src/Surging.Core/Surging.Core.EventBusKafka/Implementation/EventBusKafka.cs index 4dfdbffc8..cd8f9e9ed 100644 --- a/src/Surging.Core/Surging.Core.EventBusKafka/Implementation/EventBusKafka.cs +++ b/src/Surging.Core/Surging.Core.EventBusKafka/Implementation/EventBusKafka.cs @@ -22,6 +22,8 @@ public class EventBusKafka : IEventBus, IDisposable private readonly IKafkaPersisterConnection _producerConnection; private readonly IKafkaPersisterConnection _consumerConnection; + public event EventHandler OnShutdown; + public EventBusKafka( ILogger logger, IEventBusSubscriptionsManager subsManager, CPlatformContainer serviceProvider) diff --git a/src/Surging.Core/Surging.Core.EventBusKafka/Implementation/KafkaSubscriptionAdapt.cs b/src/Surging.Core/Surging.Core.EventBusKafka/Implementation/KafkaSubscriptionAdapt.cs index 9df027943..2b93e42f8 100644 --- a/src/Surging.Core/Surging.Core.EventBusKafka/Implementation/KafkaSubscriptionAdapt.cs +++ b/src/Surging.Core/Surging.Core.EventBusKafka/Implementation/KafkaSubscriptionAdapt.cs @@ -21,6 +21,11 @@ public void SubscribeAt() _consumeConfigurator.Configure(GetQueueConsumers()); } + public void Unsubscribe() + { + _consumeConfigurator.Unconfigure(GetQueueConsumers()); + } + #region 私有方法 private List GetQueueConsumers() { diff --git a/src/Surging.Core/Surging.Core.EventBusKafka/Surging.Core.EventBusKafka.csproj b/src/Surging.Core/Surging.Core.EventBusKafka/Surging.Core.EventBusKafka.csproj index 2f89eb240..a980ae933 100644 --- a/src/Surging.Core/Surging.Core.EventBusKafka/Surging.Core.EventBusKafka.csproj +++ b/src/Surging.Core/Surging.Core.EventBusKafka/Surging.Core.EventBusKafka.csproj @@ -2,7 +2,7 @@ netcoreapp2.1 - 0.9.0.2 + 1.0.0.0 fanly fanly surging Micro Service Framework @@ -10,10 +10,10 @@ Copyright © fanly All Rights Reserved. https://github.com/dotnetcore/surging/blob/master/LICENSE https://github.com/dotnetcore/surging - 1.Support for hot-swap engine components + 1. fix bug MicroService surging - 0.9.0.2 - 0.9.0.2 + 1.0.0.0 + 1.0.0.0 diff --git a/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Configurations/EventBusConfigurationExtensions.cs b/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Configurations/EventBusConfigurationExtensions.cs index cdf6b2c17..a155a4f42 100644 --- a/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Configurations/EventBusConfigurationExtensions.cs +++ b/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Configurations/EventBusConfigurationExtensions.cs @@ -12,20 +12,25 @@ public static class EventBusConfigurationExtensions { public static IConfigurationBuilder AddEventBusFile(this IConfigurationBuilder builder, string path) { - return AddEventBusFile(builder, provider: null, path: path, optional: false, reloadOnChange: false); + return AddEventBusFile(builder, provider: null, path: path, basePath: null, optional: false, reloadOnChange: false); } public static IConfigurationBuilder AddEventBusFile(this IConfigurationBuilder builder, string path, bool optional) { - return AddEventBusFile(builder, provider: null, path: path, optional: optional, reloadOnChange: false); + return AddEventBusFile(builder, provider: null, path: path, basePath: null, optional: optional, reloadOnChange: false); } public static IConfigurationBuilder AddEventBusFile(this IConfigurationBuilder builder, string path, bool optional, bool reloadOnChange) { - return AddEventBusFile(builder, provider: null, path: path, optional: optional, reloadOnChange: reloadOnChange); + return AddEventBusFile(builder, provider: null, path: path,basePath:null, optional: optional, reloadOnChange: reloadOnChange); } - public static IConfigurationBuilder AddEventBusFile(this IConfigurationBuilder builder, IFileProvider provider, string path, bool optional, bool reloadOnChange) + public static IConfigurationBuilder AddEventBusFile(this IConfigurationBuilder builder, string path,string basePath, bool optional, bool reloadOnChange) + { + return AddEventBusFile(builder, provider: null, path: path, basePath:basePath, optional: optional, reloadOnChange: reloadOnChange); + } + + public static IConfigurationBuilder AddEventBusFile(this IConfigurationBuilder builder, IFileProvider provider, string path,string basePath, bool optional, bool reloadOnChange) { Check.NotNull(builder, "builder"); Check.CheckCondition(() => string.IsNullOrEmpty(path), "path"); @@ -34,6 +39,7 @@ public static IConfigurationBuilder AddEventBusFile(this IConfigurationBuilder b provider = new PhysicalFileProvider(Path.GetDirectoryName(path)); path = Path.GetFileName(path); } + var source = new EventBusConfigurationSource { FileProvider = provider, @@ -42,6 +48,8 @@ public static IConfigurationBuilder AddEventBusFile(this IConfigurationBuilder b ReloadOnChange = reloadOnChange }; builder.Add(source); + if (!string.IsNullOrEmpty(basePath)) + builder.SetBasePath(basePath); AppConfig.Configuration = builder.Build(); return builder; } diff --git a/src/Surging.Core/Surging.Core.EventBusRabbitMQ/EventBusRabbitMQModule.cs b/src/Surging.Core/Surging.Core.EventBusRabbitMQ/EventBusRabbitMQModule.cs index 3a1a7546d..0f07be99d 100644 --- a/src/Surging.Core/Surging.Core.EventBusRabbitMQ/EventBusRabbitMQModule.cs +++ b/src/Surging.Core/Surging.Core.EventBusRabbitMQ/EventBusRabbitMQModule.cs @@ -12,6 +12,7 @@ using System.Collections.Generic; using Microsoft.Extensions.DependencyInjection; using Surging.Core.CPlatform.EventBus.Implementation; +using Surging.Core.CPlatform.Routing; namespace Surging.Core.EventBusRabbitMQ { @@ -20,7 +21,15 @@ public class EventBusRabbitMQModule : EnginePartModule public override void Initialize(CPlatformContainer serviceProvider) { base.Initialize(serviceProvider); - serviceProvider.GetInstances().SubscribeAt(); + new ServiceRouteWatch(serviceProvider.GetInstances(), () => + { + var subscriptionAdapt = serviceProvider.GetInstances(); + serviceProvider.GetInstances().OnShutdown += (sender, args) => + { + subscriptionAdapt.Unsubscribe(); + }; + serviceProvider.GetInstances().SubscribeAt(); + }); } /// diff --git a/src/Surging.Core/Surging.Core.EventBusRabbitMQ/IConsumeConfigurator.cs b/src/Surging.Core/Surging.Core.EventBusRabbitMQ/IConsumeConfigurator.cs index 0c67dcd34..451299996 100644 --- a/src/Surging.Core/Surging.Core.EventBusRabbitMQ/IConsumeConfigurator.cs +++ b/src/Surging.Core/Surging.Core.EventBusRabbitMQ/IConsumeConfigurator.cs @@ -7,5 +7,7 @@ namespace Surging.Core.EventBusRabbitMQ public interface IConsumeConfigurator { void Configure(List consumers); + + void Unconfigure(List consumers); } } diff --git a/src/Surging.Core/Surging.Core.EventBusRabbitMQ/IRabbitMQPersisterConnection.cs b/src/Surging.Core/Surging.Core.EventBusRabbitMQ/IRabbitMQPersisterConnection.cs index 9938e1682..1b32ccf92 100644 --- a/src/Surging.Core/Surging.Core.EventBusRabbitMQ/IRabbitMQPersisterConnection.cs +++ b/src/Surging.Core/Surging.Core.EventBusRabbitMQ/IRabbitMQPersisterConnection.cs @@ -13,5 +13,7 @@ public interface IRabbitMQPersistentConnection bool TryConnect(); IModel CreateModel(); + + event EventHandler OnRabbitConnectionShutdown; } } \ No newline at end of file diff --git a/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Implementation/DefaultConsumeConfigurator.cs b/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Implementation/DefaultConsumeConfigurator.cs index b7575194d..485b3cb4b 100644 --- a/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Implementation/DefaultConsumeConfigurator.cs +++ b/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Implementation/DefaultConsumeConfigurator.cs @@ -46,7 +46,35 @@ public void Configure(List consumers) } } } - + + public void Unconfigure(List consumers) + { + foreach (var consumer in consumers) + { + if (consumer.GetTypeInfo().IsGenericType) + { + continue; + } + var consumerType = consumer.GetInterfaces() + .Where( + d => + d.GetTypeInfo().IsGenericType && + d.GetGenericTypeDefinition() == typeof(IIntegrationEventHandler<>)) + .Select(d => d.GetGenericArguments().Single()) + .First(); + try + { + var type = consumer; + this.FastInvoke(new[] { consumerType, consumer }, + x => x.RemoveConsumer>()); + } + catch (Exception ex) + { + throw ex; + } + } + } + protected void ConsumerTo() where TConsumer : IIntegrationEventHandler where TEvent : class @@ -54,5 +82,12 @@ protected void ConsumerTo() _eventBus.Subscribe (() => (TConsumer)_container.GetInstances(typeof(TConsumer))); } + + protected void RemoveConsumer() + where TConsumer : IIntegrationEventHandler + where TEvent : class + { + _eventBus.Unsubscribe(); + } } } diff --git a/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Implementation/DefaultRabbitMQPersisterConnection.cs b/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Implementation/DefaultRabbitMQPersisterConnection.cs index 2aa010de9..b9eb5c86e 100644 --- a/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Implementation/DefaultRabbitMQPersisterConnection.cs +++ b/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Implementation/DefaultRabbitMQPersisterConnection.cs @@ -4,6 +4,7 @@ using RabbitMQ.Client; using RabbitMQ.Client.Events; using RabbitMQ.Client.Exceptions; +using Surging.Core.CPlatform.EventBus; using System; using System.Collections.Generic; using System.IO; @@ -17,13 +18,15 @@ public class DefaultRabbitMQPersistentConnection { private readonly IConnectionFactory _connectionFactory; private readonly ILogger _logger; - IConnection _connection; bool _disposed; object sync_root = new object(); - public DefaultRabbitMQPersistentConnection(IConnectionFactory connectionFactory, ILogger logger) + public event EventHandler OnRabbitConnectionShutdown; + + public DefaultRabbitMQPersistentConnection(IConnectionFactory connectionFactory, + ILogger logger) { _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory)); _logger = logger ?? throw new ArgumentNullException(nameof(logger)); @@ -81,6 +84,7 @@ public bool TryConnect() { _connection = _connectionFactory .CreateConnection(); + }); if (IsConnected) @@ -124,7 +128,7 @@ void OnConnectionShutdown(object sender, ShutdownEventArgs reason) if (_disposed) return; _logger.LogWarning("A RabbitMQ connection is on shutdown. Trying to re-connect..."); - + OnRabbitConnectionShutdown(sender, reason); TryConnect(); } } diff --git a/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Implementation/EventBusRabbitMQ.cs b/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Implementation/EventBusRabbitMQ.cs index 122e80e3b..20aa268bc 100644 --- a/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Implementation/EventBusRabbitMQ.cs +++ b/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Implementation/EventBusRabbitMQ.cs @@ -36,7 +36,8 @@ public class EventBusRabbitMQ : IEventBus, IDisposable private readonly IDictionary _exchanges; private IDictionary, IModel> _consumerChannels; - private string _queueName; + + public event EventHandler OnShutdown; public EventBusRabbitMQ(IRabbitMQPersistentConnection persistentConnection, ILogger logger, IEventBusSubscriptionsManager subsManager) { @@ -53,7 +54,7 @@ public EventBusRabbitMQ(IRabbitMQPersistentConnection persistentConnection, ILog _persistentConnection = persistentConnection ?? throw new ArgumentNullException(nameof(persistentConnection)); _logger = logger ?? throw new ArgumentNullException(nameof(logger)); _subsManager = subsManager ?? new InMemoryEventBusSubscriptionsManager(); - + _persistentConnection.OnRabbitConnectionShutdown += PersistentConnection_OnEventShutDown; _subsManager.OnEventRemoved += SubsManager_OnEventRemoved; } @@ -69,15 +70,6 @@ private void SubsManager_OnEventRemoved(object sender, ValueTuple(Func handler) foreach (var modeName in _modeNames) { var mode = Enum.Parse(modeName); + string queueName = ""; if (mode != QueueConsumerMode.Normal) queueName = $"{queueConsumerAttr.QueueName}@{mode.ToString()}"; else queueName = queueConsumerAttr.QueueName; - _consumerChannels.Add(new Tuple(queueName, mode), + var key = new Tuple(queueName, mode); + if (_consumerChannels.ContainsKey(key)) + { + _consumerChannels[key].Close(); + _consumerChannels.Remove(key); + } + _consumerChannels.Add(key, CreateConsumerChannel(queueConsumerAttr, eventName, mode)); channel.QueueBind(queue: queueName, exchange: _exchanges[mode], - routingKey: eventName); + routingKey: eventName); } } } - _subsManager.AddSubscription(handler, queueConsumerAttr.QueueName); + if (!_subsManager.HasSubscriptionsForEvent()) + _subsManager.AddSubscription(handler, queueConsumerAttr.QueueName); } public void Unsubscribe() where TH : IIntegrationEventHandler { - _subsManager.RemoveSubscription(); + if (_subsManager.HasSubscriptionsForEvent()) + _subsManager.RemoveSubscription(); } private static Func FindHandlerByType(Type handlerType, IEnumerable> handlers) @@ -244,13 +245,15 @@ private IModel CreateConsumerChannel(string queueName, bool bindConsumer) channel.BasicConsume(queue: queueName, autoAck: false, consumer: consumer); + channel.CallbackException += (sender, ea) => + { + var key = new Tuple(queueName, mode); + _consumerChannels[key].Dispose(); + _consumerChannels[key] = CreateConsumerChannel(queueName, bindConsumer); + }; } - channel.CallbackException += (sender, ea) => - { - var key = new Tuple(queueName, mode); - _consumerChannels[key].Dispose(); - _consumerChannels[key] = CreateConsumerChannel(queueName, bindConsumer); - }; + else + channel.Close(); return channel; } @@ -283,13 +286,17 @@ private IModel CreateRetryConsumerChannel(string queueName, string routeKey, boo channel.BasicConsume(queue: retryQueueName, autoAck: false, consumer: consumer); + channel.CallbackException += (sender, ea) => + { + var key = new Tuple(queueName, mode); + _consumerChannels[key].Dispose(); + _consumerChannels[key] = CreateRetryConsumerChannel(queueName, routeKey, bindConsumer); + }; } - channel.CallbackException += (sender, ea) => - { - var key = new Tuple(queueName, mode); - _consumerChannels[key].Dispose(); - _consumerChannels[key] = CreateRetryConsumerChannel(queueName, routeKey, bindConsumer); - }; + else + channel.Close(); + + return channel; } @@ -318,13 +325,16 @@ private IModel CreateFailConsumerChannel(string queueName, bool bindConsumer) channel.BasicConsume(queue: failQueueName, autoAck: false, consumer: consumer); + channel.CallbackException += (sender, ea) => + { + var key = new Tuple(queueName, mode); + _consumerChannels[key].Dispose(); + _consumerChannels[key] = CreateFailConsumerChannel(queueName, bindConsumer); + }; } - channel.CallbackException += (sender, ea) => - { - var key = new Tuple(queueName, mode); - _consumerChannels[key].Dispose(); - _consumerChannels[key] = CreateFailConsumerChannel(queueName, bindConsumer); - }; + else + channel.Close(); + return channel; } @@ -501,5 +511,10 @@ private FastInvokeHandler GetHandler(string key, MethodInfo method) } return objInstance as FastInvokeHandler; } + + private void PersistentConnection_OnEventShutDown(object sender, ShutdownEventArgs reason) + { + OnShutdown(this,new EventArgs()); + } } } diff --git a/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Implementation/RabbitMqSubscriptionAdapt.cs b/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Implementation/RabbitMqSubscriptionAdapt.cs index 20e2c1d8c..ecb0e415b 100644 --- a/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Implementation/RabbitMqSubscriptionAdapt.cs +++ b/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Implementation/RabbitMqSubscriptionAdapt.cs @@ -24,6 +24,12 @@ public void SubscribeAt() _consumeConfigurator.Configure(GetQueueConsumers()); } + public void Unsubscribe() + { + _consumeConfigurator.Unconfigure(GetQueueConsumers()); + } + + #region 私有方法 private List GetQueueConsumers() { diff --git a/src/Surging.Core/Surging.Core.EventBusRabbitMQ/ServiceHostBuilderExtensions.cs b/src/Surging.Core/Surging.Core.EventBusRabbitMQ/ServiceHostBuilderExtensions.cs index bee3161b7..626ba2ef3 100644 --- a/src/Surging.Core/Surging.Core.EventBusRabbitMQ/ServiceHostBuilderExtensions.cs +++ b/src/Surging.Core/Surging.Core.EventBusRabbitMQ/ServiceHostBuilderExtensions.cs @@ -2,6 +2,9 @@ using Surging.Core.ServiceHosting.Internal; using Autofac; using Surging.Core.CPlatform.Engines; +using Surging.Core.CPlatform; +using Surging.Core.CPlatform.Routing; +using Surging.Core.CPlatform.EventBus.Implementation; namespace Surging.Core.EventBusRabbitMQ { @@ -14,6 +17,15 @@ public static IServiceHostBuilder SubscribeAt(this IServiceHostBuilder hostBuild mapper.Resolve().ServiceEngineStarted.Register(() => { mapper.Resolve().SubscribeAt(); + new ServiceRouteWatch(mapper.Resolve(), () => + { + var subscriptionAdapt = mapper.Resolve(); + mapper.Resolve().OnShutdown += (sender, args) => + { + subscriptionAdapt.Unsubscribe(); + }; + mapper.Resolve().SubscribeAt(); + }); }); }); } diff --git a/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Surging.Core.EventBusRabbitMQ.csproj b/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Surging.Core.EventBusRabbitMQ.csproj index ea2148ed3..900e7cbbb 100644 --- a/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Surging.Core.EventBusRabbitMQ.csproj +++ b/src/Surging.Core/Surging.Core.EventBusRabbitMQ/Surging.Core.EventBusRabbitMQ.csproj @@ -3,7 +3,7 @@ netcoreapp2.1 surging is a distributed micro service framework that provides high-performance RPC remote service calls, using Zookeeper, Consul as the registration center for surging services, integrating hash, random, polling as a load balancing algorithm, RPC integration using the netty framework, Using asynchronous transmission. Use json.net, protobuf, messagepack for serialization Codec - 0.9.0.2 + 1.0.0.0 fanly surging Micro Service Framework @@ -11,9 +11,9 @@ https://github.com/dotnetcore/surging/blob/master/LICENSE https://github.com/dotnetcore/surging MicroService surging - 0.9.0.2 - 0.2.0.2 - 1.Support for hot-swap engine components + 1.0.0.0 + 1.0.0.0 + 1.fix bug diff --git a/src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/ActionContext.cs b/src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/ActionContext.cs new file mode 100644 index 000000000..55eac5bbf --- /dev/null +++ b/src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/ActionContext.cs @@ -0,0 +1,22 @@ +using Microsoft.AspNetCore.Http; +using Surging.Core.CPlatform.Messages; +using Surging.Core.CPlatform.Runtime.Server; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.KestrelHttpServer +{ + public class ActionContext + { + public ActionContext() + { + + } + + public HttpContext HttpContext { get; set; } + + public TransportMessage Message { get; set; } + + } +} diff --git a/src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/ActionResult.cs b/src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/ActionResult.cs index 92d7df281..04e15f703 100644 --- a/src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/ActionResult.cs +++ b/src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/ActionResult.cs @@ -1,10 +1,21 @@ using System; using System.Collections.Generic; using System.Text; +using System.Threading.Tasks; -namespace Surging.Core.KestrelHttpServer.Abstractions +namespace Surging.Core.KestrelHttpServer { - class ActionResult + public abstract class ActionResult: IActionResult { + public virtual Task ExecuteResultAsync(ActionContext context) + { + ExecuteResult(context); + return Task.CompletedTask; + } + + + public virtual void ExecuteResult(ActionContext context) + { + } } } diff --git a/src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/ContentResult.cs b/src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/ContentResult.cs index a2f2b4b6d..db68d73bd 100644 --- a/src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/ContentResult.cs +++ b/src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/ContentResult.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Surging.Core.KestrelHttpServer.Abstractions +namespace Surging.Core.KestrelHttpServer { class ContentResult { diff --git a/src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/FileContentResult.cs b/src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/FileContentResult.cs new file mode 100644 index 000000000..86a04fa6d --- /dev/null +++ b/src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/FileContentResult.cs @@ -0,0 +1,90 @@ +using Microsoft.AspNetCore.Http; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; +using Microsoft.Net.Http.Headers; +using System.IO; +using Surging.Core.KestrelHttpServer.Internal; + +namespace Surging.Core.KestrelHttpServer +{ + public class FileContentResult : FileResult + { + private byte[] _fileContents; + protected const int BufferSize = 64 * 1024; + + public FileContentResult(byte[] fileContents, string contentType) + : this(fileContents, MediaTypeHeaderValue.Parse(contentType)) + { + if (fileContents == null) + { + throw new ArgumentNullException(nameof(fileContents)); + } + } + + public FileContentResult(byte[] fileContents, string contentType,string fileDownloadName) + : this(fileContents, MediaTypeHeaderValue.Parse(contentType)) + { + if (fileContents == null) + { + throw new ArgumentNullException(nameof(fileContents)); + } + if (fileDownloadName == null) + { + throw new ArgumentNullException(nameof(fileDownloadName)); + } + this.FileDownloadName = fileDownloadName; + } + + public FileContentResult(byte[] fileContents, MediaTypeHeaderValue contentType) + : base(contentType?.ToString()) + { + if (fileContents == null) + { + throw new ArgumentNullException(nameof(fileContents)); + } + + FileContents = fileContents; + } + + public byte[] FileContents + { + get => _fileContents; + set + { + if (value == null) + { + throw new ArgumentNullException(nameof(value)); + } + + _fileContents = value; + } + } + + public override async Task ExecuteResultAsync(ActionContext context) + { + if (context == null) + { + throw new ArgumentNullException(nameof(context)); + } + + try + { + var contentDisposition = new ContentDispositionHeaderValue("attachment"); + contentDisposition.SetHttpFileName(FileDownloadName); + var httpResponse = context.HttpContext.Response; + + httpResponse.Headers.Add("Content-Type", this.ContentType); + httpResponse.Headers.Add("Content-Length", FileContents.Length.ToString()); + httpResponse.Headers[HeaderNames.ContentDisposition] = contentDisposition.ToString(); + using (var stream = new MemoryStream(FileContents)) + await StreamCopyOperation.CopyToAsync(stream, httpResponse.Body, count: null, bufferSize: BufferSize, cancel: context.HttpContext.RequestAborted); + } + catch (OperationCanceledException) + { + context.HttpContext.Abort(); + } + } + } +} diff --git a/src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/FileResult.cs b/src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/FileResult.cs index 8b65413d3..0f1a74a5f 100644 --- a/src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/FileResult.cs +++ b/src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/FileResult.cs @@ -4,7 +4,7 @@ namespace Surging.Core.KestrelHttpServer { - public abstract class FileResult + public abstract class FileResult: ActionResult { private string _fileDownloadName; diff --git a/src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/IActionResult.cs b/src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/IActionResult.cs new file mode 100644 index 000000000..ced3e7bbd --- /dev/null +++ b/src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/IActionResult.cs @@ -0,0 +1,13 @@ +using Microsoft.AspNetCore.Http; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Surging.Core.KestrelHttpServer +{ + public interface IActionResult + { + Task ExecuteResultAsync(ActionContext context); + } +} diff --git a/src/Surging.Core/Surging.Core.KestrelHttpServer/Builder/MvcApplicationBuilderExtensions.cs b/src/Surging.Core/Surging.Core.KestrelHttpServer/Builder/MvcApplicationBuilderExtensions.cs deleted file mode 100644 index 33f08ac39..000000000 --- a/src/Surging.Core/Surging.Core.KestrelHttpServer/Builder/MvcApplicationBuilderExtensions.cs +++ /dev/null @@ -1,49 +0,0 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.DependencyInjection; -using Surging.Core.CPlatform.Runtime.Server; -using System; -using System.Collections.Generic; -using System.Text; - -namespace Surging.Core.KestrelHttpServer.Builder -{ - public static class MvcApplicationBuilderExtensions - { - private const string EndpointRoutingRegisteredKey = "__EndpointRoutingMiddlewareRegistered"; - - /// - /// Adds MVC to the request execution pipeline. - /// - /// The . - /// A reference to this instance after the operation has completed. - /// This method only supports attribute routing. To add conventional routes use - /// . - public static IApplicationBuilder UseWebService(this IApplicationBuilder app) - { - if (app == null) - { - throw new ArgumentNullException(nameof(app)); - } - - //app.ApplicationServices.GetRequiredService<> - return app.UseWebService(routes => - { - //routes.get - }); - } - - - /// - /// Adds MVC to the request execution pipeline. - /// - /// The . - /// A callback to configure MVC routes. - /// A reference to this instance after the operation has completed. - public static IApplicationBuilder UseWebService( - this IApplicationBuilder app, - Action configureRoutes) - { - return app; - } - } -} diff --git a/src/Surging.Core/Surging.Core.KestrelHttpServer/HttpMessageListener.cs b/src/Surging.Core/Surging.Core.KestrelHttpServer/HttpMessageListener.cs index f119eff14..d93ab3b5a 100644 --- a/src/Surging.Core/Surging.Core.KestrelHttpServer/HttpMessageListener.cs +++ b/src/Surging.Core/Surging.Core.KestrelHttpServer/HttpMessageListener.cs @@ -38,9 +38,8 @@ public async Task OnReceived(IMessageSender sender, TransportMessage message) public async Task OnReceived(IMessageSender sender, HttpContext context) { - var routePath = GetRoutePath(context.Request.Path.ToString()); - IDictionary parameters = context.Request.Query.ToDictionary(p => p.Key.ToLower(), p => (object)p.Value.ToString()); + IDictionary parameters = context.Request.Query.ToDictionary(p => p.Key,p => (object)p.Value.ToString()); parameters.Remove("servicekey", out object serviceKey); if (context.Request.HasFormContentType) { diff --git a/src/Surging.Core/Surging.Core.KestrelHttpServer/HttpServerMessageSender.cs b/src/Surging.Core/Surging.Core.KestrelHttpServer/HttpServerMessageSender.cs index 24c8ff416..74978dc8e 100644 --- a/src/Surging.Core/Surging.Core.KestrelHttpServer/HttpServerMessageSender.cs +++ b/src/Surging.Core/Surging.Core.KestrelHttpServer/HttpServerMessageSender.cs @@ -18,33 +18,51 @@ public HttpServerMessageSender(ISerializer serializer,HttpContext httpC _serializer = serializer; _context = httpContext; } - + public async Task SendAndFlushAsync(TransportMessage message) { - var text = _serializer.Serialize(message.Content); - var data = Encoding.UTF8.GetBytes(text); - var contentLength = data.Length; - _context.Response.Headers.Add("Content-Type", "application/json"); - _context.Response.Headers.Add("Content-Length", contentLength.ToString()); - await _context.Response.WriteAsync(text); + var httpMessage = message.GetContent>(); + var actionResult= httpMessage.Entity as IActionResult; + if (actionResult == null) + { + var text = _serializer.Serialize(message.Content); + var data = Encoding.UTF8.GetBytes(text); + var contentLength = data.Length; + _context.Response.Headers.Add("Content-Type", "application/json"); + _context.Response.Headers.Add("Content-Length", contentLength.ToString()); + await _context.Response.WriteAsync(text); + } + else + { + await actionResult.ExecuteResultAsync(new ActionContext + { + HttpContext = _context, + Message = message + }); + } } public async Task SendAsync(TransportMessage message) { - var text = _serializer.Serialize(message); - var data = Encoding.UTF8.GetBytes(_serializer.Serialize(text)); - var contentLength = data.Length; - _context.Response.Headers.Add("Content-type", "application/json"); - _context.Response.Headers.Add("Content-Length", contentLength.ToString()); - await _context.Response.WriteAsync(text); - - - } - - private async Task WriteResponse(HttpContext context, TransportMessage message) - { - await context.Response.WriteAsync("hello, world"); - await context.Response.Body.FlushAsync(); + var actionResult = message.GetContent(); + if (actionResult == null) + { + var text = _serializer.Serialize(message); + var data = Encoding.UTF8.GetBytes(_serializer.Serialize(text)); + var contentLength = data.Length; + _context.Response.Headers.Add("Content-type", "application/json"); + _context.Response.Headers.Add("Content-Length", contentLength.ToString()); + await _context.Response.WriteAsync(text); + } + else + { + await actionResult.ExecuteResultAsync(new ActionContext + { + HttpContext = _context, + Message = message + }); + } } + } } diff --git a/src/Surging.Core/Surging.Core.KestrelHttpServer/Internal/StreamCopyOperation.cs b/src/Surging.Core/Surging.Core.KestrelHttpServer/Internal/StreamCopyOperation.cs new file mode 100644 index 000000000..93ae2542a --- /dev/null +++ b/src/Surging.Core/Surging.Core.KestrelHttpServer/Internal/StreamCopyOperation.cs @@ -0,0 +1,239 @@ +using System; +using System.Buffers; +using System.Collections.Generic; +using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.Contracts; +using System.IO; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Surging.Core.KestrelHttpServer.Internal +{ + internal class StreamCopyOperation + { + private const int DefaultBufferSize = 1024 * 16; + + private readonly TaskCompletionSource _tcs; + private readonly Stream _source; + private readonly Stream _destination; + private readonly byte[] _buffer; + private readonly AsyncCallback _readCallback; + private readonly AsyncCallback _writeCallback; + + private long? _bytesRemaining; + private CancellationToken _cancel; + + internal StreamCopyOperation(Stream source, Stream destination, long? bytesRemaining, CancellationToken cancel) + : this(source, destination, bytesRemaining, DefaultBufferSize, cancel) + { + } + + internal StreamCopyOperation(Stream source, Stream destination, long? bytesRemaining, int bufferSize, CancellationToken cancel) + : this(source, destination, bytesRemaining, new byte[bufferSize], cancel) + { + } + + internal StreamCopyOperation(Stream source, Stream destination, long? bytesRemaining, byte[] buffer, CancellationToken cancel) + { + Contract.Assert(source != null); + Contract.Assert(destination != null); + Contract.Assert(!bytesRemaining.HasValue || bytesRemaining.Value >= 0); + Contract.Assert(buffer != null); + + _source = source; + _destination = destination; + _bytesRemaining = bytesRemaining; + _cancel = cancel; + _buffer = buffer; + + _tcs = new TaskCompletionSource(); + _readCallback = new AsyncCallback(ReadCallback); + _writeCallback = new AsyncCallback(WriteCallback); + } + + public static async Task CopyToAsync(Stream source, Stream destination, long? count, int bufferSize, CancellationToken cancel) + { + long? bytesRemaining = count; + + var buffer = ArrayPool.Shared.Rent(bufferSize); + try + { + Debug.Assert(source != null); + Debug.Assert(destination != null); + Debug.Assert(!bytesRemaining.HasValue || bytesRemaining.Value >= 0); + Debug.Assert(buffer != null); + + while (true) + { + if (bytesRemaining.HasValue && bytesRemaining.Value <= 0) + { + return; + } + + cancel.ThrowIfCancellationRequested(); + + int readLength = buffer.Length; + if (bytesRemaining.HasValue) + { + readLength = (int)Math.Min(bytesRemaining.Value, (long)readLength); + } + int read = await source.ReadAsync(buffer, 0, readLength, cancel); + + if (bytesRemaining.HasValue) + { + bytesRemaining -= read; + } + + if (read <= 0) + { + return; + } + + cancel.ThrowIfCancellationRequested(); + + destination.Write(buffer, 0, read); + } + } + finally + { + ArrayPool.Shared.Return(buffer); + } + } + + internal Task Start() + { + ReadNextSegment(); + return _tcs.Task; + } + + private void Complete() + { + _tcs.TrySetResult(null); + } + + private bool CheckCancelled() + { + if (_cancel.IsCancellationRequested) + { + _tcs.TrySetCanceled(); + return true; + } + return false; + } + + private void Fail(Exception ex) + { + _tcs.TrySetException(ex); + } + + [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Redirecting")] + private void ReadNextSegment() + { + // The natural end of the range. + if (_bytesRemaining.HasValue && _bytesRemaining.Value <= 0) + { + Complete(); + return; + } + + if (CheckCancelled()) + { + return; + } + + try + { + int readLength = _buffer.Length; + if (_bytesRemaining.HasValue) + { + readLength = (int)Math.Min(_bytesRemaining.Value, (long)readLength); + } + IAsyncResult async = _source.BeginRead(_buffer, 0, readLength, _readCallback, null); + + if (async.CompletedSynchronously) + { + int read = _source.EndRead(async); + WriteToOutputStream(read); + } + } + catch (Exception ex) + { + Fail(ex); + } + } + + [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Redirecting")] + private void ReadCallback(IAsyncResult async) + { + if (async.CompletedSynchronously) + { + return; + } + + try + { + int read = _source.EndRead(async); + WriteToOutputStream(read); + } + catch (Exception ex) + { + Fail(ex); + } + } + + [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Redirecting")] + private void WriteToOutputStream(int count) + { + if (_bytesRemaining.HasValue) + { + _bytesRemaining -= count; + } + + if (count == 0) + { + Complete(); + return; + } + + if (CheckCancelled()) + { + return; + } + + try + { + IAsyncResult async = _destination.BeginWrite(_buffer, 0, count, _writeCallback, null); + if (async.CompletedSynchronously) + { + _destination.EndWrite(async); + ReadNextSegment(); + } + } + catch (Exception ex) + { + Fail(ex); + } + } + + [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Redirecting")] + private void WriteCallback(IAsyncResult async) + { + if (async.CompletedSynchronously) + { + return; + } + + try + { + _destination.EndWrite(async); + ReadNextSegment(); + } + catch (Exception ex) + { + Fail(ex); + } + } + } +} diff --git a/src/Surging.Core/Surging.Core.KestrelHttpServer/KestrelHttpMessageListener.cs b/src/Surging.Core/Surging.Core.KestrelHttpServer/KestrelHttpMessageListener.cs index d8ae905b3..3e216240d 100644 --- a/src/Surging.Core/Surging.Core.KestrelHttpServer/KestrelHttpMessageListener.cs +++ b/src/Surging.Core/Surging.Core.KestrelHttpServer/KestrelHttpMessageListener.cs @@ -1,22 +1,15 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Surging.Core.CPlatform.Messages; -using Surging.Core.CPlatform.Transport; +using Surging.Core.CPlatform.Serialization; +using Surging.Core.KestrelHttpServer.Internal; +using Surging.Core.Swagger.Builder; +using Surging.Core.Swagger.SwaggerUI; using System; -using System.Collections.Generic; using System.IO; using System.Net; -using System.Text; using System.Threading.Tasks; -using Surging.Core.KestrelHttpServer.Builder; -using Microsoft.AspNetCore.Http; -using Surging.Core.CPlatform.Serialization; -using Microsoft.Extensions.DependencyInjection; -using Surging.Core.Swagger; -using Surging.Core.Swagger.Builder; -using Surging.Core.Swagger.SwaggerUI; -using Surging.Core.KestrelHttpServer.Internal; namespace Surging.Core.KestrelHttpServer { @@ -72,9 +65,7 @@ public void ConfigureServices(IServiceCollection services) { services.AddSwaggerGen(options => { - options.SwaggerDoc(AppConfig.SwaggerOptions.Version, AppConfig.SwaggerOptions); - var xmlPaths = _serviceSchemaProvider.GetSchemaFilesPath(); foreach (var xmlPath in xmlPaths) options.IncludeXmlComments(xmlPath); diff --git a/src/Surging.Core/Surging.Core.KestrelHttpServer/Surging.Core.KestrelHttpServer.csproj b/src/Surging.Core/Surging.Core.KestrelHttpServer/Surging.Core.KestrelHttpServer.csproj index 55872d187..373366e3e 100644 --- a/src/Surging.Core/Surging.Core.KestrelHttpServer/Surging.Core.KestrelHttpServer.csproj +++ b/src/Surging.Core/Surging.Core.KestrelHttpServer/Surging.Core.KestrelHttpServer.csproj @@ -2,6 +2,18 @@ netcoreapp2.1 + 1.0.0.0 + fanly + fanly + surging Micro Service Framework + surging is a distributed micro service framework that provides high-performance RPC remote service calls, using Zookeeper, Consul as the registration center for surging services, integrating hash, random, polling as a load balancing algorithm, RPC integration using the netty framework, Using asynchronous transmission. Use json.net, protobuf, messagepack for serialization Codec + Copyright © fanly All Rights Reserved. + https://github.com/dotnetcore/surging/blob/master/LICENSE + https://github.com/dotnetcore/surging + 1. fix bug + MicroService surging + 1.0.0.0 + 1.0.0.0 @@ -27,8 +39,4 @@ - - - - diff --git a/src/Surging.Core/Surging.Core.Log4net/Surging.Core.Log4net.csproj b/src/Surging.Core/Surging.Core.Log4net/Surging.Core.Log4net.csproj index 3979abb54..70bac9286 100644 --- a/src/Surging.Core/Surging.Core.Log4net/Surging.Core.Log4net.csproj +++ b/src/Surging.Core/Surging.Core.Log4net/Surging.Core.Log4net.csproj @@ -2,7 +2,7 @@ netcoreapp2.1 - 0.9.0.2 + 1.0.0.0 fanly surging Micro Service Framework @@ -11,9 +11,9 @@ https://github.com/dotnetcore/surging/blob/master/LICENSE https://github.com/dotnetcore/surging MicroService surging - 1.Support for hot-swap engine components - 0.9.0.2 - 0.9.0.2 + 1. fix bug + 1.0.0.0 + 1.0.0.0 diff --git a/src/Surging.Core/Surging.Core.NLog/Surging.Core.Nlog.csproj b/src/Surging.Core/Surging.Core.NLog/Surging.Core.Nlog.csproj index 3bef2bb43..19f2a2873 100644 --- a/src/Surging.Core/Surging.Core.NLog/Surging.Core.Nlog.csproj +++ b/src/Surging.Core/Surging.Core.NLog/Surging.Core.Nlog.csproj @@ -2,8 +2,8 @@ netcoreapp2.1 - 1.Support for hot-swap engine components - 0.9.0.2 + 1. fix bug + 1.0.0.0 fanly fanly surging Micro Service Framework @@ -12,8 +12,8 @@ https://github.com/dotnetcore/surging/blob/master/LICENSE https://github.com/dotnetcore/surging MicroService surging - 0.9.0.2 - 0.9.0.2 + 1.0.0.0 + 1.0.0.0 diff --git a/src/Surging.Core/Surging.Core.Protocol.Http/DotNettyHttpServerMessageListener.cs b/src/Surging.Core/Surging.Core.Protocol.Http/DotNettyHttpServerMessageListener.cs index 8fac7557a..033ea8260 100644 --- a/src/Surging.Core/Surging.Core.Protocol.Http/DotNettyHttpServerMessageListener.cs +++ b/src/Surging.Core/Surging.Core.Protocol.Http/DotNettyHttpServerMessageListener.cs @@ -4,6 +4,7 @@ using DotNetty.Transport.Channels; using DotNetty.Transport.Channels.Sockets; using Microsoft.Extensions.Logging; +using Surging.Core.CPlatform; using Surging.Core.CPlatform.Messages; using Surging.Core.CPlatform.Serialization; using Surging.Core.CPlatform.Transport; @@ -70,10 +71,10 @@ public async Task StartAsync(EndPoint endPoint) var bootstrap = new ServerBootstrap(); bootstrap .Group(bossGroup, workerGroup) - .Channel() - .Option(ChannelOption.SoReuseport, true) + .Channel() + .Option(ChannelOption.SoReuseport, true) .ChildOption(ChannelOption.SoReuseaddr, true) - .Option(ChannelOption.SoBacklog, 8192) + .Option(ChannelOption.SoBacklog, AppConfig.ServerOptions.SoBacklog) .ChildHandler(new ActionChannelInitializer(channel => { IChannelPipeline pipeline = channel.Pipeline; @@ -91,13 +92,13 @@ public async Task StartAsync(EndPoint endPoint) { _channel = await bootstrap.BindAsync(endPoint); if (_logger.IsEnabled(LogLevel.Debug)) - _logger.LogDebug($"Http服务主机启动成功，监听地址：{endPoint}。"); + _logger.LogDebug($"Http服务主机启动成功，监听地址：{endPoint}。"); } catch { _logger.LogError($"Http服务主机启动失败，监听地址：{endPoint}。 "); } - + } public void CloseAsync() diff --git a/src/Surging.Core/Surging.Core.Protocol.Http/Surging.Core.Protocol.Http.csproj b/src/Surging.Core/Surging.Core.Protocol.Http/Surging.Core.Protocol.Http.csproj index a4c720558..ae9929b21 100644 --- a/src/Surging.Core/Surging.Core.Protocol.Http/Surging.Core.Protocol.Http.csproj +++ b/src/Surging.Core/Surging.Core.Protocol.Http/Surging.Core.Protocol.Http.csproj @@ -2,7 +2,7 @@ netcoreapp2.1 - 0.9.0.2 + 1.0.0.0 fanly fanly surging Micro Service Framework @@ -11,14 +11,14 @@ https://github.com/dotnetcore/surging/blob/master/LICENSE https://github.com/dotnetcore/surging MicroService surging - 1.Support for hot-swap engine components - 0.9.0.2 - 0.9.0.2 + 1. fix bug + 1.0.0.0 + 1.0.0.0 - - + + diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/DotNettyMqttServerMessageListener.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/DotNettyMqttServerMessageListener.cs new file mode 100644 index 000000000..a3c7bd41d --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/DotNettyMqttServerMessageListener.cs @@ -0,0 +1,195 @@ +using DotNetty.Buffers; +using DotNetty.Codecs.Mqtt; +using DotNetty.Codecs.Mqtt.Packets; +using DotNetty.Common.Utilities; +using DotNetty.Transport.Bootstrapping; +using DotNetty.Transport.Channels; +using DotNetty.Transport.Channels.Sockets; +using DotNetty.Transport.Libuv; +using Microsoft.Extensions.Logging; +using Surging.Core.CPlatform; +using Surging.Core.CPlatform.Messages; +using Surging.Core.CPlatform.Serialization; +using Surging.Core.CPlatform.Transport; +using Surging.Core.CPlatform.Transport.Codec; +using Surging.Core.Protocol.Mqtt.Implementation; +using Surging.Core.Protocol.Mqtt.Internal.Channel; +using Surging.Core.Protocol.Mqtt.Internal.Enums; +using Surging.Core.Protocol.Mqtt.Internal.Runtime; +using Surging.Core.Protocol.Mqtt.Internal.Services; +using System; +using System.Collections.Generic; +using System.Net; +using System.Text; +using System.Threading.Tasks; + +namespace Surging.Core.Protocol.Mqtt +{ + public class DotNettyMqttServerMessageListener : IMessageListener, IDisposable + { + #region Field + + private readonly ILogger _logger; + private IChannel _channel; + private readonly IChannelService _channelService; + private readonly IMqttBehaviorProvider _mqttBehaviorProvider; + #endregion Field + + public event ReceivedDelegate Received; + + #region Constructor + public DotNettyMqttServerMessageListener(ILogger logger, + IChannelService channelService, + IMqttBehaviorProvider mqttBehaviorProvider) + { + _logger = logger; + _channelService = channelService; + _mqttBehaviorProvider = mqttBehaviorProvider; + } + #endregion + + public void Dispose() + { + throw new NotImplementedException(); + } + + public async Task OnReceived(IMessageSender sender, TransportMessage message) + { + if (Received == null) + return; + await Received(sender, message); + } + + public async Task StartAsync(EndPoint endPoint) + { + if (_logger.IsEnabled(LogLevel.Debug)) + _logger.LogDebug($"准备启动Mqtt服务主机，监听地址：{endPoint}。"); + IEventLoopGroup bossGroup = new MultithreadEventLoopGroup(1); + IEventLoopGroup workerGroup = new MultithreadEventLoopGroup();//Default eventLoopCount is Environment.ProcessorCount * 2 + var bootstrap = new ServerBootstrap(); + if (AppConfig.ServerOptions.Libuv) + { + var dispatcher = new DispatcherEventLoopGroup(); + bossGroup = dispatcher; + workerGroup = new WorkerEventLoopGroup(dispatcher); + bootstrap.Channel(); + } + else + { + bossGroup = new MultithreadEventLoopGroup(1); + workerGroup = new MultithreadEventLoopGroup(); + bootstrap.Channel(); + } + bootstrap + .Option(ChannelOption.SoBacklog, AppConfig.ServerOptions.SoBacklog) + .ChildOption(ChannelOption.Allocator, PooledByteBufferAllocator.Default) + .Group(bossGroup, workerGroup) + .Option(ChannelOption.TcpNodelay, true) + .ChildHandler(new ActionChannelInitializer(channel => + { + IChannelPipeline pipeline = channel.Pipeline; + pipeline.AddLast(MqttEncoder.Instance, + new MqttDecoder(true, 256 * 1024), new ServerHandler(async (context, packetType, message) => + { + var mqttHandlerService = new ServerMqttHandlerService(_logger, _channelService, _mqttBehaviorProvider); + await ChannelWrite(context, message, packetType, mqttHandlerService); + }, _logger, _channelService, _mqttBehaviorProvider)); + })); + try + { + _channel = await bootstrap.BindAsync(endPoint); + if (_logger.IsEnabled(LogLevel.Debug)) + _logger.LogDebug($"mqtt服务主机启动成功，监听地址：{endPoint}。"); + } + catch + { + _logger.LogError($"mqtt服务主机启动失败，监听地址：{endPoint}。 "); + } + } + + public async Task ChannelWrite(IChannelHandlerContext context,object message, PacketType packetType, ServerMqttHandlerService mqttHandlerService) + { + switch (packetType) + { + case PacketType.CONNECT: + await mqttHandlerService.Login(context, message as ConnectPacket); + break; + case PacketType.PUBLISH: + await mqttHandlerService.Publish(context, message as PublishPacket); + break; + case PacketType.PUBACK: + await mqttHandlerService.PubAck(context, message as PubAckPacket); + break; + case PacketType.PUBREC: + await mqttHandlerService.PubRec(context, message as PubRecPacket); + break; + case PacketType.PUBREL: + await mqttHandlerService.PubRel(context, message as PubRelPacket); + break; + case PacketType.PUBCOMP: + await mqttHandlerService.PubComp(context, message as PubCompPacket); + break; + case PacketType.SUBSCRIBE: + await mqttHandlerService.Subscribe(context, message as SubscribePacket); + break; + case PacketType.SUBACK: + await mqttHandlerService.SubAck(context, message as SubAckPacket); + break; + case PacketType.UNSUBSCRIBE: + await mqttHandlerService.Unsubscribe(context, message as UnsubscribePacket); + break; + case PacketType.UNSUBACK: + await mqttHandlerService.UnsubAck(context, message as UnsubAckPacket); + break; + case PacketType.PINGREQ: + await mqttHandlerService.PingReq(context, message as PingReqPacket); + break; + case PacketType.PINGRESP: + await mqttHandlerService.PingResp(context, message as PingRespPacket); + break; + case PacketType.DISCONNECT: + await mqttHandlerService.Disconnect(context, message as DisconnectPacket); + break; + } + } + + private class ServerHandler : ChannelHandlerAdapter + { + private readonly Action _readAction; + private readonly ILogger _logger; + + public ServerHandler(Action readAction, + ILogger logger, + IChannelService channelService, + IMqttBehaviorProvider mqttBehaviorProvider) + { + _readAction = readAction; + _logger = logger; + } + + public override void ChannelRead(IChannelHandlerContext context, object message) + { + var buffer = message as Packet; + _readAction(context, buffer.PacketType, buffer); + ReferenceCountUtil.Release(message); + } + + public override void ChannelInactive(IChannelHandlerContext context) + { + this.SetException(new InvalidOperationException("Channel is closed.")); + base.ChannelInactive(context); + } + + public override void ExceptionCaught(IChannelHandlerContext context, Exception exception) { + _readAction.Invoke(context,PacketType.DISCONNECT,DisconnectPacket.Instance); + this.SetException(exception); + } + + void SetException(Exception ex) + { + if (_logger.IsEnabled(LogLevel.Error)) + _logger.LogError($"message:{ex.Message},Source:{ex.Source},Trace:{ex.StackTrace}"); + } + } + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Implementation/DefaultMqttServiceFactory.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Implementation/DefaultMqttServiceFactory.cs new file mode 100644 index 000000000..dd6f68a1b --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Implementation/DefaultMqttServiceFactory.cs @@ -0,0 +1,61 @@ +using Surging.Core.CPlatform.Address; +using Surging.Core.CPlatform.Mqtt; +using Surging.Core.CPlatform.Serialization; +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Surging.Core.Protocol.Mqtt.Implementation +{ + public class DefaultMqttServiceFactory : IMqttServiceFactory + { + + private readonly ISerializer _serializer; + private readonly ConcurrentDictionary _addressModel = + new ConcurrentDictionary(); + + public DefaultMqttServiceFactory(ISerializer serializer) + { + _serializer = serializer; + } + + public Task> CreateMqttServiceRoutesAsync(IEnumerable descriptors) + { + if (descriptors == null) + throw new ArgumentNullException(nameof(descriptors)); + + descriptors = descriptors.ToArray(); + var routes = new List(descriptors.Count()); + + routes.AddRange(descriptors.Select(descriptor => new MqttServiceRoute + { + MqttEndpoint = CreateAddress(descriptor.AddressDescriptors), + MqttDescriptor = descriptor.MqttDescriptor + })); + + return Task.FromResult(routes.AsEnumerable()); + } + + + private IEnumerable CreateAddress(IEnumerable descriptors) + { + if (descriptors == null) + yield break; + + foreach (var descriptor in descriptors) + { + _addressModel.TryGetValue(descriptor.Value, out AddressModel address); + if (address == null) + { + address = (AddressModel)_serializer.Deserialize(descriptor.Value, typeof(IpAddressModel)); + _addressModel.TryAdd(descriptor.Value, address); + } + yield return address; + } + } + + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Implementation/ServerMqttHandlerService.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Implementation/ServerMqttHandlerService.cs new file mode 100644 index 000000000..3e8965b2e --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Implementation/ServerMqttHandlerService.cs @@ -0,0 +1,187 @@ +using System; +using System.Collections.Generic; +using System.Text; +using DotNetty.Codecs.Mqtt.Packets; +using DotNetty.Transport.Channels; +using Microsoft.Extensions.Logging; +using Surging.Core.Protocol.Mqtt.Internal.Enums; +using System.Linq; +using Surging.Core.Protocol.Mqtt.Internal.Services; +using Surging.Core.Protocol.Mqtt.Internal.Runtime; +using System.Threading.Tasks; + +namespace Surging.Core.Protocol.Mqtt.Implementation +{ + public class ServerMqttHandlerService + { + private readonly ILogger _logger; + private readonly IChannelService _channelService; + private readonly IMqttBehaviorProvider _mqttBehaviorProvider; + public ServerMqttHandlerService( + ILogger logger, IChannelService channelService, IMqttBehaviorProvider mqttBehaviorProvider) + { + _logger = logger; + _channelService = channelService; + _mqttBehaviorProvider = mqttBehaviorProvider; + } + + public async Task ConnAck(IChannelHandlerContext context, ConnAckPacket packet) + { + await context.WriteAndFlushAsync(packet); + } + + public async Task Login(IChannelHandlerContext context, ConnectPacket packet) + { + string deviceId = packet.ClientId; + if (string.IsNullOrEmpty(deviceId)) + { + await ConnAck(context, new ConnAckPacket + { + ReturnCode = ConnectReturnCode.RefusedIdentifierRejected + }); + return; + } + var mqttBehavior = _mqttBehaviorProvider.GetMqttBehavior(); + if (mqttBehavior != null) + { + if (packet.HasPassword && packet.HasUsername + && await mqttBehavior.Authorized(packet.Username, packet.Password)) + { + var mqttChannel = _channelService.GetMqttChannel(deviceId); + if (mqttChannel == null || mqttChannel.SessionStatus == SessionStatus.CLOSE) + { + byte[] bytes = null; + if (packet.WillMessage != null) + { + bytes = new byte[packet.WillMessage.ReadableBytes]; + packet.WillMessage.ReadBytes(bytes); + } + await _channelService.Login(context.Channel, deviceId, new ConnectMessage + { + CleanSession = packet.CleanSession, + ClientId = packet.ClientId, + Duplicate = packet.Duplicate, + HasPassword = packet.HasPassword, + HasUsername = packet.HasUsername, + HasWill = packet.HasWill, + KeepAliveInSeconds = packet.KeepAliveInSeconds, + Password = packet.Password, + ProtocolLevel = packet.ProtocolLevel, + ProtocolName = packet.ProtocolName, + Qos = (int)packet.QualityOfService, + RetainRequested = packet.RetainRequested, + Username = packet.Username, + WillMessage = bytes, + WillQualityOfService = (int)packet.WillQualityOfService, + WillRetain = packet.WillRetain, + WillTopic = packet.WillTopicName + + }); + } + } + else + { + await ConnAck(context, new ConnAckPacket + { + ReturnCode = ConnectReturnCode.RefusedBadUsernameOrPassword + }); + } + } + else + { + await ConnAck(context, new ConnAckPacket + { + ReturnCode = ConnectReturnCode.RefusedServerUnavailable + }); + } + } + + public async Task Disconnect(IChannelHandlerContext context, DisconnectPacket packet) + { + await _channelService.Close(await _channelService.GetDeviceId(context.Channel), true); + } + + public async Task PingReq(IChannelHandlerContext context, PingReqPacket packet) + { + var channel = context.Channel; + if (channel.Open && channel.Active && channel.IsWritable) + { + if (_logger.IsEnabled(LogLevel.Information)) + _logger.LogInformation("收到来自：【" + context.Channel.RemoteAddress.ToString() + "】心跳"); + await PingResp(context, PingRespPacket.Instance); + } + } + + public async Task PingResp(IChannelHandlerContext context, PingRespPacket packet) + { + await context.WriteAndFlushAsync(packet); + } + + public async Task PubAck(IChannelHandlerContext context, PubAckPacket packet) + { + int messageId = packet.PacketId; + var mqttChannel = _channelService.GetMqttChannel(await _channelService.GetDeviceId(context.Channel)); + var message = mqttChannel.GetMqttMessage(messageId); + message.ConfirmStatus = ConfirmStatus.COMPLETE; + } + + public async Task PubComp(IChannelHandlerContext context, PubCompPacket packet) + { + int messageId = packet.PacketId; + var mqttChannel = _channelService.GetMqttChannel(await _channelService.GetDeviceId(context.Channel)); + var message = mqttChannel.GetMqttMessage(messageId); + message.ConfirmStatus = ConfirmStatus.COMPLETE; + } + + public async Task Publish(IChannelHandlerContext context, PublishPacket packet) + { + await _channelService.Publish(context.Channel, packet); + } + + public async Task PubRec(IChannelHandlerContext context, PubRecPacket packet) + { + int messageId = packet.PacketId; + var mqttChannel = _channelService.GetMqttChannel(await _channelService.GetDeviceId(context.Channel)); + var message= mqttChannel.GetMqttMessage(messageId); + message.ConfirmStatus=ConfirmStatus.PUBREL; + await _channelService.Pubrec(mqttChannel, messageId); + } + + public async Task PubRel(IChannelHandlerContext context, PubRelPacket packet) + { + int messageId = packet.PacketId; + var mqttChannel = _channelService.GetMqttChannel(await _channelService.GetDeviceId(context.Channel)); + var message = mqttChannel.GetMqttMessage(messageId); + message.ConfirmStatus = ConfirmStatus.PUBREL; + await _channelService.Pubrec(mqttChannel, messageId); + } + + public async Task SubAck(IChannelHandlerContext context, SubAckPacket packet) + { + await context.WriteAndFlushAsync(packet); + } + + public async Task Subscribe(IChannelHandlerContext context, SubscribePacket packet) + { + if (packet != null) + { + var topics = packet.Requests.Select(p => p.TopicFilter).ToArray(); + await _channelService.Suscribe(await _channelService.GetDeviceId(context.Channel), topics); + await SubAck(context, SubAckPacket.InResponseTo(packet, QualityOfService.ExactlyOnce + )); + } + } + + public async Task UnsubAck(IChannelHandlerContext context, UnsubAckPacket packet) + { + await context.WriteAndFlushAsync(packet); + } + + public async Task Unsubscribe(IChannelHandlerContext context, UnsubscribePacket packet) + { + string [] topics = packet.TopicFilters.ToArray(); + await _channelService.UnSubscribe(await _channelService.GetDeviceId(context.Channel), topics); + await UnsubAck(context, UnsubAckPacket.InResponseTo(packet)); + } + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Channel/MqttChannel.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Channel/MqttChannel.cs new file mode 100644 index 000000000..285be70cb --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Channel/MqttChannel.cs @@ -0,0 +1,70 @@ +using DotNetty.Common.Utilities; +using DotNetty.Transport.Channels; +using Surging.Core.Protocol.Mqtt.Internal.Enums; +using Surging.Core.Protocol.Mqtt.Internal.Messages; +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Surging.Core.Protocol.Mqtt.Internal.Channel +{ + public class MqttChannel + { + public IChannel Channel { get; set; } + public string ClientId { get; set; } + public bool IsWill { get; set; } + public SubscribeStatus SubscribeStatus { get; set; } + public List Topics { get; set; } + public SessionStatus SessionStatus { get; set; } + public bool CleanSession { get; set; } + public ConcurrentDictionary Messages { get; set; } + + public void AddMqttMessage(int messageId, SendMqttMessage msg) + { + Messages.AddOrUpdate(messageId, msg,(id,message)=>msg); + } + + public SendMqttMessage GetMqttMessage(int messageId) + { + SendMqttMessage mqttMessage = null; + Messages.TryGetValue(messageId, out mqttMessage); + return mqttMessage; + } + + + public void RemoveMqttMessage(int messageId) + { + SendMqttMessage mqttMessage = null; + Messages.Remove(messageId,out mqttMessage); + } + + public bool IsLogin() + { + bool result = false; + if (Channel != null) + { + AttributeKey _login = AttributeKey.ValueOf("login"); + result= Channel.Active && Channel.HasAttribute(_login); + } + return result; + } + + public async Task Close() + { + if (Channel != null) + await Channel.CloseAsync(); + } + + public bool IsActive() + { + return Channel != null && Channel.Active; + } + + public void AddTopic(params string[] topics) + { + Topics.AddRange(topics); + } + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/Behavior.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/Behavior.cs new file mode 100644 index 000000000..b2b4db088 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/Behavior.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.Protocol.Mqtt.Internal.Enums +{ + public enum Behavior + { + Publish, + Suscribe, + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/ConfirmStatus.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/ConfirmStatus.cs new file mode 100644 index 000000000..9b10580e0 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/ConfirmStatus.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.Protocol.Mqtt.Internal.Enums +{ + public enum ConfirmStatus + { + PUB, + PUBREC, + PUBREL, + COMPLETE, + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/ConnReturnCode.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/ConnReturnCode.cs new file mode 100644 index 000000000..c19ba4255 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/ConnReturnCode.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.Protocol.Mqtt.Internal.Enums +{ + public enum ConnReturnCode + { + Accepted = 0x00, + RefusedUnacceptableProtocolVersion = 0X01, + RefusedIdentifierRejected = 0x02, + RefusedServerUnavailable = 0x03, + RefusedBadUsernameOrPassword = 0x04, + RefusedNotAuthorized = 0x05 + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/MessageType.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/MessageType.cs new file mode 100644 index 000000000..aa6efa2b2 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/MessageType.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.Protocol.Mqtt.Internal.Enums +{ + public enum MessageType + { + CONNECT = 1, + CONNACK = 2, + PUBLISH = 3, + PUBACK = 4, + PUBREC = 5, + PUBREL = 6, + PUBCOMP = 7, + SUBSCRIBE = 8, + SUBACK = 9, + UNSUBSCRIBE = 10, + UNSUBACK = 11, + PINGREQ = 12, + PINGRESP = 13, + DISCONNECT = 14 + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/SessionStatus.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/SessionStatus.cs new file mode 100644 index 000000000..0f8c91c4f --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/SessionStatus.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.Protocol.Mqtt.Internal.Enums +{ + public enum SessionStatus + { + OPEN, + CLOSE + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/SubscribeStatus.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/SubscribeStatus.cs new file mode 100644 index 000000000..5e0486066 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/SubscribeStatus.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.Protocol.Mqtt.Internal.Enums +{ + public enum SubscribeStatus + { + Yes, + No + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/ConnectMessage.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/ConnectMessage.cs new file mode 100644 index 000000000..86f7a5c23 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/ConnectMessage.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.Protocol.Mqtt.Internal.Enums +{ + public class ConnectMessage:MqttMessage + { + public override MessageType MessageType => MessageType.CONNECT; + public string ProtocolName { get; set; } + + public int ProtocolLevel { get; set; } + + public bool CleanSession { get; set; } + + public bool HasWill { get; set; } + + public int WillQualityOfService { get; set; } + + public bool WillRetain { get; set; } + + public bool HasPassword { get; set; } + + public bool HasUsername { get; set; } + + public int KeepAliveInSeconds { get; set; } + + public string Username { get; set; } + + public string Password { get; set; } + + public string ClientId { get; set; } + + public string WillTopic { get; set; } + + public byte[] WillMessage { get; set; } + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/MqttMessage.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/MqttMessage.cs new file mode 100644 index 000000000..e3191dbf0 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/MqttMessage.cs @@ -0,0 +1,22 @@ +using DotNetty.Codecs.Mqtt.Packets; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.Protocol.Mqtt.Internal.Enums +{ + public abstract class MqttMessage + { + public abstract MessageType MessageType { get; } + + public virtual bool Duplicate { get; set; } + public virtual int Qos { get; set; } =(int) QualityOfService.AtMostOnce; + public virtual bool RetainRequested { get; set; } + + + public override string ToString() + { + return $"{this.GetType().Name}[Qos={this.Qos}, Duplicate={this.Duplicate}, Retain={this.RetainRequested}]"; + } + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/MqttWillMessage.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/MqttWillMessage.cs new file mode 100644 index 000000000..4968ef511 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/MqttWillMessage.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.Protocol.Mqtt.Internal.Messages +{ + public class MqttWillMessage + { + public string Topic{ get; set; } + + public string WillMessage { get; set; } + + + public bool WillRetain { get; set; } + + public int Qos { get; set; } + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/RetainMessage.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/RetainMessage.cs new file mode 100644 index 000000000..b937eabd1 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/RetainMessage.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.Protocol.Mqtt.Internal.Messages +{ + public class RetainMessage + { + public byte[] ByteBuf { get; set; } + + public int QoS { get; set; } + public new string ToString => Encoding.UTF8.GetString(ByteBuf); + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/SendMqttMessage.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/SendMqttMessage.cs new file mode 100644 index 000000000..8e82024a1 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/SendMqttMessage.cs @@ -0,0 +1,27 @@ +using DotNetty.Transport.Channels; +using Surging.Core.Protocol.Mqtt.Internal.Enums; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.Protocol.Mqtt.Internal.Messages +{ + public class SendMqttMessage + { + public int MessageId { get; set; } + + public IChannel Channel { get; set; } + + public ConfirmStatus ConfirmStatus { get; set; } + + public long Time { get; set; } + + public byte[] ByteBuf { get; set; } + + public bool Retain { get; set; } + + public int Qos { get; set; } + + public string Topic { get; set; } + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/SessionMessage.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/SessionMessage.cs new file mode 100644 index 000000000..aa5bdd080 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/SessionMessage.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.Protocol.Mqtt.Internal.Messages +{ + public class SessionMessage + { + public byte[] Message { get; set; } + + public int QoS { get; set; } + + public string Topic { get; set; } + + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/IMqttBehaviorProvider.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/IMqttBehaviorProvider.cs new file mode 100644 index 000000000..c95c13539 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/IMqttBehaviorProvider.cs @@ -0,0 +1,12 @@ +using Surging.Core.Protocol.Mqtt.Internal.Services; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.Protocol.Mqtt.Internal.Runtime +{ + public interface IMqttBehaviorProvider + { + MqttBehavior GetMqttBehavior(); + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/IMqttBrokerEntryManger.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/IMqttBrokerEntryManger.cs new file mode 100644 index 000000000..e48fa5d5a --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/IMqttBrokerEntryManger.cs @@ -0,0 +1,17 @@ +using Surging.Core.CPlatform.Address; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Surging.Core.Protocol.Mqtt.Internal.Runtime +{ + public interface IMqttBrokerEntryManger + { + ValueTask> GetMqttBrokerAddress(string topic); + + Task CancellationReg(string topic,AddressModel addressModel); + + Task Register(string topic, AddressModel addressModel); + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/IMqttRemoteInvokeService.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/IMqttRemoteInvokeService.cs new file mode 100644 index 000000000..519a85bd4 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/IMqttRemoteInvokeService.cs @@ -0,0 +1,19 @@ +using Surging.Core.CPlatform.Runtime.Client; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Surging.Core.Protocol.Mqtt.Internal.Runtime +{ + public interface IMqttRemoteInvokeService + { + + Task InvokeAsync(RemoteInvokeContext context); + + Task InvokeAsync(RemoteInvokeContext context, CancellationToken cancellationToken); + + Task InvokeAsync(RemoteInvokeContext context, int requestTimeout); + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/IMqttRomtePublishService.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/IMqttRomtePublishService.cs new file mode 100644 index 000000000..ab7a4182b --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/IMqttRomtePublishService.cs @@ -0,0 +1,19 @@ +using Surging.Core.CPlatform.Ioc; +using Surging.Core.CPlatform.Runtime.Client.Address.Resolvers.Implementation.Selectors.Implementation; +using Surging.Core.CPlatform.Runtime.Server.Implementation.ServiceDiscovery.Attributes; +using Surging.Core.CPlatform.Support.Attributes; +using Surging.Core.Protocol.Mqtt.Internal.Messages; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Surging.Core.Protocol.Mqtt.Internal.Runtime +{ + [ServiceBundle("Device")] + public interface IMqttRomtePublishService : IServiceKey + { + [Command(ShuntStrategy = AddressSelectorMode.HashAlgorithm)] + Task Publish(string deviceId, MqttWillMessage message); + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Implementation/DefaultMqttBehaviorProvider.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Implementation/DefaultMqttBehaviorProvider.cs new file mode 100644 index 000000000..33ab3dba6 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Implementation/DefaultMqttBehaviorProvider.cs @@ -0,0 +1,38 @@ +using Surging.Core.CPlatform; +using Surging.Core.CPlatform.Runtime.Server; +using Surging.Core.Protocol.Mqtt.Internal.Services; +using System.Linq; + +namespace Surging.Core.Protocol.Mqtt.Internal.Runtime.Implementation +{ + public class DefaultMqttBehaviorProvider : IMqttBehaviorProvider + { + #region Field + + private readonly IServiceEntryProvider _serviceEntryProvider; + private readonly CPlatformContainer _serviceProvider; + private MqttBehavior _mqttBehavior; + + #endregion Field + + #region Constructor + + public DefaultMqttBehaviorProvider(IServiceEntryProvider serviceEntryProvider, CPlatformContainer serviceProvider) + { + _serviceEntryProvider = serviceEntryProvider; + _serviceProvider = serviceProvider; + } + + #endregion Constructor + + public MqttBehavior GetMqttBehavior() + { + if (_mqttBehavior == null) + { + _mqttBehavior = _serviceEntryProvider.GetTypes() + .Select(type=> _serviceProvider.GetInstances(type) as MqttBehavior ).Where(p=>p!=null).FirstOrDefault(); + } + return _mqttBehavior; + } + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Implementation/DefaultMqttBrokerEntryManager.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Implementation/DefaultMqttBrokerEntryManager.cs new file mode 100644 index 000000000..a5186d5d4 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Implementation/DefaultMqttBrokerEntryManager.cs @@ -0,0 +1,83 @@ +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; +using Surging.Core.CPlatform.Address; +using Surging.Core.CPlatform.Mqtt; +using Surging.Core.CPlatform.Mqtt.Implementation; +using Surging.Core.CPlatform.Runtime.Client.HealthChecks; +using Surging.Core.CPlatform.Runtime.Client.HealthChecks.Implementation; + +namespace Surging.Core.Protocol.Mqtt.Internal.Runtime.Implementation +{ + public class DefaultMqttBrokerEntryManager : IMqttBrokerEntryManger + { + private readonly IMqttServiceRouteManager _mqttServiceRouteManager; + private readonly ILogger _logger; + private readonly ConcurrentDictionary> _brokerEntries = + new ConcurrentDictionary>(); + + public DefaultMqttBrokerEntryManager(IMqttServiceRouteManager mqttServiceRouteManager, + ILogger logger, IHealthCheckService healthCheckService) + { + _mqttServiceRouteManager = mqttServiceRouteManager; + _logger = logger; + _mqttServiceRouteManager.Changed += MqttRouteManager_Removed; + _mqttServiceRouteManager.Removed += MqttRouteManager_Removed; + healthCheckService.Removed += MqttRouteManager_Removed; + } + + public async Task CancellationReg(string topic, AddressModel addressModel) + { + await _mqttServiceRouteManager.RemoveByTopicAsync(topic, new AddressModel[] { addressModel }); + } + + public async ValueTask> GetMqttBrokerAddress(string topic) + { + _brokerEntries.TryGetValue(topic, out IEnumerable addresses); + if (addresses==null || !addresses.Any()) + { + var routes = await _mqttServiceRouteManager.GetRoutesAsync(); + var route= routes.Where(p => p.MqttDescriptor.Topic == topic).SingleOrDefault(); + if (route != null) + { + _brokerEntries.TryAdd(topic, route.MqttEndpoint); + addresses = route.MqttEndpoint; + } + } + return addresses; + } + + public async Task Register(string topic, AddressModel addressModel) + { + await _mqttServiceRouteManager.SetRoutesAsync(new MqttServiceRoute[] { new MqttServiceRoute { + MqttDescriptor=new MqttDescriptor{ + Topic=topic + }, + MqttEndpoint=new AddressModel[]{ + addressModel + } + } + }); + } + + private static string GetCacheKey(MqttDescriptor descriptor) + { + return descriptor.Topic; + } + + private void MqttRouteManager_Removed(object sender, MqttServiceRouteEventArgs e) + { + var key = GetCacheKey(e.Route.MqttDescriptor); + _brokerEntries.TryRemove(key, out IEnumerable value); + } + + private void MqttRouteManager_Removed(object sender, HealthCheckEventArgs e) + { + _mqttServiceRouteManager.RemveAddressAsync(new AddressModel[] { e.Address }); + } + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Implementation/MqttRemoteInvokeService.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Implementation/MqttRemoteInvokeService.cs new file mode 100644 index 000000000..dba4f464f --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Implementation/MqttRemoteInvokeService.cs @@ -0,0 +1,111 @@ +using Microsoft.Extensions.Logging; +using Surging.Core.CPlatform.Address; +using Surging.Core.CPlatform.Exceptions; +using Surging.Core.CPlatform.Messages; +using Surging.Core.CPlatform.Runtime.Client; +using Surging.Core.CPlatform.Runtime.Client.Address.Resolvers; +using Surging.Core.CPlatform.Runtime.Client.HealthChecks; +using Surging.Core.CPlatform.Transport; +using Surging.Core.CPlatform.Utilities; +using System; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; + +namespace Surging.Core.Protocol.Mqtt.Internal.Runtime.Implementation +{ + public class MqttRemoteInvokeService:IMqttRemoteInvokeService + { + private readonly ITransportClientFactory _transportClientFactory; + private readonly ILogger _logger; + private readonly IHealthCheckService _healthCheckService; + private readonly IMqttBrokerEntryManger _mqttBrokerEntryManger; + + public MqttRemoteInvokeService( ITransportClientFactory transportClientFactory, + ILogger logger, + IHealthCheckService healthCheckService, + IMqttBrokerEntryManger mqttBrokerEntryManger) + { + _transportClientFactory = transportClientFactory; + _logger = logger; + _healthCheckService = healthCheckService; + _mqttBrokerEntryManger = mqttBrokerEntryManger; + } + + #region Implementation of IRemoteInvokeService + + public async Task InvokeAsync(RemoteInvokeContext context) + { + await InvokeAsync(context, Task.Factory.CancellationToken); + } + + public async Task InvokeAsync(RemoteInvokeContext context, CancellationToken cancellationToken) + { + var mqttContext = context as MqttRemoteInvokeContext; + if (mqttContext != null) + { + var invokeMessage = context.InvokeMessage; + var host= NetUtils.GetHostAddress(); + var addresses = await _mqttBrokerEntryManger.GetMqttBrokerAddress(mqttContext.topic); + addresses = addresses.Except(new AddressModel[] { host }); + foreach (var address in addresses) + { + try + { + var endPoint = address.CreateEndPoint(); + if (_logger.IsEnabled(LogLevel.Debug)) + _logger.LogDebug($"使用地址：'{endPoint}'进行调用。"); + var client = _transportClientFactory.CreateClient(endPoint); + await client.SendAsync(invokeMessage).WithCancellation(cancellationToken); + } + catch (CommunicationException) + { + await _healthCheckService.MarkFailure(address); + } + catch (Exception exception) + { + _logger.LogError(exception, $"发起请求中发生了错误，服务Id：{invokeMessage.ServiceId}。"); + } + } + } + } + + public async Task InvokeAsync(RemoteInvokeContext context, int requestTimeout) + { + var mqttContext = context as MqttRemoteInvokeContext; + if (mqttContext != null) + { + var invokeMessage = context.InvokeMessage; + var host = NetUtils.GetHostAddress(); + var addresses = await _mqttBrokerEntryManger.GetMqttBrokerAddress(mqttContext.topic); + if (addresses != null) + { + addresses = addresses.Except(new AddressModel[] { host }); + foreach (var address in addresses) + { + try + { + var endPoint = address.CreateEndPoint(); + if (_logger.IsEnabled(LogLevel.Debug)) + _logger.LogDebug($"使用地址：'{endPoint}'进行调用。"); + var client = _transportClientFactory.CreateClient(endPoint); + await client.SendAsync(invokeMessage).WithCancellation(requestTimeout); + } + catch (CommunicationException) + { + await _healthCheckService.MarkFailure(address); + } + catch (Exception exception) + { + _logger.LogError(exception, $"发起mqtt请求中发生了错误，服务Id：{invokeMessage.ServiceId}。"); + + } + } + } + } + } + + + #endregion Implementation of IRemoteInvokeService + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Implementation/MqttRomtePublishService.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Implementation/MqttRomtePublishService.cs new file mode 100644 index 000000000..eb01b8401 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Implementation/MqttRomtePublishService.cs @@ -0,0 +1,19 @@ +using Surging.Core.CPlatform.Ioc; +using Surging.Core.CPlatform.Utilities; +using Surging.Core.Protocol.Mqtt.Internal.Messages; +using Surging.Core.Protocol.Mqtt.Internal.Services; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Surging.Core.Protocol.Mqtt.Internal.Runtime.Implementation +{ + public class MqttRomtePublishService : ServiceBase, IMqttRomtePublishService + { + public async Task Publish(string deviceId, MqttWillMessage message) + { + await ServiceLocator.GetService().Publish(deviceId, message); + } + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/MqttRemoteInvokeContext.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/MqttRemoteInvokeContext.cs new file mode 100644 index 000000000..843652bc0 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/MqttRemoteInvokeContext.cs @@ -0,0 +1,13 @@ +using Surging.Core.CPlatform.Runtime.Client; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.Protocol.Mqtt.Internal.Runtime +{ + public class MqttRemoteInvokeContext: RemoteInvokeContext + { + public string topic { get; set; } + } +} + \ No newline at end of file diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Runnable.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Runnable.cs new file mode 100644 index 000000000..51c731314 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Runnable.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; + +namespace Surging.Core.Protocol.Mqtt.Internal.Runtime +{ + public abstract class Runnable + { + private volatile Thread _runnableThread; + private readonly Timer _timer; + public Runnable() + { + var timeSpan = TimeSpan.FromSeconds(3); + _timer = new Timer(s => + { + Run(); + }, null, timeSpan, timeSpan); + } + + public abstract void Run(); + + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/SacnScheduled.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/SacnScheduled.cs new file mode 100644 index 000000000..3a3deeb18 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/SacnScheduled.cs @@ -0,0 +1,73 @@ +using DotNetty.Buffers; +using DotNetty.Codecs.Mqtt.Packets; +using DotNetty.Transport.Channels; +using Surging.Core.Protocol.Mqtt.Internal.Enums; +using Surging.Core.Protocol.Mqtt.Internal.Messages; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.Protocol.Mqtt.Internal.Runtime +{ + public class SacnScheduled: ScanRunnable + { + + public SacnScheduled() + { + } + + private bool CheckTime(long time) + { + return DateTime.Now.Millisecond - time >= 10 * 1000; + } + + public override void Execute(SendMqttMessage poll) + { + if (CheckTime(poll.Time) && poll.Channel.Active) + { + poll.Time=DateTime.Now.Ticks / 10000; + switch (poll.ConfirmStatus) + { + case ConfirmStatus.PUB: + PubMessage(poll.Channel, poll); + break; + case ConfirmStatus.PUBREL: + PubRelAck(poll); + break; + case ConfirmStatus.PUBREC: + PubRecAck(poll); + break; + } + } + } + + private void PubMessage(IChannel channel, SendMqttMessage mqttMessage) + { + PublishPacket mqttPublishMessage = new PublishPacket((QualityOfService)mqttMessage.Qos, true, mqttMessage.Retain) + { + TopicName = mqttMessage.Topic, + PacketId = mqttMessage.MessageId, + Payload = Unpooled.WrappedBuffer(mqttMessage.ByteBuf) + }; + channel.WriteAndFlushAsync(mqttPublishMessage); + } + + protected void PubRelAck( SendMqttMessage mqttMessage) + { + PubRelPacket mqttPubAckMessage = new PubRelPacket() + { + PacketId = mqttMessage.MessageId, + }; + mqttMessage.Channel.WriteAndFlushAsync(mqttPubAckMessage); + } + + private void PubRecAck(SendMqttMessage mqttMessage) + { + PubRecPacket mqttPubAckMessage = new PubRecPacket() + { + PacketId = mqttMessage.MessageId, + }; + mqttMessage.Channel.WriteAndFlushAsync(mqttPubAckMessage); + } + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/ScanRunnable.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/ScanRunnable.cs new file mode 100644 index 000000000..d9378c4bf --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/ScanRunnable.cs @@ -0,0 +1,41 @@ +using Surging.Core.Protocol.Mqtt.Internal.Enums; +using Surging.Core.Protocol.Mqtt.Internal.Messages; +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; + +namespace Surging.Core.Protocol.Mqtt.Internal.Runtime +{ + public abstract class ScanRunnable : Runnable + { + private ConcurrentQueue _queue = new ConcurrentQueue(); + public void Enqueue(SendMqttMessage t) + { + _queue.Enqueue(t); + } + + public void Enqueue(List ts) + { + ts.ForEach(message=> _queue.Enqueue(message)); + } + + public override void Run() + { + if (!_queue.IsEmpty) + { + List list = new List(); + for (; (_queue.TryDequeue(out SendMqttMessage poll));) + { + if (poll.ConfirmStatus != ConfirmStatus.COMPLETE) + { + list.Add(poll); + Execute(poll); + } + break; + } + } + } + + public abstract void Execute(SendMqttMessage poll); + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/AbstractChannelService.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/AbstractChannelService.cs new file mode 100644 index 000000000..7f67ae16a --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/AbstractChannelService.cs @@ -0,0 +1,195 @@ +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Text; +using DotNetty.Common.Utilities; +using DotNetty.Transport.Channels; +using Surging.Core.Protocol.Mqtt.Internal.Channel; +using Surging.Core.Protocol.Mqtt.Internal.Enums; +using Surging.Core.Protocol.Mqtt.Internal.Messages; +using System.Collections; +using System.Linq; +using DotNetty.Codecs.Mqtt.Packets; +using System.Threading.Tasks; +using Surging.Core.Protocol.Mqtt.Internal.Runtime; +using System.Net; +using Surging.Core.CPlatform.Address; +using Surging.Core.CPlatform; +using Surging.Core.CPlatform.Utilities; +using Surging.Core.CPlatform.Messages; +using Surging.Core.CPlatform.Ids; + +namespace Surging.Core.Protocol.Mqtt.Internal.Services +{ + public abstract class AbstractChannelService : IChannelService + { + private readonly AttributeKey _loginAttrKey = AttributeKey.ValueOf("login"); + private readonly AttributeKey _deviceIdAttrKey = AttributeKey.ValueOf("deviceId"); + private readonly IMessagePushService _messagePushService; + private readonly ConcurrentDictionary> _topics = new ConcurrentDictionary>(); + private readonly ConcurrentDictionary _mqttChannels = new ConcurrentDictionary(); + protected readonly ConcurrentDictionary> _retain = new ConcurrentDictionary>(); + private readonly IMqttBrokerEntryManger _mqttBrokerEntryManger; + private readonly IMqttRemoteInvokeService _mqttRemoteInvokeService; + private readonly string _publishServiceId; + + public AbstractChannelService(IMessagePushService messagePushService, + IMqttBrokerEntryManger mqttBrokerEntryManger, + IMqttRemoteInvokeService mqttRemoteInvokeService, + IServiceIdGenerator serviceIdGenerator + ) + { + _messagePushService = messagePushService; + _mqttBrokerEntryManger = mqttBrokerEntryManger; + _mqttRemoteInvokeService = mqttRemoteInvokeService; + _publishServiceId= serviceIdGenerator.GenerateServiceId(typeof(IMqttRomtePublishService).GetMethod("Publish")); + } + + public ConcurrentDictionary MqttChannels { get { + return _mqttChannels; + } + } + + public AttributeKey DeviceIdAttrKey + { + get + { + return _deviceIdAttrKey; + } + } + + public AttributeKey LoginAttrKey + { + get + { + return _loginAttrKey; + } + } + + public ConcurrentDictionary> Topics + { + get + { + return _topics; + } + } + + public ConcurrentDictionary> Retain + { + get + { + return _retain; + } + } + + public abstract Task Close(string deviceId, bool isDisconnect); + + public abstract bool Connect(string deviceId, MqttChannel build); + + public bool RemoveChannel(string topic, MqttChannel mqttChannel) + { + var result = false; + if (!string.IsNullOrEmpty(topic) && mqttChannel != null) + { + _topics.TryGetValue(topic, out IEnumerable mqttChannels); + var channels = mqttChannels == null ? new List() : mqttChannels.ToList(); + channels.Remove(mqttChannel); + _topics.AddOrUpdate(topic, channels, (key, value) => channels); + result = true; + } + return result; + } + + public async ValueTask GetDeviceId(IChannel channel) + { + string deviceId = null; + if (channel != null) + { + AttributeKey deviceIdAttrKey = AttributeKey.ValueOf("deviceId"); + deviceId = channel.GetAttribute(deviceIdAttrKey).Get(); + } + return await new ValueTask(deviceId); + } + + public bool AddChannel(string topic, MqttChannel mqttChannel) + { + var result = false; + if (!string.IsNullOrEmpty(topic) && mqttChannel != null) + { + _topics.TryGetValue(topic, out IEnumerable mqttChannels); + var channels = mqttChannels==null ? new List(): mqttChannels.ToList(); + channels.Add(mqttChannel); + _topics.AddOrUpdate(topic, channels, (key, value) => channels); + result = true; + } + return result; + } + + public MqttChannel GetMqttChannel(string deviceId) + { + MqttChannel channel = null; + if (!string.IsNullOrEmpty(deviceId)) + { + _mqttChannels.TryGetValue(deviceId, out channel); + } + return channel; + } + + protected async Task RegisterMqttBroker(string topic) + { + var addresses = await _mqttBrokerEntryManger.GetMqttBrokerAddress(topic); + var host = NetUtils.GetHostAddress(); + if (addresses==null || !addresses.Any(p => p.ToString() == host.ToString())) + await _mqttBrokerEntryManger.Register(topic, host); + } + + protected async Task BrokerCancellationReg(string topic) + { + if (Topics.Count == 0) + await _mqttBrokerEntryManger.CancellationReg(topic, NetUtils.GetHostAddress()); + } + + protected async Task RemotePublishMessage(string deviceId, MqttWillMessage willMessage) + { + await _mqttRemoteInvokeService.InvokeAsync(new MqttRemoteInvokeContext + { + topic = willMessage.Topic, + InvokeMessage = new RemoteInvokeMessage + { + ServiceId = _publishServiceId, + Parameters = new Dictionary() { + {"deviceId",deviceId}, + { "willMessage",willMessage} + } + }, + + }, AppConfig.ServerOptions.ExecutionTimeoutInMilliseconds); + } + + public abstract Task Login(IChannel channel, string deviceId, ConnectMessage mqttConnectMessage); + + public abstract Task Publish(IChannel channel, PublishPacket mqttPublishMessage); + + public abstract Task Pubrec(MqttChannel channel, int messageId); + + public abstract Task Pubrel(IChannel channel, int messageId); + + public abstract Task SendWillMsg(MqttWillMessage willMeaasge); + public abstract Task Suscribe(string deviceId, params string[] topics); + + public abstract Task UnSubscribe(string deviceId, params string[] topics); + + public abstract Task Publish(string deviceId, MqttWillMessage willMessage); + + public ValueTask GetDeviceStatus(string deviceId) + { + SessionStatus? result = null; + if (!string.IsNullOrEmpty(deviceId)) + { + MqttChannels.TryGetValue(deviceId, out MqttChannel mqttChannel); + result = mqttChannel?.SessionStatus; + } + return new ValueTask(result); + } + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/IChannelService.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/IChannelService.cs new file mode 100644 index 000000000..07b31c4a2 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/IChannelService.cs @@ -0,0 +1,29 @@ +using DotNetty.Codecs.Mqtt.Packets; +using DotNetty.Transport.Channels; +using Surging.Core.Protocol.Mqtt.Internal.Channel; +using Surging.Core.Protocol.Mqtt.Internal.Enums; +using Surging.Core.Protocol.Mqtt.Internal.Messages; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Surging.Core.Protocol.Mqtt.Internal.Services +{ + public interface IChannelService + { + MqttChannel GetMqttChannel(string deviceId); + bool Connect(string deviceId, MqttChannel build); + Task Suscribe(String deviceId, params string[] topics); + Task Login(IChannel channel, string deviceId, ConnectMessage mqttConnectMessage); + Task Publish(IChannel channel, PublishPacket mqttPublishMessage); + Task Publish(string deviceId, MqttWillMessage willMessage); + Task Close(string deviceId, bool isDisconnect); + ValueTask GetDeviceStatus(string deviceId); + Task SendWillMsg(MqttWillMessage willMeaasge); + ValueTask GetDeviceId(IChannel channel); + Task UnSubscribe(string deviceId, params string[] topics); + Task Pubrel(IChannel channel, int messageId); + Task Pubrec(MqttChannel channel, int messageId); + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/IClientSessionService.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/IClientSessionService.cs new file mode 100644 index 000000000..9c9ad7556 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/IClientSessionService.cs @@ -0,0 +1,15 @@ +using Surging.Core.Protocol.Mqtt.Internal.Messages; +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.Protocol.Mqtt.Internal.Services +{ + public interface IClientSessionService + { + void SaveMessage(string deviceId, SessionMessage sessionMessage); + + ConcurrentQueue GetMessages(string deviceId); + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/IMessagePushService.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/IMessagePushService.cs new file mode 100644 index 000000000..43e43287e --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/IMessagePushService.cs @@ -0,0 +1,28 @@ +using DotNetty.Codecs.Mqtt.Packets; +using DotNetty.Transport.Channels; +using Surging.Core.Protocol.Mqtt.Internal.Channel; +using Surging.Core.Protocol.Mqtt.Internal.Messages; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Surging.Core.Protocol.Mqtt.Internal.Services +{ + public interface IMessagePushService + { + Task WriteWillMsg(MqttChannel mqttChannel, MqttWillMessage willMeaasge); + + Task SendQosConfirmMsg(QualityOfService qos, MqttChannel mqttChannel, string topic, byte[] bytes); + + Task SendPubBack(IChannel channel, int messageId); + + Task SendPubRec(MqttChannel mqttChannel, int messageId); + + Task SendPubRel(IChannel channel, int messageId); + + Task SendToPubComp(IChannel channel, int messageId); + + Task SendQos0Msg(IChannel channel, String topic, byte[] byteBuf); + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/IWillService.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/IWillService.cs new file mode 100644 index 000000000..fc99ed19c --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/IWillService.cs @@ -0,0 +1,17 @@ +using Surging.Core.Protocol.Mqtt.Internal.Messages; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Surging.Core.Protocol.Mqtt.Internal.Services +{ + public interface IWillService + { + void Add(string deviceid, MqttWillMessage willMessage); + + Task SendWillMessage(string deviceId); + + void Remove(string deviceid); + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/Implementation/ClientSessionService.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/Implementation/ClientSessionService.cs new file mode 100644 index 000000000..7f007ed89 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/Implementation/ClientSessionService.cs @@ -0,0 +1,28 @@ +using Surging.Core.Protocol.Mqtt.Internal.Messages; +using System; +using System.Collections.Concurrent; + +namespace Surging.Core.Protocol.Mqtt.Internal.Services.Implementation +{ + public class ClientSessionService: IClientSessionService + { + private readonly ConcurrentDictionary> _clientsessionMessages = + new ConcurrentDictionary>(); + + public ConcurrentQueue GetMessages(string deviceId) + { + _clientsessionMessages.TryGetValue(deviceId, out ConcurrentQueue messages); + return messages; + } + + public void SaveMessage(string deviceId, SessionMessage sessionMessage) + { + _clientsessionMessages.TryGetValue(deviceId, out ConcurrentQueue sessionMessages); + _clientsessionMessages.AddOrUpdate(deviceId, sessionMessages, (id, message) => + { + sessionMessages.Enqueue(sessionMessage); + return sessionMessages; + }); + } + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/Implementation/MessagePushService.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/Implementation/MessagePushService.cs new file mode 100644 index 000000000..5b1c303fc --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/Implementation/MessagePushService.cs @@ -0,0 +1,149 @@ +using DotNetty.Buffers; +using DotNetty.Codecs.Mqtt.Packets; +using DotNetty.Transport.Channels; +using Surging.Core.Protocol.Mqtt.Internal.Channel; +using Surging.Core.Protocol.Mqtt.Internal.Enums; +using Surging.Core.Protocol.Mqtt.Internal.Messages; +using Surging.Core.Protocol.Mqtt.Internal.Runtime; +using Surging.Core.Protocol.Mqtt.Util; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Surging.Core.Protocol.Mqtt.Internal.Services.Implementation +{ + public class MessagePushService:IMessagePushService + { + private readonly ScanRunnable _scanRunnable; + public MessagePushService(ScanRunnable scanRunnable) + { + _scanRunnable = scanRunnable; + } + public async Task WriteWillMsg(MqttChannel mqttChannel, MqttWillMessage willMeaasge) + { + switch (willMeaasge.Qos) + { + case 0: + await SendQos0Msg(mqttChannel.Channel, willMeaasge.Topic, Encoding.Default.GetBytes(willMeaasge.WillMessage)); + break; + case 1: // qos1 + await SendQosConfirmMsg(QualityOfService.AtLeastOnce, mqttChannel, willMeaasge.Topic, Encoding.Default.GetBytes(willMeaasge.WillMessage)); + break; + case 2: // qos2 + await SendQosConfirmMsg(QualityOfService.ExactlyOnce, mqttChannel, willMeaasge.Topic, Encoding.Default.GetBytes(willMeaasge.WillMessage)); + break; + } + + } + + public async Task SendQosConfirmMsg(QualityOfService qos, MqttChannel mqttChannel, string topic, byte[] bytes) + { + if (mqttChannel.IsLogin()) + { + int messageId = MessageIdGenerater.GenerateId(); + switch (qos) + { + case QualityOfService.AtLeastOnce: + mqttChannel.AddMqttMessage(messageId, await SendQos1Msg(mqttChannel.Channel, topic, false, bytes, messageId)); + break; + case QualityOfService.ExactlyOnce: + mqttChannel.AddMqttMessage(messageId,await SendQos2Msg(mqttChannel.Channel, topic, false, bytes, messageId)); + break; + } + } + + } + + private async Task SendQos1Msg(IChannel channel, String topic, bool isDup, byte[] byteBuf, int messageId) + { + var mqttPublishMessage = new PublishPacket(QualityOfService.AtLeastOnce, false, false); + mqttPublishMessage.Payload = Unpooled.WrappedBuffer(byteBuf); + await channel.WriteAndFlushAsync(mqttPublishMessage); + return Enqueue(channel, messageId, topic, byteBuf, (int)QualityOfService.AtLeastOnce, ConfirmStatus.PUB); + } + + private async Task SendQos2Msg(IChannel channel, String topic, bool isDup, byte[] byteBuf, int messageId) + { + var mqttPublishMessage = new PublishPacket(QualityOfService.ExactlyOnce, false, false); + mqttPublishMessage.Payload = Unpooled.WrappedBuffer(byteBuf); + await channel.WriteAndFlushAsync(mqttPublishMessage); + return Enqueue(channel, messageId, topic, byteBuf, (int)QualityOfService.AtLeastOnce, ConfirmStatus.PUB); + } + + private async Task SendQos0Msg(IChannel channel, String topic, byte[] byteBuf, int messageId) + { + if (channel != null) + { + var mqttPublishMessage = new PublishPacket(QualityOfService.AtMostOnce, true, true); + mqttPublishMessage.TopicName = topic; + mqttPublishMessage.Payload = Unpooled.WrappedBuffer(byteBuf); + await channel.WriteAndFlushAsync(mqttPublishMessage); + } + } + + public async Task SendPubBack(IChannel channel, int messageId) + { + var mqttPubAckMessage = new PubAckPacket() { + PacketId = messageId + }; + await channel.WriteAndFlushAsync(mqttPubAckMessage); + } + + public async Task SendPubRec(MqttChannel mqttChannel, int messageId) + { + var mqttPubAckMessage = new PubRecPacket() + { + PacketId = messageId + }; + var channel = mqttChannel.Channel; + await channel.WriteAndFlushAsync(mqttPubAckMessage); + var sendMqttMessage = Enqueue(channel, messageId, null, null, 1, ConfirmStatus.PUBREC); + mqttChannel.AddMqttMessage(messageId, sendMqttMessage); + } + + public async Task SendPubRel(IChannel channel, int messageId) + { + var mqttPubAckMessage = new PubRelPacket() + { + PacketId = messageId + }; + await channel.WriteAndFlushAsync(mqttPubAckMessage); + } + + public async Task SendToPubComp(IChannel channel, int messageId) + { + var mqttPubAckMessage = new PubCompPacket() + { + PacketId = messageId + }; + await channel.WriteAndFlushAsync(mqttPubAckMessage); + } + + + public async Task SendQos0Msg(IChannel channel, String topic, byte[] byteBuf) + { + if (channel != null) + { + await SendQos0Msg(channel, topic, byteBuf, 0); + } + } + + private SendMqttMessage Enqueue(IChannel channel, int messageId, String topic, byte[] datas, int mqttQoS, ConfirmStatus confirmStatus) + { + var message = new SendMqttMessage + { + ByteBuf = datas, + Channel = channel, + MessageId = messageId, + Qos = mqttQoS, + Time = DateTime.Now.Ticks / 10000, + ConfirmStatus = confirmStatus, + Topic = topic + }; + _scanRunnable.Enqueue(message); + return message; + } + + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/Implementation/MqttChannelService.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/Implementation/MqttChannelService.cs new file mode 100644 index 000000000..9907a6aaa --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/Implementation/MqttChannelService.cs @@ -0,0 +1,428 @@ +using System; +using System.Collections.Generic; +using System.Text; +using DotNetty.Transport.Channels; +using Surging.Core.Protocol.Mqtt.Internal.Channel; +using Surging.Core.Protocol.Mqtt.Internal.Enums; +using Surging.Core.Protocol.Mqtt.Internal.Messages; +using System.Linq; +using System.Collections.Concurrent; +using DotNetty.Codecs.Mqtt.Packets; +using Microsoft.Extensions.Logging; +using DotNetty.Buffers; +using System.Threading.Tasks; +using Surging.Core.Protocol.Mqtt.Internal.Runtime; +using Surging.Core.CPlatform.Ids; + +namespace Surging.Core.Protocol.Mqtt.Internal.Services.Implementation +{ + public class MqttChannelService : AbstractChannelService + { + private readonly IMessagePushService _messagePushService; + private readonly IClientSessionService _clientSessionService; + private readonly ILogger _logger; + private readonly IWillService _willService; + public MqttChannelService(IMessagePushService messagePushService, IClientSessionService clientSessionService, + ILogger logger, IWillService willService, + IMqttBrokerEntryManger mqttBrokerEntryManger, + IMqttRemoteInvokeService mqttRemoteInvokeService, + IServiceIdGenerator serviceIdGenerator) : + base(messagePushService, + mqttBrokerEntryManger, + mqttRemoteInvokeService, + serviceIdGenerator) + { + _messagePushService = messagePushService; + _clientSessionService = clientSessionService; + _logger = logger; + _willService = willService; + } + + public override async Task Close(string deviceId, bool isDisconnect) + { + if (!string.IsNullOrEmpty(deviceId)) + { + MqttChannels.TryGetValue(deviceId, out MqttChannel mqttChannel); + if (mqttChannel != null) + { + mqttChannel.SessionStatus = SessionStatus.CLOSE; + await mqttChannel.Close(); + mqttChannel.Channel = null; + } + if (!mqttChannel.CleanSession) + { + var messages = mqttChannel.Messages; + if (messages != null) + { + foreach (var sendMqttMessage in messages.Values) + { + if (sendMqttMessage.ConfirmStatus == ConfirmStatus.PUB) + { + _clientSessionService.SaveMessage(mqttChannel.ClientId, new SessionMessage + { + Message = sendMqttMessage.ByteBuf, + QoS = sendMqttMessage.Qos, + Topic = sendMqttMessage.Topic + }); + } + } + } + } + else + { + MqttChannels.TryRemove(deviceId, out MqttChannel channel); + if (mqttChannel.SubscribeStatus == SubscribeStatus.Yes) + { + RemoveSubTopic(mqttChannel); + } + } + if (mqttChannel.IsWill) + { + if (!isDisconnect) + { + await _willService.SendWillMessage(deviceId); + } + } + + } + } + + public override bool Connect(string deviceId, MqttChannel channel) + { + var mqttChannel = GetMqttChannel(deviceId); + if (mqttChannel != null) + { + if (mqttChannel.SessionStatus == SessionStatus.OPEN) return false; + else if (mqttChannel.SessionStatus == SessionStatus.CLOSE) + { + if (mqttChannel.SubscribeStatus == SubscribeStatus.Yes) + { + var topics = RemoveSubTopic(mqttChannel); + foreach (var topic in topics) + { + Topics.TryGetValue(topic, out IEnumerable comparisonValue); + var newValue = comparisonValue.Concat(new [] { channel }); + Topics.AddOrUpdate(topic, newValue, (key, value) => newValue); + } + } + + } + } + MqttChannels.AddOrUpdate(deviceId, channel, (k, v) => channel); + return true; + } + + public override async Task Login(IChannel channel, string deviceId, ConnectMessage mqttConnectMessage) + { + channel.GetAttribute(LoginAttrKey).Set("login"); + channel.GetAttribute(DeviceIdAttrKey).Set(deviceId); + await Init(channel,mqttConnectMessage); + } + + public override async Task Publish(IChannel channel, PublishPacket mqttPublishMessage) + { + MqttChannel mqttChannel = GetMqttChannel(await this.GetDeviceId(channel)); + var buffer = mqttPublishMessage.Payload; + byte[] bytes = new byte[buffer.ReadableBytes]; + buffer.ReadBytes(bytes); + int messageId = mqttPublishMessage.PacketId; + if (channel.HasAttribute(LoginAttrKey) && mqttChannel != null) + { + bool isRetain = mqttPublishMessage.RetainRequested; + switch (mqttPublishMessage.QualityOfService) + { + case QualityOfService.AtLeastOnce: + await _messagePushService.SendPubBack(channel, messageId); + break; + case QualityOfService.ExactlyOnce: + await Pubrec(mqttChannel, messageId); + break; + } + if (isRetain) + { + SaveRetain(mqttPublishMessage.TopicName, + new RetainMessage + { + ByteBuf = bytes, + QoS = (int)mqttPublishMessage.QualityOfService + }, mqttPublishMessage.QualityOfService == QualityOfService.AtMostOnce ? true : false); + } + await PushMessage(mqttPublishMessage.TopicName, (int)mqttPublishMessage.QualityOfService, bytes, isRetain); + await RemotePublishMessage("", new MqttWillMessage + { + Qos = (int)mqttPublishMessage.QualityOfService, + Topic = mqttPublishMessage.TopicName, + WillMessage = Encoding.Default.GetString(bytes), + WillRetain = mqttPublishMessage.RetainRequested + }); + } + } + + public override async Task Publish(string deviceId, MqttWillMessage willMessage) + { + if (!string.IsNullOrEmpty(deviceId)) + { + var mqttChannel = GetMqttChannel(deviceId); + if (mqttChannel.SessionStatus == SessionStatus.OPEN) + { + await _messagePushService.WriteWillMsg(mqttChannel, willMessage); + } + } + else { await SendWillMsg(willMessage); } + if (willMessage.WillRetain) + SaveRetain(willMessage.Topic, new RetainMessage + { + ByteBuf = Encoding.UTF8.GetBytes(willMessage.WillMessage), + QoS = willMessage.Qos + }, willMessage.Qos==0?true:false); + await RemotePublishMessage(deviceId, willMessage); + } + + private async Task PushMessage(string topic, int qos, byte[] bytes, bool isRetain) + { + Topics.TryGetValue(topic, out IEnumerable mqttChannels); + if (mqttChannels!=null && mqttChannels.Any()) + { + foreach (var mqttChannel in mqttChannels) + { + switch (mqttChannel.SessionStatus) + { + case SessionStatus.OPEN: + { + if (mqttChannel.IsActive()) + { + await SendMessage(mqttChannel, qos, + topic, bytes); + } + else + { + if (!mqttChannel.CleanSession && !isRetain) + { + _clientSessionService.SaveMessage(mqttChannel.ClientId, + new SessionMessage + { + Message = bytes, + QoS = qos, + Topic = topic + }); + break; + } + } + } + break; + case SessionStatus.CLOSE: + _clientSessionService.SaveMessage(mqttChannel.ClientId, + new SessionMessage + { + Message = bytes, + QoS = qos, + Topic = topic + }); + break; + } + } + } + } + + public override async Task Pubrec(MqttChannel channel, int messageId) + { + await _messagePushService.SendPubRec(channel, messageId); + } + + public override async Task Pubrel(IChannel channel, int messageId) + { + if (MqttChannels.TryGetValue(await this.GetDeviceId(channel), out MqttChannel mqttChannel)) + { + if (mqttChannel.IsLogin()) + { + mqttChannel.RemoveMqttMessage(messageId); + await _messagePushService.SendToPubComp(channel, messageId); + } + } + } + + public override async Task SendWillMsg(MqttWillMessage willMeaasge) + { + Topics.TryGetValue(willMeaasge.Topic, out IEnumerable mqttChannels); + if (mqttChannels!=null && mqttChannels.Any()) + { + foreach (var mqttChannel in mqttChannels) + { + switch (mqttChannel.SessionStatus) + { + case SessionStatus.CLOSE: + _clientSessionService.SaveMessage(mqttChannel.ClientId, new SessionMessage + { + Message = Encoding.UTF8.GetBytes(willMeaasge.WillMessage), + QoS = willMeaasge.Qos, + Topic = willMeaasge.Topic + }); + break; + case SessionStatus.OPEN: + await _messagePushService.WriteWillMsg(mqttChannel, willMeaasge); + break; + + } + } + } + } + + public override async Task Suscribe(string deviceId, params string[] topics) + { + if (!string.IsNullOrEmpty(deviceId)) + { + MqttChannels.TryGetValue(deviceId, out MqttChannel mqttChannel); + mqttChannel.SubscribeStatus = SubscribeStatus.Yes; + mqttChannel.AddTopic(topics); + if (mqttChannel.IsLogin()) + { + foreach (var topic in topics) + { + this.AddChannel(topic, mqttChannel); + await RegisterMqttBroker(topic); + await this.SendRetain(topic, mqttChannel); + } + } + } + } + + public override async Task UnSubscribe(string deviceId, params string[] topics) + { + if (MqttChannels.TryGetValue(deviceId, out MqttChannel mqttChannel)) + { + foreach (var topic in topics) + { + RemoveChannel(topic, mqttChannel); + await BrokerCancellationReg(topic); + } + } + } + + public async Task SendRetain(string topic, MqttChannel mqttChannel) + { + Retain.TryGetValue(topic, out ConcurrentQueue retainMessages); + if (retainMessages!=null && !retainMessages.IsEmpty) + { + var count = retainMessages.Count; + for (int i = 0; i < count; i++) + { + if (retainMessages.TryPeek(out RetainMessage retainMessage)) + { + await SendMessage(mqttChannel, retainMessage.QoS, topic, retainMessage.ByteBuf); + } + } + } + } + + private void SaveRetain(String topic, RetainMessage retainMessage, bool isClean) + { + Retain.TryGetValue(topic, out ConcurrentQueue retainMessages); + if (retainMessages == null) retainMessages=new ConcurrentQueue(); + if (!retainMessages.IsEmpty && isClean) + { + retainMessages.Clear(); + } + retainMessages.Enqueue(retainMessage); + Retain.AddOrUpdate(topic, retainMessages,(key,value)=> retainMessages); + } + + public IEnumerable RemoveSubTopic(MqttChannel mqttChannel) + { + IEnumerable topics = mqttChannel.Topics; + foreach (var topic in topics) + { + Topics.TryGetValue(topic, out IEnumerable comparisonValue); + var newValue = comparisonValue.Where(p => p != mqttChannel); + Topics.TryUpdate(topic, newValue, comparisonValue); + } + return topics; + } + + private async Task SendMessage(MqttChannel mqttChannel,int qos, string topic,byte [] byteBuf) + { + switch (qos) + { + case 0: + await _messagePushService.SendQos0Msg(mqttChannel.Channel, topic, byteBuf); + break; + case 1: + await _messagePushService.SendQosConfirmMsg(QualityOfService.AtLeastOnce, mqttChannel, topic, byteBuf); + break; + case 2: + await _messagePushService.SendQosConfirmMsg(QualityOfService.ExactlyOnce, mqttChannel, topic, byteBuf); + break; + } + } + + private async Task Init(IChannel channel, ConnectMessage mqttConnectMessage) + { + String deviceId = await GetDeviceId(channel); + MqttChannel mqttChannel = new MqttChannel() + { + Channel = channel, + CleanSession = mqttConnectMessage.CleanSession, + ClientId = mqttConnectMessage.ClientId, + SessionStatus = SessionStatus.OPEN, + IsWill = mqttConnectMessage.HasWill, + SubscribeStatus = SubscribeStatus.No, + Messages = new ConcurrentDictionary(), + Topics = new List() + }; + if (Connect(deviceId, mqttChannel)) + { + if (mqttConnectMessage.HasWill) + { + if (mqttConnectMessage.WillMessage == null || string.IsNullOrEmpty(mqttConnectMessage.WillTopic)) + { + if (_logger.IsEnabled(LogLevel.Error)) + _logger.LogError($"WillMessage 和 WillTopic不能为空"); + return; + } + var willMessage = new MqttWillMessage + { + Qos = mqttConnectMessage.Qos, + WillRetain = mqttConnectMessage.WillRetain, + Topic = mqttConnectMessage.WillTopic, + WillMessage = Encoding.UTF8.GetString(mqttConnectMessage.WillMessage) + + }; + _willService.Add(mqttConnectMessage.ClientId, willMessage); + } + else + { + _willService.Remove(mqttConnectMessage.ClientId); + if (!mqttConnectMessage.WillRetain && mqttConnectMessage.WillQualityOfService != 0) + { + if (_logger.IsEnabled(LogLevel.Error)) + _logger.LogError($"WillRetain 设置为false,WillQos必须设置为AtMostOnce"); + return; + } + } + await channel.WriteAndFlushAsync(new ConnAckPacket + { + ReturnCode = ConnectReturnCode.Accepted, + SessionPresent = !mqttConnectMessage.CleanSession + }); + var sessionMessages = _clientSessionService.GetMessages(mqttConnectMessage.ClientId); + if (sessionMessages != null && !sessionMessages.IsEmpty) + { + for (; sessionMessages.TryDequeue(out SessionMessage sessionMessage) && sessionMessage != null;) + { + switch (sessionMessage.QoS) + { + case 0: + await _messagePushService.SendQos0Msg(channel, sessionMessage.Topic, sessionMessage.Message); + break; + case 1: + await _messagePushService.SendQosConfirmMsg(QualityOfService.AtLeastOnce, GetMqttChannel(deviceId), sessionMessage.Topic, sessionMessage.Message); + break; + case 2: + await _messagePushService.SendQosConfirmMsg(QualityOfService.ExactlyOnce, GetMqttChannel(deviceId), sessionMessage.Topic, sessionMessage.Message); + break; + } + } + } + } + } + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/Implementation/WillService.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/Implementation/WillService.cs new file mode 100644 index 000000000..7764ae8e3 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/Implementation/WillService.cs @@ -0,0 +1,52 @@ +using Microsoft.Extensions.Logging; +using Surging.Core.CPlatform; +using Surging.Core.Protocol.Mqtt.Internal.Messages; +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Surging.Core.Protocol.Mqtt.Internal.Services.Implementation +{ + public class WillService: IWillService + { + private ConcurrentDictionary willMeaasges = new ConcurrentDictionary(); + private readonly ILogger _logger; + private readonly CPlatformContainer _serviceProvider; + + public WillService(ILogger logger, CPlatformContainer serviceProvider) + { + _logger = logger; + _serviceProvider = serviceProvider; + } + + public void Add(string deviceid, MqttWillMessage willMessage) + { + willMeaasges.AddOrUpdate(deviceid, willMessage,(id,message)=>willMessage); + } + + public async Task SendWillMessage(string deviceId) + { + if (!string.IsNullOrEmpty(deviceId)) + { + willMeaasges.TryGetValue(deviceId, out MqttWillMessage willMessage); + if (willMeaasges != null) + { + await _serviceProvider.GetInstances().SendWillMsg(willMessage); + if (!willMessage.WillRetain) + { + Remove(deviceId); + if (_logger.IsEnabled(LogLevel.Information)) + _logger.LogInformation($"deviceId:{deviceId} 的遗嘱消息[" + willMessage.WillMessage + "] 已经被删除"); + + } + } + } + } + + public void Remove(string deviceid) { + willMeaasges.TryRemove(deviceid,out MqttWillMessage message); + } + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/MqttBehavior.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/MqttBehavior.cs new file mode 100644 index 000000000..c651a78da --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/MqttBehavior.cs @@ -0,0 +1,26 @@ +using Surging.Core.CPlatform.Ioc; +using Surging.Core.CPlatform.Utilities; +using Surging.Core.Protocol.Mqtt.Internal.Enums; +using Surging.Core.Protocol.Mqtt.Internal.Messages; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Surging.Core.Protocol.Mqtt.Internal.Services +{ + public abstract class MqttBehavior: ServiceBase + { + public async Task Publish(string deviceId, MqttWillMessage willMessage) + { + await GetService().Publish(deviceId, willMessage); + } + + public async Task GetDeviceStatus(string deviceId) + { + return await this.GetService().GetDeviceStatus(deviceId); + } + + public abstract Task Authorized(string username, string password); + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/MqttHandlerServiceBase.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/MqttHandlerServiceBase.cs new file mode 100644 index 000000000..34dacefb2 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/MqttHandlerServiceBase.cs @@ -0,0 +1,48 @@ +using DotNetty.Codecs.Mqtt.Packets; +using DotNetty.Transport.Channels; +using Surging.Core.CPlatform.Messages; +using Surging.Core.Protocol.Mqtt.Internal.Enums; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.Protocol.Mqtt +{ + public abstract class MqttHandlerServiceBase + { + protected readonly Action _handler; + public MqttHandlerServiceBase( Action handler) + { + _handler = handler; + } + + public abstract void Login(IChannelHandlerContext context, ConnectPacket packet); + + public abstract void ConnAck(IChannelHandlerContext context, ConnAckPacket packet); + + public abstract void Disconnect(IChannelHandlerContext context, DisconnectPacket packet); + + public abstract void PingReq(IChannelHandlerContext context, PingReqPacket packet); + + public abstract void PingResp(IChannelHandlerContext context, PingRespPacket packet); + + public abstract void PubAck(IChannelHandlerContext context, PubAckPacket packet); + + public abstract void PubComp(IChannelHandlerContext context, PubCompPacket packet); + + public abstract void PubRec(IChannelHandlerContext context, PubRecPacket packet); + + public abstract void PubRel(IChannelHandlerContext context, PubRelPacket packet); + + public abstract void Publish(IChannelHandlerContext context, PublishPacket packet); + + public abstract void SubAck(IChannelHandlerContext context, SubAckPacket packet); + + public abstract void Subscribe(IChannelHandlerContext context, SubscribePacket packet); + + public abstract void UnsubAck(IChannelHandlerContext context, UnsubAckPacket packet); + + public abstract void Unsubscribe(IChannelHandlerContext context, UnsubscribePacket packet); + + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/MqttProtocolModule.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/MqttProtocolModule.cs new file mode 100644 index 000000000..6919b72e4 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/MqttProtocolModule.cs @@ -0,0 +1,119 @@ +using Autofac; +using Microsoft.Extensions.Logging; +using Surging.Core.CPlatform; +using Surging.Core.CPlatform.Ids; +using Surging.Core.CPlatform.Module; +using Surging.Core.CPlatform.Mqtt; +using Surging.Core.CPlatform.Runtime.Server; +using Surging.Core.CPlatform.Runtime.Server.Implementation; +using Surging.Core.CPlatform.Transport.Codec; +using Surging.Core.Protocol.Mqtt.Implementation; +using Surging.Core.Protocol.Mqtt.Internal.Channel; +using Surging.Core.Protocol.Mqtt.Internal.Runtime; +using Surging.Core.Protocol.Mqtt.Internal.Runtime.Implementation; +using Surging.Core.Protocol.Mqtt.Internal.Services; +using Surging.Core.Protocol.Mqtt.Internal.Services.Implementation; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.Protocol.Mqtt +{ + public class MqttProtocolModule : EnginePartModule + { + public override void Initialize(CPlatformContainer serviceProvider) + { + base.Initialize(serviceProvider); + } + + /// + /// Inject dependent third-party components + /// + /// + protected override void RegisterBuilder(ContainerBuilderWrapper builder) + { + base.RegisterBuilder(builder); + builder.RegisterType(typeof(DefaultMqttServiceFactory)).As(typeof(IMqttServiceFactory)).SingleInstance(); + builder.RegisterType(typeof(DefaultMqttBrokerEntryManager)).As(typeof(IMqttBrokerEntryManger)).SingleInstance(); + builder.RegisterType(typeof(MqttRemoteInvokeService)).As(typeof(IMqttRemoteInvokeService)).SingleInstance(); + builder.Register(provider => + { + return new WillService( + provider.Resolve>(), + provider.Resolve() + ); + }).As().SingleInstance(); + builder.Register(provider => + { + return new MessagePushService(new SacnScheduled()); + }).As().SingleInstance(); + builder.RegisterType(typeof(ClientSessionService)).As(typeof(IClientSessionService)).SingleInstance(); + builder.Register(provider => + { + return new MqttChannelService( + provider.Resolve(), + provider.Resolve(), + provider.Resolve>(), + provider.Resolve(), + provider.Resolve(), + provider.Resolve(), + provider.Resolve() + ); + }).As(typeof(IChannelService)).SingleInstance(); + builder.RegisterType(typeof(DefaultMqttBehaviorProvider)).As(typeof(IMqttBehaviorProvider)).SingleInstance(); + + if (AppConfig.ServerOptions.Protocol == CommunicationProtocol.Http) + { + RegisterDefaultProtocol(builder); + } + else if (AppConfig.ServerOptions.Protocol == CommunicationProtocol.None) + { + RegisterMqttProtocol(builder); + } + } + + private static void RegisterDefaultProtocol(ContainerBuilderWrapper builder) + { + builder.Register(provider => + { + return new DotNettyMqttServerMessageListener(provider.Resolve>(), + provider.Resolve(), + provider.Resolve() + ); + }).SingleInstance(); + builder.Register(provider => + { + + var messageListener = provider.Resolve(); + return new DefaultServiceHost(async endPoint => + { + await messageListener.StartAsync(endPoint); + return messageListener; + }, null); + + }).As(); + } + + private static void RegisterMqttProtocol(ContainerBuilderWrapper builder) + { + + builder.Register(provider => + { + return new DotNettyMqttServerMessageListener(provider.Resolve>(), + provider.Resolve(), + provider.Resolve() + ); + }).SingleInstance(); + builder.Register(provider => + { + var messageListener = provider.Resolve(); + return new MqttServiceHost(async endPoint => + { + await messageListener.StartAsync(endPoint); + return messageListener; + }); + + }).As(); + } + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/MqttServiceHost.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/MqttServiceHost.cs new file mode 100644 index 000000000..b8d2de071 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/MqttServiceHost.cs @@ -0,0 +1,56 @@ +using Surging.Core.CPlatform; +using Surging.Core.CPlatform.Runtime.Server.Implementation; +using Surging.Core.CPlatform.Transport; +using System; +using System.Collections.Generic; +using System.Net; +using System.Text; +using System.Threading.Tasks; + +namespace Surging.Core.Protocol.Mqtt +{ + public class MqttServiceHost : ServiceHostAbstract + { + #region Field + + private readonly Func> _messageListenerFactory; + private IMessageListener _serverMessageListener; + + #endregion Field + + public MqttServiceHost(Func> messageListenerFactory) : base(null) + { + _messageListenerFactory = messageListenerFactory; + } + + #region Overrides of ServiceHostAbstract + + /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. + public override void Dispose() + { + (_serverMessageListener as IDisposable)?.Dispose(); + } + + /// + /// 启动主机。 + /// + /// 主机终结点。 + /// 一个任务。 + public override async Task StartAsync(EndPoint endPoint) + { + if (_serverMessageListener != null) + return; + _serverMessageListener = await _messageListenerFactory(endPoint); + + } + + public override async Task StartAsync(string ip, int port) + { + if (_serverMessageListener != null) + return; + _serverMessageListener = await _messageListenerFactory(new IPEndPoint(IPAddress.Parse(ip), AppConfig.ServerOptions.Ports.MQTTPort)); + } + + #endregion Overrides of ServiceHostAbstract + } +} \ No newline at end of file diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Surging.Core.Protocol.Mqtt.csproj b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Surging.Core.Protocol.Mqtt.csproj new file mode 100644 index 000000000..8c283bb3d --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Surging.Core.Protocol.Mqtt.csproj @@ -0,0 +1,31 @@ + + + + netcoreapp2.1 + fanly + surging Micro Service Framework + surging is a distributed micro service framework that provides high-performance RPC remote service calls, using Zookeeper, Consul as the registration center for surging services, integrating hash, random, polling as a load balancing algorithm, RPC integration using the netty framework, Using asynchronous transmission. Use json.net, protobuf, messagepack for serialization Codec + Copyright © fanly All Rights Reserved. + https://github.com/dotnetcore/surging/blob/master/LICENSE + https://github.com/dotnetcore/surging + MicroService surging + 1. fix bug + + + + + + + + + + + + + + + C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.extensions.logging.abstractions\2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + + + + diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Util/MessageIdGenerater.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Util/MessageIdGenerater.cs new file mode 100644 index 000000000..5e29f6de4 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Util/MessageIdGenerater.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; + +namespace Surging.Core.Protocol.Mqtt.Util +{ + public class MessageIdGenerater + { + + private static int _index; + private static int _lock; + public static int GenerateId() + { + for (; ; ) + { + if (Interlocked.Exchange(ref _lock, 1) != 0) + { + default(SpinWait).SpinOnce(); + continue; + } + if (int.MaxValue > _index) + _index++; + else + _index = 0; + + Interlocked.Exchange(ref _lock, 0); + return _index; + } + } + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.WS/Attributes/BehaviorContractAttribute.cs b/src/Surging.Core/Surging.Core.Protocol.WS/Attributes/BehaviorContractAttribute.cs new file mode 100644 index 000000000..ab81e0756 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.WS/Attributes/BehaviorContractAttribute.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.Protocol.WS.Attributes +{ + public class BehaviorContractAttribute : Attribute + { + + public bool IgnoreExtensions { get; set; } + + public bool EmitOnPing { get; set; } + + public string Protocol { get; set; } + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.WS/Configurations/BehaviorOption.cs b/src/Surging.Core/Surging.Core.Protocol.WS/Configurations/BehaviorOption.cs new file mode 100644 index 000000000..7bb3a65a4 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.WS/Configurations/BehaviorOption.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.Protocol.WS.Configurations +{ + public class BehaviorOption + { + public bool IgnoreExtensions { get; set; } + + public bool EmitOnPing { get; set; } + + public string Protocol { get; set; } + } +} diff --git a/src/Surging.Core/Surging.Core.Protocol.WS/Configurations/WebSocketOptions.cs b/src/Surging.Core/Surging.Core.Protocol.WS/Configurations/WebSocketOptions.cs new file mode 100644 index 000000000..de8add798 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Protocol.WS/Configurations/WebSocketOptions.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.Core.Protocol.WS.Configurations +{ + public class WebSocketOptions + { + /// + /// Gets or sets the time to wait for the response to the WebSocket Ping or + /// Close. + /// + /// + /// The set operation does nothing if the server has already started or + /// it is shutting down. + /// + /// + /// + /// A to wait for the response. + /// + /// + /// The default value is the same as 1 second. + /// + /// + /// + /// The value specified for a set operation is zero or less. + /// + public int WaitTime { get; set; } = 1; + + public bool KeepClean + { + get; + set; + } = false; + + public BehaviorOption Behavior { get; set; } + } + +} \ No newline at end of file diff --git a/src/Surging.Core/Surging.Core.Protocol.WS/DefaultWSServerMessageListener.cs b/src/Surging.Core/Surging.Core.Protocol.WS/DefaultWSServerMessageListener.cs index 720dbb16d..02abc26da 100644 --- a/src/Surging.Core/Surging.Core.Protocol.WS/DefaultWSServerMessageListener.cs +++ b/src/Surging.Core/Surging.Core.Protocol.WS/DefaultWSServerMessageListener.cs @@ -9,6 +9,7 @@ using WebSocketCore.Server; using Surging.Core.Protocol.WS.Runtime; using Microsoft.Extensions.Logging; +using Surging.Core.Protocol.WS.Configurations; namespace Surging.Core.Protocol.WS { @@ -17,10 +18,14 @@ public class DefaultWSServerMessageListener : IMessageListener, IDisposable private readonly List _entries; private WebSocketServer _wssv; private readonly ILogger _logger; - public DefaultWSServerMessageListener(ILogger logger,IWSServiceEntryProvider wsServiceEntryProvider) + private readonly WebSocketOptions _options; + + public DefaultWSServerMessageListener(ILogger logger, + IWSServiceEntryProvider wsServiceEntryProvider, WebSocketOptions options) { _logger = logger; _entries = wsServiceEntryProvider.GetEntries().ToList(); + _options = options; } public async Task StartAsync(EndPoint endPoint) { @@ -30,7 +35,8 @@ public async Task StartAsync(EndPoint endPoint) { foreach (var entry in _entries) _wssv.AddWebSocketService(entry.Path, entry.FuncBehavior); - _wssv.KeepClean = false; + _wssv.KeepClean = _options.KeepClean; + _wssv.WaitTime = TimeSpan.FromSeconds(_options.WaitTime); _wssv.Start(); if (_logger.IsEnabled(LogLevel.Debug)) _logger.LogDebug($"WS服务主机启动成功，监听地址：{endPoint}。"); diff --git a/src/Surging.Core/Surging.Core.Protocol.WS/Runtime/Implementation/DefaultWSServiceEntryProvider.cs b/src/Surging.Core/Surging.Core.Protocol.WS/Runtime/Implementation/DefaultWSServiceEntryProvider.cs index 63e9eac0f..45f1498c7 100644 --- a/src/Surging.Core/Surging.Core.Protocol.WS/Runtime/Implementation/DefaultWSServiceEntryProvider.cs +++ b/src/Surging.Core/Surging.Core.Protocol.WS/Runtime/Implementation/DefaultWSServiceEntryProvider.cs @@ -4,6 +4,8 @@ using Surging.Core.CPlatform.Routing.Template; using Surging.Core.CPlatform.Runtime.Server; using Surging.Core.CPlatform.Runtime.Server.Implementation.ServiceDiscovery.Attributes; +using Surging.Core.Protocol.WS.Attributes; +using Surging.Core.Protocol.WS.Configurations; using System; using System.Collections.Generic; using System.Linq; @@ -21,16 +23,21 @@ public class DefaultWSServiceEntryProvider : IWSServiceEntryProvider private readonly ILogger _logger; private readonly CPlatformContainer _serviceProvider; private List _wSServiceEntries; + private WebSocketOptions _options; #endregion Field #region Constructor - public DefaultWSServiceEntryProvider(IServiceEntryProvider serviceEntryProvider, ILogger logger, CPlatformContainer serviceProvider) + public DefaultWSServiceEntryProvider(IServiceEntryProvider serviceEntryProvider, + ILogger logger, + CPlatformContainer serviceProvider, + WebSocketOptions options) { _types = serviceEntryProvider.GetTypes(); _logger = logger; _serviceProvider = serviceProvider; + _options = options; } #endregion Constructor @@ -68,6 +75,7 @@ public WSServiceEntry CreateServiceEntry(Type service) { WSServiceEntry result = null; var routeTemplate = service.GetCustomAttribute(); + var behaviorContract = service.GetCustomAttribute(); var objInstance = _serviceProvider.GetInstances(service); var behavior = objInstance as WebSocketBehavior; var path = RoutePatternParser.Parse(routeTemplate.RouteTemplate, service.Name); @@ -79,9 +87,30 @@ public WSServiceEntry CreateServiceEntry(Type service) Behavior = behavior, Type = behavior.GetType(), Path = path, - FuncBehavior= () => _serviceProvider.GetInstances(service) as WebSocketBehavior, + FuncBehavior = () => + { + return GetWebSocketBehavior(service, _options?.Behavior, behaviorContract); + } }; return result; } + + private WebSocketBehavior GetWebSocketBehavior(Type service,BehaviorOption option, BehaviorContractAttribute contractAttribute) + { + var wsBehavior = _serviceProvider.GetInstances(service) as WebSocketBehavior; + if (option != null) + { + wsBehavior.IgnoreExtensions = option.IgnoreExtensions; + wsBehavior.Protocol = option.Protocol; + wsBehavior.EmitOnPing = option.EmitOnPing; + } + if (contractAttribute != null) + { + wsBehavior.IgnoreExtensions = contractAttribute.IgnoreExtensions; + wsBehavior.Protocol = contractAttribute.Protocol; + wsBehavior.EmitOnPing = contractAttribute.EmitOnPing; + } + return wsBehavior; + } } } diff --git a/src/Surging.Core/Surging.Core.Protocol.WS/Runtime/WSServiceEntry.cs b/src/Surging.Core/Surging.Core.Protocol.WS/Runtime/WSServiceEntry.cs index 0f0cbbfc7..574ad5005 100644 --- a/src/Surging.Core/Surging.Core.Protocol.WS/Runtime/WSServiceEntry.cs +++ b/src/Surging.Core/Surging.Core.Protocol.WS/Runtime/WSServiceEntry.cs @@ -1,4 +1,5 @@ -using System; +using Surging.Core.Protocol.WS.Configurations; +using System; using System.Collections.Generic; using System.Text; using WebSocketCore.Server; diff --git a/src/Surging.Core/Surging.Core.Protocol.WS/Surging.Core.Protocol.WS.csproj b/src/Surging.Core/Surging.Core.Protocol.WS/Surging.Core.Protocol.WS.csproj index a52b24fca..a6c452044 100644 --- a/src/Surging.Core/Surging.Core.Protocol.WS/Surging.Core.Protocol.WS.csproj +++ b/src/Surging.Core/Surging.Core.Protocol.WS/Surging.Core.Protocol.WS.csproj @@ -2,7 +2,7 @@ netcoreapp2.1 - 0.9.0.2 + 1.0.0.0 fanly fanly surging Micro Service Framework @@ -11,9 +11,9 @@ https://github.com/dotnetcore/surging/blob/master/LICENSE https://github.com/dotnetcore/surging MicroService surging - 1.Support for hot-swap engine components - 0.9.0.2 - 0.9.0.2 + 1. fix bug + 1.0.0.0 + 1.0.0.0 diff --git a/src/Surging.Core/Surging.Core.Protocol.WS/WSProtocolModule.cs b/src/Surging.Core/Surging.Core.Protocol.WS/WSProtocolModule.cs index 06250b7c0..a3fe3dac0 100644 --- a/src/Surging.Core/Surging.Core.Protocol.WS/WSProtocolModule.cs +++ b/src/Surging.Core/Surging.Core.Protocol.WS/WSProtocolModule.cs @@ -1,4 +1,5 @@ using Autofac; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; using Surging.Core.CPlatform; using Surging.Core.CPlatform.Module; @@ -6,6 +7,7 @@ using Surging.Core.CPlatform.Runtime.Server.Implementation; using Surging.Core.CPlatform.Serialization; using Surging.Core.CPlatform.Transport.Codec; +using Surging.Core.Protocol.WS.Configurations; using Surging.Core.Protocol.WS.Runtime; using Surging.Core.Protocol.WS.Runtime.Implementation; using System; @@ -14,7 +16,7 @@ namespace Surging.Core.Protocol.WS { - public class WSProtocolModule : EnginePartModule + public class WSProtocolModule : EnginePartModule { public override void Initialize(CPlatformContainer serviceProvider) { @@ -27,25 +29,39 @@ public override void Initialize(CPlatformContainer serviceProvider) /// protected override void RegisterBuilder(ContainerBuilderWrapper builder) { + var options = new WebSocketOptions(); + var section = AppConfig.GetSection("WebSocket"); + if (section.Exists()) + options = section.Get(); base.RegisterBuilder(builder); - builder.RegisterType(typeof(DefaultWSServiceEntryProvider)).As(typeof(IWSServiceEntryProvider)).SingleInstance(); + builder.Register(provider => + { + return new DefaultWSServiceEntryProvider( + provider.Resolve(), + provider.Resolve>(), + provider.Resolve(), + options + ); + }).As(typeof(IWSServiceEntryProvider)).SingleInstance(); if (AppConfig.ServerOptions.Protocol == CommunicationProtocol.WS) { - RegisterDefaultProtocol(builder); + RegisterDefaultProtocol(builder, options); } else if (AppConfig.ServerOptions.Protocol == CommunicationProtocol.None) { - RegisterWSProtocol(builder); + RegisterWSProtocol(builder, options); } } - private static void RegisterDefaultProtocol(ContainerBuilderWrapper builder) + private static void RegisterDefaultProtocol(ContainerBuilderWrapper builder, WebSocketOptions options) { + builder.Register(provider => { return new DefaultWSServerMessageListener( provider.Resolve>(), - provider.Resolve() + provider.Resolve(), + options ); }).SingleInstance(); builder.Register(provider => @@ -60,12 +76,13 @@ private static void RegisterDefaultProtocol(ContainerBuilderWrapper builder) }).As(); } - private static void RegisterWSProtocol(ContainerBuilderWrapper builder) + private static void RegisterWSProtocol(ContainerBuilderWrapper builder, WebSocketOptions options) { builder.Register(provider => { return new DefaultWSServerMessageListener(provider.Resolve>(), - provider.Resolve() + provider.Resolve(), + options ); }).SingleInstance(); builder.Register(provider => diff --git a/src/Surging.Core/Surging.Core.ProxyGenerator/Implementation/ServiceProxyBase.cs b/src/Surging.Core/Surging.Core.ProxyGenerator/Implementation/ServiceProxyBase.cs index 63c45535a..a57cd7a90 100644 --- a/src/Surging.Core/Surging.Core.ProxyGenerator/Implementation/ServiceProxyBase.cs +++ b/src/Surging.Core/Surging.Core.ProxyGenerator/Implementation/ServiceProxyBase.cs @@ -104,7 +104,10 @@ protected async Task Invoke(IDictionary parameters, string } } if (message != null) - result = _typeConvertibleService.Convert(message.Result, typeof(T)); + { + if (message.Result == null) result = message.Result; + else result = _typeConvertibleService.Convert(message.Result, typeof(T)); + } return (T)result; } diff --git a/src/Surging.Core/Surging.Core.ProxyGenerator/Surging.Core.ProxyGenerator.csproj b/src/Surging.Core/Surging.Core.ProxyGenerator/Surging.Core.ProxyGenerator.csproj index c3ba7e896..cb152f0c0 100644 --- a/src/Surging.Core/Surging.Core.ProxyGenerator/Surging.Core.ProxyGenerator.csproj +++ b/src/Surging.Core/Surging.Core.ProxyGenerator/Surging.Core.ProxyGenerator.csproj @@ -2,17 +2,18 @@ netcoreapp2.1 - 0.9.0.4 + 1.0.0.0 fanly surging Micro Service Framework Copyright © fanly All Rights Reserved. - 1. Fix errors caused by dynamically loading assemblies + 1. fix bug + https://github.com/dotnetcore/surging https://github.com/dotnetcore/surging/blob/master/LICENSE MicroService surging - 0.9.0.4 - 0.9.0.4 + 1.0.0.0 + 1.0.0.0 surging is a distributed micro service framework that provides high-performance RPC remote service calls, using Zookeeper, Consul as the registration center for surging services, integrating hash, random, polling as a load balancing algorithm, RPC integration using the netty framework, Using asynchronous transmission. Use json.net, protobuf, messagepack for serialization Codec diff --git a/src/Surging.Core/Surging.Core.ServiceHosting/Surging.Core.ServiceHosting.csproj b/src/Surging.Core/Surging.Core.ServiceHosting/Surging.Core.ServiceHosting.csproj index 711097b85..5c246c6ca 100644 --- a/src/Surging.Core/Surging.Core.ServiceHosting/Surging.Core.ServiceHosting.csproj +++ b/src/Surging.Core/Surging.Core.ServiceHosting/Surging.Core.ServiceHosting.csproj @@ -4,17 +4,19 @@ netcoreapp2.1 Surging.Core.ServiceHosting Copyright © fanly All Rights Reserved. - 0.9.0.4 + 1.0.0.0 fanly surging Micro Service Framework - 1. Fix errors caused by dynamically loading assemblies + 1. add KestrelHttpServer support +2.add Swagger support +3. fix bug MicroService surging https://github.com/dotnetcore/surging/blob/master/LICENSE https://github.com/dotnetcore/surging surging is a distributed micro service framework that provides high-performance RPC remote service calls, using Zookeeper, Consul as the registration center for surging services, integrating hash, random, polling as a load balancing algorithm, RPC integration using the netty framework, Using asynchronous transmission. Use json.net, protobuf, messagepack for serialization Codec - 0.9.0.4 - 0.9.0.4 + 1.0.0.0 + 1.0.0.0 diff --git a/src/Surging.Core/Surging.Core.Swagger/Surging.Core.Swagger.csproj b/src/Surging.Core/Surging.Core.Swagger/Surging.Core.Swagger.csproj index 5fa7b2a3e..877e007ec 100644 --- a/src/Surging.Core/Surging.Core.Swagger/Surging.Core.Swagger.csproj +++ b/src/Surging.Core/Surging.Core.Swagger/Surging.Core.Swagger.csproj @@ -2,6 +2,20 @@ netcoreapp2.1 + 1.0.0.0 + fanly + fanly + surging Micro Service Framework + surging is a distributed micro service framework that provides high-performance RPC remote service calls, using Zookeeper, Consul as the registration center for surging services, integrating hash, random, polling as a load balancing algorithm, RPC integration using the netty framework, Using asynchronous transmission. Use json.net, protobuf, messagepack for serialization Codec + Copyright © fanly All Rights Reserved. + https://github.com/dotnetcore/surging/blob/master/LICENSE + https://github.com/dotnetcore/surging + MicroService surging + 1. add KestrelHttpServer support +2.add Swagger support +3. fix bug + 1.0.0.0 + 1.0.0.0 diff --git a/src/Surging.Core/Surging.Core.Swagger/Swagger/Model/SwaggerDocument.cs b/src/Surging.Core/Surging.Core.Swagger/Swagger/Model/SwaggerDocument.cs index 45b59e648..bc3a17b55 100644 --- a/src/Surging.Core/Surging.Core.Swagger/Swagger/Model/SwaggerDocument.cs +++ b/src/Surging.Core/Surging.Core.Swagger/Swagger/Model/SwaggerDocument.cs @@ -140,7 +140,7 @@ public Operation() public IList Parameters { get; set; } public IDictionary Responses { get; set; } - + public IList Schemes { get; set; } public bool? Deprecated { get; set; } diff --git a/src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/ISchemaRegistry.cs b/src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/ISchemaRegistry.cs index aa4e7a32a..867203486 100644 --- a/src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/ISchemaRegistry.cs +++ b/src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/ISchemaRegistry.cs @@ -7,6 +7,8 @@ public interface ISchemaRegistry { Schema GetOrRegister(Type type); + Schema GetOrRegister(string parmName, Type type); + IDictionary Definitions { get; } } } diff --git a/src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/SchemaRegistry.cs b/src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/SchemaRegistry.cs index 4d454891d..35534bf81 100644 --- a/src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/SchemaRegistry.cs +++ b/src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/SchemaRegistry.cs @@ -31,9 +31,12 @@ public SchemaRegistry( public IDictionary Definitions { get; private set; } public Schema GetOrRegister(Type type) + => GetOrRegister(null, type); + + public Schema GetOrRegister(string paramName, Type type) { var referencedTypes = new Queue(); - var schema = CreateSchema(type, referencedTypes); + var schema = CreateSchema(paramName,type, referencedTypes); // Ensure all referenced types have a corresponding definition while (referencedTypes.Any()) @@ -46,13 +49,17 @@ public Schema GetOrRegister(Type type) // and prevents a stack overflow by ensuring the above condition is met if the same // type ends up back on the referencedTypes queue via recursion within 'CreateInlineSchema' Definitions.Add(schemaId, null); - Definitions[schemaId] = CreateInlineSchema(referencedType, referencedTypes); + Definitions[schemaId] = CreateInlineSchema(paramName, referencedType, referencedTypes); } return schema; } - private Schema CreateSchema(Type type, Queue referencedTypes) + private Schema CreateSchema(Type type, Queue referencedTypes) => + CreateSchema(null, type, referencedTypes); + + + private Schema CreateSchema(string paramName, Type type, Queue referencedTypes) { // If Option (F#), use the type argument if (type.IsFSharpOption()) @@ -71,7 +78,7 @@ jsonContract is JsonObjectContract || return createReference ? CreateReferenceSchema(type, referencedTypes) - : CreateInlineSchema(type, referencedTypes); + : CreateInlineSchema(paramName, type, referencedTypes); } private Schema CreateReferenceSchema(Type type, Queue referencedTypes) @@ -80,7 +87,7 @@ private Schema CreateReferenceSchema(Type type, Queue referencedTypes) return new Schema { Ref = "#/definitions/" + _schemaIdManager.IdFor(type) }; } - private Schema CreateInlineSchema(Type type, Queue referencedTypes) + private Schema CreateInlineSchema(string paramName, Type type, Queue referencedTypes) { Schema schema; @@ -96,7 +103,7 @@ private Schema CreateInlineSchema(Type type, Queue referencedTypes) if (jsonContract is JsonPrimitiveContract) schema = CreatePrimitiveSchema((JsonPrimitiveContract)jsonContract); else if (jsonContract is JsonDictionaryContract) - schema = CreateDictionarySchema((JsonDictionaryContract)jsonContract, referencedTypes); + schema = CreateDictionarySchema(paramName,(JsonDictionaryContract)jsonContract, referencedTypes); else if (jsonContract is JsonArrayContract) schema = CreateArraySchema((JsonArrayContract)jsonContract, referencedTypes); else if (jsonContract is JsonObjectContract && type != typeof(object)) @@ -171,7 +178,7 @@ private Schema CreateEnumSchema(JsonPrimitiveContract primitiveContract, Type ty }; } - private Schema CreateDictionarySchema(JsonDictionaryContract dictionaryContract, Queue referencedTypes) + private Schema CreateDictionarySchema(string paramName, JsonDictionaryContract dictionaryContract, Queue referencedTypes) { var keyType = dictionaryContract.DictionaryKeyType ?? typeof(object); var valueType = dictionaryContract.DictionaryValueType ?? typeof(object); @@ -187,6 +194,16 @@ private Schema CreateDictionarySchema(JsonDictionaryContract dictionaryContract, ) }; } + else if(!string.IsNullOrEmpty(paramName)) + { + return new Schema + { + Type = "object", + Properties = new Dictionary { {paramName, + CreateSchema(valueType, referencedTypes) } } + + }; + } else { return new Schema diff --git a/src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/SwaggerGenerator.cs b/src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/SwaggerGenerator.cs index b24da5f08..a9eeb263b 100644 --- a/src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/SwaggerGenerator.cs +++ b/src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/SwaggerGenerator.cs @@ -57,8 +57,6 @@ public SwaggerDocument GetSwagger( var entry = _serviceEntryProvider.GetALLEntries(); - - var schemaRegistry = _schemaRegistryFactory.Create(); var swaggerDoc = new SwaggerDocument @@ -73,27 +71,20 @@ public SwaggerDocument GetSwagger( Security = _options.SecurityRequirements.Any() ? _options.SecurityRequirements : null }; - //var filterContext = new DocumentFilterContext( - // _apiDescriptionsProvider.ApiDescriptionGroups, - // applicableApiDescriptions, - // schemaRegistry); - - //foreach (var filter in _options.DocumentFilters) - //{ - // filter.Apply(swaggerDoc, filterContext); - //} - return swaggerDoc; } private Dictionary CreatePathItems( - IEnumerable apiDescriptions, + IEnumerable apiDescriptions, ISchemaRegistry schemaRegistry) { + return apiDescriptions - .OrderBy(p=>p.RoutePath) + .OrderBy(p => p.RoutePath) .GroupBy(apiDesc => apiDesc.Descriptor.RoutePath) - .ToDictionary(entry => "/" + entry.Key, entry => CreatePathItem(entry, schemaRegistry)); + .ToDictionary(entry => + entry.Key.IndexOf("/") == 0 ? entry.Key : $"/{entry.Key}" + , entry => CreatePathItem(entry, schemaRegistry)); } private Dictionary CreatePathItems( @@ -201,6 +192,7 @@ private Operation CreateOperation(ServiceEntry serviceEntry, MethodInfo methodIn Responses = CreateResponses(serviceEntry,methodInfo, schemaRegistry), }; + var filterContext = new OperationFilterContext( null, schemaRegistry, @@ -311,15 +303,31 @@ private IList CreateParameters( ServiceEntry serviceEntry, MethodInf }; return parameterInfo !=null && parameterInfo.Any(p => ! UtilityType.ConvertibleType.GetTypeInfo().IsAssignableFrom(p.ParameterType) && p.ParameterType.Name != "HttpFormCollection") - ? parameterInfo.Select(p=> CreateBodyParameter(p,schemaRegistry)).ToList(): - parameterInfo.Select(p => CreateNonBodyParameter(p, schemaRegistry)).ToList(); + ? new List { CreateServiceKeyParameter() }.Union(parameterInfo.Select(p=> CreateBodyParameter(p,schemaRegistry))).ToList(): + new List { CreateServiceKeyParameter() }.Union(parameterInfo.Select(p => CreateNonBodyParameter(p, schemaRegistry))).ToList(); } private IParameter CreateBodyParameter(ParameterInfo parameterInfo, ISchemaRegistry schemaRegistry) { - var schema = schemaRegistry.GetOrRegister(parameterInfo.ParameterType); + + var schema = schemaRegistry.GetOrRegister(parameterInfo.Name,typeof(IDictionary<,>).MakeGenericType(typeof(string), parameterInfo.ParameterType)); return new BodyParameter { Name = parameterInfo.Name,Schema=schema, Required = true }; } + + private IParameter CreateServiceKeyParameter() + { + var nonBodyParam = new NonBodyParameter + { + Name = "servicekey", + In = "query", + Required = false, + }; + var schema = new Schema(); + schema.Description = "ServiceKey"; + nonBodyParam.PopulateFrom(schema); + return nonBodyParam; + } + private IParameter CreateNonBodyParameter(ParameterInfo parameterInfo, ISchemaRegistry schemaRegistry) { var nonBodyParam = new NonBodyParameter diff --git a/src/Surging.Core/Surging.Core.Zookeeper/Configurations/ConfigInfo.cs b/src/Surging.Core/Surging.Core.Zookeeper/Configurations/ConfigInfo.cs index 75bbb215d..108257360 100644 --- a/src/Surging.Core/Surging.Core.Zookeeper/Configurations/ConfigInfo.cs +++ b/src/Surging.Core/Surging.Core.Zookeeper/Configurations/ConfigInfo.cs @@ -14,11 +14,13 @@ public class ConfigInfo /// 订阅者配置路径 /// 服务命令配置路径 /// 缓存中心配置路径 + /// mqtt路由配置路径 /// 根节点。 public ConfigInfo(string connectionString, string routePath = "/services/serviceRoutes", string subscriberPath = "/services/serviceSubscribers", string commandPath = "/services/serviceCommands", - string cachePath = "/services/serviceCaches", + string cachePath = "/services/serviceCaches", + string mqttRoutePath = "services/mqttServiceRoutes/", string chRoot = null, bool reloadOnChange = false, bool enableChildrenMonitor = false) : this(connectionString, TimeSpan.FromSeconds(20), @@ -26,6 +28,7 @@ public ConfigInfo(string connectionString, string routePath = "/services/service subscriberPath, commandPath, cachePath, + mqttRoutePath, chRoot, reloadOnChange, enableChildrenMonitor) { @@ -40,11 +43,13 @@ public ConfigInfo(string connectionString, string routePath = "/services/service /// 订阅者配置路径 /// 会话超时时间。 /// 缓存中心配置路径 + /// mqtt路由配置路径 /// 根节点。 public ConfigInfo(string connectionString, TimeSpan sessionTimeout, string routePath = "/services/serviceRoutes", string subscriberPath = "/services/serviceSubscribers", string commandPath = "/services/serviceCommands", string cachePath = "/services/serviceCaches", + string mqttRoutePath = "services/mqttServiceRoutes/", string chRoot = null, bool reloadOnChange = false, bool enableChildrenMonitor = false) { @@ -97,5 +102,11 @@ public ConfigInfo(string connectionString, TimeSpan sessionTimeout, string route /// 缓存中心配置中心 /// public string CachePath { get; set; } + + + /// + /// Mqtt路由配置路径。 + /// + public string MqttRoutePath { get; set; } } } diff --git a/src/Surging.Core/Surging.Core.Zookeeper/Configurations/ZookeeperOption.cs b/src/Surging.Core/Surging.Core.Zookeeper/Configurations/ZookeeperOption.cs index a0b850577..a973cf1f2 100644 --- a/src/Surging.Core/Surging.Core.Zookeeper/Configurations/ZookeeperOption.cs +++ b/src/Surging.Core/Surging.Core.Zookeeper/Configurations/ZookeeperOption.cs @@ -21,6 +21,8 @@ public class ZookeeperOption public string CachePath { get; set; } + public string MqttRoutePath { get; set; } + public string ReloadOnChange { get; set; } public string EnableChildrenMonitor { get; set; } diff --git a/src/Surging.Core/Surging.Core.Zookeeper/ContainerBuilderExtensions.cs b/src/Surging.Core/Surging.Core.Zookeeper/ContainerBuilderExtensions.cs index 25ad8a995..e9db78f34 100644 --- a/src/Surging.Core/Surging.Core.Zookeeper/ContainerBuilderExtensions.cs +++ b/src/Surging.Core/Surging.Core.Zookeeper/ContainerBuilderExtensions.cs @@ -3,6 +3,7 @@ using Microsoft.Extensions.Logging; using Surging.Core.CPlatform; using Surging.Core.CPlatform.Cache; +using Surging.Core.CPlatform.Mqtt; using Surging.Core.CPlatform.Routing; using Surging.Core.CPlatform.Runtime.Client; using Surging.Core.CPlatform.Runtime.Server; @@ -31,6 +32,20 @@ public static IServiceBuilder UseZooKeeperRouteManager(this IServiceBuilder buil provider.GetRequiredService>())); } + public static IServiceBuilder UseZooKeeperMqttRouteManager(this IServiceBuilder builder, ConfigInfo configInfo) + { + return builder.UseMqttRouteManager(provider => + { + var result = new ZooKeeperMqttServiceRouteManager( + GetConfigInfo(configInfo), + provider.GetRequiredService>(), + provider.GetRequiredService>(), + provider.GetRequiredService(), + provider.GetRequiredService>()); + return result; + }); + } + /// /// 设置服务命令管理者。 /// @@ -83,7 +98,8 @@ public static IServiceBuilder UseZooKeeperManager(this IServiceBuilder builder, return builder.UseZooKeeperRouteManager(configInfo) .UseZooKeeperCacheManager(configInfo) .UseZooKeeperServiceSubscribeManager(configInfo) - .UseZooKeeperCommandManager(configInfo); + .UseZooKeeperCommandManager(configInfo) + .UseZooKeeperMqttRouteManager(configInfo); } public static IServiceBuilder UseZooKeeperManager(this IServiceBuilder builder) @@ -92,7 +108,8 @@ public static IServiceBuilder UseZooKeeperManager(this IServiceBuilder builder) return builder.UseZooKeeperRouteManager(configInfo) .UseZooKeeperCacheManager(configInfo) .UseZooKeeperServiceSubscribeManager(configInfo) - .UseZooKeeperCommandManager(configInfo); + .UseZooKeeperCommandManager(configInfo) + .UseZooKeeperMqttRouteManager(configInfo); } @@ -115,10 +132,11 @@ private static ConfigInfo GetConfigInfo(ConfigInfo config) option.SubscriberPath ?? config.SubscriberPath, option.CommandPath ?? config.CommandPath, option.CachePath ?? config.CachePath, + option.MqttRoutePath ?? config.MqttRoutePath, option.ChRoot ?? config.ChRoot, option.ReloadOnChange != null ? bool.Parse(option.ReloadOnChange) : config.ReloadOnChange, - option.EnableChildrenMonitor!= null ? bool.Parse(option.EnableChildrenMonitor): + option.EnableChildrenMonitor != null ? bool.Parse(option.EnableChildrenMonitor) : config.EnableChildrenMonitor ); } diff --git a/src/Surging.Core/Surging.Core.Zookeeper/Surging.Core.Zookeeper.csproj b/src/Surging.Core/Surging.Core.Zookeeper/Surging.Core.Zookeeper.csproj index 2a3f73aec..416fb7059 100644 --- a/src/Surging.Core/Surging.Core.Zookeeper/Surging.Core.Zookeeper.csproj +++ b/src/Surging.Core/Surging.Core.Zookeeper/Surging.Core.Zookeeper.csproj @@ -2,7 +2,7 @@ netcoreapp2.1 - 0.9.0.2 + 1.0.0.0 fanly surging Micro Service Framework @@ -11,9 +11,9 @@ https://github.com/dotnetcore/surging surging is a distributed micro service framework that provides high-performance RPC remote service calls, using Zookeeper, Consul as the registration center for surging services, integrating hash, random, polling as a load balancing algorithm, RPC integration using the netty framework, Using asynchronous transmission. Use json.net, protobuf, messagepack for serialization Codec MicroService surging - 1.Support for hot-swap engine components - 0.9.0.2 - 0.9.0.2 + 1. fix bug + 1.0.0.0 + 1.0.0.0 diff --git a/src/Surging.Core/Surging.Core.Zookeeper/ZooKeeperMqttServiceRouteManager.cs b/src/Surging.Core/Surging.Core.Zookeeper/ZooKeeperMqttServiceRouteManager.cs new file mode 100644 index 000000000..c3a988c79 --- /dev/null +++ b/src/Surging.Core/Surging.Core.Zookeeper/ZooKeeperMqttServiceRouteManager.cs @@ -0,0 +1,410 @@ +using Microsoft.Extensions.Logging; +using org.apache.zookeeper; +using Surging.Core.CPlatform.Address; +using Surging.Core.CPlatform.Mqtt; +using Surging.Core.CPlatform.Mqtt.Implementation; +using Surging.Core.CPlatform.Serialization; +using Surging.Core.CPlatform.Transport.Implementation; +using Surging.Core.CPlatform.Utilities; +using Surging.Core.Zookeeper.Configurations; +using Surging.Core.Zookeeper.WatcherProvider; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Surging.Core.Zookeeper +{ + public class ZooKeeperMqttServiceRouteManager : MqttServiceRouteManagerBase, IDisposable + { + private ZooKeeper _zooKeeper; + private readonly ConfigInfo _configInfo; + private readonly ISerializer _serializer; + private readonly IMqttServiceFactory _mqttServiceFactory; + private readonly ILogger _logger; + private MqttServiceRoute[] _routes; + private readonly ManualResetEvent _connectionWait = new ManualResetEvent(false); + + public ZooKeeperMqttServiceRouteManager(ConfigInfo configInfo, ISerializer serializer, + ISerializer stringSerializer, IMqttServiceFactory mqttServiceFactory, + ILogger logger) : base(stringSerializer) + { + _configInfo = configInfo; + _serializer = serializer; + _mqttServiceFactory = mqttServiceFactory; + _logger = logger; + CreateZooKeeper().Wait(); + EnterRoutes().Wait(); + } + + + /// + /// 获取所有可用的mqtt服务路由信息。 + /// + /// 服务路由集合。 + public override async Task> GetRoutesAsync() + { + await EnterRoutes(); + return _routes; + } + + /// + /// 清空所有的mqtt服务路由。 + /// + /// 一个任务。 + public override async Task ClearAsync() + { + if (_logger.IsEnabled(LogLevel.Information)) + _logger.LogInformation("准备清空所有mqtt路由配置。"); + var path = _configInfo.MqttRoutePath; + var childrens = path.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries); + + var index = 0; + while (childrens.Count() > 1) + { + var nodePath = "/" + string.Join("/", childrens); + + if (await _zooKeeper.existsAsync(nodePath) != null) + { + var result = await _zooKeeper.getChildrenAsync(nodePath); + if (result?.Children != null) + { + foreach (var child in result.Children) + { + var childPath = $"{nodePath}/{child}"; + if (_logger.IsEnabled(LogLevel.Debug)) + _logger.LogDebug($"准备删除：{childPath}。"); + await _zooKeeper.deleteAsync(childPath); + } + } + if (_logger.IsEnabled(LogLevel.Debug)) + _logger.LogDebug($"准备删除：{nodePath}。"); + await _zooKeeper.deleteAsync(nodePath); + } + index++; + childrens = childrens.Take(childrens.Length - index).ToArray(); + } + if (_logger.IsEnabled(LogLevel.Information)) + _logger.LogInformation("路由配置清空完成。"); + } + + /// + /// 设置mqtt服务路由。 + /// + /// 服务路由集合。 + /// 一个任务。 + protected override async Task SetRoutesAsync(IEnumerable routes) + { + if (_logger.IsEnabled(LogLevel.Information)) + _logger.LogInformation("准备添加mqtt服务路由。"); + await CreateSubdirectory(_configInfo.MqttRoutePath); + + var path = _configInfo.MqttRoutePath; + if (!path.EndsWith("/")) + path += "/"; + + routes = routes.ToArray(); + + foreach (var serviceRoute in routes) + { + var nodePath = $"{path}{serviceRoute.MqttDescriptor.Topic}"; + var nodeData = _serializer.Serialize(serviceRoute); + if (await _zooKeeper.existsAsync(nodePath) == null) + { + if (_logger.IsEnabled(LogLevel.Debug)) + _logger.LogDebug($"节点：{nodePath}不存在将进行创建。"); + + await _zooKeeper.createAsync(nodePath, nodeData, ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); + } + else + { + if (_logger.IsEnabled(LogLevel.Debug)) + _logger.LogDebug($"将更新节点：{nodePath}的数据。"); + + var onlineData = (await _zooKeeper.getDataAsync(nodePath)).Data; + if (!DataEquals(nodeData, onlineData)) + await _zooKeeper.setDataAsync(nodePath, nodeData); + } + } + if (_logger.IsEnabled(LogLevel.Information)) + _logger.LogInformation("mqtt服务路由添加成功。"); + } + + public override async Task RemveAddressAsync(IEnumerable Address) + { + var routes = await GetRoutesAsync(); + foreach (var route in routes) + { + route.MqttEndpoint = route.MqttEndpoint.Except(Address); + } + await base.SetRoutesAsync(routes); + } + + public override async Task RemoveByTopicAsync(string topic, IEnumerable endpoint) + { + var routes = await GetRoutesAsync(); + var route = routes.Where(p => p.MqttDescriptor.Topic == topic).SingleOrDefault(); + if (route != null) + { + route.MqttEndpoint = route.MqttEndpoint.Except(endpoint); + await base.SetRoutesAsync(new MqttServiceRoute[] { route }); + } + } + + public override async Task SetRoutesAsync(IEnumerable routes) + { + var hostAddr = NetUtils.GetHostAddress(); + var serviceRoutes = await GetRoutes(routes.Select(p => p.MqttDescriptor.Topic)); + if (serviceRoutes.Count() > 0) + { + foreach (var route in routes) + { + var serviceRoute = serviceRoutes.Where(p => p.MqttDescriptor.Topic == route.MqttDescriptor.Topic).FirstOrDefault(); + if (serviceRoute != null) + { + var addresses = serviceRoute.MqttEndpoint.Concat( + route.MqttEndpoint.Except(serviceRoute.MqttEndpoint)).ToList(); + + foreach (var address in route.MqttEndpoint) + { + addresses.Remove(addresses.Where(p => p.ToString() == address.ToString()).FirstOrDefault()); + addresses.Add(address); + } + route.MqttEndpoint = addresses; + } + } + } + await RemoveExceptRoutesAsync(routes, hostAddr); + await base.SetRoutesAsync(routes); + } + + private async Task RemoveExceptRoutesAsync(IEnumerable routes, AddressModel hostAddr) + { + var path = _configInfo.MqttRoutePath; + if (!path.EndsWith("/")) + path += "/"; + routes = routes.ToArray(); + if (_routes != null) + { + var oldRouteTopics = _routes.Select(i => i.MqttDescriptor.Topic).ToArray(); + var newRouteTopics = routes.Select(i => i.MqttDescriptor.Topic).ToArray(); + var deletedRouteTopics = oldRouteTopics.Except(newRouteTopics).ToArray(); + foreach (var deletedRouteTopic in deletedRouteTopics) + { + var addresses = _routes.Where(p => p.MqttDescriptor.Topic == deletedRouteTopic).Select(p => p.MqttEndpoint).FirstOrDefault(); + if (addresses.Contains(hostAddr)) + { + var nodePath = $"{path}{deletedRouteTopic}"; + await _zooKeeper.deleteAsync(nodePath); + } + } + } + } + + private async Task CreateZooKeeper() + { + if (_zooKeeper != null) + await _zooKeeper.closeAsync(); + _zooKeeper = new ZooKeeper(_configInfo.ConnectionString, (int)_configInfo.SessionTimeout.TotalMilliseconds + , new ReconnectionWatcher( + () => + { + _connectionWait.Set(); + }, + () => + { + _connectionWait.Close(); + }, + async () => + { + _connectionWait.Reset(); + await CreateZooKeeper(); + })); + + } + + private async Task CreateSubdirectory(string path) + { + _connectionWait.WaitOne(); + if (await _zooKeeper.existsAsync(path) != null) + return; + + if (_logger.IsEnabled(LogLevel.Information)) + _logger.LogInformation($"节点{path}不存在，将进行创建。"); + + var childrens = path.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries); + var nodePath = "/"; + + foreach (var children in childrens) + { + nodePath += children; + if (await _zooKeeper.existsAsync(nodePath) == null) + { + await _zooKeeper.createAsync(nodePath, null, ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); + } + nodePath += "/"; + } + } + + private async Task GetRoute(byte[] data) + { + if (_logger.IsEnabled(LogLevel.Debug)) + _logger.LogDebug($"准备转换mqtt服务路由，配置内容：{Encoding.UTF8.GetString(data)}。"); + + if (data == null) + return null; + + var descriptor = _serializer.Deserialize(data); + return (await _mqttServiceFactory.CreateMqttServiceRoutesAsync(new[] { descriptor })).First(); + } + + private async Task GetRoute(string path) + { + MqttServiceRoute result = null; + var watcher = new NodeMonitorWatcher(_zooKeeper, path, + async (oldData, newData) => await NodeChange(oldData, newData)); + if (await _zooKeeper.existsAsync(path) != null) + { + var data = (await _zooKeeper.getDataAsync(path, watcher)).Data; + watcher.SetCurrentData(data); + result = await GetRoute(data); + } + return result; + } + + private async Task GetRoutes(IEnumerable childrens) + { + var rootPath = _configInfo.MqttRoutePath; + if (!rootPath.EndsWith("/")) + rootPath += "/"; + + childrens = childrens.ToArray(); + var routes = new List(childrens.Count()); + + foreach (var children in childrens) + { + if (_logger.IsEnabled(LogLevel.Debug)) + _logger.LogDebug($"准备从节点：{children}中获取mqtt路由信息。"); + + var nodePath = $"{rootPath}{children}"; + var route = await GetRoute(nodePath); + if (route != null) + routes.Add(route); + } + + return routes.ToArray(); + } + + private async Task EnterRoutes() + { + if (_routes != null) + return; + _connectionWait.WaitOne(); + var watcher = new ChildrenMonitorWatcher(_zooKeeper, _configInfo.MqttRoutePath, + async (oldChildrens, newChildrens) => await ChildrenChange(oldChildrens, newChildrens)); + if (await _zooKeeper.existsAsync(_configInfo.MqttRoutePath, watcher) != null) + { + var result = await _zooKeeper.getChildrenAsync(_configInfo.MqttRoutePath, watcher); + var childrens = result.Children.ToArray(); + watcher.SetCurrentData(childrens); + _routes = await GetRoutes(childrens); + } + else + { + if (_logger.IsEnabled(LogLevel.Warning)) + _logger.LogWarning($"无法获取mqtt路由信息，因为节点：{_configInfo.RoutePath}，不存在。"); + _routes = new MqttServiceRoute[0]; + } + } + + private static bool DataEquals(IReadOnlyList data1, IReadOnlyList data2) + { + if (data1.Count != data2.Count) + return false; + for (var i = 0; i < data1.Count; i++) + { + var b1 = data1[i]; + var b2 = data2[i]; + if (b1 != b2) + return false; + } + return true; + } + + public async Task NodeChange(byte[] oldData, byte[] newData) + { + if (DataEquals(oldData, newData)) + return; + + var newRoute = await GetRoute(newData); + //得到旧的mqtt路由。 + var oldRoute = _routes.FirstOrDefault(i => i.MqttDescriptor.Topic == newRoute.MqttDescriptor.Topic); + + lock (_routes) + { + //删除旧mqtt路由，并添加上新的mqtt路由。 + _routes = + _routes + .Where(i => i.MqttDescriptor.Topic != newRoute.MqttDescriptor.Topic) + .Concat(new[] { newRoute }).ToArray(); + } + + //触发路由变更事件。 + OnChanged(new MqttServiceRouteChangedEventArgs(newRoute, oldRoute)); + } + + public async Task ChildrenChange(string[] oldChildrens, string[] newChildrens) + { + if (_logger.IsEnabled(LogLevel.Debug)) + _logger.LogDebug($"最新的mqtt节点信息：{string.Join(",", newChildrens)}"); + + if (_logger.IsEnabled(LogLevel.Debug)) + _logger.LogDebug($"旧的mqtt节点信息：{string.Join(",", oldChildrens)}"); + + //计算出已被删除的节点。 + var deletedChildrens = oldChildrens.Except(newChildrens).ToArray(); + //计算出新增的节点。 + var createdChildrens = newChildrens.Except(oldChildrens).ToArray(); + + if (_logger.IsEnabled(LogLevel.Debug)) + _logger.LogDebug($"需要被删除的mqtt路由节点：{string.Join(",", deletedChildrens)}"); + if (_logger.IsEnabled(LogLevel.Debug)) + _logger.LogDebug($"需要被添加的mqtt路由节点：{string.Join(",", createdChildrens)}"); + + //获取新增的mqtt路由信息。 + var newRoutes = (await GetRoutes(createdChildrens)).ToArray(); + + var routes = _routes.ToArray(); + lock (_routes) + { + _routes = _routes + //删除无效的节点路由。 + .Where(i => !deletedChildrens.Contains(i.MqttDescriptor.Topic)) + //连接上新的mqtt路由。 + .Concat(newRoutes) + .ToArray(); + } + //需要删除的Topic路由集合。 + var deletedRoutes = routes.Where(i => deletedChildrens.Contains(i.MqttDescriptor.Topic)).ToArray(); + //触发删除事件。 + OnRemoved(deletedRoutes.Select(route => new MqttServiceRouteEventArgs(route)).ToArray()); + + //触发路由被创建事件。 + OnCreated(newRoutes.Select(route => new MqttServiceRouteEventArgs(route)).ToArray()); + + if (_logger.IsEnabled(LogLevel.Information)) + _logger.LogInformation("mqtt路由数据更新成功。"); + } + + + /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. + public void Dispose() + { + _connectionWait.Dispose(); + _zooKeeper.closeAsync().Wait(); + } + + } +} diff --git a/src/Surging.Core/Surging.Core.Zookeeper/ZooKeeperServiceRouteManager.cs b/src/Surging.Core/Surging.Core.Zookeeper/ZooKeeperServiceRouteManager.cs index 96d31ea1e..892b52f4a 100644 --- a/src/Surging.Core/Surging.Core.Zookeeper/ZooKeeperServiceRouteManager.cs +++ b/src/Surging.Core/Surging.Core.Zookeeper/ZooKeeperServiceRouteManager.cs @@ -5,6 +5,7 @@ using Surging.Core.CPlatform.Routing.Implementation; using Surging.Core.CPlatform.Serialization; using Surging.Core.CPlatform.Transport.Implementation; +using Surging.Core.CPlatform.Utilities; using Surging.Core.Zookeeper.Configurations; using Surging.Core.Zookeeper.WatcherProvider; using System; @@ -144,7 +145,7 @@ public override async Task RemveAddressAsync(IEnumerable Address) public override async Task SetRoutesAsync(IEnumerable routes) { - var hostAddr = RpcContext.GetContext().GetAttachment("Host") as AddressModel; + var hostAddr = NetUtils.GetHostAddress(); var serviceRoutes = await GetRoutes(routes.Select(p => p.ServiceDescriptor.Id)); if (serviceRoutes.Count() > 0) { diff --git a/src/Surging.Core/Surging.Core.Zookeeper/ZookeeperModule.cs b/src/Surging.Core/Surging.Core.Zookeeper/ZookeeperModule.cs index d072075b0..9825aaf58 100644 --- a/src/Surging.Core/Surging.Core.Zookeeper/ZookeeperModule.cs +++ b/src/Surging.Core/Surging.Core.Zookeeper/ZookeeperModule.cs @@ -4,6 +4,7 @@ using Surging.Core.CPlatform; using Surging.Core.CPlatform.Cache; using Surging.Core.CPlatform.Module; +using Surging.Core.CPlatform.Mqtt; using Surging.Core.CPlatform.Routing; using Surging.Core.CPlatform.Runtime.Client; using Surging.Core.CPlatform.Runtime.Server; @@ -59,6 +60,12 @@ public ContainerBuilderWrapper UseCacheManager(ContainerBuilderWrapper builder, return builder; } + public ContainerBuilderWrapper UseMqttRouteManager(ContainerBuilderWrapper builder, Func factory) + { + builder.RegisterAdapter(factory).InstancePerLifetimeScope(); + return builder; + } + /// /// 设置共享文件路由管理者。 /// @@ -77,6 +84,22 @@ public ZookeeperModule UseZooKeeperRouteManager(ContainerBuilderWrapper builder, return this; } + public ZookeeperModule UseZooKeeperMqttRouteManager(ContainerBuilderWrapper builder, ConfigInfo configInfo) + { + UseMqttRouteManager(builder, provider => + { + var result = new ZooKeeperMqttServiceRouteManager( + GetConfigInfo(configInfo), + provider.GetRequiredService>(), + provider.GetRequiredService>(), + provider.GetRequiredService(), + provider.GetRequiredService>()); + return result; + }); + return this; + } + + /// /// 设置服务命令管理者。 /// @@ -145,6 +168,7 @@ private static ConfigInfo GetConfigInfo(ConfigInfo config) option.SubscriberPath ?? config.SubscriberPath, option.CommandPath ?? config.CommandPath, option.CachePath ?? config.CachePath, + option.MqttRoutePath ?? config.MqttRoutePath, option.ChRoot ?? config.ChRoot, option.ReloadOnChange != null ? bool.Parse(option.ReloadOnChange) : config.ReloadOnChange, diff --git a/src/Surging.IModuleServices/Surging.IModuleServices.Common/IChatService.cs b/src/Surging.IModuleServices/Surging.IModuleServices.Common/IChatService.cs index d7421e6c8..9d9d57171 100644 --- a/src/Surging.IModuleServices/Surging.IModuleServices.Common/IChatService.cs +++ b/src/Surging.IModuleServices/Surging.IModuleServices.Common/IChatService.cs @@ -3,6 +3,7 @@ using Surging.Core.CPlatform.Runtime.Server.Implementation.ServiceDiscovery.Attributes; using Surging.Core.CPlatform.Support.Attributes; using Surging.Core.Protocol.WS; +using Surging.Core.Protocol.WS.Attributes; using System; using System.Collections.Generic; using System.Text; @@ -11,6 +12,7 @@ namespace Surging.IModuleServices.Common { [ServiceBundle("Api/{Service}")] + [BehaviorContract(IgnoreExtensions =true)] public interface IChatService: IServiceKey { [Command( ShuntStrategy=AddressSelectorMode.HashAlgorithm)] diff --git a/src/Surging.IModuleServices/Surging.IModuleServices.Common/IControllerService.cs b/src/Surging.IModuleServices/Surging.IModuleServices.Common/IControllerService.cs new file mode 100644 index 000000000..eb0bbdb74 --- /dev/null +++ b/src/Surging.IModuleServices/Surging.IModuleServices.Common/IControllerService.cs @@ -0,0 +1,23 @@ +using Surging.Core.CPlatform.Ioc; +using Surging.Core.CPlatform.Runtime.Client.Address.Resolvers.Implementation.Selectors.Implementation; +using Surging.Core.CPlatform.Runtime.Server.Implementation.ServiceDiscovery.Attributes; +using Surging.Core.CPlatform.Support.Attributes; +using Surging.Core.Protocol.Mqtt.Internal.Enums; +using Surging.IModuleServices.Common.Models; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Surging.IModuleServices.Common +{ + [ServiceBundle("Device/{Service}")] + public interface IControllerService : IServiceKey + { + [Command(ShuntStrategy = AddressSelectorMode.HashAlgorithm)] + Task Publish(string deviceId, WillMessage message); + + [Command(ShuntStrategy = AddressSelectorMode.HashAlgorithm)] + Task IsOnline(string deviceId); + } +} diff --git a/src/Surging.IModuleServices/Surging.IModuleServices.Common/IUserService.cs b/src/Surging.IModuleServices/Surging.IModuleServices.Common/IUserService.cs index 3d01c33f2..e8d34e7b7 100644 --- a/src/Surging.IModuleServices/Surging.IModuleServices.Common/IUserService.cs +++ b/src/Surging.IModuleServices/Surging.IModuleServices.Common/IUserService.cs @@ -1,22 +1,18 @@ -using Newtonsoft.Json.Linq; -using Surging.Core.Caching; -using Surging.Core.CPlatform; +using Surging.Core.Caching; +using Surging.Core.Common; using Surging.Core.CPlatform.EventBus.Events; using Surging.Core.CPlatform.Filters.Implementation; using Surging.Core.CPlatform.Ioc; -using Surging.Core.CPlatform.Routing.Implementation; using Surging.Core.CPlatform.Runtime.Client.Address.Resolvers.Implementation.Selectors.Implementation; using Surging.Core.CPlatform.Runtime.Server.Implementation.ServiceDiscovery.Attributes; using Surging.Core.CPlatform.Support; using Surging.Core.CPlatform.Support.Attributes; using Surging.Core.KestrelHttpServer; using Surging.Core.KestrelHttpServer.Internal; -using Surging.Core.ProxyGenerator.Implementation; using Surging.Core.System.Intercept; using Surging.IModuleServices.Common.Models; using System; using System.Collections.Generic; -using System.Text; using System.Threading.Tasks; namespace Surging.IModuleServices.Common @@ -62,7 +58,9 @@ public interface IUserService: IServiceKey [Command(Strategy = StrategyType.Injection, ShuntStrategy = AddressSelectorMode.HashAlgorithm, ExecutionTimeoutInMilliseconds = 1500, BreakerRequestVolumeThreshold = 3, Injection = @"return 1;", RequestCacheEnabled = true)] [InterceptMethod(CachingMethod.Get, Key = "GetUserId_{0}", CacheSectionType = SectionType.ddlCache, Mode = CacheTargetType.Redis, Time = 480)] Task GetUserId(string userName); - + + Task Try(); + /// /// 获取用户最后次sign时间 /// @@ -144,5 +142,18 @@ public interface IUserService: IServiceKey /// Task UploadFile(HttpFormCollection form); + /// + /// 测试下载文件 + /// + /// 文件名 + /// Content-Type + /// + Task DownFile(string fileName, string contentType); + + /// + /// + /// + /// + Task> GetAllThings(); } } diff --git a/src/Surging.IModuleServices/Surging.IModuleServices.Common/Models/WillMessage.cs b/src/Surging.IModuleServices/Surging.IModuleServices.Common/Models/WillMessage.cs new file mode 100644 index 000000000..3aed9f303 --- /dev/null +++ b/src/Surging.IModuleServices/Surging.IModuleServices.Common/Models/WillMessage.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Surging.IModuleServices.Common.Models +{ + public class WillMessage + { + public string Topic { get; set; } + + public string Message { get; set; } + + + public bool WillRetain { get; set; } + + public int Qos { get; set; } + } +} diff --git a/src/Surging.IModuleServices/Surging.IModuleServices.Common/Surging.IModuleServices.Common.csproj b/src/Surging.IModuleServices/Surging.IModuleServices.Common/Surging.IModuleServices.Common.csproj index 5c9614bad..0d39f68ad 100644 --- a/src/Surging.IModuleServices/Surging.IModuleServices.Common/Surging.IModuleServices.Common.csproj +++ b/src/Surging.IModuleServices/Surging.IModuleServices.Common/Surging.IModuleServices.Common.csproj @@ -24,6 +24,7 @@ + diff --git a/src/Surging.Modules/Surging.Modules.Common/Domain/ControllerService.cs b/src/Surging.Modules/Surging.Modules.Common/Domain/ControllerService.cs new file mode 100644 index 000000000..b91909cbb --- /dev/null +++ b/src/Surging.Modules/Surging.Modules.Common/Domain/ControllerService.cs @@ -0,0 +1,40 @@ +using Surging.Core.Protocol.Mqtt.Internal.Enums; +using Surging.Core.Protocol.Mqtt.Internal.Messages; +using Surging.Core.Protocol.Mqtt.Internal.Services; +using Surging.IModuleServices.Common; +using Surging.IModuleServices.Common.Models; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Surging.Modules.Common.Domain +{ + public class ControllerService : MqttBehavior, IControllerService + { + public override async Task Authorized(string username, string password) + { + bool result = false; + if (username == "admin" && password == "123456") + result= true; + return await Task.FromResult(result); + } + + public async Task IsOnline(string deviceId) + { + var status= await base.GetDeviceStatus(deviceId); + return status == SessionStatus.OPEN; + } + + public async Task Publish(string deviceId, WillMessage message) + { + await Publish(deviceId, new MqttWillMessage + { + WillMessage = message.Message, + Qos = message.Qos, + Topic = message.Topic, + WillRetain = message.WillRetain + }); + } + } +} diff --git a/src/Surging.Modules/Surging.Modules.Common/Domain/PersonService.cs b/src/Surging.Modules/Surging.Modules.Common/Domain/PersonService.cs index d1d0a7d3e..09453f3d7 100644 --- a/src/Surging.Modules/Surging.Modules.Common/Domain/PersonService.cs +++ b/src/Surging.Modules/Surging.Modules.Common/Domain/PersonService.cs @@ -12,6 +12,8 @@ using Surging.Core.ProxyGenerator; using Surging.Core.KestrelHttpServer.Internal; using System.IO; +using Surging.Core.KestrelHttpServer; +using Surging.Core.Common; namespace Surging.Modules.Common.Domain { @@ -124,6 +126,31 @@ public async Task UploadFile(HttpFormCollection form) return true; } + public async Task DownFile(string fileName, string contentType) + { + string uploadPath = Path.Combine("C:", fileName); + if (File.Exists(uploadPath)) + { + using (var stream = new FileStream(uploadPath, FileMode.Open)) + { + + var bytes = new Byte[stream.Length]; + await stream.WriteAsync(bytes, 0, bytes.Length); + return new FileContentResult(bytes, contentType, fileName); + } + } + else + { + throw new FileNotFoundException(fileName); + } + + } + + public async Task> GetAllThings() + { + return await Task.FromResult(new Dictionary { { "aaa", 12 } }); + } + #endregion Implementation of IUserService } } diff --git a/src/Surging.Modules/Surging.Modules.Common/Domain/UserService.cs b/src/Surging.Modules/Surging.Modules.Common/Domain/UserService.cs index 6d1268e1d..fda195a9b 100644 --- a/src/Surging.Modules/Surging.Modules.Common/Domain/UserService.cs +++ b/src/Surging.Modules/Surging.Modules.Common/Domain/UserService.cs @@ -1,8 +1,10 @@  +using Surging.Core.Common; using Surging.Core.CPlatform.EventBus.Events; using Surging.Core.CPlatform.EventBus.Implementation; using Surging.Core.CPlatform.Ioc; using Surging.Core.CPlatform.Transport.Implementation; +using Surging.Core.KestrelHttpServer; using Surging.Core.KestrelHttpServer.Internal; using Surging.Core.ProxyGenerator; using Surging.IModuleServices.Common; @@ -28,8 +30,8 @@ public UserService(UserRepository repository) public Task GetUserName(int id) { - this.GetService().SayHello("fanly"); - return Task.FromResult($"id:{id} is name fanly."); + //this.GetService().SayHello("fanly"); + return Task.FromResult(null); } public Task Exists(int id) @@ -126,6 +128,30 @@ public Task GetUser(List idList) { return Task.FromResult("type is List"); } + + public async Task> GetAllThings() + { + return await Task.FromResult(new Dictionary { { "aaa", 12 } }); + } + + public async Task DownFile(string fileName,string contentType) + { + string uploadPath = Path.Combine(AppContext.BaseDirectory, fileName); + if (File.Exists(uploadPath)) + { + using (var stream = new FileStream(uploadPath, FileMode.Open)) + { + var bytes = new Byte[stream.Length]; + await stream.ReadAsync(bytes, 0, bytes.Length); + stream.Dispose(); + return new FileContentResult(bytes, contentType, fileName); + } + } + else + { + throw new FileNotFoundException(fileName); + } + } #endregion Implementation of IUserService } } \ No newline at end of file diff --git a/src/Surging.Modules/Surging.Modules.Common/IntegrationEvents/EventHandling/UserLoginDateChangeHandler.cs b/src/Surging.Modules/Surging.Modules.Common/IntegrationEvents/EventHandling/UserLoginDateChangeHandler.cs index f5df1b298..23e1c9ccb 100644 --- a/src/Surging.Modules/Surging.Modules.Common/IntegrationEvents/EventHandling/UserLoginDateChangeHandler.cs +++ b/src/Surging.Modules/Surging.Modules.Common/IntegrationEvents/EventHandling/UserLoginDateChangeHandler.cs @@ -1,26 +1,23 @@ using Surging.Core.CPlatform.EventBus.Events; -using System; -using System.Collections.Generic; -using System.Text; -using Surging.IModuleServices.Common.Models.Events; -using System.Threading.Tasks; -using Surging.IModuleServices.Common; -using Surging.IModuleServices.Common.Models; using Surging.Core.CPlatform.Utilities; -using Surging.Core.EventBusRabbitMQ.Attributes; using Surging.Core.EventBusRabbitMQ; +using Surging.Core.EventBusRabbitMQ.Attributes; +using Surging.IModuleServices.Common; +using Surging.IModuleServices.Common.Models; +using Surging.IModuleServices.Common.Models.Events; +using System; +using System.Threading.Tasks; namespace Surging.Modules.Common.IntegrationEvents.EventHandling { - - [QueueConsumer("UserLoginDateChangeHandler")] + [QueueConsumer("UserLoginDateChangeHandler",QueueConsumerMode.Normal,QueueConsumerMode.Fail)] public class UserLoginDateChangeHandler : BaseIntegrationEventHandler { private readonly IUserService _userService; public UserLoginDateChangeHandler() { _userService = ServiceLocator.GetService("User"); - } + } public override async Task Handle(UserEvent @event) { Console.WriteLine($"消费1。"); diff --git a/src/Surging.Modules/Surging.Modules.Common/IntegrationEvents/EventHandling/UserLogoutDataChangeHandler.cs b/src/Surging.Modules/Surging.Modules.Common/IntegrationEvents/EventHandling/UserLogoutDataChangeHandler.cs index 715396fa1..b40ed7e2c 100644 --- a/src/Surging.Modules/Surging.Modules.Common/IntegrationEvents/EventHandling/UserLogoutDataChangeHandler.cs +++ b/src/Surging.Modules/Surging.Modules.Common/IntegrationEvents/EventHandling/UserLogoutDataChangeHandler.cs @@ -5,13 +5,10 @@ using Surging.IModuleServices.Common.Models; using Surging.IModuleServices.Common.Models.Events; using System; -using System.Collections.Generic; -using System.Text; using System.Threading.Tasks; namespace Surging.Modules.Common.IntegrationEvents.EventHandling { - [QueueConsumer("UserLogoutDateChangeHandler")] public class UserLogoutDataChangeHandler : IIntegrationEventHandler { diff --git a/src/Surging.Modules/Surging.Modules.Common/Surging.Modules.Common.csproj b/src/Surging.Modules/Surging.Modules.Common/Surging.Modules.Common.csproj index 83db941a4..01654829e 100644 --- a/src/Surging.Modules/Surging.Modules.Common/Surging.Modules.Common.csproj +++ b/src/Surging.Modules/Surging.Modules.Common/Surging.Modules.Common.csproj @@ -15,6 +15,7 @@ + diff --git a/src/Surging.Services/Surging.Services.Client/Program.cs b/src/Surging.Services/Surging.Services.Client/Program.cs index 10d747177..f5d3d2a19 100644 --- a/src/Surging.Services/Surging.Services.Client/Program.cs +++ b/src/Surging.Services/Surging.Services.Client/Program.cs @@ -43,6 +43,11 @@ static void Main(string[] args) .AddCache(); builder.Register(p => new CPlatformContainer(ServiceLocator.Current)); }); + }) + .ConfigureLogging(logger => + { + logger.AddConfiguration( + Core.CPlatform.AppConfig.GetSection("Logging")); }) .Configure(build => build.AddEventBusFile("eventBusSettings.json", optional: false)) @@ -50,7 +55,6 @@ static void Main(string[] args) build.AddCacheFile("cacheSettings.json", optional: false, reloadOnChange: true)) .Configure(build => build.AddCPlatformFile("${surgingpath}|surgingSettings.json", optional: false, reloadOnChange: true)) - .UseNLog(LogLevel.Error) .UseClient() .UseStartup() .Build(); diff --git a/src/Surging.Services/Surging.Services.Client/Startup.cs b/src/Surging.Services/Surging.Services.Client/Startup.cs index a23fd22f8..77dda70b5 100644 --- a/src/Surging.Services/Surging.Services.Client/Startup.cs +++ b/src/Surging.Services/Surging.Services.Client/Startup.cs @@ -77,17 +77,19 @@ public static void Test(IServiceProxyFactory serviceProxyFactory) Task.Run(async () => { var userProxy = serviceProxyFactory.CreateProxy("User"); - var v = userProxy.GetUserId("fanly").GetAwaiter().GetResult(); - var fa= userProxy.GetUserName(1).GetAwaiter().GetResult(); + var v = userProxy.GetUserId("fanly").GetAwaiter().GetResult(); + var fa = userProxy.GetUserName(1).GetAwaiter().GetResult(); + userProxy.Try().GetAwaiter().GetResult(); var v1 = userProxy.GetUserLastSignInTime(1).Result; - var apiResult = userProxy.GetApiResult().GetAwaiter().GetResult(); + var things = userProxy.GetAllThings().Result; + var apiResult = userProxy.GetApiResult().GetAwaiter().GetResult(); userProxy.PublishThroughEventBusAsync(new UserEvent { UserId = 1, Name = "fanly" }).Wait(); - - userProxy.PublishThroughEventBusAsync(new UserEvent + + userProxy.PublishThroughEventBusAsync(new UserEvent { UserId = 1, Name = "fanly" @@ -105,7 +107,7 @@ public static void Test(IServiceProxyFactory serviceProxyFactory) for (var i = 0; i < 10000; i++) { //var a = userProxy.GetDictionary().Result; - var a = userProxy.GetDictionary().Result; + var a = await userProxy.GetDictionary(); //var result = serviceProxyProvider.Invoke(new Dictionary(), "api/user/GetDictionary", "User").Result; } watch.Stop(); diff --git a/src/Surging.Services/Surging.Services.Client/Surging.Services.Client.csproj b/src/Surging.Services/Surging.Services.Client/Surging.Services.Client.csproj index b429d8c7e..335ad422d 100644 --- a/src/Surging.Services/Surging.Services.Client/Surging.Services.Client.csproj +++ b/src/Surging.Services/Surging.Services.Client/Surging.Services.Client.csproj @@ -3,6 +3,7 @@ Exe netcoreapp2.1 + true diff --git a/src/Surging.Services/Surging.Services.Client/cacheSettings.json b/src/Surging.Services/Surging.Services.Client/cacheSettings.json index ab9c7e43d..000858d09 100644 --- a/src/Surging.Services/Surging.Services.Client/cacheSettings.json +++ b/src/Surging.Services/Surging.Services.Client/cacheSettings.json @@ -1,47 +1,119 @@ -{ - "CachingSettings": [ - { - "Id": "ddlCache", - "Class": "Surging.Core.Caching.RedisCache.RedisContext,Surging.Core.Caching", - "Properties": [ - { - "Name": "appRuleFile", - "Ref": "rule" - }, - { - "Name": "dataContextPool", - "Ref": "ddls_sample", - "Maps": [ - { - "Name": "Redis", - "Properties": [ - { - "value": "127.0.0.1:6379::1" - } - ] - }, - { - "Name": "MemoryCache" - } - ] - }, - { - "Name": "defaultExpireTime", - "value": "120" - }, - { - "Name": "connectTimeout", - "Value": "120" - }, - { - "Name": "minSize", - "Value": "1" - }, - { - "Name": "maxSize", - "Value": "10" - } - ] - } - ] +{ + "CachingSettings": [ + { + "Id": "ddlCache", + "Class": "Surging.Core.Caching.RedisCache.RedisContext,Surging.Core.Caching", + "Properties": [ + { + "Name": "appRuleFile", + "Ref": "rule" + }, + { + "Name": "dataContextPool", + "Ref": "ddls_sample", + "Maps": [ + { + "Name": "Redis", + "Properties": [ + { + "value": "127.0.0.1:6379::1" + } + ] + }, + { + "Name": "MemoryCache" + } + ] + }, + { + "Name": "defaultExpireTime", + "value": "120" + }, + { + "Name": "connectTimeout", + "Value": "120" + }, + { + "Name": "minSize", + "Value": "1" + }, + { + "Name": "maxSize", + "Value": "10" + } + ] + }, + { + "Id": "surgingDemoCache", + "Class": "Surging.Core.Caching.RedisCache.RedisContext,Surging.Core.Caching", + "InitMethod": "", + "Maps": null, + "Properties": [ + { + "Name": "appRuleFile", + "Ref": "rule", + "Value": "", + "Maps": null + }, + { + "Name": "dataContextPool", + "Ref": "ddls_sample", + "Value": "", + "Maps": [ + { + "Name": "Redis", + "Properties": [ + { + "Name": null, + "Ref": null, + "Value": "127.0.0.1:7000::1", + "Maps": null + }, + { + "Name": null, + "Ref": null, + "Value": "127.0.0.1:7005::1", + "Maps": null + }, + { + "Name": null, + "Ref": null, + "Value": "127.0.0.1:6379::1", + "Maps": null + } + ] + }, + { + "Name": "MemoryCache", + "Properties": null + } + ] + }, + { + "Name": "defaultExpireTime", + "Ref": "", + "Value": "120", + "Maps": null + }, + { + "Name": "connectTimeout", + "Ref": "", + "Value": "120", + "Maps": null + }, + { + "Name": "minSize", + "Ref": "", + "Value": "1", + "Maps": null + }, + { + "Name": "maxSize", + "Ref": "", + "Value": "10", + "Maps": null + } + ] + } + ] } diff --git a/src/Surging.Services/Surging.Services.Client/nLog.config b/src/Surging.Services/Surging.Services.Client/nLog.config index ebc2346f1..dc4734c52 100644 --- a/src/Surging.Services/Surging.Services.Client/nLog.config +++ b/src/Surging.Services/Surging.Services.Client/nLog.config @@ -2,12 +2,21 @@ + + + + + + + - - + + \ No newline at end of file diff --git a/src/Surging.Services/Surging.Services.Client/surgingSettings.json b/src/Surging.Services/Surging.Services.Client/surgingSettings.json index 30c193438..efa963ff2 100644 --- a/src/Surging.Services/Surging.Services.Client/surgingSettings.json +++ b/src/Surging.Services/Surging.Services.Client/surgingSettings.json @@ -6,6 +6,7 @@ "MappingIp": "${Mapping_ip}", "MappingPort": "${Mapping_Port}", "Token": "true", + "Libuv": true, "Protocol": "${Protocol}|Tcp", //HttpTcpNone //"RootPath": "${RootPath}|d:\\microsurging", "RootPath": "${RootPath}|F:\\github\\surging\\src\\Surging.Services\\Surging.Services.Client\\bin\\Release\\PublishOutput", @@ -24,7 +25,8 @@ "ConnectionString": "${Register_Conn}|127.0.0.1:8500", // "127.0.0.1:8500", "SessionTimeout": "${Register_SessionTimeout}|50", "RoutePath": "${Register_RoutePath}", - "ReloadOnChange": true + "ReloadOnChange": true, + "EnableChildrenMonitor": false }, "EventBus": { "EventBusConnection": "${EventBusConnection}|localhost", diff --git a/src/Surging.Services/Surging.Services.Server/NLog.config b/src/Surging.Services/Surging.Services.Server/NLog.config index e2a178da3..dc4734c52 100644 --- a/src/Surging.Services/Surging.Services.Server/NLog.config +++ b/src/Surging.Services/Surging.Services.Server/NLog.config @@ -17,6 +17,6 @@ - + \ No newline at end of file diff --git a/src/Surging.Services/Surging.Services.Server/Program.cs b/src/Surging.Services/Surging.Services.Server/Program.cs index 5cbe7007b..ca3b3c342 100644 --- a/src/Surging.Services/Surging.Services.Server/Program.cs +++ b/src/Surging.Services/Surging.Services.Server/Program.cs @@ -30,7 +30,6 @@ public class Program { static void Main(string[] args) { - Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); var host = new ServiceHostBuilder() .RegisterServices(builder => @@ -53,7 +52,7 @@ static void Main(string[] args) .UseServer(options =>{ }) .UseConsoleLifetime() .Configure(build => - build.AddCacheFile("${cachepath}|cacheSettings.json", optional: false, reloadOnChange: true)) + build.AddCacheFile("${cachepath}|cacheSettings.json",basePath:AppContext.BaseDirectory, optional: false, reloadOnChange: true)) .Configure(build => build.AddCPlatformFile("${surgingpath}|surgingSettings.json", optional: false, reloadOnChange: true)) .UseStartup() @@ -68,4 +67,4 @@ static void Main(string[] args) } } } -} \ No newline at end of file +} diff --git a/src/Surging.Services/Surging.Services.Server/Startup.cs b/src/Surging.Services/Surging.Services.Server/Startup.cs index b9507df46..d29a9f5cf 100644 --- a/src/Surging.Services/Surging.Services.Server/Startup.cs +++ b/src/Surging.Services/Surging.Services.Server/Startup.cs @@ -12,8 +12,8 @@ public class Startup { public Startup(IConfigurationBuilder config) { - ConfigureEventBus(config); - ConfigureCache(config); + ConfigureEventBus(config); + // ConfigureCache(config); } public IContainer ConfigureServices(ContainerBuilder builder) diff --git a/src/Surging.Services/Surging.Services.Server/Surging.Services.Server.csproj b/src/Surging.Services/Surging.Services.Server/Surging.Services.Server.csproj index 15a187615..7ecdca3a6 100644 --- a/src/Surging.Services/Surging.Services.Server/Surging.Services.Server.csproj +++ b/src/Surging.Services/Surging.Services.Server/Surging.Services.Server.csproj @@ -2,7 +2,9 @@ Exe + false netcoreapp2.1 + true @@ -32,6 +34,7 @@ + diff --git a/src/Surging.Services/Surging.Services.Server/cacheSettings.json b/src/Surging.Services/Surging.Services.Server/cacheSettings.json index a6fb88f4b..a312c93d2 100644 --- a/src/Surging.Services/Surging.Services.Server/cacheSettings.json +++ b/src/Surging.Services/Surging.Services.Server/cacheSettings.json @@ -1 +1,148 @@ -{"CachingSettings":[{"Id":"ddlCache","Class":"Surging.Core.Caching.RedisCache.RedisContext,Surging.Core.Caching","InitMethod":"","Maps":null,"Properties":[{"Name":"appRuleFile","Ref":"rule","Value":"","Maps":null},{"Name":"dataContextPool","Ref":"ddls_sample","Value":"","Maps":[{"Name":"Redis","Properties":[{"Name":null,"Ref":null,"Value":"127.0.0.1:7000::1","Maps":null},{"Name":null,"Ref":null,"Value":"127.0.0.1:7005::1","Maps":null},{"Name":null,"Ref":null,"Value":"127.0.0.1:6379::1","Maps":null}]},{"Name":"MemoryCache","Properties":null}]},{"Name":"defaultExpireTime","Ref":"","Value":"120","Maps":null},{"Name":"connectTimeout","Ref":"","Value":"120","Maps":null},{"Name":"minSize","Ref":"","Value":"1","Maps":null},{"Name":"maxSize","Ref":"","Value":"10","Maps":null}]}]} \ No newline at end of file +{ + "CachingSettings": [ + { + "Id": "ddlCache", + "Class": "Surging.Core.Caching.RedisCache.RedisContext,Surging.Core.Caching", + "InitMethod": "", + "Maps": null, + "Properties": [ + { + "Name": "appRuleFile", + "Ref": "rule", + "Value": "", + "Maps": null + }, + { + "Name": "dataContextPool", + "Ref": "ddls_sample", + "Value": "", + "Maps": [ + { + "Name": "Redis", + "Properties": [ + { + "Name": null, + "Ref": null, + "Value": "127.0.0.1:7000::1", + "Maps": null + }, + { + "Name": null, + "Ref": null, + "Value": "127.0.0.1:7005::1", + "Maps": null + }, + { + "Name": null, + "Ref": null, + "Value": "127.0.0.1:6379::1", + "Maps": null + } + ] + }, + { + "Name": "MemoryCache", + "Properties": null + } + ] + }, + { + "Name": "defaultExpireTime", + "Ref": "", + "Value": "120", + "Maps": null + }, + { + "Name": "connectTimeout", + "Ref": "", + "Value": "120", + "Maps": null + }, + { + "Name": "minSize", + "Ref": "", + "Value": "1", + "Maps": null + }, + { + "Name": "maxSize", + "Ref": "", + "Value": "10", + "Maps": null + } + ] + }, + { + "Id": "userCache", + "Class": "Surging.Core.Caching.RedisCache.RedisContext,Surging.Core.Caching", + "InitMethod": "", + "Maps": null, + "Properties": [ + { + "Name": "appRuleFile", + "Ref": "rule", + "Value": "", + "Maps": null + }, + { + "Name": "dataContextPool", + "Ref": "ddls_sample", + "Value": "", + "Maps": [ + { + "Name": "Redis", + "Properties": [ + { + "Name": null, + "Ref": null, + "Value": "127.0.0.1:7000::1", + "Maps": null + }, + { + "Name": null, + "Ref": null, + "Value": "127.0.0.1:7005::1", + "Maps": null + }, + { + "Name": null, + "Ref": null, + "Value": "127.0.0.1:6379::1", + "Maps": null + } + ] + }, + { + "Name": "MemoryCache", + "Properties": null + } + ] + }, + { + "Name": "defaultExpireTime", + "Ref": "", + "Value": "120", + "Maps": null + }, + { + "Name": "connectTimeout", + "Ref": "", + "Value": "120", + "Maps": null + }, + { + "Name": "minSize", + "Ref": "", + "Value": "1", + "Maps": null + }, + { + "Name": "maxSize", + "Ref": "", + "Value": "10", + "Maps": null + } + ] + } + ] +} \ No newline at end of file diff --git a/src/Surging.Services/Surging.Services.Server/surgingSettings.json b/src/Surging.Services/Surging.Services.Server/surgingSettings.json index 7edfd98b8..14a18b4d1 100644 --- a/src/Surging.Services/Surging.Services.Server/surgingSettings.json +++ b/src/Surging.Services/Surging.Services.Server/surgingSettings.json @@ -2,24 +2,28 @@ "Surging": { "Ip": "${Surging_Server_IP}|127.0.0.1", "WatchInterval": 30, - "Port": "${Surging_Server_Port}|99", + "Port": "${Surging_Server_Port}|98", "MappingIp": "${Mapping_ip}", "MappingPort": "${Mapping_Port}", "Token": "true", + "WanIp": "${Mapping_Port}|192.168.249.103", + "Libuv": true, + "SoBacklog": 100, "MaxConcurrentRequests": 20, - "ExecutionTimeoutInMilliseconds": 30000, + "ExecutionTimeoutInMilliseconds": 1000, "Protocol": "${Protocol}|None", //HttpTcpNone //"RootPath": "${RootPath}|D:\\userapp", "RootPath": "${RootPath}|F:\\github\\surging\\src\\Surging.Services\\Surging.Services.Server\\bin\\Release\\PublishOutput", "Ports": { "HttpPort": "${HttpPort}|280", - "WSPort": "${WSPort}|96" + "WSPort": "${WSPort}|96", + "MQTTPort": "${MQTTPort}|97" }, "RequestCacheEnabled": false, "Packages": [ { "TypeName": "EnginePartModule", - "Using": "${UseEngineParts}|DotNettyModule;NLogModule;MessagePackModule;ConsulModule;KestrelHttpModule;WSProtocolModule;EventBusRabbitMQModule;CachingModule;" + "Using": "${UseEngineParts}|DotNettyModule;NLogModule;MessagePackModule;ConsulModule;WSProtocolModule;MqttProtocolModule;EventBusRabbitMQModule;CachingModule;" } ] }, //öͬ͵ҪPackagesԶ尴ãPackages @@ -27,7 +31,8 @@ "ConnectionString": "${Register_Conn}|127.0.0.1:8500", // "127.0.0.1:8500", "SessionTimeout": "${Register_SessionTimeout}|50", "RoutePath": "${Register_RoutePath}", - "ReloadOnChange": true + "ReloadOnChange": true, + "EnableChildrenMonitor": false }, "Swagger": { "Version": "${SwaggerVersion}|V1", // "127.0.0.1:8500", @@ -52,6 +57,14 @@ "OffsetReset": "${OffsetReset}|earliest", "GroupID": "${EventBusGroupID}|surgingdemo" }, + "WebSocket":{ + "WaitTime": 2, + "KeepClean": false, + "Behavior": { + "IgnoreExtensions": true, + "EmitOnPing": false + } + }, "EventBus": { "EventBusConnection": "${EventBusConnection}|localhost", "EventBusUserName": "${EventBusUserName}|guest", diff --git a/src/Surging.sln b/src/Surging.sln index 1a1bb4100..fcd4ea161 100644 --- a/src/Surging.sln +++ b/src/Surging.sln @@ -69,6 +69,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Surging.Services.Server", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Surging.Core.Swagger", "Surging.Core\Surging.Core.Swagger\Surging.Core.Swagger.csproj", "{DC065D75-25DD-4C0C-80A5-7B59E7B3A38D}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Surging.Core.Protocol.Mqtt", "Surging.Core\Surging.Core.Protocol.Mqtt\Surging.Core.Protocol.Mqtt.csproj", "{A0502179-D200-49AE-9897-A6B189A75B45}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -187,6 +189,10 @@ Global {DC065D75-25DD-4C0C-80A5-7B59E7B3A38D}.Debug|Any CPU.Build.0 = Debug|Any CPU {DC065D75-25DD-4C0C-80A5-7B59E7B3A38D}.Release|Any CPU.ActiveCfg = Release|Any CPU {DC065D75-25DD-4C0C-80A5-7B59E7B3A38D}.Release|Any CPU.Build.0 = Release|Any CPU + {A0502179-D200-49AE-9897-A6B189A75B45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A0502179-D200-49AE-9897-A6B189A75B45}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A0502179-D200-49AE-9897-A6B189A75B45}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A0502179-D200-49AE-9897-A6B189A75B45}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -219,6 +225,7 @@ Global {5846D387-8371-4E49-97B7-2B5E688FC0FD} = {30ADB177-C82F-49A7-8FA7-C32996543C4A} {A8C605D7-3552-44D8-AD8D-4EA08B68CF33} = {30ADB177-C82F-49A7-8FA7-C32996543C4A} {DC065D75-25DD-4C0C-80A5-7B59E7B3A38D} = {E3ADE8DE-5F3A-4E76-B22F-2C9435AACA06} + {A0502179-D200-49AE-9897-A6B189A75B45} = {E3ADE8DE-5F3A-4E76-B22F-2C9435AACA06} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9889BCDC-E6A6-448F-B01A-ECFD0FAF294C} diff --git a/src/WebSocket/WebSocketCore/WebSocketCore.csproj b/src/WebSocket/WebSocketCore/WebSocketCore.csproj index 86f558983..7c5dc70fe 100644 --- a/src/WebSocket/WebSocketCore/WebSocketCore.csproj +++ b/src/WebSocket/WebSocketCore/WebSocketCore.csproj @@ -10,9 +10,9 @@ Copyright © fanly All Rights Reserved. https://github.com/dotnetcore/surging/blob/master/LICENSE https://github.com/dotnetcore/surging - 1.9.1.0 - 1.9.1.0 - 1.9.1 + 1.9.2.0 + 1.9.2.0 + 1.9.2 diff --git "a/\346\215\220\350\265\240.png" "b/\346\215\220\350\265\240.png" new file mode 100644 index 0000000000000000000000000000000000000000..d9d3c7c0e194c35343f5e4c8f9c425a7cc6b4b99 GIT binary patch literal 55248 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%0D1&<;IK4BBX0a`%dT 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 literal 0 HcmV?d00001 From cfcb83f8fb742e8123f533a56b747742cbae29a0 Mon Sep 17 00:00:00 2001 From: sxf359 Date: Sun, 21 Jul 2019 11:54:59 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/.dockerignore | 12 - src/.vscode/launch.json | 63 - src/.vscode/tasks.json | 45 - src/Surging.ApiGateway/.bowerrc | 4 - .../Configs/appsettings.Development.json | 10 - .../Configs/appsettings.json | 15 - .../Configs/cacheSettings.json | 47 - .../Configs/gatewaySettings.json | 37 - .../AuthenticationManageController.cs | 31 - .../Controllers/HomeController.cs | 19 - .../Controllers/ServiceManageController.cs | 149 - .../Controllers/ServicesController.cs | 212 - .../CustomExceptionFilterAttribute.cs | 38 - src/Surging.ApiGateway/Dockerfile | 4 - .../Models/CacheEndpointParam.cs | 18 - .../Models/ErrorViewModel.cs | 11 - src/Surging.ApiGateway/Program.cs | 38 - .../PublishProfiles/FolderProfile.pubxml | 19 - .../Properties/launchSettings.json | 27 - .../ServiceExceptionFilter.cs | 18 - src/Surging.ApiGateway/Startup.cs | 136 - .../Surging.ApiGateway.csproj | 68 - .../EditServiceToken.cshtml | 23 - .../Views/AuthenticationManage/Index.cshtml | 88 - .../_AuthenticationManage.cshtml | 50 - .../Views/Home/Index.cshtml | 44 - .../ServiceManage/EditCacheEndPoint.cshtml | 51 - .../ServiceManage/EditFaultTolerant.cshtml | 98 - .../Views/ServiceManage/FaultTolerant.cshtml | 105 - .../Views/ServiceManage/Index.cshtml | 71 - .../Views/ServiceManage/ServiceCache.cshtml | 70 - .../ServiceManage/ServiceCacheEndpoint.cshtml | 96 - .../ServiceManage/ServiceDescriptor.cshtml | 76 - .../ServiceManage/ServiceSubscriber.cshtml | 69 - .../ServiceManage/_ServiceManageLayout.cshtml | 54 - .../Views/Shared/Error.cshtml | 22 - .../Views/Shared/Partial/ManageNav.cshtml | 38 - .../Views/Shared/_AppLayout.cshtml | 41 - .../Views/Shared/_Layout.cshtml | 43 - .../Views/Shared/_ManagerLayout.cshtml | 52 - .../Shared/_ValidationScriptsPartial.cshtml | 18 - .../Views/_ViewImports.cshtml | 3 - .../Views/_ViewStart.cshtml | 3 - src/Surging.ApiGateway/bower.json | 12 - src/Surging.ApiGateway/bundleconfig.json | 24 - .../apps/authmanage/assets/css/index.css | 357 - .../assets/js/modules/authenticationmanage.js | 17 - .../apps/authmanage/assets/js/url.config.js | 7 - .../assets/js/view/address.guide.js | 83 - .../assets/templates/authmanage_template.tpl | 26 - .../assets/css/img/app_icon_servicemange.png | Bin 890 -> 0 bytes .../apps/servicemange/assets/css/index.css | 342 - .../assets/js/modules/ServiceManage.js | 17 - .../apps/servicemange/assets/js/url.config.js | 15 - .../assets/js/view/address.guide.js | 49 - .../assets/js/view/faulttolerant.guide.js | 85 - .../assets/js/view/servicecache.guide.js | 48 - .../js/view/servicecacheendpoint.guide.js | 122 - .../assets/js/view/servicedescriptor.guide.js | 50 - .../assets/js/view/servicesubscriber.guide.js | 47 - .../templates/faulttolerant_template.tpl | 49 - .../templates/servicecache_template.tpl | 20 - .../servicecacheendpoint_template.tpl | 21 - .../templates/servicedescriptor_template.tpl | 42 - .../templates/servicemanage_template.tpl | 27 - .../templates/servicesubscriber_template.tpl | 26 - .../assets/css/base/ace/ace-ie.min.css | 1 - .../assets/css/base/ace/ace-rtl.min.css | 1 - .../assets/css/base/ace/ace-skins.min.css | 1 - .../wwwroot/assets/css/base/ace/ace.min.css | 1 - .../assets/css/base/ace/font-awesome.min.css | 1837 --- .../wwwroot/assets/css/base/app_publiccss.css | 326 - .../css/base/font/font-awesome-ie7.min.css | 384 - .../wwwroot/assets/css/base/global.css | 44 - .../assets/css/fonts/fontawesome-webfont.eot | Bin 68875 -> 0 bytes .../assets/css/fonts/fontawesome-webfont.ttf | Bin 138204 -> 0 bytes .../assets/css/fonts/fontawesome-webfont.woff | Bin 81284 -> 0 bytes .../css/fonts/fontawesome-webfont.woff2 | Bin 64464 -> 0 bytes .../assets/css/fonts/surgingfonticon.eot | Bin 10160 -> 0 bytes .../assets/css/fonts/surgingfonticon.svg | 36 - .../assets/css/fonts/surgingfonticon.ttf | Bin 9964 -> 0 bytes .../assets/css/fonts/surgingfonticon.woff | Bin 10040 -> 0 bytes .../assets/css/manager/img/app_icon_all.png | Bin 15559 -> 0 bytes .../wwwroot/assets/css/manager/index.css | 1245 --- .../wwwroot/assets/css/manager/public.css | 271 - .../css/manager/themes/default/skin.css | 110 - .../wwwroot/assets/css/site.css | 43 - .../wwwroot/assets/images/Heading.jpg | Bin 21591 -> 0 bytes .../wwwroot/assets/js/base/bootstrap.js | 2379 ---- .../wwwroot/assets/js/base/bootstrap.min.js | 12 - .../wwwroot/assets/js/base/extensions.js | 147 - .../wwwroot/assets/js/base/jquery.js | 9834 ----------------- .../wwwroot/assets/js/base/jquery.min.js | 14 - .../wwwroot/assets/js/base/jquery.min.map | 1 - .../wwwroot/assets/js/base/seajs-text.js | 1 - .../wwwroot/assets/js/config.js | 25 - .../wwwroot/assets/js/ie/html5shiv.min.js | 8 - .../wwwroot/assets/js/ie/respond.min.js | 6 - .../assets/js/modules/dt.pjax.event.js | 206 - .../assets/js/plugins/ace-elements.min.js | 5 - .../assets/js/plugins/ace-extra.min.js | 4 - .../wwwroot/assets/js/plugins/ace.min.js | 4 - .../wwwroot/assets/js/plugins/bootbox.min.js | 8 - .../assets/js/plugins/jquery.pjax_n.js | 863 -- .../assets/js/plugins/jquery.tmpl.min.js | 14 - .../wwwroot/assets/js/seajs/sea-debug.js | 846 -- .../wwwroot/assets/js/seajs/sea.js | 2 - .../wwwroot/assets/js/seajs/sea.js.map | 8 - .../assets/js/seajs/seajs-text-debug.js | 172 - .../wwwroot/assets/js/seajs/seajs-text.js | 1 - .../wwwroot/assets/js/url.config.js | 1 - .../wwwroot/assets/js/view/main.guide.js | 29 - .../wwwroot/assets/lib/bootstrap/.bower.json | 44 - .../wwwroot/assets/lib/bootstrap/CHANGELOG.md | 5 - .../wwwroot/assets/lib/bootstrap/Gruntfile.js | 533 - .../wwwroot/assets/lib/bootstrap/LICENSE | 21 - .../wwwroot/assets/lib/bootstrap/README.md | 139 - .../wwwroot/assets/lib/bootstrap/bower.json | 34 - .../bootstrap/dist/css/bootstrap-theme.css | 587 - .../dist/css/bootstrap-theme.css.map | 1 - .../dist/css/bootstrap-theme.min.css | 6 - .../dist/css/bootstrap-theme.min.css.map | 1 - .../lib/bootstrap/dist/css/bootstrap.css | 6760 ----------- .../lib/bootstrap/dist/css/bootstrap.css.map | 1 - .../lib/bootstrap/dist/css/bootstrap.min.css | 6 - .../bootstrap/dist/css/bootstrap.min.css.map | 1 - .../fonts/glyphicons-halflings-regular.eot | Bin 20127 -> 0 bytes .../fonts/glyphicons-halflings-regular.svg | 288 - .../fonts/glyphicons-halflings-regular.ttf | Bin 45404 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 18028 -> 0 bytes .../assets/lib/bootstrap/dist/js/bootstrap.js | 2363 ---- .../lib/bootstrap/dist/js/bootstrap.min.js | 7 - .../assets/lib/bootstrap/dist/js/npm.js | 13 - .../fonts/glyphicons-halflings-regular.eot | Bin 20127 -> 0 bytes .../fonts/glyphicons-halflings-regular.svg | 288 - .../fonts/glyphicons-halflings-regular.ttf | Bin 45404 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 18028 -> 0 bytes .../assets/lib/bootstrap/grunt/.jshintrc | 7 - .../bootstrap/grunt/bs-commonjs-generator.js | 30 - .../grunt/bs-glyphicons-data-generator.js | 42 - .../lib/bootstrap/grunt/bs-lessdoc-parser.js | 237 - .../bootstrap/grunt/bs-raw-files-generator.js | 44 - .../lib/bootstrap/grunt/configBridge.json | 46 - .../lib/bootstrap/grunt/sauce_browsers.yml | 82 - .../wwwroot/assets/lib/bootstrap/js/.jscsrc | 42 - .../wwwroot/assets/lib/bootstrap/js/.jshintrc | 15 - .../wwwroot/assets/lib/bootstrap/js/affix.js | 162 - .../wwwroot/assets/lib/bootstrap/js/alert.js | 94 - .../wwwroot/assets/lib/bootstrap/js/button.js | 120 - .../assets/lib/bootstrap/js/carousel.js | 237 - .../assets/lib/bootstrap/js/collapse.js | 211 - .../assets/lib/bootstrap/js/dropdown.js | 165 - .../wwwroot/assets/lib/bootstrap/js/modal.js | 337 - .../assets/lib/bootstrap/js/popover.js | 108 - .../assets/lib/bootstrap/js/scrollspy.js | 172 - .../wwwroot/assets/lib/bootstrap/js/tab.js | 155 - .../assets/lib/bootstrap/js/tooltip.js | 514 - .../assets/lib/bootstrap/js/transition.js | 59 - .../assets/lib/bootstrap/less/.csscomb.json | 304 - .../assets/lib/bootstrap/less/.csslintrc | 19 - .../assets/lib/bootstrap/less/alerts.less | 73 - .../assets/lib/bootstrap/less/badges.less | 66 - .../assets/lib/bootstrap/less/bootstrap.less | 56 - .../lib/bootstrap/less/breadcrumbs.less | 26 - .../lib/bootstrap/less/button-groups.less | 244 - .../assets/lib/bootstrap/less/buttons.less | 166 - .../assets/lib/bootstrap/less/carousel.less | 270 - .../assets/lib/bootstrap/less/close.less | 34 - .../assets/lib/bootstrap/less/code.less | 69 - .../bootstrap/less/component-animations.less | 33 - .../assets/lib/bootstrap/less/dropdowns.less | 216 - .../assets/lib/bootstrap/less/forms.less | 613 - .../assets/lib/bootstrap/less/glyphicons.less | 305 - .../assets/lib/bootstrap/less/grid.less | 84 - .../lib/bootstrap/less/input-groups.less | 171 - .../assets/lib/bootstrap/less/jumbotron.less | 54 - .../assets/lib/bootstrap/less/labels.less | 64 - .../assets/lib/bootstrap/less/list-group.less | 130 - .../assets/lib/bootstrap/less/media.less | 66 - .../assets/lib/bootstrap/less/mixins.less | 40 - .../lib/bootstrap/less/mixins/alerts.less | 14 - .../less/mixins/background-variant.less | 9 - .../bootstrap/less/mixins/border-radius.less | 18 - .../lib/bootstrap/less/mixins/buttons.less | 65 - .../bootstrap/less/mixins/center-block.less | 7 - .../lib/bootstrap/less/mixins/clearfix.less | 22 - .../lib/bootstrap/less/mixins/forms.less | 85 - .../lib/bootstrap/less/mixins/gradients.less | 59 - .../bootstrap/less/mixins/grid-framework.less | 91 - .../lib/bootstrap/less/mixins/grid.less | 122 - .../lib/bootstrap/less/mixins/hide-text.less | 21 - .../lib/bootstrap/less/mixins/image.less | 33 - .../lib/bootstrap/less/mixins/labels.less | 12 - .../lib/bootstrap/less/mixins/list-group.less | 30 - .../bootstrap/less/mixins/nav-divider.less | 10 - .../less/mixins/nav-vertical-align.less | 9 - .../lib/bootstrap/less/mixins/opacity.less | 8 - .../lib/bootstrap/less/mixins/pagination.less | 24 - .../lib/bootstrap/less/mixins/panels.less | 24 - .../bootstrap/less/mixins/progress-bar.less | 10 - .../bootstrap/less/mixins/reset-filter.less | 8 - .../lib/bootstrap/less/mixins/reset-text.less | 18 - .../lib/bootstrap/less/mixins/resize.less | 6 - .../less/mixins/responsive-visibility.less | 15 - .../lib/bootstrap/less/mixins/size.less | 10 - .../lib/bootstrap/less/mixins/tab-focus.less | 9 - .../lib/bootstrap/less/mixins/table-row.less | 28 - .../bootstrap/less/mixins/text-emphasis.less | 9 - .../bootstrap/less/mixins/text-overflow.less | 8 - .../less/mixins/vendor-prefixes.less | 227 - .../assets/lib/bootstrap/less/modals.less | 150 - .../assets/lib/bootstrap/less/navbar.less | 660 -- .../assets/lib/bootstrap/less/navs.less | 242 - .../assets/lib/bootstrap/less/normalize.less | 424 - .../assets/lib/bootstrap/less/pager.less | 54 - .../assets/lib/bootstrap/less/pagination.less | 89 - .../assets/lib/bootstrap/less/panels.less | 271 - .../assets/lib/bootstrap/less/popovers.less | 131 - .../assets/lib/bootstrap/less/print.less | 101 - .../lib/bootstrap/less/progress-bars.less | 87 - .../lib/bootstrap/less/responsive-embed.less | 35 - .../bootstrap/less/responsive-utilities.less | 194 - .../lib/bootstrap/less/scaffolding.less | 161 - .../assets/lib/bootstrap/less/tables.less | 234 - .../assets/lib/bootstrap/less/theme.less | 291 - .../assets/lib/bootstrap/less/thumbnails.less | 36 - .../assets/lib/bootstrap/less/tooltip.less | 101 - .../assets/lib/bootstrap/less/type.less | 302 - .../assets/lib/bootstrap/less/utilities.less | 55 - .../assets/lib/bootstrap/less/variables.less | 869 -- .../assets/lib/bootstrap/less/wells.less | 29 - .../assets/lib/bootstrap/nuget/MyGet.ps1 | 8 - .../lib/bootstrap/nuget/bootstrap.less.nuspec | 28 - .../lib/bootstrap/nuget/bootstrap.nuspec | 28 - .../wwwroot/assets/lib/bootstrap/package.js | 32 - .../wwwroot/assets/lib/bootstrap/package.json | 87 - .../assets/lib/font-awesome/.bower.json | 37 - .../assets/lib/font-awesome/.gitignore | 33 - .../assets/lib/font-awesome/.npmignore | 42 - .../assets/lib/font-awesome/HELP-US-OUT.txt | 7 - .../assets/lib/font-awesome/bower.json | 22 - .../lib/font-awesome/css/font-awesome.css | 2337 ---- .../lib/font-awesome/css/font-awesome.css.map | 7 - .../lib/font-awesome/css/font-awesome.min.css | 4 - .../lib/font-awesome/fonts/FontAwesome.otf | Bin 134808 -> 0 bytes .../fonts/fontawesome-webfont.eot | Bin 165742 -> 0 bytes .../fonts/fontawesome-webfont.svg | 2671 ----- .../fonts/fontawesome-webfont.ttf | Bin 165548 -> 0 bytes .../fonts/fontawesome-webfont.woff | Bin 98024 -> 0 bytes .../fonts/fontawesome-webfont.woff2 | Bin 77160 -> 0 bytes .../lib/font-awesome/less/animated.less | 34 - .../font-awesome/less/bordered-pulled.less | 25 - .../assets/lib/font-awesome/less/core.less | 12 - .../lib/font-awesome/less/fixed-width.less | 6 - .../lib/font-awesome/less/font-awesome.less | 18 - .../assets/lib/font-awesome/less/icons.less | 789 -- .../assets/lib/font-awesome/less/larger.less | 13 - .../assets/lib/font-awesome/less/list.less | 19 - .../assets/lib/font-awesome/less/mixins.less | 60 - .../assets/lib/font-awesome/less/path.less | 15 - .../font-awesome/less/rotated-flipped.less | 20 - .../lib/font-awesome/less/screen-reader.less | 5 - .../assets/lib/font-awesome/less/stacked.less | 20 - .../lib/font-awesome/less/variables.less | 800 -- .../lib/font-awesome/scss/_animated.scss | 34 - .../font-awesome/scss/_bordered-pulled.scss | 25 - .../assets/lib/font-awesome/scss/_core.scss | 12 - .../lib/font-awesome/scss/_fixed-width.scss | 6 - .../assets/lib/font-awesome/scss/_icons.scss | 789 -- .../assets/lib/font-awesome/scss/_larger.scss | 13 - .../assets/lib/font-awesome/scss/_list.scss | 19 - .../assets/lib/font-awesome/scss/_mixins.scss | 60 - .../assets/lib/font-awesome/scss/_path.scss | 15 - .../font-awesome/scss/_rotated-flipped.scss | 20 - .../lib/font-awesome/scss/_screen-reader.scss | 5 - .../lib/font-awesome/scss/_stacked.scss | 20 - .../lib/font-awesome/scss/_variables.scss | 800 -- .../lib/font-awesome/scss/font-awesome.scss | 18 - .../jquery-validation-unobtrusive/.bower.json | 45 - .../jquery-validation-unobtrusive/LICENSE.txt | 12 - .../jquery-validation-unobtrusive/bower.json | 36 - .../jquery.validate.unobtrusive.js | 416 - .../jquery.validate.unobtrusive.min.js | 5 - .../assets/lib/jquery-validation/.bower.json | 40 - .../lib/jquery-validation/CONTRIBUTING.md | 53 - .../assets/lib/jquery-validation/Gruntfile.js | 186 - .../assets/lib/jquery-validation/LICENSE.md | 22 - .../assets/lib/jquery-validation/README.md | 65 - .../assets/lib/jquery-validation/bower.json | 31 - .../lib/jquery-validation/build/release.js | 43 - .../assets/lib/jquery-validation/changelog.md | 534 - .../dist/additional-methods.js | 998 -- .../dist/additional-methods.min.js | 4 - .../jquery-validation/dist/jquery.validate.js | 1398 --- .../dist/jquery.validate.min.js | 4 - .../assets/lib/jquery-validation/package.json | 57 - .../src/additional/accept.js | 33 - .../src/additional/additional.js | 24 - .../src/additional/alphanumeric.js | 3 - .../src/additional/bankaccountNL.js | 25 - .../src/additional/bankorgiroaccountNL.js | 5 - .../jquery-validation/src/additional/bic.js | 16 - .../jquery-validation/src/additional/cifES.js | 61 - .../jquery-validation/src/additional/cpfBR.js | 57 - .../src/additional/creditcardtypes.js | 69 - .../src/additional/currency.js | 41 - .../src/additional/dateFA.js | 3 - .../src/additional/dateITA.js | 39 - .../src/additional/dateNL.js | 3 - .../src/additional/extension.js | 5 - .../src/additional/giroaccountNL.js | 6 - .../jquery-validation/src/additional/iban.js | 122 - .../src/additional/integer.js | 3 - .../jquery-validation/src/additional/ipv4.js | 3 - .../jquery-validation/src/additional/ipv6.js | 3 - .../src/additional/lettersonly.js | 3 - .../src/additional/letterswithbasicpunc.js | 3 - .../src/additional/mobileNL.js | 3 - .../src/additional/mobileUK.js | 13 - .../jquery-validation/src/additional/nieES.js | 34 - .../jquery-validation/src/additional/nifES.js | 25 - .../src/additional/notEqualTo.js | 3 - .../src/additional/nowhitespace.js | 3 - .../src/additional/pattern.js | 22 - .../src/additional/phoneNL.js | 6 - .../src/additional/phoneUK.js | 13 - .../src/additional/phoneUS.js | 21 - .../src/additional/phonesUK.js | 14 - .../src/additional/postalCodeCA.js | 16 - .../src/additional/postalcodeBR.js | 11 - .../src/additional/postalcodeIT.js | 4 - .../src/additional/postalcodeNL.js | 3 - .../src/additional/postcodeUK.js | 4 - .../src/additional/require_from_group.js | 37 - .../src/additional/skip_or_fill_minimum.js | 43 - .../src/additional/statesUS.js | 58 - .../src/additional/strippedminlength.js | 4 - .../jquery-validation/src/additional/time.js | 3 - .../src/additional/time12h.js | 3 - .../jquery-validation/src/additional/url2.js | 4 - .../jquery-validation/src/additional/vinUS.js | 54 - .../src/additional/zipcodeUS.js | 3 - .../src/additional/ziprange.js | 3 - .../assets/lib/jquery-validation/src/ajax.js | 33 - .../assets/lib/jquery-validation/src/core.js | 1346 --- .../src/localization/messages_ar.js | 23 - .../src/localization/messages_bg.js | 23 - .../src/localization/messages_bn_BD.js | 23 - .../src/localization/messages_ca.js | 23 - .../src/localization/messages_cs.js | 23 - .../src/localization/messages_da.js | 20 - .../src/localization/messages_de.js | 20 - .../src/localization/messages_el.js | 23 - .../src/localization/messages_es.js | 26 - .../src/localization/messages_es_AR.js | 27 - .../src/localization/messages_es_PE.js | 27 - .../src/localization/messages_et.js | 21 - .../src/localization/messages_eu.js | 23 - .../src/localization/messages_fa.js | 26 - .../src/localization/messages_fi.js | 21 - .../src/localization/messages_fr.js | 49 - .../src/localization/messages_ge.js | 23 - .../src/localization/messages_gl.js | 28 - .../src/localization/messages_he.js | 23 - .../src/localization/messages_hr.js | 23 - .../src/localization/messages_hu.js | 22 - .../src/localization/messages_hy_AM.js | 23 - .../src/localization/messages_id.js | 22 - .../src/localization/messages_is.js | 21 - .../src/localization/messages_it.js | 27 - .../src/localization/messages_ja.js | 23 - .../src/localization/messages_ka.js | 23 - .../src/localization/messages_kk.js | 23 - .../src/localization/messages_ko.js | 23 - .../src/localization/messages_lt.js | 23 - .../src/localization/messages_lv.js | 23 - .../src/localization/messages_my.js | 23 - .../src/localization/messages_nl.js | 33 - .../src/localization/messages_no.js | 23 - .../src/localization/messages_pl.js | 23 - .../src/localization/messages_pt_BR.js | 29 - .../src/localization/messages_pt_PT.js | 27 - .../src/localization/messages_ro.js | 23 - .../src/localization/messages_ru.js | 23 - .../src/localization/messages_si.js | 23 - .../src/localization/messages_sk.js | 20 - .../src/localization/messages_sl.js | 23 - .../src/localization/messages_sr.js | 23 - .../src/localization/messages_sr_lat.js | 23 - .../src/localization/messages_sv.js | 21 - .../src/localization/messages_th.js | 23 - .../src/localization/messages_tj.js | 23 - .../src/localization/messages_tr.js | 24 - .../src/localization/messages_uk.js | 23 - .../src/localization/messages_vi.js | 23 - .../src/localization/messages_zh.js | 23 - .../src/localization/messages_zh_TW.js | 24 - .../src/localization/methods_de.js | 12 - .../src/localization/methods_es_CL.js | 12 - .../src/localization/methods_fi.js | 12 - .../src/localization/methods_nl.js | 9 - .../src/localization/methods_pt.js | 9 - .../jquery-validation/validation.jquery.json | 29 - .../wwwroot/assets/lib/jquery/.bower.json | 25 - .../wwwroot/assets/lib/jquery/AUTHORS.txt | 275 - .../wwwroot/assets/lib/jquery/LICENSE.txt | 36 - .../wwwroot/assets/lib/jquery/README.md | 5 - .../wwwroot/assets/lib/jquery/bower.json | 14 - .../wwwroot/assets/lib/jquery/dist/jquery.js | 9831 ---------------- .../assets/lib/jquery/dist/jquery.min.js | 4 - .../assets/lib/jquery/dist/jquery.min.map | 1 - .../wwwroot/assets/lib/jquery/src/.jshintrc | 29 - .../wwwroot/assets/lib/jquery/src/ajax.js | 845 -- .../assets/lib/jquery/src/ajax/jsonp.js | 100 - .../assets/lib/jquery/src/ajax/load.js | 83 - .../assets/lib/jquery/src/ajax/parseJSON.js | 13 - .../assets/lib/jquery/src/ajax/parseXML.js | 27 - .../assets/lib/jquery/src/ajax/script.js | 68 - .../lib/jquery/src/ajax/var/location.js | 3 - .../assets/lib/jquery/src/ajax/var/nonce.js | 5 - .../assets/lib/jquery/src/ajax/var/rquery.js | 3 - .../wwwroot/assets/lib/jquery/src/ajax/xhr.js | 167 - .../assets/lib/jquery/src/attributes.js | 11 - .../assets/lib/jquery/src/attributes/attr.js | 142 - .../lib/jquery/src/attributes/classes.js | 177 - .../assets/lib/jquery/src/attributes/prop.js | 109 - .../lib/jquery/src/attributes/support.js | 36 - .../assets/lib/jquery/src/attributes/val.js | 170 - .../assets/lib/jquery/src/callbacks.js | 232 - .../wwwroot/assets/lib/jquery/src/core.js | 489 - .../assets/lib/jquery/src/core/access.js | 65 - .../assets/lib/jquery/src/core/init.js | 134 - .../assets/lib/jquery/src/core/parseHTML.js | 49 - .../assets/lib/jquery/src/core/ready.js | 103 - .../assets/lib/jquery/src/core/support.js | 18 - .../lib/jquery/src/core/var/rsingleTag.js | 5 - .../wwwroot/assets/lib/jquery/src/css.js | 515 - .../assets/lib/jquery/src/css/addGetHookIf.js | 24 - .../assets/lib/jquery/src/css/adjustCSS.js | 65 - .../assets/lib/jquery/src/css/curCSS.js | 57 - .../lib/jquery/src/css/defaultDisplay.js | 72 - .../jquery/src/css/hiddenVisibleSelectors.js | 18 - .../assets/lib/jquery/src/css/showHide.js | 48 - .../assets/lib/jquery/src/css/support.js | 121 - .../lib/jquery/src/css/var/cssExpand.js | 3 - .../lib/jquery/src/css/var/getStyles.js | 15 - .../assets/lib/jquery/src/css/var/isHidden.js | 16 - .../assets/lib/jquery/src/css/var/rmargin.js | 3 - .../lib/jquery/src/css/var/rnumnonpx.js | 5 - .../assets/lib/jquery/src/css/var/swap.js | 24 - .../wwwroot/assets/lib/jquery/src/data.js | 187 - .../assets/lib/jquery/src/data/Data.js | 200 - .../assets/lib/jquery/src/data/accepts.js | 20 - .../assets/lib/jquery/src/data/support.js | 23 - .../lib/jquery/src/data/var/acceptData.js | 18 - .../lib/jquery/src/data/var/dataPriv.js | 5 - .../lib/jquery/src/data/var/dataUser.js | 5 - .../wwwroot/assets/lib/jquery/src/deferred.js | 158 - .../assets/lib/jquery/src/deprecated.js | 32 - .../assets/lib/jquery/src/dimensions.js | 54 - .../wwwroot/assets/lib/jquery/src/effects.js | 629 -- .../assets/lib/jquery/src/effects/Tween.js | 121 - .../jquery/src/effects/animatedSelector.js | 13 - .../assets/lib/jquery/src/effects/support.js | 58 - .../wwwroot/assets/lib/jquery/src/event.js | 710 -- .../assets/lib/jquery/src/event/ajax.js | 20 - .../assets/lib/jquery/src/event/alias.js | 27 - .../assets/lib/jquery/src/event/focusin.js | 53 - .../assets/lib/jquery/src/event/support.js | 9 - .../assets/lib/jquery/src/event/trigger.js | 199 - .../assets/lib/jquery/src/exports/amd.js | 24 - .../assets/lib/jquery/src/exports/global.js | 26 - .../wwwroot/assets/lib/jquery/src/intro.js | 44 - .../wwwroot/assets/lib/jquery/src/jquery.js | 37 - .../assets/lib/jquery/src/manipulation.js | 481 - .../lib/jquery/src/manipulation/_evalUrl.js | 20 - .../jquery/src/manipulation/buildFragment.js | 102 - .../src/manipulation/createSafeFragment.js | 20 - .../lib/jquery/src/manipulation/getAll.js | 21 - .../jquery/src/manipulation/setGlobalEval.js | 20 - .../lib/jquery/src/manipulation/support.js | 33 - .../jquery/src/manipulation/var/nodeNames.js | 5 - .../src/manipulation/var/rcheckableType.js | 3 - .../manipulation/var/rleadingWhitespace.js | 3 - .../src/manipulation/var/rscriptType.js | 3 - .../jquery/src/manipulation/var/rtagName.js | 3 - .../lib/jquery/src/manipulation/wrapMap.js | 27 - .../wwwroot/assets/lib/jquery/src/offset.js | 221 - .../wwwroot/assets/lib/jquery/src/outro.js | 2 - .../wwwroot/assets/lib/jquery/src/queue.js | 143 - .../assets/lib/jquery/src/queue/delay.js | 22 - .../assets/lib/jquery/src/selector-native.js | 211 - .../assets/lib/jquery/src/selector-sizzle.js | 14 - .../wwwroot/assets/lib/jquery/src/selector.js | 1 - .../assets/lib/jquery/src/serialize.js | 125 - .../wwwroot/assets/lib/jquery/src/support.js | 63 - .../assets/lib/jquery/src/traversing.js | 175 - .../lib/jquery/src/traversing/findFilter.js | 100 - .../lib/jquery/src/traversing/var/dir.js | 20 - .../src/traversing/var/rneedsContext.js | 6 - .../lib/jquery/src/traversing/var/siblings.js | 15 - .../wwwroot/assets/lib/jquery/src/var/arr.js | 3 - .../assets/lib/jquery/src/var/class2type.js | 5 - .../assets/lib/jquery/src/var/concat.js | 5 - .../assets/lib/jquery/src/var/deletedIds.js | 3 - .../assets/lib/jquery/src/var/document.js | 3 - .../lib/jquery/src/var/documentElement.js | 5 - .../assets/lib/jquery/src/var/hasOwn.js | 5 - .../assets/lib/jquery/src/var/indexOf.js | 5 - .../wwwroot/assets/lib/jquery/src/var/pnum.js | 3 - .../wwwroot/assets/lib/jquery/src/var/push.js | 5 - .../assets/lib/jquery/src/var/rcssNum.js | 7 - .../assets/lib/jquery/src/var/rnotwhite.js | 3 - .../assets/lib/jquery/src/var/slice.js | 5 - .../assets/lib/jquery/src/var/support.js | 5 - .../assets/lib/jquery/src/var/toString.js | 5 - .../wwwroot/assets/lib/jquery/src/wrap.js | 79 - .../wwwroot/assets/lib/seajs/.bower.json | 29 - .../wwwroot/assets/lib/seajs/LICENSE.md | 24 - .../wwwroot/assets/lib/seajs/bower.json | 19 - .../assets/lib/seajs/dist/runtime-debug.js | 925 -- .../wwwroot/assets/lib/seajs/dist/runtime.js | 2 - .../assets/lib/seajs/dist/sea-debug.js | 1131 -- .../wwwroot/assets/lib/seajs/dist/sea.js | 2 - .../assets/lib/seajs/dist/standalone-debug.js | 78 - .../assets/lib/seajs/dist/standalone.js | 2 - src/Surging.ApiGateway/wwwroot/favicon.ico | Bin 32038 -> 0 bytes .../Aggregation/ServicePartProvider.cs | 72 - .../Aggregation/ServicePartType.cs | 13 - .../Surging.Core.ApiGateWay/AppConfig.cs | 124 - .../Configurations/AccessPolicy.cs | 19 - .../Configurations/Register.cs | 14 - .../Configurations/RegisterProvider.cs | 12 - .../Configurations/ServiceAggregation.cs | 17 - .../Configurations/ServicePart.cs | 15 - .../Configurations/Services.cs | 12 - .../ContainerBuilderExtensions.cs | 44 - .../IServicePartProvider.cs | 14 - .../OAuth/IAuthorizationServerProvider.cs | 16 - .../AuthorizationServerProvider.cs | 90 - .../Configurations/ConfigInfo.cs | 24 - .../GatewayConfigurationExtensions.cs | 49 - .../GatewayConfigurationProvider.cs | 20 - .../GatewayConfigurationSource.cs | 18 - .../OAuth/Implementation/EncryptMode.cs | 11 - .../Implementation/JWTSecureDataHeader.cs | 15 - .../OAuth/Implementation/JWTSecureDataType.cs | 11 - .../IFaultTolerantProvider.cs | 17 - .../ServiceDiscovery/IServiceCacheProvider.cs | 21 - .../IServiceDiscoveryProvider.cs | 19 - .../IServiceSubscribeProvider.cs | 16 - .../Implementation/FaultTolerantProvider.cs | 29 - .../Implementation/ServiceAddressModel.cs | 14 - .../Implementation/ServiceCacheProvider.cs | 73 - .../ServiceDiscoveryProvider.cs | 60 - .../ServiceSubscribeProvider.cs | 32 - .../Surging.Core.ApiGateWay/ServiceResult.cs | 101 - .../ServiceStatusCode.cs | 13 - .../Surging.Core.ApiGateWay.csproj | 29 - .../Utilities/ServiceResult.cs | 101 - .../Address/AddressModel.cs | 62 - .../Address/IpAddressModel.cs | 80 - .../Surging.Core.CPlatform/AppConfig.cs | 60 - .../CPlatformContainer.cs | 79 - .../CPlatformResource.Designer.cs | 135 - .../CPlatformResource.resx | 144 - .../Cache/CacheDescriptor.cs | 160 - .../Cache/CacheEndpoint.cs | 68 - .../Cache/ICacheNodeProvider.cs | 11 - .../Cache/ICacheProvider.cs | 34 - .../Cache/IServiceCacheFactory.cs | 18 - .../Cache/IServiceCacheManager.cs | 61 - .../Implementation/ServiceCacheManagerBase.cs | 112 - .../Cache/ServiceCache.cs | 58 - .../Cache/ServiceCacheDescriptor.cs | 51 - .../CommunicationProtocol.cs | 15 - .../CPlatformConfigurationExtensions.cs | 65 - .../CPlatformConfigurationProvider.cs | 18 - .../CPlatformConfigurationSource.cs | 15 - .../IConfigurationWatchManager.cs | 9 - .../Configurations/ModulePackage.cs | 8 - .../Configurations/ProtocolPortOptions.cs | 11 - .../Remote/IConfigurationParser.cs | 10 - .../Remote/JsonConfigurationParser.cs | 174 - .../Remote/RemoteConfigurationEvents.cs | 18 - .../Remote/RemoteConfigurationExtensions.cs | 103 - .../Remote/RemoteConfigurationProvider.cs | 72 - .../Remote/RemoteConfigurationSource.cs | 57 - .../Configurations/SurgingServerOptions.cs | 42 - .../Watch/ConfigurationWatch.cs | 16 - .../Watch/ConfigurationWatchManager.cs | 64 - .../ContainerBuilderExtensions.cs | 749 -- .../Convertibles/ITypeConvertibleProvider.cs | 25 - .../Convertibles/ITypeConvertibleService.cs | 18 - .../DefaultTypeConvertibleProvider.cs | 59 - .../DefaultTypeConvertibleService.cs | 74 - .../DependencyResolverExtensions.cs | 119 - .../IDependencyResolver.cs | 40 - .../DependencyResolution/ServiceResolver.cs | 100 - .../Engines/IServiceEngine.cs | 10 - .../Engines/IServiceEngineBuilder.cs | 12 - .../Engines/IServiceEngineLifetime.cs | 23 - .../DefaultServiceEngineBuilder.cs | 77 - .../Implementation/ServiceEngineLifetime.cs | 79 - .../VirtualPathProviderServiceEngine .cs | 13 - .../EventBus/Events/EventContext.cs | 16 - .../Events/IIntegrationEventHandler.cs | 26 - .../EventBus/Events/IntegrationEvent.cs | 24 - .../EventBus/IEventBusSubscriptionsManager.cs | 25 - .../EventBus/ISubscriptionAdapt.cs | 13 - .../EventBus/Implementation/IEventBus.cs | 19 - .../InMemoryEventBusSubscriptionsManager.cs | 116 - .../Exceptions/CPlatformException.cs | 19 - .../Exceptions/CPlatformRemoteException.cs | 21 - .../Exceptions/CommunicationException.cs | 19 - .../Filters/IAuthorizationFilter.cs | 15 - .../Filters/IExceptionFilter.cs | 14 - .../Surging.Core.CPlatform/Filters/IFilter.cs | 12 - .../Implementation/AuthorizationAttribute.cs | 12 - .../AuthorizationFilterAttribute.cs | 28 - .../Implementation/AuthorizationType.cs | 12 - .../ExceptionFilterAttribute.cs | 42 - .../Filters/Implementation/FilterAttribute.cs | 16 - .../RpcActionExecutedContext.cs | 15 - .../HashAlgorithms/ConsistentHash.cs | 157 - .../HashAlgorithms/HashAlgorithm.cs | 78 - .../HashAlgorithms/IHashAlgorithm.cs | 27 - .../IdentifyAttribute.cs | 18 - .../Ids/IServiceIdGenerator.cs | 17 - .../DefaultServiceIdGenerator.cs | 48 - .../Ioc/BaseRepository.cs | 10 - .../Ioc/IServiceBehavior.cs | 10 - .../Surging.Core.CPlatform/Ioc/IServiceKey.cs | 10 - .../Ioc/ModuleNameAttribute.cs | 23 - .../Surging.Core.CPlatform/Ioc/ServiceBase.cs | 30 - .../Logging/NullLogger.cs | 52 - .../Messages/HttpMessage.cs | 16 - .../Messages/HttpResultMessage.cs | 97 - .../MessagePackTransportMessageType.cs | 18 - .../Messages/RemoteInvokeMessage.cs | 25 - .../Messages/RemoteInvokeResultMessage.cs | 22 - .../Messages/TransportMessage.cs | 113 - .../Module/AbstractModule.cs | 164 - .../Module/AssemblyEntry.cs | 398 - .../Module/BusinessModule.cs | 22 - .../Module/Component.cs | 51 - .../Module/ContainerBuilderWrapper.cs | 23 - .../Module/EchoService.cs | 47 - .../Module/EnginePartModule.cs | 29 - .../Module/IEchoService.cs | 16 - .../Module/IModuleManager.cs | 22 - .../Module/IModuleProvider.cs | 11 - .../Module/ModuleProvider.cs | 46 - .../Module/ModuleState.cs | 32 - .../Module/RegistrationExtensions.cs | 127 - .../Module/SystemModule.cs | 20 - .../Mqtt/IMqttServiceFactory.cs | 18 - .../Mqtt/IMqttServiceRouteManager.cs | 37 - .../MqttServiceRouteManagerBase.cs | 114 - .../Mqtt/MqttDescriptor.cs | 105 - .../Mqtt/MqttServiceDescriptor.cs | 55 - .../Mqtt/MqttServiceRoute.cs | 59 - .../Surging.Core.CPlatform/RequetData.cs | 11 - .../Routing/IServiceRouteFactory.cs | 18 - .../Routing/IServiceRouteManager.cs | 133 - .../Routing/IServiceRouteProvider.cs | 14 - .../DefaultServiceRouteFactory.cs | 69 - .../DefaultServiceRouteProvider.cs | 119 - .../Implementation/ServiceRouteManagerBase.cs | 157 - .../SharedFileServiceRouteManager.cs | 256 - .../Routing/ServiceRoute.cs | 60 - .../Routing/ServiceRouteContext.cs | 19 - .../Routing/ServiceRouteDescriptor.cs | 43 - .../Routing/ServiceRouteWatch.cs | 28 - .../Routing/Template/RoutePatternParser.cs | 69 - .../Address/Resolvers/IAddressResolver.cs | 18 - .../Implementation/DefaultAddressResolver.cs | 147 - .../Selectors/IAddressSelector.cs | 39 - .../Implementation/AddressSelectorBase.cs | 45 - .../Implementation/AddressSelectorMode.cs | 14 - .../Implementation/FairPollingAdrSelector.cs | 118 - .../HashAlgorithmAdrSelector.cs | 112 - .../Implementation/PollingAddressSelector.cs | 135 - .../Implementation/RandomAddressSelector.cs | 62 - .../HealthChecks/IHealthCheckService.cs | 39 - .../DefaultHealthCheckService.cs | 237 - .../Implementation/HealthCheckEventArgs.cs | 25 - .../Runtime/Client/IRemoteInvokeService.cs | 35 - .../Client/IServiceHeartbeatManager.cs | 14 - .../Client/IServiceSubscribeManager.cs | 99 - .../Client/IServiceSubscriberFactory.cs | 20 - .../DefaultServiceHeartbeatManager.cs | 22 - .../DefaultServiceSubscriberFactory.cs | 47 - .../Implementation/RemoteInvokeService.cs | 105 - .../ServiceSubscribeManagerBase.cs | 69 - .../Runtime/Client/RemoteInvokeContext.cs | 17 - .../Runtime/Client/ServiceSubscriber.cs | 58 - .../Client/ServiceSubscriberDescriptor.cs | 18 - .../Runtime/Server/IServiceEntryLocate.cs | 19 - .../Runtime/Server/IServiceEntryManager.cs | 18 - .../Runtime/Server/IServiceEntryProvider.cs | 21 - .../Runtime/Server/IServiceExecutor.cs | 19 - .../Runtime/Server/IServiceHost.cs | 25 - .../Runtime/Server/IServiceTokenGenerator.cs | 13 - .../DefaultServiceEntryLocate.cs | 43 - .../DefaultServiceEntryManager.cs | 61 - .../Implementation/DefaultServiceExecutor.cs | 180 - .../Implementation/DefaultServiceHost.cs | 68 - .../AttributeServiceEntryProvider.cs | 89 - .../Attributes/ServiceAttribute.cs | 65 - .../Attributes/ServiceBundleAttribute.cs | 17 - .../Attributes/ServiceDescriptorAttribute.cs | 16 - .../Attributes/ServiceMetadataAttribute.cs | 45 - .../IClrServiceEntryFactory.cs | 19 - .../Implementation/ClrServiceEntryFactory.cs | 124 - .../Implementation/ServiceHostAbstract.cs | 66 - .../Implementation/ServiceTokenGenerator.cs | 28 - .../Runtime/Server/ServiceEntry.cs | 26 - .../Serialization/ISerializer.cs | 28 - .../Implementation/JsonSerializer.cs | 36 - .../StringByteArraySerializer.cs | 51 - .../Implementation/StringObjectSerializer.cs | 50 - .../Serialization/SerializerExtensions.cs | 21 - .../ServiceDescriptor.cs | 273 - .../ServiceHostBuilderExtensions.cs | 131 - .../Support/Attributes/CommandAttribute.cs | 92 - .../Support/IBreakeRemoteInvokeService.cs | 11 - .../Support/IClusterInvoker.cs | 12 - .../Support/IFallbackInvoker.cs | 14 - .../Support/IServiceCommandManager.cs | 65 - .../Support/IServiceCommandProvider.cs | 13 - .../BreakeRemoteInvokeService.cs | 149 - .../Implementation/FailoverHandoverInvoker.cs | 54 - .../FailoverInjectionInvoker.cs | 69 - .../Implementation/ServiceCommandBase.cs | 35 - .../ServiceCommandManagerBase.cs | 176 - .../Implementation/ServiceCommandProvider.cs | 126 - .../Support/ServiceCommand.cs | 85 - .../Support/ServiceCommandDescriptor.cs | 7 - .../Support/ServiceInvokeListenInfo.cs | 41 - .../Support/StrategyType.cs | 9 - .../Surging.Core.CPlatform.csproj | 55 - .../Codec/ITransportMessageCodecFactory.cs | 20 - .../Codec/ITransportMessageDecoder.cs | 9 - .../Codec/ITransportMessageEncoder.cs | 9 - .../JsonTransportMessageCodecFactory.cs | 33 - .../JsonTransportMessageDecoder.cs | 28 - .../JsonTransportMessageEncoder.cs | 19 - .../Transport/IMessageListener.cs | 31 - .../Transport/IMessageSender.cs | 25 - .../Transport/ITransportClient.cs | 18 - .../Transport/ITransportClientFactory.cs | 17 - .../Implementation/MessageListener.cs | 33 - .../Transport/Implementation/RpcContext.cs | 53 - .../Implementation/TransportClient.cs | 156 - .../Utilities/CancellationTokenExtensions.cs | 44 - .../Surging.Core.CPlatform/Utilities/Check.cs | 54 - .../Utilities/DebugCheck.cs | 25 - .../Utilities/EnvironmentHelper.cs | 63 - .../Utilities/FastInvoke.cs | 152 - .../Utilities/NetUtils.cs | 108 - .../Utilities/ServiceLocator.cs | 51 - .../Utilities/StringExtensions.cs | 17 - .../Utilities/TaskHelpers.cs | 62 - .../Utilities/UtilityType.cs | 18 - .../AddressResolvers/IAddressResolver.cs | 14 - .../Implementation/DefaultAddressResolver.cs | 134 - .../Surging.Core.Caching/AppConfig.cs | 156 - .../Surging.Core.Caching/CacheContainer.cs | 55 - .../Surging.Core.Caching/CacheTargetType.cs | 14 - .../Surging.Core.Caching/CachingModule.cs | 135 - .../CachingResources.Designer.cs | 127 - .../CachingResources.resx | 141 - .../CacheConfigurationExtensions.cs | 58 - .../CacheConfigurationProvider.cs | 21 - .../CacheConfigurationSource.cs | 18 - .../IConfigurationWatchProvider.cs | 10 - .../ConfigurationWatchProvider.cs | 88 - .../Remote/IConfigurationParser.cs | 21 - .../Remote/JsonConfigurationParser.cs | 159 - .../Remote/RemoteConfigurationEvents.cs | 18 - .../Remote/RemoteConfigurationExtensions.cs | 106 - .../Remote/RemoteConfigurationProvider.cs | 72 - .../Remote/RemoteConfigurationSource.cs | 59 - .../ContainerBuilderExtensions.cs | 126 - .../DependencyResolverExtensions.cs | 119 - .../IDependencyResolver.cs | 40 - .../DependencyResolution/ServiceResolver.cs | 94 - .../HashAlgorithms/ConsistentHash.cs | 162 - .../HashAlgorithms/ConsistentHashNode.cs | 111 - .../HashAlgorithms/HashAlgorithm.cs | 78 - .../HashAlgorithms/IHashAlgorithm.cs | 27 - .../HealthChecks/IHealthCheckService.cs | 30 - .../DefaultHealthCheckService.cs | 152 - .../IdentifyCacheAttribute.cs | 17 - .../Interfaces/ICacheClient.cs | 17 - .../DefaultCacheNodeProvider.cs | 51 - .../DefaultServiceCacheFactory.cs | 59 - .../Models/CachingProvider.cs | 11 - .../Surging.Core.Caching/Models/Map.cs | 13 - .../Surging.Core.Caching/Models/Property.cs | 17 - .../Surging.Core.Caching/Models/binding.cs | 19 - .../NetCache/GCThreadProvider.cs | 52 - .../NetCache/MemoryCache.cs | 169 - .../NetCache/MemoryCacheProvider.cs | 199 - .../Surging.Core.Caching/ObjectPool.cs | 91 - .../RedisCache/RedisCacheClient.cs | 88 - .../RedisCache/RedisContext.cs | 228 - .../RedisCache/RedisEndpoint.cs | 85 - .../RedisCache/RedisProvider.cs | 475 - .../StackExchangeRedisExtensions.cs | 130 - .../ServiceHostBuilderExtensions.cs | 29 - .../Surging.Core.Caching.csproj | 49 - .../Utilities/CacheException.cs | 46 - .../Surging.Core.Caching/Utilities/Check.cs | 55 - .../Utilities/DebugCheck.cs | 25 - .../ContainerBuilderExtensions.cs | 12 - .../MessagePackModule.cs | 27 - ...MessagePackTransportMessageCodecFactory.cs | 24 - .../MessagePackTransportMessageDecoder.cs | 20 - .../MessagePackTransportMessageEncoder.cs | 23 - .../Messages/DynamicItem.cs | 67 - .../MessagePackRemoteInvokeMessage.cs | 79 - .../MessagePackRemoteInvokeResultMessage.cs | 39 - .../Messages/MessagePackTransportMessage.cs | 85 - .../Surging.Core.Codec.MessagePack.csproj | 27 - .../Utilities/SerializerUtilitys.cs | 36 - .../ContainerBuilderExtensions.cs | 15 - .../Messages/DynamicItem.cs | 67 - .../ProtoBufferRemoteInvokeMessage.cs | 82 - .../ProtoBufferRemoteInvokeResultMessage.cs | 43 - .../Messages/ProtoBufferTransportMessage.cs | 90 - .../ProtoBufferModule.cs | 27 - ...ProtoBufferTransportMessageCodecFactory.cs | 32 - .../ProtoBufferTransportMessageDecoder.cs | 23 - .../ProtoBufferTransportMessageEncoder.cs | 28 - .../Surging.Core.Codec.ProtoBuffer.csproj | 27 - .../Utilities/SerializerUtilitys.cs | 40 - .../Surging.Core.Common/ApiResult.cs | 18 - .../Surging.Core.Common/CommonModule.cs | 11 - .../Extensions/EnumExtensions.cs | 72 - .../ServicesException/ServiceException.cs | 90 - .../Surging.Core.Common.csproj | 15 - .../Surging.Core.Consul/AppConfig.cs | 12 - .../Configurations/ConfigInfo.cs | 122 - .../ConsulConfigurationExtensions.cs | 50 - .../ConsulConfigurationProvider.cs | 20 - .../ConsulConfigurationSource.cs | 16 - .../Configurations/ConsulOption.cs | 27 - .../Surging.Core.Consul/ConsulModule.cs | 199 - .../ConsulMqttServiceRouteManager.cs | 371 - .../ConsulServiceCacheManager.cs | 333 - .../ConsulServiceCommandManager.cs | 339 - .../ConsulServiceRouteManager.cs | 354 - .../ConsulServiceSubscribeManager.cs | 174 - .../ContainerBuilderExtensions.cs | 169 - .../Surging.Core.Consul/Package.nuspec | 22 - .../Surging.Core.Consul.csproj | 27 - .../Utilitys/ConsulClientExtensions.cs | 40 - .../WatcherProvider/IClientWatchManager.cs | 11 - .../Implementation/ChildWatchRegistration.cs | 22 - .../Implementation/ChildrenMonitorWatcher.cs | 61 - .../Implementation/ClientWatchManager.cs | 61 - .../Implementation/NodeMonitorWatcher.cs | 61 - .../Implementation/ReconnectionWatcher.cs | 10 - .../Implementation/WatchRegistration.cs | 38 - .../WatcherProvider/Implementation/Watcher.cs | 26 - .../Implementation/WatcherBase.cs | 24 - .../TransportMessageChannelHandlerAdapter.cs | 34 - .../ContainerBuilderExtensions.cs | 62 - .../DotNettyMessageSender.cs | 121 - .../Surging.Core.DotNetty/DotNettyModule.cs | 61 - .../DotNettyServerMessageListener.cs | 173 - .../DotNettyTransportClientFactory.cs | 174 - .../Surging.Core.DotNetty.csproj | 34 - .../Surging.Core.EventBusKafka/Appconfig.cs | 46 - .../EventBusConfigurationExtensions.cs | 57 - .../EventBusConfigurationProvider.cs | 20 - .../EventBusConfigurationSource.cs | 18 - .../Configurations/KafkaOptions.cs | 63 - .../Configurations/OffsetResetMode.cs | 13 - .../ContainerBuilderExtensions.cs | 66 - .../EventBusKafkaModule.cs | 77 - .../IConsumeConfigurator.cs | 13 - .../IKafkaPersisterConnection.cs | 16 - .../DefaultConsumeConfigurator.cs | 95 - .../Implementation/EventBusKafka.cs | 129 - .../Implementation/KafkaConnectionType.cs | 12 - .../KafkaConsumerPersistentConnection.cs | 110 - .../KafkaPersistentConnectionBase.cs | 64 - .../KafkaProducerPersistentConnection.cs | 70 - .../Implementation/KafkaSubscriptionAdapt.cs | 43 - .../ServiceHostBuilderExtensions.cs | 20 - .../Surging.Core.EventBusKafka.csproj | 33 - .../Utilities/ExtensionsToFastActivator.cs | 15 - .../Utilities/FastInvoker.cs | 75 - .../AppConfig.cs | 23 - .../Attributes/QueueConsumerAttribute.cs | 33 - .../EventBusConfigurationExtensions.cs | 57 - .../EventBusConfigurationProvider.cs | 20 - .../EventBusConfigurationSource.cs | 18 - .../Configurations/EventBusOption.cs | 29 - .../ContainerBuilderExtensions.cs | 75 - .../EventBusRabbitMQModule.cs | 96 - .../IConsumeConfigurator.cs | 13 - .../IRabbitMQPersisterConnection.cs | 19 - .../DefaultConsumeConfigurator.cs | 93 - .../DefaultRabbitMQPersisterConnection.cs | 135 - .../Implementation/EventBusRabbitMQ.cs | 520 - .../RabbitMqSubscriptionAdapt.cs | 46 - .../QueueConsumerMode.cs | 13 - .../RabbitmqLifetime.cs | 10 - .../ServiceHostBuilderExtensions.cs | 33 - .../Surging.Core.EventBusRabbitMQ.csproj | 31 - .../Utilities/ExtensionsToFastActivator.cs | 18 - .../Utilities/FastInvoker.cs | 75 - .../Abstractions/ActionContext.cs | 22 - .../Abstractions/ActionResult.cs | 21 - .../Abstractions/ContentResult.cs | 10 - .../Abstractions/FileContentResult.cs | 90 - .../Abstractions/FileResult.cs | 30 - .../Abstractions/IActionResult.cs | 13 - .../AppConfig.cs | 15 - .../DefaultHttpServiceHost.cs | 64 - .../HttpExecutor.cs | 212 - .../HttpMessageListener.cs | 162 - .../HttpServerMessageSender.cs | 68 - .../HttpServiceHost.cs | 66 - .../Internal/DefaultServiceSchemaProvider.cs | 39 - .../Internal/FileStreamResult.cs | 44 - .../Internal/HttpFormCollection.cs | 183 - .../Internal/HttpFormFile.cs | 24 - .../Internal/HttpFormFileCollection.cs | 39 - .../Internal/IServiceSchemaProvider.cs | 11 - .../Internal/StreamCopyOperation.cs | 239 - .../KestrelHttpMessageListener.cs | 102 - .../KestrelHttpModule.cs | 94 - .../StatusCode.cs | 13 - .../Surging.Core.KestrelHttpServer.csproj | 42 - .../Surging.Core.Log4net/Log4NetLogger.cs | 109 - .../Surging.Core.Log4net/Log4NetProvider.cs | 45 - .../Surging.Core.Log4net/Log4netModule.cs | 29 - .../ServiceHostBuilderExtensions.cs | 53 - .../Surging.Core.Log4net.csproj | 30 - .../Surging.Core.NLog/NLogModule.cs | 33 - .../Surging.Core.NLog/NLogProvider.cs | 33 - src/Surging.Core/Surging.Core.NLog/NLogger.cs | 98 - .../ServiceHostBuilderExtensions.cs | 57 - .../Surging.Core.Nlog.csproj | 31 - .../ContainerBuilderExtensions.cs | 80 - .../DotNettyHttpServerMessageListener.cs | 195 - .../DotNettyHttpServerMessageSender.cs | 81 - .../HttpProtocolModule.cs | 87 - .../HttpServiceExecutor.cs | 214 - .../HttpServiceHost.cs | 73 - .../Surging.Core.Protocol.Http/StatusCode.cs | 13 - .../Surging.Core.Protocol.Http.csproj | 31 - .../DotNettyMqttServerMessageListener.cs | 195 - .../DefaultMqttServiceFactory.cs | 61 - .../ServerMqttHandlerService.cs | 187 - .../Internal/Channel/MqttChannel.cs | 70 - .../Internal/Enums/Behavior.cs | 12 - .../Internal/Enums/ConfirmStatus.cs | 14 - .../Internal/Enums/ConnReturnCode.cs | 16 - .../Internal/Enums/MessageType.cs | 24 - .../Internal/Enums/SessionStatus.cs | 12 - .../Internal/Enums/SubscribeStatus.cs | 12 - .../Internal/Messages/ConnectMessage.cs | 38 - .../Internal/Messages/MqttMessage.cs | 22 - .../Internal/Messages/MqttWillMessage.cs | 18 - .../Internal/Messages/RetainMessage.cs | 14 - .../Internal/Messages/SendMqttMessage.cs | 27 - .../Internal/Messages/SessionMessage.cs | 16 - .../Internal/Runtime/IMqttBehaviorProvider.cs | 12 - .../Runtime/IMqttBrokerEntryManger.cs | 17 - .../Runtime/IMqttRemoteInvokeService.cs | 19 - .../Runtime/IMqttRomtePublishService.cs | 19 - .../DefaultMqttBehaviorProvider.cs | 38 - .../DefaultMqttBrokerEntryManager.cs | 83 - .../Implementation/MqttRemoteInvokeService.cs | 111 - .../Implementation/MqttRomtePublishService.cs | 19 - .../Runtime/MqttRemoteInvokeContext.cs | 13 - .../Internal/Runtime/Runnable.cs | 24 - .../Internal/Runtime/SacnScheduled.cs | 73 - .../Internal/Runtime/ScanRunnable.cs | 41 - .../Services/AbstractChannelService.cs | 195 - .../Internal/Services/IChannelService.cs | 29 - .../Services/IClientSessionService.cs | 15 - .../Internal/Services/IMessagePushService.cs | 28 - .../Internal/Services/IWillService.cs | 17 - .../Implementation/ClientSessionService.cs | 28 - .../Implementation/MessagePushService.cs | 149 - .../Implementation/MqttChannelService.cs | 428 - .../Services/Implementation/WillService.cs | 52 - .../Internal/Services/MqttBehavior.cs | 26 - .../MqttHandlerServiceBase.cs | 48 - .../MqttProtocolModule.cs | 119 - .../MqttServiceHost.cs | 56 - .../Surging.Core.Protocol.Mqtt.csproj | 31 - .../Util/MessageIdGenerater.cs | 32 - .../Attributes/BehaviorContractAttribute.cs | 16 - .../Configurations/BehaviorOption.cs | 15 - .../Configurations/WebSocketOptions.cs | 39 - .../DefaultWSServerMessageListener.cs | 71 - .../Runtime/IWSServiceEntryProvider.cs | 11 - .../DefaultWSServiceEntryProvider.cs | 116 - .../Runtime/WSServiceEntry.cs | 19 - .../Surging.Core.Protocol.WS.csproj | 25 - .../WSProtocolModule.cs | 100 - .../Surging.Core.Protocol.WS/WSServiceBase.cs | 86 - .../Surging.Core.Protocol.WS/WSServiceHost.cs | 56 - .../ContainerBuilderExtensions.cs | 69 - .../FastReflection/ConstructorInvoker.cs | 70 - .../FastReflection/MethodInvoker.cs | 93 - .../FastReflection/PropertyAccessor.cs | 95 - .../IServiceProxyFactory.cs | 46 - .../IServiceProxyGenerater.cs | 27 - .../IServiceProxyProvider.cs | 14 - .../Implementation/RemoteServiceProxy.cs | 36 - .../Implementation/ServiceProxyBase.cs | 199 - .../Implementation/ServiceProxyFactory.cs | 106 - .../Implementation/ServiceProxyGenerater.cs | 383 - .../Implementation/ServiceProxyProvider.cs | 76 - .../Interceptors/CacheInterceptor.cs | 17 - .../Interceptors/ICacheInvocation.cs | 14 - .../Interceptors/IInterceptor.cs | 12 - .../Interceptors/IInterceptorProvider.cs | 13 - .../Interceptors/IInvocation.cs | 25 - .../Implementation/AbstractInvocation.cs | 56 - .../Implementation/ActionInvocation.cs | 36 - .../Implementation/InterceptorProvider.cs | 92 - .../Implementation/KeyAttribute.cs | 20 - .../Interceptors/InvocationMethods.cs | 27 - .../ProxyServiceBase.cs | 75 - .../RegistrationExtensions.cs | 25 - .../ServiceHostBuilderExtensions.cs | 20 - .../ServiceProxyModule.cs | 30 - .../Surging.Core.ProxyGenerator.csproj | 31 - .../Utilitys/AttributeFactory.cs | 47 - .../Utilitys/CompilationUtilitys.cs | 260 - .../Configurations/ConfigInfo.cs | 10 - .../StackExchangeRedisExtensions.cs | 130 - .../Provider/ICacheClient.cs | 15 - .../Implementation/RedisCacheClient.cs | 35 - .../Provider/Implementation/RedisEndpoint.cs | 68 - .../Provider/Implementation/RedisProvider.cs | 363 - .../Surging.Core.Redis.csproj | 15 - .../Internal/IApplicationLifetime.cs | 23 - .../Internal/IHostLifetime.cs | 16 - .../Internal/IServiceHost.cs | 16 - .../Internal/IServiceHostBuilder.cs | 26 - .../Implementation/ApplicationLifetime.cs | 79 - .../Implementation/ConfigureBuilder.cs | 54 - .../ConfigureContainerBuilder.cs | 39 - .../ConfigureServicesBuilder.cs | 47 - .../Implementation/ConsoleLifetime.cs | 49 - .../Internal/Implementation/ServiceHost.cs | 126 - .../Implementation/ServiceHostBuilder.cs | 128 - .../Internal/Implementation/StartupLoader.cs | 167 - .../ServiceCollectionExtensions.cs | 20 - .../ServiceHostBuilderExtensions.cs | 53 - .../Startup/IStartup.cs | 15 - .../Implementation/ConventionBasedStartup.cs | 54 - .../Startup/Implementation/DelegateStartup.cs | 20 - .../Startup/Implementation/StartupBase.cs | 41 - .../Startup/Implementation/StartupMethods.cs | 24 - .../Surging.Core.ServiceHosting.csproj | 31 - .../Surging.Core.Swagger.csproj | 87 - .../Application/SwaggerBuilderExtensions.cs | 29 - .../Application/SwaggerContractResolver.cs | 50 - .../Swagger/Application/SwaggerMiddleware.cs | 98 - .../Swagger/Application/SwaggerOptions.cs | 25 - .../Application/SwaggerSerializerFactory.cs | 20 - .../Swagger/Model/ApiKeyScheme.cs | 14 - .../Swagger/Model/BasicAuthScheme.cs | 10 - .../Swagger/Model/ISwaggerProvider.cs | 20 - .../Swagger/Model/OAuth2Scheme.cs | 20 - .../Swagger/Model/SecurityScheme.cs | 20 - .../Swagger/Model/SwaggerDocument.cs | 378 - .../ConfigureSchemaRegistryOptions.cs | 48 - .../ConfigureSwaggerGeneratorOptions.cs | 61 - .../SwaggerApplicationConvention.cs | 12 - .../Application/SwaggerGenOptions.cs | 32 - .../SwaggerGenOptionsExtensions.cs | 330 - .../SwaggerGenServiceCollectionExtensions.cs | 40 - .../Generator/ApiDescriptionExtensions.cs | 54 - .../ApiParameterDescriptionExtensions.cs | 41 - .../Generator/ApiResponseTypeExtensions.cs | 21 - .../SwaggerGen/Generator/IDocumentFilter.cs | 33 - .../SwaggerGen/Generator/IOperationFilter.cs | 42 - .../SwaggerGen/Generator/IParameterFilter.cs | 34 - .../SwaggerGen/Generator/ISchemaFilter.cs | 30 - .../SwaggerGen/Generator/ISchemaRegistry.cs | 14 - .../Generator/ISchemaRegistryFactory.cs | 7 - .../Generator/JsonContractExtensions.cs | 18 - .../Generator/JsonPropertyExtensions.cs | 61 - .../SwaggerGen/Generator/SchemaExtensions.cs | 89 - .../SwaggerGen/Generator/SchemaIdManager.cs | 37 - .../SwaggerGen/Generator/SchemaRegistry.cs | 297 - .../Generator/SchemaRegistryFactory.cs | 31 - .../Generator/SchemaRegistryOptions.cs | 30 - .../SwaggerGen/Generator/StringExtensions.cs | 17 - .../SwaggerGen/Generator/SwaggerGenerator.cs | 576 - .../Generator/SwaggerGeneratorOptions.cs | 77 - .../SwaggerGen/Generator/TypeExtensions.cs | 50 - .../XmlComments/XmlCommentsDocumentFilter.cs | 53 - .../XmlCommentsMemberNameHelper.cs | 84 - .../XmlComments/XmlCommentsOperationFilter.cs | 192 - .../XmlComments/XmlCommentsSchemaFilter.cs | 66 - .../XmlComments/XmlCommentsTextHelper.cs | 93 - .../SwaggerUI/SwaggerUIBuilderExtensions.cs | 29 - .../SwaggerUI/SwaggerUIMiddleware.cs | 135 - .../SwaggerUI/SwaggerUIOptions.cs | 207 - .../SwaggerUIOptionsExtensions.cs.cs | 260 - .../Surging.Core.Swagger/SwaggerUI/index.html | 104 - .../swagger-ui-dist/absolute-path.js | 14 - .../swagger-ui-dist/favicon-16x16.png | Bin 445 -> 0 bytes .../swagger-ui-dist/favicon-32x32.png | Bin 1141 -> 0 bytes .../node_modules/swagger-ui-dist/index.html | 60 - .../node_modules/swagger-ui-dist/index.js | 17 - .../swagger-ui-dist/oauth2-redirect.html | 67 - .../node_modules/swagger-ui-dist/package.json | 109 - .../swagger-ui-dist/swagger-ui-bundle.js | 93 - .../swagger-ui-dist/swagger-ui-bundle.js.map | 1 - .../swagger-ui-dist-3.17.5.tgz | Bin 2276742 -> 0 bytes .../swagger-ui-standalone-preset.js | 14 - .../swagger-ui-standalone-preset.js.map | 1 - .../swagger-ui-dist/swagger-ui.css | 3 - .../swagger-ui-dist/swagger-ui.css.map | 1 - .../swagger-ui-dist/swagger-ui.js | 9 - .../swagger-ui-dist/swagger-ui.js.map | 1 - .../Intercept/CacheKeyAttribute.cs | 19 - .../Intercept/CacheProviderExtension.cs | 48 - .../Intercept/CacheProviderInterceptor.cs | 65 - .../Intercept/CachingMethod.cs | 28 - .../Intercept/InterceptMethodAttribute.cs | 105 - .../Intercept/LogProviderInterceptor.cs | 20 - .../Intercept/LoggerInterceptAttribute.cs | 53 - .../Intercept/SectionType.cs | 11 - .../Ioc/ModuleNameAttribute.cs | 21 - .../Ioc/RegistrationExtensions.cs | 326 - .../Module/AbstractModule.cs | 260 - ...emblyDisableStopAndUninstalledAttribute.cs | 53 - .../Attributes/AssemblyModuleTypeAttribute.cs | 53 - .../Attributes/ModelBinderTypeAttribute.cs | 40 - .../Attributes/ModuleDescriptionAttribute.cs | 83 - .../Module/BusinessModule.cs | 41 - .../Surging.Core.System/Module/Component.cs | 128 - .../Module/ContainerBuilderWrapper.cs | 47 - .../Surging.Core.System/Module/ModuleType.cs | 47 - .../Module/RegistrationExtensions.cs | 138 - .../Module/SystemModule.cs | 41 - .../Attributes/CollectionNameAttribute.cs | 21 - .../MongoProvider/Entity.cs | 15 - .../MongoProvider/IEntity.cs | 11 - .../MongoProvider/MongoConfig.cs | 35 - .../MongoProvider/MongoModule.cs | 31 - .../MongoProvider/QueryParams.cs | 40 - .../Repositories/IMongoRepository.cs | 47 - .../Repositories/MongoRepository.cs | 236 - .../Surging.Core.System/MongoProvider/Util.cs | 87 - .../Properties/AssemblyInfo.cs | 12 - .../Surging.Core.System/ServiceBase.cs | 52 - .../Surging.Core.System.csproj | 32 - .../Surging.Core.Zookeeper/AppConfig.cs | 10 - .../Configurations/ConfigInfo.cs | 112 - .../ZookeeperConfigurationExtensions.cs | 49 - .../ZookeeperConfigurationProvider.cs | 17 - .../ZookeeperConfigurationSource.cs | 16 - .../Configurations/ZookeeperOption.cs | 30 - .../ContainerBuilderExtensions.cs | 146 - .../Surging.Core.Zookeeper.csproj | 28 - .../WatcherProvider/ChildrenMonitorWatcher.cs | 71 - .../WatcherProvider/NodeMonitorWatcher.cs | 47 - .../WatcherProvider/ReconnectionWatcher.cs | 63 - .../WatcherProvider/WatcherBase.cs | 27 - .../ZooKeeperMqttServiceRouteManager.cs | 410 - .../ZooKeeperServiceRouteManager.cs | 400 - .../ZooKeeperServiceSubscribeManager.cs | 288 - .../Surging.Core.Zookeeper/ZookeeperModule.cs | 182 - .../ZookeeperServiceCacheManager.cs | 419 - .../ZookeeperServiceCommandManager.cs | 380 - .../IChatService.cs | 21 - .../IControllerService.cs | 23 - .../IRoteMangeService.cs | 17 - .../IUserService.cs | 159 - .../IntercepteModule.cs | 29 - .../Models/AuthenticationRequestData.cs | 17 - .../Models/BaseModel.cs | 15 - .../Models/Events/LogoutEvent.cs | 17 - .../Models/Events/UserEvent.cs | 16 - .../Models/IdentityUser.cs | 15 - .../Models/RoteModel.cs | 14 - .../Models/UserModel.cs | 22 - .../Models/WillMessage.cs | 18 - .../Properties/AssemblyInfo.cs | 12 - .../Surging.IModuleServices.Common.csproj | 32 - .../IManagerService.cs | 19 - .../Surging.IModuleServices.Manager.csproj | 11 - .../Domain/ChatService.cs | 56 - .../Domain/ControllerService.cs | 40 - .../Domain/PersonService.cs | 156 - .../Domain/RoteMangeService.cs | 24 - .../Domain/UserService.cs | 157 - .../UserLoginDateChangeHandler.cs | 41 - .../UserLogoutDataChangeHandler.cs | 31 - .../Properties/AssemblyInfo.cs | 12 - .../Repositories/UserRepository.cs | 11 - .../Surging.Modules.Common.csproj | 25 - .../Domain/ManagerService.cs | 14 - .../Surging.Modules.Manager.csproj | 12 - .../Surging.Services.Client/Program.cs | 101 - .../PublishProfiles/FolderProfile.pubxml | 13 - .../Surging.Services.Client/Startup.cs | 155 - .../Surging.Services.Client.csproj | 58 - .../cacheSettings.json | 119 - .../eventBusSettings.json | 4 - .../Surging.Services.Client/log4net.config | 26 - .../Surging.Services.Client/nLog.config | 22 - .../surgingSettings.json | 60 - .../Configs/Zookeeper.json | 5 - .../Configs/consul.json | 6 - .../Surging.Services.Server/Dockerfile | 5 - .../Surging.Services.Server/NLog.config | 22 - .../Surging.Services.Server/Program.cs | 70 - .../PublishProfiles/FolderProfile.pubxml | 13 - .../Properties/launchSettings.json | 7 - .../Surging.Services.Server/Startup.cs | 60 - .../Surging.Services.Server.csproj | 71 - .../SurgingServiceEngine.cs | 26 - .../cacheSettings.json | 148 - .../eventBusSettings.json | 8 - .../Surging.Services.Server/log4net.config | 24 - .../surgingSettings.json | 101 - src/Surging.sln | 251 - src/WebSocket/WebSocketCore/ByteOrder.cs | 47 - src/WebSocket/WebSocketCore/CloseEventArgs.cs | 142 - .../WebSocketCore/CloseStatusCode.cs | 120 - .../WebSocketCore/CompressionMethod.cs | 52 - src/WebSocket/WebSocketCore/ErrorEventArgs.cs | 109 - src/WebSocket/WebSocketCore/Ext.cs | 2051 ---- src/WebSocket/WebSocketCore/Fin.cs | 51 - src/WebSocket/WebSocketCore/HttpBase.cs | 208 - src/WebSocket/WebSocketCore/HttpRequest.cs | 217 - src/WebSocket/WebSocketCore/HttpResponse.cs | 209 - src/WebSocket/WebSocketCore/LogData.cs | 149 - src/WebSocket/WebSocketCore/LogLevel.cs | 63 - src/WebSocket/WebSocketCore/Logger.cs | 330 - src/WebSocket/WebSocketCore/Mask.cs | 51 - .../WebSocketCore/MessageEventArgs.cs | 180 - .../WebSocketCore/Net/AuthenticationBase.cs | 151 - .../Net/AuthenticationChallenge.cs | 146 - .../Net/AuthenticationResponse.cs | 323 - .../Net/AuthenticationSchemes.cs | 66 - src/WebSocket/WebSocketCore/Net/Chunk.cs | 91 - .../WebSocketCore/Net/ChunkStream.cs | 360 - .../WebSocketCore/Net/ChunkedRequestStream.cs | 211 - .../Net/ClientSslConfiguration.cs | 291 - src/WebSocket/WebSocketCore/Net/Cookie.cs | 822 -- .../WebSocketCore/Net/CookieCollection.cs | 598 - .../WebSocketCore/Net/CookieException.cs | 143 - .../WebSocketCore/Net/EndPointListener.cs | 515 - .../WebSocketCore/Net/EndPointManager.cs | 240 - .../WebSocketCore/Net/HttpBasicIdentity.cs | 82 - .../WebSocketCore/Net/HttpConnection.cs | 597 - .../WebSocketCore/Net/HttpDigestIdentity.cs | 187 - .../WebSocketCore/Net/HttpHeaderInfo.cs | 114 - .../WebSocketCore/Net/HttpHeaderType.cs | 44 - .../WebSocketCore/Net/HttpListener.cs | 836 -- .../Net/HttpListenerAsyncResult.cs | 198 - .../WebSocketCore/Net/HttpListenerContext.cs | 256 - .../Net/HttpListenerException.cs | 127 - .../WebSocketCore/Net/HttpListenerPrefix.cs | 228 - .../Net/HttpListenerPrefixCollection.cs | 278 - .../WebSocketCore/Net/HttpListenerRequest.cs | 910 -- .../WebSocketCore/Net/HttpListenerResponse.cs | 846 -- .../WebSocketCore/Net/HttpRequestHeader.cs | 233 - .../WebSocketCore/Net/HttpResponseHeader.cs | 189 - .../WebSocketCore/Net/HttpStatusCode.cs | 359 - .../Net/HttpStreamAsyncResult.cs | 184 - .../WebSocketCore/Net/HttpUtility.cs | 1288 --- .../WebSocketCore/Net/HttpVersion.cs | 73 - .../WebSocketCore/Net/InputChunkState.cs | 52 - src/WebSocket/WebSocketCore/Net/InputState.cs | 49 - src/WebSocket/WebSocketCore/Net/LineState.cs | 50 - .../WebSocketCore/Net/NetworkCredential.cs | 209 - .../Net/QueryStringCollection.cs | 68 - .../WebSocketCore/Net/ReadBufferState.cs | 124 - .../WebSocketCore/Net/RequestStream.cs | 267 - .../WebSocketCore/Net/ResponseStream.cs | 325 - .../Net/ServerSslConfiguration.cs | 245 - .../WebSocketCore/Net/WebHeaderCollection.cs | 1459 --- .../HttpListenerWebSocketContext.cs | 394 - .../WebSockets/TcpListenerWebSocketContext.cs | 518 - .../Net/WebSockets/WebSocketContext.cs | 224 - src/WebSocket/WebSocketCore/Opcode.cs | 68 - src/WebSocket/WebSocketCore/PayloadData.cs | 234 - src/WebSocket/WebSocketCore/Program.cs | 12 - src/WebSocket/WebSocketCore/Rsv.cs | 51 - .../Server/HttpRequestEventArgs.cs | 255 - .../WebSocketCore/Server/HttpServer.cs | 1661 --- .../WebSocketCore/Server/IWebSocketSession.cs | 91 - .../WebSocketCore/Server/ServerState.cs | 40 - .../WebSocketCore/Server/WebSocketBehavior.cs | 874 -- .../WebSocketCore/Server/WebSocketServer.cs | 1528 --- .../Server/WebSocketServiceHost.cs | 29 - .../Server/WebSocketServiceHostBase.cs | 238 - .../Server/WebSocketServiceHost`1.cs | 102 - .../Server/WebSocketServiceManager.cs | 1114 -- .../Server/WebSocketSessionManager.cs | 1695 --- src/WebSocket/WebSocketCore/WebSocket.cs | 4104 ------- .../WebSocketCore/WebSocketCore.csproj | 18 - .../WebSocketCore/WebSocketException.cs | 109 - src/WebSocket/WebSocketCore/WebSocketFrame.cs | 797 -- src/WebSocket/WebSocketCore/WebSocketState.cs | 65 - src/docker-compose.ci.build.yml | 9 - src/docker-compose.dcproj | 19 - src/docker-compose.override.yml | 9 - src/docker-compose.yml | 12 - .../SharedSolutionFiles/SharedAssemblyInfo.cs | 30 - 1322 files changed, 160538 deletions(-) delete mode 100644 src/.dockerignore delete mode 100644 src/.vscode/launch.json delete mode 100644 src/.vscode/tasks.json delete mode 100644 src/Surging.ApiGateway/.bowerrc delete mode 100644 src/Surging.ApiGateway/Configs/appsettings.Development.json delete mode 100644 src/Surging.ApiGateway/Configs/appsettings.json delete mode 100644 src/Surging.ApiGateway/Configs/cacheSettings.json delete mode 100644 src/Surging.ApiGateway/Configs/gatewaySettings.json delete mode 100644 src/Surging.ApiGateway/Controllers/AuthenticationManageController.cs delete mode 100644 src/Surging.ApiGateway/Controllers/HomeController.cs delete mode 100644 src/Surging.ApiGateway/Controllers/ServiceManageController.cs delete mode 100644 src/Surging.ApiGateway/Controllers/ServicesController.cs delete mode 100644 src/Surging.ApiGateway/CustomExceptionFilterAttribute.cs delete mode 100644 src/Surging.ApiGateway/Dockerfile delete mode 100644 src/Surging.ApiGateway/Models/CacheEndpointParam.cs delete mode 100644 src/Surging.ApiGateway/Models/ErrorViewModel.cs delete mode 100644 src/Surging.ApiGateway/Program.cs delete mode 100644 src/Surging.ApiGateway/Properties/PublishProfiles/FolderProfile.pubxml delete mode 100644 src/Surging.ApiGateway/Properties/launchSettings.json delete mode 100644 src/Surging.ApiGateway/ServiceExceptionFilter.cs delete mode 100644 src/Surging.ApiGateway/Startup.cs delete mode 100644 src/Surging.ApiGateway/Surging.ApiGateway.csproj delete mode 100644 src/Surging.ApiGateway/Views/AuthenticationManage/EditServiceToken.cshtml delete mode 100644 src/Surging.ApiGateway/Views/AuthenticationManage/Index.cshtml delete mode 100644 src/Surging.ApiGateway/Views/AuthenticationManage/_AuthenticationManage.cshtml delete mode 100644 src/Surging.ApiGateway/Views/Home/Index.cshtml delete mode 100644 src/Surging.ApiGateway/Views/ServiceManage/EditCacheEndPoint.cshtml delete mode 100644 src/Surging.ApiGateway/Views/ServiceManage/EditFaultTolerant.cshtml delete mode 100644 src/Surging.ApiGateway/Views/ServiceManage/FaultTolerant.cshtml delete mode 100644 src/Surging.ApiGateway/Views/ServiceManage/Index.cshtml delete mode 100644 src/Surging.ApiGateway/Views/ServiceManage/ServiceCache.cshtml delete mode 100644 src/Surging.ApiGateway/Views/ServiceManage/ServiceCacheEndpoint.cshtml delete mode 100644 src/Surging.ApiGateway/Views/ServiceManage/ServiceDescriptor.cshtml delete mode 100644 src/Surging.ApiGateway/Views/ServiceManage/ServiceSubscriber.cshtml delete mode 100644 src/Surging.ApiGateway/Views/ServiceManage/_ServiceManageLayout.cshtml delete mode 100644 src/Surging.ApiGateway/Views/Shared/Error.cshtml delete mode 100644 src/Surging.ApiGateway/Views/Shared/Partial/ManageNav.cshtml delete mode 100644 src/Surging.ApiGateway/Views/Shared/_AppLayout.cshtml delete mode 100644 src/Surging.ApiGateway/Views/Shared/_Layout.cshtml delete mode 100644 src/Surging.ApiGateway/Views/Shared/_ManagerLayout.cshtml delete mode 100644 src/Surging.ApiGateway/Views/Shared/_ValidationScriptsPartial.cshtml delete mode 100644 src/Surging.ApiGateway/Views/_ViewImports.cshtml delete mode 100644 src/Surging.ApiGateway/Views/_ViewStart.cshtml delete mode 100644 src/Surging.ApiGateway/bower.json delete mode 100644 src/Surging.ApiGateway/bundleconfig.json delete mode 100644 src/Surging.ApiGateway/wwwroot/apps/authmanage/assets/css/index.css delete mode 100644 src/Surging.ApiGateway/wwwroot/apps/authmanage/assets/js/modules/authenticationmanage.js delete mode 100644 src/Surging.ApiGateway/wwwroot/apps/authmanage/assets/js/url.config.js delete mode 100644 src/Surging.ApiGateway/wwwroot/apps/authmanage/assets/js/view/address.guide.js delete mode 100644 src/Surging.ApiGateway/wwwroot/apps/authmanage/assets/templates/authmanage_template.tpl delete mode 100644 src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/css/img/app_icon_servicemange.png delete mode 100644 src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/css/index.css delete mode 100644 src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/modules/ServiceManage.js delete mode 100644 src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/url.config.js delete mode 100644 src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/address.guide.js delete mode 100644 src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/faulttolerant.guide.js delete mode 100644 src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/servicecache.guide.js delete mode 100644 src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/servicecacheendpoint.guide.js delete mode 100644 src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/servicedescriptor.guide.js delete mode 100644 src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/servicesubscriber.guide.js delete mode 100644 src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/faulttolerant_template.tpl delete mode 100644 src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/servicecache_template.tpl delete mode 100644 src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/servicecacheendpoint_template.tpl delete mode 100644 src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/servicedescriptor_template.tpl delete mode 100644 src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/servicemanage_template.tpl delete mode 100644 src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/servicesubscriber_template.tpl delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/css/base/ace/ace-ie.min.css delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/css/base/ace/ace-rtl.min.css delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/css/base/ace/ace-skins.min.css delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/css/base/ace/ace.min.css delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/css/base/ace/font-awesome.min.css delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/css/base/app_publiccss.css delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/css/base/font/font-awesome-ie7.min.css delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/css/base/global.css delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/css/fonts/fontawesome-webfont.eot delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/css/fonts/fontawesome-webfont.ttf delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/css/fonts/fontawesome-webfont.woff delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/css/fonts/fontawesome-webfont.woff2 delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/css/fonts/surgingfonticon.eot delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/css/fonts/surgingfonticon.svg delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/css/fonts/surgingfonticon.ttf delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/css/fonts/surgingfonticon.woff delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/css/manager/img/app_icon_all.png delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/css/manager/index.css delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/css/manager/public.css delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/css/manager/themes/default/skin.css delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/css/site.css delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/images/Heading.jpg delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/base/bootstrap.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/base/bootstrap.min.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/base/extensions.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/base/jquery.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/base/jquery.min.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/base/jquery.min.map delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/base/seajs-text.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/config.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/ie/html5shiv.min.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/ie/respond.min.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/modules/dt.pjax.event.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/plugins/ace-elements.min.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/plugins/ace-extra.min.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/plugins/ace.min.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/plugins/bootbox.min.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/plugins/jquery.pjax_n.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/plugins/jquery.tmpl.min.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/seajs/sea-debug.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/seajs/sea.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/seajs/sea.js.map delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/seajs/seajs-text-debug.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/seajs/seajs-text.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/url.config.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/js/view/main.guide.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/.bower.json delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/CHANGELOG.md delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/Gruntfile.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/LICENSE delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/README.md delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/bower.json delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/dist/css/bootstrap-theme.css delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/dist/css/bootstrap-theme.css.map delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/dist/css/bootstrap-theme.min.css delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/dist/css/bootstrap-theme.min.css.map delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/dist/css/bootstrap.css delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/dist/css/bootstrap.css.map delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/dist/css/bootstrap.min.css delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/dist/css/bootstrap.min.css.map delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/dist/js/bootstrap.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/dist/js/bootstrap.min.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/dist/js/npm.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/fonts/glyphicons-halflings-regular.eot delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/fonts/glyphicons-halflings-regular.svg delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/fonts/glyphicons-halflings-regular.woff delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2 delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/grunt/.jshintrc delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/grunt/bs-commonjs-generator.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/grunt/bs-glyphicons-data-generator.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/grunt/bs-lessdoc-parser.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/grunt/bs-raw-files-generator.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/grunt/configBridge.json delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/grunt/sauce_browsers.yml delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/js/.jscsrc delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/js/.jshintrc delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/js/affix.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/js/alert.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/js/button.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/js/carousel.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/js/collapse.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/js/dropdown.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/js/modal.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/js/popover.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/js/scrollspy.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/js/tab.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/js/tooltip.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/js/transition.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/.csscomb.json delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/.csslintrc delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/alerts.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/badges.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/bootstrap.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/breadcrumbs.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/button-groups.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/buttons.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/carousel.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/close.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/code.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/component-animations.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/dropdowns.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/forms.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/glyphicons.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/grid.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/input-groups.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/jumbotron.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/labels.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/list-group.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/media.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/alerts.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/background-variant.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/border-radius.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/buttons.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/center-block.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/clearfix.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/forms.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/gradients.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/grid-framework.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/grid.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/hide-text.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/image.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/labels.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/list-group.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/nav-divider.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/nav-vertical-align.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/opacity.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/pagination.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/panels.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/progress-bar.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/reset-filter.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/reset-text.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/resize.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/responsive-visibility.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/size.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/tab-focus.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/table-row.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/text-emphasis.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/text-overflow.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/mixins/vendor-prefixes.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/modals.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/navbar.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/navs.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/normalize.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/pager.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/pagination.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/panels.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/popovers.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/print.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/progress-bars.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/responsive-embed.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/responsive-utilities.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/scaffolding.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/tables.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/theme.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/thumbnails.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/tooltip.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/type.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/utilities.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/variables.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/less/wells.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/nuget/MyGet.ps1 delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/nuget/bootstrap.less.nuspec delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/nuget/bootstrap.nuspec delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/package.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/bootstrap/package.json delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/.bower.json delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/.gitignore delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/.npmignore delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/HELP-US-OUT.txt delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/bower.json delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/css/font-awesome.css delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/css/font-awesome.css.map delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/css/font-awesome.min.css delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/fonts/FontAwesome.otf delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/fonts/fontawesome-webfont.eot delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/fonts/fontawesome-webfont.svg delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/fonts/fontawesome-webfont.ttf delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/fonts/fontawesome-webfont.woff delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/fonts/fontawesome-webfont.woff2 delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/less/animated.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/less/bordered-pulled.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/less/core.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/less/fixed-width.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/less/font-awesome.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/less/icons.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/less/larger.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/less/list.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/less/mixins.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/less/path.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/less/rotated-flipped.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/less/screen-reader.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/less/stacked.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/less/variables.less delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/scss/_animated.scss delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/scss/_bordered-pulled.scss delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/scss/_core.scss delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/scss/_fixed-width.scss delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/scss/_icons.scss delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/scss/_larger.scss delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/scss/_list.scss delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/scss/_mixins.scss delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/scss/_path.scss delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/scss/_rotated-flipped.scss delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/scss/_screen-reader.scss delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/scss/_stacked.scss delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/scss/_variables.scss delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/font-awesome/scss/font-awesome.scss delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation-unobtrusive/.bower.json delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation-unobtrusive/LICENSE.txt delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation-unobtrusive/bower.json delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/.bower.json delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/CONTRIBUTING.md delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/Gruntfile.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/LICENSE.md delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/README.md delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/bower.json delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/build/release.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/changelog.md delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/dist/additional-methods.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/dist/additional-methods.min.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/dist/jquery.validate.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/dist/jquery.validate.min.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/package.json delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/accept.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/additional.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/alphanumeric.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/bankaccountNL.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/bankorgiroaccountNL.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/bic.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/cifES.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/cpfBR.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/creditcardtypes.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/currency.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/dateFA.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/dateITA.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/dateNL.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/extension.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/giroaccountNL.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/iban.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/integer.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/ipv4.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/ipv6.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/lettersonly.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/letterswithbasicpunc.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/mobileNL.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/mobileUK.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/nieES.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/nifES.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/notEqualTo.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/nowhitespace.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/pattern.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/phoneNL.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/phoneUK.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/phoneUS.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/phonesUK.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/postalCodeCA.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/postalcodeBR.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/postalcodeIT.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/postalcodeNL.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/postcodeUK.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/require_from_group.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/skip_or_fill_minimum.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/statesUS.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/strippedminlength.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/time.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/time12h.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/url2.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/vinUS.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/zipcodeUS.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/additional/ziprange.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/ajax.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/core.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_ar.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_bg.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_bn_BD.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_ca.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_cs.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_da.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_de.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_el.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_es.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_es_AR.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_es_PE.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_et.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_eu.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_fa.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_fi.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_fr.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_ge.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_gl.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_he.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_hr.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_hu.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_hy_AM.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_id.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_is.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_it.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_ja.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_ka.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_kk.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_ko.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_lt.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_lv.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_my.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_nl.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_no.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_pl.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_pt_BR.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_pt_PT.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_ro.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_ru.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_si.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_sk.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_sl.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_sr.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_sr_lat.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_sv.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_th.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_tj.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_tr.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_uk.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_vi.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_zh.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/messages_zh_TW.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/methods_de.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/methods_es_CL.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/methods_fi.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/methods_nl.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/src/localization/methods_pt.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery-validation/validation.jquery.json delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/.bower.json delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/AUTHORS.txt delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/LICENSE.txt delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/README.md delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/bower.json delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/dist/jquery.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/dist/jquery.min.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/dist/jquery.min.map delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/.jshintrc delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/ajax.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/ajax/jsonp.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/ajax/load.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/ajax/parseJSON.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/ajax/parseXML.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/ajax/script.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/ajax/var/location.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/ajax/var/nonce.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/ajax/var/rquery.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/ajax/xhr.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/attributes.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/attributes/attr.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/attributes/classes.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/attributes/prop.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/attributes/support.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/attributes/val.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/callbacks.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/core.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/core/access.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/core/init.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/core/parseHTML.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/core/ready.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/core/support.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/core/var/rsingleTag.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/css.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/css/addGetHookIf.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/css/adjustCSS.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/css/curCSS.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/css/defaultDisplay.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/css/hiddenVisibleSelectors.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/css/showHide.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/css/support.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/css/var/cssExpand.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/css/var/getStyles.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/css/var/isHidden.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/css/var/rmargin.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/css/var/rnumnonpx.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/css/var/swap.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/data.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/data/Data.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/data/accepts.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/data/support.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/data/var/acceptData.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/data/var/dataPriv.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/data/var/dataUser.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/deferred.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/deprecated.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/dimensions.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/effects.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/effects/Tween.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/effects/animatedSelector.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/effects/support.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/event.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/event/ajax.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/event/alias.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/event/focusin.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/event/support.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/event/trigger.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/exports/amd.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/exports/global.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/intro.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/jquery.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/manipulation.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/manipulation/_evalUrl.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/manipulation/buildFragment.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/manipulation/createSafeFragment.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/manipulation/getAll.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/manipulation/setGlobalEval.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/manipulation/support.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/manipulation/var/nodeNames.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/manipulation/var/rcheckableType.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/manipulation/var/rleadingWhitespace.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/manipulation/var/rscriptType.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/manipulation/var/rtagName.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/manipulation/wrapMap.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/offset.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/outro.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/queue.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/queue/delay.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/selector-native.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/selector-sizzle.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/selector.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/serialize.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/support.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/traversing.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/traversing/findFilter.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/traversing/var/dir.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/traversing/var/rneedsContext.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/traversing/var/siblings.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/var/arr.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/var/class2type.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/var/concat.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/var/deletedIds.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/var/document.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/var/documentElement.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/var/hasOwn.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/var/indexOf.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/var/pnum.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/var/push.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/var/rcssNum.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/var/rnotwhite.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/var/slice.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/var/support.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/var/toString.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/jquery/src/wrap.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/seajs/.bower.json delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/seajs/LICENSE.md delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/seajs/bower.json delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/seajs/dist/runtime-debug.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/seajs/dist/runtime.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/seajs/dist/sea-debug.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/seajs/dist/sea.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/seajs/dist/standalone-debug.js delete mode 100644 src/Surging.ApiGateway/wwwroot/assets/lib/seajs/dist/standalone.js delete mode 100644 src/Surging.ApiGateway/wwwroot/favicon.ico delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/Aggregation/ServicePartProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/Aggregation/ServicePartType.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/AppConfig.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/Configurations/AccessPolicy.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/Configurations/Register.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/Configurations/RegisterProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/Configurations/ServiceAggregation.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/Configurations/ServicePart.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/Configurations/Services.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/ContainerBuilderExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/IServicePartProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/OAuth/IAuthorizationServerProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/OAuth/Implementation/AuthorizationServerProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/OAuth/Implementation/Configurations/ConfigInfo.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/OAuth/Implementation/Configurations/GatewayConfigurationExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/OAuth/Implementation/Configurations/GatewayConfigurationProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/OAuth/Implementation/Configurations/GatewayConfigurationSource.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/OAuth/Implementation/EncryptMode.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/OAuth/Implementation/JWTSecureDataHeader.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/OAuth/Implementation/JWTSecureDataType.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/ServiceDiscovery/IFaultTolerantProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/ServiceDiscovery/IServiceCacheProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/ServiceDiscovery/IServiceDiscoveryProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/ServiceDiscovery/IServiceSubscribeProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/ServiceDiscovery/Implementation/FaultTolerantProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/ServiceDiscovery/Implementation/ServiceAddressModel.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/ServiceDiscovery/Implementation/ServiceCacheProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/ServiceDiscovery/Implementation/ServiceDiscoveryProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/ServiceDiscovery/Implementation/ServiceSubscribeProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/ServiceResult.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/ServiceStatusCode.cs delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/Surging.Core.ApiGateWay.csproj delete mode 100644 src/Surging.Core/Surging.Core.ApiGateWay/Utilities/ServiceResult.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Address/AddressModel.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Address/IpAddressModel.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/AppConfig.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/CPlatformContainer.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/CPlatformResource.Designer.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/CPlatformResource.resx delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Cache/CacheDescriptor.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Cache/CacheEndpoint.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Cache/ICacheNodeProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Cache/ICacheProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Cache/IServiceCacheFactory.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Cache/IServiceCacheManager.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Cache/Implementation/ServiceCacheManagerBase.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Cache/ServiceCache.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Cache/ServiceCacheDescriptor.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/CommunicationProtocol.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Configurations/CPlatformConfigurationExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Configurations/CPlatformConfigurationProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Configurations/CPlatformConfigurationSource.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Configurations/IConfigurationWatchManager.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Configurations/ModulePackage.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Configurations/ProtocolPortOptions.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Configurations/Remote/IConfigurationParser.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Configurations/Remote/JsonConfigurationParser.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Configurations/Remote/RemoteConfigurationEvents.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Configurations/Remote/RemoteConfigurationExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Configurations/Remote/RemoteConfigurationProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Configurations/Remote/RemoteConfigurationSource.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Configurations/SurgingServerOptions.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Configurations/Watch/ConfigurationWatch.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Configurations/Watch/ConfigurationWatchManager.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/ContainerBuilderExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Convertibles/ITypeConvertibleProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Convertibles/ITypeConvertibleService.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Convertibles/Implementation/DefaultTypeConvertibleProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Convertibles/Implementation/DefaultTypeConvertibleService.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/DependencyResolution/DependencyResolverExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/DependencyResolution/IDependencyResolver.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/DependencyResolution/ServiceResolver.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Engines/IServiceEngine.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Engines/IServiceEngineBuilder.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Engines/IServiceEngineLifetime.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Engines/Implementation/DefaultServiceEngineBuilder.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Engines/Implementation/ServiceEngineLifetime.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Engines/Implementation/VirtualPathProviderServiceEngine .cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/EventBus/Events/EventContext.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/EventBus/Events/IIntegrationEventHandler.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/EventBus/Events/IntegrationEvent.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/EventBus/IEventBusSubscriptionsManager.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/EventBus/ISubscriptionAdapt.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/EventBus/Implementation/IEventBus.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/EventBus/InMemoryEventBusSubscriptionsManager.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Exceptions/CPlatformException.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Exceptions/CPlatformRemoteException.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Exceptions/CommunicationException.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Filters/IAuthorizationFilter.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Filters/IExceptionFilter.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Filters/IFilter.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Filters/Implementation/AuthorizationAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Filters/Implementation/AuthorizationFilterAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Filters/Implementation/AuthorizationType.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Filters/Implementation/ExceptionFilterAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Filters/Implementation/FilterAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Filters/Implementation/RpcActionExecutedContext.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/HashAlgorithms/ConsistentHash.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/HashAlgorithms/HashAlgorithm.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/HashAlgorithms/IHashAlgorithm.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/IdentifyAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Ids/IServiceIdGenerator.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Ids/Implementation/DefaultServiceIdGenerator.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Ioc/BaseRepository.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Ioc/IServiceBehavior.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Ioc/IServiceKey.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Ioc/ModuleNameAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Ioc/ServiceBase.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Logging/NullLogger.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Messages/HttpMessage.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Messages/HttpResultMessage.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Messages/MessagePackTransportMessageType.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Messages/RemoteInvokeMessage.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Messages/RemoteInvokeResultMessage.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Messages/TransportMessage.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Module/AbstractModule.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Module/AssemblyEntry.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Module/BusinessModule.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Module/Component.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Module/ContainerBuilderWrapper.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Module/EchoService.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Module/EnginePartModule.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Module/IEchoService.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Module/IModuleManager.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Module/IModuleProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Module/ModuleProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Module/ModuleState.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Module/RegistrationExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Module/SystemModule.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Mqtt/IMqttServiceFactory.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Mqtt/IMqttServiceRouteManager.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Mqtt/Implementation/MqttServiceRouteManagerBase.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Mqtt/MqttDescriptor.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Mqtt/MqttServiceDescriptor.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Mqtt/MqttServiceRoute.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/RequetData.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Routing/IServiceRouteFactory.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Routing/IServiceRouteManager.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Routing/IServiceRouteProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Routing/Implementation/DefaultServiceRouteFactory.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Routing/Implementation/DefaultServiceRouteProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Routing/Implementation/ServiceRouteManagerBase.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Routing/Implementation/SharedFileServiceRouteManager.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Routing/ServiceRoute.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Routing/ServiceRouteContext.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Routing/ServiceRouteDescriptor.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Routing/ServiceRouteWatch.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Routing/Template/RoutePatternParser.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/IAddressResolver.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/DefaultAddressResolver.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/Selectors/IAddressSelector.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/Selectors/Implementation/AddressSelectorBase.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/Selectors/Implementation/AddressSelectorMode.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/Selectors/Implementation/FairPollingAdrSelector.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/Selectors/Implementation/HashAlgorithmAdrSelector.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/Selectors/Implementation/PollingAddressSelector.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Address/Resolvers/Implementation/Selectors/Implementation/RandomAddressSelector.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/HealthChecks/IHealthCheckService.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/HealthChecks/Implementation/DefaultHealthCheckService.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/HealthChecks/Implementation/HealthCheckEventArgs.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/IRemoteInvokeService.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/IServiceHeartbeatManager.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/IServiceSubscribeManager.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/IServiceSubscriberFactory.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Implementation/DefaultServiceHeartbeatManager.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Implementation/DefaultServiceSubscriberFactory.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Implementation/RemoteInvokeService.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/Implementation/ServiceSubscribeManagerBase.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/RemoteInvokeContext.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/ServiceSubscriber.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Client/ServiceSubscriberDescriptor.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/IServiceEntryLocate.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/IServiceEntryManager.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/IServiceEntryProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/IServiceExecutor.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/IServiceHost.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/IServiceTokenGenerator.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/Implementation/DefaultServiceEntryLocate.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/Implementation/DefaultServiceEntryManager.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/Implementation/DefaultServiceExecutor.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/Implementation/DefaultServiceHost.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/Implementation/ServiceDiscovery/Attributes/AttributeServiceEntryProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/Implementation/ServiceDiscovery/Attributes/ServiceAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/Implementation/ServiceDiscovery/Attributes/ServiceBundleAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/Implementation/ServiceDiscovery/Attributes/ServiceDescriptorAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/Implementation/ServiceDiscovery/Attributes/ServiceMetadataAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/Implementation/ServiceDiscovery/IClrServiceEntryFactory.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/Implementation/ServiceDiscovery/Implementation/ClrServiceEntryFactory.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/Implementation/ServiceHostAbstract.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/Implementation/ServiceTokenGenerator.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Runtime/Server/ServiceEntry.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Serialization/ISerializer.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Serialization/Implementation/JsonSerializer.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Serialization/Implementation/StringByteArraySerializer.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Serialization/Implementation/StringObjectSerializer.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Serialization/SerializerExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/ServiceDescriptor.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/ServiceHostBuilderExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Support/Attributes/CommandAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Support/IBreakeRemoteInvokeService.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Support/IClusterInvoker.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Support/IFallbackInvoker.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Support/IServiceCommandManager.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Support/IServiceCommandProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Support/Implementation/BreakeRemoteInvokeService.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Support/Implementation/FailoverHandoverInvoker.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Support/Implementation/FailoverInjectionInvoker.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Support/Implementation/ServiceCommandBase.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Support/Implementation/ServiceCommandManagerBase.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Support/Implementation/ServiceCommandProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Support/ServiceCommand.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Support/ServiceCommandDescriptor.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Support/ServiceInvokeListenInfo.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Support/StrategyType.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Surging.Core.CPlatform.csproj delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Transport/Codec/ITransportMessageCodecFactory.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Transport/Codec/ITransportMessageDecoder.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Transport/Codec/ITransportMessageEncoder.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Transport/Codec/Implementation/JsonTransportMessageCodecFactory.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Transport/Codec/Implementation/JsonTransportMessageDecoder.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Transport/Codec/Implementation/JsonTransportMessageEncoder.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Transport/IMessageListener.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Transport/IMessageSender.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Transport/ITransportClient.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Transport/ITransportClientFactory.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Transport/Implementation/MessageListener.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Transport/Implementation/RpcContext.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Transport/Implementation/TransportClient.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Utilities/CancellationTokenExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Utilities/Check.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Utilities/DebugCheck.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Utilities/EnvironmentHelper.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Utilities/FastInvoke.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Utilities/NetUtils.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Utilities/ServiceLocator.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Utilities/StringExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Utilities/TaskHelpers.cs delete mode 100644 src/Surging.Core/Surging.Core.CPlatform/Utilities/UtilityType.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/AddressResolvers/IAddressResolver.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/AddressResolvers/Implementation/DefaultAddressResolver.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/AppConfig.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/CacheContainer.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/CacheTargetType.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/CachingModule.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/CachingResources.Designer.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/CachingResources.resx delete mode 100644 src/Surging.Core/Surging.Core.Caching/Configurations/CacheConfigurationExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/Configurations/CacheConfigurationProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/Configurations/CacheConfigurationSource.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/Configurations/IConfigurationWatchProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/Configurations/Implementation/ConfigurationWatchProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/Configurations/Remote/IConfigurationParser.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/Configurations/Remote/JsonConfigurationParser.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/Configurations/Remote/RemoteConfigurationEvents.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/Configurations/Remote/RemoteConfigurationExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/Configurations/Remote/RemoteConfigurationProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/Configurations/Remote/RemoteConfigurationSource.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/ContainerBuilderExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/DependencyResolution/DependencyResolverExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/DependencyResolution/IDependencyResolver.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/DependencyResolution/ServiceResolver.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/HashAlgorithms/ConsistentHash.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/HashAlgorithms/ConsistentHashNode.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/HashAlgorithms/HashAlgorithm.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/HashAlgorithms/IHashAlgorithm.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/HealthChecks/IHealthCheckService.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/HealthChecks/Implementation/DefaultHealthCheckService.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/IdentifyCacheAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/Interfaces/ICacheClient.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/Internal/Implementation/DefaultCacheNodeProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/Internal/Implementation/DefaultServiceCacheFactory.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/Models/CachingProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/Models/Map.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/Models/Property.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/Models/binding.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/NetCache/GCThreadProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/NetCache/MemoryCache.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/NetCache/MemoryCacheProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/ObjectPool.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/RedisCache/RedisCacheClient.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/RedisCache/RedisContext.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/RedisCache/RedisEndpoint.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/RedisCache/RedisProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/RedisCache/StackExchangeRedisExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/ServiceHostBuilderExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/Surging.Core.Caching.csproj delete mode 100644 src/Surging.Core/Surging.Core.Caching/Utilities/CacheException.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/Utilities/Check.cs delete mode 100644 src/Surging.Core/Surging.Core.Caching/Utilities/DebugCheck.cs delete mode 100644 src/Surging.Core/Surging.Core.Codec.MessagePack/ContainerBuilderExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Codec.MessagePack/MessagePackModule.cs delete mode 100644 src/Surging.Core/Surging.Core.Codec.MessagePack/MessagePackTransportMessageCodecFactory.cs delete mode 100644 src/Surging.Core/Surging.Core.Codec.MessagePack/MessagePackTransportMessageDecoder.cs delete mode 100644 src/Surging.Core/Surging.Core.Codec.MessagePack/MessagePackTransportMessageEncoder.cs delete mode 100644 src/Surging.Core/Surging.Core.Codec.MessagePack/Messages/DynamicItem.cs delete mode 100644 src/Surging.Core/Surging.Core.Codec.MessagePack/Messages/MessagePackRemoteInvokeMessage.cs delete mode 100644 src/Surging.Core/Surging.Core.Codec.MessagePack/Messages/MessagePackRemoteInvokeResultMessage.cs delete mode 100644 src/Surging.Core/Surging.Core.Codec.MessagePack/Messages/MessagePackTransportMessage.cs delete mode 100644 src/Surging.Core/Surging.Core.Codec.MessagePack/Surging.Core.Codec.MessagePack.csproj delete mode 100644 src/Surging.Core/Surging.Core.Codec.MessagePack/Utilities/SerializerUtilitys.cs delete mode 100644 src/Surging.Core/Surging.Core.Codec.ProtoBuffer/ContainerBuilderExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Codec.ProtoBuffer/Messages/DynamicItem.cs delete mode 100644 src/Surging.Core/Surging.Core.Codec.ProtoBuffer/Messages/ProtoBufferRemoteInvokeMessage.cs delete mode 100644 src/Surging.Core/Surging.Core.Codec.ProtoBuffer/Messages/ProtoBufferRemoteInvokeResultMessage.cs delete mode 100644 src/Surging.Core/Surging.Core.Codec.ProtoBuffer/Messages/ProtoBufferTransportMessage.cs delete mode 100644 src/Surging.Core/Surging.Core.Codec.ProtoBuffer/ProtoBufferModule.cs delete mode 100644 src/Surging.Core/Surging.Core.Codec.ProtoBuffer/ProtoBufferTransportMessageCodecFactory.cs delete mode 100644 src/Surging.Core/Surging.Core.Codec.ProtoBuffer/ProtoBufferTransportMessageDecoder.cs delete mode 100644 src/Surging.Core/Surging.Core.Codec.ProtoBuffer/ProtoBufferTransportMessageEncoder.cs delete mode 100644 src/Surging.Core/Surging.Core.Codec.ProtoBuffer/Surging.Core.Codec.ProtoBuffer.csproj delete mode 100644 src/Surging.Core/Surging.Core.Codec.ProtoBuffer/Utilities/SerializerUtilitys.cs delete mode 100644 src/Surging.Core/Surging.Core.Common/ApiResult.cs delete mode 100644 src/Surging.Core/Surging.Core.Common/CommonModule.cs delete mode 100644 src/Surging.Core/Surging.Core.Common/Extensions/EnumExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Common/ServicesException/ServiceException.cs delete mode 100644 src/Surging.Core/Surging.Core.Common/Surging.Core.Common.csproj delete mode 100644 src/Surging.Core/Surging.Core.Consul/AppConfig.cs delete mode 100644 src/Surging.Core/Surging.Core.Consul/Configurations/ConfigInfo.cs delete mode 100644 src/Surging.Core/Surging.Core.Consul/Configurations/ConsulConfigurationExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Consul/Configurations/ConsulConfigurationProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.Consul/Configurations/ConsulConfigurationSource.cs delete mode 100644 src/Surging.Core/Surging.Core.Consul/Configurations/ConsulOption.cs delete mode 100644 src/Surging.Core/Surging.Core.Consul/ConsulModule.cs delete mode 100644 src/Surging.Core/Surging.Core.Consul/ConsulMqttServiceRouteManager.cs delete mode 100644 src/Surging.Core/Surging.Core.Consul/ConsulServiceCacheManager.cs delete mode 100644 src/Surging.Core/Surging.Core.Consul/ConsulServiceCommandManager.cs delete mode 100644 src/Surging.Core/Surging.Core.Consul/ConsulServiceRouteManager.cs delete mode 100644 src/Surging.Core/Surging.Core.Consul/ConsulServiceSubscribeManager.cs delete mode 100644 src/Surging.Core/Surging.Core.Consul/ContainerBuilderExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Consul/Package.nuspec delete mode 100644 src/Surging.Core/Surging.Core.Consul/Surging.Core.Consul.csproj delete mode 100644 src/Surging.Core/Surging.Core.Consul/Utilitys/ConsulClientExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Consul/WatcherProvider/IClientWatchManager.cs delete mode 100644 src/Surging.Core/Surging.Core.Consul/WatcherProvider/Implementation/ChildWatchRegistration.cs delete mode 100644 src/Surging.Core/Surging.Core.Consul/WatcherProvider/Implementation/ChildrenMonitorWatcher.cs delete mode 100644 src/Surging.Core/Surging.Core.Consul/WatcherProvider/Implementation/ClientWatchManager.cs delete mode 100644 src/Surging.Core/Surging.Core.Consul/WatcherProvider/Implementation/NodeMonitorWatcher.cs delete mode 100644 src/Surging.Core/Surging.Core.Consul/WatcherProvider/Implementation/ReconnectionWatcher.cs delete mode 100644 src/Surging.Core/Surging.Core.Consul/WatcherProvider/Implementation/WatchRegistration.cs delete mode 100644 src/Surging.Core/Surging.Core.Consul/WatcherProvider/Implementation/Watcher.cs delete mode 100644 src/Surging.Core/Surging.Core.Consul/WatcherProvider/Implementation/WatcherBase.cs delete mode 100644 src/Surging.Core/Surging.Core.DotNetty/Adapter/TransportMessageChannelHandlerAdapter.cs delete mode 100644 src/Surging.Core/Surging.Core.DotNetty/ContainerBuilderExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.DotNetty/DotNettyMessageSender.cs delete mode 100644 src/Surging.Core/Surging.Core.DotNetty/DotNettyModule.cs delete mode 100644 src/Surging.Core/Surging.Core.DotNetty/DotNettyServerMessageListener.cs delete mode 100644 src/Surging.Core/Surging.Core.DotNetty/DotNettyTransportClientFactory.cs delete mode 100644 src/Surging.Core/Surging.Core.DotNetty/Surging.Core.DotNetty.csproj delete mode 100644 src/Surging.Core/Surging.Core.EventBusKafka/Appconfig.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusKafka/Configurations/EventBusConfigurationExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusKafka/Configurations/EventBusConfigurationProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusKafka/Configurations/EventBusConfigurationSource.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusKafka/Configurations/KafkaOptions.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusKafka/Configurations/OffsetResetMode.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusKafka/ContainerBuilderExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusKafka/EventBusKafkaModule.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusKafka/IConsumeConfigurator.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusKafka/IKafkaPersisterConnection.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusKafka/Implementation/DefaultConsumeConfigurator.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusKafka/Implementation/EventBusKafka.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusKafka/Implementation/KafkaConnectionType.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusKafka/Implementation/KafkaConsumerPersistentConnection.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusKafka/Implementation/KafkaPersistentConnectionBase.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusKafka/Implementation/KafkaProducerPersistentConnection.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusKafka/Implementation/KafkaSubscriptionAdapt.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusKafka/ServiceHostBuilderExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusKafka/Surging.Core.EventBusKafka.csproj delete mode 100644 src/Surging.Core/Surging.Core.EventBusKafka/Utilities/ExtensionsToFastActivator.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusKafka/Utilities/FastInvoker.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusRabbitMQ/AppConfig.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusRabbitMQ/Attributes/QueueConsumerAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusRabbitMQ/Configurations/EventBusConfigurationExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusRabbitMQ/Configurations/EventBusConfigurationProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusRabbitMQ/Configurations/EventBusConfigurationSource.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusRabbitMQ/Configurations/EventBusOption.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusRabbitMQ/ContainerBuilderExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusRabbitMQ/EventBusRabbitMQModule.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusRabbitMQ/IConsumeConfigurator.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusRabbitMQ/IRabbitMQPersisterConnection.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusRabbitMQ/Implementation/DefaultConsumeConfigurator.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusRabbitMQ/Implementation/DefaultRabbitMQPersisterConnection.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusRabbitMQ/Implementation/EventBusRabbitMQ.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusRabbitMQ/Implementation/RabbitMqSubscriptionAdapt.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusRabbitMQ/QueueConsumerMode.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusRabbitMQ/RabbitmqLifetime.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusRabbitMQ/ServiceHostBuilderExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusRabbitMQ/Surging.Core.EventBusRabbitMQ.csproj delete mode 100644 src/Surging.Core/Surging.Core.EventBusRabbitMQ/Utilities/ExtensionsToFastActivator.cs delete mode 100644 src/Surging.Core/Surging.Core.EventBusRabbitMQ/Utilities/FastInvoker.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/ActionContext.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/ActionResult.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/ContentResult.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/FileContentResult.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/FileResult.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/Abstractions/IActionResult.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/AppConfig.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/DefaultHttpServiceHost.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/HttpExecutor.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/HttpMessageListener.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/HttpServerMessageSender.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/HttpServiceHost.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/Internal/DefaultServiceSchemaProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/Internal/FileStreamResult.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/Internal/HttpFormCollection.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/Internal/HttpFormFile.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/Internal/HttpFormFileCollection.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/Internal/IServiceSchemaProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/Internal/StreamCopyOperation.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/KestrelHttpMessageListener.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/KestrelHttpModule.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/StatusCode.cs delete mode 100644 src/Surging.Core/Surging.Core.KestrelHttpServer/Surging.Core.KestrelHttpServer.csproj delete mode 100644 src/Surging.Core/Surging.Core.Log4net/Log4NetLogger.cs delete mode 100644 src/Surging.Core/Surging.Core.Log4net/Log4NetProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.Log4net/Log4netModule.cs delete mode 100644 src/Surging.Core/Surging.Core.Log4net/ServiceHostBuilderExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Log4net/Surging.Core.Log4net.csproj delete mode 100644 src/Surging.Core/Surging.Core.NLog/NLogModule.cs delete mode 100644 src/Surging.Core/Surging.Core.NLog/NLogProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.NLog/NLogger.cs delete mode 100644 src/Surging.Core/Surging.Core.NLog/ServiceHostBuilderExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.NLog/Surging.Core.Nlog.csproj delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Http/ContainerBuilderExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Http/DotNettyHttpServerMessageListener.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Http/DotNettyHttpServerMessageSender.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Http/HttpProtocolModule.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Http/HttpServiceExecutor.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Http/HttpServiceHost.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Http/StatusCode.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Http/Surging.Core.Protocol.Http.csproj delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/DotNettyMqttServerMessageListener.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Implementation/DefaultMqttServiceFactory.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Implementation/ServerMqttHandlerService.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Channel/MqttChannel.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/Behavior.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/ConfirmStatus.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/ConnReturnCode.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/MessageType.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/SessionStatus.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Enums/SubscribeStatus.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/ConnectMessage.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/MqttMessage.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/MqttWillMessage.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/RetainMessage.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/SendMqttMessage.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Messages/SessionMessage.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/IMqttBehaviorProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/IMqttBrokerEntryManger.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/IMqttRemoteInvokeService.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/IMqttRomtePublishService.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Implementation/DefaultMqttBehaviorProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Implementation/DefaultMqttBrokerEntryManager.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Implementation/MqttRemoteInvokeService.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Implementation/MqttRomtePublishService.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/MqttRemoteInvokeContext.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/Runnable.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/SacnScheduled.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Runtime/ScanRunnable.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/AbstractChannelService.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/IChannelService.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/IClientSessionService.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/IMessagePushService.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/IWillService.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/Implementation/ClientSessionService.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/Implementation/MessagePushService.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/Implementation/MqttChannelService.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/Implementation/WillService.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/MqttBehavior.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/MqttHandlerServiceBase.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/MqttProtocolModule.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/MqttServiceHost.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Surging.Core.Protocol.Mqtt.csproj delete mode 100644 src/Surging.Core/Surging.Core.Protocol.Mqtt/Util/MessageIdGenerater.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.WS/Attributes/BehaviorContractAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.WS/Configurations/BehaviorOption.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.WS/Configurations/WebSocketOptions.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.WS/DefaultWSServerMessageListener.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.WS/Runtime/IWSServiceEntryProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.WS/Runtime/Implementation/DefaultWSServiceEntryProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.WS/Runtime/WSServiceEntry.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.WS/Surging.Core.Protocol.WS.csproj delete mode 100644 src/Surging.Core/Surging.Core.Protocol.WS/WSProtocolModule.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.WS/WSServiceBase.cs delete mode 100644 src/Surging.Core/Surging.Core.Protocol.WS/WSServiceHost.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/ContainerBuilderExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/FastReflection/ConstructorInvoker.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/FastReflection/MethodInvoker.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/FastReflection/PropertyAccessor.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/IServiceProxyFactory.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/IServiceProxyGenerater.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/IServiceProxyProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/Implementation/RemoteServiceProxy.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/Implementation/ServiceProxyBase.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/Implementation/ServiceProxyFactory.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/Implementation/ServiceProxyGenerater.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/Implementation/ServiceProxyProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/Interceptors/CacheInterceptor.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/Interceptors/ICacheInvocation.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/Interceptors/IInterceptor.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/Interceptors/IInterceptorProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/Interceptors/IInvocation.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/Interceptors/Implementation/AbstractInvocation.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/Interceptors/Implementation/ActionInvocation.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/Interceptors/Implementation/InterceptorProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/Interceptors/Implementation/KeyAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/Interceptors/InvocationMethods.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/ProxyServiceBase.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/RegistrationExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/ServiceHostBuilderExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/ServiceProxyModule.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/Surging.Core.ProxyGenerator.csproj delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/Utilitys/AttributeFactory.cs delete mode 100644 src/Surging.Core/Surging.Core.ProxyGenerator/Utilitys/CompilationUtilitys.cs delete mode 100644 src/Surging.Core/Surging.Core.Redis/Configurations/ConfigInfo.cs delete mode 100644 src/Surging.Core/Surging.Core.Redis/Extensions/StackExchangeRedisExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Redis/Provider/ICacheClient.cs delete mode 100644 src/Surging.Core/Surging.Core.Redis/Provider/Implementation/RedisCacheClient.cs delete mode 100644 src/Surging.Core/Surging.Core.Redis/Provider/Implementation/RedisEndpoint.cs delete mode 100644 src/Surging.Core/Surging.Core.Redis/Provider/Implementation/RedisProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.Redis/Surging.Core.Redis.csproj delete mode 100644 src/Surging.Core/Surging.Core.ServiceHosting/Internal/IApplicationLifetime.cs delete mode 100644 src/Surging.Core/Surging.Core.ServiceHosting/Internal/IHostLifetime.cs delete mode 100644 src/Surging.Core/Surging.Core.ServiceHosting/Internal/IServiceHost.cs delete mode 100644 src/Surging.Core/Surging.Core.ServiceHosting/Internal/IServiceHostBuilder.cs delete mode 100644 src/Surging.Core/Surging.Core.ServiceHosting/Internal/Implementation/ApplicationLifetime.cs delete mode 100644 src/Surging.Core/Surging.Core.ServiceHosting/Internal/Implementation/ConfigureBuilder.cs delete mode 100644 src/Surging.Core/Surging.Core.ServiceHosting/Internal/Implementation/ConfigureContainerBuilder.cs delete mode 100644 src/Surging.Core/Surging.Core.ServiceHosting/Internal/Implementation/ConfigureServicesBuilder.cs delete mode 100644 src/Surging.Core/Surging.Core.ServiceHosting/Internal/Implementation/ConsoleLifetime.cs delete mode 100644 src/Surging.Core/Surging.Core.ServiceHosting/Internal/Implementation/ServiceHost.cs delete mode 100644 src/Surging.Core/Surging.Core.ServiceHosting/Internal/Implementation/ServiceHostBuilder.cs delete mode 100644 src/Surging.Core/Surging.Core.ServiceHosting/Internal/Implementation/StartupLoader.cs delete mode 100644 src/Surging.Core/Surging.Core.ServiceHosting/ServiceCollectionExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.ServiceHosting/ServiceHostBuilderExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.ServiceHosting/Startup/IStartup.cs delete mode 100644 src/Surging.Core/Surging.Core.ServiceHosting/Startup/Implementation/ConventionBasedStartup.cs delete mode 100644 src/Surging.Core/Surging.Core.ServiceHosting/Startup/Implementation/DelegateStartup.cs delete mode 100644 src/Surging.Core/Surging.Core.ServiceHosting/Startup/Implementation/StartupBase.cs delete mode 100644 src/Surging.Core/Surging.Core.ServiceHosting/Startup/Implementation/StartupMethods.cs delete mode 100644 src/Surging.Core/Surging.Core.ServiceHosting/Surging.Core.ServiceHosting.csproj delete mode 100644 src/Surging.Core/Surging.Core.Swagger/Surging.Core.Swagger.csproj delete mode 100644 src/Surging.Core/Surging.Core.Swagger/Swagger/Application/SwaggerBuilderExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/Swagger/Application/SwaggerContractResolver.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/Swagger/Application/SwaggerMiddleware.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/Swagger/Application/SwaggerOptions.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/Swagger/Application/SwaggerSerializerFactory.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/Swagger/Model/ApiKeyScheme.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/Swagger/Model/BasicAuthScheme.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/Swagger/Model/ISwaggerProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/Swagger/Model/OAuth2Scheme.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/Swagger/Model/SecurityScheme.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/Swagger/Model/SwaggerDocument.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Application/ConfigureSchemaRegistryOptions.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Application/ConfigureSwaggerGeneratorOptions.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Application/SwaggerApplicationConvention.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Application/SwaggerGenOptions.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Application/SwaggerGenOptionsExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Application/SwaggerGenServiceCollectionExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/ApiDescriptionExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/ApiParameterDescriptionExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/ApiResponseTypeExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/IDocumentFilter.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/IOperationFilter.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/IParameterFilter.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/ISchemaFilter.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/ISchemaRegistry.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/ISchemaRegistryFactory.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/JsonContractExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/JsonPropertyExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/SchemaExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/SchemaIdManager.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/SchemaRegistry.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/SchemaRegistryFactory.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/SchemaRegistryOptions.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/StringExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/SwaggerGenerator.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/SwaggerGeneratorOptions.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/Generator/TypeExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/XmlComments/XmlCommentsDocumentFilter.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/XmlComments/XmlCommentsMemberNameHelper.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/XmlComments/XmlCommentsOperationFilter.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/XmlComments/XmlCommentsSchemaFilter.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerGen/XmlComments/XmlCommentsTextHelper.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerUI/SwaggerUIBuilderExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerUI/SwaggerUIMiddleware.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerUI/SwaggerUIOptions.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerUI/SwaggerUIOptionsExtensions.cs.cs delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerUI/index.html delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerUI/node_modules/swagger-ui-dist/absolute-path.js delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerUI/node_modules/swagger-ui-dist/favicon-16x16.png delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerUI/node_modules/swagger-ui-dist/favicon-32x32.png delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerUI/node_modules/swagger-ui-dist/index.html delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerUI/node_modules/swagger-ui-dist/index.js delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerUI/node_modules/swagger-ui-dist/oauth2-redirect.html delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerUI/node_modules/swagger-ui-dist/package.json delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerUI/node_modules/swagger-ui-dist/swagger-ui-bundle.js delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerUI/node_modules/swagger-ui-dist/swagger-ui-bundle.js.map delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerUI/node_modules/swagger-ui-dist/swagger-ui-dist-3.17.5.tgz delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerUI/node_modules/swagger-ui-dist/swagger-ui-standalone-preset.js delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerUI/node_modules/swagger-ui-dist/swagger-ui-standalone-preset.js.map delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerUI/node_modules/swagger-ui-dist/swagger-ui.css delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerUI/node_modules/swagger-ui-dist/swagger-ui.css.map delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerUI/node_modules/swagger-ui-dist/swagger-ui.js delete mode 100644 src/Surging.Core/Surging.Core.Swagger/SwaggerUI/node_modules/swagger-ui-dist/swagger-ui.js.map delete mode 100644 src/Surging.Core/Surging.Core.System/Intercept/CacheKeyAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.System/Intercept/CacheProviderExtension.cs delete mode 100644 src/Surging.Core/Surging.Core.System/Intercept/CacheProviderInterceptor.cs delete mode 100644 src/Surging.Core/Surging.Core.System/Intercept/CachingMethod.cs delete mode 100644 src/Surging.Core/Surging.Core.System/Intercept/InterceptMethodAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.System/Intercept/LogProviderInterceptor.cs delete mode 100644 src/Surging.Core/Surging.Core.System/Intercept/LoggerInterceptAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.System/Intercept/SectionType.cs delete mode 100644 src/Surging.Core/Surging.Core.System/Ioc/ModuleNameAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.System/Ioc/RegistrationExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.System/Module/AbstractModule.cs delete mode 100644 src/Surging.Core/Surging.Core.System/Module/Attributes/AssemblyDisableStopAndUninstalledAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.System/Module/Attributes/AssemblyModuleTypeAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.System/Module/Attributes/ModelBinderTypeAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.System/Module/Attributes/ModuleDescriptionAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.System/Module/BusinessModule.cs delete mode 100644 src/Surging.Core/Surging.Core.System/Module/Component.cs delete mode 100644 src/Surging.Core/Surging.Core.System/Module/ContainerBuilderWrapper.cs delete mode 100644 src/Surging.Core/Surging.Core.System/Module/ModuleType.cs delete mode 100644 src/Surging.Core/Surging.Core.System/Module/RegistrationExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.System/Module/SystemModule.cs delete mode 100644 src/Surging.Core/Surging.Core.System/MongoProvider/Attributes/CollectionNameAttribute.cs delete mode 100644 src/Surging.Core/Surging.Core.System/MongoProvider/Entity.cs delete mode 100644 src/Surging.Core/Surging.Core.System/MongoProvider/IEntity.cs delete mode 100644 src/Surging.Core/Surging.Core.System/MongoProvider/MongoConfig.cs delete mode 100644 src/Surging.Core/Surging.Core.System/MongoProvider/MongoModule.cs delete mode 100644 src/Surging.Core/Surging.Core.System/MongoProvider/QueryParams.cs delete mode 100644 src/Surging.Core/Surging.Core.System/MongoProvider/Repositories/IMongoRepository.cs delete mode 100644 src/Surging.Core/Surging.Core.System/MongoProvider/Repositories/MongoRepository.cs delete mode 100644 src/Surging.Core/Surging.Core.System/MongoProvider/Util.cs delete mode 100644 src/Surging.Core/Surging.Core.System/Properties/AssemblyInfo.cs delete mode 100644 src/Surging.Core/Surging.Core.System/ServiceBase.cs delete mode 100644 src/Surging.Core/Surging.Core.System/Surging.Core.System.csproj delete mode 100644 src/Surging.Core/Surging.Core.Zookeeper/AppConfig.cs delete mode 100644 src/Surging.Core/Surging.Core.Zookeeper/Configurations/ConfigInfo.cs delete mode 100644 src/Surging.Core/Surging.Core.Zookeeper/Configurations/ZookeeperConfigurationExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Zookeeper/Configurations/ZookeeperConfigurationProvider.cs delete mode 100644 src/Surging.Core/Surging.Core.Zookeeper/Configurations/ZookeeperConfigurationSource.cs delete mode 100644 src/Surging.Core/Surging.Core.Zookeeper/Configurations/ZookeeperOption.cs delete mode 100644 src/Surging.Core/Surging.Core.Zookeeper/ContainerBuilderExtensions.cs delete mode 100644 src/Surging.Core/Surging.Core.Zookeeper/Surging.Core.Zookeeper.csproj delete mode 100644 src/Surging.Core/Surging.Core.Zookeeper/WatcherProvider/ChildrenMonitorWatcher.cs delete mode 100644 src/Surging.Core/Surging.Core.Zookeeper/WatcherProvider/NodeMonitorWatcher.cs delete mode 100644 src/Surging.Core/Surging.Core.Zookeeper/WatcherProvider/ReconnectionWatcher.cs delete mode 100644 src/Surging.Core/Surging.Core.Zookeeper/WatcherProvider/WatcherBase.cs delete mode 100644 src/Surging.Core/Surging.Core.Zookeeper/ZooKeeperMqttServiceRouteManager.cs delete mode 100644 src/Surging.Core/Surging.Core.Zookeeper/ZooKeeperServiceRouteManager.cs delete mode 100644 src/Surging.Core/Surging.Core.Zookeeper/ZooKeeperServiceSubscribeManager.cs delete mode 100644 src/Surging.Core/Surging.Core.Zookeeper/ZookeeperModule.cs delete mode 100644 src/Surging.Core/Surging.Core.Zookeeper/ZookeeperServiceCacheManager.cs delete mode 100644 src/Surging.Core/Surging.Core.Zookeeper/ZookeeperServiceCommandManager.cs delete mode 100644 src/Surging.IModuleServices/Surging.IModuleServices.Common/IChatService.cs delete mode 100644 src/Surging.IModuleServices/Surging.IModuleServices.Common/IControllerService.cs delete mode 100644 src/Surging.IModuleServices/Surging.IModuleServices.Common/IRoteMangeService.cs delete mode 100644 src/Surging.IModuleServices/Surging.IModuleServices.Common/IUserService.cs delete mode 100644 src/Surging.IModuleServices/Surging.IModuleServices.Common/IntercepteModule.cs delete mode 100644 src/Surging.IModuleServices/Surging.IModuleServices.Common/Models/AuthenticationRequestData.cs delete mode 100644 src/Surging.IModuleServices/Surging.IModuleServices.Common/Models/BaseModel.cs delete mode 100644 src/Surging.IModuleServices/Surging.IModuleServices.Common/Models/Events/LogoutEvent.cs delete mode 100644 src/Surging.IModuleServices/Surging.IModuleServices.Common/Models/Events/UserEvent.cs delete mode 100644 src/Surging.IModuleServices/Surging.IModuleServices.Common/Models/IdentityUser.cs delete mode 100644 src/Surging.IModuleServices/Surging.IModuleServices.Common/Models/RoteModel.cs delete mode 100644 src/Surging.IModuleServices/Surging.IModuleServices.Common/Models/UserModel.cs delete mode 100644 src/Surging.IModuleServices/Surging.IModuleServices.Common/Models/WillMessage.cs delete mode 100644 src/Surging.IModuleServices/Surging.IModuleServices.Common/Properties/AssemblyInfo.cs delete mode 100644 src/Surging.IModuleServices/Surging.IModuleServices.Common/Surging.IModuleServices.Common.csproj delete mode 100644 src/Surging.IModuleServices/Surging.IModuleServices.Manger/IManagerService.cs delete mode 100644 src/Surging.IModuleServices/Surging.IModuleServices.Manger/Surging.IModuleServices.Manager.csproj delete mode 100644 src/Surging.Modules/Surging.Modules.Common/Domain/ChatService.cs delete mode 100644 src/Surging.Modules/Surging.Modules.Common/Domain/ControllerService.cs delete mode 100644 src/Surging.Modules/Surging.Modules.Common/Domain/PersonService.cs delete mode 100644 src/Surging.Modules/Surging.Modules.Common/Domain/RoteMangeService.cs delete mode 100644 src/Surging.Modules/Surging.Modules.Common/Domain/UserService.cs delete mode 100644 src/Surging.Modules/Surging.Modules.Common/IntegrationEvents/EventHandling/UserLoginDateChangeHandler.cs delete mode 100644 src/Surging.Modules/Surging.Modules.Common/IntegrationEvents/EventHandling/UserLogoutDataChangeHandler.cs delete mode 100644 src/Surging.Modules/Surging.Modules.Common/Properties/AssemblyInfo.cs delete mode 100644 src/Surging.Modules/Surging.Modules.Common/Repositories/UserRepository.cs delete mode 100644 src/Surging.Modules/Surging.Modules.Common/Surging.Modules.Common.csproj delete mode 100644 src/Surging.Modules/Surging.Modules.Manager/Domain/ManagerService.cs delete mode 100644 src/Surging.Modules/Surging.Modules.Manager/Surging.Modules.Manager.csproj delete mode 100644 src/Surging.Services/Surging.Services.Client/Program.cs delete mode 100644 src/Surging.Services/Surging.Services.Client/Properties/PublishProfiles/FolderProfile.pubxml delete mode 100644 src/Surging.Services/Surging.Services.Client/Startup.cs delete mode 100644 src/Surging.Services/Surging.Services.Client/Surging.Services.Client.csproj delete mode 100644 src/Surging.Services/Surging.Services.Client/cacheSettings.json delete mode 100644 src/Surging.Services/Surging.Services.Client/eventBusSettings.json delete mode 100644 src/Surging.Services/Surging.Services.Client/log4net.config delete mode 100644 src/Surging.Services/Surging.Services.Client/nLog.config delete mode 100644 src/Surging.Services/Surging.Services.Client/surgingSettings.json delete mode 100644 src/Surging.Services/Surging.Services.Server/Configs/Zookeeper.json delete mode 100644 src/Surging.Services/Surging.Services.Server/Configs/consul.json delete mode 100644 src/Surging.Services/Surging.Services.Server/Dockerfile delete mode 100644 src/Surging.Services/Surging.Services.Server/NLog.config delete mode 100644 src/Surging.Services/Surging.Services.Server/Program.cs delete mode 100644 src/Surging.Services/Surging.Services.Server/Properties/PublishProfiles/FolderProfile.pubxml delete mode 100644 src/Surging.Services/Surging.Services.Server/Properties/launchSettings.json delete mode 100644 src/Surging.Services/Surging.Services.Server/Startup.cs delete mode 100644 src/Surging.Services/Surging.Services.Server/Surging.Services.Server.csproj delete mode 100644 src/Surging.Services/Surging.Services.Server/SurgingServiceEngine.cs delete mode 100644 src/Surging.Services/Surging.Services.Server/cacheSettings.json delete mode 100644 src/Surging.Services/Surging.Services.Server/eventBusSettings.json delete mode 100644 src/Surging.Services/Surging.Services.Server/log4net.config delete mode 100644 src/Surging.Services/Surging.Services.Server/surgingSettings.json delete mode 100644 src/Surging.sln delete mode 100644 src/WebSocket/WebSocketCore/ByteOrder.cs delete mode 100644 src/WebSocket/WebSocketCore/CloseEventArgs.cs delete mode 100644 src/WebSocket/WebSocketCore/CloseStatusCode.cs delete mode 100644 src/WebSocket/WebSocketCore/CompressionMethod.cs delete mode 100644 src/WebSocket/WebSocketCore/ErrorEventArgs.cs delete mode 100644 src/WebSocket/WebSocketCore/Ext.cs delete mode 100644 src/WebSocket/WebSocketCore/Fin.cs delete mode 100644 src/WebSocket/WebSocketCore/HttpBase.cs delete mode 100644 src/WebSocket/WebSocketCore/HttpRequest.cs delete mode 100644 src/WebSocket/WebSocketCore/HttpResponse.cs delete mode 100644 src/WebSocket/WebSocketCore/LogData.cs delete mode 100644 src/WebSocket/WebSocketCore/LogLevel.cs delete mode 100644 src/WebSocket/WebSocketCore/Logger.cs delete mode 100644 src/WebSocket/WebSocketCore/Mask.cs delete mode 100644 src/WebSocket/WebSocketCore/MessageEventArgs.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/AuthenticationBase.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/AuthenticationChallenge.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/AuthenticationResponse.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/AuthenticationSchemes.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/Chunk.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/ChunkStream.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/ChunkedRequestStream.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/ClientSslConfiguration.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/Cookie.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/CookieCollection.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/CookieException.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/EndPointListener.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/EndPointManager.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/HttpBasicIdentity.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/HttpConnection.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/HttpDigestIdentity.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/HttpHeaderInfo.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/HttpHeaderType.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/HttpListener.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/HttpListenerAsyncResult.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/HttpListenerContext.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/HttpListenerException.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/HttpListenerPrefix.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/HttpListenerPrefixCollection.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/HttpListenerRequest.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/HttpListenerResponse.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/HttpRequestHeader.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/HttpResponseHeader.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/HttpStatusCode.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/HttpStreamAsyncResult.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/HttpUtility.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/HttpVersion.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/InputChunkState.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/InputState.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/LineState.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/NetworkCredential.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/QueryStringCollection.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/ReadBufferState.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/RequestStream.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/ResponseStream.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/ServerSslConfiguration.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/WebHeaderCollection.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/WebSockets/HttpListenerWebSocketContext.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/WebSockets/TcpListenerWebSocketContext.cs delete mode 100644 src/WebSocket/WebSocketCore/Net/WebSockets/WebSocketContext.cs delete mode 100644 src/WebSocket/WebSocketCore/Opcode.cs delete mode 100644 src/WebSocket/WebSocketCore/PayloadData.cs delete mode 100644 src/WebSocket/WebSocketCore/Program.cs delete mode 100644 src/WebSocket/WebSocketCore/Rsv.cs delete mode 100644 src/WebSocket/WebSocketCore/Server/HttpRequestEventArgs.cs delete mode 100644 src/WebSocket/WebSocketCore/Server/HttpServer.cs delete mode 100644 src/WebSocket/WebSocketCore/Server/IWebSocketSession.cs delete mode 100644 src/WebSocket/WebSocketCore/Server/ServerState.cs delete mode 100644 src/WebSocket/WebSocketCore/Server/WebSocketBehavior.cs delete mode 100644 src/WebSocket/WebSocketCore/Server/WebSocketServer.cs delete mode 100644 src/WebSocket/WebSocketCore/Server/WebSocketServiceHost.cs delete mode 100644 src/WebSocket/WebSocketCore/Server/WebSocketServiceHostBase.cs delete mode 100644 src/WebSocket/WebSocketCore/Server/WebSocketServiceHost`1.cs delete mode 100644 src/WebSocket/WebSocketCore/Server/WebSocketServiceManager.cs delete mode 100644 src/WebSocket/WebSocketCore/Server/WebSocketSessionManager.cs delete mode 100644 src/WebSocket/WebSocketCore/WebSocket.cs delete mode 100644 src/WebSocket/WebSocketCore/WebSocketCore.csproj delete mode 100644 src/WebSocket/WebSocketCore/WebSocketException.cs delete mode 100644 src/WebSocket/WebSocketCore/WebSocketFrame.cs delete mode 100644 src/WebSocket/WebSocketCore/WebSocketState.cs delete mode 100644 src/docker-compose.ci.build.yml delete mode 100644 src/docker-compose.dcproj delete mode 100644 src/docker-compose.override.yml delete mode 100644 src/docker-compose.yml delete mode 100644 src/packages/SharedSolutionFiles/SharedAssemblyInfo.cs diff --git a/src/.dockerignore b/src/.dockerignore deleted file mode 100644 index e694ae215..000000000 --- a/src/.dockerignore +++ /dev/null @@ -1,12 +0,0 @@ -.dockerignore -.env -.git -.gitignore -.vs -.vscode -docker-compose.yml -docker-compose.*.yml -*/bin -*/obj -!obj/Docker/publish/* -!obj/Docker/empty/ diff --git a/src/.vscode/launch.json b/src/.vscode/launch.json deleted file mode 100644 index e42be79fb..000000000 --- a/src/.vscode/launch.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "name": "Server", - "type": "coreclr", - "request": "launch", - "preLaunchTask": "ServerBuild", - "program": "${workspaceRoot}/Surging.Services/Surging.Services.Server/bin/Debug/netcoreapp2.0/Surging.Services.Server.dll", - "args": [], - "cwd": "${workspaceRoot}/Surging.Services/Surging.Services.Server", - "stopAtEntry": false, - "console": "internalConsole" - }, - { - "name": "Client", - "type": "coreclr", - "request": "launch", - "preLaunchTask": "ClientBuild", - "program": "${workspaceRoot}/Surging.Services/Surging.Services.Client/bin/Debug/netcoreapp2.0/Surging.Services.Client.dll", - "args": [], - "cwd": "${workspaceRoot}/Surging.Services/Surging.Services.Client", - "stopAtEntry": false, - "console": "internalConsole" - }, - { - "name": "Web", - "type": "coreclr", - "request": "launch", - "preLaunchTask": "Webbuild", - "program": "${workspaceRoot}/Surging.ApiGateway/bin/Debug/netcoreapp2.0/Surging.ApiGateway.dll", - "args": [], - "cwd": "${workspaceRoot}/Surging.ApiGateway", - "stopAtEntry": false, - "launchBrowser": { - "enabled": true, - "args": "${auto-detect-url}", - "windows": { - "command": "cmd.exe", - "args": "/C start ${auto-detect-url}" - }, - "osx": { - "command": "open" - }, - "linux": { - "command": "xdg-open" - } - }, - "env": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "sourceFileMap": { - "/Views": "${workspaceRoot}/Views" - } - }, - { - "name": ".NET Core Attach", - "type": "coreclr", - "request": "attach", - "processId": "${command:pickProcess}" - } - ] -} \ No newline at end of file diff --git a/src/.vscode/tasks.json b/src/.vscode/tasks.json deleted file mode 100644 index 8724c4465..000000000 --- a/src/.vscode/tasks.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - "tasks": [{ - "taskName": "ClientBuild", - "command": "dotnet", - "type": "shell", - "group": "build", - "presentation": { - "reveal": "silent" - }, - "args": [ - "build", "${workspaceRoot}/Surging.Services/Surging.Services.Client/Surging.Services.Client.csproj" - ], - "problemMatcher": "$msCompile" - }, - { - "taskName": "ServerBuild", - "command": "dotnet", - "type": "shell", - "group": "build", - "presentation": { - "reveal": "silent" - }, - "args": [ - "build", "${workspaceRoot}/Surging.Services/Surging.Services.Server/Surging.Services.Server.csproj" - ], - "problemMatcher": "$msCompile" - }, - { - "taskName": "Webbuild", - "command": "dotnet", - "type": "shell", - "group": "build", - "presentation": { - "reveal": "silent" - }, - "args": [ - "build", "${workspaceRoot}/Surging.ApiGateway/Surging.ApiGateway.csproj" - ], - "problemMatcher": "$msCompile" - } - ] -} \ No newline at end of file diff --git a/src/Surging.ApiGateway/.bowerrc b/src/Surging.ApiGateway/.bowerrc deleted file mode 100644 index 038f7dfef..000000000 --- a/src/Surging.ApiGateway/.bowerrc +++ /dev/null @@ -1,4 +0,0 @@ -{ - "directory": "wwwroot/assets/lib" -} - diff --git a/src/Surging.ApiGateway/Configs/appsettings.Development.json b/src/Surging.ApiGateway/Configs/appsettings.Development.json deleted file mode 100644 index fa8ce71a9..000000000 --- a/src/Surging.ApiGateway/Configs/appsettings.Development.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Logging": { - "IncludeScopes": false, - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - } -} diff --git a/src/Surging.ApiGateway/Configs/appsettings.json b/src/Surging.ApiGateway/Configs/appsettings.json deleted file mode 100644 index 26bb0ac7a..000000000 --- a/src/Surging.ApiGateway/Configs/appsettings.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "Logging": { - "IncludeScopes": false, - "Debug": { - "LogLevel": { - "Default": "Warning" - } - }, - "Console": { - "LogLevel": { - "Default": "Warning" - } - } - } -} diff --git a/src/Surging.ApiGateway/Configs/cacheSettings.json b/src/Surging.ApiGateway/Configs/cacheSettings.json deleted file mode 100644 index ab9c7e43d..000000000 --- a/src/Surging.ApiGateway/Configs/cacheSettings.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "CachingSettings": [ - { - "Id": "ddlCache", - "Class": "Surging.Core.Caching.RedisCache.RedisContext,Surging.Core.Caching", - "Properties": [ - { - "Name": "appRuleFile", - "Ref": "rule" - }, - { - "Name": "dataContextPool", - "Ref": "ddls_sample", - "Maps": [ - { - "Name": "Redis", - "Properties": [ - { - "value": "127.0.0.1:6379::1" - } - ] - }, - { - "Name": "MemoryCache" - } - ] - }, - { - "Name": "defaultExpireTime", - "value": "120" - }, - { - "Name": "connectTimeout", - "Value": "120" - }, - { - "Name": "minSize", - "Value": "1" - }, - { - "Name": "maxSize", - "Value": "10" - } - ] - } - ] -} diff --git a/src/Surging.ApiGateway/Configs/gatewaySettings.json b/src/Surging.ApiGateway/Configs/gatewaySettings.json deleted file mode 100644 index 76f08a2f1..000000000 --- a/src/Surging.ApiGateway/Configs/gatewaySettings.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "AccessTokenExpireTimeSpan": "30", - "AuthorizationRoutePath": "api/user/authentication", - "AuthorizationServiceKey": "User", - "TokenEndpointPath": "api/oauth2/token", - "CacheMode": "ddlCache.Redis", //MemoryCache or gateway.Redis save token - "AccessPolicy": { - "Origins": [ "http://127.0.0.1:1927", "http://localhost:927" ], - "AllowAnyHeader": true, - "AllowAnyMethod": true - }, - "Register": { - "Provider": "Consul", - "Address": "${Register_Conn}|127.0.0.1:8500" - }, - "ServicePart": { - "MainPath": "part/service/aggregation", - "EnableAuthorization": false, - "Services": [ - { - "ServiceAggregation": [ - { - "RoutePath": "api/user/GetUserName", - "ServiceKey": "User", - "Key": "Users" - }, - { - "RoutePath": "api/user/GetUserName", - "ServiceKey": "User", - "Key": "Roles" - } - ], - "UrlMapping": "part/user/getuserrole" - } - ] - } -} diff --git a/src/Surging.ApiGateway/Controllers/AuthenticationManageController.cs b/src/Surging.ApiGateway/Controllers/AuthenticationManageController.cs deleted file mode 100644 index 92b13235a..000000000 --- a/src/Surging.ApiGateway/Controllers/AuthenticationManageController.cs +++ /dev/null @@ -1,31 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using Surging.Core.ApiGateWay.ServiceDiscovery; -using Surging.Core.ApiGateWay.Utilities; -using Surging.Core.CPlatform.Address; -using Surging.Core.CPlatform.Utilities; -using System.Linq; -using System.Threading.Tasks; - -namespace Surging.ApiGateway.Controllers -{ - public class AuthenticationManageController : Controller - { - public IActionResult Index() - { - return View(); - } - - public async Task EditServiceToken([FromServices]IServiceDiscoveryProvider serviceDiscoveryProvider, string address) - { - var list = await serviceDiscoveryProvider.GetAddressAsync(address); ; - return View(list.FirstOrDefault()); - } - - [HttpPost] - public async Task EditServiceToken([FromServices]IServiceDiscoveryProvider serviceDiscoveryProvider, IpAddressModel model) - { - await serviceDiscoveryProvider.EditServiceToken(model); - return Json(ServiceResult.Create(true)); - } - } -} diff --git a/src/Surging.ApiGateway/Controllers/HomeController.cs b/src/Surging.ApiGateway/Controllers/HomeController.cs deleted file mode 100644 index e81047ba8..000000000 --- a/src/Surging.ApiGateway/Controllers/HomeController.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using Surging.ApiGateway.Models; -using System.Diagnostics; - -namespace Surging.ApiGateway.Controllers -{ - public class HomeController : Controller - { - public IActionResult Index() - { - return View(); - } - - public IActionResult Error() - { - return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); - } - } -} diff --git a/src/Surging.ApiGateway/Controllers/ServiceManageController.cs b/src/Surging.ApiGateway/Controllers/ServiceManageController.cs deleted file mode 100644 index 6d718818a..000000000 --- a/src/Surging.ApiGateway/Controllers/ServiceManageController.cs +++ /dev/null @@ -1,149 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using Surging.ApiGateway.Models; -using Surging.Core.ApiGateWay.ServiceDiscovery; -using Surging.Core.ApiGateWay.ServiceDiscovery.Implementation; -using Surging.Core.ApiGateWay.Utilities; -using Surging.Core.Caching.HashAlgorithms; -using Surging.Core.CPlatform; -using Surging.Core.CPlatform.Cache; -using Surging.Core.CPlatform.Support; -using Surging.Core.CPlatform.Utilities; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -// For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 - -namespace Surging.ApiGateway.Controllers -{ - public class ServiceManageController : Controller - { - // GET: // - public IActionResult Index() - { - return View(); - } - - [HttpPost] - public async Task GetAddress([FromServices]IServiceDiscoveryProvider serviceDiscoveryProvider, string queryParam) - { - var list = await serviceDiscoveryProvider.GetAddressAsync(queryParam); - var result = ServiceResult>.Create(true, list); - return Json(result); - } - - [HttpPost] - public async Task GetServiceDescriptor([FromServices]IServiceDiscoveryProvider serviceDiscoveryProvider, string address, string queryParam) - { - var list = await serviceDiscoveryProvider.GetServiceDescriptorAsync(address, queryParam); - var result = ServiceResult>.Create(true, list); - return Json(result); - } - - public IActionResult ServiceDescriptor(string address) - { - ViewBag.address = address; - return View(); - } - - public IActionResult FaultTolerant(string serviceId, string address) - { - ViewBag.ServiceId = serviceId; - ViewBag.Address = address; - return View(); - } - - public async Task EditCacheEndPoint([FromServices]IServiceCacheProvider serviceCacheProvider, string cacheId,string endpoint) - { - var model = await serviceCacheProvider.GetCacheEndpointAsync(cacheId, endpoint); - return View(model); - } - - [HttpPost] - public async Task DelCacheEndPoint([FromServices]IServiceCacheProvider serviceCacheProvider, string cacheId, string endpoint) - { - await serviceCacheProvider.DelCacheEndpointAsync(cacheId, endpoint); - return Json(ServiceResult.Create(true)); - } - - [HttpPost] - public async Task EditCacheEndPoint([FromServices]IServiceCacheProvider serviceCacheProvider, CacheEndpointParam param) - { - await serviceCacheProvider.SetCacheEndpointByEndpoint(param.CacheId, param.Endpoint, param.CacheEndpoint); - return Json(ServiceResult.Create(true)); - } - - public async Task EditFaultTolerant([FromServices]IFaultTolerantProvider faultTolerantProvider,string serviceId) - { - var list = await faultTolerantProvider.GetCommandDescriptor(serviceId); - return View(list.FirstOrDefault()); - } - - [HttpPost] - public async Task EditFaultTolerant([FromServices]IFaultTolerantProvider faultTolerantProvider, ServiceCommandDescriptor model) - { - await faultTolerantProvider.SetCommandDescriptorByAddress(model); - return Json(ServiceResult.Create(true)); - } - - [HttpPost] - public async Task GetCommandDescriptor([FromServices]IFaultTolerantProvider faultTolerantProvider, - string serviceId, string address) - { - IEnumerable list = null; - if (!string.IsNullOrEmpty(serviceId)) - { - list = await faultTolerantProvider.GetCommandDescriptor(serviceId); - } - else if (!string.IsNullOrEmpty(address)) - { - list = await faultTolerantProvider.GetCommandDescriptorByAddress(address); - } - var result = ServiceResult>.Create(true, list); - return Json(result); - } - - public IActionResult ServiceCache() - { - return View(); - } - - [HttpPost] - public async Task GetServiceCache([FromServices]IServiceCacheProvider serviceCacheProvider, string queryParam) - { - var list = await serviceCacheProvider.GetServiceDescriptorAsync(); - var result = ServiceResult>.Create(true, list); - return Json(result); - } - - public IActionResult ServiceCacheEndpoint(string cacheId) - { - ViewBag.CacheId = cacheId; - return View(); - } - - public async Task GetCacheEndpoint([FromServices]IServiceCacheProvider serviceCacheProvider, - string cacheId) - { - var list = await serviceCacheProvider.GetCacheEndpointAsync(cacheId); - var result = ServiceResult>.Create(true, list); - return Json(result); - } - - - public IActionResult ServiceSubscriber(string serviceId) - { - ViewBag.ServiceId = serviceId; - return View(); - } - - [HttpPost] - public async Task GetSubscriber([FromServices]IServiceSubscribeProvider serviceSubscribeProvider, - string queryParam) - { - var list = await serviceSubscribeProvider.GetAddressAsync(queryParam); - var result = ServiceResult>.Create(true, list); - return Json(result); - } - } -} diff --git a/src/Surging.ApiGateway/Controllers/ServicesController.cs b/src/Surging.ApiGateway/Controllers/ServicesController.cs deleted file mode 100644 index 734287873..000000000 --- a/src/Surging.ApiGateway/Controllers/ServicesController.cs +++ /dev/null @@ -1,212 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using Surging.Core.ApiGateWay; -using Surging.Core.ApiGateWay.OAuth; -using Surging.Core.CPlatform; -using Surging.Core.CPlatform.Filters.Implementation; -using Surging.Core.CPlatform.Routing; -using Surging.Core.ProxyGenerator; -using Surging.Core.ProxyGenerator.Utilitys; -using System; -using System.Collections.Generic; -using System.Security.Cryptography; -using System.Text; -using System.Threading.Tasks; -using System.Linq; -using GateWayAppConfig = Surging.Core.ApiGateWay.AppConfig; -using System.Reflection; -using Surging.Core.CPlatform.Utilities; -using Newtonsoft.Json.Linq; -using Surging.Core.CPlatform.Transport.Implementation; - -namespace Surging.ApiGateway.Controllers -{ - public class ServicesController : Controller - { - private readonly IServiceProxyProvider _serviceProxyProvider; - private readonly IServiceRouteProvider _serviceRouteProvider; - private readonly IAuthorizationServerProvider _authorizationServerProvider; - - - public ServicesController(IServiceProxyProvider serviceProxyProvider, - IServiceRouteProvider serviceRouteProvider, - IAuthorizationServerProvider authorizationServerProvider) - { - _serviceProxyProvider = serviceProxyProvider; - _serviceRouteProvider = serviceRouteProvider; - _authorizationServerProvider = authorizationServerProvider; - } - - public async Task> Path([FromServices]IServicePartProvider servicePartProvider, string path, [FromBody]Dictionary model) - { - string serviceKey = this.Request.Query["servicekey"]; - path = path.IndexOf("/") < 0 ? $"/{path}" : path; - if (model == null) - { - model = new Dictionary(); - } - foreach (string n in this.Request.Query.Keys) - { - model[n] = this.Request.Query[n].ToString(); - } - ServiceResult result = ServiceResult.Create(false,null); - path = String.Compare(path,GateWayAppConfig.TokenEndpointPath,true) ==0 ? - GateWayAppConfig.AuthorizationRoutePath : path.ToLower(); - if( await GetAllowRequest(path)==false) return new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.RequestError, Message = "Request error" }; - if (servicePartProvider.IsPart(path)) - { - result = ServiceResult.Create(true, await servicePartProvider.Merge(path, model)); - result.StatusCode = (int)ServiceStatusCode.Success; - } - else - if ( OnAuthorization(path, model,ref result)) - { - if (path == GateWayAppConfig.AuthorizationRoutePath) - { - var token = await _authorizationServerProvider.GenerateTokenCredential(model); - if (token != null) - { - result = ServiceResult.Create(true, token); - result.StatusCode = (int)ServiceStatusCode.Success; - } - else - { - result = new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.AuthorizationFailed, Message = "Invalid authentication credentials" }; - } - } - else - { - if (!string.IsNullOrEmpty(serviceKey)) - { - - result = ServiceResult.Create(true, await _serviceProxyProvider.Invoke(model, path, serviceKey)); - result.StatusCode = (int)ServiceStatusCode.Success; - } - else - { - result = ServiceResult.Create(true, await _serviceProxyProvider.Invoke(model, path)); - result.StatusCode = (int)ServiceStatusCode.Success; - } - } - } - return result; - } - - private async Task GetAllowRequest(string path) - { - var route = await _serviceRouteProvider.GetRouteByPath(path); - return !route.ServiceDescriptor.DisableNetwork(); - } - - private bool OnAuthorization(string path, Dictionary model, ref ServiceResult result) - { - bool isSuccess = true; - var route = _serviceRouteProvider.GetRouteByPath(path).GetAwaiter().GetResult(); - if (route.ServiceDescriptor.EnableAuthorization()) - { - if(route.ServiceDescriptor.AuthType()== AuthorizationType.JWT.ToString()) - { - isSuccess= ValidateJwtAuthentication(route,model, ref result); - } - else - { - isSuccess = ValidateAppSecretAuthentication(route, path, model, ref result); - } - - } - return isSuccess; - } - - public bool ValidateJwtAuthentication(ServiceRoute route, Dictionary model, ref ServiceResult result) - { - bool isSuccess = true; - var author = HttpContext.Request.Headers["Authorization"]; - if (author.Count > 0) - { - isSuccess = _authorizationServerProvider.ValidateClientAuthentication(author).Result; - if (!isSuccess) - { - result = new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.AuthorizationFailed, Message = "Invalid authentication credentials" }; - } - else - { - var keyValue = model.FirstOrDefault(); - if (!(keyValue.Value is IConvertible) || !typeof(IConvertible).GetTypeInfo().IsAssignableFrom(keyValue.Value.GetType())) - { - dynamic instance = keyValue.Value; - instance.Payload = _authorizationServerProvider.GetPayloadString(author); - RpcContext.GetContext().SetAttachment("payload", instance.Payload.ToString()); - model.Remove(keyValue.Key); - model.Add(keyValue.Key, instance); - } - } - } - else - { - result = new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.RequestError, Message = "Request error" }; - isSuccess = false; - } - return isSuccess; - } - - private bool ValidateAppSecretAuthentication(ServiceRoute route, string path, - Dictionary model, ref ServiceResult result) - { - bool isSuccess = true; - DateTime time; - var author = HttpContext.Request.Headers["Authorization"]; - - if (!string.IsNullOrEmpty(path) && model.ContainsKey("timeStamp") && author.Count>0) - { - if (DateTime.TryParse(model["timeStamp"].ToString(), out time)) - { - var seconds = (DateTime.Now - time).TotalSeconds; - if (seconds <= 3560 && seconds >= 0) - { - if (GetMD5($"{route.ServiceDescriptor.Token}{time.ToString("yyyy-MM-dd hh:mm:ss") }") != author.ToString()) - { - result = new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.AuthorizationFailed, Message = "Invalid authentication credentials" }; - isSuccess = false; - } - } - else - { - result = new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.AuthorizationFailed, Message = "Invalid authentication credentials" }; - isSuccess = false; - } - } - else - { - result = new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.AuthorizationFailed, Message = "Invalid authentication credentials" }; - isSuccess = false; - } - } - else - { - result = new ServiceResult { IsSucceed = false, StatusCode = (int)ServiceStatusCode.RequestError, Message = "Request error" }; - isSuccess = false; - } - return isSuccess; - } - - public static string GetMD5(string encypStr) - { - try - { - var md5 = MD5.Create(); - var bs = md5.ComputeHash(Encoding.UTF8.GetBytes(encypStr)); - var sb = new StringBuilder(); - foreach (byte b in bs) - { - sb.Append(b.ToString("X2")); - } - //所有字符转为大写 - return sb.ToString().ToLower(); - } - catch (Exception e) - { - Console.Error.WriteLine(e.StackTrace); - return null; - } - } - } -} diff --git a/src/Surging.ApiGateway/CustomExceptionFilterAttribute.cs b/src/Surging.ApiGateway/CustomExceptionFilterAttribute.cs deleted file mode 100644 index afbfb8862..000000000 --- a/src/Surging.ApiGateway/CustomExceptionFilterAttribute.cs +++ /dev/null @@ -1,38 +0,0 @@ -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.Filters; -using Microsoft.AspNetCore.Mvc.ModelBinding; -using Surging.Core.ApiGateWay; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace Surging.ApiGateway -{ - public class CustomExceptionFilterAttribute : ExceptionFilterAttribute - { - private readonly IHostingEnvironment _hostingEnvironment; - private readonly IModelMetadataProvider _modelMetadataProvider; - - public CustomExceptionFilterAttribute( - IHostingEnvironment hostingEnvironment, - IModelMetadataProvider modelMetadataProvider) - { - _hostingEnvironment = hostingEnvironment; - _modelMetadataProvider = modelMetadataProvider; - } - - public override void OnException(ExceptionContext context) - { - if (!_hostingEnvironment.IsDevelopment()) - { - return; - } - var result = ServiceResult.Create(false,errorMessage: context.Exception.Message); - result.StatusCode = 400; - context.Result =new JsonResult(result); - } - } -} - diff --git a/src/Surging.ApiGateway/Dockerfile b/src/Surging.ApiGateway/Dockerfile deleted file mode 100644 index 677f91242..000000000 --- a/src/Surging.ApiGateway/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM microsoft/dotnet:2.1-runtime -WORKDIR /app -COPY . . -ENTRYPOINT ["dotnet", "Surging.ApiGateway.dll"] diff --git a/src/Surging.ApiGateway/Models/CacheEndpointParam.cs b/src/Surging.ApiGateway/Models/CacheEndpointParam.cs deleted file mode 100644 index 9936352cb..000000000 --- a/src/Surging.ApiGateway/Models/CacheEndpointParam.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Surging.Core.Caching.HashAlgorithms; -using Surging.Core.CPlatform.Cache; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace Surging.ApiGateway.Models -{ - public class CacheEndpointParam - { - public string CacheId { get; set; } - - public string Endpoint { get; set; } - - public ConsistentHashNode CacheEndpoint { get; set; } - } -} diff --git a/src/Surging.ApiGateway/Models/ErrorViewModel.cs b/src/Surging.ApiGateway/Models/ErrorViewModel.cs deleted file mode 100644 index efcef4c59..000000000 --- a/src/Surging.ApiGateway/Models/ErrorViewModel.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; - -namespace Surging.ApiGateway.Models -{ - public class ErrorViewModel - { - public string RequestId { get; set; } - - public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); - } -} \ No newline at end of file diff --git a/src/Surging.ApiGateway/Program.cs b/src/Surging.ApiGateway/Program.cs deleted file mode 100644 index b0f8eb85c..000000000 --- a/src/Surging.ApiGateway/Program.cs +++ /dev/null @@ -1,38 +0,0 @@ -using Autofac; -using Autofac.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Server.Kestrel.Core; -using Microsoft.Extensions.Logging; -using Surging.Core.ApiGateWay; -using Surging.Core.Codec.MessagePack; -using Surging.Core.Consul; -using Surging.Core.Consul.Configurations; -using Surging.Core.CPlatform; -using Surging.Core.CPlatform.Utilities; -using Surging.Core.DotNetty; -using Surging.Core.ProxyGenerator; -using Surging.Core.ServiceHosting; -using Surging.Core.System.Intercept; -using System; -using System.IO; - - -namespace Surging.ApiGateway -{ - public class Program - { - public static void Main(string[] args) - { - var host = new WebHostBuilder() - .UseUrls("http://*:729") - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISIntegration() - .UseStartup() - .UseApplicationInsights() - .Build(); - host.Run(); - - } - } -} diff --git a/src/Surging.ApiGateway/Properties/PublishProfiles/FolderProfile.pubxml b/src/Surging.ApiGateway/Properties/PublishProfiles/FolderProfile.pubxml deleted file mode 100644 index e7dab5007..000000000 --- a/src/Surging.ApiGateway/Properties/PublishProfiles/FolderProfile.pubxml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - FileSystem - FileSystem - Release - Any CPU - - True - False - 70fc4ee8-ac84-4774-bc0e-de26a4b743b1 - bin\Release\PublishOutput - False - - \ No newline at end of file diff --git a/src/Surging.ApiGateway/Properties/launchSettings.json b/src/Surging.ApiGateway/Properties/launchSettings.json deleted file mode 100644 index 859996e33..000000000 --- a/src/Surging.ApiGateway/Properties/launchSettings.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:729/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "Surging.ApiGateway": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "http://localhost:50651/" - } - } -} \ No newline at end of file diff --git a/src/Surging.ApiGateway/ServiceExceptionFilter.cs b/src/Surging.ApiGateway/ServiceExceptionFilter.cs deleted file mode 100644 index 854e1a555..000000000 --- a/src/Surging.ApiGateway/ServiceExceptionFilter.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Surging.Core.CPlatform.Exceptions; -using Surging.Core.CPlatform.Filters.Implementation; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace Surging.ApiGateway -{ - public class ServiceExceptionFilter: ExceptionFilterAttribute - { - public override void OnException(RpcActionExecutedContext context) - { - if (context.Exception is CPlatformCommunicationException) - throw new Exception(context.Exception.Message,context.Exception); - } - } -} diff --git a/src/Surging.ApiGateway/Startup.cs b/src/Surging.ApiGateway/Startup.cs deleted file mode 100644 index 0ad34f9d2..000000000 --- a/src/Surging.ApiGateway/Startup.cs +++ /dev/null @@ -1,136 +0,0 @@ -using Autofac; -using Autofac.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.StaticFiles; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using Newtonsoft.Json.Serialization; -using Surging.Core.ApiGateWay; -using Surging.Core.ApiGateWay.Configurations; -using Surging.Core.ApiGateWay.OAuth.Implementation.Configurations; -using Surging.Core.Caching.Configurations; -using Surging.Core.Codec.MessagePack; -using Surging.Core.Consul; -using Surging.Core.Consul.Configurations; -using Surging.Core.CPlatform; -using Surging.Core.CPlatform.Utilities; -using Surging.Core.DotNetty; -using Surging.Core.ProxyGenerator; -using Surging.Core.System.Intercept; -using Surging.Core.Zookeeper; -//using Surging.Core.Zookeeper; -using ZookeeperConfigInfo = Surging.Core.Zookeeper.Configurations.ConfigInfo; -using System; -using ApiGateWayConfig = Surging.Core.ApiGateWay.AppConfig; -using Surging.Core.Caching; -using Surging.Core.CPlatform.Cache; -using System.Linq; - -namespace Surging.ApiGateway -{ - public class Startup - { - public IConfigurationRoot Configuration { get; } - - public IContainer ApplicationContainer { get; private set; } - - public Startup(IHostingEnvironment env) - { - var builder = new ConfigurationBuilder() - .SetBasePath(env.ContentRootPath) - .AddCacheFile("Configs/cacheSettings.json", optional: false) - .AddJsonFile("Configs/appsettings.json", optional: true, reloadOnChange: true) - .AddGatewayFile("Configs/gatewaySettings.json", optional: false) - .AddJsonFile($"Configs/appsettings.{env.EnvironmentName}.json", optional: true); - Configuration = builder.Build(); - } - - public IServiceProvider ConfigureServices(IServiceCollection services) - { - return RegisterAutofac(services); - } - - private IServiceProvider RegisterAutofac(IServiceCollection services) - { - var registerConfig = ApiGateWayConfig.Register; - services.AddMvc(options => { - options.Filters.Add(typeof(CustomExceptionFilterAttribute)); - }).AddJsonOptions(options => { - options.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss"; - options.SerializerSettings.ContractResolver = new DefaultContractResolver(); - }); - services.AddLogging(); - services.AddCors(); - var builder = new ContainerBuilder(); - builder.Populate(services); - builder.AddMicroService(option => - { - option.AddClient(); - option.AddCache(); - option.AddClientIntercepted(typeof(CacheProviderInterceptor)); - //option.UseZooKeeperManager(new ConfigInfo("127.0.0.1:2181")); - if(registerConfig.Provider== RegisterProvider.Consul) - option.UseConsulManager(new ConfigInfo(registerConfig.Address,enableChildrenMonitor:false)); - else if(registerConfig.Provider == RegisterProvider.Zookeeper) - option.UseZooKeeperManager(new ZookeeperConfigInfo(registerConfig.Address, enableChildrenMonitor: true)); - option.UseDotNettyTransport(); - option.AddApiGateWay(); - option.AddFilter(new ServiceExceptionFilter()); - //option.UseProtoBufferCodec(); - option.UseMessagePackCodec(); - builder.Register(m => new CPlatformContainer(ServiceLocator.Current)); - }); - ServiceLocator.Current = builder.Build(); - return new AutofacServiceProvider(ServiceLocator.Current); - - } - - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) - { - loggerFactory.AddConsole(); - var serviceCacheProvider = ServiceLocator.Current.Resolve(); - var addressDescriptors = serviceCacheProvider.GetServiceCaches().ToList(); - ServiceLocator.Current.Resolve().SetCachesAsync(addressDescriptors); - ServiceLocator.Current.Resolve(); - - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - else - { - app.UseExceptionHandler("/Home/Error"); - } - app.UseCors(builder => - { - var policy = Core.ApiGateWay.AppConfig.Policy; - builder.WithOrigins(policy.Origins); - if (policy.AllowAnyHeader) - builder.AllowAnyHeader(); - if (policy.AllowAnyMethod) - builder.AllowAnyMethod(); - if (policy.AllowAnyOrigin) - builder.AllowAnyOrigin(); - if (policy.AllowCredentials) - builder.AllowCredentials(); - }); - var myProvider = new FileExtensionContentTypeProvider(); - myProvider.Mappings.Add(".tpl", "text/plain"); - app.UseStaticFiles(new StaticFileOptions() { ContentTypeProvider = myProvider }); - app.UseStaticFiles(); - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - - routes.MapRoute( - "Path", - "{*path}", - new { controller = "Services", action = "Path" }); - }); - } - } -} \ No newline at end of file diff --git a/src/Surging.ApiGateway/Surging.ApiGateway.csproj b/src/Surging.ApiGateway/Surging.ApiGateway.csproj deleted file mode 100644 index 2d643318a..000000000 --- a/src/Surging.ApiGateway/Surging.ApiGateway.csproj +++ /dev/null @@ -1,68 +0,0 @@ - - - - netcoreapp2.1 - true - $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - aspnet-Surging.ApiGateway-147A234E-A922-4E6A-89B8-DCC64AEA96EE - false - 1.0.0.0 - fanly - surging Micro Service Framework - - surging is a distributed micro service framework that provides high-performance RPC remote service calls, using Zookeeper, Consul as the registration center for surging services, integrating hash, random, polling as a load balancing algorithm, RPC integration using the netty framework, Using asynchronous transmission. Use json.net, protobuf, messagepack for serialization Codec - Copyright © fanly All Rights Reserved. - https://github.com/dotnetcore/surging/blob/master/LICENSE - https://github.com/dotnetcore/surging - MicroService surging - ..\docker-compose.dcproj - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - diff --git a/src/Surging.ApiGateway/Views/AuthenticationManage/EditServiceToken.cshtml b/src/Surging.ApiGateway/Views/AuthenticationManage/EditServiceToken.cshtml deleted file mode 100644 index 96c2c89ce..000000000 --- a/src/Surging.ApiGateway/Views/AuthenticationManage/EditServiceToken.cshtml +++ /dev/null @@ -1,23 +0,0 @@ -@using Surging.Core.CPlatform.Address; -@model Surging.Core.ApiGateWay.ServiceDiscovery.Implementation.ServiceAddressModel -@{ - - Layout = null; -} -
-
- -
- -
-
-
- -
- @Html.TextBoxFor(p => ((IpAddressModel)p.Address).Token, new {autocomplete = "off", placeholder = "令牌", @class = "form-control" }) -
-
- - @Html.HiddenFor(p => ((IpAddressModel)p.Address).Ip) - @Html.HiddenFor(p => ((IpAddressModel)p.Address).Port) -
diff --git a/src/Surging.ApiGateway/Views/AuthenticationManage/Index.cshtml b/src/Surging.ApiGateway/Views/AuthenticationManage/Index.cshtml deleted file mode 100644 index c1db77d85..000000000 --- a/src/Surging.ApiGateway/Views/AuthenticationManage/Index.cshtml +++ /dev/null @@ -1,88 +0,0 @@ - -@{ - ViewBag.Title = "认证管理"; - var isPjax = (!string.IsNullOrEmpty(Context.Request.Query["XPJAX"]) && bool.Parse(Context.Request.Query["XPJAX"])) - && (!string.IsNullOrEmpty(Context.Request.Headers["X-PJAX"]) && bool.Parse(Context.Request.Headers["X-PJAX"])); - Layout = isPjax ? null : "_AuthenticationManage.cshtml"; -} -
-

- 认证管理 - - - 服务令牌 - -

-
- - - -
-
-
-
-
-
-
- 关键字： - -
-
-
- - - - - - - - - - - - -
机器名状态检查令牌操作
-
-
-
-
- - -@if (!isPjax) -{ - @section SubFootJS - { - - } -} -else -{ - -} \ No newline at end of file diff --git a/src/Surging.ApiGateway/Views/AuthenticationManage/_AuthenticationManage.cshtml b/src/Surging.ApiGateway/Views/AuthenticationManage/_AuthenticationManage.cshtml deleted file mode 100644 index 37c7c238a..000000000 --- a/src/Surging.ApiGateway/Views/AuthenticationManage/_AuthenticationManage.cshtml +++ /dev/null @@ -1,50 +0,0 @@ -@{ - ViewBag.Title = "认证管理"; - Layout = "~/Views/Shared/_AppLayout.cshtml"; -} -@section SubHeadCSS - { - -} -
-
-

身份认证

-
-
- -
-
-
- -
-
-
-
- @RenderBody() -
-
- @*
- 返回首页 -
*@ -
- - - - -
-
-@section SubFootJS - { - - @RenderSection("SubFootJS", false) -} \ No newline at end of file diff --git a/src/Surging.ApiGateway/Views/Home/Index.cshtml b/src/Surging.ApiGateway/Views/Home/Index.cshtml deleted file mode 100644 index 6d8710d10..000000000 --- a/src/Surging.ApiGateway/Views/Home/Index.cshtml +++ /dev/null @@ -1,44 +0,0 @@ -@{ - ViewBag.Title = "首页"; - var isPjax = !string.IsNullOrEmpty( Context.Request.Headers["X-PJAX"]) && bool.Parse(Context.Request.Headers["X-PJAX"]); - Layout = isPjax ? null : "~/Views/Shared/_ManagerLayout.cshtml"; -} -
-
-
-
-
-

运行概况

-
- - - - - 欢迎使用 - - Surging Gateway(v0.14) - ,基于.NET CORE Surging微服务网关 -
-
-
-
- -
-
- -
- - - - - - -
-
-
-@section FootJS - { - -} \ No newline at end of file diff --git a/src/Surging.ApiGateway/Views/ServiceManage/EditCacheEndPoint.cshtml b/src/Surging.ApiGateway/Views/ServiceManage/EditCacheEndPoint.cshtml deleted file mode 100644 index 664aaefab..000000000 --- a/src/Surging.ApiGateway/Views/ServiceManage/EditCacheEndPoint.cshtml +++ /dev/null @@ -1,51 +0,0 @@ -@using Surging.Core.Caching.HashAlgorithms; -@model ConsistentHashNode -@{ - - Layout = null; -} -
-
- -
- @Html.TextBoxFor(p => p.Host, new { autocomplete = "off", placeholder = "地址", @class = "form-control" }) -
-
-
- -
- @Html.TextBoxFor(p => p.Port, new { autocomplete = "off", placeholder = "端口", @class = "form-control" }) -
-
-
- -
- @Html.TextBoxFor(p => p.UserName, new { autocomplete = "off", placeholder = "用户名", @class = "form-control" }) -
-
-
- -
- @Html.TextBoxFor(p => p.Password, new { autocomplete = "off", placeholder = "密码", @class = "form-control" }) -
-
-
- -
- @Html.TextBoxFor(p => p.Db, new { autocomplete = "off", placeholder = "库名", @class = "form-control" }) -
-
-
- -
- @Html.TextBoxFor(p => p.MaxSize, new { autocomplete = "off", placeholder = "最大连接池", @class = "form-control" }) -
-
-
- -
- @Html.TextBoxFor(p => p.MinSize, new { autocomplete = "off", placeholder = "最小连接池", @class = "form-control" }) -
-
- @Html.Hidden("Type",Model.Type) -
diff --git a/src/Surging.ApiGateway/Views/ServiceManage/EditFaultTolerant.cshtml b/src/Surging.ApiGateway/Views/ServiceManage/EditFaultTolerant.cshtml deleted file mode 100644 index 769e535fa..000000000 --- a/src/Surging.ApiGateway/Views/ServiceManage/EditFaultTolerant.cshtml +++ /dev/null @@ -1,98 +0,0 @@ -@using Surging.Core.CPlatform.Support; -@model Surging.Core.CPlatform.Support.ServiceCommandDescriptor -@{ - - Layout = null; -} - -
-
- -
- @Html.LabelFor(p => p.ServiceId, Model.ServiceId) -
-
-
- -
- @Html.RadioButtonFor(p => p.CircuitBreakerForceOpen, true, new { name = "CircuitBreakerForceOpen" }) - @Html.RadioButtonFor(p => p.CircuitBreakerForceOpen, false, new { name = "CircuitBreakerForceOpen" }) -
-
-
- -
- @Html.DropDownListFor(p => p.Strategy, new SelectListItem[] { - new SelectListItem{ Text="Failover",Value=StrategyType.Failover.ToString(),Selected=true}, - new SelectListItem{ Text="Injection",Value=StrategyType.Injection.ToString()}, - new SelectListItem{ Text="FallBack",Value=StrategyType.Injection.ToString()} - }) -
-
-
- -
- @Html.TextBoxFor(p => p.ExecutionTimeoutInMilliseconds, new { autocomplete = "off", placeholder = "超时时间", @class = "form-control" }) -
-
-
- -
- @Html.RadioButtonFor(p => p.RequestCacheEnabled, true, new { name = "RequestCacheEnabled" }) - @Html.RadioButtonFor(p => p.RequestCacheEnabled, false, new { name = "RequestCacheEnabled" }) -
-
-
- -
- @Html.TextBoxFor(p => p.BreakeErrorThresholdPercentage, new { autocomplete = "off", placeholder = "错误率", @class = "form-control" }) -
-
-
- -
- @Html.TextBoxFor(p => p.BreakeSleepWindowInMilliseconds, new { autocomplete = "off", placeholder = "尝试请求", @class = "form-control" }) -
-
-
- -
- @Html.RadioButtonFor(p => p.BreakerForceClosed, true, new { name = "BreakerForceClosed" }) - @Html.RadioButtonFor(p => p.BreakerForceClosed, false, new { name = "BreakerForceClosed" }) -
-
-
- -
- @Html.TextBoxFor(p => p.BreakerRequestVolumeThreshold, new { autocomplete = "off", placeholder = "熔断阚值", @class = "form-control" }) -
-
-
- -
- @Html.TextBoxFor(p => p.MaxConcurrentRequests, new { autocomplete = "off", placeholder = "信号并发", @class = "form-control" }) -
-
-
- -
- -
-
-
- -
- -
-
- -
- -
- @Html.TextAreaFor(p => p.Injection, new { autocomplete = "off", placeholder = "填写描述", @class = "form-control", style = "height: 120px;" }) -
-
- - @Html.HiddenFor(p => p.ServiceId) -
- diff --git a/src/Surging.ApiGateway/Views/ServiceManage/FaultTolerant.cshtml b/src/Surging.ApiGateway/Views/ServiceManage/FaultTolerant.cshtml deleted file mode 100644 index 415b5d49c..000000000 --- a/src/Surging.ApiGateway/Views/ServiceManage/FaultTolerant.cshtml +++ /dev/null @@ -1,105 +0,0 @@ -@using Surging.Core.CPlatform; -@model List -@{ - ViewBag.Title = "容错规则"; - var isPjax = !string.IsNullOrEmpty(Context.Request.Headers["X-PJAX"]) && bool.Parse(Context.Request.Headers["X-PJAX"]); - Layout = isPjax ? null : "_ServiceManageLayout.cshtml"; -} -
-

- 服务管理 - - - 容错规则 - -

-
- - - - - -
-
-
-
-
-
-
-
- 关键字： - - - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - -
服务ID强制熔断容错策略超时时间开启缓存回退实例名注入脚本命名空间错误率尝试请求关闭熔断熔断阚值信号并发操作
-
-
-
-
- - - -@if (!isPjax) -{ - @section SubFootJS - { - - } -} -else -{ - -} \ No newline at end of file diff --git a/src/Surging.ApiGateway/Views/ServiceManage/Index.cshtml b/src/Surging.ApiGateway/Views/ServiceManage/Index.cshtml deleted file mode 100644 index 8ff1ac96f..000000000 --- a/src/Surging.ApiGateway/Views/ServiceManage/Index.cshtml +++ /dev/null @@ -1,71 +0,0 @@ - -@{ - ViewBag.Title = "服务管理"; - var isPjax = (!string.IsNullOrEmpty(Context.Request.Query["XPJAX"]) && bool.Parse(Context.Request.Query["XPJAX"])) - && (!string.IsNullOrEmpty(Context.Request.Headers["X-PJAX"]) && bool.Parse(Context.Request.Headers["X-PJAX"])) ; - Layout = isPjax ? null : "_ServiceManageLayout.cshtml"; - ViewBag.Selected = "Index"; -} -
-

- 服务管理 - - - 服务管理 - -

-
- - - -
-
-
-
-
-
-
- - 关键字： - -
-
-
- - - - - - - - - - - - -
机器名状态检查操作
-
-
-
-
-@if (!isPjax) -{ - @section SubFootJS - { - - } -} -else -{ - -} diff --git a/src/Surging.ApiGateway/Views/ServiceManage/ServiceCache.cshtml b/src/Surging.ApiGateway/Views/ServiceManage/ServiceCache.cshtml deleted file mode 100644 index 7fa85352f..000000000 --- a/src/Surging.ApiGateway/Views/ServiceManage/ServiceCache.cshtml +++ /dev/null @@ -1,70 +0,0 @@ - -@{ - ViewBag.Title = "服务管理"; - var isPjax = !string.IsNullOrEmpty(Context.Request.Headers["X-PJAX"]) && bool.Parse(Context.Request.Headers["X-PJAX"]); - Layout = isPjax ? null : "_ServiceManageLayout.cshtml"; - ViewBag.Selected = "ServiceCache"; -} -
-

- 服务管理 - - - 服务缓存管理 - -

-
- - - -
-
-
-
-
-
-
- - 关键字： - -
-
-
- - - - - - - - - - - - -
缓存ID类型失效时间连接失效时间操作
-
-
-
-
-@if (!isPjax) -{ - @section SubFootJS - { - - } -} -else -{ - -} \ No newline at end of file diff --git a/src/Surging.ApiGateway/Views/ServiceManage/ServiceCacheEndpoint.cshtml b/src/Surging.ApiGateway/Views/ServiceManage/ServiceCacheEndpoint.cshtml deleted file mode 100644 index f7ad21696..000000000 --- a/src/Surging.ApiGateway/Views/ServiceManage/ServiceCacheEndpoint.cshtml +++ /dev/null @@ -1,96 +0,0 @@ - -@{ - ViewBag.Title = "服务管理"; - var isPjax = !string.IsNullOrEmpty(Context.Request.Headers["X-PJAX"]) && bool.Parse(Context.Request.Headers["X-PJAX"]); - Layout = isPjax ? null : "_ServiceManageLayout.cshtml"; - ViewBag.Selected = "ServiceCache"; -} -
-

- 服务管理 - - - 服务缓存管理 - -

-
- - - -
-
-
-
-
-
-
-
- 关键字： - - -
-
-
-
- - - - - - - - - - - - - - -
地址用户名密码库名最大连接池最小连接池操作
-
-
-
-
- - - -@if (!isPjax) -{ - @section SubFootJS - { - - } -} -else -{ - -} \ No newline at end of file diff --git a/src/Surging.ApiGateway/Views/ServiceManage/ServiceDescriptor.cshtml b/src/Surging.ApiGateway/Views/ServiceManage/ServiceDescriptor.cshtml deleted file mode 100644 index 6e7c0ecd2..000000000 --- a/src/Surging.ApiGateway/Views/ServiceManage/ServiceDescriptor.cshtml +++ /dev/null @@ -1,76 +0,0 @@ - - @{ - ViewBag.Title = "服务元数据"; - var isPjax = !string.IsNullOrEmpty(Context.Request.Headers["X-PJAX"]) && bool.Parse(Context.Request.Headers["X-PJAX"]); - Layout = isPjax ? null : "_ServiceManageLayout.cshtml"; - } -
-

- 服务管理 - - - 服务元数据 - -

-
- - - -
-
-
-
-
-
-
-
- 关键字： - - -
-
-
-
- - - - - - - - - - - - - - - - - -
服务Id名称是否阻塞禁用外网是否授权负责人更新时间操作
-
-
-
-
-@if (!isPjax) -{ - @section SubFootJS - { - - } -} -else -{ - -} \ No newline at end of file diff --git a/src/Surging.ApiGateway/Views/ServiceManage/ServiceSubscriber.cshtml b/src/Surging.ApiGateway/Views/ServiceManage/ServiceSubscriber.cshtml deleted file mode 100644 index 91ac9ccb6..000000000 --- a/src/Surging.ApiGateway/Views/ServiceManage/ServiceSubscriber.cshtml +++ /dev/null @@ -1,69 +0,0 @@ - - @{ - ViewBag.Title = "服务管理"; - var isPjax = !string.IsNullOrEmpty(Context.Request.Headers["X-PJAX"]) && bool.Parse(Context.Request.Headers["X-PJAX"]) ; - Layout = isPjax ? null : "_ServiceManageLayout.cshtml"; - ViewBag.Selected="ServiceSubscriber"; - } -
-

- 服务管理 - - - 关联服务管理 - -

-
- - - -
-
-
-
-
-
-
- - 关键字： - -
-
-
- - - - - - - - - - - -
机器名状态检查操作
-
-
-
-
- @if (!isPjax) -{ - @section SubFootJS - { - - } -} -else -{ - -} diff --git a/src/Surging.ApiGateway/Views/ServiceManage/_ServiceManageLayout.cshtml b/src/Surging.ApiGateway/Views/ServiceManage/_ServiceManageLayout.cshtml deleted file mode 100644 index 64b295c94..000000000 --- a/src/Surging.ApiGateway/Views/ServiceManage/_ServiceManageLayout.cshtml +++ /dev/null @@ -1,54 +0,0 @@ -@{ - ViewBag.Title = "服务管理"; - Layout = "~/Views/Shared/_AppLayout.cshtml"; -} -@section SubHeadCSS - { - -} -
-
-

服务管理

-
-
- -
-
-
- -
-
-
-
- @RenderBody() -
-
- @*
- 返回首页 -
*@ - -
- - - - - -
-
-@section SubFootJS - { - -@RenderSection("SubFootJS", false) -} \ No newline at end of file diff --git a/src/Surging.ApiGateway/Views/Shared/Error.cshtml b/src/Surging.ApiGateway/Views/Shared/Error.cshtml deleted file mode 100644 index ec2ea6bd0..000000000 --- a/src/Surging.ApiGateway/Views/Shared/Error.cshtml +++ /dev/null @@ -1,22 +0,0 @@ -@model ErrorViewModel -@{ - ViewData["Title"] = "Error"; -} - -

Error.

-

An error occurred while processing your request.

- -@if (Model.ShowRequestId) -{ -

- Request ID: @Model.RequestId -

-} - -

Development Mode

-

- Swapping to Development environment will display more detailed information about the error that occurred. -

-

- Development environment should not be enabled in deployed applications, as it can result in sensitive information from exceptions being displayed to end users. For local debugging, development environment can be enabled by setting the ASPNETCORE_ENVIRONMENT environment variable to Development, and restarting the application. -

diff --git a/src/Surging.ApiGateway/Views/Shared/Partial/ManageNav.cshtml b/src/Surging.ApiGateway/Views/Shared/Partial/ManageNav.cshtml deleted file mode 100644 index 62114323c..000000000 --- a/src/Surging.ApiGateway/Views/Shared/Partial/ManageNav.cshtml +++ /dev/null @@ -1,38 +0,0 @@ -@{ - Layout = null; -} -
-
- -
- -
\ No newline at end of file diff --git a/src/Surging.ApiGateway/Views/Shared/_AppLayout.cshtml b/src/Surging.ApiGateway/Views/Shared/_AppLayout.cshtml deleted file mode 100644 index 13c955826..000000000 --- a/src/Surging.ApiGateway/Views/Shared/_AppLayout.cshtml +++ /dev/null @@ -1,41 +0,0 @@ -@{ - var isPjax = !string.IsNullOrEmpty(Context.Request.Headers["X-PJAX"]) && bool.Parse(Context.Request.Headers["X-PJAX"]); - Layout = isPjax ? null : "_Layout.cshtml"; ; - var now = DateTime.Now; -} -@if (isPjax) -{ - @RenderSection("SubHeadCSS", false) - @RenderBody() - @RenderSection("SubFootJS", false) -} -else -{ - -
-
@RenderBody()
-
-} - -@section HeadCSS{ - @RenderSection("SubHeadCSS", false) -} -@section FootJS{ - - - - - - @RenderSection("SubFootJS", false) -} \ No newline at end of file diff --git a/src/Surging.ApiGateway/Views/Shared/_Layout.cshtml b/src/Surging.ApiGateway/Views/Shared/_Layout.cshtml deleted file mode 100644 index 2edf23082..000000000 --- a/src/Surging.ApiGateway/Views/Shared/_Layout.cshtml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - Surging Gateway- @ViewBag.Title - - - - - - - - - - - - - - - - @RenderSection("HeadCSS", false) - - - - - - @RenderBody() - @RenderSection("FootJS", false) - - \ No newline at end of file diff --git a/src/Surging.ApiGateway/Views/Shared/_ManagerLayout.cshtml b/src/Surging.ApiGateway/Views/Shared/_ManagerLayout.cshtml deleted file mode 100644 index b3a45c3c5..000000000 --- a/src/Surging.ApiGateway/Views/Shared/_ManagerLayout.cshtml +++ /dev/null @@ -1,52 +0,0 @@ -@{ - Layout = "_Layout.cshtml"; - var now = DateTime.Now; -} -@section HeadCSS - { - @RenderSection("HeadCSS", false) -} -
-
- @Html.Partial("Partial/ManageNav") -
- @RenderBody() - -
-
- -
-
-
-
-
- -@section FootJS -{ - - - - - -@RenderSection("FootJS", false) - } \ No newline at end of file diff --git a/src/Surging.ApiGateway/Views/Shared/_ValidationScriptsPartial.cshtml b/src/Surging.ApiGateway/Views/Shared/_ValidationScriptsPartial.cshtml deleted file mode 100644 index a699aafa9..000000000 --- a/src/Surging.ApiGateway/Views/Shared/_ValidationScriptsPartial.cshtml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - diff --git a/src/Surging.ApiGateway/Views/_ViewImports.cshtml b/src/Surging.ApiGateway/Views/_ViewImports.cshtml deleted file mode 100644 index 758ea8ffa..000000000 --- a/src/Surging.ApiGateway/Views/_ViewImports.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@using Surging.ApiGateway -@using Surging.ApiGateway.Models -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/src/Surging.ApiGateway/Views/_ViewStart.cshtml b/src/Surging.ApiGateway/Views/_ViewStart.cshtml deleted file mode 100644 index a5f10045d..000000000 --- a/src/Surging.ApiGateway/Views/_ViewStart.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@{ - Layout = "_Layout"; -} diff --git a/src/Surging.ApiGateway/bower.json b/src/Surging.ApiGateway/bower.json deleted file mode 100644 index bb682012b..000000000 --- a/src/Surging.ApiGateway/bower.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "asp.net", - "private": true, - "dependencies": { - "bootstrap": "3.3.6", - "jquery": "2.2.0", - "jquery-validation": "1.14.0", - "jquery-validation-unobtrusive": "3.2.6", - "seajs": "3.0.0", - "font-awesome": "Font-Awesome#v4.7.0" - } -} diff --git a/src/Surging.ApiGateway/bundleconfig.json b/src/Surging.ApiGateway/bundleconfig.json deleted file mode 100644 index 6d3f9a57a..000000000 --- a/src/Surging.ApiGateway/bundleconfig.json +++ /dev/null @@ -1,24 +0,0 @@ -// Configure bundling and minification for the project. -// More info at https://go.microsoft.com/fwlink/?LinkId=808241 -[ - { - "outputFileName": "wwwroot/css/site.min.css", - // An array of relative input file paths. Globbing patterns supported - "inputFiles": [ - "wwwroot/css/site.css" - ] - }, - { - "outputFileName": "wwwroot/js/site.min.js", - "inputFiles": [ - "wwwroot/js/site.js" - ], - // Optionally specify minification options - "minify": { - "enabled": true, - "renameLocals": true - }, - // Optionally generate .map file - "sourceMap": false - } -] diff --git a/src/Surging.ApiGateway/wwwroot/apps/authmanage/assets/css/index.css b/src/Surging.ApiGateway/wwwroot/apps/authmanage/assets/css/index.css deleted file mode 100644 index 788b5fd5b..000000000 --- a/src/Surging.ApiGateway/wwwroot/apps/authmanage/assets/css/index.css +++ /dev/null @@ -1,357 +0,0 @@ -.app-board-dialog .modal-header { - color: #fff; - background-color: #1a5581; -} - -.app-board-dialog { - min-height: inherit; -} - - .app-board-dialog .btn { - padding: 6px 26px; - } - - .app-board-dialog .modal-body { - padding: 10px; - } - - .app-board-dialog .modal-footer { - padding: 15px; - } - -.tooltipster-base .tooltipster-content { - padding: 10px 20px; -} - -.app-board { - background-color: #3b75a5; - height: 100%; -} - - .app-board .app-left-side .app-title { - border-bottom-color: #CCC; - - } - - .app-board .app-left-side { - border: 1px solid #ccc; - width: 200px; - } - - .app-board .app-left-side .app-title > i { - margin-right: 10px; - } - - .app-board .app-left-side, .app-board .app-right-side { - background-color: #444c63; - } - - .app-board .app-wrapper { - margin-right: 0; - margin-left: 0; - padding-bottom: 40px; - padding-left: 200px; - min-height: 100%; - background-color: #fff; - box-shadow: none; - } - - .app-board .app-wrapper .container { - position: relative; - } - -.app-left-side.menu-min > .app-title > i { - margin-right: 0px; - margin-bottom: 10px; -} - -.app-board .app-left-side .app-title, -.app-left-nav ul li.nav-subnav h4 { - color: #fff; -} - -.app-board .app-left-nav ul a { - padding: 12px 5px 12px 20px; - color: #fff; -} - - .app-board .app-left-nav ul a:hover, .app-board .app-left-nav ul .active { - color: #fff; - background-color: #27314c; - border-left: 3px solid #4489ca - } - -.app-board .app-right-side { - background-color: #3b75a5; - position: fixed; - z-index: 1; - top: 0; - right: 0; - width: 50px; - height: 100%; - padding: 17px; - padding-top: 18%; - color: #FFF; -} - - .app-board .app-right-side > a { - color: #FFF; - text-decoration: none; - } - - -.app-board .search-bar { - margin: 10px 0; -} - - .app-board .search-bar > .navbar-header { - padding: 15px 5px; - color: #fff; - } - -.app-left-side .sidebar-toggle { - position: relative; - margin-top: 10px; - padding: 10px 0; - text-align: center; - border-top: solid 1px #ccc; - background-color: #444c63; -} - - .app-left-side .sidebar-toggle:before { - position: absolute; - top: 20px; - right: 15px; - left: 15px; - display: block; - height: 0; - content: ''; - border-color: inherit; - border-top: 1px solid #e0e0e0; - } - - .app-left-side .sidebar-toggle > .icon { - font-size: 14px; - position: relative; - padding: 2px 5px; - cursor: pointer; - color: #fff; - border: 1px solid #BBB; - border-radius: 100%; - background-color: #27314c; - } - - .app-left-side .sidebar-toggle > .icon:hover { - background-color: #EFEFEF; - border-color: #999; - color: #999; - } - -.app-board .app-left-side.menu-min, -.app-board .app-left-side.menu-min.compact, -.sidebar.menu-min.navbar-collapse { - width: 60px; -} - - .app-board .app-left-side.menu-min + .app-wrapper { - padding-left: 60px; - } - - .app-board .app-left-side.menu-min .app-left-nav li a { - line-height: 44px; - position: relative; - overflow: inherit; - height: 44px; - padding: 0; - text-align: center; - } - - .app-board .app-left-side.menu-min .app-left-nav li a > i { - font-size: 20px; - margin: 0; - } - - .app-board .app-left-side.menu-min .app-left-nav li .nav-level-span { - line-height: 44px; - position: absolute; - z-index: 1025; - top: 0; - left: 50px; - display: none; - width: 150px; - height: 44px; - padding-left: 20px; - text-align: left; - background-color: #27314c; - } -.app-left-side .app-left-nav .nav-level-span { - position: absolute; - padding-left: 12px; -} - .app-board .app-left-side.menu-min .app-left-nav li a:hover .nav-level-span, - .app-board .app-left-side.menu-min .app-left-nav li a .nav-level-span:hover { - display: block; - opacity: .95; - filter: alpha(opacity=95); - -moz-opacity: .95; - -webkit-opacity: .95; - -khtml-opacity: .95; - } - - .app-board .app-left-side.menu-min .app-title { - font-size: 22px; - line-height: 55px; - height: 55px; - padding: 0; - text-align: center; - } - - .app-board .app-left-side.menu-min .app-title span { - display: none; - } - -.app-board .board-box { - padding-right: 10px; - padding-left: 10px; -} - - .app-board .board-box:hover { - cursor: pointer; - } - - .app-board .board-box .board-unit { - position: relative; - margin: 8px 0; - margin-left: -2px; - padding: 10px; - background-color: #fff; - -webkit-box-shadow: none; - box-shadow: none; - } - - .app-board .board-box .board-unit:hover { - z-index: 11; - background-color: #fafafa; - box-shadow: 0 0 4px 2px rgba(0, 0, 0, .4); - } - -.board-unit .board-avatar { - width: 40px; - height: 40px; -} - -.board-unit .board-head { - font-size: 12px; - position: relative; - min-height: 40px; - margin: 0 0 5px 0; - padding-left: 50px; -} - - .board-unit .board-head h4 { - font-size: 14px; - margin: 0 0 5px 0; - } - -.board-unit .board-body { - min-height: 131px; - padding: 0 2px; -} - -.board-unit .board-text { - font-size: 12px; - overflow: hidden; - height: 55px; - padding: 2px 0 3px 0; - text-overflow: ellipsis; - color: #222; -} - -.board-unit .board-pic { - padding: 3px 0; -} - - .board-unit .board-pic img { - min-width: 50px; - min-height: 50px; - } - -.board-unit .board-comment { - font-size: 12px; -} - -.board-detail { - min-height: 500px; - background-color: #fff; -} - - .board-detail .board-content { - font-size: 14px; - font-weight: 400; - line-height: 22px; - padding: 15px 0; - table-layout: fixed; - word-break: break-all; - color: #222; - } - - .board-detail .board-content img { - width: 100%; - } - - .board-detail .board-comment { - padding: 10px; - } - -.app-board .nextmore { - padding: 10px 0; - border: none; -} - - .app-board .nextmore > .inner { - border: none; - background-color: transparent; - } - - .app-board .nextmore > .inner > a { - font-size: 20px; - margin: 10px 0; - color: #eee; - } - - .app-board .nextmore > .inner > a:hover { - color: #fff; - } - -.page-header { - border-bottom: 1px dotted #e2e2e2; - margin: 0 0 12px; - padding-bottom: 16px; - padding-top: 7px; -} - - .page-header h1 { - color: #2679b5; - font-size: 24px; - font-weight: lighter; - margin: 0 8px; - padding: 0; - } - -.page-content { - min-height: 600px; -} - -.app-left-nav ul { - margin: 0px; - padding: 0px; -} -/*Modal*/ -.modal .modal-header { - background-color: #2e425a; - color: #fff; -} -.modal .close, .modal .close:hover { - color: #fff; - opacity: 1; -} diff --git a/src/Surging.ApiGateway/wwwroot/apps/authmanage/assets/js/modules/authenticationmanage.js b/src/Surging.ApiGateway/wwwroot/apps/authmanage/assets/js/modules/authenticationmanage.js deleted file mode 100644 index ea274b579..000000000 --- a/src/Surging.ApiGateway/wwwroot/apps/authmanage/assets/js/modules/authenticationmanage.js +++ /dev/null @@ -1,17 +0,0 @@ -define(function (require, exports, module) { - var $ = jQuery = require('jquery'); - var init = function () { - $(".app-board").on("click", "#leftSide-toggle", function () { - var $this = $(this); - if ($this.is(".icon-double-angle-right")) { - $this.attr("class", "icon icon-double-angle-left"); - $(".app-left-side").removeClass("menu-min"); - } else { - $this.attr("class", "icon icon-double-angle-right"); - $(".app-left-side").addClass("menu-min"); - } - - }); - } - exports.init = init; -}); \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/apps/authmanage/assets/js/url.config.js b/src/Surging.ApiGateway/wwwroot/apps/authmanage/assets/js/url.config.js deleted file mode 100644 index 4e5dc7400..000000000 --- a/src/Surging.ApiGateway/wwwroot/apps/authmanage/assets/js/url.config.js +++ /dev/null @@ -1,7 +0,0 @@ -define(function (require, exports, module) { - window.debug = false; - module.exports = { - GET_ADDRESS: "/ServiceManage/GetAddress", - EDIT_SERVICETOKEN:"/AuthenticationManage/EditServiceToken" - } -}); \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/apps/authmanage/assets/js/view/address.guide.js b/src/Surging.ApiGateway/wwwroot/apps/authmanage/assets/js/view/address.guide.js deleted file mode 100644 index e9d4593fe..000000000 --- a/src/Surging.ApiGateway/wwwroot/apps/authmanage/assets/js/view/address.guide.js +++ /dev/null @@ -1,83 +0,0 @@ -define(function (require, exports, module) { - var $ = jQuery = require('jquery'); - require('jquerytmpl'); - var def = { - wrap: "#dataService tbody", - modal: "#myModal", - modalBody: "#myModal .modal-body", - modalForm: "#eventForm", - editServiceToken: ".editServiceToken", - btnSearch: "#btnSearch", - queryParam: "#queryParam" - }; - var config = require('../url.config.js'); - var serviceaddress = function (options) { - var defaults = { - servicemanage_tpl: require("../../templates/authmanage_template.tpl") - }; - var self = this; - this.opts = $.extend(defaults, options || {}); - }; - serviceaddress.prototype = { - init: function () { - var self = this; - self.initEvent(); - self.loadData(); - - }, - openDiag: function (id) { - $.when( - $.get(config.EDIT_SERVICETOKEN, { address: id })) - .then(function (data) { - $(def.modalBody).replaceWith(data); - $(def.modal).modal('show'); - }); - - }, - bindSubmit: function () { - var self = this; - var formData = $(def.modalForm).serializeObject(); - $.when( - $.post(config.EDIT_SERVICETOKEN, formData)) - .then(function (data) { - if (data.IsSucceed) { - $(def.modal).modal('hide'); - self.loadData(); - } - }); - }, - initEvent: function () { - var self = this; - $(def.btnSearch).off("click").bind("click", function () { - self.loadData($(def.queryParam).val()); - }); - $(def.modalForm).off("submit").bind("submit", function () { - self.bindSubmit(); - return false; - }); - $(def.editServiceToken).off("click").bind("click", function () { - var $tr = $(this).parents("tr"); - var address = $.tmplItem($tr).data.Entity[$tr.index()].Address; - var serviceAddress = [address.Ip, address.Port].join(":"); - self.openDiag(serviceAddress); - }); - }, - loadData: function (condition) { - var self = this; - $.when( - $.post(config.GET_ADDRESS, { QueryParam: condition })) - .then(function (data) { - if (data.IsSucceed) { - var tpl = $.tmpl(self.opts.servicemanage_tpl, data); - $(def.wrap).html(tpl); - self.initEvent(); - } - }); - } - }; - exports.init = function (options) { - var obj = new serviceaddress(options); - obj.init(); - }; - -}); \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/apps/authmanage/assets/templates/authmanage_template.tpl b/src/Surging.ApiGateway/wwwroot/apps/authmanage/assets/templates/authmanage_template.tpl deleted file mode 100644 index 8ed984e48..000000000 --- a/src/Surging.ApiGateway/wwwroot/apps/authmanage/assets/templates/authmanage_template.tpl +++ /dev/null @@ -1,26 +0,0 @@ - {{each Entity}} - - - {{if ($index+1)%2==1 }} - ${$index+1} - {{else}} - ${$index+1} - {{/if}} - - {{= [Address.Ip,Address.Port].join(":")}} - 已启动 - - {{if IsHealth==true }} - 正常 - {{else}} - 异常 - {{/if}} - - ${Address.Token} - - - - - {{/each}} \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/css/img/app_icon_servicemange.png b/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/css/img/app_icon_servicemange.png deleted file mode 100644 index 343d6b136295123659f070892e5454640e61a406..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 890 zcmV-=1BLvFP)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ<07*naRCwCdms?0wQ51%!tCps8gQAd%E(St91VIo)1sQ215#6oqf?#Tw(K0A3 ziqMCkK+#gPqM+A`h@j{punQWMSJV`l(= zpQ@8x8z91oz-ncHO_UpIM?N(+^$j6?IEnFFx8DFV3Ex8fwQBEK*B?ia1jni z8aBq7h6yc1!&QoJ#aoL1#bLBJmcwW`j^l>EIgXPRu*R} zqckM3v}8M?v}8#@E^s)Wmh8W2N=Hvyp6H9ofUDVq1YFG$emNbs>-nz%0L)>LcaY9= QWB>pF07*qoM6N<$f@%Ac5dZ)H diff --git a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/css/index.css b/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/css/index.css deleted file mode 100644 index 8f5de4415..000000000 --- a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/css/index.css +++ /dev/null @@ -1,342 +0,0 @@ -.app-board-dialog .modal-header { - color: #fff; - background-color: #1a5581; -} - -.app-board-dialog { - min-height: inherit; -} - -.app-board-dialog .btn { - padding: 6px 26px; -} - -.app-board-dialog .modal-body { - padding: 10px; -} - -.app-board-dialog .modal-footer { - padding: 15px; -} - -.tooltipster-base .tooltipster-content { - padding: 10px 20px; -} - -.app-board { - background-color: #3b75a5; - height: 100%; -} - -.app-board .app-left-side .app-title { - border-bottom-color: #CCC -} - -.app-board .app-left-side { - border: 1px solid #ccc; - width: 200px; -} - -.app-board .app-left-side .app-title > i { - margin-right: 10px; -} - -.app-board .app-left-side, .app-board .app-right-side { - background-color: #f9f9f9; -} - -.app-board .app-wrapper { - margin-right: 0; - margin-left: 0; - padding-bottom: 40px; - padding-left: 200px; - min-height: 100%; - background-color: #fff; - box-shadow: none; -} - -.app-board .app-wrapper .container { - position: relative; -} - -.app-left-side.menu-min > .app-title > i { - margin-right: 0px; - margin-bottom: 10px; -} - -.app-board .app-left-side .app-title, -.app-left-nav ul li.nav-subnav h4 { - color: #585858; -} - -.app-board .app-left-nav ul a { - padding: 12px 5px 12px 20px; - color: #585858; -} - - .app-board .app-left-nav ul a:hover, .app-board .app-left-nav ul .active { - color: #fff; - background-color: #3b75a5; - } - -.app-board .app-right-side { - background-color: #3b75a5; - position: fixed; - z-index: 1; - top: 0; - right: 0; - width: 50px; - height: 100%; - padding: 17px; - padding-top: 18%; - color: #FFF; -} - -.app-board .app-right-side > a { - color: #FFF; - text-decoration: none; -} - - -.app-board .search-bar { - margin: 10px 0; -} - -.app-board .search-bar > .navbar-header { - padding: 15px 5px; - color: #fff; -} - -.app-left-side .sidebar-toggle { - position: relative; - margin-top: 10px; - padding: 10px 0; - text-align: center; - border-top: solid 1px #ccc; - background-color: #f2f2f2; -} - -.app-left-side .sidebar-toggle:before { - position: absolute; - top: 20px; - right: 15px; - left: 15px; - display: block; - height: 0; - content: ''; - border-color: inherit; - border-top: 1px solid #e0e0e0; -} - -.app-left-side .sidebar-toggle > .icon { - font-size: 14px; - position: relative; - padding: 2px 5px; - cursor: pointer; - color: #AAA; - border: 1px solid #BBB; - border-radius: 100%; - background-color: #FFF; -} - -.app-left-side .sidebar-toggle > .icon:hover { - background-color: #EFEFEF; - border-color: #999; - color: #999; -} - -.app-board .app-left-side.menu-min, -.app-board .app-left-side.menu-min.compact, -.sidebar.menu-min.navbar-collapse { - width: 60px; -} - -.app-board .app-left-side.menu-min + .app-wrapper { - padding-left: 60px; -} - -.app-board .app-left-side.menu-min .app-left-nav li a { - line-height: 44px; - position: relative; - overflow: inherit; - height: 44px; - padding: 0; - text-align: center; -} - -.app-board .app-left-side.menu-min .app-left-nav li a > i { - font-size: 20px; - margin: 0; -} - -.app-board .app-left-side.menu-min .app-left-nav li .nav-level-span { - line-height: 44px; - position: absolute; - z-index: 1025; - top: 0; - left: 50px; - display: none; - width: 150px; - height: 44px; - padding-left: 20px; - text-align: left; - background-color: #3b75a5; -} -.app-left-side .app-left-nav .nav-level-span { - position: absolute; - padding-left: 12px; -} -.app-board .app-left-side.menu-min .app-left-nav li a:hover .nav-level-span, -.app-board .app-left-side.menu-min .app-left-nav li a .nav-level-span:hover { - display: block; - opacity: .95; - filter: alpha(opacity=95); - -moz-opacity: .95; - -webkit-opacity: .95; - -khtml-opacity: .95; -} - -.app-board .app-left-side.menu-min .app-title { - font-size: 22px; - line-height: 55px; - height: 55px; - padding: 0; - text-align: center; -} - -.app-board .app-left-side.menu-min .app-title span { - display: none; -} - -.app-board .board-box { - padding-right: 10px; - padding-left: 10px; -} - -.app-board .board-box:hover { - cursor: pointer; -} - -.app-board .board-box .board-unit { - position: relative; - margin: 8px 0; - margin-left: -2px; - padding: 10px; - background-color: #fff; - -webkit-box-shadow: none; - box-shadow: none; -} - -.app-board .board-box .board-unit:hover { - z-index: 11; - background-color: #fafafa; - box-shadow: 0 0 4px 2px rgba(0, 0, 0, .4); -} - -.board-unit .board-avatar { - width: 40px; - height: 40px; -} - -.board-unit .board-head { - font-size: 12px; - position: relative; - min-height: 40px; - margin: 0 0 5px 0; - padding-left: 50px; -} - -.board-unit .board-head h4 { - font-size: 14px; - margin: 0 0 5px 0; -} - -.board-unit .board-body { - min-height: 131px; - padding: 0 2px; -} - -.board-unit .board-text { - font-size: 12px; - overflow: hidden; - height: 55px; - padding: 2px 0 3px 0; - text-overflow: ellipsis; - color: #222; -} - -.board-unit .board-pic { - padding: 3px 0; -} - - .board-unit .board-pic img { - min-width: 50px; - min-height: 50px; - } - -.board-unit .board-comment { - font-size: 12px; -} - -.board-detail { - min-height: 500px; - background-color: #fff; -} - -.board-detail .board-content { - font-size: 14px; - font-weight: 400; - line-height: 22px; - padding: 15px 0; - table-layout: fixed; - word-break: break-all; - color: #222; -} - -.board-detail .board-content img { - width: 100%; -} - -.board-detail .board-comment { - padding: 10px; -} - -.app-board .nextmore { - padding: 10px 0; - border: none; -} - -.app-board .nextmore > .inner { - border: none; - background-color: transparent; -} - -.app-board .nextmore > .inner > a { - font-size: 20px; - margin: 10px 0; - color: #eee; -} - -.app-board .nextmore > .inner > a:hover { - color: #fff; -} -.page-header { - border-bottom: 1px dotted #e2e2e2; - margin: 0 0 12px; - padding-bottom: 16px; - padding-top: 7px; -} -.page-header h1 { - color: #2679b5; - font-size: 24px; - font-weight: lighter; - margin: 0 8px; - padding: 0; -} -.page-content { - min-height:600px; -} -.app-left-nav ul{ - margin:0px; - padding:0px; -} diff --git a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/modules/ServiceManage.js b/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/modules/ServiceManage.js deleted file mode 100644 index ea274b579..000000000 --- a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/modules/ServiceManage.js +++ /dev/null @@ -1,17 +0,0 @@ -define(function (require, exports, module) { - var $ = jQuery = require('jquery'); - var init = function () { - $(".app-board").on("click", "#leftSide-toggle", function () { - var $this = $(this); - if ($this.is(".icon-double-angle-right")) { - $this.attr("class", "icon icon-double-angle-left"); - $(".app-left-side").removeClass("menu-min"); - } else { - $this.attr("class", "icon icon-double-angle-right"); - $(".app-left-side").addClass("menu-min"); - } - - }); - } - exports.init = init; -}); \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/url.config.js b/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/url.config.js deleted file mode 100644 index 9c0b3c655..000000000 --- a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/url.config.js +++ /dev/null @@ -1,15 +0,0 @@ -define(function (require, exports, module) { - window.debug = false; - module.exports = { - GET_ADDRESS: "/ServiceManage/GetAddress", - GET_SERVICEDESCRIPTOR: "/ServiceManage/GetServiceDescriptor", - GET_SUBSCRIBERDESCRIPTOR: "/ServiceManage/GetSubscriberDescriptor", - GET_COMMANDDESCRIPTOR: "/ServiceManage/GetCommandDescriptor", - GET_SUBSCRIBER: "/ServiceManage/GetSubscriber", - GET_SERVICECACHE: "/ServiceManage/GetServiceCache", - EDIT_FAULTTOLERANT: "/ServiceManage/EditFaultTolerant", - GET_CACHEENDPOINT: "/ServiceManage/GetCacheEndpoint", - EDIT_CACHEENDPOINT: "/ServiceManage/EditCacheEndpoint", - DEL_CACHEENDPOINT:"/ServiceManage/DelCacheEndpoint" - } -}); diff --git a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/address.guide.js b/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/address.guide.js deleted file mode 100644 index 503059670..000000000 --- a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/address.guide.js +++ /dev/null @@ -1,49 +0,0 @@ -define(function (require, exports, module) { - var $ = jQuery = require('jquery'); - require('jquerytmpl'); - var def = { - wrap: "#dataService tbody", - btnSearch: "#btnSearch", - queryParam: "#queryParam" - }; - var config = require('../url.config.js'); - var serviceaddress = function (options) { - var defaults = { - servicemanage_tpl: require("../../templates/servicemanage_template.tpl") - }; - var self = this; - this.opts = $.extend(defaults, options || {}); - }; - serviceaddress.prototype = { - init: function () { - var self = this; - self.initEvent(); - self.loadData(); - - }, - initEvent: function () - { - var self = this; - $(def.btnSearch).off("click").bind("click", function () { - self.loadData($(def.queryParam).val()); - }); - }, - loadData: function (condition) - { - var self = this; - $.when( - $.post(config.GET_ADDRESS, { QueryParam: condition })) - .then(function (data) { - if (data.IsSucceed) { - var tpl = $.tmpl(self.opts.servicemanage_tpl, data); - $(def.wrap).html(tpl); - } - }); - } - }; - exports.init = function (options) { - var obj = new serviceaddress(options); - obj.init(); - }; - -}); \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/faulttolerant.guide.js b/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/faulttolerant.guide.js deleted file mode 100644 index fd9264a4c..000000000 --- a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/faulttolerant.guide.js +++ /dev/null @@ -1,85 +0,0 @@ -define(function (require, exports, module) { - var $ = jQuery = require('jquery'); - require('jquerytmpl'); - var def = { - wrap: "#dataFaultTolerant tbody", - modal: "#myModal", - modalBody: "#myModal .modal-body", - modalForm: "#eventForm", - editFaultTolerant:".editFaultTolerant", - btnSearch: "#btnSearch", - searchForm: "#searchForm", - queryParam: "#queryParam" - }; - var config = require('../url.config.js'); - var serviceaddress = function (options) { - var defaults = { - faulttolerant_tpl: require("../../templates/faulttolerant_template.tpl") - }; - var self = this; - this.opts = $.extend(defaults, options || {}); - }; - serviceaddress.prototype = { - init: function () { - var self = this; - self.initEvent(); - self.loadData(); - }, - openDiag: function (id) - { - $.when( - $.get(config.EDIT_FAULTTOLERANT, {serviceId:id})) - .then(function (data) { - $(def.modalBody).replaceWith(data); - $(def.modal).modal('show'); - }); - - }, - initEvent: function () { - var self = this; - $(def.btnSearch).off("click").bind("click", function () { - self.loadData(); - }); - $(def.modalForm).off("submit").bind("submit", function () { - self.bindSubmit(); - return false; - }); - $(def.editFaultTolerant).off("click").bind("click", function () { - var $tr = $(this).parents("tr"); - var serviceId = $.tmplItem($tr).data.Entity[$tr.index()].ServiceId; - self.openDiag(serviceId); - }); - }, - bindSubmit: function () { - var self = this; - var formData = $(def.modalForm).serializeObject(); - formData.InjectionNamespaces = formData.InjectionNamespaces.split(','); - $.when( - $.post(config.EDIT_FAULTTOLERANT, formData)) - .then(function (data) { - if (data.IsSucceed) { - $(def.modal).modal('hide'); - self.loadData(); - } - }); - }, - loadData: function () { - var self = this; - var formData = $(def.searchForm).serializeArray(); - $.when( - $.post(config.GET_COMMANDDESCRIPTOR, formData)) - .then(function (data) { - if (data.IsSucceed) { - var tpl = $.tmpl(self.opts.faulttolerant_tpl, data); - $(def.wrap).html(tpl); - self.initEvent(); - } - }); - } - }; - exports.init = function (options) { - var obj = new serviceaddress(options); - obj.init(); - }; - -}); \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/servicecache.guide.js b/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/servicecache.guide.js deleted file mode 100644 index 868bbd7dd..000000000 --- a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/servicecache.guide.js +++ /dev/null @@ -1,48 +0,0 @@ -define(function (require, exports, module) { - var $ = jQuery = require('jquery'); - require('jquerytmpl'); - var def = { - wrap: "#dataServiceCache tbody", - btnSearch: "#btnSearch", - queryParam: "#queryParam" - }; - var config = require('../url.config.js'); - var serviceCache = function (options) { - var defaults = { - servicesubscriber_tpl: require("../../templates/servicecache_template.tpl") - }; - var self = this; - this.opts = $.extend(defaults, options || {}); - }; - serviceCache.prototype = { - init: function () { - var self = this; - self.initEvent(); - self.loadData(); - - }, - initEvent: function () { - var self = this; - $(def.btnSearch).off("click").bind("click", function () { - self.loadData($(def.queryParam).val()); - }); - }, - loadData: function (condition) { - var self = this; - $.when( - $.post(config.GET_SERVICECACHE, { queryParam: condition })) - .then(function (data) { - - if (data.IsSucceed) { - var tpl = $.tmpl(self.opts.servicesubscriber_tpl, data); - $(def.wrap).html(tpl); - } - }); - } - }; - exports.init = function (options) { - var obj = new serviceCache(options); - obj.init(); - }; - -}); \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/servicecacheendpoint.guide.js b/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/servicecacheendpoint.guide.js deleted file mode 100644 index e1b204603..000000000 --- a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/servicecacheendpoint.guide.js +++ /dev/null @@ -1,122 +0,0 @@ -define(function (require, exports, module) { - var $ = jQuery = require('jquery'); - require('bootbox'); - require('jquerytmpl'); - var def = { - wrap: "#dataServiceCache tbody", - modal: "#myModal", - modalBody: "#myModal .modal-body", - modalForm: "#eventForm", - editCacheEndpoint: ".editCacheEndpoint", - delCacheEndpoint: ".delCacheEndpoint", - searchForm: "#searchForm", - btnSearch: "#btnSearch", - queryParam: "#queryParam" - }; - var config = require('../url.config.js'); - var serviceCache = function (options) { - var defaults = { - servicecacheendpoint_tpl: require("../../templates/servicecacheendpoint_template.tpl") - }; - var self = this; - this.opts = $.extend(defaults, options || {}); - }; - serviceCache.prototype = { - init: function () { - var self = this; - self.initEvent(); - self.loadData(); - - }, - openDiag: function (id, endpoint) { - $.when( - $.get(config.EDIT_CACHEENDPOINT, { cacheId: id, endpoint: endpoint})) - .then(function (data) { - $(def.modalBody).replaceWith(data); - $(def.modal).modal('show'); - }); - - }, - initEvent: function () { - var self = this; - - $(def.btnSearch).off("click").bind("click", function () { - self.loadData($(def.queryParam).val()); - }); - $(def.modalForm).off("submit").bind("submit", function () { - self.bindSubmit(); - return false; - }); - $(def.editCacheEndpoint).off("click").bind("click", function () { - var $tr = $(this).parents("tr"); - var cacheEndpoint = $.tmplItem($tr).data.Entity[$tr.index()]; - self.openDiag(self.opts.Id, [cacheEndpoint.Host, ":", cacheEndpoint.Port].join("")); - }); - $(def.delCacheEndpoint).off("click").bind("click", function () { - var $tr = $(this).parents("tr"); - var cacheEndpoint = $.tmplItem($tr).data.Entity[$tr.index()]; - bootbox.confirm({ - message: "是否删除", - buttons: { - confirm: { - label: '确定' - }, - cancel: { - label: '取消' - } - }, - callback: function (result) { - if (result) { - self.delEndpoint(self.opts.Id, [cacheEndpoint.Host, ":", cacheEndpoint.Port].join("")); - } - } - }); - }); - }, - bindSubmit: function () { - var self = this; - var formData = $(def.modalForm).serializeObject(); - var endpoint = [$("#Host").val(), ":", $("#Port").val()].join(""); - var data = {}; - data.CacheId = self.opts.Id; - data.Endpoint = endpoint; - data.CacheEndpoint = formData; - $.when( - $.post(config.EDIT_CACHEENDPOINT, data)) - .then(function (data) { - if (data.IsSucceed) { - $(def.modal).modal('hide'); - self.loadData(); - } - }); - }, - loadData: function () { - var self = this; - var formData = $(def.searchForm).serializeArray(); - $.when( - $.post(config.GET_CACHEENDPOINT, formData)) - .then(function (data) { - if (data.IsSucceed) { - var tpl = $.tmpl(self.opts.servicecacheendpoint_tpl, data); - $(def.wrap).html(tpl); - self.initEvent(); - } - }); - }, - delEndpoint: function (id, endpoint) { - var self = this; - $.when( - $.post(config.DEL_CACHEENDPOINT, { cacheId: id, endpoint: endpoint })) - .then(function (data) { - if (data.IsSucceed) { - self.loadData(); - } - }); - } - }; - exports.init = function (options) { - var obj = new serviceCache(options); - obj.init(); - }; - -}); \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/servicedescriptor.guide.js b/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/servicedescriptor.guide.js deleted file mode 100644 index a26119e01..000000000 --- a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/servicedescriptor.guide.js +++ /dev/null @@ -1,50 +0,0 @@ -define(function (require, exports, module) { - var $ = jQuery = require('jquery'); - require('jquerytmpl'); - var def = { - wrap: "#dataServiceDescriptor tbody", - btnSearch: "#btnSearch", - searchForm: "#searchForm", - queryParam: "#queryParam" - }; - var config = require('../url.config.js'); - var descriptor = function (options) { - var defaults = { - servicedescriptor_tpl: require("../../templates/servicedescriptor_template.tpl") - }; - var self = this; - this.opts = $.extend(defaults, options || {}); - }; - descriptor.prototype = { - init: function () { - var self = this; - self.initEvent(); - self.loadData(); - - }, - initEvent: function () { - var self = this; - $(def.searchForm).off("submit").bind("submit", function () { - self.loadData(); - return false; - }); - }, - loadData: function () { - var self = this; - var formData = $(def.searchForm).serializeArray(); - $.when( - $.post(config.GET_SERVICEDESCRIPTOR, formData)) - .then(function (data) { - if (data.IsSucceed) { - var tpl = $.tmpl(self.opts.servicedescriptor_tpl, data); - $(def.wrap).html(tpl); - } - }); - } - }; - exports.init = function (options) { - var obj = new descriptor(options); - obj.init(); - }; - -}); \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/servicesubscriber.guide.js b/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/servicesubscriber.guide.js deleted file mode 100644 index 5c0c97d34..000000000 --- a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/js/view/servicesubscriber.guide.js +++ /dev/null @@ -1,47 +0,0 @@ -define(function (require, exports, module) { - var $ = jQuery = require('jquery'); - require('jquerytmpl'); - var def = { - wrap: "#dataSubscriber tbody", - btnSearch: "#btnSearch", - queryParam: "#queryParam" - }; - var config = require('../url.config.js'); - var serviceSubscriber = function (options) { - var defaults = { - servicesubscriber_tpl: require("../../templates/servicesubscriber_template.tpl") - }; - var self = this; - this.opts = $.extend(defaults, options || {}); - }; - serviceSubscriber.prototype = { - init: function () { - var self = this; - self.initEvent(); - self.loadData(); - - }, - initEvent: function () { - var self = this; - $(def.btnSearch).off("click").bind("click", function () { - self.loadData($(def.queryParam).val()); - }); - }, - loadData: function (condition) { - var self = this; - $.when( - $.post(config.GET_SUBSCRIBER, { queryParam: condition })) - .then(function (data) { - if (data.IsSucceed) { - var tpl = $.tmpl(self.opts.servicesubscriber_tpl, data); - $(def.wrap).html(tpl); - } - }); - } - }; - exports.init = function (options) { - var obj = new serviceSubscriber(options); - obj.init(); - }; - -}); \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/faulttolerant_template.tpl b/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/faulttolerant_template.tpl deleted file mode 100644 index 291401ec8..000000000 --- a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/faulttolerant_template.tpl +++ /dev/null @@ -1,49 +0,0 @@ -{{each Entity}} - - - {{if ($index+1)%2==1 }} - ${$index+1} - {{else}} - ${$index+1} - {{/if}} - - ${ServiceId} - - {{if CircuitBreakerForceOpen==true }} - 是 - {{else}} - 否 - {{/if}} - - - ${Strategy} - - ${ExecutionTimeoutInMilliseconds} - - {{if RequestCacheEnabled==true }} - 是 - {{else}} - 否 - {{/if}} - - ${FallBackName} - ${Injection} - ${InjectionNamespaces} - ${BreakeErrorThresholdPercentage} - ${BreakeSleepWindowInMilliseconds} - - {{if BreakerForceClosed==true }} - 是 - {{else}} - 否 - {{/if}} - - ${BreakerRequestVolumeThreshold} - ${MaxConcurrentRequests} - - - - -{{/each}} diff --git a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/servicecache_template.tpl b/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/servicecache_template.tpl deleted file mode 100644 index 75947b742..000000000 --- a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/servicecache_template.tpl +++ /dev/null @@ -1,20 +0,0 @@ - {{each Entity}} - - - {{if ($index+1)%2==1 }} - ${$index+1} - {{else}} - ${$index+1} - {{/if}} - - ${Id} - ${Type} - ${Metadatas.DefaultExpireTime} - ${Metadatas.DefaultExpireTime} - - - {{/each}} \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/servicecacheendpoint_template.tpl b/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/servicecacheendpoint_template.tpl deleted file mode 100644 index de4b5fba9..000000000 --- a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/servicecacheendpoint_template.tpl +++ /dev/null @@ -1,21 +0,0 @@ - {{each Entity}} - - - {{if ($index+1)%2==1 }} - ${$index+1} - {{else}} - ${$index+1} - {{/if}} - - {{= [Host,Port].join(":")}} - ${UserName} - ${Password} - ${Db} - ${MaxSize} - ${MinSize} - - - {{/each}} \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/servicedescriptor_template.tpl b/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/servicedescriptor_template.tpl deleted file mode 100644 index fe331fa9b..000000000 --- a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/servicedescriptor_template.tpl +++ /dev/null @@ -1,42 +0,0 @@ - {{each Entity}} - - - {{if ($index+1)%2==1 }} - ${$index+1} - {{else}} - ${$index+1} - {{/if}} - - ${Id} - ${Metadatas.GroupName} - - {{if Metadatas.WaitExecution==true }} - 是 - {{else}} - 否 - {{/if}} - - - {{if Metadatas.DisableNetwork==true }} - 是 - {{else}} - 否 - {{/if}} - - - {{if Metadatas.EnableAuthorization==true }} - 是 - {{else}} - 否 - {{/if}} - - ${Metadatas.Director} - ${Metadatas.Date} - - - - {{/each}} \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/servicemanage_template.tpl b/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/servicemanage_template.tpl deleted file mode 100644 index d26b63a9c..000000000 --- a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/servicemanage_template.tpl +++ /dev/null @@ -1,27 +0,0 @@ - {{each Entity}} - - - {{if ($index+1)%2==1 }} - ${$index+1} - {{else}} - ${$index+1} - {{/if}} - - {{= [Address.Ip,Address.Port].join(":")}} - 已启动 - - {{if IsHealth==true }} - 正常 - {{else}} - 异常 - {{/if}} - - - - - {{/each}} \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/servicesubscriber_template.tpl b/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/servicesubscriber_template.tpl deleted file mode 100644 index 5eeeffc55..000000000 --- a/src/Surging.ApiGateway/wwwroot/apps/servicemange/assets/templates/servicesubscriber_template.tpl +++ /dev/null @@ -1,26 +0,0 @@ - {{each Entity}} - - - {{if ($index+1)%2==1 }} - ${$index+1} - {{else}} - ${$index+1} - {{/if}} - - {{= [Address.Ip,Address.Port].join(":")}} - 已启动 - - {{if IsHealth==true }} - 正常 - {{else}} - 异常 - {{/if}} - - - - - {{/each}} \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/assets/css/base/ace/ace-ie.min.css b/src/Surging.ApiGateway/wwwroot/assets/css/base/ace/ace-ie.min.css deleted file mode 100644 index 930e6e9af..000000000 --- a/src/Surging.ApiGateway/wwwroot/assets/css/base/ace/ace-ie.min.css +++ /dev/null @@ -1 +0,0 @@ -.sidebar{*left:0}.sidebar:before{display:none}.ace-nav>li.white-opaque{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#CCFFFFFF',endColorstr='#CCFFFFFF',GradientType=0)}.ace-nav>li.dark-opaque{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#33000000',endColorstr='#33000000',GradientType=0)}.infobox>.infobox-icon>[class*="icon-"]:before{color:#FFF}.infobox-dark>.badge{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#33FFFFFF',endColorstr='#33FFFFFF',GradientType=0)!important}.widget-box-overlay{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#55000000',endColorstr='#55000000',GradientType=0)!important}.widget-toolbar-light{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#D8FFFFFF',endColorstr='#D8FFFFFF',GradientType=0)!important}input[type=checkbox].ace,input[type=radio].ace{position:static;width:auto;height:auto;z-index:auto}input[type=checkbox].ace+.lbl,input[type=radio].ace+.lbl{min-height:auto;min-width:auto}input[type=checkbox].ace.ace-switch{width:auto}input[type=checkbox].ace.ace-switch+.lbl{margin:0;min-height:auto}input[type=checkbox].ace.ace-switch-7{width:auto}.ace-file-input input[type=file]{width:100%;height:30px;position:absolute;z-index:1;filter:alpha(opacity=0);cursor:pointer}.ace-file-input input[type=file]:hover+.file-label{border-color:#f59942}.ace-file-multiple input[type=file]{height:100%}.ace-file-input .remove{z-index:2}.ace-file-input .file-label.selected .file-name{width:50%}.ace-file-multiple .file-label.selected .file-name{width:auto}.wizard-steps li:first-child:before{max-width:100%;left:0}.login-layout .widget-box{display:none;visibility:visible;position:static}.login-layout .widget-box.visible{display:block}.pricing-box-small:hover{zoom:1.04;left:-1px;top:-3px}.ace-thumbnails>li>a>img{width:auto!important}.ace-thumbnails>li>:first-child>.text{display:none}.ace-thumbnails>li:hover>:first-child>.text{display:block}.ace-thumbnails>li>.tools{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#8C000000',endColorstr='#8C000000',GradientType=0)!important}.ace-thumbnails>li>:first-child>.text{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#8C000000',endColorstr='#8C000000',GradientType=0)!important}#cboxLoadingGraphic>[class*="icon-"]{display:inline-block;background:#FFF url('images/loading.gif') no-repeat center}#cboxLoadingGraphic>[class*="icon-"]:before{display:none}.widget-box-overlay>[class*="icon-"]{display:inline-block;width:24px;height:24px;margin-left:46%;background:transparent url('images/loading.gif') no-repeat center}.widget-box-overlay>[class*="icon-"]:before{display:none}.btn.btn-app.btn-light{border:1px solid #d9d9d9}.btn.btn-app.btn-yellow{border:1px solid #fee188}.grid3{width:31%}.grid4{width:23%}.itemdiv.dialogdiv>.body:before{display:none}.fc-event-hori,.fc-event-vert{border:none!important}[class*="tab-color-"] .nav-tabs>li>a>[class*="icon-"]:first-child{color:#666!important}.dropdown-preview>.dropdown-menu{*width:180px}.ui-datepicker,.ui-autocomplete,.ui-menu{border:1px solid #CCC}.ui-widget-overlay{filter:alpha(opacity=100)!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#44000000',endColorstr='#44000000',GradientType=0)!important}.message-content{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#CCFFFFFF',endColorstr='#CCFFFFFF',GradientType=0)!important}.gritter-item-wrapper{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#EA323232',endColorstr='#EA323232',GradientType=0)!important}.gritter-item-wrapper.gritter-info{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#EA315185',endColorstr='#EA315185',GradientType=0)!important}.gritter-item-wrapper.gritter-error{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#EA992812',endColorstr='#EA992812',GradientType=0)!important}.gritter-item-wrapper.gritter-success{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#EA59834B',endColorstr='#EA59834B',GradientType=0)!important}.gritter-item-wrapper.gritter-warning{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#EABE701F',endColorstr='#EABE701F',GradientType=0)!important}.gritter-item-wrapper.gritter-light{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#F2F5F5F5',endColorstr='#F2F5F5F5',GradientType=0)!important}.gritter-info.gritter-light{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#F2E8F2FF',endColorstr='#F2E8F2FF',GradientType=0)!important}.gritter-error.gritter-light{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#F2FFEBEB',endColorstr='#F2FFEBEB',GradientType=0)!important}.gritter-success.gritter-light{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#F2EFFAE3',endColorstr='#F2EFFAE3',GradientType=0)!important}.gritter-warning.gritter-light{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#F2FCF8E3',endColorstr='#F2FCF8E3',GradientType=0)!important}.widget-header .wysiwyg-toolbar .btn-group>.btn,.widget-body .md-header .btn{background:transparent none!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#40FFFFFF',endColorstr='#40FFFFFF',GradientType=0)!important}.widget-header .wysiwyg-toolbar .btn-group>.btn.active,.widget-body .md-header .btn-inverse{background:transparent none!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#40000000',endColorstr='#40000000',GradientType=0)!important}.widget-body .md-header .btn,.widget-body .md-header .btn-inverse{display:none}body.skin-3,.skin-3 .sidebar{background-color:#d6d6d6}.skin-3 .menu-min .nav-list>li.active>a{background-color:#eef8ff}body.skin-2,.skin-2 .sidebar{background-color:#505050}.skin-2 .nav-list>li:hover>a>span{color:#FFF}.skin-2 .nav-list>li:hover>a>[class*="icon-"]:first-child{color:#FFF}.skin-2 .menu-min .nav-list>li>a:hover>[class*="icon-"]:first-child{color:#FFF}.rtl .nav-list li.active>a:after{border-left-color:transparent;border-right-color:#0b6cbc}.rtl.skin-1 .nav-list li.active>a:after{border-right-color:#FFF;border-left-color:transparent}.rtl.skin-1 .menu-min .nav-list li.active:hover>a:after{border-right-color:#242a2b}.rtl.skin-2 .nav-list li.active>a:after{border-right-color:#FFF;border-left-color:transparent}.rtl.skin-2 .menu-min .nav-list li.active:hover>a:after{border-right-color:#292929;border-left-color:transparent}.rtl.skin-2 .nav-list li.active.open>.submenu>li.active>a:after{border-right-color:#FFF;border-left-color:transparent}.rtl.skin-3 .nav-list li.active>a:after{border-right-color:#FFF;border-left-color:transparent}.rtl.skin-3 .nav-list li.active>a:before{border-right-color:#a4c6dd;border-left-color:transparent} \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/assets/css/base/ace/ace-rtl.min.css b/src/Surging.ApiGateway/wwwroot/assets/css/base/ace/ace-rtl.min.css deleted file mode 100644 index 47ed3a3ce..000000000 --- a/src/Surging.ApiGateway/wwwroot/assets/css/base/ace/ace-rtl.min.css +++ /dev/null @@ -1 +0,0 @@ -.rtl [class*="col-xs-"]{float:right}@media(min-width:768px){.rtl [class*="col-sm-"]{float:right}}@media(min-width:992px){.rtl [class*="col-md-"]{float:right}}@media(min-width:1200px){.rtl [class*="col-lg-"]{float:right}}@media(min-width:768px){.rtl [class*="col-sm-push-"]{left:auto}.rtl [class*="col-sm-pull-"]{right:auto}.rtl [class*="col-sm-offset-"]{margin-left:auto}.rtl .col-sm-push-1{right:8.33333%}.rtl .col-sm-push-2{right:16.6666%}.rtl .col-sm-push-3{right:25%}.rtl .col-sm-push-4{right:33.3333%}.rtl .col-sm-push-5{right:41.6666%}.rtl .col-sm-push-6{right:50%}.rtl .col-sm-push-7{right:58.3333%}.rtl .col-sm-push-8{right:66.6666%}.rtl .col-sm-push-9{right:75%}.rtl .col-sm-push-10{right:83.3333%}.rtl .col-sm-push-11{right:91.6666%}.rtl .col-sm-pull-1{left:8.33333%}.rtl .col-sm-pull-2{left:16.6666%}.rtl .col-sm-pull-3{left:25%}.rtl .col-sm-pull-4{left:33.3333%}.rtl .col-sm-pull-5{left:41.6666%}.rtl .col-sm-pull-6{left:50%}.rtl .col-sm-pull-7{left:58.3333%}.rtl .col-sm-pull-8{left:66.6666%}.rtl .col-sm-pull-9{left:75%}.rtl .col-sm-pull-10{left:83.3333%}.rtl .col-sm-pull-11{left:91.6666%}.rtl .col-sm-offset-1{margin-right:8.33333%}.rtl .col-sm-offset-2{margin-right:16.6666%}.rtl .col-sm-offset-3{margin-right:25%}.rtl .col-sm-offset-4{margin-right:33.3333%}.rtl .col-sm-offset-5{margin-right:41.6666%}.rtl .col-sm-offset-6{margin-right:50%}.rtl .col-sm-offset-7{margin-right:58.3333%}.rtl .col-sm-offset-8{margin-right:66.6666%}.rtl .col-sm-offset-9{margin-right:75%}.rtl .col-sm-offset-10{margin-right:83.3333%}.rtl .col-sm-offset-11{margin-right:91.6666%}}@media(min-width:992px){.rtl [class*="col-md-push-"]{left:auto}.rtl [class*="col-md-pull-"]{right:auto}.rtl [class*="col-md-offset-"]{margin-left:auto}.rtl .col-md-push-1{right:8.33333%}.rtl .col-md-push-2{right:16.6666%}.rtl .col-md-push-3{right:25%}.rtl .col-md-push-4{right:33.3333%}.rtl .col-md-push-5{right:41.6666%}.rtl .col-md-push-6{right:50%}.rtl .col-md-push-7{right:58.3333%}.rtl .col-md-push-8{right:66.6666%}.rtl .col-md-push-9{right:75%}.rtl .col-md-push-10{right:83.3333%}.rtl .col-md-push-11{right:91.6666%}.rtl .col-md-pull-1{left:8.33333%}.rtl .col-md-pull-2{left:16.6666%}.rtl .col-md-pull-3{left:25%}.rtl .col-md-pull-4{left:33.3333%}.rtl .col-md-pull-5{left:41.6666%}.rtl .col-md-pull-6{left:50%}.rtl .col-md-pull-7{left:58.3333%}.rtl .col-md-pull-8{left:66.6666%}.rtl .col-md-pull-9{left:75%}.rtl .col-md-pull-10{left:83.3333%}.rtl .col-md-pull-11{left:91.6666%}.rtl .col-md-offset-1{margin-right:8.33333%}.rtl .col-md-offset-2{margin-right:16.6666%}.rtl .col-md-offset-3{margin-right:25%}.rtl .col-md-offset-4{margin-right:33.3333%}.rtl .col-md-offset-5{margin-right:41.6666%}.rtl .col-md-offset-6{margin-right:50%}.rtl .col-md-offset-7{margin-right:58.3333%}.rtl .col-md-offset-8{margin-right:66.6666%}.rtl .col-md-offset-9{margin-right:75%}.rtl .col-md-offset-10{margin-right:83.3333%}.rtl .col-md-offset-11{margin-right:91.6666%}}@media(min-width:1200px){.rtl [class*="col-lg-push-"]{left:auto}.rtl [class*="col-lg-pull-"]{right:auto}.rtl [class*="col-lg-offset-"]{margin-left:auto}.rtl .col-lg-push-1{right:8.33333%}.rtl .col-lg-push-2{right:16.6666%}.rtl .col-lg-push-3{right:25%}.rtl .col-lg-push-4{right:33.3333%}.rtl .col-lg-push-5{right:41.6666%}.rtl .col-lg-push-6{right:50%}.rtl .col-lg-push-7{right:58.3333%}.rtl .col-lg-push-8{right:66.6666%}.rtl .col-lg-push-9{right:75%}.rtl .col-lg-push-10{right:83.3333%}.rtl .col-lg-push-11{right:91.6666%}.rtl .col-lg-pull-1{left:8.33333%}.rtl .col-lg-pull-2{left:16.6666%}.rtl .col-lg-pull-3{left:25%}.rtl .col-lg-pull-4{left:33.3333%}.rtl .col-lg-pull-5{left:41.6666%}.rtl .col-lg-pull-6{left:50%}.rtl .col-lg-pull-7{left:58.3333%}.rtl .col-lg-pull-8{left:66.6666%}.rtl .col-lg-pull-9{left:75%}.rtl .col-lg-pull-10{left:83.3333%}.rtl .col-lg-pull-11{left:91.6666%}.rtl .col-lg-offset-1{margin-right:8.33333%}.rtl .col-lg-offset-2{margin-right:16.6666%}.rtl .col-lg-offset-3{margin-right:25%}.rtl .col-lg-offset-4{margin-right:33.3333%}.rtl .col-lg-offset-5{margin-right:41.6666%}.rtl .col-lg-offset-6{margin-right:50%}.rtl .col-lg-offset-7{margin-right:58.3333%}.rtl .col-lg-offset-8{margin-right:66.6666%}.rtl .col-lg-offset-9{margin-right:75%}.rtl .col-lg-offset-10{margin-right:83.3333%}.rtl .col-lg-offset-11{margin-right:91.6666%}}.rtl ul,.rtl ol{margin-left:0;margin-right:25px}.rtl ul.list-unstyled,.rtl ol.list-unstyled,.rtl ul.list-inline,.rtl ol.list-inline{margin-right:0}.rtl li>ul,.rtl li>ol{margin-left:0;margin-right:18px}.rtl dd{margin-left:0;margin-right:10px}.rtl .dl-horizontal dt{float:right;clear:right;text-align:left}.rtl .dl-horizontal dd{margin-left:0;margin-right:180px}.rtl blockquote p,.rtl blockquote small{text-align:left}.rtl blockquote small:before{content:""}.rtl blockquote small:after{content:"\00A0 \2014"}.rtl blockquote.pull-right p,.rtl blockquote.pull-right small{text-align:right}.rtl blockquote.pull-right small:after{content:""}.rtl blockquote.pull-right small:before{content:"\2014 \00A0"}.rtl .radio,.rtl .checkbox{padding-left:0;padding-right:20px}.rtl .radio input[type="radio"],.rtl .checkbox input[type="checkbox"]{float:right;margin-left:0;margin-right:-20px}.rtl .radio.inline+.radio.inline,.rtl .checkbox.inline+.checkbox.inline{margin-left:0;margin-right:10px}.rtl .help-inline{padding-left:0;padding-right:5px}.rtl .input-group .input-group-addon:first-child{border-left-width:0;border-right:1px solid #ccc}.rtl .input-group .input-group-addon:last-child{border-right-width:0;border-left:1px solid #ccc}.rtl input.search-query{padding-left:14px;padding-left:4px \9;padding-right:14px;padding-right:4px \9}.rtl .form-search .radio,.rtl .form-search .checkbox,.rtl .form-inline .radio,.rtl .form-inline .checkbox{padding-right:0}.rtl .form-search .radio input[type="radio"],.rtl .form-search .checkbox input[type="checkbox"],.rtl .form-inline .radio input[type="radio"],.rtl .form-inline .checkbox input[type="checkbox"]{float:right;margin-right:0;margin-left:3px}.rtl .form-horizontal .control-label{text-align:left}.rtl .btn-group+.btn-group{margin-left:auto;margin-right:5px}.rtl .btn-group>.btn,.rtl .btn-group-vertical>.btn{float:right}.rtl .dropdown-menu{margin:2px 0 0}.rtl .dropdown .caret{margin-left:0;margin-right:2px}.rtl .close{float:left}.rtl .table-header .close{margin-right:auto;margin-left:6px}.rtl .alert .close{float:left}.rtl .nav{margin-right:0}.rtl .nav-tabs>li,.rtl .nav-pills>li{float:right}.rtl .nav-pills>li>a{margin-right:0;margin-left:2px}.rtl .nav-stacked>li{float:none}.rtl .nav-tabs>li>a{margin-right:0;margin-left:-1px}.rtl .tabs-left>.nav-tabs>li,.rtl .tabs-right>.nav-tabs>li{float:none}.rtl .navbar{direction:rtl;text-align:right}.rtl .navbar .navbar-brand{float:right}.rtl .navbar-search{float:right}.rtl .navbar-text{float:right}.rtl ul.pagination{margin-right:0}.rtl .pager{margin-right:0}.rtl .pager .next>a,.rtl .pager .next>span{float:left}.rtl .pager .previous>a,.rtl .pager .previous>span{float:right}.rtl .modal{direction:rtl;text-align:right}.rtl .modal-footer{text-align:left}.rtl .modal-footer .btn+.btn{margin-left:0;margin-right:5px}.rtl .popover.bottom .arrow:after,.rtl .popover.top .arrow:after{margin-right:-10px;margin-left:auto}.rtl .popover-content,.rtl .tooltip-inner{text-align:right;direction:rtl}.rtl .thumbnails{margin-left:0;margin-right:-24px}.rtl .row .thumbnails{margin-right:0}.rtl .thumbnails>li{float:right;margin-left:0;margin-right:24px}.rtl .media-list{margin-right:0}.rtl .main-container{direction:rtl;text-align:right}.rtl .main-content{margin-right:190px;margin-left:0}.rtl li>ul.margin,.rtl li>ol.margin{margin-left:0;margin-right:18px}.rtl .ace-nav>li{float:right!important;border-left:none;border-right:1px solid #DDD}.rtl .ace-nav>li:first-child{border-right:0}.rtl .ace-nav>li>a>.badge{left:auto;right:2px}.rtl .ace-nav>li.no-border{border:0}.rtl .ace-nav>li.margin-4{margin-left:0;margin-right:4px}.rtl .ace-nav>li.margin-3{margin-left:0;margin-right:3px}.rtl .ace-nav>li.margin-2{margin-left:0;margin-right:2px}.rtl .ace-nav>li.margin-1{margin-left:0;margin-right:1px}.rtl .ace-nav .nav-user-photo{margin:-4px 0 0 8px}.rtl .ace-nav .dropdown-menu.dropdown-closer{left:0}.rtl .breadcrumbs{padding:0 0 0 12px}.rtl .breadcrumbs.fixed,.rtl .breadcrumbs.breadcrumbs-fixed{position:fixed;left:0;right:190px}.rtl .breadcrumb{margin:0 12px 0 22px}.rtl .breadcrumb .icon-home{margin-left:2px;margin-right:4px}.rtl .breadcrumb>li+li:before{content:"\f104";padding:0 2px 0 5px}.rtl .breadcrumb>li+li:last-child:before{display:none}.rtl .breadcrumb>li+li:last-child:after{display:inline;font-family:FontAwesome;font-size:14px;content:"\f104";color:#b2b6bf;margin-left:2px;padding:0 2px 0 5px;position:relative;top:1px}.rtl .nav-search{left:22px;right:auto}.rtl .sidebar>.nav-search.menu-min .nav-search .form-search{left:auto;right:5px}.rtl .sidebar{float:right;border-width:0 0 0 1px}.rtl .sidebar:before{border-width:0 0 0 1px}.rtl .sidebar.fixed,.rtl .sidebar.sidebar-fixed{left:auto;right:0}.rtl .sidebar.fixed:before,.rtl .sidebar.sidebar-fixed:before{left:auto;right:0}.rtl .nav-list>li>a{padding:0 7px 0 16px}.rtl .nav-list>li>a:hover:before{left:auto;right:0}.rtl .nav-list>li a>.arrow{left:9px;right:auto}.rtl .nav-list>li.active:after{left:-2px;right:auto;border-width:0 0 0 2px}.rtl .nav-list>li .submenu>li{margin-left:0;margin-right:0}.rtl .nav-list>li .submenu>li>a{padding:7px 37px 8px 0}.rtl .nav-list>li .submenu>li a>[class*="icon-"]:first-child{left:auto;right:10px}.rtl .nav-list>li>.submenu>li:before{left:auto;right:18px}.rtl .nav-list>li>.submenu:before{left:auto;right:18px;border-width:0 1px 0 0}.rtl .nav-list>li.active>.submenu:before{border-right-color:#8eb3d0}.rtl .nav-list li.active>a:after{left:0;right:auto;border-left-color:#2b7dbc;border-right-color:transparent}.rtl .nav-list a .badge,.rtl .nav-list a .label{right:auto;left:11px}.rtl .nav-list a.dropdown-toggle .badge,.rtl .nav-list a.dropdown-toggle .label{right:auto;left:28px}.rtl .menu-min .nav-list a .badge,.rtl .menu-min .nav-list a .label{left:auto;right:4px}.rtl .sidebar.menu-min+.main-content{margin-left:auto;margin-right:43px}.rtl .sidebar.menu-min+.main-content .breadcrumbs.fixed,.rtl .sidebar.menu-min+.main-content .breadcrumbs.breadcrumbs-fixed{left:0;right:43px}.rtl .menu-min .nav-list>li>a>.menu-text{left:auto;right:42px;padding-left:0;padding-right:12px;-webkit-box-shadow:-2px 1px 2px 0 rgba(0,0,0,0.2);box-shadow:-2px 1px 2px 0 rgba(0,0,0,0.2)}.rtl .menu-min .nav-list>li>a.dropdown-toggle>.menu-text{left:auto;right:43px;-webkit-box-shadow:none;box-shadow:none}.rtl .menu-min .nav-list>li.active>a>.menu-text{border-left-color:#ccc;border-right-color:#1963aa}.rtl .menu-min .nav-list>li>.submenu{-webkit-box-shadow:-2px 1px 2px 0 rgba(0,0,0,0.2);box-shadow:-2px 1px 2px 0 rgba(0,0,0,0.2);left:auto;right:42px}.rtl .menu-min .nav-list>li>.submenu li>a{margin-left:auto;margin-right:0;padding-left:0;padding-right:24px}.rtl .menu-min .nav-list>li>.submenu li>a>[class*="icon-"]:first-child{left:auto;right:4px}.rtl .menu-min .nav-list>li.active>.submenu{border-left-color:#ccc;border-right-color:#1963aa}.rtl .menu-min .sidebar-shortcuts-large{-webkit-box-shadow:-2px 1px 2px 0 rgba(0,0,0,0.2);box-shadow:-2px 1px 2px 0 rgba(0,0,0,0.2);left:auto;right:42px}.rtl .nav-list>li>.submenu a>.arrow{left:11px;right:auto}.rtl .nav-list>li>.submenu li>.submenu>li>a>.arrow{left:12px;right:auto}.rtl .nav-list>li>.submenu li>.submenu>li>a{margin-left:auto;padding-left:0;margin-right:20px;padding-right:22px}.rtl .nav-list>li>.submenu li>.submenu>li>.submenu>li>a{margin-left:auto;padding-left:0;margin-right:20px;padding-right:38px}.rtl .menu-min .nav-list>li>.submenu li>.submenu>li>a{margin-right:0;padding-right:30px}.rtl .menu-min .nav-list>li>.submenu li>.submenu>li>.submenu>li>a{margin-right:0;padding-right:45px}.rtl button.btn:active{left:-1px}.rtl .btn.disabled:active,.rtl .btn[disabled]:active{left:0}.rtl .btn>[class*="icon-"]{margin-left:4px;margin-right:0}.rtl .btn>[class*="icon-"].icon-on-right{margin-left:0;margin-right:4px}.rtl .btn>[class*="icon-"].icon-only{margin:0}.rtl .btn-lg>[class*="icon-"]{margin-left:6px;margin-right:0}.rtl .btn-lg>[class*="icon-"].icon-on-right{margin-left:0;margin-right:6px}.rtl .btn-sm>[class*="icon-"]{margin-left:3px;margin-right:0}.rtl .btn-sm>[class*="icon-"].icon-on-right{margin-left:0;margin-right:3px}.rtl .btn-xs>[class*="icon-"],.rtl.btn-minier>[class*="icon-"]{margin-left:2px;margin-right:0}.rtl .btn-xs>[class*="icon-"].icon-on-right,.rtl.btn-minier>[class*="icon-"].icon-on-right{margin-left:0;margin-right:2px}.rtl .btn-group>.btn>.caret{margin-left:0;margin-right:1px}.rtl .dropdown-menu.dropdown-only-icon>li{float:right}.rtl .dropdown-light .dropdown-submenu:hover>a:after,.rtl .dropdown-lighter .dropdown-submenu:hover>a:after{border-left-color:transparent;border-right-color:#444}.rtl .dropdown-navbar>li>[class*="icon-"],.rtl .dropdown-navbar>li>a>[class*="icon-"]{margin-right:0!important;margin-left:5px!important}.rtl .dropdown-navbar [class*="btn"][class*="icon-"]{margin:0 0 0 5px}.rtl .dropdown-navbar .msg-photo{margin-left:6px;margin-right:0}.rtl .dropdown-navbar .user-menu>li>a>[class*="icon-"]{margin-left:6px;margin-right:0}.rtl .help-button{margin-left:0;margin-right:4px}.rtl .form-search .radio [type=radio]+label,.rtl .form-inline .radio [type=radio]+label,.rtl .form-search .checkbox [type=checkbox]+label,.rtl .form-inline .checkbox [type=checkbox]+label{float:right;margin-left:0;margin-right:-20px}.form-search .rtl .form-search .radio [type=radio]+label,.form-search .rtl .form-inline .radio [type=radio]+label,.form-search .rtl .form-search .checkbox [type=checkbox]+label,.form-search .rtl .form-inline .checkbox [type=checkbox]+label,.form-inline .rtl .form-search .radio [type=radio]+label,.form-inline .rtl .form-inline .radio [type=radio]+label,.form-inline .rtl .form-search .checkbox [type=checkbox]+label,.form-inline .rtl .form-inline .checkbox [type=checkbox]+label{margin-right:0;margin-left:3px}.rtl input[type=checkbox].ace+.lbl::before,.rtl input[type=radio].ace+.lbl::before{margin-right:0;margin-left:1px}.rtl input[type=checkbox].ace.ace-switch+.lbl::before,.rtl input[type=radio].ace.ace-switch+.lbl::before{direction:ltr;text-align:left}.rtl .ace-file-input .file-label:before{right:auto;left:0}.rtl .ace-file-input .file-label .file-name{padding-left:0;padding-right:30px}.rtl .ace-file-input .file-label.selected{left:16px;right:0}.rtl .ace-file-input .file-label [class*="icon-"]{right:0;left:auto}.rtl .ace-file-input .remove{left:-8px;right:auto}.rtl .ace-file-multiple .file-label.selected .file-name [class*="icon-"]{right:0;left:auto}.rtl .ace-file-multiple .file-label .file-name{padding:0;text-align:right}.rtl .ace-file-multiple .file-label .file-name img{margin:4px 1px 4px 8px}.rtl .ace-file-multiple .file-label .file-name.large{text-align:center}.rtl .ace-file-multiple .file-label .file-name.large img{margin:0}.rtl .ace-file-multiple .remove{left:-11px;right:auto}.rtl .ace-file-multiple .file-label.selected .file-name [class*="icon-"]{margin-left:4px;margin-right:2px}.rtl .nav-tabs.padding-24{padding-left:0;padding-right:24px}.rtl .nav-tabs.padding-20{padding-left:0;padding-right:20px}.rtl .nav-tabs.padding-16{padding-left:0;padding-right:16px}.rtl .nav-tabs.padding-12{padding-left:0;padding-right:12px}.rtl .nav-tabs.padding-8{padding-left:0;padding-right:8px}.rtl .nav-tabs.padding-4{padding-left:0;padding-right:4px}.rtl .nav-tabs.padding-22{padding-left:0;padding-right:22px}.rtl .nav-tabs.padding-18{padding-left:0;padding-right:18px}.rtl .nav-tabs.padding-14{padding-left:0;padding-right:14px}.rtl .nav-tabs.padding-10{padding-left:0;padding-right:10px}.rtl .nav-tabs.padding-6{padding-left:0;padding-right:6px}.rtl .nav-tabs.padding-2{padding-left:0;padding-right:2px}.rtl .tabs-right>.nav-tabs[class*="padding-"],.rtl .tabs-left>.nav-tabs[class*="padding-"]{padding-right:0}.rtl .tabs-left>.nav-tabs{margin-left:auto;margin-right:-1px}.rtl .tabs-left>.nav-tabs>li>a,.rtl .tabs-left>.nav-tabs>li>a:hover,.rtl .tabs-left>.nav-tabs>li>a:focus{margin:0 -1px 0 0}.rtl .tabs-left>.nav-tabs>li.active>a,.rtl .tabs-left>.nav-tabs>li.active>a:hover,.rtl .tabs-left>.nav-tabs>li.active>a:focus{margin:0 -1px}.rtl .nav-tabs.tab-space-1>li>a{margin-right:auto;margin-left:1px}.rtl .nav-tabs.tab-space-2>li>a{margin-right:auto;margin-left:2px}.rtl .nav-tabs.tab-space-3>li>a{margin-right:auto;margin-left:3px}.rtl .nav-tabs.tab-space-4>li>a{margin-right:auto;margin-left:4px}.rtl .nav-tabs[class*="tab-color-"]>li>a,.rtl .nav-tabs[class*="tab-color-"]>li>a:focus,.rtl .nav-tabs[class*="tab-color-"]>li>a:hover{margin-right:auto;margin-left:3px}.rtl .accordion-style2.panel-group .panel-heading .accordion-toggle{border-width:0 2px 0 0}.rtl .accordion-style2.panel-group .panel-heading .accordion-toggle.collapsed{border-width:0 1px 0 0}.rtl .table thead:first-child tr th [class*="icon-"]:first-child{margin-left:2px;margin-right:0}.rtl .widget-main.no-padding .table-bordered th:first-child,.rtl .widget-main.padding-0 .table-bordered th:first-child,.rtl .widget-main.no-padding .table-bordered td:first-child,.rtl .widget-main.padding-0 .table-bordered td:first-child{border-left-width:1px}.rtl .widget-main.no-padding .table-bordered th:last-child,.rtl .widget-main.padding-0 .table-bordered th:last-child,.rtl .widget-main.no-padding .table-bordered td:last-child,.rtl .widget-main.padding-0 .table-bordered td:last-child{border-left-width:0}.rtl .table-header{padding-left:0;padding-right:12px}.rtl .dataTables_length{margin-left:0;margin-right:8px}.rtl .dataTables_filter{margin-left:8px;margin-right:0;text-align:left}.rtl .dataTables_info{margin:0 12px 0 0}.rtl .dataTables_paginate{text-align:left}.rtl .dataTable th[class*=sort]:after{float:left;margin-right:0;margin-left:4px}.rtl .dataTables_wrapper>.row>[class*="col-"]{float:right;margin-left:0;width:50%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.rtl .widget-box{direction:rtl;text-align:right}.rtl .widget-header{padding-left:0;padding-right:12px}.rtl .widget-header:after{clear:left}.rtl .widget-header-large{padding-left:0;padding-right:18px}.rtl .widget-header-small{padding-left:0;padding-right:10px}.rtl .widget-header>.widget-caption>[class*="icon-"],.rtl .widget-header>:first-child>[class*="icon-"]{margin-right:0;margin-left:5px}.rtl .widget-toolbar{float:left}.rtl .widget-toolbar:before{left:auto;right:-1px;border-width:0 0 0 1px}.rtl .widget-toolbar>[data-action]>[class*="icon-"]{margin-right:auto;margin-left:0}.rtl .widget-box.transparent>.widget-header{padding-left:0;padding-right:3px}.rtl .widget-box.transparent>.widget-header-large{padding-left:0;padding-right:5px}.rtl .widget-box.transparent>.widget-header-small{padding-left:0;padding-right:1px}.rtl [class*="header-color-"]>.widget-toolbar>.nav-tabs>li>a{margin-right:0;margin-left:1px}.rtl .infobox{padding:8px 9px 6px 3px;text-align:right}.rtl .infobox>.infobox-icon>[class*="icon-"]{padding:1px 2px 0 1px}.rtl .infobox>.infobox-data{text-align:right;padding-left:0;padding-right:8px}.rtl .infobox>.stat{left:20px;right:auto;padding-left:18px;padding-right:0}.rtl .infobox>.stat:before{left:4px;right:auto}.rtl .infobox>.stat:after{left:1px;right:auto}.rtl .infobox>.badge{left:20px;right:auto}.rtl .infobox.infobox-dark>.badge{left:2px;right:auto}.rtl .infobox-small{text-align:right}.rtl .infobox-small>.infobox-data{text-align:right}.rtl .infobox-small>.infobox-chart>.sparkline{margin-left:auto;margin-right:2px}.rtl .infobox-small .percentage{margin-left:auto;margin-right:2px}.rtl .pricing-box .widget-header{padding-right:0}.rtl .pricing-table-header{text-align:right}.rtl .pricing-table-header>li{padding:7px 11px 7px 0}.rtl .pricing-box-small{margin-left:0;margin-right:-2px}.rtl .pricing-span[class*="col-"]{float:right!important}.rtl .pricing-span-header{float:right;padding-left:0;padding-right:12px}@media only screen and (max-width:768px){.rtl .pricing-box:nth-child(odd){padding-right:12px!important;padding-left:0!important}.rtl .pricing-box:nth-child(even){padding-left:12px!important;padding-right:0!important}}.rtl .pricing-span{float:right!important}@media only screen and (max-width:460px){.rtl .pricing-box,.rtl .pricing-box:nth-child(odd),.rtl .pricing-box:nth-child(even){padding-left:12px!important;padding-right:12px!important}}.rtl.login-layout .main-content{margin-right:0}.rtl.login-layout .login-box .toolbar>div:first-child{float:right;text-align:right}.rtl.login-layout .login-box .toolbar>div:first-child>a{margin-left:0;margin-right:11px}.rtl.login-layout .login-box .toolbar>div:first-child+div{float:left;text-align:left}.rtl.login-layout .login-box .toolbar>div:first-child+div>a{margin-left:11px;margin-right:0}.rtl .ace-thumbnails{margin-right:0}.rtl .ace-thumbnails>li{float:right}.rtl .ace-thumbnails>li .tags{direction:ltr}.rtl .ace-thumbnails>li .tags>.label-holder{margin:1px 0 0 1px;direction:rtl;text-align:right}.rtl .itemdiv{padding-right:0;padding-left:3px}.rtl .itemdiv>.user{left:auto;right:0}.rtl .itemdiv>.body{margin-right:50px;margin-left:12px}.rtl .itemdiv>.body>.time{right:auto;left:9px}.rtl .itemdiv>.body>.text{padding-left:0;padding-right:7px}.rtl .itemdiv>.body>.text:after{right:16px;left:-12px}.rtl .itemdiv>.body>.text>[class*="icon-quote-"]:first-child{margin-left:4px;margin-right:0}.rtl .itemdiv.dialogdiv:before{left:auto;right:19px}.rtl .itemdiv.dialogdiv>.body{border-left-width:1px;border-right-width:2px;margin-left:1px}.rtl .itemdiv.dialogdiv>.body:before{left:auto;right:-7px;border-width:2px 2px 0 0;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg)}.rtl .itemdiv.dialogdiv>.body>.time{float:left}.rtl .itemdiv.dialogdiv>.body>.text{padding-right:0}.rtl .itemdiv.memberdiv{float:right}.rtl .itemdiv .tools{right:auto;left:4px}.rtl .itemdiv.commentdiv .tools{right:auto;left:9px}.rtl .item-list{margin:0}.rtl .item-list>li{border-left-width:1px;border-right-width:3px;border-left-color:#DDD}.rtl li[class*="item-"]{border-left-width:1px;border-right-width:3px;border-left-color:#DDD}.rtl li.item-orange{border-right-color:#e8b110}.rtl li.item-orange2{border-right-color:#f79263}.rtl li.item-red{border-right-color:#d53f40}.rtl li.item-red2{border-right-color:#d15b47}.rtl li.item-green{border-right-color:#9abc32}.rtl li.item-green2{border-right-color:#0490a6}.rtl li.item-blue{border-right-color:#4f99c6}.rtl li.item-blue2{border-right-color:#3983c2}.rtl li.item-blue3{border-right-color:#1144eb}.rtl li.item-pink{border-right-color:#cb6fd7}.rtl li.item-black{border-right-color:#505050}.rtl li.item-grey{border-right-color:#a0a0a0}.rtl li.item-brown{border-right-color:#a52a2a}.rtl li.item-default{border-right-color:#abbac3}.rtl li.item-purple{border-right-color:#6f3cc4}.rtl .profile-info-name{text-align:left;padding-right:0;padding-left:10px;left:auto;right:0}.rtl .profile-info-value{padding-right:6px;padding-left:4px;margin-left:auto;margin-right:120px}.rtl .profile-info-value>span+span:before{margin-left:3px;margin-right:1px}.rtl .profile-user-info-striped .profile-info-value{padding-left:0;padding-right:12px}.rtl .profile-activity img,.rtl .profile-activity .thumbicon{margin-right:0;margin-left:10px}.rtl .profile-activity .tools{left:12px;right:auto}.rtl .user-profile .user-title-label+.dropdown-menu{margin-left:auto;margin-right:-12px}.rtl .user-status{margin-right:auto;margin-left:1px}.rtl .tab-content.profile-edit-tab-content{-webkit-box-shadow:-1px 1px 0 0 rgba(0,0,0,0.2);box-shadow:-1px 1px 0 0 rgba(0,0,0,0.2)}.rtl .inbox-tabs.nav-tabs>li.active>a.btn-new-mail>.btn:before{left:auto;right:35%;right:calc(50% - 6px)}.rtl .inbox-tabs.nav-tabs.tab-size-bigger>li.active>a.btn-new-mail>.btn:before{left:auto;right:35%;right:calc(50% - 8px)}.rtl .inbox-tabs.nav-tabs>li.pull-left{float:left}@media only screen and (max-width:475px){.rtl .inbox-tabs>.li-new-mail{text-align:left}}.rtl .message-item .sender{margin-left:4px;margin-right:6px}.rtl .message-item .summary{margin-left:auto;margin-right:30px}.rtl .message-item .message-flags{right:auto;left:101%;left:calc(100%+4px)}.rtl .message-item .time{float:left}.rtl .message-item .attachment{float:left}.rtl .message-star{margin-left:4px;margin-right:6px}.rtl .mail-tag:empty{margin-left:1px;margin-right:0}.rtl ul.attachment-list{margin-left:0;margin-right:8px}.rtl .attached-file>[class*="icon-"]{margin-right:auto;margin-left:2px}.rtl .messagebar-item-left,.rtl .messagebar-item-right{text-align:right}.rtl .message-navbar .nav-search{left:auto;right:60px}.rtl .inbox-folders .btn>[class*="icon-"]:first-child{text-align:right}.rtl .inbox-folders .btn.active:before{left:auto;right:-1px;border-left:none;border-right:3px solid #4f99c6}.rtl .inbox-folders .btn .counter{right:auto;left:8px}.rtl .message-form .controls{margin-right:125px}.rtl .timeline-container:before{right:28px;left:auto}.rtl .timeline-item .transparent.widget-box{border-right:3px solid #dae1e5;border-left:none}.rtl .timeline-item .transparent .widget-header>:first-child{margin-left:auto;margin-right:8px}.rtl .timeline-item:nth-child(even) .widget-box.transparent{border-right-color:#dbdbdb!important}.rtl .timeline-item .widget-box{margin-left:auto;margin-right:60px}.rtl .timeline-info{float:right}.rtl .timeline-label{margin-right:34px;margin-left:auto}.rtl .timeline-style2:before{display:none}.rtl .timeline-style2 .timeline-item:before{left:auto;right:90px}.rtl .timeline-style2 .timeline-item .transparent.widget-box{border-right:none!important}.rtl .timeline-style2 .timeline-indicator{left:auto;right:86px}.rtl .timeline-style2 .timeline-date{text-align:left;margin-right:auto;margin-left:25px}.rtl .timeline-style2 .timeline-item .widget-box{margin-left:auto;margin-right:112px}.rtl .timeline-style2 .timeline-label{margin-right:0;text-align:left}.rtl .ace-settings-container{left:0;right:auto}.rtl .btn.ace-settings-btn{float:right;border-radius:0 6px 6px 0!important}.rtl .ace-settings-box{float:right}.rtl .grid2,.rtl .grid3,.rtl .grid4{float:right;border-left:none;border-right:1px solid #e3e3e3}.rtl .grid2:first-child,.rtl .grid3:first-child,.rtl .grid4:first-child{border-right:0}.rtl .easyPieChart canvas{left:auto;right:0}.rtl .external-event>[class*="icon-"]:first-child{margin-right:0;margin-left:5px;border-right:0;border-left:1px solid #FFF}.rtl #cboxCurrent{left:auto;right:64px}.rtl #cboxNext,.rtl #cboxPrevious{margin-left:0;margin-right:5px}.rtl #cboxPrevious{left:auto;right:27px}.rtl #cboxNext{left:auto;right:0}.rtl .ace-spinner .spinner-buttons>button.btn:active{left:auto;top:auto}.rtl .wizard-steps{margin-right:0}.rtl .wizard-actions{text-align:left}.rtl .wizard-steps li:first-child:before{right:50%;left:auto}.rtl .tree{padding-left:0;padding-right:9px}.rtl .tree:before{left:auto;right:0;border-width:0 1px 0 0}.rtl .tree .tree-folder .tree-folder-header .tree-folder-name{margin-left:0;margin-right:2px}.rtl .tree .tree-folder .tree-folder-header>[class*="icon-"]:first-child{margin:-2px -2px 0 0}.rtl .tree .tree-folder:last-child:after{left:auto;right:-15px;border-left:none;border-right:1px solid #FFF}.rtl .tree .tree-folder .tree-folder-content{margin-left:0;margin-right:23px}.rtl .tree .tree-folder .tree-folder-content:before{left:auto;right:-14px;border-width:0 1px 0 0}.rtl .tree .tree-item .tree-item-name{margin-left:0;margin-right:3px}.rtl .tree .tree-item .tree-item-name>[class*="icon-"]:first-child{margin-right:0;margin-left:3px}.rtl .tree .tree-folder:before,.rtl .tree .tree-item:before{left:auto;right:-13px}.rtl .tree .tree-loading{margin-left:0;margin-right:36px}.rtl #gritter-notice-wrapper{text-align:right;direction:rtl;left:20px;right:auto}.rtl .gritter-close{right:auto;left:3px}.rtl .gritter-image{float:right}.rtl .gritter-with-image,.rtl .gritter-without-image{float:left}.rtl .wysiwyg-toolbar .dropdown-menu{text-align:right}.rtl .wysiwyg-toolbar .wysiwyg-choose-file{margin-left:auto}.rtl .wysiwyg-toolbar .btn-group>.btn,.rtl .wysiwyg-toolbar .btn-group>.inline>.btn{float:none}.rtl .wysiwyg-style1 .btn-group:after,.rtl .wysiwyg-style2 .btn-group:after{left:auto;border-left:none;right:-2px;border-right:1px solid #e1e6ea}.rtl .wysiwyg-toolbar .dropdown-menu input[type=text]{margin-left:0;margin-right:8px}.rtl .wysiwyg-toolbar .dropdown-menu .btn{margin-right:1px;margin-left:8px}.rtl .widget-body .md-header{margin-left:0;margin-right:9px}.rtl .widget-body .md-header .btn-inverse{padding-right:0;padding-left:5px}.rtl .select2-container .select2-choice{padding-left:0;padding-right:8px}.rtl .select2-container.select2-allowclear .select2-choice .select2-chosen{margin-right:auto;margin-left:42px}.rtl .select2-container .select2-choice>.select2-chosen{margin-left:26px;margin-right:auto}.rtl .select2-container .select2-choice abbr{right:auto;left:20px}.rtl .select2-container .select2-choice .select2-arrow{right:auto;left:0}.rtl .select2-container .select2-choice .select2-arrow b:before{right:5px;left:auto}.rtl .select2-container-multi .select2-choices li{float:right}.rtl .select2-container-multi .select2-choices .select2-search-choice{margin:3px 5px 3px 0;padding:3px 18px 3px 5px}.rtl .select2-results{margin-right:0}.rtl .select2-drop{direction:rtl;text-align:right}.rtl .select2-drop input{padding-right:5px;padding-left:20px}.rtl .select2-drop .select2-results{padding-right:4px;padding-left:0}.rtl .select2-search:after{right:-20px;left:auto}.rtl .select2-search input.select2-active{background-position:0 0}.rtl .editable-buttons{margin-left:auto;margin-right:1px}.rtl .editable-buttons .btn{margin:0 0 0 1px}.rtl .editable-input .ace-spinner{margin-right:auto;margin-left:8px}.rtl .editable-inline .editable-slider{margin-right:auto;margin-left:4px}.rtl .tags .tag{padding-left:22px;padding-right:9px;text-shadow:-1px 1px 1px rgba(0,0,0,0.15)}.rtl .tags .tag .close{float:none;left:0;right:auto}.rtl .ui-datepicker .ui-datepicker-prev:before{content:"\f061"}.rtl .ui-datepicker .ui-datepicker-next:before{content:"\f060"}.rtl .ui-menu,.rtl .ui-dialog,.rtl .ui-jqdialog{direction:rtl;text-align:right}.rtl .ui-menu .ui-menu-item a .ui-menu-icon{float:left}.rtl .ui-menu .ui-menu-item a .ui-menu-icon:before{content:"\f104"}.rtl .ui-dialog .ui-dialog-titlebar-close,.rtl .ui-jqdialog .ui-jqdialog-titlebar-close{left:8px!important;right:auto!important}.rtl .ui-tabs .ui-tabs-nav li{float:right;margin-right:0;margin-left:.2em}.rtl .ui-tabs .ui-tabs-nav li a{float:right}.rtl .ui-tabs .ui-tabs-nav li.ui-state-default>a{margin-right:auto;margin-left:-1px}.rtl .ui-accordion .ui-accordion-header{padding-right:24px;padding-left:8px}.rtl .ui-accordion .ui-accordion-header .ui-accordion-header-icon{position:absolute;left:auto;right:10px}.rtl .ui-accordion .ui-accordion-header .ui-accordion-header-icon:before{content:"\f0d9"}.rtl .ui-accordion .ui-accordion-header.ui-state-active .ui-accordion-header-icon:before{content:"\f0d7"}.rtl .ui-jqgrid .ui-jqgrid-hdiv{border-width:1px 1px 0 0}.rtl .ui-jqgrid .ui-jqgrid-labels th{border-right:none!important;border-left:1px solid #e1e1e1!important;text-align:right!important}.rtl .ui-jqgrid .ui-jqgrid-labels th:first-child{border-right:1px solid #e1e1e1!important}.rtl .ui-jqgrid-labels th[id*="_cb"]:first-child{text-align:center!important}.rtl .ui-jqgrid-sortable{padding-left:0;padding-right:4px}.rtl .ui-jqdialog-content .searchFilter table{margin-left:auto;margin-right:4px}.rtl .ui-jqdialog-content .searchFilter .add-group,.rtl .ui-jqdialog-content .searchFilter .add-rule,.rtl .ui-jqdialog-content .searchFilter .delete-group{margin-left:auto!important;margin-right:4px!important}.rtl .ui-jqdialog-content .CaptionTD{text-align:left}.rtl .ui-jqdialog .ui-widget-header .ui-jqdialog-title{text-align:right;padding-left:0;padding-right:12px;float:right!important}.rtl .dd{text-align:right;direction:rtl}.rtl .dd-list{text-align:right;direction:rtl;margin-right:0}.rtl .dd-list .dd-list{padding-right:30px;padding-left:0}.rtl .dd2-handle+.dd2-content,.rtl .dd2-handle+.dd2-content[class*="btn-"]{padding-left:0;padding-right:44px}.rtl .dd-item>button{float:right;margin:5px 5px 5px 1px;left:auto;right:1px}.rtl .dd2-item.dd-item>button{margin-left:5px;margin-right:34px}.rtl .dd-dragel>li>.dd-handle{border-right:2px solid #777;border-left-width:0}.rtl .dd-list>li[class*="item-"]{border-left-width:0;border-right-width:0}.rtl .dd-list>li[class*="item-"]>.dd-handle{border-right:2px solid;border-right-color:inherit;border-left-color:#dae2ea;border-left-width:1px}.rtl .dd-list>li>.dd-handle .sticker{right:auto;left:0}.rtl .dd2-handle,.rtl .dd-dragel>li>.dd2-handle{left:auto;right:0;border-width:1px 0 0 1px}.rtl .limiterBox{direction:rtl;text-align:right}.rtl ol.linenums{margin-right:33px}.rtl ol.linenums li{padding-left:0;padding-right:12px}.rtl .prettyprint.linenums{-webkit-box-shadow:-40px 0 0 #fbfbfc inset,-41px 0 0 #ececf0 inset;box-shadow:-40px 0 0 #fbfbfc inset,-41px 0 0 #ececf0 inset}@media only screen and (max-width:767px){.rtl .ace-nav>li:nth-last-child(4)>.dropdown-menu{right:auto;left:-80px}.rtl .ace-nav>li:nth-last-child(4)>.dropdown-menu:before,.rtl .ace-nav>li:nth-last-child(4)>.dropdown-menu:after{right:auto;left:100px}.rtl .ace-nav>li:nth-last-child(3)>.dropdown-menu{right:auto;left:-40px}.rtl .ace-nav>li:nth-last-child(3)>.dropdown-menu:before,.rtl .ace-nav>li:nth-last-child(3)>.dropdown-menu:after{right:auto;left:60px}}@media only screen and (max-width:480px){.rtl .ace-nav>li:nth-last-child(4)>.dropdown-menu{right:auto;left:-120px}.rtl .ace-nav>li:nth-last-child(4)>.dropdown-menu:before,.rtl .ace-nav>li:nth-last-child(4)>.dropdown-menu:after{right:auto;left:140px}.rtl .ace-nav>li:nth-last-child(3)>.dropdown-menu{right:auto;left:-80px}.rtl .ace-nav>li:nth-last-child(3)>.dropdown-menu:before,.rtl .ace-nav>li:nth-last-child(3)>.dropdown-menu:after{right:auto;left:100px}.rtl .ace-nav>li:nth-last-child(2)>.dropdown-menu{right:auto;left:-50px}.rtl .ace-nav>li:nth-last-child(2)>.dropdown-menu:before,.rtl .ace-nav>li:nth-last-child(2)>.dropdown-menu:after{right:auto;left:70px}}@media only screen and (max-width:460px){.rtl .ace-nav>li:nth-last-child(4)>.dropdown-menu{left:auto;right:-5px}.rtl .ace-nav>li:nth-last-child(4)>.dropdown-menu:before,.rtl .ace-nav>li:nth-last-child(4)>.dropdown-menu:after{left:auto;right:25px}.rtl .ace-nav>li:nth-last-child(3)>.dropdown-menu{left:auto;right:-60px}.rtl .ace-nav>li:nth-last-child(3)>.dropdown-menu:before,.rtl .ace-nav>li:nth-last-child(3)>.dropdown-menu:after{left:auto;right:80px}.rtl .ace-nav>li:nth-last-child(2)>.dropdown-menu{left:auto;right:-110px}.rtl .ace-nav>li:nth-last-child(2)>.dropdown-menu:before,.rtl .ace-nav>li:nth-last-child(2)>.dropdown-menu:after{left:auto;right:130px}}@media only screen and (max-width:460px){.rtl .ace-nav>li{text-align:right;float:none!important}.rtl .ace-nav>li:first-child{border-left:none;border-right:1px solid #DDD}.rtl .ace-nav>li:last-child{border-left:1px solid #DDD}}@media(min-width:422px) and (max-width:480px),(max-width:340px){.rtl .ace-nav .nav-user-photo{margin-left:0}.rtl .user-info{margin-left:auto;right:auto;margin-right:1px;left:2px}}@media only screen and (max-width:767px){.rtl .nav-search{right:auto;left:5px}}@media only screen and (max-width:991px){.rtl .navbar-brand{margin-right:0}.rtl .sidebar{left:auto;box-shadow:-2px 1px 2px 0 rgba(0,0,0,0.2);border-left-width:1px;border-right-width:0}.rtl .sidebar.display,.rtl .sidebar.menu-min.display{left:auto;right:0}.rtl .sidebar.menu-min{left:auto;right:-50px}.rtl .main-content{margin-left:auto!important;margin-right:0!important}.rtl .menu-toggler{left:auto;margin-right:auto;right:0;margin-left:2px;padding-left:0;padding-right:33px}.rtl .menu-toggler:before{left:auto;right:4px}.rtl .menu-toggler:after{left:auto;right:4px}.rtl .menu-toggler>.menu-text{left:auto;right:0}.rtl .menu-toggler>.menu-text:after{left:auto;right:-8px}.rtl .breadcrumb{margin-left:auto;margin-right:90px}}@media only screen and (max-width:460px){.rtl .navbar .navbar-brand{display:block;float:none}}@media only screen and (max-width:480px){.rtl .ace-thumbnails>li{float:none}}@media only screen and (max-width:320px){.rtl .breadcrumb{margin-left:0;margin-right:36px}.rtl .menu-toggler>.menu-text:after{left:auto;right:-13px}}@media only screen and (max-width:480px){.rtl .fc-header td{text-align:right}}@media only screen and (max-width:360px){.rtl .grid2,.rtl .grid3,.rtl .grid4{border-right:0}.rtl .grid2>[class*="pull-"],.rtl .grid3>[class*="pull-"],.rtl .grid4>[class*="pull-"]{right:auto;left:11px}}@media only screen and (max-width:767px){.rtl .help-inline,.rtl .input-icon+.help-inline{padding-right:0}}@media only screen and (max-width:480px){.rtl .profile-info-value{margin-left:auto;margin-right:90px}.rtl .profile-user-info-striped .profile-info-name{padding-right:10px;padding-left:0;text-align:right}.rtl .profile-user-info-striped .profile-info-value{margin-left:auto;margin-right:10px}} \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/assets/css/base/ace/ace-skins.min.css b/src/Surging.ApiGateway/wwwroot/assets/css/base/ace/ace-skins.min.css deleted file mode 100644 index 74576e386..000000000 --- a/src/Surging.ApiGateway/wwwroot/assets/css/base/ace/ace-skins.min.css +++ /dev/null @@ -1 +0,0 @@ -.skin-1{background-color:#4a4f56}.skin-1 .navbar{background:#2c6aa0}.skin-1 .sidebar,.skin-1 .sidebar:before{background-color:#222a2d;border-right:0}.skin-1 .nav-list>li{border-color:#3f4e54;border-top-width:0}.skin-1 .nav-list>li>a,.skin-1 .menu-min .nav-list>li.open>a{background-color:#222a2d;color:#b1bac1}.skin-1 .nav-list>li:hover>a{background-color:#414b51;color:#e1eaf1}.skin-1 .nav-list>li>a>.arrow{color:#b1bac1}.skin-1 .nav-list>li.open>a>.arrow{color:#85c0ec}.skin-1 .nav-list>li .submenu>li>a{border-top-color:#afbdc9}.skin-1 .nav-list>li.active .submenu>li>a{border-top-color:#70818e}.skin-1 .nav-list li.active>a:after{border-right-color:#FFF;border-width:16px 10px;top:2px}.skin-1 .nav-list>li.active.open>ul.submenu>li.active>a:after{top:1px}.skin-1 .nav-list>li.active:after{display:none}.skin-1 .menu-min .nav-list>li.active>a:after{border-width:10px 6px;top:8px}.skin-1 .menu-min .nav-list>li.active:hover>a:after{border-right-color:#242a2b}.skin-1 .nav-list>li.open>a,.skin-1 .nav-list>li.open>a:hover{color:#85c0ec;background-color:#222a2d}.skin-1 .nav-list>li.active>a,.skin-1 .nav-list>li.active>a:hover,.skin-1 .menu-min .nav-list>li.active>a,.skin-1 .menu-min .nav-list>li.active>a:hover{background-color:#141a1b;color:#55a0dc}.skin-1 .nav-list>li>ul.submenu{background-color:#3a4344;border-top-color:#5a6364}.skin-1 .nav-list>li.active>ul.submenu{background-color:#141a1b;border-top-color:#2f3e44}.skin-1 .nav-list>li>.submenu>li>a{color:#d1dae1;border-bottom-color:#5a6364}.skin-1 .nav-list>li>.submenu>li:first-child>a{border-top-color:transparent}.skin-1 .nav-list>li>.submenu>li>a:hover{color:#8ab4de}.skin-1 .nav-list>li>.submenu>li.active>a{color:#55a0dc;border-bottom-color:#2f3e44}.skin-1 .nav-list>li>.submenu>li>a>[class*="icon-"]:first-child{display:none}.skin-1 .menu-min .nav-list>li:hover>a{color:#e1eaf1}.skin-1 .menu-min .nav-list>li>a>.menu-text{background-color:#414b51}.skin-1 .menu-min .nav-list>li.active>a>.menu-text{background-color:#242a2b}.skin-1 .menu-min .nav-list>li.active:hover>a,.skin-1 .menu-min .nav-list>li.active>a>.menu-text{color:#55a0dc}.skin-1 .menu-min .nav-list>li>a.active,.skin-1 .menu-min .nav-list>li.open.active>a{background-color:#141a1b}.skin-1 .menu-min .nav-list>li>a>.menu-text,.skin-1 .menu-min .nav-list>li>ul.submenu{border-color:#3f4e54;margin-top:1px;border-left-color:#242a2b}.skin-1 .nav-list>li>.submenu>li:before,.skin-1 .nav-list>li>.submenu:before{border-color:#929ba3}.skin-1 .nav-list>li.active>.submenu>li:before,.skin-1 .nav-list>li.active>.submenu:before{border-color:#3f4e54}.skin-1 .menu-min .nav-list>li>a.dropdown-toggle>.menu-text{border-bottom-color:#5a606a}.skin-1 .sidebar-collapse{background-color:#141a1b;border-color:#3f4e54;border-top-width:1px}.skin-1 .sidebar-collapse:before{border-color:#3f4e54}.skin-1 .sidebar-collapse>[class*="icon-"]{background-color:#222a2d}.skin-1 .sidebar-shortcuts,.skin-1 .sidebar-shortcuts-mini{background-color:#141a1b;border-color:#3f4e54}.skin-1 .sidebar>.nav-search{background-color:#141a1b;border-color:#3f4e54}.skin-1 .menu-min .sidebar-shortcuts-large{background-color:#141a1b;box-shadow:none;border:0;top:0}.skin-1 .breadcrumbs{border:0;background-color:#f0f0f0}@media only screen and (max-width:991px){.skin-1 .sidebar{border:0;box-shadow:none}.skin-1 .nav-list li.active>a:after{display:none}.skin-1 .menu-min .nav-list>li.active.open>a:after{display:none}.skin-1 .menu-min .nav-list>li.active:hover>a:after{display:block}}.skin-1 .nav-list>li>.submenu>li>.submenu a{border-top-color:#7b858c}.skin-1 .nav-list>li.active>.submenu>li>.submenu a{border-top-color:#545b60}.skin-1 .nav-list>li .submenu li>.submenu>li a{color:#d1dae1;font-size:13px}.skin-1 .nav-list>li .submenu li>.submenu>li a>[class*="icon-"]:first-child{color:inherit}.skin-1 .nav-list>li .submenu li>.submenu>li a:hover{color:#8ab4de;text-decoration:none}.skin-1 .nav-list>li .submenu li>.submenu>li a:hover>[class*="icon-"]:first-child{color:#55a0dc}.skin-1 .nav-list>li .submenu li.open>a,.skin-1 .nav-list>li .submenu li>.submenu>li.open>a{color:#85c0ec}.skin-1 .nav-list>li .submenu li.open>a>[class*="icon-"]:first-child,.skin-1 .nav-list>li .submenu li>.submenu>li.open>a>[class*="icon-"]:first-child{color:inherit}.skin-1 .nav-list>li .submenu li>.submenu li.active>a{color:#61a8dd}.skin-1 .nav-list>li .submenu li>.submenu li.active>a>[class*="icon-"]:first-child{color:inherit}.skin-1 .nav-list>li .submenu li>.submenu li.active>a:hover{color:#85c0ec}.skin-1 .nav-list>li .submenu li>a>.arrow{color:#BBB}.skin-1 .nav-list>li>.submenu>li.open>a>.arrow,.skin-1 .nav-list>li>.submenu>li>a:hover>.arrow,.skin-1 .nav-list>li>.submenu>li>.submenu>li.open>a>.arrow,.skin-1 .nav-list>li>.submenu>li>.submenu>li>a:hover>.arrow{color:inherit}.skin-2{background-color:#5c5c5c}.skin-2 .navbar{background:#c6487e}.skin-2 .sidebar,.skin-2 .sidebar:before{background-color:#505050;border-right:0}.skin-2 .nav-list>li{border-color:#444;border-top-width:0}.skin-2 .nav-list>li:last-child{border-bottom-width:0}.skin-2 .nav-list>li>a,.skin-2 .menu-min .nav-list>li.open>a,.skin-2 .nav-list .open>a,.skin-2 .nav-list .open>a:hover,.skin-2 .nav-list .open>a:focus{background-color:#393939}.skin-2 .nav-list>li.active>a{color:#FFF}.skin-2 .nav-list>li>a:hover:before{display:none}.skin-2 .nav-list li.active>a:after{border-right-color:#FFF}.skin-2 .nav-list>li.active>a:after,.skin-2 .nav-list>li.active>.submenu>li.active>a:after{top:2px;right:0;border-width:16px 10px}.skin-2 .menu-min .nav-list>li.active>a:after{border-width:10px 6px;top:8px}.skin-2 .menu-min .nav-list>li.active:hover>a:after{border-right-color:#292929}.skin-2 .nav-list>li.active:after{display:none}.skin-2 .nav-list>li.active.open>.submenu>li.active>a:after{border-right-color:#FFF;right:0}.skin-2 .nav-list>li>.submenu{background-color:#303030;border-top-color:#666}.skin-2 .nav-list>li.active>.submenu{background-color:#222}.skin-2 .nav-list>li>.submenu>li:first-child>a{border-top:0}.skin-2 .nav-list>li>.submenu>li>a{color:#CCC;border-bottom-color:#555}.skin-2 .nav-list>li>.submenu>li>a>[class*="icon-"]:first-child{display:none}.skin-2 .nav-list>li>a>.menu-text{color:#DDD}.skin-2 .nav-list>li>a:hover>.menu-text{color:rgba(0,0,0,0.5);font-weight:bold}.skin-2 .nav-list>li.active>a:hover>.menu-text{color:#FFF}.skin-2 .nav-list>li>a>.arrow{color:#AAA}.skin-2 .nav-list>li>a:hover>.arrow{color:#FFF}.skin-2 .menu-min .nav-list>li>a>.menu-text{color:#FFF;font-weight:bold;opacity:1;filter:alpha(opacity=100);background-color:#292929;border:0;box-shadow:none;text-shadow:1px 1px 0 rgba(0,0,0,0.5);margin-top:2px}.skin-2 .menu-min .nav-list>li>a.dropdown-toggle>.menu-text{margin-top:0;background-color:#292929}.skin-2 .menu-min .nav-list>li>ul.submenu{box-shadow:none;border:0;background-color:#303030;margin-left:1px;margin-top:1px;border-left:1px solid #FFF}.skin-2 .nav-list>li>ul.submenu>li>a:hover{color:#FFF}.skin-2 .nav-list>li>ul.submenu>li:before,.skin-2 .nav-list>li>ul.submenu>li:after{display:none}.skin-2 .nav-list>li>ul.submenu>li>a{padding-left:28px}.skin-2 .nav-list>li>a,.skin-2 .menu-min .nav-list>li>a>.menu-text{color:#CCC}.skin-2 .nav-list>li:nth-child(1)>a,.skin-2 .menu-min .nav-list>li:nth-child(1)>a>.menu-text{color:#00be67}.skin-2 .nav-list>li:nth-child(2)>a,.skin-2 .menu-min .nav-list>li:nth-child(2)>a>.menu-text{color:#5ed02b}.skin-2 .nav-list>li:nth-child(3)>a,.skin-2 .menu-min .nav-list>li:nth-child(3)>a>.menu-text{color:#a7d700}.skin-2 .nav-list>li:nth-child(4)>a,.skin-2 .menu-min .nav-list>li:nth-child(4)>a>.menu-text{color:#cee100}.skin-2 .nav-list>li:nth-child(5)>a,.skin-2 .menu-min .nav-list>li:nth-child(5)>a>.menu-text{color:#f8c600}.skin-2 .nav-list>li:nth-child(6)>a,.skin-2 .menu-min .nav-list>li:nth-child(6)>a>.menu-text{color:#ffab00}.skin-2 .nav-list>li:nth-child(7)>a,.skin-2 .menu-min .nav-list>li:nth-child(7)>a>.menu-text{color:#ff6e00}.skin-2 .nav-list>li:nth-child(8)>a,.skin-2 .menu-min .nav-list>li:nth-child(8)>a>.menu-text{color:#f21c30}.skin-2 .nav-list>li:nth-child(9)>a,.skin-2 .menu-min .nav-list>li:nth-child(9)>a>.menu-text{color:#ee218b}.skin-2 .nav-list>li:nth-child(10)>a,.skin-2 .menu-min .nav-list>li:nth-child(10)>a>.menu-text{color:#c55ee7}.skin-2 .nav-list>li:nth-child(11)>a,.skin-2 .menu-min .nav-list>li:nth-child(11)>a>.menu-text{color:#218bee}.skin-2 .nav-list>li:nth-child(12)>a,.skin-2 .menu-min .nav-list>li:nth-child(12)>a>.menu-text{color:#2ecee7}.skin-2 .menu-min .nav-list>li.active>a>[class*="icon-"],.skin-2 .nav-list>li:not(.active):hover>a>[class*="icon-"]{color:#FFF}.skin-2 .nav-list>li.active>a>.menu-text{color:#FFF}.skin-2 .nav-list>li.active>ul.submenu{background-color:#222}.skin-2 .nav-list>li>ul.submenu:before{display:block;content:"";position:absolute;z-index:auto;left:0;top:0;right:0;bottom:0;background-color:#393939;opacity:.12}.skin-2 .sidebar:not(.menu-min) .nav-list>li:not(.active)>a:hover .badge:not(.badge-transparent),.skin-2 .sidebar:not(.menu-min) .nav-list>li:not(.active)>a:hover .label:not(.label-transparent){background-color:rgba(0,0,0,0.5)!important}.skin-2 .sidebar:not(.menu-min) .nav-list>li:not(.active)>a:hover .badge.badge-transparent,.skin-2 .sidebar:not(.menu-min) .nav-list>li:not(.active)>a:hover .label.label-transparent{color:rgba(255,255,255,0.75)!important}.skin-2 .sidebar:not(.menu-min) .nav-list>li:not(.active)>a:hover .badge.badge-transparent [class*="icon-"],.skin-2 .sidebar:not(.menu-min) .nav-list>li:not(.active)>a:hover .label.label-transparent [class*="icon-"]{color:rgba(255,255,255,0.75)!important}.skin-2 .nav-list>li>a:hover,.skin-2 .menu-min .nav-list>li:hover>a,.skin-2 .menu-min .nav-list>li.active>a{background-color:#c6487e}.skin-2 .nav-list>li>ul.submenu:before{background-color:#35262d}.skin-2 .nav-list>li:nth-child(1)>a:hover,.skin-2 .menu-min .nav-list li:nth-child(1):hover>a,.skin-2 .menu-min .nav-list li.active:nth-child(1)>a,.skin-2 .nav-list>li:nth-child(1)>ul.submenu:before{background-color:#00be67}.skin-2 .nav-list>li:nth-child(2)>a:hover,.skin-2 .menu-min .nav-list li:nth-child(2):hover>a,.skin-2 .menu-min .nav-list li.active:nth-child(2)>a,.skin-2 .nav-list>li:nth-child(2)>ul.submenu:before{background-color:#5ed02b}.skin-2 .nav-list>li:nth-child(3)>a:hover,.skin-2 .menu-min .nav-list li:nth-child(3):hover>a,.skin-2 .menu-min .nav-list li.active:nth-child(3)>a,.skin-2 .nav-list>li:nth-child(3)>ul.submenu:before{background-color:#a7d700}.skin-2 .nav-list>li:nth-child(4)>a:hover,.skin-2 .menu-min .nav-list li:nth-child(4):hover>a,.skin-2 .menu-min .nav-list li.active:nth-child(4)>a,.skin-2 .nav-list>li:nth-child(4)>ul.submenu:before{background-color:#cee100}.skin-2 .nav-list>li:nth-child(5)>a:hover,.skin-2 .menu-min .nav-list li:nth-child(5):hover>a,.skin-2 .menu-min .nav-list li.active:nth-child(5)>a,.skin-2 .nav-list>li:nth-child(5)>ul.submenu:before{background-color:#f8c600}.skin-2 .nav-list>li:nth-child(6)>a:hover,.skin-2 .menu-min .nav-list li:nth-child(6):hover>a,.skin-2 .menu-min .nav-list li.active:nth-child(6)>a,.skin-2 .nav-list>li:nth-child(6)>ul.submenu:before{background-color:#ffab00}.skin-2 .nav-list>li:nth-child(7)>a:hover,.skin-2 .menu-min .nav-list li:nth-child(7):hover>a,.skin-2 .menu-min .nav-list li.active:nth-child(7)>a,.skin-2 .nav-list>li:nth-child(7)>ul.submenu:before{background-color:#ff6e00}.skin-2 .nav-list>li:nth-child(8)>a:hover,.skin-2 .menu-min .nav-list li:nth-child(8):hover>a,.skin-2 .menu-min .nav-list li.active:nth-child(8)>a,.skin-2 .nav-list>li:nth-child(8)>ul.submenu:before{background-color:#f21c30}.skin-2 .nav-list>li:nth-child(9)>a:hover,.skin-2 .menu-min .nav-listli:nth-child(9):hover>a,.skin-2 .menu-min .nav-list li.active:nth-child(9)>a,.skin-2 .nav-list>li:nth-child(9)>ul.submenu:before{background-color:#ee218b}.skin-2 .nav-list>li:nth-child(10)>a:hover,.skin-2 .menu-min .nav-list li:nth-child(10):hover>a,.skin-2 .menu-min .nav-list li.active:nth-child(10)>a,.skin-2 .nav-list>li:nth-child(10)>ul.submenu:before{background-color:#c55ee7}.skin-2 .nav-list>li:nth-child(11)>a:hover,.skin-2 .menu-min .nav-list li:nth-child(11):hover>a,.skin-2 .menu-min .nav-list li.active:nth-child(11)>a,.skin-2 .nav-list>li:nth-child(11)>ul.submenu:before{background-color:#218bee}.skin-2 .nav-list>li:nth-child(12)>a:hover,.skin-2 .menu-min .nav-list li:nth-child(12):hover>a,.skin-2 .menu-min .nav-listli.active:nth-child(12)>a,.skin-2 .nav-list>li:nth-child(12)>ul.submenu:before{background-color:#2ecee7}.skin-2 .nav-list>li>ul.submenu{border-top-style:inset}.skin-2 .menu-min .nav-list>li>ul.submenu{border-top-color:#666!important}.skin-2 .nav-list>li>ul.submenu{border-top-color:#c6487e}.skin-2 .nav-list>li:nth-child(1)>ul.submenu{border-top-color:#00be67}.skin-2 .nav-list>li:nth-child(2)>ul.submenu{border-top-color:#5ed02b}.skin-2 .nav-list>li:nth-child(3)>ul.submenu{border-top-color:#a7d700}.skin-2 .nav-list>li:nth-child(4)>ul.submenu{border-top-color:#cee100}.skin-2 .nav-list>li:nth-child(5)>ul.submenu{border-top-color:#f8c600}.skin-2 .nav-list>li:nth-child(6)>ul.submenu{border-top-color:#ffab00}.skin-2 .nav-list>li:nth-child(7)>ul.submenu{border-top-color:#ff6e00}.skin-2 .nav-list>li:nth-child(8)>ul.submenu{border-top-color:#f21c30}.skin-2 .nav-list>li:nth-child(9)>ul.submenu{border-top-color:#ee218b}.skin-2 .nav-list>li:nth-child(10)>ul.submenu{border-top-color:#c55ee7}.skin-2 .nav-list>li:nth-child(11)>ul.submenu{border-top-color:#218bee}.skin-2 .nav-list>li:nth-child(12)>ul.submenu{border-top-color:#2ecee7}.skin-2 .nav-list>li>ul.submenu li.active>a{color:#c6487e}.skin-2 .nav-list>li:nth-child(1)>ul.submenu li.active>a{color:#00be67}.skin-2 .nav-list>li:nth-child(2)>ul.submenu li.active>a{color:#5ed02b}.skin-2 .nav-list>li:nth-child(3)>ul.submenu li.active>a{color:#a7d700}.skin-2 .nav-list>li:nth-child(4)>ul.submenu li.active>a{color:#cee100}.skin-2 .nav-list>li:nth-child(5)>ul.submenu li.active>a{color:#f8c600}.skin-2 .nav-list>li:nth-child(6)>ul.submenu li.active>a{color:#ffab00}.skin-2 .nav-list>li:nth-child(7)>ul.submenu li.active>a{color:#ff6e00}.skin-2 .nav-list>li:nth-child(8)>ul.submenu li.active>a{color:#f21c30}.skin-2 .nav-list>li:nth-child(9)>ul.submenu li.active>a{color:#ee218b}.skin-2 .nav-list>li:nth-child(10)>ul.submenu li.active>a{color:#c55ee7}.skin-2 .nav-list>li:nth-child(11)>ul.submenu li.active>a{color:#218bee}.skin-2 .nav-list>li:nth-child(12)>ul.submenu li.active>a{color:#2ecee7}.skin-2 .nav-list>li.active>a,.skin-2 .nav-list>li.active>a:hover{background-color:#242424}.skin-2 .sidebar-collapse{background-color:#2c2c2c;border-top:1px solid #666;border-bottom:1px solid #777}.skin-2 .sidebar-collapse:before{border-color:#666}.skin-2 .sidebar-collapse>[class*="icon-"]{background-color:#333}.skin-2 .sidebar-shortcuts{background-color:#393939;border-color:#666;min-height:40px}.skin-2 .sidebar>.nav-search{background-color:#393939;border-color:#666}.skin-2 .sidebar-shortcuts .btn{border-radius:32px!important;border-width:2px;background-color:#555!important}.skin-2 .sidebar-shortcuts .btn:hover{background-color:#222!important}.skin-2 .menu-min .sidebar-shortcuts-large{border:0;box-shadow:none;background-color:#393939;top:0}.skin-2 .sidebar-shortcuts-mini{background-color:#141a1b;border-color:#3f4e54}.skin-2 .sidebar-shortcuts-mini .btn{border-width:2px!important;border-radius:32px!important;padding:6px!important;opacity:1;background-color:inherit}body.skin-2 .main-content{padding-top:8px}.skin-2 .breadcrumbs{border:0;background-color:#e7f2f8;margin:0 8px 0;border-radius:4px}@media only screen and (max-width:991px){.skin-2 .sidebar{border:0;box-shadow:none}.skin-2 .nav-list li.active>a:after{display:none}body.skin-2 .main-content{padding-top:0}.skin-2 .breadcrumbs{margin:0;border-radius:0}.skin-2 .menu-min .nav-list>li.active>a:after{display:none}.skin-2 .menu-min .nav-list>li.active:hover>a:after{display:block}}.skin-2 .nav-list>li .submenu a{background-color:transparent!important}.skin-2 .nav-list>li>.submenu>li>.submenu a{border-top-color:#CCC}.skin-2 .nav-list>li.active>.submenu>li>.submenu a{border-top-color:#999}.skin-2 .nav-list>li>.submenu li>.submenu>li a{color:#d5d5d5}.skin-2 .nav-list>li>.submenu li>.submenu>li a>[class*="icon-"]:first-child{color:#d5d5d5}.skin-2 .nav-list>li>.submenu li>.submenu li.active>a>[class*="icon-"]:first-child{color:inherit}.skin-2 .nav-list>li .submenu a>.arrow{color:#CCC}.skin-2 .nav-list>li>.submenu>li>a:hover>.arrow,.skin-2 .nav-list>li>.submenu>li>.submenu>li>a:hover>.arrow{color:#EEE}.skin-2 .nav-list>li>.submenu>li>.submenu>li>a{margin-left:0;padding-left:38px}.skin-2 .nav-list>li>.submenu>li>.submenu>li>.submenu>li>a{margin-left:0;padding-left:54px}.skin-2 .nav-list>li ul.submenu li.open>a{color:#c6487e}.skin-2 .nav-list>li:nth-child(1) ul.submenu li.open>a{color:#00be67}.skin-2 .nav-list>li:nth-child(2) ul.submenu li.open>a{color:#5ed02b}.skin-2 .nav-list>li:nth-child(3) ul.submenu li.open>a{color:#a7d700}.skin-2 .nav-list>li:nth-child(4) ul.submenu li.open>a{color:#cee100}.skin-2 .nav-list>li:nth-child(5) ul.submenu li.open>a{color:#f8c600}.skin-2 .nav-list>li:nth-child(6) ul.submenu li.open>a{color:#ffab00}.skin-2 .nav-list>li:nth-child(7) ul.submenu li.open>a{color:#ff6e00}.skin-2 .nav-list>li:nth-child(8) ul.submenu li.open>a{color:#f21c30}.skin-2 .nav-list>li:nth-child(9) ul.submenu li.open>a{color:#ee218b}.skin-2 .nav-list>li:nth-child(10) ul.submenu li.open>a{color:#c55ee7}.skin-2 .nav-list>li:nth-child(11) ul.submenu li.open>a{color:#218bee}.skin-2 .nav-list>li:nth-child(12) ul.submenu li.open>a{color:#2ecee7}.skin-2 .nav-list>li ul.submenu li>a:hover{color:#FFF}.skin-2 .nav-list>li>.submenu>li.open>a>[class*="icon-"]:first-child,.skin-2 .nav-list>li>.submenu>li>.submenu>li.open>a>[class*="icon-"]:first-child{color:inherit}.skin-2 .nav-list>li>.submenu>li.open>a>.arrow,.skin-2 .nav-list>li>.submenu>li>.submenu>li.open>a>.arrow{color:inherit}.skin-3{background-color:#BBB}.skin-3 .main-container:after{background:#FFF;background:-moz-linear-gradient(top,#eef5fa 0,#FFF 8%) 0 4px;background:-webkit-gradient(linear,0 0,0 100%,from(#eef5fa),color-stop(4%,#FFF)) 0 4px;background:-webkit-linear-gradient(top,#eef5fa 0,#FFF 8%) 0 4px;background:-o-linear-gradient(top,#eef5fa 0,#FFF 8%) 0 4px;background:-ms-linear-gradient(top,#eef5fa 0,#FFF 8%) 0 4px;background:linear-gradient(top,#eef5fa 0,#FFF 8%) 0 4px;-moz-background-size:100% 26px;-webkit-background-size:100% 26px;-o-background-size:100% 26px;-ms-background-size:100% 26px;background-size:100% 26px}.skin-3 .navbar{background:#393939}.skin-3 .sidebar,.skin-3 .sidebar:before{background-color:#d6d6d6;border-right:1px solid #a4c6dd}.skin-3 .page-content{background-color:transparent}.skin-3 .infobox:not(.infobox-dark){border-style:solid;background-color:transparent}.skin-3 .nav-list>li{border-color:#f2f2f2;border-bottom-width:0;position:relative}.skin-3 .nav-list>li:before{display:inline-block;content:"";position:absolute;z-index:1;left:0;top:0;bottom:0;max-width:0;overflow:hidden;border-left:3px solid #444}.skin-3 .nav-list>li.active:before{border-left-color:#4d96cb}.skin-3 .nav-list>li:first-child{border-top:1px solid #f2f2f2}.skin-3 .nav-list>li:last-child{border-bottom-width:1px}.skin-3 .nav-list>li:hover{border-left-color:#1963aa;border-top-color:#EEE}.skin-3 .nav-list>li:hover+li{border-top-color:#EEE}.skin-3 .nav-list>li:last-child:hover{border-bottom-color:#EEE}.skin-3 .nav-list>li.active{border-left-color:#1a67bd;border-top-color:#a4c6dd!important}.skin-3 .nav-list>li.active+li{border-top-color:#a4c6dd}.skin-3 .nav-list>li.active:last-child{border-bottom-color:#a4c6dd}.skin-3 .nav-list>li>a:hover:before{display:none}.skin-3 .nav-list>li>a{background-color:#e0e0e0;color:#5a5a5a}.skin-3 .nav-list>li:hover>a{background-color:#EEE;color:#1963aa}.skin-3 .nav-list>li>a:focus{color:#1963aa}.skin-3 .nav-list>li.open>a{background-color:#f3f3f3;color:#1963aa}.skin-3 .menu-min .nav-list>li.open>a{background-color:#e0e0e0;color:#5a5a5a}.skin-3 .menu-min .nav-list>li.open>a>.menu-text{color:#1963aa}.skin-3 .menu-min .nav-list>li.active>a>.menu-text{border-left-color:#EEE}.skin-3 .nav-list>li.active>a{background-color:#eef8ff;color:#4d96cb}.skin-3 .nav-list li.active>a:after{border-right-color:#FFF;right:-1px;top:0;z-index:12;border-width:18px 12px}.skin-3 .nav-list li.active>a:before{content:"";display:block;position:absolute;right:0;top:0;z-index:11;left:auto;bottom:auto;width:auto;max-width:auto;background-color:transparent;border-style:solid;border-width:18px 12px;border-color:transparent;border-right-color:#a4c6dd}.skin-3 .nav-list>li.active.open>.submenu li.active>a:before,.skin-3 .nav-list>li.active.open>.submenu li.active>a:after{border-width:14px 10px;top:2px}.skin-3 .nav-list>li.active.open>.submenu .submenu li.active>a:before,.skin-3 .nav-list>li.active.open>.submenu .submenu li.active>a:after{top:0}.skin-3 .nav-list li.active.open>a:after,.skin-3 .nav-list li.active.open>a:before{display:none}.skin-3 .nav-list>li.active:after{display:none}.skin-3 .nav-list li.active.open>.submenu>li.active.open>a.dropdown-toggle:before{display:none}.skin-3 .nav-list li.active>.submenu>li.active>a:before{display:none}.skin-3 .nav-list li.active.open>.submenu>li.active>a:before{display:block}.skin-3 .menu-min .nav-list li.active.open>.submenu>li.active>a:before{display:none}.skin-3 .menu-min .nav-list>li.active>a{background-color:#4d96cb;color:#FFF}.skin-3 .menu-min .nav-list>li.active>a>.menu-text{color:#4d96cb}.skin-3 .menu-min .nav-list li.active>a:after{display:none}.skin-3 .menu-min .nav-list li.active>a:before{display:none}.skin-3 .menu-min .nav-list>li.active>a:after{display:block;border-width:12px 7px;top:5px}.skin-3 .menu-min .sidebar-shortcuts{border-left:none}.skin-3 .sidebar.menu-min>.nav-search{border-left:none}.skin-3 .menu-min .nav-list>li>.submenu,.skin-3 .menu-min .nav-list>li.active>.submenu{border-left-color:#CCC}.skin-3 .nav-list>li>a>.arrow{right:10px}.skin-3 .sidebar-collapse{background-color:#d0d0d0;border-color:#FFF}.skin-3 .sidebar-collapse:before{border-color:#FFF}.skin-3 .sidebar-collapse>[class*="icon-"]{background-color:#FFF;border-color:#999;color:#999}.skin-3 .sidebar-shortcuts{background-color:#e0e0e0;border-bottom:0;border-color:#FFF;min-height:40px;border-left:3px solid #444}.skin-3 .sidebar>.nav-search{background-color:#e0e0e0;border-bottom:0;border-color:#FFF;border-left:3px solid #444}.skin-3 .sidebar-shortcuts-mini{background-color:#e0e0e0}.skin-3 .sidebar-shortcuts-mini>.btn{opacity:1}.skin-3 .menu-min .sidebar-shortcuts-large{background-color:#f5f5f5;top:-1px}body.skin-3 .main-content{padding-top:8px}.skin-3 .breadcrumbs{border:0;border-radius:4px;background-color:#e7f2f8;margin:0 8px 0}.skin-3 .nav-search-input{border-radius:4px}.skin-3 .page-content>.page-header:first-child{border-bottom-color:#c9c9c9}.skin-3 .hr{border-color:#d5d5d5}@media only screen and (max-width:991px){.skin-3 .sidebar,.skin-3 .nav-list>li,.skin-3 .sidebar-shortcuts{border-left:none}.skin-3 .sidebar{border-color:#a4c6dd}body.skin-3 .main-content{padding-top:0}.skin-3 .breadcrumbs{border-radius:0;margin:0}.skin-3 .menu-toggler{background-color:#62a8d1;color:#FFF}.skin-3 .menu-toggler:after,.skin-3 .menu-toggler:before{border-color:#FFF}.skin-3 .menu-toggler>.menu-text{border-top-color:#62a8d1}.skin-3 .menu-toggler>.menu-text:after{color:#FFF}.skin-3 .nav-list li.active>a:before,.skin-3 .nav-list li.active>a:after{display:none}.skin-3 .menu-min .nav-list li.active>a:before,.skin-3 .menu-min .nav-list li.active>a:after{display:none}.skin-3 .nav-list li.active.open>.submenu>li.active>a:before{display:none}.skin-3 .menu-min .nav-list>li.active.open:hover>a:after{display:block!important}}.rtl.skin-1 .sidebar,.rtl.skin-1 .sidebar:before{border-left:none}.rtl.skin-1 .nav-list li.active>a:after{border-right-color:transparent;border-left-color:#FFF}.rtl.skin-1 .menu-min .nav-list>li.active:hover>a:after{border-left-color:#242a2b;border-right-color:transparent}.rtl.skin-1 .menu-min .nav-list>li>a>.menu-text,.rtl.skin-1 .menu-min .nav-list>li>ul.submenu{border-left-color:#3f4e54;border-right-color:#242a2b}.rtl.skin-2 .sidebar,.rtl.skin-2 .sidebar:before{border-left:none}.rtl.skin-2 .nav-list li.active>a:after{border-right-color:transparent;border-left-color:#FFF}.rtl.skin-2 .nav-list>li.active>a:after,.rtl.skin-2 .nav-list>li.active>.submenu>li.active>a:after{right:auto;left:0}.rtl.skin-2 .menu-min .nav-list>li.active:hover>a:after{border-right-color:transparent;border-left-color:#292929}.rtl.skin-2 .nav-list>li.active.open>.submenu>li.active>a:after{border-right-color:transparent;border-left-color:#FFF;right:auto;left:0}.rtl.skin-2 .menu-min .nav-list>li>a>.menu-text{text-shadow:-1px 1px 0 rgba(0,0,0,0.5)}.rtl.skin-2 .menu-min .nav-list>li>ul.submenu{margin-left:auto;margin-right:1px;border-left:none;border-right:1px solid #FFF}.rtl.skin-2 .nav-list>li>ul.submenu>li>a{padding-left:0;padding-right:28px}.rtl.skin-2 .nav-list>li>.submenu>li>.submenu>li>a{margin-left:auto;padding-left:0;margin-right:0;padding-right:38px}.rtl.skin-2 .nav-list>li>.submenu>li>.submenu>li>.submenu>li>a{margin-left:auto;padding-left:0;margin-right:0;padding-right:54px}.rtl.skin-3 .sidebar,.rtl.skin-3 .sidebar:before{border-right:0;border-left:1px solid #a4c6dd}.rtl.skin-3 .nav-list>li:before{left:auto;right:0;border-left:none;border-right:3px solid #444}.rtl.skin-3 .nav-list>li.active:before{border-left:none;border-right-color:#4d96cb}.rtl.skin-3 .nav-list>li:hover{border-left-color:#f2f2f2;border-right-color:#1963aa}.rtl.skin-3 .nav-list>li.active{border-left-color:#f2f2f2;border-right-color:#1a67bd}.rtl.skin-3 .menu-min .nav-list>li.active>a>.menu-text{border-left-color:#CCC;border-right-color:#EEE}.rtl.skin-3 .nav-list li.active>a:after{border-right-color:transparent;border-left-color:#FFF;left:-1px;right:auto}.rtl.skin-3 .nav-list li.active>a:before{right:auto;left:0;border-right-color:transparent;border-left-color:#a4c6dd}.rtl.skin-3 .menu-min .sidebar-shortcuts{border-right:0}.rtl.skin-3 .sidebar.menu-min>.nav-search{border-right:0}.rtl.skin-3 .menu-min .nav-list>li>.submenu,.rtl.skin-3 .menu-min .nav-list>li.active>.submenu{border-right-color:#CCC}.rtl.skin-3 .nav-list>li>a>.arrow{right:auto;left:10px}.rtl.skin-3 .sidebar-shortcuts{border-left:none;border-right:3px solid #444}.rtl.skin-3 .sidebar>.nav-search{border-left:none;border-right:3px solid #444}@media only screen and (max-width:991px){.rtl.skin-3 .sidebar,.rtl.skin-3 .nav-list>li,.rtl.skin-3 .sidebar-shortcuts{border-right:0}} \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/assets/css/base/ace/ace.min.css b/src/Surging.ApiGateway/wwwroot/assets/css/base/ace/ace.min.css deleted file mode 100644 index a685915a8..000000000 --- a/src/Surging.ApiGateway/wwwroot/assets/css/base/ace/ace.min.css +++ /dev/null @@ -1 +0,0 @@ -html{min-height:100%;position:relative}body{padding-bottom:0;background-color:#e4e6e9;min-height:100%;font: 12px/18px "Microsoft Yahei",Tahoma;color:#393939;line-height:1.5}body.navbar-fixed{padding-top:45px}body.breadcrumbs-fixed{padding-top:86px}.main-container{position:static;padding:0}.main-container:after{background-color:#FFF;bottom:0;content:"";display:block;max-width:inherit;position:fixed;top:0;width:100%;z-index:-2}@media(min-width:768px){.container.main-container:after{-webkit-box-shadow:0 0 0 1px rgba(0,0,0,0.1);box-shadow:0 0 0 1px rgba(0,0,0,0.1)}}.main-container>.main-container-inner{position:relative}.container.main-container .sidebar.sidebar-fixed,.container.main-container .sidebar.sidebar-fixed:before{left:auto}.main-content{margin-left:190px;margin-right:0;margin-top:0;min-height:100%;padding:0}.page-content{background:#fff;margin:0;padding:8px 20px 24px}.page-header{margin:0 0 12px;border-bottom:1px dotted #e2e2e2;padding-bottom:16px;padding-top:7px}.page-header h1{padding:0;margin:0 8px;font-size:24px;font-weight:lighter;color:#2679b5}.page-header h1 small{margin:0 6px;font-size:14px;font-weight:normal;color:#8089a0}[class*=" icon-"],[class^="icon-"]{display:inline-block;text-align:center}a:focus,a:active{text-decoration:none}h1{font-size:32px;font-weight:normal;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif}h1.smaller{font-size:31px}h1.bigger{font-size:33px}h1.block{margin-bottom:16px}h2{font-size:26px;font-weight:normal;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif}h2.smaller{font-size:25px}h2.bigger{font-size:27px}h2.block{margin-bottom:16px}h3{font-size:22px;font-weight:normal;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif}h3.smaller{font-size:21px}h3.bigger{font-size:23px}h3.block{margin-bottom:16px}h4{font-size:18px;font-weight:normal;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif}h4.smaller{font-size:17px}h4.bigger{font-size:19px}h4.block{margin-bottom:16px}h5{font-size:15px;font-weight:normal;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif}h5.smaller{font-size:14px}h5.bigger{font-size:16px}h5.block{margin-bottom:16px}h6{font-size:13px;font-weight:normal;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif}h6.smaller{font-size:12px}h6.bigger{font-size:14px}h6.block{margin-bottom:16px}ul,ol{margin:0 0 10px 25px;padding:0}ul.margin-5,ol.margin-5{margin-left:5px}ul.margin-10,ol.margin-10{margin-left:10px}ul.margin-15,ol.margin-15{margin-left:15px}ul.margin-20,ol.margin-20{margin-left:20px}li>ul,li>ol{margin-left:18px}.list-unstyled,.list-inline{margin-left:0}.list-unstyled>li>[class*="icon-"]:first-child,.list-inline>li>[class*="icon-"]:first-child{width:18px;text-align:center}.spaced>li{margin-top:9px;margin-bottom:9px}.spaced2>li{margin-top:15px;margin-bottom:15px}li.divider{margin-top:3px;margin-bottom:3px;height:0;font-size:0}.spaced>li.divider{margin-top:5px;margin-bottom:5px}.spaced2>li.divider{margin-top:8px;margin-bottom:8px}li.divider:before{content:"";display:inline-block}blockquote,blockquote.pull-right{border-color:#e5eaf1}.modal-content{border-radius:0;-webkit-box-shadow:none;box-shadow:none}.modal-footer{padding-top:12px;padding-bottom:14px;border-top-color:#e4e9ee;-webkit-box-shadow:none;box-shadow:none;background-color:#eff3f8}.modal-header .close{font-size:32px}.well{border-radius:0}.well h1,.well h2,.well h3,.well h4,.well h5,.well h6{margin-top:0}.well h1,.well h2,.well h3{line-height:36px}.alert{font-size:14px;border-radius:0}.alert .close{font-size:16px}.alert-block p+p{margin-top:10px}.pagination>li>a,.pager>li>a,.pagination>li>span,.pager>li>span{border-width:1px;border-radius:0!important}.pagination>li>a,.pager>li>a{color:#2283c5;background-color:#fafafa;margin:0 -1px 0 0;border-color:#e0e8eb}.pagination>li>a:hover,.pager>li>a:hover{background-color:#eaeff2}.pagination>li>a:focus,.pager>li>a:focus{background-color:#eaeef2}.pagination>li.disabled>a,.pagination>li.disabled>a:hover,.pager>li.disabled>a,.pager>li.disabled>a:hover{background-color:#f9f9f9;border-color:#d9d9d9}.pagination>li.active>a,.pagination>li.active>a:hover{background-color:#6faed9;border-color:#6faed9;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.list-group-item{border-radius:0!important}.lighter{font-weight:lighter}.bolder{font-weight:bolder}.inline{display:inline-block!important}.block{display:block!important}.center,.align-center{text-align:center!important}.align-left{text-align:left!important}.align-right{text-align:right!important}.middle{vertical-align:middle}.align-middle{vertical-align:middle!important}.align-top{vertical-align:top!important}.align-bottom{vertical-align:bottom!important}.position-relative{position:relative}.position-absolute{position:absolute}.line-height-normal{line-height:normal!important}.line-height-1{line-height:1!important}.dark{color:#333!important}.white{color:#fff!important}.red{color:#dd5a43!important}.light-red{color:#f77!important}.blue{color:#478fca!important}.light-blue{color:#93cbf9!important}.green{color:#69aa46!important}.light-green{color:#b0d877!important}.orange{color:#ff892a!important}.light-orange{color:#fcac6f!important}.orange2{color:#feb902!important}.purple{color:#a069c3!important}.pink{color:#c6699f!important}.pink2{color:#d6487e!important}.brown{color:#a52a2a!important}.grey{color:#777!important}.light-grey{color:#bbb!important}.bigger-110{font-size:110%}.bigger-120{font-size:120%}.bigger-130{font-size:130%}.bigger-140{font-size:140%}.bigger-150{font-size:150%}.bigger-160{font-size:160%}.bigger-170{font-size:170%}.bigger-180{font-size:180%}.bigger-190{font-size:190%}.bigger-200{font-size:200%}.bigger-210{font-size:210%}.bigger-220{font-size:220%}.bigger-230{font-size:230%}.bigger-240{font-size:240%}.bigger-250{font-size:250%}.bigger-260{font-size:260%}.bigger-270{font-size:270%}.bigger-280{font-size:280%}.bigger-290{font-size:290%}.bigger-300{font-size:300%}.bigger-125{font-size:125%}.bigger-175{font-size:175%}.bigger-225{font-size:225%}.bigger-275{font-size:275%}.smaller-90{font-size:90%}.smaller-80{font-size:80%}.smaller-70{font-size:70%}.smaller-60{font-size:60%}.smaller-50{font-size:50%}.smaller-40{font-size:40%}.smaller-30{font-size:30%}.smaller-20{font-size:20%}.smaller-75{font-size:75%}.width-20{width:20%!important}.width-25{width:25%!important}.width-30{width:30%!important}.width-35{width:35%!important}.width-40{width:40%!important}.width-45{width:45%!important}.width-50{width:50%!important}.width-55{width:55%!important}.width-60{width:60%!important}.width-65{width:65%!important}.width-70{width:70%!important}.width-75{width:75%!important}.width-80{width:80%!important}.width-85{width:85%!important}.width-90{width:90%!important}.width-95{width:95%!important}.width-100{width:100%!important}.width-48{width:48%!important}.width-auto{width:auto!important}.height-auto{height:auto!important}.no-padding{padding:0!important}.no-padding-bottom{padding-bottom:0!important}.no-padding-top{padding-top:0!important}.no-padding-left{padding-left:0!important}.no-padding-right{padding-right:0!important}.no-margin{margin:0!important}.no-margin-bottom{margin-bottom:0!important}.no-margin-top{margin-top:0!important}.no-margin-left{margin-left:0!important}.no-margin-right{margin-right:0!important}.no-border{border:0}.no-border-bottom{border-bottom:0}.no-border-top{border-top:0}.no-border-left{border-left:none}.no-border-right{border-right:0}.no-underline{text-decoration:none!important}.no-hover-underline:hover{text-decoration:none!important}.no-shadow,.no-box-shadow{-webkit-box-shadow:none!important;box-shadow:none!important}.no-text-shadow{text-shadow:none!important}.overflow-hidden{overflow:hidden!important}.overflow-auto{overflow:auto!important}.overflow-scroll{overflow:scroll!important}.overflow-visible{overflow:visible!important}.hr{display:block;height:0;overflow:hidden;font-size:0;border-top:1px solid #e3e3e3;margin:12px 0}.hr-double{height:3px;border-top:1px solid #e3e3e3;border-bottom:1px solid #e3e3e3}.hr.dotted,.hr-dotted{border-top-style:dotted}.hr-double.dotted{border-bottom-style:dotted}.hr-32,.hr32{margin:32px 0}.hr-30,.hr30{margin:30px 0}.hr-28,.hr28{margin:28px 0}.hr-26,.hr26{margin:26px 0}.hr-24,.hr24{margin:24px 0}.hr-22,.hr22{margin:22px 0}.hr-20,.hr20{margin:20px 0}.hr-18,.hr18{margin:18px 0}.hr-16,.hr16{margin:16px 0}.hr-14,.hr14{margin:14px 0}.hr-12,.hr12{margin:12px 0}.hr-10,.hr10{margin:10px 0}.hr-8,.hr8{margin:8px 0}.hr-6,.hr6{margin:6px 0}.hr-4,.hr4{margin:4px 0}.hr-2,.hr2{margin:2px 0}.space{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0}.vspace-xs,.vspace-sm,.vspace-md,.vspace-lg{max-height:1px;min-height:1px;overflow:hidden;display:none;margin:12px 0}.space-32{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:32px 0 31px}.vspace-32,.vspace-xs-32,.vspace-sm-32,.vspace-md-32,.vspace-lg-32{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:32px 0 31px 0}.space-30{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:30px 0 29px}.vspace-30,.vspace-xs-30,.vspace-sm-30,.vspace-md-30,.vspace-lg-30{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:30px 0 29px 0}.space-28{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:28px 0 27px}.vspace-28,.vspace-xs-28,.vspace-sm-28,.vspace-md-28,.vspace-lg-28{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:28px 0 27px 0}.space-26{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:26px 0 25px}.vspace-26,.vspace-xs-26,.vspace-sm-26,.vspace-md-26,.vspace-lg-26{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:26px 0 25px 0}.space-24{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:24px 0 23px}.vspace-24,.vspace-xs-24,.vspace-sm-24,.vspace-md-24,.vspace-lg-24{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:24px 0 23px 0}.space-22{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:22px 0 21px}.vspace-22,.vspace-xs-22,.vspace-sm-22,.vspace-md-22,.vspace-lg-22{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:22px 0 21px 0}.space-20{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:20px 0 19px}.vspace-20,.vspace-xs-20,.vspace-sm-20,.vspace-md-20,.vspace-lg-20{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:20px 0 19px 0}.space-18{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:18px 0 17px}.vspace-18,.vspace-xs-18,.vspace-sm-18,.vspace-md-18,.vspace-lg-18{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:18px 0 17px 0}.space-16{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:16px 0 15px}.vspace-16,.vspace-xs-16,.vspace-sm-16,.vspace-md-16,.vspace-lg-16{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:16px 0 15px 0}.space-14{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:14px 0 13px}.vspace-14,.vspace-xs-14,.vspace-sm-14,.vspace-md-14,.vspace-lg-14{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:14px 0 13px 0}.space-12{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:12px 0 11px}.vspace-12,.vspace-xs-12,.vspace-sm-12,.vspace-md-12,.vspace-lg-12{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:12px 0 11px 0}.space-10{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:10px 0 9px}.vspace-10,.vspace-xs-10,.vspace-sm-10,.vspace-md-10,.vspace-lg-10{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:10px 0 9px 0}.space-8{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:8px 0 7px}.vspace-8,.vspace-xs-8,.vspace-sm-8,.vspace-md-8,.vspace-lg-8{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:8px 0 7px 0}.space-6{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:6px 0 5px}.vspace-6,.vspace-xs-6,.vspace-sm-6,.vspace-md-6,.vspace-lg-6{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:6px 0 5px 0}.space-4{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:4px 0 3px}.vspace-4,.vspace-xs-4,.vspace-sm-4,.vspace-md-4,.vspace-lg-4{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:4px 0 3px 0}.space-2{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:2px 0 1px}.vspace-2,.vspace-xs-2,.vspace-sm-2,.vspace-md-2,.vspace-lg-2{max-height:1px;min-height:1px;overflow:hidden;margin:12px 0;margin:2px 0 1px 0}.header{line-height:28px;margin-bottom:16px;margin-top:18px;padding-bottom:4px;border-bottom:1px solid #CCC}.header.blue{border-bottom-color:#d5e3ef}.header.green{border-bottom-color:#cce2c1}.header.purple{border-bottom-color:#e0d1ea}.header.orange{border-bottom-color:#fdd0ac}.header.orange2{border-bottom-color:#fbd36b}.header.red{border-bottom-color:#f3cdc6}.header.grey{border-bottom-color:#c3c3c3}.header.pink{border-bottom-color:#f2e0eb}.header.pink2{border-bottom-color:#e69eb9}.header.light-blue{border-bottom-color:#dceefc}.header.light-red{border-bottom-color:#fec5c5}.header.light-green{border-bottom-color:#d2e7b5}.header.brown{border-bottom-color:#df9393}.header>[class*="icon-"]{margin-right:2px}.no-radius{border-radius:0!important}.action-buttons a{margin:0 3px;display:inline-block;opacity:.85;-webkit-transition:all .1s;transition:all .1s}.action-buttons a:hover{text-decoration:none;-moz-transform:scale(1.2);-webkit-transform:scale(1.2);-o-transform:scale(1.2);-ms-transform:scale(1.2);transform:scale(1.2);opacity:1}.navbar{margin-bottom:0}.navbar{margin-left:0;margin-right:0;border:0;-webkit-box-shadow:none;box-shadow:none;border-radius:0;margin:0;padding-left:0;padding-right:0;min-height:45px;position:relative;background:#438eb9}.navbar>.container{padding-left:0;padding-right:0}.navbar .navbar-text,.navbar .navbar-link{color:#fff}.navbar .navbar-brand{color:#fff;font-size:24px;text-shadow:none;padding-top:10px;padding-bottom:10px}.navbar .navbar-brand:hover,.navbar .navbar-brand:focus{color:#fff}.navbar .navbar-header{margin:0!important}.navbar .navbar-nav>li>a,.navbar .navbar-nav>li>a:hover,.navbar .navbar-nav>li>a:focus{font-size:13px;text-shadow:none;color:#fff}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed}.navbar-container{padding-left:10px;padding-right:20px}.navbar-container.container{padding-left:0;padding-right:0}.ace-nav{height:100%;margin:0!important}.ace-nav>li{line-height:45px;height:45px;border-left:1px solid #DDD;padding:0;position:relative;float:left!important}.ace-nav>li:first-child{border-left:none}.ace-nav>li>a{background-color:#2e6589;color:#FFF;display:block;line-height:inherit;text-align:center;height:100%;width:auto;min-width:50px;padding:0 8px;position:relative}.ace-nav>li>a>[class*="icon-"]{font-size:16px;color:#FFF;display:inline-block;width:20px;text-align:center}.ace-nav>li>a>.badge{position:relative;top:-4px;left:2px;padding-right:5px;padding-left:5px}.ace-nav>li>a:hover,.ace-nav>li>a:focus{background-color:#2c5976}.ace-nav>li.open>a{background-color:#2c5976!important}.ace-nav>li.open>a{color:#FFF!important}.ace-nav>li.grey>a{background-color:#555}.ace-nav>li.grey>a:hover,.ace-nav>li.grey>a:focus{background-color:#4b4b4b}.ace-nav>li.open.grey>a{background-color:#4b4b4b!important}.ace-nav>li.purple>a{background-color:#892e65}.ace-nav>li.purple>a:hover,.ace-nav>li.purple>a:focus{background-color:#762c59}.ace-nav>li.open.purple>a{background-color:#762c59!important}.ace-nav>li.green>a{background-color:#2e8965}.ace-nav>li.green>a:hover,.ace-nav>li.green>a:focus{background-color:#2c7659}.ace-nav>li.open.green>a{background-color:#2c7659!important}.ace-nav>li.light-blue>a{background-color:#62a8d1}.ace-nav>li.light-blue>a:hover,.ace-nav>li.light-blue>a:focus{background-color:#579ec8}.ace-nav>li.open.light-blue>a{background-color:#579ec8!important}.ace-nav>li.light-blue2>a{background-color:#42a8e1}.ace-nav>li.light-blue2>a:hover,.ace-nav>li.light-blue2>a:focus{background-color:#359fd9}.ace-nav>li.open.light-blue2>a{background-color:#359fd9!important}.ace-nav>li.red>a{background-color:#b74635}.ace-nav>li.red>a:hover,.ace-nav>li.red>a:focus{background-color:#a34335}.ace-nav>li.open.red>a{background-color:#a34335!important}.ace-nav>li.light-green>a{background-color:#9abc32}.ace-nav>li.light-green>a:hover,.ace-nav>li.light-green>a:focus{background-color:#8ba832}.ace-nav>li.open.light-green>a{background-color:#8ba832!important}.ace-nav>li.light-purple>a{background-color:#cb6fd7}.ace-nav>li.light-purple>a:hover,.ace-nav>li.light-purple>a:focus{background-color:#c263ce}.ace-nav>li.open.light-purple>a{background-color:#c263ce!important}.ace-nav>li.light-orange>a{background-color:#f79263}.ace-nav>li.light-orange>a:hover,.ace-nav>li.light-orange>a:focus{background-color:#f28653}.ace-nav>li.open.light-orange>a{background-color:#f28653!important}.ace-nav>li.light-pink>a{background-color:#f4dae5}.ace-nav>li.light-pink>a:hover,.ace-nav>li.light-pink>a:focus{background-color:#eeccda}.ace-nav>li.open.light-pink>a{background-color:#eeccda!important}.ace-nav>li.dark>a{background-color:#404040}.ace-nav>li.dark>a:hover,.ace-nav>li.dark>a:focus{background-color:#363636}.ace-nav>li.open.dark>a{background-color:#363636!important}.ace-nav>li.white-opaque>a{background-color:rgba(255,255,255,0.8)}.ace-nav>li.white-opaque>a:hover,.ace-nav>li.white-opaque>a:focus{background-color:rgba(245,245,245,0.8)}.ace-nav>li.open.white-opaque>a{background-color:rgba(245,245,245,0.8)!important}.ace-nav>li.dark-opaque>a{background-color:rgba(0,0,0,0.2)}.ace-nav>li.dark-opaque>a:hover,.ace-nav>li.dark-opaque>a:focus{background-color:rgba(0,0,0,0.2)}.ace-nav>li.open.dark-opaque>a{background-color:rgba(0,0,0,0.2)!important}.ace-nav>li.margin-4{margin-left:4px}.ace-nav>li.margin-3{margin-left:3px}.ace-nav>li.margin-2{margin-left:2px}.ace-nav>li.margin-1{margin-left:1px}.ace-nav>li.no-border{border:none!important}.ace-nav>li .dropdown-menu{z-index:1031}.ace-nav .nav-user-photo{margin:-4px 8px 0 0;border-radius:100%;border:2px solid #FFF;max-width:40px}.ace-nav li:last-child a [class^="icon-"]{display:inline-block;width:1.25em;text-align:center}@media only screen and (max-width:767px){.navbar-container{padding-left:0;padding-right:0}}@media only screen and (max-width:767px){.ace-nav>li:nth-last-child(4)>.dropdown-menu.pull-right{right:-80px}.ace-nav>li:nth-last-child(4)>.dropdown-menu.pull-right:before,.ace-nav>li:nth-last-child(4)>.dropdown-menu.pull-right:after{right:100px}.ace-nav>li:nth-last-child(3)>.dropdown-menu.pull-right{right:-40px}.ace-nav>li:nth-last-child(3)>.dropdown-menu.pull-right:before,.ace-nav>li:nth-last-child(3)>.dropdown-menu.pull-right:after{right:60px}.user-menu.dropdown-close.pull-right{right:0!important}}@media only screen and (max-width:480px){.ace-nav>li:nth-last-child(4)>.dropdown-menu.pull-right{right:-120px}.ace-nav>li:nth-last-child(4)>.dropdown-menu.pull-right:before,.ace-nav>li:nth-last-child(4)>.dropdown-menu.pull-right:after{right:140px}.ace-nav>li:nth-last-child(3)>.dropdown-menu.pull-right{right:-80px}.ace-nav>li:nth-last-child(3)>.dropdown-menu.pull-right:before,.ace-nav>li:nth-last-child(3)>.dropdown-menu.pull-right:after{right:100px}.ace-nav>li:nth-last-child(2)>.dropdown-menu.pull-right{right:-50px}.ace-nav>li:nth-last-child(2)>.dropdown-menu.pull-right:before,.ace-nav>li:nth-last-child(2)>.dropdown-menu.pull-right:after{right:70px}}@media only screen and (max-width:460px){.ace-nav>li:nth-last-child(4)>.dropdown-menu.pull-right{left:-5px;right:auto}.ace-nav>li:nth-last-child(4)>.dropdown-menu.pull-right:before,.ace-nav>li:nth-last-child(4)>.dropdown-menu.pull-right:after{right:auto;left:25px}.ace-nav>li:nth-last-child(3)>.dropdown-menu.pull-right{left:-60px;right:auto}.ace-nav>li:nth-last-child(3)>.dropdown-menu.pull-right:before,.ace-nav>li:nth-last-child(3)>.dropdown-menu.pull-right:after{left:80px;right:auto}.ace-nav>li:nth-last-child(2)>.dropdown-menu.pull-right{left:-110px;right:auto}.ace-nav>li:nth-last-child(2)>.dropdown-menu.pull-right:before,.ace-nav>li:nth-last-child(2)>.dropdown-menu.pull-right:after{left:130px;right:auto}}@media only screen and (max-width:460px){.navbar .navbar-header.pull-left{display:block;float:none!important}.navbar .navbar-header.pull-right{display:block;float:none!important}.ace-nav{display:block;float:none!important;text-align:center;background-color:#404040;border:1px solid #DDD;border-width:1px 0;letter-spacing:-3px}.ace-nav>li{display:inline-block;float:none!important;text-align:left;letter-spacing:normal}.ace-nav>li:first-child{border-left:1px solid #DDD}.ace-nav>li:last-child{border-right:1px solid #DDD}}@media only screen and (max-width:320px){.ace-nav>li>a{padding:0 5px!important}}.user-menu>li>a{padding:4px 12px}.user-menu>li>a>[class*="icon-"]{margin-right:6px;font-size:120%}.user-info{max-width:100px;display:inline-block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;text-align:left;vertical-align:top;line-height:15px;position:relative;top:6px}.user-info small{display:block}@media(min-width:461px) and (max-width:480px),(max-width:360px){.user-menu{padding-top:42px!important}.ace-nav .nav-user-photo{margin-right:0}.user-info{position:absolute!important;margin-top:40px;margin-left:1px;right:2px;z-index:1032;color:#777;font-size:14px;width:156px;max-width:156px;padding-left:8px;padding-right:8px;height:32px;line-height:26px!important;display:none;border-bottom:1px solid #e5e5e5;text-align:center;vertical-align:none;line-height:normal}.user-info>small{display:inline;opacity:1}li.open .user-info{display:inline-block}}.breadcrumbs{position:relative;border-bottom:1px solid #e5e5e5;background-color:#f5f5f5;min-height:41px;line-height:40px;padding:0 12px 0 0;display:block}.breadcrumbs.fixed,.breadcrumbs.breadcrumbs-fixed{position:fixed;right:0;left:190px;top:45px;z-index:1028}.breadcrumb{background-color:transparent;display:inline-block;line-height:24px;margin:0 22px 0 12px;padding:0;font-size:13px;color:#333;border-radius:0}.breadcrumb>li,.breadcrumb>li.active{color:#555}.breadcrumb>li>a{display:inline-block;padding:0 4px;color:#4c8fbd}.breadcrumb>li+li:before{font-family:FontAwesome;font-size:14px;content:"\f105";color:#b2b6bf;margin-right:2px;padding:0 5px 0 2px;position:relative;top:1px}.breadcrumb .home-icon{margin-left:4px;margin-right:2px;font-size:20px;position:relative;top:2px}@media only screen and (max-width:991px){.breadcrumb{margin-left:90px}.breadcrumbs.fixed,.breadcrumbs.breadcrumbs-fixed{position:relative!important;left:auto!important;right:auto!important;top:auto!important;z-index:auto!important}body.breadcrumbs-fixed .ace-settings-container{top:50px}}@media only screen and (max-width:480px){.breadcrumb>li>a{padding:0 1px}}@media only screen and (max-width:320px){.breadcrumb{margin-left:36px}}.container.main-container .breadcrumbs.breadcrumbs-fixed{left:auto!important;right:auto!important}@media(min-width:768px){.container.main-container .breadcrumbs.breadcrumbs-fixed{width:554px}.container.main-container .menu-min+.main-content .breadcrumbs.breadcrumbs-fixed{width:701px}}@media(min-width:992px){.container.main-container .breadcrumbs.breadcrumbs-fixed{width:774px}.container.main-container .menu-min+.main-content .breadcrumbs.breadcrumbs-fixed{width:921px}}@media(min-width:1200px){.container.main-container .breadcrumbs.breadcrumbs-fixed{width:974px}.container.main-container .menu-min+.main-content .breadcrumbs.breadcrumbs-fixed{width:1121px}}.nav-search{position:absolute;top:6px;right:22px;line-height:24px}.nav-search .form-search{margin-bottom:0}.nav-search .nav-search-input{border:1px solid #6fb3e0;width:152px;height:28px!important;border-radius:4px!important;font-size:13px;color:#666!important;z-index:11;-webkit-transition:width ease .15s;transition:width ease .15s}.nav-search .nav-search-input+.dropdown-menu{min-width:0;left:0;right:0}.nav-search .nav-search-input:focus,.nav-search .nav-search-input:hover{border-color:#6fb3e0}.nav-search .nav-search-icon{color:#6fb3e0!important;font-size:14px!important;line-height:24px!important}.nav-search.minimized .nav-search-input{width:0;opacity:0;filter:alpha(opacity=0);max-width:0}.nav-search.minimized:hover .nav-search-input,.nav-search.minimized .nav-search-btn:active+.nav-search-input,.nav-search.minimized .nav-search-input:focus,.nav-search.minimized .nav-search-input:hover,.nav-search.minimized .nav-search-input:active{opacity:1;filter:alpha(opacity=100);width:152px;max-width:152px}.nav-search.minimized .nav-search-icon{border:1px solid;border-radius:100%;background-color:#FFF;padding:0 5px!important}.nav-search.minimized:hover .nav-search-icon,.nav-search.minimized .nav-search-input:focus ~ .nav-search-icon,.nav-search.minimized .nav-search-input:hover ~ .nav-search-icon,.nav-search.minimized .nav-search-input:active ~ .nav-search-icon{border:0;border-radius:0;padding:0 3px!important}.nav-search-icon{border:0;border-radius:0;padding:0 3px!important}.sidebar>.nav-search{position:static;background-color:#fafafa;border-bottom:1px solid #DDD;text-align:center;height:35px;padding-top:6px}.sidebar>.nav-search .nav-search-input{width:162px!important;border-radius:0!important;max-width:162px!important;opacity:1!important;filter:alpha(opacity=100)!important}.sidebar>.nav-search .nav-search-input+.dropdown-menu{text-align:left}.sidebar.menu-min .nav-search .form-search{position:absolute;left:5px;z-index:14}.sidebar.menu-min .nav-search .nav-search-input{width:0!important;max-width:0!important;opacity:0!important;filter:alpha(opacity=0)!important}.sidebar.menu-min .nav-search .nav-search-input:hover,.sidebar.menu-min .nav-search .nav-search-input:focus,.sidebar.menu-min .nav-search .nav-search-input:active{width:162px!important;max-width:162px!important;opacity:1!important;filter:alpha(opacity=100)!important}.sidebar.menu-min .nav-search .nav-search-input:hover ~ #nav-search-icon,.sidebar.menu-min .nav-search .nav-search-input:focus ~ #nav-search-icon,.sidebar.menu-min .nav-search .nav-search-input:active ~ #nav-search-icon{border:0;border-radius:0;padding:0 3px!important}.sidebar.menu-min .nav-search:hover .nav-search-input{width:162px!important;max-width:162px!important;opacity:1!important;filter:alpha(opacity=100)!important}.sidebar.menu-min .nav-search:hover .nav-search-input ~ .nav-search-icon{border:0;border-radius:0;padding:0 3px!important}.sidebar.menu-min .nav-search .nav-search-icon{border:1px solid;border-radius:32px;background-color:#FFF;padding:0 5px!important}@media only screen and (max-width:767px){.nav-search{right:5px}.nav-search .nav-search-input{width:105px}.nav-search:hover .nav-search-input,.nav-search .nav-search-btn:active+.nav-search-input,.nav-search .nav-search-input:focus,.nav-search .nav-search-input:hover,.nav-search .nav-search-input:active{width:145px}}@media only screen and (max-width:480px){.nav-search .nav-search-input{width:0;opacity:0;filter:alpha(opacity=0);max-width:0}.nav-search:hover .nav-search-input,.nav-search .nav-search-btn:active+.nav-search-input,.nav-search .nav-search-input:focus,.nav-search .nav-search-input:hover,.nav-search .nav-search-input:active{opacity:1;filter:alpha(opacity=100);width:152px;max-width:152px}.nav-search .nav-search-icon{border:1px solid;border-radius:100%;background-color:#FFF;padding:0 5px!important}.nav-search:hover .nav-search-icon,.nav-search .nav-search-input:focus ~ .nav-search-icon,.nav-search .nav-search-input:hover ~ .nav-search-icon,.nav-search .nav-search-input:active ~ .nav-search-icon{border:0;border-radius:0;padding:0 3px!important}}.sidebar{width:190px;float:left;position:relative;border:1px solid #ccc;border-width:0 1px 0 0;background-color:#f2f2f2}.sidebar:before{content:"";display:block;width:190px;position:fixed;bottom:0;top:0;z-index:-1;background-color:#f2f2f2;border:1px solid #ccc;border-width:0 1px 0 0}.sidebar.fixed,.sidebar.sidebar-fixed{position:fixed;z-index:1029;top:45px;left:0}.sidebar.fixed:before,.sidebar.sidebar-fixed:before{left:0;right:auto}li [class^="icon-"],li [class*=" icon-"],.nav-list li [class^="icon-"],.nav-list li [class*=" icon-"]{width:auto}.nav-list{margin:0;padding:0;list-style:none}.nav-list .open>a,.nav-list .open>a:hover,.nav-list .open>a:focus{background-color:#fafafa}.nav-list>li>a,.nav-list .nav-header{margin:0}.nav-list>li{display:block;padding:0;margin:0;border:0;border-top:1px solid #fcfcfc;border-bottom:1px solid #e5e5e5;position:relative}.nav-list>li:first-child{border-top:0}.nav-list li>a:focus{outline:0}.nav-list>li>a{display:block;height:38px;line-height:36px;padding:0 16px 0 7px;background-color:#f9f9f9;color:#585858;text-shadow:none!important;font-size:13px;text-decoration:none}.nav-list>li>a>[class*="icon-"]:first-child{display:inline-block;vertical-align:middle;min-width:30px;text-align:center;font-size:18px;font-weight:normal;margin-right:2px}.nav-list>li>a:focus{background-color:#f9f9f9;color:#1963aa}.nav-list>li>a:hover{background-color:#FFF;color:#1963aa}.nav-list>li>a:hover:before{display:block;content:"";position:absolute;top:-1px;bottom:0;left:0;width:3px;max-width:3px;overflow:hidden;background-color:#3382af}.nav-list>li a>.arrow{display:inline-block;width:14px!important;height:14px;line-height:14px;text-shadow:none;font-size:18px;position:absolute;right:11px;top:11px;padding:0;color:#666}.nav-list>li a:hover>.arrow,.nav-list>li.active>a>.arrow,.nav-list>li.open>a>.arrow{color:#1963aa}.nav-list>li.separator{height:3px;background-color:transparent;position:static;margin:1px 0;-webkit-box-shadow:none;box-shadow:none}.nav-list>li.open>a{background-color:#fafafa;color:#1963aa}.nav-list>li.active{background-color:#fff}.nav-list>li.active>a,.nav-list>li.active>a:hover,.nav-list>li.active>a:focus,.nav-list>li.active>a:active{background-color:#fff;color:#2b7dbc;font-weight:bold;font-size:13px}.nav-list>li.active>a>[class*="icon-"]{font-weight:normal}.nav-list>li.active>a:hover:before{display:none}.nav-list>li.active:after{display:inline-block;content:"";position:absolute;right:-2px;top:-1px;bottom:0;z-index:1;border:2px solid #2b7dbc;border-width:0 2px 0 0}.nav-list>li.open{border-bottom-color:#e5e5e5}.nav-list>li.active .submenu{display:block}.nav-list>li .submenu{display:none;list-style:none;margin:0;padding:0;position:relative;background-color:#fff;border-top:1px solid #e5e5e5}.nav-list>li .submenu>li{margin-left:0;position:relative}.nav-list>li .submenu>li>a{display:block;position:relative;color:#616161;padding:7px 0 9px 37px;margin:0;border-top:1px dotted #e4e4e4}.nav-list>li .submenu>li>a:focus{text-decoration:none}.nav-list>li .submenu>li>a:hover{text-decoration:none;color:#4b88b7}.nav-list>li .submenu>li.active>a{color:#2b7dbc}.nav-list>li .submenu>li a>[class*="icon-"]:first-child{display:none;font-size:12px;font-weight:normal;width:18px;height:auto;line-height:12px;text-align:center;position:absolute;left:10px;top:11px;z-index:1;background-color:#FFF}.nav-list>li .submenu>li.active>a>[class*="icon-"]:first-child,.nav-list>li .submenu>li:hover>a>[class*="icon-"]:first-child{display:inline-block}.nav-list>li .submenu>li.active>a>[class*="icon-"]:first-child{color:#c86139}.nav-list>li>.submenu>li:before{content:"";display:inline-block;position:absolute;width:7px;left:20px;top:17px;border-top:1px dotted #9dbdd6}.nav-list>li>.submenu>li:first-child>a{border-top:1px solid #fafafa}.nav-list>li>.submenu:before{content:"";display:block;position:absolute;z-index:1;left:18px;top:0;bottom:0;border:1px dotted #9dbdd6;border-width:0 0 0 1px}.nav-list>li.active>.submenu>li:before{border-top-color:#8eb3d0}.nav-list>li.active>.submenu:before{border-left-color:#8eb3d0}.nav-list li .submenu{overflow:hidden}.nav-list li.active>a:after{display:block;content:"";position:absolute!important;right:0;top:4px;border:8px solid transparent;border-width:14px 10px;border-right-color:#2b7dbc}.nav-list li.open>a:after{display:none}.nav-list li.active.open>.submenu>li.active.open>a.dropdown-toggle:after{display:none}.nav-list li.active>.submenu>li.active>a:after{display:none}.nav-list li.active.open>.submenu>li.active>a:after{display:block}.nav-list li.active.no-active-child>a:after{display:inline-block!important}.nav-list a .badge,.nav-list a .label{font-size:12px;padding-left:6px;padding-right:6px;position:absolute;top:9px;right:11px;opacity:.88}.nav-list a .badge [class*="icon-"],.nav-list a .label [class*="icon-"]{vertical-align:middle;margin:0}.nav-list a.dropdown-toggle .badge,.nav-list a.dropdown-toggle .label{right:28px}.nav-list a:hover .badge,.nav-list a:hover .label{opacity:1}.nav-list .submenu .submenu a .badge,.nav-list .submenu .submenu a .label{top:6px}.sidebar-collapse{border-bottom:1px solid #e0e0e0;background-color:#f3f3f3;text-align:center;padding:3px 0;position:relative}.sidebar-collapse>[class*="icon-"]{display:inline-block;cursor:pointer;font-size:14px;color:#aaa;border:1px solid #bbb;padding:0 5px;line-height:18px;border-radius:16px;background-color:#fff;position:relative}.sidebar-collapse:before{content:"";display:inline-block;height:0;border-top:1px solid #e0e0e0;position:absolute;left:15px;right:15px;top:13px}.sidebar-shortcuts{background-color:#fafafa;border-bottom:1px solid #ddd;text-align:center;line-height:39px;max-height:41px;margin-bottom:0}.sidebar-shortcuts-large{padding-bottom:4px}.sidebar-shortcuts-large>.btn{width:41px;line-height:24px;margin-top:-2px;padding:0;border-width:4px;text-align:center}.sidebar-shortcuts-large>.btn>[class*="icon-"]{margin:0}.sidebar-shortcuts-mini{display:none;font-size:0;width:42px;line-height:18px;padding-top:2px;padding-bottom:2px;background-color:#fff}.sidebar-shortcuts-mini>.btn{border-width:0!important;font-size:0;line-height:0;padding:8px!important;margin:0 1px;border-radius:0!important;opacity:.85;filter:alpha(opacity=85)}@media screen and (-webkit-min-device-pixel-ratio:0){::safari-only,.sidebar-shortcuts-mini>.btn{margin:0}}.nav-list>li>.submenu li>.submenu{border-top:0;background-color:transparent;display:none}.nav-list>li>.submenu li.active>.submenu{display:block}.nav-list>li>.submenu a>.arrow{right:11px;top:10px;font-size:16px;color:#6b828e}.nav-list>li>.submenu .open>a,.nav-list>li>.submenu .open>a:hover,.nav-list>li>.submenu .open>a:focus{background-color:transparent;border-color:#e4e4e4}.nav-list>li>.submenu li>.submenu>li>a>.arrow{right:12px;top:9px}.nav-list>li>.submenu li>.submenu>li{line-height:16px}.nav-list>li>.submenu li>.submenu>li:before{display:none}.nav-list>li>.submenu li>.submenu>li>a{margin-left:20px;padding-left:22px}.nav-list>li>.submenu li>.submenu>li>.submenu>li>a{margin-left:20px;padding-left:38px}.nav-list>li>.submenu li>.submenu>li a>[class*="icon-"]:first-child{display:inline-block;color:inherit;font-size:14px;position:static;background-color:transparent;margin-right:1px}.nav-list>li>.submenu li>.submenu>li a{font-size:13px;color:#777}.nav-list>li>.submenu li>.submenu>li a:hover{color:#316292;text-decoration:underline}.nav-list>li>.submenu li>.submenu>li a:hover [class*="icon-"]{text-decoration:none;color:#316292}.nav-list>li>.submenu li.open>a{color:#25639e}.nav-list>li>.submenu li.open>a>[class*="icon-"]:first-child{display:inline-block}.nav-list>li>.submenu li.open>a .arrow{color:#25639e}.nav-list>li>.submenu li>.submenu li.open>a{color:#25639e}.nav-list>li>.submenu li>.submenu li.open>a>[class*="icon-"]:first-child{display:inline-block;color:#1963aa}.nav-list>li>.submenu li>.submenu li.open>a .arrow{color:#25639e}.nav-list>li>.submenu li>.submenu li.active>a{color:#347cb3}.nav-list>li>.submenu li>.submenu li.active>a>[class*="icon-"]:first-child{display:inline-block;color:#347cb3}.nav-list>li.active.open li.active>a:after{top:2px;border-width:14px 8px}.nav-list>li.active.open li.active.open li.active>a:after{top:0}.menu-min.sidebar{width:43px}.menu-min.sidebar:before{width:43px}.menu-min.sidebar+.main-content{margin-left:43px}.menu-min.sidebar+.main-content .breadcrumbs.fixed,.menu-min.sidebar+.main-content .breadcrumbs.breadcrumbs-fixed{left:43px}.menu-min .nav-list a .badge,.menu-min .nav-list a .label{position:relative;top:-1px;right:auto;left:4px}.menu-min .nav-list .submenu .submenu a .badge,.menu-min .nav-list .submenu .submenu a .label{top:0}.menu-min .nav-list>li>a{position:relative}.menu-min .nav-list>li>a>.menu-text{display:none;position:absolute;left:42px;top:-2px;width:174px;height:40px;line-height:38px;background-color:#f5f5f5;z-index:121;-webkit-box-shadow:2px 1px 2px 0 rgba(0,0,0,0.2);box-shadow:2px 1px 2px 0 rgba(0,0,0,0.2);border:1px solid #ccc;padding-left:12px}.menu-min .nav-list>li>a.dropdown-toggle>.menu-text{-webkit-box-shadow:none;box-shadow:none;border:0;top:-1px;left:43px;width:174px;border-bottom:1px solid #ddd}.menu-min .nav-list>li>a .arrow{display:none}.menu-min .nav-list>li>a:hover:before{width:2px}.menu-min .nav-list>li:hover>a{color:#1963aa}.menu-min .nav-list>li:hover>a>.menu-text{display:block}.menu-min .nav-list>li.active>a>.menu-text{border-left-color:#1963aa}.menu-min .nav-list>li.open>a{background-color:#fafafa;color:#585858}.menu-min .nav-list>li.open.active>a{background-color:#fff}.menu-min .nav-list>li.open:hover>a{color:#1963aa}.menu-min .nav-list>li.active>a{color:#2b7dbc}.menu-min .nav-list>li.active>a:after{border-width:10px 6px;top:8px}.menu-min .nav-list>li.active.open>a:after{display:block}.menu-min .nav-list>li.active.open li.active>a:after{display:none}.menu-min .nav-list>li>.submenu{background:#fff;position:absolute;z-index:120;left:42px;top:-2px;width:176px;border:1px solid #ccc;-webkit-box-shadow:2px 1px 2px 0 rgba(0,0,0,0.2);box-shadow:2px 1px 2px 0 rgba(0,0,0,0.2);padding-top:40px;padding-bottom:2px;display:none!important}.menu-min .nav-list>li>.submenu:before{display:none}.menu-min .nav-list>li>.submenu li:before{display:none}.menu-min .nav-list>li>.submenu li>a{margin-left:0;padding-left:24px}.menu-min .nav-list>li>.submenu li>a>[class*="icon-"]:first-child{left:4px}.menu-min .nav-list>li:hover>.submenu{display:block!important}.menu-min .nav-list>li.active>.submenu{border-left-color:#2b7dbc}.menu-min .sidebar-shortcuts{position:relative}.menu-min .sidebar-shortcuts-mini{display:block}.menu-min .sidebar-shortcuts-large{display:none;position:absolute;z-index:20;top:-1px;left:42px;width:182px;padding:0 2px 1px;background-color:#fff;-webkit-box-shadow:2px 1px 2px 0 rgba(0,0,0,0.2);box-shadow:2px 1px 2px 0 rgba(0,0,0,0.2);border:1px solid #ccc}.menu-min .sidebar-shortcuts:hover .sidebar-shortcuts-large{display:block}.menu-min .sidebar-collapse:before{left:5px;right:5px}.menu-min .sidebar-collapse>[class*="icon-"]{font-size:13px;padding:0 4px;line-height:15px;border-width:1px;border-color:#aeaeae}.menu-min .nav-list>li>.submenu li>.submenu>li>a{margin-left:0;padding-left:30px}.menu-min .nav-list>li>.submenu li>.submenu>li>.submenu>li>a{margin-left:0;padding-left:45px}.menu-min .nav-list>li>.submenu li.active>a:after{display:none}.menu-min .nav-list li.active.open>.submenu>li.active>a:after{display:none}.menu-toggler{display:none}@media only screen and (max-width:991px){.sidebar:before{display:none}.sidebar{display:none;float:none;position:absolute;z-index:999;left:0;bottom:auto;top:auto!important;margin-top:40px;border:1px solid #CCC;border-left-width:0;box-shadow:2px 1px 2px 0 rgba(0,0,0,0.2)}.sidebar.display{display:block}.menu-toggler{display:inline-block;position:absolute;left:0;z-index:998;width:52px;height:32px;margin-right:2px;line-height:normal;padding-left:33px;padding-top:7px;padding-bottom:1px;font-size:13px;font-weight:bold;text-transform:uppercase;background-color:#444;color:#f3f3f3;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.menu-toggler:hover{text-decoration:none}.menu-toggler:before{border-top:1px solid #87b87f;border-bottom:1px solid #6fb3e0;height:2px;width:24px;content:"";position:absolute;z-index:11;top:13px;left:4px;-webkit-transition:all .1s ease;transition:all .1s ease;-o-transition:none;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.menu-toggler:after{border-top:1px solid #ffa24d;border-bottom:1px solid #d15b47;content:"";height:2px;width:24px;position:absolute;top:19px;left:4px;-webkit-transition:all .1s ease;transition:all .1s ease;-o-transition:none;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.menu-toggler.display:before{height:4px;top:8px;border-width:2px}.menu-toggler.display:after{height:4px;top:20px;border-width:2px}.menu-toggler>.menu-text{display:block;position:absolute;bottom:-18px;left:0;border:1px solid transparent;border-width:9px 42px;border-top-color:#444}.menu-toggler>.menu-text:after{display:block;color:#FFF;content:"MENU";position:absolute;left:-8px;top:-41px}.nav-list>li.active:after{display:none}.nav-list li.active>a:after{display:none}.nav-list li.active.open>.submenu>li.active>a:after{display:none}.menu-min .nav-list>li.active:after{display:block}.menu-min .nav-list>li.active>a:after{display:block}}@media only screen and (max-width:320px){.menu-toggler{width:0}.menu-toggler>.menu-text{border-width:7px 16px;bottom:-14px}.menu-toggler>.menu-text:after{font-size:9px;font-weight:normal;color:#FFF;position:absolute;left:-13px;top:-42px}.menu-toggler:before,.menu-toggler:after{margin-top:8px}.menu-toggler.display:before,.menu-toggler.display:after{height:2px;border-width:1px}.menu-toggler.display:before{top:13px}.menu-toggler.display:after{top:19px}}.btn{display:inline-block;color:#FFF!important;text-shadow:0 -1px 0 rgba(0,0,0,0.25)!important;background-image:none!important;border:5px solid #FFF;border-radius:0;box-shadow:none!important;-webkit-transition:all ease .15s;transition:all ease .15s;cursor:pointer;vertical-align:middle;margin:0;position:relative}.btn-lg{border-width:5px;line-height:1.35;padding:7px 16px}.btn-sm{border-width:4px;font-size:13px;padding:4px 9px;line-height:1.39}.btn-xs{border-width:3px}.btn-minier{padding:0 4px;line-height:18px;border-width:2px;font-size:12px}button.btn:active{top:1px;left:1px}.btn,.btn-default,.btn:focus,.btn-default:focus{background-color:#abbac3!important;border-color:#abbac3}.btn:hover,.btn-default:hover,.open .btn.dropdown-toggle,.open .btn-default.dropdown-toggle{background-color:#8b9aa3!important;border-color:#abbac3}.btn.no-border:hover,.btn-default.no-border:hover{border-color:#8b9aa3}.btn.no-hover:hover,.btn-default.no-hover:hover{background-color:#abbac3!important}.btn.active,.btn-default.active{background-color:#9baab3!important;border-color:#8799a4}.btn.no-border.active,.btn-default.no-border.active{background-color:#92a3ac!important;border-color:#92a3ac}.btn.disabled,.btn-default.disabled,.btn[disabled],.btn-default[disabled],fieldset[disabled] .btn,fieldset[disabled] .btn-default,.btn.disabled:hover,.btn-default.disabled:hover,.btn[disabled]:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn:hover,fieldset[disabled] .btn-default:hover,.btn.disabled:focus,.btn-default.disabled:focus,.btn[disabled]:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn:focus,fieldset[disabled] .btn-default:focus,.btn.disabled:active,.btn-default.disabled:active,.btn[disabled]:active,.btn-default[disabled]:active,fieldset[disabled] .btn:active,fieldset[disabled] .btn-default:active,.btn.disabled.active,.btn-default.disabled.active,.btn[disabled].active,.btn-default[disabled].active,fieldset[disabled] .btn.active,fieldset[disabled] .btn-default.active{background-color:#abbac3!important;border-color:#abbac3}.btn-primary,.btn-primary:focus{background-color:#428bca!important;border-color:#428bca}.btn-primary:hover,.open .btn-primary.dropdown-toggle{background-color:#1b6aaa!important;border-color:#428bca}.btn-primary.no-border:hover{border-color:#1b6aaa}.btn-primary.no-hover:hover{background-color:#428bca!important}.btn-primary.active{background-color:#2f7bba!important;border-color:#27689d}.btn-primary.no-border.active{background-color:#2b72ae!important;border-color:#2b72ae}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#428bca!important;border-color:#428bca}.btn-info,.btn-info:focus{background-color:#6fb3e0!important;border-color:#6fb3e0}.btn-info:hover,.open .btn-info.dropdown-toggle{background-color:#4f99c6!important;border-color:#6fb3e0}.btn-info.no-border:hover{border-color:#4f99c6}.btn-info.no-hover:hover{background-color:#6fb3e0!important}.btn-info.active{background-color:#5fa6d3!important;border-color:#4396cb}.btn-info.no-border.active{background-color:#539fd0!important;border-color:#539fd0}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#6fb3e0!important;border-color:#6fb3e0}.btn-success,.btn-success:focus{background-color:#87b87f!important;border-color:#87b87f}.btn-success:hover,.open .btn-success.dropdown-toggle{background-color:#629b58!important;border-color:#87b87f}.btn-success.no-border:hover{border-color:#629b58}.btn-success.no-hover:hover{background-color:#87b87f!important}.btn-success.active{background-color:#75aa6c!important;border-color:#629959}.btn-success.no-border.active{background-color:#6ba462!important;border-color:#6ba462}.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#87b87f!important;border-color:#87b87f}.btn-warning,.btn-warning:focus{background-color:#ffb752!important;border-color:#ffb752}.btn-warning:hover,.open .btn-warning.dropdown-toggle{background-color:#e59729!important;border-color:#ffb752}.btn-warning.no-border:hover{border-color:#e59729}.btn-warning.no-hover:hover{background-color:#ffb752!important}.btn-warning.active{background-color:#f2a73e!important;border-color:#f0981c}.btn-warning.no-border.active{background-color:#f1a02f!important;border-color:#f1a02f}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#ffb752!important;border-color:#ffb752}.btn-danger,.btn-danger:focus{background-color:#d15b47!important;border-color:#d15b47}.btn-danger:hover,.open .btn-danger.dropdown-toggle{background-color:#b74635!important;border-color:#d15b47}.btn-danger.no-border:hover{border-color:#b74635}.btn-danger.no-hover:hover{background-color:#d15b47!important}.btn-danger.active{background-color:#c4513e!important;border-color:#aa4434}.btn-danger.no-border.active{background-color:#ba4b39!important;border-color:#ba4b39}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d15b47!important;border-color:#d15b47}.btn-inverse,.btn-inverse:focus{background-color:#555!important;border-color:#555}.btn-inverse:hover,.open .btn-inverse.dropdown-toggle{background-color:#303030!important;border-color:#555}.btn-inverse.no-border:hover{border-color:#303030}.btn-inverse.no-hover:hover{background-color:#555!important}.btn-inverse.active{background-color:#434343!important;border-color:#313131}.btn-inverse.no-border.active{background-color:#3b3b3b!important;border-color:#3b3b3b}.btn-inverse.disabled,.btn-inverse[disabled],fieldset[disabled] .btn-inverse,.btn-inverse.disabled:hover,.btn-inverse[disabled]:hover,fieldset[disabled] .btn-inverse:hover,.btn-inverse.disabled:focus,.btn-inverse[disabled]:focus,fieldset[disabled] .btn-inverse:focus,.btn-inverse.disabled:active,.btn-inverse[disabled]:active,fieldset[disabled] .btn-inverse:active,.btn-inverse.disabled.active,.btn-inverse[disabled].active,fieldset[disabled] .btn-inverse.active{background-color:#555!important;border-color:#555}.btn-pink,.btn-pink:focus{background-color:#d6487e!important;border-color:#d6487e}.btn-pink:hover,.open .btn-pink.dropdown-toggle{background-color:#b73766!important;border-color:#d6487e}.btn-pink.no-border:hover{border-color:#b73766}.btn-pink.no-hover:hover{background-color:#d6487e!important}.btn-pink.active{background-color:#c74072!important;border-color:#af3462}.btn-pink.no-border.active{background-color:#be386a!important;border-color:#be386a}.btn-pink.disabled,.btn-pink[disabled],fieldset[disabled] .btn-pink,.btn-pink.disabled:hover,.btn-pink[disabled]:hover,fieldset[disabled] .btn-pink:hover,.btn-pink.disabled:focus,.btn-pink[disabled]:focus,fieldset[disabled] .btn-pink:focus,.btn-pink.disabled:active,.btn-pink[disabled]:active,fieldset[disabled] .btn-pink:active,.btn-pink.disabled.active,.btn-pink[disabled].active,fieldset[disabled] .btn-pink.active{background-color:#d6487e!important;border-color:#d6487e}.btn-purple,.btn-purple:focus{background-color:#9585bf!important;border-color:#9585bf}.btn-purple:hover,.open .btn-purple.dropdown-toggle{background-color:#7461aa!important;border-color:#9585bf}.btn-purple.no-border:hover{border-color:#7461aa}.btn-purple.no-hover:hover{background-color:#9585bf!important}.btn-purple.active{background-color:#8573b5!important;border-color:#705ca8}.btn-purple.no-border.active{background-color:#7c69af!important;border-color:#7c69af}.btn-purple.disabled,.btn-purple[disabled],fieldset[disabled] .btn-purple,.btn-purple.disabled:hover,.btn-purple[disabled]:hover,fieldset[disabled] .btn-purple:hover,.btn-purple.disabled:focus,.btn-purple[disabled]:focus,fieldset[disabled] .btn-purple:focus,.btn-purple.disabled:active,.btn-purple[disabled]:active,fieldset[disabled] .btn-purple:active,.btn-purple.disabled.active,.btn-purple[disabled].active,fieldset[disabled] .btn-purple.active{background-color:#9585bf!important;border-color:#9585bf}.btn-grey,.btn-grey:focus{background-color:#a0a0a0!important;border-color:#a0a0a0}.btn-grey:hover,.open .btn-grey.dropdown-toggle{background-color:#888!important;border-color:#a0a0a0}.btn-grey.no-border:hover{border-color:#888}.btn-grey.no-hover:hover{background-color:#a0a0a0!important}.btn-grey.active{background-color:#949494!important;border-color:#828282}.btn-grey.no-border.active{background-color:#8c8c8c!important;border-color:#8c8c8c}.btn-grey.disabled,.btn-grey[disabled],fieldset[disabled] .btn-grey,.btn-grey.disabled:hover,.btn-grey[disabled]:hover,fieldset[disabled] .btn-grey:hover,.btn-grey.disabled:focus,.btn-grey[disabled]:focus,fieldset[disabled] .btn-grey:focus,.btn-grey.disabled:active,.btn-grey[disabled]:active,fieldset[disabled] .btn-grey:active,.btn-grey.disabled.active,.btn-grey[disabled].active,fieldset[disabled] .btn-grey.active{background-color:#a0a0a0!important;border-color:#a0a0a0}.btn-yellow{color:#963!important;text-shadow:0 -1px 0 rgba(255,255,255,0.4)!important}.btn-yellow,.btn-yellow:focus{background-color:#fee188!important;border-color:#fee188}.btn-yellow:hover,.open .btn-yellow.dropdown-toggle{background-color:#f7d05b!important;border-color:#fee188}.btn-yellow.no-border:hover{border-color:#f7d05b}.btn-yellow.no-hover:hover{background-color:#fee188!important}.btn-yellow.active{background-color:#fbd972!important;border-color:#f9cf4f}.btn-yellow.no-border.active{background-color:#fad463!important;border-color:#fad463}.btn-yellow.disabled,.btn-yellow[disabled],fieldset[disabled] .btn-yellow,.btn-yellow.disabled:hover,.btn-yellow[disabled]:hover,fieldset[disabled] .btn-yellow:hover,.btn-yellow.disabled:focus,.btn-yellow[disabled]:focus,fieldset[disabled] .btn-yellow:focus,.btn-yellow.disabled:active,.btn-yellow[disabled]:active,fieldset[disabled] .btn-yellow:active,.btn-yellow.disabled.active,.btn-yellow[disabled].active,fieldset[disabled] .btn-yellow.active{background-color:#fee188!important;border-color:#fee188}.btn-light{color:#888!important;text-shadow:0 -1px 0 rgba(250,250,250,0.25)!important}.btn-light,.btn-light:focus{background-color:#e7e7e7!important;border-color:#e7e7e7}.btn-light:hover,.open .btn-light.dropdown-toggle{background-color:#d9d9d9!important;border-color:#e7e7e7}.btn-light.no-border:hover{border-color:#d9d9d9}.btn-light.no-hover:hover{background-color:#e7e7e7!important}.btn-light.active{background-color:#e0e0e0!important;border-color:#cecece}.btn-light.no-border.active{background-color:#d8d8d8!important;border-color:#d8d8d8}.btn-light.disabled,.btn-light[disabled],fieldset[disabled] .btn-light,.btn-light.disabled:hover,.btn-light[disabled]:hover,fieldset[disabled] .btn-light:hover,.btn-light.disabled:focus,.btn-light[disabled]:focus,fieldset[disabled] .btn-light:focus,.btn-light.disabled:active,.btn-light[disabled]:active,fieldset[disabled] .btn-light:active,.btn-light.disabled.active,.btn-light[disabled].active,fieldset[disabled] .btn-light.active{background-color:#e7e7e7!important;border-color:#e7e7e7}.btn-light.btn-xs:after{left:-2px;right:-2px;top:-2px;bottom:-2px}.btn-light.btn-sm:after{left:-4px;right:-4px;top:-4px;bottom:-4px}.btn-light.btn-large:after{left:-6px;right:-6px;top:-6px;bottom:-6px}.btn.btn-white{border-width:1px;border-color:#CCC;color:#444!important;text-shadow:none!important;background-color:#FFF!important}.btn.btn-white:hover,.btn.btn-white:focus{background-color:#ebebeb!important}.btn.btn-white.no-border{border-color:#CCC}.btn.disabled.active,.btn[disabled].active,.btn.disabled:focus,.btn[disabled]:focus,.btn.disabled:active,.btn[disabled]:active{outline:0}.btn.disabled:active,.btn[disabled]:active{top:0;left:0}.btn.active{color:#efe5b5}.btn.active:after{display:inline-block;content:"";position:absolute;border-bottom:1px solid #efe5b5;left:-4px;right:-4px;bottom:-4px}.btn.active.btn-sm:after{left:-3px;right:-3px;bottom:-3px}.btn.active.btn-large:after{left:-5px;right:-5px;bottom:-5px}.btn.active.btn-xs:after,.btn.active.btn-minier:after{left:-1px;right:-1px;bottom:-2px}.btn.active.btn-minier:after{bottom:-1px}.btn.active.btn-yellow:after{border-bottom-color:#c96338}.btn.active.btn-light{color:#515151}.btn.active.btn-light:after{border-bottom-color:#b5b5b5}.btn>[class*="icon-"]{display:inline;margin-right:4px}.btn>[class*="icon-"].icon-on-right{margin-right:0;margin-left:4px}.btn>.icon-only[class*="icon-"]{margin:0;vertical-align:middle;text-align:center;padding:0}.btn-large>[class*="icon-"]{margin-right:6px}.btn-large>[class*="icon-"].icon-on-right{margin-right:0;margin-left:6px}.btn-sm>[class*="icon-"]{margin-right:3px}.btn-sm>[class*="icon-"].icon-on-right{margin-right:0;margin-left:3px}.btn-xs>[class*="icon-"],.btn-minier>[class*="icon-"]{margin-right:2px}.btn-xs>[class*="icon-"].icon-on-right,.btn-minier>[class*="icon-"].icon-on-right{margin-right:0;margin-left:2px}.btn.btn-link{border:none!important;background:transparent none!important;color:#08c!important;text-shadow:none!important;padding:4px 12px!important;line-height:20px!important}.btn.btn-link:hover{background:none!important;text-shadow:none!important}.btn.btn-link.active{background:none!important;text-decoration:underline;color:#009ceb!important}.btn.btn-link.active:after{display:none}.btn.btn-link.disabled,.btn.btn-link[disabled]{background:0;opacity:.65;filter:alpha(opacity=65)}.btn.btn-link.disabled:hover,.btn.btn-link[disabled]:hover{background:none!important;text-decoration:none!important}.btn.btn-no-border{border-width:0!important}.btn-group>.btn,.btn-group>.btn+.btn{margin:0 1px 0 0}.btn-group>.btn:first-child{margin:0 1px 0 0}.btn-group>.btn:first-child,.btn-group>.btn:last-child{border-radius:0}.btn-group>.btn>.caret{margin-top:15px;margin-left:1px;border-width:5px;border-top-color:#FFF}.btn-group>.btn.btn-sm>.caret{margin-top:10px;border-width:4px}.btn-group>.btn.btn-large>.caret{margin-top:18px;border-width:6px}.btn-group>.btn.btn-xs>.caret{margin-top:9px;border-width:4px}.btn-group>.btn.btn-minier>.caret{margin-top:7px;border-width:3px}.btn-group>.btn+.btn.dropdown-toggle{padding-right:3px;padding-left:3px}.btn-group>.btn+.btn-large.dropdown-toggle{padding-right:4px;padding-left:4px}.btn-group .dropdown-toggle{border-radius:0}.btn-group>.btn,.btn-group+.btn{margin:0 1px 0 0;border-width:3px}.btn-group>.btn.active:after,.btn-group+.btn.active:after{left:-2px;right:-2px;bottom:-2px;border-bottom-width:1px}.btn-group>.btn-large,.btn-group+.btn-large{border-width:4px}.btn-group>.btn-large.active:after,.btn-group+.btn-large.active:after{left:-3px;right:-3px;bottom:-3px;border-bottom-width:1px}.btn-group>.btn-sm,.btn-group+.btn-sm{border-width:2px}.btn-group>.btn-sm.active:after,.btn-group+.btn-sm.active:after{left:-1px;right:-1px;bottom:-1px;border-bottom-width:1px}.btn-group>.btn-xs,.btn-group+.btn-xs{border-width:1px}.btn-group>.btn-xs.active:after,.btn-group+.btn-xs.active:after{left:0;right:0;bottom:0;border-bottom-width:1px}.btn-group>.btn-minier,.btn-group+.btn-minier{border-width:1px}.btn-group>.btn-minier.active:after,.btn-group+.btn-minier.active:after{left:0;right:0;bottom:0;border-bottom-width:1px}.btn-group>.btn{border-radius:0!important}.btn-group-vertical>.btn,.btn-group-vertical>.btn+.btn{margin:1px 0 0}.btn-group-vertical>.btn:first-child{margin-right:0}.btn.btn-app{display:inline-block;width:100px;font-size:18px;font-weight:normal;color:#FFF;text-align:center;text-shadow:0 -1px -1px rgba(0,0,0,0.2)!important;border:0;border-radius:12px;padding:12px 0 8px;margin:2px;line-height:1.7;position:relative}.btn-app,.btn-app.btn-default,.btn-app.no-hover:hover,.btn-app.btn-default.no-hover:hover,.btn-app.disabled:hover,.btn-app.btn-default.disabled:hover{background:#b4c2cc!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#bcc9d5),to(#abbac3))!important;background-image:-webkit-linear-gradient(top,#bcc9d5,0%,#abbac3,100%)!important;background-image:-moz-linear-gradient(top,#bcc9d5 0,#abbac3 100%)!important;background-image:linear-gradient(to bottom,#bcc9d5 0,#abbac3 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffbcc9d5',endColorstr='#ffabbac3',GradientType=0)!important}.btn-app:hover,.btn-app.btn-default:hover{background:#9baebc!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#a3b5c5),to(#93a6b2))!important;background-image:-webkit-linear-gradient(top,#a3b5c5,0%,#93a6b2,100%)!important;background-image:-moz-linear-gradient(top,#a3b5c5 0,#93a6b2 100%)!important;background-image:linear-gradient(to bottom,#a3b5c5 0,#93a6b2 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa3b5c5',endColorstr='#ff93a6b2',GradientType=0)!important}.btn-app.btn-primary,.btn-app.btn-primary.no-hover:hover,.btn-app.btn-primary.disabled:hover{background:#2a8bcc!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#3b98d6),to(#197ec1))!important;background-image:-webkit-linear-gradient(top,#3b98d6,0%,#197ec1,100%)!important;background-image:-moz-linear-gradient(top,#3b98d6 0,#197ec1 100%)!important;background-image:linear-gradient(to bottom,#3b98d6 0,#197ec1 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3b98d6',endColorstr='#ff197ec1',GradientType=0)!important}.btn-app.btn-primary:hover{background:#1d6fa6!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#267eb8),to(#136194))!important;background-image:-webkit-linear-gradient(top,#267eb8,0%,#136194,100%)!important;background-image:-moz-linear-gradient(top,#267eb8 0,#136194 100%)!important;background-image:linear-gradient(to bottom,#267eb8 0,#136194 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff267eb8',endColorstr='#ff136194',GradientType=0)!important}.btn-app.btn-info,.btn-app.btn-info.no-hover:hover,.btn-app.btn-info.disabled:hover{background:#68adde!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#75b5e6),to(#5ba4d5))!important;background-image:-webkit-linear-gradient(top,#75b5e6,0%,#5ba4d5,100%)!important;background-image:-moz-linear-gradient(top,#75b5e6 0,#5ba4d5 100%)!important;background-image:linear-gradient(to bottom,#75b5e6 0,#5ba4d5 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff75b5e6',endColorstr='#ff5ba4d5',GradientType=0)!important}.btn-app.btn-info:hover{background:#3f96d4!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#4a9ede),to(#348dc9))!important;background-image:-webkit-linear-gradient(top,#4a9ede,0%,#348dc9,100%)!important;background-image:-moz-linear-gradient(top,#4a9ede 0,#348dc9 100%)!important;background-image:linear-gradient(to bottom,#4a9ede 0,#348dc9 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4a9ede',endColorstr='#ff348dc9',GradientType=0)!important}.btn-app.btn-success,.btn-app.btn-success.no-hover:hover,.btn-app.btn-success.disabled:hover{background:#86b558!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#8ebf60),to(#7daa50))!important;background-image:-webkit-linear-gradient(top,#8ebf60,0%,#7daa50,100%)!important;background-image:-moz-linear-gradient(top,#8ebf60 0,#7daa50 100%)!important;background-image:linear-gradient(to bottom,#8ebf60 0,#7daa50 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8ebf60',endColorstr='#ff7daa50',GradientType=0)!important}.btn-app.btn-success:hover{background:#6c9842!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#74a844),to(#648740))!important;background-image:-webkit-linear-gradient(top,#74a844,0%,#648740,100%)!important;background-image:-moz-linear-gradient(top,#74a844 0,#648740 100%)!important;background-image:linear-gradient(to bottom,#74a844 0,#648740 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff74a844',endColorstr='#ff648740',GradientType=0)!important}.btn-app.btn-danger,.btn-app.btn-danger.no-hover:hover,.btn-app.btn-danger.disabled:hover{background:#d3413b!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#d55b52),to(#d12723))!important;background-image:-webkit-linear-gradient(top,#d55b52,0%,#d12723,100%)!important;background-image:-moz-linear-gradient(top,#d55b52 0,#d12723 100%)!important;background-image:linear-gradient(to bottom,#d55b52 0,#d12723 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd55b52',endColorstr='#ffd12723',GradientType=0)!important}.btn-app.btn-danger:hover{background:#b52c26!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#c43a30),to(#a51f1c))!important;background-image:-webkit-linear-gradient(top,#c43a30,0%,#a51f1c,100%)!important;background-image:-moz-linear-gradient(top,#c43a30 0,#a51f1c 100%)!important;background-image:linear-gradient(to bottom,#c43a30 0,#a51f1c 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc43a30',endColorstr='#ffa51f1c',GradientType=0)!important}.btn-app.btn-warning,.btn-app.btn-warning.no-hover:hover,.btn-app.btn-warning.disabled:hover{background:#ffb44b!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#ffbf66),to(#ffa830))!important;background-image:-webkit-linear-gradient(top,#ffbf66,0%,#ffa830,100%)!important;background-image:-moz-linear-gradient(top,#ffbf66 0,#ffa830 100%)!important;background-image:linear-gradient(to bottom,#ffbf66 0,#ffa830 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffbf66',endColorstr='#ffffa830',GradientType=0)!important}.btn-app.btn-warning:hover{background:#fe9e19!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#fa3),to(#fc9200))!important;background-image:-webkit-linear-gradient(top,#fa3,0%,#fc9200,100%)!important;background-image:-moz-linear-gradient(top,#fa3 0,#fc9200 100%)!important;background-image:linear-gradient(to bottom,#fa3 0,#fc9200 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffaa33',endColorstr='#fffc9200',GradientType=0)!important}.btn-app.btn-purple,.btn-app.btn-purple.no-hover:hover,.btn-app.btn-purple.disabled:hover{background:#9889c1!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#a696ce),to(#8a7cb4))!important;background-image:-webkit-linear-gradient(top,#a696ce,0%,#8a7cb4,100%)!important;background-image:-moz-linear-gradient(top,#a696ce 0,#8a7cb4 100%)!important;background-image:linear-gradient(to bottom,#a696ce 0,#8a7cb4 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa696ce',endColorstr='#ff8a7cb4',GradientType=0)!important}.btn-app.btn-purple:hover{background:#7b68af!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#8973be),to(#6d5ca1))!important;background-image:-webkit-linear-gradient(top,#8973be,0%,#6d5ca1,100%)!important;background-image:-moz-linear-gradient(top,#8973be 0,#6d5ca1 100%)!important;background-image:linear-gradient(to bottom,#8973be 0,#6d5ca1 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8973be',endColorstr='#ff6d5ca1',GradientType=0)!important}.btn-app.btn-pink,.btn-app.btn-pink.no-hover:hover,.btn-app.btn-pink.disabled:hover{background:#d54c7e!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#db5e8c),to(#ce3970))!important;background-image:-webkit-linear-gradient(top,#db5e8c,0%,#ce3970,100%)!important;background-image:-moz-linear-gradient(top,#db5e8c 0,#ce3970 100%)!important;background-image:linear-gradient(to bottom,#db5e8c 0,#ce3970 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdb5e8c',endColorstr='#ffce3970',GradientType=0)!important}.btn-app.btn-pink:hover{background:#be2f64!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#d2346e),to(#aa2a59))!important;background-image:-webkit-linear-gradient(top,#d2346e,0%,#aa2a59,100%)!important;background-image:-moz-linear-gradient(top,#d2346e 0,#aa2a59 100%)!important;background-image:linear-gradient(to bottom,#d2346e 0,#aa2a59 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd2346e',endColorstr='#ffaa2a59',GradientType=0)!important}.btn-app.btn-inverse,.btn-app.btn-inverse.no-hover:hover,.btn-app.btn-inverse.disabled:hover{background:#444!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#555),to(#333))!important;background-image:-webkit-linear-gradient(top,#555,0%,#333,100%)!important;background-image:-moz-linear-gradient(top,#555 0,#333 100%)!important;background-image:linear-gradient(to bottom,#555 0,#333 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff555555',endColorstr='#ff333333',GradientType=0)!important}.btn-app.btn-inverse:hover{background:#2b2b2b!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#3b3b3b),to(#1a1a1a))!important;background-image:-webkit-linear-gradient(top,#3b3b3b,0%,#1a1a1a,100%)!important;background-image:-moz-linear-gradient(top,#3b3b3b 0,#1a1a1a 100%)!important;background-image:linear-gradient(to bottom,#3b3b3b 0,#1a1a1a 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3b3b3b',endColorstr='#ff1a1a1a',GradientType=0)!important}.btn-app.btn-grey,.btn-app.btn-grey.no-hover:hover,.btn-app.btn-grey.disabled:hover{background:#797979!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#898989),to(#696969))!important;background-image:-webkit-linear-gradient(top,#898989,0%,#696969,100%)!important;background-image:-moz-linear-gradient(top,#898989 0,#696969 100%)!important;background-image:linear-gradient(to bottom,#898989 0,#696969 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff898989',endColorstr='#ff696969',GradientType=0)!important}.btn-app.btn-grey:hover{background:#6c6c6c!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#7c7c7c),to(#5c5c5c))!important;background-image:-webkit-linear-gradient(top,#7c7c7c,0%,#5c5c5c,100%)!important;background-image:-moz-linear-gradient(top,#7c7c7c 0,#5c5c5c 100%)!important;background-image:linear-gradient(to bottom,#7c7c7c 0,#5c5c5c 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff7c7c7c',endColorstr='#ff5c5c5c',GradientType=0)!important}.btn.btn-app.btn-light{color:#5a5a5a!important;text-shadow:0 1px 1px #EEE!important}.btn.btn-app.btn-light,.btn.btn-app.btn-light.no-hover:hover,.btn.btn-app.btn-light.disabled:hover{background:#ededed!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#f4f4f4),to(#e6e6e6))!important;background-image:-webkit-linear-gradient(top,#f4f4f4,0%,#e6e6e6,100%)!important;background-image:-moz-linear-gradient(top,#f4f4f4 0,#e6e6e6 100%)!important;background-image:linear-gradient(to bottom,#f4f4f4 0,#e6e6e6 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff4f4f4',endColorstr='#ffe6e6e6',GradientType=0)!important}.btn.btn-app.btn-light:hover{background:#e0e0e0!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#e7e7e7),to(#d9d9d9))!important;background-image:-webkit-linear-gradient(top,#e7e7e7,0%,#d9d9d9,100%)!important;background-image:-moz-linear-gradient(top,#e7e7e7 0,#d9d9d9 100%)!important;background-image:linear-gradient(to bottom,#e7e7e7 0,#d9d9d9 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe7e7e7',endColorstr='#ffd9d9d9',GradientType=0)!important}.btn.btn-app.btn-yellow{color:#963!important;text-shadow:0 -1px 0 rgba(255,255,255,0.4)!important}.btn.btn-app.btn-yellow,.btn.btn-app.btn-yellow.no-hover:hover,.btn.btn-app.btn-yellow.disabled:hover{background:#fee088!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#ffe8a5),to(#fcd76a))!important;background-image:-webkit-linear-gradient(top,#ffe8a5,0%,#fcd76a,100%)!important;background-image:-moz-linear-gradient(top,#ffe8a5 0,#fcd76a 100%)!important;background-image:linear-gradient(to bottom,#ffe8a5 0,#fcd76a 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffe8a5',endColorstr='#fffcd76a',GradientType=0)!important}.btn.btn-app.btn-yellow:hover{background:#fdd96e!important;background-image:-webkit-gradient(linear,left 0,left 100%,from(#ffe18b),to(#fbd051))!important;background-image:-webkit-linear-gradient(top,#ffe18b,0%,#fbd051,100%)!important;background-image:-moz-linear-gradient(top,#ffe18b 0,#fbd051 100%)!important;background-image:linear-gradient(to bottom,#ffe18b 0,#fbd051 100%)!important;background-repeat:repeat-x!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffe18b',endColorstr='#fffbd051',GradientType=0)!important}.btn.btn-app.btn-sm{width:80px;font-size:16px;border-radius:10px;line-height:1.5}.btn.btn-app.btn-xs{width:64px;font-size:15px;border-radius:8px;padding-bottom:7px;padding-top:8px;line-height:1.45}.btn.btn-app>[class*=icon]{display:block;font-size:42px;margin:0 0 4px;line-height:36px;min-width:0;padding:0}.btn.btn-app.btn-sm>[class*=icon]{display:block;font-size:32px;line-height:30px;margin:0 0 3px}.btn.btn-app.btn-xs>[class*=icon]{display:block;font-size:24px;line-height:24px;margin:0}.btn.btn-app.no-radius{border-radius:0}.btn.btn-app.radius-4{border-radius:4px}.btn.btn-app>.badge,.btn.btn-app>.label{position:absolute!important;top:-2px;right:-2px;padding:1px 3px;text-align:center;font-size:12px}.btn.btn-app>.badge.badge-left,.btn.btn-app>.label.badge-left,.btn.btn-app>.badge.label-left,.btn.btn-app>.label.label-left{right:auto;left:-2px}.btn.btn-app>.label{padding:1px 6px 3px;font-size:13px}.btn.btn-app.radius-4>.badge,.btn.btn-app.no-radius>.badge{border-radius:3px}.btn.btn-app.radius-4>.badge.no-radius,.btn.btn-app.no-radius>.badge.no-radius{border-radius:0}.btn.btn-app.active{color:#fff}.btn.btn-app.active:after{display:none}.btn.btn-app.active.btn-yellow{color:#963;border-color:#fee188}.btn.btn-app.active.btn-light{color:#515151}.btn.btn-app.btn-light,.btn.btn-app.btn-yellow{-webkit-box-shadow:0 0 0 1px rgba(0,0,0,0.08) inset!important;box-shadow:0 0 0 1px rgba(0,0,0,0.08) inset!important}.label{border-radius:0;text-shadow:none;font-weight:normal;display:inline-block;background-color:#abbac3!important}.label[class*="col-"][class*="arrow"]{min-height:0}@media screen and (-webkit-min-device-pixel-ratio:0){::safari-only,.label:empty{display:inline-block}::safari-only,.badge:empty{display:inline-block}}.badge{text-shadow:none;font-size:12px;padding-top:1px;padding-bottom:3px;font-weight:normal;line-height:15px;background-color:#abbac3!important}.badge.no-radius{border-radius:0}.badge.radius-1{border-radius:1px}.badge.radius-2{border-radius:2px}.badge.radius-3{border-radius:3px}.badge.radius-4{border-radius:4px}.badge.radius-5{border-radius:5px}.badge.radius-6{border-radius:6px}.label-transparent,.badge-transparent{background-color:transparent!important}.label-grey,.badge-grey{background-color:#a0a0a0!important}.label-info,.badge-info{background-color:#3a87ad!important}.label-primary,.badge-primary{background-color:#428bca!important}.label-success,.badge-success{background-color:#82af6f!important}.label-danger,.badge-danger{background-color:#d15b47!important}.label-important,.badge-important{background-color:#d15b47!important}.label-inverse,.badge-inverse{background-color:#333!important}.label-warning,.badge-warning{background-color:#f89406!important}.label-pink,.badge-pink{background-color:#d6487e!important}.label-purple,.badge-purple{background-color:#9585bf!important}.label-yellow,.badge-yellow{background-color:#fee188!important}.label-light,.badge-light{background-color:#e7e7e7!important}.badge-yellow,.label-yellow{color:#963!important;border-color:#fee188}.badge-light,.label-light{color:#888!important}.label.arrowed,.label.arrowed-in{position:relative;z-index:1}.label.arrowed:before,.label.arrowed-in:before{display:inline-block;content:"";position:absolute;top:0;z-index:-1;border:1px solid transparent;border-right-color:#abbac3}.label.arrowed-in:before{border-color:#abbac3;border-left-color:transparent!important}.label.arrowed-right,.label.arrowed-in-right{position:relative;z-index:1}.label.arrowed-right:after,.label.arrowed-in-right:after{display:inline-block;content:"";position:absolute;top:0;z-index:-1;border:1px solid transparent;border-left-color:#abbac3}.label.arrowed-in-right:after{border-color:#abbac3;border-right-color:transparent!important}.label-info.arrowed:before{border-right-color:#3a87ad}.label-info.arrowed-in:before{border-color:#3a87ad}.label-info.arrowed-right:after{border-left-color:#3a87ad}.label-info.arrowed-in-right:after{border-color:#3a87ad}.label-primary.arrowed:before{border-right-color:#428bca}.label-primary.arrowed-in:before{border-color:#428bca}.label-primary.arrowed-right:after{border-left-color:#428bca}.label-primary.arrowed-in-right:after{border-color:#428bca}.label-success.arrowed:before{border-right-color:#82af6f}.label-success.arrowed-in:before{border-color:#82af6f}.label-success.arrowed-right:after{border-left-color:#82af6f}.label-success.arrowed-in-right:after{border-color:#82af6f}.label-warning.arrowed:before{border-right-color:#f89406}.label-warning.arrowed-in:before{border-color:#f89406}.label-warning.arrowed-right:after{border-left-color:#f89406}.label-warning.arrowed-in-right:after{border-color:#f89406}.label-important.arrowed:before{border-right-color:#d15b47}.label-important.arrowed-in:before{border-color:#d15b47}.label-important.arrowed-right:after{border-left-color:#d15b47}.label-important.arrowed-in-right:after{border-color:#d15b47}.label-danger.arrowed:before{border-right-color:#d15b47}.label-danger.arrowed-in:before{border-color:#d15b47}.label-danger.arrowed-right:after{border-left-color:#d15b47}.label-danger.arrowed-in-right:after{border-color:#d15b47}.label-inverse.arrowed:before{border-right-color:#333}.label-inverse.arrowed-in:before{border-color:#333}.label-inverse.arrowed-right:after{border-left-color:#333}.label-inverse.arrowed-in-right:after{border-color:#333}.label-pink.arrowed:before{border-right-color:#d6487e}.label-pink.arrowed-in:before{border-color:#d6487e}.label-pink.arrowed-right:after{border-left-color:#d6487e}.label-pink.arrowed-in-right:after{border-color:#d6487e}.label-purple.arrowed:before{border-right-color:#9585bf}.label-purple.arrowed-in:before{border-color:#9585bf}.label-purple.arrowed-right:after{border-left-color:#9585bf}.label-purple.arrowed-in-right:after{border-color:#9585bf}.label-yellow.arrowed:before{border-right-color:#fee188}.label-yellow.arrowed-in:before{border-color:#fee188}.label-yellow.arrowed-right:after{border-left-color:#fee188}.label-yellow.arrowed-in-right:after{border-color:#fee188}.label-light.arrowed:before{border-right-color:#e7e7e7}.label-light.arrowed-in:before{border-color:#e7e7e7}.label-light.arrowed-right:after{border-left-color:#e7e7e7}.label-light.arrowed-in-right:after{border-color:#e7e7e7}.label-grey.arrowed:before{border-right-color:#a0a0a0}.label-grey.arrowed-in:before{border-color:#a0a0a0}.label-grey.arrowed-right:after{border-left-color:#a0a0a0}.label-grey.arrowed-in-right:after{border-color:#a0a0a0}.label{font-size:12px;line-height:1.15;height:20px}.label.arrowed{margin-left:5px}.label.arrowed:before{left:-10px;border-width:10px 5px}.label.arrowed-in{margin-left:5px}.label.arrowed-in:before{left:-5px;border-width:10px 5px}.label.arrowed-right{margin-right:5px}.label.arrowed-right:after{right:-10px;border-width:10px 5px}.label.arrowed-in-right{margin-right:5px}.label.arrowed-in-right:after{right:-5px;border-width:10px 5px}.label-lg{padding:.3em .6em .4em;font-size:13px;line-height:1.1;height:24px}.label-lg.arrowed{margin-left:6px}.label-lg.arrowed:before{left:-12px;border-width:12px 6px}.label-lg.arrowed-in{margin-left:6px}.label-lg.arrowed-in:before{left:-6px;border-width:12px 6px}.label-lg.arrowed-right{margin-right:6px}.label-lg.arrowed-right:after{right:-12px;border-width:12px 6px}.label-lg.arrowed-in-right{margin-right:6px}.label-lg.arrowed-in-right:after{right:-6px;border-width:12px 6px}.label-xlg{padding:.3em .7em .4em;font-size:14px;line-height:1.3;height:28px}.label-xlg.arrowed{margin-left:7px}.label-xlg.arrowed:before{left:-14px;border-width:14px 7px}.label-xlg.arrowed-in{margin-left:7px}.label-xlg.arrowed-in:before{left:-7px;border-width:14px 7px}.label-xlg.arrowed-right{margin-right:7px}.label-xlg.arrowed-right:after{right:-14px;border-width:14px 7px}.label-xlg.arrowed-in-right{margin-right:7px}.label-xlg.arrowed-in-right:after{right:-7px;border-width:14px 7px}.label-sm{padding:.2em .4em .3em;font-size:11px;line-height:1;height:18px}.label-sm.arrowed{margin-left:4px}.label-sm.arrowed:before{left:-8px;border-width:9px 4px}.label-sm.arrowed-in{margin-left:4px}.label-sm.arrowed-in:before{left:-4px;border-width:9px 4px}.label-sm.arrowed-right{margin-right:4px}.label-sm.arrowed-right:after{right:-8px;border-width:9px 4px}.label-sm.arrowed-in-right{margin-right:4px}.label-sm.arrowed-in-right:after{right:-4px;border-width:9px 4px}.label>span,.label>[class*="icon-"]{line-height:1;vertical-align:bottom}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:focus>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>li>a:focus>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:focus>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"],.dropdown-submenu:focus>a>[class*=" icon-"]{background-image:none}.dropdown-menu{border-radius:0!important;-webkit-box-shadow:0 2px 4px rgba(0,0,0,0.2);box-shadow:0 2px 4px rgba(0,0,0,0.2)}.dropdown-menu>li>a{font-size:13px;padding-left:11px;padding-right:11px;margin-bottom:1px;margin-top:1px}.dropdown-menu.dropdown-only-icon{min-width:50px}.dropdown-menu.dropdown-only-icon>li{float:left;margin:0 4px}.dropdown-menu.dropdown-only-icon>li>a [class*="icon-"]{width:18px;display:inline-block}.dropdown-menu.dropdown-only-icon>li>a .icon-2x{width:36px}.dropdown-menu li a:hover,.dropdown-menu li a:focus,.dropdown-menu li a:active,.dropdown-menu li.active a,.dropdown-menu li.active a:hover,.dropdown-menu .dropdown-submenu:hover>a,.nav-tabs .dropdown-menu li>a:focus{background:#4f99c6;color:#fff}.dropdown-default li a:hover,.dropdown-default li a:focus,.dropdown-default li a:active,.dropdown-default li.active a,.dropdown-default li.active a:hover,.dropdown-default .dropdown-submenu:hover>a,.nav-tabs .dropdown-default li>a:focus{background:#abbac3;color:#fff}.dropdown-info li a:hover,.dropdown-info li a:focus,.dropdown-info li a:active,.dropdown-info li.active a,.dropdown-info li.active a:hover,.dropdown-info .dropdown-submenu:hover>a,.nav-tabs .dropdown-info li>a:focus{background:#6fb3e0;color:#fff}.dropdown-primary li a:hover,.dropdown-primary li a:focus,.dropdown-primary li a:active,.dropdown-primary li.active a,.dropdown-primary li.active a:hover,.dropdown-primary .dropdown-submenu:hover>a,.nav-tabs .dropdown-primary li>a:focus{background:#428bca;color:#fff}.dropdown-success li a:hover,.dropdown-success li a:focus,.dropdown-success li a:active,.dropdown-success li.active a,.dropdown-success li.active a:hover,.dropdown-success .dropdown-submenu:hover>a,.nav-tabs .dropdown-success li>a:focus{background:#87b87f;color:#fff}.dropdown-warning li a:hover,.dropdown-warning li a:focus,.dropdown-warning li a:active,.dropdown-warning li.active a,.dropdown-warning li.active a:hover,.dropdown-warning .dropdown-submenu:hover>a,.nav-tabs .dropdown-warning li>a:focus{background:#ffa24d;color:#fff}.dropdown-danger li a:hover,.dropdown-danger li a:focus,.dropdown-danger li a:active,.dropdown-danger li.active a,.dropdown-danger li.active a:hover,.dropdown-danger .dropdown-submenu:hover>a,.nav-tabs .dropdown-danger li>a:focus{background:#d15b47;color:#fff}.dropdown-inverse li a:hover,.dropdown-inverse li a:focus,.dropdown-inverse li a:active,.dropdown-inverse li.active a,.dropdown-inverse li.active a:hover,.dropdown-inverse .dropdown-submenu:hover>a,.nav-tabs .dropdown-inverse li>a:focus{background:#555;color:#fff}.dropdown-purple li a:hover,.dropdown-purple li a:focus,.dropdown-purple li a:active,.dropdown-purple li.active a,.dropdown-purple li.active a:hover,.dropdown-purple .dropdown-submenu:hover>a,.nav-tabs .dropdown-purple li>a:focus{background:#9585bf;color:#fff}.dropdown-pink li a:hover,.dropdown-pink li a:focus,.dropdown-pink li a:active,.dropdown-pink li.active a,.dropdown-pink li.active a:hover,.dropdown-pink .dropdown-submenu:hover>a,.nav-tabs .dropdown-pink li>a:focus{background:#d6487e;color:#fff}.dropdown-grey li a:hover,.dropdown-grey li a:focus,.dropdown-grey li a:active,.dropdown-grey li.active a,.dropdown-grey li.active a:hover,.dropdown-grey .dropdown-submenu:hover>a,.nav-tabs .dropdown-grey li>a:focus{background:#a0a0a0;color:#fff}.dropdown-light li a:hover,.dropdown-light li a:focus,.dropdown-light li a:active,.dropdown-light li.active a,.dropdown-light li.active a:hover,.dropdown-light .dropdown-submenu:hover>a,.nav-tabs .dropdown-light li>a:focus{background:#e7e7e7;color:#333}.dropdown-lighter li a:hover,.dropdown-lighter li a:focus,.dropdown-lighter li a:active,.dropdown-lighter li.active a,.dropdown-lighter li.active a:hover,.dropdown-lighter .dropdown-submenu:hover>a,.nav-tabs .dropdown-lighter li>a:focus{background:#efefef;color:#444}.dropdown-lightest li a:hover,.dropdown-lightest li a:focus,.dropdown-lightest li a:active,.dropdown-lightest li.active a,.dropdown-lightest li.active a:hover,.dropdown-lightest .dropdown-submenu:hover>a,.nav-tabs .dropdown-lightest li>a:focus{background:#f3f3f3;color:#444}.dropdown-yellow li a:hover,.dropdown-yellow li a:focus,.dropdown-yellow li a:active,.dropdown-yellow li.active a,.dropdown-yellow li.active a:hover,.dropdown-yellow .dropdown-submenu:hover>a,.nav-tabs .dropdown-yellow li>a:focus{background:#fee188;color:#444}.dropdown-yellow2 li a:hover,.dropdown-yellow2 li a:focus,.dropdown-yellow2 li a:active,.dropdown-yellow2 li.active a,.dropdown-yellow2 li.active a:hover,.dropdown-yellow2 .dropdown-submenu:hover>a,.nav-tabs .dropdown-yellow2 li>a:focus{background:#f9e8b3;color:#444}.dropdown-light-blue li a:hover,.dropdown-light-blue li a:focus,.dropdown-light-blue li a:active,.dropdown-light-blue li.active a,.dropdown-light-blue li.active a:hover,.dropdown-light-blue .dropdown-submenu:hover>a,.nav-tabs .dropdown-light-blue li>a:focus{background:#ecf3f9;color:#456}.dropdown-light .dropdown-submenu:hover>a:after,.dropdown-lighter .dropdown-submenu:hover>a:after,.dropdown-lightest .dropdown-submenu:hover>a:after{border-left-color:#444}.dropdown-menu.dropdown-close{top:92%;left:-5px}.dropdown-menu.dropdown-close.pull-right{left:auto;right:-5px}.dropdown-menu.dropdown-closer{top:80%;left:-10px}.dropdown-menu.dropdown-closer.pull-right{right:-10px;left:auto}.dropdown-submenu>.dropdown-menu{border-radius:0}.dropdown-submenu>a:after{margin-right:-5px}.dropdown-colorpicker>.dropdown-menu{top:80%;left:-7px;padding:4px;min-width:130px;max-width:130px}.dropdown-colorpicker>.dropdown-menu.pull-right{right:-7px;left:auto}.dropdown-colorpicker>.dropdown-menu>li{display:block;float:left;width:20px;height:20px;margin:2px}.dropdown-colorpicker>.dropdown-menu>li>.colorpick-btn{display:block;width:20px;height:20px;margin:0;padding:0;border-radius:0;position:relative;-webkit-transition:all ease .1s;transition:all ease .1s}.dropdown-colorpicker>.dropdown-menu>li>.colorpick-btn:hover{text-decoration:none;opacity:.8;filter:alpha(opacity=80);-webkit-transform:scale(1.08);-ms-transform:scale(1.08);transform:scale(1.08)}.dropdown-colorpicker>.dropdown-menu>li>.colorpick-btn.selected:after{content:"\f00c";display:inline-block;font-family:FontAwesome;font-size:11px;color:#FFF;position:absolute;left:0;right:0;text-align:center;line-height:20px}.btn-colorpicker{display:inline-block;width:20px;height:20px;background-color:#DDD;vertical-align:middle;border-radius:0}.dropdown-navbar{padding:0;width:240px;-webkit-box-shadow:0 2px 4px rgba(30,30,100,0.25);box-shadow:0 2px 4px rgba(30,30,100,0.25);border-color:#bcd4e5}.dropdown-navbar>li{padding:0 8px;background-color:#fff}.dropdown-navbar>li.dropdown-header{text-shadow:none;padding-top:0;padding-bottom:0;line-height:34px;font-size:13px;font-weight:bold;text-transform:none;border-bottom:1px solid}.dropdown-navbar>li>[class*="icon-"],.dropdown-navbar>li>a>[class*="icon-"]{margin-right:5px!important;color:#555;font-size:14px}.dropdown-navbar>li>a{padding:10px 2px;margin:0;border-bottom:1px solid;font-size:12px;line-height:16px;color:#555}.dropdown-navbar>li>a:active,.dropdown-navbar>li>a:hover,.dropdown-navbar>li>a:focus{background-color:transparent!important;color:#555}.dropdown-navbar>li>a .progress{margin-bottom:0;margin-top:4px}.dropdown-navbar>li>a .badge{line-height:16px;padding-right:4px;padding-left:4px;font-size:12px}.dropdown-navbar>li:last-child>a{border-bottom:0 solid #DDD;border-top:1px dotted transparent;color:#4f99c6;text-align:center;font-size:13px}.dropdown-navbar>li:last-child>a:hover{background-color:#FFF;color:#4f99c6;text-decoration:underline}.dropdown-navbar>li:last-child>a:hover>[class*="icon-"]{text-decoration:none}.dropdown-navbar>li:hover{background-color:#f4f9fc!important}.dropdown-navbar>li.dropdown-header{background-color:#ecf2f7!important;color:#8090a0;border-bottom-color:#bcd4e5}.dropdown-navbar>li.dropdown-header>[class*="icon-"]{color:#8090a0}.dropdown-navbar>li>a{border-bottom-color:#e4ecf3}.dropdown-navbar.navbar-pink{border-color:#e5bcd4}.dropdown-navbar.navbar-pink>li:hover{background-color:#fcf4f9!important}.dropdown-navbar.navbar-pink>li.dropdown-header{background-color:#f7ecf2!important;color:#b471a0;border-bottom-color:#e5bcd4}.dropdown-navbar.navbar-pink>li.dropdown-header>[class*="icon-"]{color:#c06090}.dropdown-navbar.navbar-pink>li>a{border-bottom-color:#f3e4ec}.dropdown-navbar.navbar-grey{border-color:#e5e5e5}.dropdown-navbar.navbar-grey>li:hover{background-color:#f8f8f8!important}.dropdown-navbar.navbar-grey>li.dropdown-header{background-color:#f2f2f2!important;color:#3a87ad;border-bottom-color:#e5e5e5}.dropdown-navbar.navbar-grey>li.dropdown-header>[class*="icon-"]{color:#3a87ad}.dropdown-navbar.navbar-grey>li>a{border-bottom-color:#eee}.dropdown-navbar.navbar-green{border-color:#b4d5ac}.dropdown-navbar.navbar-green>li:hover{background-color:#f4f9ef!important}.dropdown-navbar.navbar-green>li.dropdown-header{background-color:#ebf7e4!important;color:#8a6;border-bottom-color:#b4d5ac}.dropdown-navbar.navbar-green>li.dropdown-header>[class*="icon-"]{color:#90c060}.dropdown-navbar.navbar-green>li>a{border-bottom-color:#ecf3e4}.dropdown-navbar [class*="btn"][class*="icon-"]{display:inline-block;margin:0 5px 0 0;width:24px;text-align:center;padding-left:0;padding-right:0}.dropdown-navbar .msg-photo{margin-right:6px;max-width:42px}.dropdown-navbar .msg-body{display:inline-block;line-height:20px;white-space:normal;vertical-align:middle;max-width:175px}.dropdown-navbar .msg-title{display:inline-block;line-height:14px}.dropdown-navbar .msg-time{display:block;font-size:11px;color:#777}.dropdown-navbar .msg-time>[class*="icon-"]{font-size:14px;color:#555}.dropdown-100{min-width:100px}.dropdown-125{min-width:125px}.dropdown-150{min-width:150px}.dropdown-hover{position:relative}.dropdown-hover:hover>.dropdown-menu{display:block}.form-line{margin-bottom:24px;padding-bottom:12px;border-bottom:1px solid #EEE}.form-actions{display:block;background-color:#f5f5f5;border-top:1px solid #e5e5e5;margin-bottom:20px;margin-top:20px;padding:19px 20px 20px}.help-button{display:inline-block;height:22px;width:22px;line-height:22px;text-align:center;padding:0;background-color:#65bcda;color:#FFF;font-size:12px;font-weight:bold;cursor:default;margin-left:4px;border-radius:100%;border-color:#FFF;border:2px solid #FFF;-webkit-box-shadow:0 1px 0 1px rgba(0,0,0,0.2);box-shadow:0 1px 0 1px rgba(0,0,0,0.2)}.help-button:hover{background-color:#65bcda;text-shadow:none}label{font-weight:normal;font-size:14px}.form-group>label[class*="col-"]{padding-top:4px;margin-bottom:4px}label,.lbl{vertical-align:middle}td>label,th>label,label.inline{margin-bottom:0;line-height:inherit}textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"]{border-radius:0!important;color:#858585;background-color:#fff;border:1px solid #d5d5d5;padding:5px 4px;line-height:1.2;font-size:14px;font-family:inherit;-webkit-box-shadow:none!important;box-shadow:none!important;-webkit-transition-duration:.1s;transition-duration:.1s}textarea:hover,input[type="text"]:hover,input[type="password"]:hover,input[type="datetime"]:hover,input[type="datetime-local"]:hover,input[type="date"]:hover,input[type="month"]:hover,input[type="time"]:hover,input[type="week"]:hover,input[type="number"]:hover,input[type="email"]:hover,input[type="url"]:hover,input[type="search"]:hover,input[type="tel"]:hover,input[type="color"]:hover{border-color:#b5b5b5}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus{-webkit-box-shadow:none;box-shadow:none;color:#696969;border-color:#f59942;background-color:#fff;outline:0}.form-control,select{border-radius:0;-webkit-box-shadow:none!important;box-shadow:none!important;color:#858585;background-color:#fff;border:1px solid #d5d5d5}.form-control:focus,select:focus{color:#696969;border-color:#f59942;background-color:#fff;outline:0}textarea.form-control{padding:5px 9px}select{padding:3px 4px;height:30px}select.form-control{padding:4px 6px;height:32px}select[multiple],select.form-control[multiple]{height:auto}input.block{display:block;margin-bottom:9px}textarea.autosize-transition{-webkit-transition-duration:"height 0.2s";transition-duration:"height 0.2s"}.limiterBox{border:1px solid #222;border-top:0;background-color:#333;padding:3px 6px;font-size:12px;color:#FFF;margin-top:6px}.limiterBox:after{display:none}.limiterBox:before{display:block;content:"";position:absolute;width:0;height:0;top:-8px;left:50%;margin-left:-5px;border-color:transparent;border-style:solid;border-bottom-color:#333;border-width:0 8px 8px}select option,select.form-control option{padding:3px 4px}select option:active,select.form-control option:active,select option:hover,select.form-control option:hover,select option:focus,select.form-control option:focus{background-color:#e5e9ee;color:#111}select option[value=""],select.form-control option[value=""]{padding:0}input[disabled]{color:#848484!important;background-color:#eee!important}input[disabled]:hover{border-color:#d5d5d5!important}input[readonly]{color:#939192;background:#f5f5f5!important;cursor:default}input[readonly]:hover{border-color:#c3c3c3}input[readonly]:focus{-webkit-box-shadow:none;box-shadow:none;border-color:#aaa;background-color:#f9f9f9}.help-inline{font-size:13px!important}.input-icon{position:relative}span.input-icon{display:inline-block}.input-icon>input{padding-left:24px;padding-right:6px}.input-icon.input-icon-right>input{padding-left:6px;padding-right:24px}.input-icon>[class*="icon-"]{padding:0 3px;z-index:2;position:absolute;top:1px;bottom:1px;left:3px;line-height:28px;display:inline-block;color:#909090;font-size:16px}.input-icon.input-icon-right>[class*="icon-"]{left:auto;right:3px}.input-icon>input:focus+[class*="icon-"]{color:#579}.input-icon ~ .help-inline{padding-left:8px}.form-search .radio [type=radio]+label,.form-inline .radio [type=radio]+label,.form-search .checkbox [type=checkbox]+label,.form-inline .checkbox [type=checkbox]+label{float:left;margin-left:-20px}.form-search .form-search .radio [type=radio]+label,.form-search .form-inline .radio [type=radio]+label,.form-search .form-search .checkbox [type=checkbox]+label,.form-search .form-inline .checkbox [type=checkbox]+label,.form-inline .form-search .radio [type=radio]+label,.form-inline .form-inline .radio [type=radio]+label,.form-inline .form-search .checkbox [type=checkbox]+label,.form-inline .form-inline .checkbox [type=checkbox]+label{margin-left:0;margin-right:3px}.form-search .input-append .search-query:focus,.form-search .input-prepend .search-query:focus{-webkit-box-shadow:none;box-shadow:none}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input{border-radius:0}.input-mini{width:60px;max-width:100%}.input-small{width:90px;max-width:100%}.input-medium{width:150px;max-width:100%}.input-large{width:210px;max-width:100%}.input-xlarge{width:270px;max-width:100%}.input-xxlarge{width:530px;max-width:100%}input.input-lg{font-size:18px}input.input-sm{font-size:12px}input[type=checkbox].ace,input[type=radio].ace{opacity:0;position:absolute;z-index:12;width:18px;height:18px;cursor:pointer}input[type=checkbox].ace:checked,input[type=radio].ace:checked,input[type=checkbox].ace:focus,input[type=radio].ace:focus{outline:none!important}input[type=checkbox].ace+.lbl,input[type=radio].ace+.lbl{position:relative;z-index:11;display:inline-block;margin:0;line-height:20px;min-height:18px;min-width:18px;font-weight:normal}input[type=checkbox].ace+.lbl.padding-16::before,input[type=radio].ace+.lbl.padding-16::before{margin-right:16px}input[type=checkbox].ace+.lbl.padding-12::before,input[type=radio].ace+.lbl.padding-12::before{margin-right:12px}input[type=checkbox].ace+.lbl.padding-8::before,input[type=radio].ace+.lbl.padding-8::before{margin-right:8px}input[type=checkbox].ace+.lbl.padding-4::before,input[type=radio].ace+.lbl.padding-4::before{margin-right:4px}input[type=checkbox].ace+.lbl.padding-0::before,input[type=radio].ace+.lbl.padding-0::before{margin-right:0}input[type=checkbox].ace+.lbl::before,input[type=radio].ace+.lbl::before{font-family:fontAwesome;font-weight:normal;font-size:12px;color:#32a3ce;content:"\a0";background-color:#fafafa;border:1px solid #c8c8c8;box-shadow:0 1px 2px rgba(0,0,0,0.05);border-radius:0;display:inline-block;text-align:center;vertical-align:middle;height:16px;line-height:14px;min-width:16px;margin-right:1px}input[type=checkbox].ace:checked+.lbl::before,input[type=radio].ace:checked+.lbl::before{display:inline-block;content:'\f00c';background-color:#f5f8fc;border-color:#adb8c0;box-shadow:0 1px 2px rgba(0,0,0,0.05),inset 0 -15px 10px -12px rgba(0,0,0,0.05),inset 15px 10px -12px rgba(255,255,255,0.1)}input[type=checkbox].ace:hover+.lbl::before,input[type=radio].ace:hover+.lbl::before,input[type=checkbox].ace+.lbl:hover::before,input[type=radio].ace+.lbl:hover::before{border-color:#ff893c}input[type=checkbox].ace:active+.lbl::before,input[type=radio].ace:active+.lbl::before,input[type=checkbox].ace:checked:active+.lbl::before,input[type=radio].ace:checked:active+.lbl::before{box-shadow:0 1px 2px rgba(0,0,0,0.05),inset 0 1px 3px rgba(0,0,0,0.1)}input[type=checkbox].ace.ace-checkbox-2+.lbl::before,input[type=radio].ace.ace-checkbox-2+.lbl::before{box-shadow:none}input[type=checkbox].ace.ace-checkbox-2:checked+.lbl::before,input[type=radio].ace.ace-checkbox-2:checked+.lbl::before{background-color:#f9a021;border-color:#f9a021;color:#FFF}input[type=checkbox].ace:disabled+.lbl::before,input[type=radio].ace:disabled+.lbl::before,input[type=checkbox].ace[disabled]+.lbl::before,input[type=radio].ace[disabled]+.lbl::before,input[type=checkbox].ace.disabled+.lbl::before,input[type=radio].ace.disabled+.lbl::before{background-color:#DDD!important;border-color:#CCC!important;box-shadow:none!important;color:#BBB}input[type=radio].ace+.lbl::before{border-radius:100%;font-size:11px;font-family:FontAwesome;text-shadow:0 0 1px #32a3ce;line-height:15px;height:17px;min-width:17px}input[type=radio].ace:checked+.lbl::before{content:"\f111"}input[type=checkbox].ace.ace-switch{width:55px;height:25px}input[type=checkbox].ace.ace-switch+.lbl{margin:0 4px;min-height:24px}input[type=checkbox].ace.ace-switch+.lbl::before{font-family:Arial,Helvetica,sans-serif;content:"ON\a0\a0\a0\a0\a0\a0\a0\a0\a0OFF";color:#999;font-weight:bold;font-size:11px;line-height:18px;line-height:21px\9;height:20px;overflow:hidden;border-radius:12px;background-color:#f5f5f5;-webkit-box-shadow:inset 0 2px 2px 0 rgba(0,0,0,.2);box-shadow:inset 0 2px 2px 0 rgba(0,0,0,.2);border:1px solid #CCC;text-align:left;float:left;padding:0;width:52px;text-indent:-19px;text-indent:-21px\9;margin-right:0;-webkit-transition:text-indent .4s ease;transition:text-indent .4s ease}input[type=checkbox].ace.ace-switch+.lbl::after{font-family:Arial,Helvetica,sans-serif;content:'|||';font-size:10px;font-weight:lighter;color:#d5d5d5;background-color:#FFF;text-shadow:-1px 0 0 rgba(0,0,0,0.15);text-align:center;border-radius:100%;width:22px;height:22px;line-height:20px;position:absolute;top:-2px;left:-3px;padding:0;-webkit-box-shadow:0 1px 1px 1px rgba(0,0,0,.3);box-shadow:0 1px 1px 1px rgba(0,0,0,.3);-webkit-transition:left .4s ease;transition:left .4s ease}input[type=checkbox].ace.ace-switch:checked+.lbl::before{text-indent:9px;color:#FFF;background-color:#8ab2c9;border-color:#468fcc}input[type=checkbox].ace.ace-switch:checked+.lbl::after{left:34px;background-color:#FFF;color:#8ab2c9}input[type=checkbox].ace.ace-switch.ace-switch-2+.lbl::before{content:"YES\a0\a0\a0\a0\a0\a0\a0\a0NO"}input[type=checkbox].ace.ace-switch.ace-switch-3+.lbl::after{font-family:FontAwesome;font-size:13px;line-height:23px;content:"\f00d";top:-1px}input[type=checkbox].ace.ace-switch.ace-switch-3:checked+.lbl::after{content:"\f00c"}input[type=checkbox].ace.ace-switch.ace-switch-4+.lbl::before,input[type=checkbox].ace.ace-switch.ace-switch-5+.lbl::before{content:"ON\a0\a0\a0\a0\a0\a0\a0\a0\a0\a0\a0OFF";font-family:Arial,Helvetica,sans-serif;font-weight:bolder;font-size:12px;line-height:23px;height:24px;overflow:hidden;line-height:25px\9;border-radius:12px;background-color:#8b9aa3;border:1px solid #8b9aa3;color:#FFF;width:56px;text-indent:-25px;text-indent:-28px\9;display:inline-block;position:relative;box-shadow:none;-webkit-transition:all .4s ease;transition:all .4s ease}input[type=checkbox].ace.ace-switch.ace-switch-4+.lbl::after,input[type=checkbox].ace.ace-switch.ace-switch-5+.lbl::after{font-family:Helvetica,Arial,sans-serif;content:'|||';text-shadow:-1px 0 0 rgba(0,0,0,0.2);font-size:8px;font-weight:lighter;color:#8b9aa3;text-align:center;position:absolute;border-radius:12px;color:#5b6a73;top:2px;left:2px;width:20px;height:20px;line-height:18px;background-color:#FFF;-webkit-transition:all .4s ease;transition:all .4s ease}input[type=checkbox].ace.ace-switch.ace-switch-4:checked+.lbl::before,input[type=checkbox].ace.ace-switch.ace-switch-5:checked+.lbl::before{text-indent:9px;background-color:#468fcc;border-color:#468fcc}input[type=checkbox].ace.ace-switch.ace-switch-4:checked+.lbl::after,input[type=checkbox].ace.ace-switch.ace-switch-5:checked+.lbl::after{left:34px;background-color:#FFF}input[type=checkbox].ace.ace-switch.ace-switch-5+.lbl::before{content:"YES\a0\a0\a0\a0\a0\a0\a0\a0\a0\a0NO"}input[type=checkbox].ace.ace-switch.ace-switch-5:checked+.lbl::before{text-indent:8px}input[type=checkbox].ace.ace-switch.ace-switch-6+.lbl{position:relative}input[type=checkbox].ace.ace-switch.ace-switch-6+.lbl::before{font-family:FontAwesome;content:"\f00d";text-shadow:0 -1px 0 rgba(0,0,0,0.25);box-shadow:none;border:0;font-weight:lighter;font-size:16px;border-radius:12px;display:inline-block;background-color:#888;color:#f2f2f2;width:52px;height:22px;line-height:20px;text-indent:32px;-webkit-transition:background .1s ease;transition:background .1s ease}input[type=checkbox].ace.ace-switch.ace-switch-6+.lbl::after{content:'';text-shadow:0 -1px 0 rgba(0,0,0,0.25);position:absolute;top:2px;left:3px;border-radius:12px;box-shadow:0 -1px 0 rgba(0,0,0,0.25);width:18px;height:18px;text-align:center;background-color:#f2f2f2;border:4px solid #f2f2f2;-webkit-transition:left .2s ease;transition:left .2s ease}input[type=checkbox].ace.ace-switch.ace-switch-6:checked+.lbl::before{content:"\f00c";text-indent:6px;color:#FFF;border-color:#b7d3e5;background-color:#ff893c}input[type=checkbox].ace.ace-switch.ace-switch-6:checked+.lbl::after{left:32px;background-color:#FFF;border:4px solid #FFF;text-shadow:0 -1px 0 rgba(0,200,0,0.25)}input[type=checkbox].ace.ace-switch.ace-switch-7{width:75px}input[type=checkbox].ace.ace-switch.ace-switch-7+.lbl{position:relative}input[type=checkbox].ace.ace-switch.ace-switch-7+.lbl::before{content:"OFF\a0\a0\a0\a0\a0\a0\a0\a0\a0\a0\a0ON";font-weight:bolder;font-size:14px;line-height:20px;background-color:#FFF;border:2px solid #AAA;border-radius:0;box-shadow:none;color:#aaa;width:74px;height:26px;line-height:22px;overflow:hidden;text-indent:4px;display:inline-block;position:relative;-webkit-transition:all .2s ease;transition:all .2s ease}input[type=checkbox].ace.ace-switch.ace-switch-7+.lbl::after{content:'\f00d';font-family:FontAwesome;font-size:16px;position:absolute;top:3px;left:39px;width:32px;height:20px;line-height:18px;text-align:center;background-color:#aaa;color:#FFF;border-radius:0;box-shadow:none;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}input[type=checkbox].ace.ace-switch.ace-switch-7:checked+.lbl::before{color:#468fcc;background-color:#FFF;text-indent:-33px;border-color:#6fb3e0}input[type=checkbox].ace.ace-switch.ace-switch-7:checked+.lbl::after{left:3px;content:'\f00c';background-color:#468fcc;color:#FFF}.input-group .input-group-addon{border-radius:0!important}.form-group.has-success .input-group .input-group-addon{border-color:#92bf65}.form-group.has-error .input-group .input-group-addon{border-color:#f09784}.form-group.has-warning .input-group .input-group-addon{border-color:#e0c43a}.form-group.has-info .input-group .input-group-addon{border-color:#64a6bc}.input-group>.btn{line-height:20px;padding:0 6px;border-radius:0!important}.input-group>.btn.btn-sm{line-height:22px}.input-group>.btn+.btn{margin-left:1px}.input-group>.btn-group>.btn{line-height:23px}.input-group>.btn-group>.btn.btn-sm{line-height:26px}.input-group>.btn>.caret,.input-group>.btn-group>.btn>.caret,.input-group>.btn.btn-sm>.caret,.input-group>.btn-group>.btn.btn-sm>.caret{margin-top:10px}.ace-file-input{position:relative;height:38px;line-height:38px;margin-bottom:9px}.ace-file-input input[type=file]{position:fixed;z-index:-2;opacity:0;filter:alpha(opacity=0)}.ace-file-input .file-label{display:block;position:absolute;top:0;left:0;right:0;height:30px;background-color:#fff;border:1px solid #d5d5d5;cursor:pointer;-webkit-box-shadow:none;box-shadow:none;-webkit-transition:all .15s;transition:all .15s}.ace-file-input .file-label:hover{-webkit-box-shadow:none;box-shadow:none;border-color:#f59942}.ace-file-input .file-label:before{display:inline-block;content:attr(data-title);position:absolute;right:0;top:0;bottom:0;padding:0 8px;line-height:24px;text-align:center;background-color:#6fb3e0;color:#FFF;font-size:11px;font-weight:bold;border:2px solid #FFF;border-left-width:4px;-webkit-transition:all .3s;transition:all .3s}.ace-file-input .file-label .file-name{display:inline-block;height:28px;max-width:80%;white-space:nowrap;overflow:hidden;line-height:28px;color:#888;font-size:13px;vertical-align:top;position:static;padding-left:30px}.ace-file-input .file-label .file-name:after{display:inline-block;content:attr(data-title)}.ace-file-input .file-label.selected{right:16px}.ace-file-input .file-label.selected .file-name{color:#666}.ace-file-input .file-label [class*="icon-"]{display:inline-block;position:absolute;left:0;top:0;bottom:0;line-height:24px;width:26px;text-align:center;font-family:FontAwesome;font-size:13px;border:2px solid #FFF;color:#FFF;-webkit-transition:all .1s;transition:all .1s;background-color:#d1d1d1}.ace-file-input .file-label.selected .file-name [class*="icon-"]{background-color:#efad62}.ace-file-input .file-label.selected .file-name .icon-picture{background-color:#bd7a9d}.ace-file-input .file-label.selected .file-name .icon-film{background-color:#87b87f}.ace-file-input .file-label.selected .file-name .icon-music{background-color:#8b7ac9}.ace-file-input .file-label.selected .file-name .icon-archive{background-color:#efad62}.ace-file-input .file-label.hide-placeholder:before{display:none}.ace-file-input a:hover{text-decoration:none}.ace-file-input .remove{position:absolute;right:-8px;top:6px;display:none;width:17px;text-align:center;height:17px;line-height:15px;font-size:11px;font-weight:normal;background-color:#fb7142;border-radius:100%;color:#FFF;text-decoration:none}.ace-file-input .file-label.selected+.remove{display:inline-block}.ace-file-multiple{height:auto}.ace-file-multiple .file-label{position:relative;height:auto;border:1px dashed #aaa;border-radius:4px;text-align:center}.ace-file-multiple .file-label:before{display:inline-block;content:attr(data-title);position:relative;right:0;left:0;margin:12px;line-height:22px;background-color:#FFF;color:#CCC;font-size:18px;font-weight:bold;border:0}.ace-file-multiple .file-label.selected .file-name [class*="icon-"]{display:inline-block;position:absolute;left:0;top:0;bottom:0;line-height:24px;width:26px;text-align:center;font-family:FontAwesome;font-size:13px;border:2px solid #FFF;color:#FFF;-webkit-transition:all .1s;transition:all .1s}.ace-file-multiple .file-label .file-name{position:relative;display:block;padding:0;height:auto;width:auto;max-width:100%;margin:0 4px;border-bottom:1px solid #DDD;text-align:left}.ace-file-multiple .file-label .file-name:first-child{margin-top:1px}.ace-file-multiple .file-label .file-name:last-child{border-bottom-width:0;margin-bottom:1px}.ace-file-multiple .file-label .file-name img{padding:2px;border:1px solid #d7d7d7;background-color:#FFF;background-repeat:no-repeat;background-position:center;margin:4px 8px 4px 1px}.ace-file-multiple .file-label .file-name:after{display:none}.ace-file-multiple .file-label.selected .file-name:after{display:inline-block;white-space:pre}.ace-file-multiple .file-label .file-name img+[class*="icon-"],.ace-file-multiple .file-label.selected .file-name img+[class*="icon-"]{display:none}.ace-file-multiple .remove{right:-11px;top:-11px;border:3px solid #BBB;border-radius:32px;background-color:#FFF;color:red;width:22px;height:22px;line-height:15px}.ace-file-multiple .file-label.selected+.remove:hover{border-color:#f4c0b1}.ace-file-multiple .file-label .file-name [class*="icon-"]{position:relative;display:block;text-align:center;height:auto;line-height:64px;width:auto;font-size:64px;color:#d5d5d5;margin:4px 0;background-color:transparent}.ace-file-multiple .file-label.selected:after{display:none}.ace-file-multiple .file-label.selected .file-name [class*="icon-"]{position:relative;margin-right:4px;margin-left:2px;line-height:24px}.ace-file-multiple .file-label .file-name.large{text-align:center;border-bottom:2px solid #222;margin:0 1px 3px}.ace-file-multiple .file-label .file-name.large:last-child{margin:0 1px;border-bottom-width:0}.ace-file-multiple .file-label .file-name.large:after{position:absolute;top:auto;bottom:0;left:0;right:0;padding:0 4px;background-color:#555;color:#FFF;opacity:.8;filter:alpha(opacity=80)}.ace-file-multiple .file-label .file-name.large img{border-width:0;margin:0;padding:0}.ace-file-input input[type=file].disabled+.file-label,.ace-file-input input[type=file][disabled]+.file-label,.ace-file-input input[type=file][readonly]+.file-label{cursor:not-allowed;background-color:#EEE}.ace-file-input input[type=file].disabled+.file-label:hover,.ace-file-input input[type=file][disabled]+.file-label:hover,.ace-file-input input[type=file][readonly]+.file-label:hover{-webkit-box-shadow:none;box-shadow:none;border-color:#e3e3e3}.ace-file-input input[type=file].disabled+.file-label:before,.ace-file-input input[type=file][disabled]+.file-label:before,.ace-file-input input[type=file][readonly]+.file-label:before{border-color:#EEE;background-color:#a1aaaf}.ace-file-input input[type=file][readonly]+.file-label{cursor:default}.ace-file-multiple input[type=file].disabled+.file-label:hover,.ace-file-multiple input[type=file][disabled]+.file-label:hover,.ace-file-multiple input[type=file][readonly]+.file-label:hover{border-color:#AAA}.ace-file-multiple input[type=file].disabled+.file-label:before,.ace-file-multiple input[type=file][disabled]+.file-label:before,.ace-file-multiple input[type=file][readonly]+.file-label:before{background-color:transparent}.ace-file-multiple input[type=file].disabled+.file-label [class*="icon-"],.ace-file-multiple input[type=file][disabled]+.file-label [class*="icon-"],.ace-file-multiple input[type=file][readonly]+.file-label [class*="icon-"]{border-color:#EEE}.ace-file-input input[type=file]{width:100% \0/;height:30px \0/;position:absolute \0/;z-index:1 \0/;filter:alpha(opacity=0);cursor:pointer \0/}.ace-file-input input[type=file]:hover+.file-label{border-color:#f59942 \0/}.ace-file-multiple input[type=file]{height:100%\0/}.ace-file-input .remove{z-index:2\0/}.form-group select,.form-group textarea,.form-group input[type="text"],.form-group input[type="password"],.form-group input[type="datetime"],.form-group input[type="datetime-local"],.form-group input[type="date"],.form-group input[type="month"],.form-group input[type="time"],.form-group input[type="week"],.form-group input[type="number"],.form-group input[type="email"],.form-group input[type="url"],.form-group input[type="search"],.form-group input[type="tel"],.form-group input[type="color"]{background:#FFF}.form-group.has-success input,.form-group.has-success select,.form-group.has-success textarea{border-color:#92bf65;color:#8bad4c;-webkit-box-shadow:none;box-shadow:none}.form-group.has-success input:focus,.form-group.has-success select:focus,.form-group.has-success textarea:focus{-webkit-box-shadow:0 0 0 2px rgba(130,188,58,0.3);box-shadow:0 0 0 2px rgba(130,188,58,0.3);color:#786;border-color:#81a85a}.form-group.has-success input:focus+[class*="icon-"],.form-group.has-success select:focus+[class*="icon-"],.form-group.has-success textarea:focus+[class*="icon-"]{color:#8bad4c}.form-group.has-success [class*="icon-"]{color:#8bad4c}.form-group.has-success .btn [class*="icon-"]{color:inherit}.form-group.has-success .control-label,.form-group.has-success .help-block,.form-group.has-success .help-inline{color:#7ba065}.form-group.has-info input,.form-group.has-info select,.form-group.has-info textarea{border-color:#64a6bc;color:#4b89aa;-webkit-box-shadow:none;box-shadow:none}.form-group.has-info input:focus,.form-group.has-info select:focus,.form-group.has-info textarea:focus{-webkit-box-shadow:0 0 0 2px rgba(58,120,188,0.3);box-shadow:0 0 0 2px rgba(58,120,188,0.3);color:#678;border-color:#5a81a8}.form-group.has-info input:focus+[class*="icon-"],.form-group.has-info select:focus+[class*="icon-"],.form-group.has-info textarea:focus+[class*="icon-"]{color:#4b89aa}.form-group.has-info [class*="icon-"]{color:#4b89aa}.form-group.has-info .btn [class*="icon-"]{color:inherit}.form-group.has-info .control-label,.form-group.has-info .help-block,.form-group.has-info .help-inline{color:#657ba0}.form-group.has-error input,.form-group.has-error select,.form-group.has-error textarea{border-color:#f09784;color:#d68273;-webkit-box-shadow:none;box-shadow:none}.form-group.has-error input:focus,.form-group.has-error select:focus,.form-group.has-error textarea:focus{-webkit-box-shadow:0 0 0 2px rgba(219,137,120,0.3);box-shadow:0 0 0 2px rgba(219,137,120,0.3);color:#866;border-color:#db8978}.form-group.has-error input:focus+[class*="icon-"],.form-group.has-error select:focus+[class*="icon-"],.form-group.has-error textarea:focus+[class*="icon-"]{color:#d68273}.form-group.has-error [class*="icon-"]{color:#d68273}.form-group.has-error .btn [class*="icon-"]{color:inherit}.form-group.has-error .control-label,.form-group.has-error .help-block,.form-group.has-error .help-inline{color:#d16e6c}.form-group.has-warning input,.form-group.has-warning select,.form-group.has-warning textarea{border-color:#e0c43a;color:#d3bd50;-webkit-box-shadow:none;box-shadow:none}.form-group.has-warning input:focus,.form-group.has-warning select:focus,.form-group.has-warning textarea:focus{-webkit-box-shadow:0 0 0 2px rgba(216,188,65,0.3);box-shadow:0 0 0 2px rgba(216,188,65,0.3);color:#875;border-color:#d8bc41}.form-group.has-warning input:focus+[class*="icon-"],.form-group.has-warning select:focus+[class*="icon-"],.form-group.has-warning textarea:focus+[class*="icon-"]{color:#d3bd50}.form-group.has-warning [class*="icon-"]{color:#d3bd50}.form-group.has-warning .btn [class*="icon-"]{color:inherit}.form-group.has-warning .control-label,.form-group.has-warning .help-block,.form-group.has-warning .help-inline{color:#d19d59}.form-group input[disabled],.form-group input:disabled{color:#848484!important;background-color:#eee!important}@media only screen and (max-width:767px){.help-inline,.input-icon+.help-inline{padding-left:0;display:block!important}}.tab-content{border:1px solid #c5d0dc;padding:16px 12px;position:relative;z-index:11}.tab-content.no-padding{padding:0}.tab-content.no-border{border:0;padding:12px}.tab-content.padding-32{padding:32px 24px}.tab-content.no-border.padding-32{padding:32px}.tab-content.padding-30{padding:30px 23px}.tab-content.no-border.padding-30{padding:30px}.tab-content.padding-28{padding:28px 21px}.tab-content.no-border.padding-28{padding:28px}.tab-content.padding-26{padding:26px 20px}.tab-content.no-border.padding-26{padding:26px}.tab-content.padding-24{padding:24px 18px}.tab-content.no-border.padding-24{padding:24px}.tab-content.padding-22{padding:22px 17px}.tab-content.no-border.padding-22{padding:22px}.tab-content.padding-20{padding:20px 15px}.tab-content.no-border.padding-20{padding:20px}.tab-content.padding-18{padding:18px 14px}.tab-content.no-border.padding-18{padding:18px}.tab-content.padding-16{padding:16px 12px}.tab-content.no-border.padding-16{padding:16px}.tab-content.padding-14{padding:14px 11px}.tab-content.no-border.padding-14{padding:14px}.tab-content.padding-12{padding:12px 9px}.tab-content.no-border.padding-12{padding:12px}.tab-content.padding-10{padding:10px 8px}.tab-content.no-border.padding-10{padding:10px}.tab-content.padding-8{padding:8px 6px}.tab-content.no-border.padding-8{padding:8px}.tab-content.padding-6{padding:6px 5px}.tab-content.no-border.padding-6{padding:6px}.tab-content.padding-4{padding:4px 3px}.tab-content.no-border.padding-4{padding:4px}.tab-content.padding-2{padding:2px 2px}.tab-content.no-border.padding-2{padding:2px}.tab-content.padding-0{padding:0}.tab-content.no-border.padding-0{padding:0}.nav-tabs.padding-32{padding-left:32px}.tabs-right>.nav-tabs.padding-32,.tabs-left>.nav-tabs.padding-32{padding-left:0;padding-top:32px}.nav-tabs.padding-30{padding-left:30px}.tabs-right>.nav-tabs.padding-30,.tabs-left>.nav-tabs.padding-30{padding-left:0;padding-top:30px}.nav-tabs.padding-28{padding-left:28px}.tabs-right>.nav-tabs.padding-28,.tabs-left>.nav-tabs.padding-28{padding-left:0;padding-top:28px}.nav-tabs.padding-26{padding-left:26px}.tabs-right>.nav-tabs.padding-26,.tabs-left>.nav-tabs.padding-26{padding-left:0;padding-top:26px}.nav-tabs.padding-24{padding-left:24px}.tabs-right>.nav-tabs.padding-24,.tabs-left>.nav-tabs.padding-24{padding-left:0;padding-top:24px}.nav-tabs.padding-22{padding-left:22px}.tabs-right>.nav-tabs.padding-22,.tabs-left>.nav-tabs.padding-22{padding-left:0;padding-top:22px}.nav-tabs.padding-20{padding-left:20px}.tabs-right>.nav-tabs.padding-20,.tabs-left>.nav-tabs.padding-20{padding-left:0;padding-top:20px}.nav-tabs.padding-18{padding-left:18px}.tabs-right>.nav-tabs.padding-18,.tabs-left>.nav-tabs.padding-18{padding-left:0;padding-top:18px}.nav-tabs.padding-16{padding-left:16px}.tabs-right>.nav-tabs.padding-16,.tabs-left>.nav-tabs.padding-16{padding-left:0;padding-top:16px}.nav-tabs.padding-14{padding-left:14px}.tabs-right>.nav-tabs.padding-14,.tabs-left>.nav-tabs.padding-14{padding-left:0;padding-top:14px}.nav-tabs.padding-12{padding-left:12px}.tabs-right>.nav-tabs.padding-12,.tabs-left>.nav-tabs.padding-12{padding-left:0;padding-top:12px}.nav-tabs.padding-10{padding-left:10px}.tabs-right>.nav-tabs.padding-10,.tabs-left>.nav-tabs.padding-10{padding-left:0;padding-top:10px}.nav-tabs.padding-8{padding-left:8px}.tabs-right>.nav-tabs.padding-8,.tabs-left>.nav-tabs.padding-8{padding-left:0;padding-top:8px}.nav-tabs.padding-6{padding-left:6px}.tabs-right>.nav-tabs.padding-6,.tabs-left>.nav-tabs.padding-6{padding-left:0;padding-top:6px}.nav-tabs.padding-4{padding-left:4px}.tabs-right>.nav-tabs.padding-4,.tabs-left>.nav-tabs.padding-4{padding-left:0;padding-top:4px}.nav-tabs.padding-2{padding-left:2px}.tabs-right>.nav-tabs.padding-2,.tabs-left>.nav-tabs.padding-2{padding-left:0;padding-top:2px}.nav-tabs{border-color:#c5d0dc;margin-bottom:0;margin-left:0;position:relative;top:1px}.nav-tabs>li>a{padding:8px 12px}.nav-tabs>li>a,.nav-tabs>li>a:focus{border-radius:0!important;background-color:#f9f9f9;color:#999;margin-right:-1px;line-height:16px;position:relative;z-index:11;border-color:#c5d0dc}.nav-tabs>li>a:hover{background-color:#FFF;color:#4c8fbd;border-color:#c5d0dc}.nav-tabs>li>a:active,.nav-tabs>li>a:focus{outline:none!important}.nav-tabs>li:first-child>a{margin-left:0}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#576373;border-color:#c5d0dc;border-top:2px solid #4c8fbd;border-bottom-color:transparent;background-color:#FFF;z-index:12;line-height:16px;margin-top:-1px;box-shadow:0 -2px 3px 0 rgba(0,0,0,0.15)}.tabs-below>.nav-tabs{top:auto;margin-bottom:0;margin-top:-1px;border-color:#c5d0dc;border-bottom-width:0}.tabs-below>.nav-tabs>li>a,.tabs-below>.nav-tabs>li>a:hover,.tabs-below>.nav-tabs>li>a:focus{border-color:#c5d0dc}.tabs-below>.nav-tabs>li.active>a,.tabs-below>.nav-tabs>li.active>a:hover,.tabs-below>.nav-tabs>li.active>a:focus{border-color:#c5d0dc;border-top-width:1px;border-bottom:2px solid #4c8fbd;border-top-color:transparent;margin-top:0;box-shadow:0 2px 3px 0 rgba(0,0,0,0.15)}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:60px}.tabs-left>.nav-tabs{top:auto;margin-bottom:0;border-color:#c5d0dc;float:left}.tabs-left>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#c5d0dc;margin:0 -1px 0 0}.tabs-left>.nav-tabs>li.active>a,.tabs-left>.nav-tabs>li.active>a:focus,.tabs-left>.nav-tabs>li.active>a:hover{border-color:#c5d0dc;border-top-width:1px;border-left:2px solid #4c8fbd;border-right-color:transparent;margin:0 -1px 0 -1px;-webkit-box-shadow:-2px 0 3px 0 rgba(0,0,0,0.15);box-shadow:-2px 0 3px 0 rgba(0,0,0,0.15)}.tabs-right>.nav-tabs{top:auto;margin-bottom:0;border-color:#c5d0dc;float:right}.tabs-right>.nav-tabs>li{float:none}.tabs-right>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#c5d0dc;margin:0 -1px}.tabs-right>.nav-tabs>li.active>a,.tabs-right>.nav-tabs>li.active>a:focus,.tabs-right>.nav-tabs>li.active>a:hover{border-color:#c5d0dc;border-top-width:1px;border-right:2px solid #4c8fbd;border-left-color:transparent;margin:0 -2px 0 -1px;-webkit-box-shadow:2px 0 3px 0 rgba(0,0,0,0.15);box-shadow:2px 0 3px 0 rgba(0,0,0,0.15)}.nav-tabs>li>a>.badge{padding:0 4px;line-height:15px;opacity:.7}.nav-tabs>li>a>[class*="icon-"]{opacity:.75}.nav-tabs>li.active>a>.badge,.nav-tabs>li.active>a>[class*="icon-"]{opacity:1}.nav-tabs li [class*=" icon-"],.nav-tabs li [class^="icon-"]{width:1.25em;display:inline-block;text-align:center}.nav-tabs>li.open .dropdown-toggle{background-color:#4f99c6;border-color:#4f99c6;color:#FFF}.nav-tabs>li.open .dropdown-toggle>[class*="icon-"]{color:#FFF!important}.tabs-left .tab-content,.tabs-right .tab-content{overflow:auto}.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover,.nav>li.dropdown.open.active>a:focus{background-color:#4f99c6;border-color:#4f99c6;color:#fff}.nav-pills .open .dropdown-toggle>[class*="icon-"],.nav>li.dropdown.open.active>a:hover>[class*="icon-"],.nav>li.dropdown.open.active>a:focus>[class*="icon-"]{color:#FFF!important}.nav-tabs>li:not(.active):not(.open)>a:not(:hover)>[class*="icon-"]:first-child.disabled{color:#909090!important}.nav-tabs.tab-size-bigger>li>a{padding-left:14px;padding-right:14px}.nav-tabs.tab-size-bigger>li>a>[class*="icon-"]:first-child{display:block;margin-bottom:6px;width:auto}.nav-tabs.tab-space-1>li>a{margin-right:1px}.nav-tabs.tab-space-2>li>a{margin-right:2px}.nav-tabs.tab-space-3>li>a{margin-right:3px}.nav-tabs.tab-space-4>li>a{margin-right:4px}.nav-tabs[class*="tab-color-"]>li>a,.nav-tabs[class*="tab-color-"]>li>a:focus,.nav-tabs[class*="tab-color-"]>li>a:hover{color:#FFF;border-color:transparent;margin-right:3px}.nav-tabs[class*="tab-color-"]>li>a>.badge{border-radius:2px}.nav-tabs[class*="tab-color-"]>li:not(.active)>a:hover{opacity:.85;border-color:rgba(0,0,0,0.15);border-bottom-color:transparent}.nav-tabs[class*="tab-color-"]>li:not(.active)>a>[class*="icon-"]:first-child{color:#FFF!important}.nav-tabs[class*="tab-color-"]>li:not(.active)>a>.badge{color:rgba(0,0,0,0.4)!important;background-color:#FFF!important;border-radius:2px}.nav-tabs.tab-color-blue>li>a,.nav-tabs.tab-color-blue>li>a:focus{background-color:#7db4d8}.nav-tabs[class*="tab-color-"]>li.active>a,.nav-tabs[class*="tab-color-"]>li.active>a:focus,.nav-tabs[class*="tab-color-"]>li.active>a:hover{background-color:#FFF;color:#4f80a0;box-shadow:none}.nav-tabs.tab-color-blue>li.active>a,.nav-tabs.tab-color-blue>li.active>a:focus,.nav-tabs.tab-color-blue>li.active>a:hover{color:#4c718a;border-color:#7db4d8 #7db4d8 transparent}.tabs-below .nav-tabs.tab-color-blue>li.active>a{border-color:transparent #7db4d8 #7db4d8}.nav-tabs.tab-color-blue{border-bottom-color:#c5d0dc}.nav-tabs.background-blue{padding-top:6px;background-color:#eff3f8;border:1px solid #c5d0dc}.tabs-below .nav-tabs.background-blue{padding-top:0;padding-bottom:6px}.tabs-below .nav-tabs.tab-color-blue{border-top:0;border-bottom-color:#c5d0dc}.accordion-style1.panel-group .panel{border-radius:0;border-color:#cdd8e3;background-color:#FFF;box-shadow:none}.accordion-style1.panel-group .panel:last-child{border-bottom-width:1px}.accordion-style1.panel-group .panel .collapse{background-color:#FFF}.accordion-style1.panel-group .panel+.panel{margin-top:2px}.accordion-style1.panel-group .panel-heading+.panel-collapse .panel-body{border-top-color:#cdd8e3!important}.accordion-style1.panel-group .panel-heading{padding:0}.accordion-style1.panel-group .panel-heading .accordion-toggle{color:#4c8fbd;background-color:#eef4f9;position:relative;font-weight:bold;font-size:13px;line-height:1;padding:10px;display:block}.accordion-style1.panel-group .panel-heading .accordion-toggle.collapsed{color:#478fca;font-weight:normal;background-color:#f9f9f9}.accordion-style1.panel-group .panel-heading .accordion-toggle:hover{color:#6ea6cc;background-color:#f1f8fd;text-decoration:none}.accordion-style1.panel-group .panel-heading .accordion-toggle:focus,.accordion-style1.panel-group .panel-heading .accordion-toggle:active{outline:0;text-decoration:none}.accordion-style1.panel-group .panel-heading .accordion-toggle>[class*="icon-"]:first-child{width:16px}.accordion-style1.panel-group .panel-heading .accordion-toggle:hover>[class*="icon-"]:first-child{text-decoration:none}.accordion-style1.panel-group .panel-body,.accordion-style1.panel-group .collapse.in>.panel-body{border-top:1px solid #cdd8e3}.accordion-style1.panel-group.no-padding{padding:0}.accordion-style2.panel-group .panel{border-width:0}.accordion-style2.panel-group .panel:last-child{border-bottom-width:0}.accordion-style2.panel-group .panel+.panel{margin-top:4px}.accordion-style2.panel-group .panel .panel-body{border-top:0}.accordion-style2.panel-group .panel-heading .accordion-toggle{background-color:#edf3f7;border:2px solid #6eaed1;border-width:0 0 0 2px}.accordion-style2.panel-group .panel-heading .accordion-toggle:hover{text-decoration:none}.accordion-style2.panel-group .panel-heading .accordion-toggle.collapsed{background-color:#f3f3f3;color:#606060;border-width:0 0 0 1px;border-color:#d9d9d9}.accordion-style2.panel-group .panel-heading .accordion-toggle.collapsed:hover{background-color:#f6f6f6;color:#438eb9;text-decoration:none}.accordion-style2.panel-group .panel-body,.accordion-style2.panel-group .collapse.in>.panel-body{border-top:0}.accordion-style2.panel-group .accordion-style2.panel-group .panel{border-bottom:1px dotted #d9d9d9}.accordion-style2.panel-group .accordion-style2.panel-group .panel:last-child{border-bottom:0}.accordion-style2.panel-group .accordion-style2.panel-group .panel .panel-heading,.accordion-style2.panel-group .accordion-style2.panel-group .panel .panel-heading .accordion-toggle{background-color:transparent;border-width:0;font-size:13px;padding-top:6px;padding-bottom:8px}.accordion-style2.panel-group .accordion-style2.panel-group .panel .panel-heading{padding-top:0;padding-bottom:0}th,td,.table-bordered{border-radius:0!important}.table thead tr{color:#707070;font-weight:normal;background:#f2f2f2;background-image:-webkit-gradient(linear,left 0,left 100%,from(#f8f8f8),to(#ececec));background-image:-webkit-linear-gradient(top,#f8f8f8,0%,#ececec,100%);background-image:-moz-linear-gradient(top,#f8f8f8 0,#ececec 100%);background-image:linear-gradient(to bottom,#f8f8f8 0,#ececec 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff8f8f8',endColorstr='#ffececec',GradientType=0)}.table thead tr th{border-color:#DDD;font-weight:bold}.table thead tr th [class*="icon-"]:first-child{margin-right:2px}.table thead tr th:first-child{border-left-color:#f1f1f1}.table thead tr th:left-child{border-right-color:#f1f1f1}.table.table-bordered thead tr th{vertical-align:middle}.table.table-bordered thead tr th:first-child{border-left-color:#DDD}th.center,td.center{text-align:center}th .lbl,td .lbl{margin-bottom:0}th .lbl:only-child,td .lbl:only-child{vertical-align:top}.table-header{background-color:#307ecc;color:#FFF;font-size:14px;line-height:38px;padding-left:12px;margin-bottom:1px}.table-header .close{margin-right:8px;margin-top:0;opacity:.45;filter:alpha(opacity=45)}.table-header .close:hover{opacity:.75;filter:alpha(opacity=75)}.dataTables_length select{width:70px;height:25px;padding:2px 3px}.dataTables_length label{font-weight:normal}.dataTables_filter{text-align:right}.dataTables_filter input[type=text]{width:125px;height:18px;line-height:18px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;padding:4px 6px}.dataTables_filter label{font-weight:normal}.dataTables_info{font-size:14px}.dataTables_paginate{text-align:right}.dataTables_paginate .pagination{margin:0 12px}.dataTables_wrapper label{display:inline-block;font-size:13px}.dataTables_wrapper input[type=text],.dataTables_wrapper select{margin-bottom:0!important;margin:0 4px}.dataTables_wrapper .row{margin:0}.dataTables_wrapper .row:first-child{padding-top:12px;padding-bottom:12px;background-color:#eff3f8}.dataTables_wrapper .row:first-child+.dataTable{border-top:1px solid #DDD;border-bottom:1px solid #DDD}.dataTables_wrapper .row:last-child{border-top:1px solid #DDD;padding-top:12px;padding-bottom:12px;background-color:#eff3f8;border-bottom:1px solid #DDD}.dataTable{margin-bottom:0}.dataTable th[class*=sort]{cursor:pointer}.dataTable th[class*=sort]:after{content:"\f0dc";display:inline-block;color:#555;font-family:FontAwesome;font-size:13px;font-weight:normal;float:right;margin-right:4px;position:relative}.dataTable th[class*=sort]:hover{color:#547ea8}.dataTable th[class*=sorting_]{color:#307ecc}.dataTable th.sorting_desc,.dataTable th.sorting_asc{background-image:-webkit-gradient(linear,left 0,left 100%,from(#eff3f8),to(#e3e7ed));background-image:-webkit-linear-gradient(top,#eff3f8,0%,#e3e7ed,100%);background-image:-moz-linear-gradient(top,#eff3f8 0,#e3e7ed 100%);background-image:linear-gradient(to bottom,#eff3f8 0,#e3e7ed 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffeff3f8',endColorstr='#ffe3e7ed',GradientType=0)}.dataTable th.sorting_desc:after{content:"\f0dd";top:-6px;color:#307ecc}.dataTable th.sorting_asc:after{content:"\f0de";top:4px;color:#307ecc}.dataTable th.sorting_disabled{cursor:inherit}.dataTable th.sorting_disabled:after{display:none}.widget-box{padding:0;-webkit-box-shadow:none;box-shadow:none;margin:3px 0;border-bottom:1px solid #CCC}@media only screen and (max-width:767px){.widget-box{margin-top:7px;margin-bottom:7px}}.widget-header{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;position:relative;min-height:38px;background:#f7f7f7;background-image:-webkit-gradient(linear,left 0,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0,#eee 100%);background-image:linear-gradient(to bottom,#fff 0,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);color:#669fc7;border:1px solid #CCC;border-bottom:1px solid #DDD;padding-left:12px}.widget-header:before,.widget-header:after{content:"";display:table;line-height:0}.widget-header:after{clear:right}.collapsed .widget-header{border-bottom-width:0}.collapsed .widget-body{display:none}.widget-header-flat{background:#f7f7f7;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.widget-header-large{min-height:49px;padding-left:18px}.widget-header-small{min-height:31px;padding-left:10px}.widget-header>.widget-caption,.widget-header>:first-child{line-height:36px;padding:0;margin:0;display:inline}.widget-header>.widget-caption>[class*="icon-"],.widget-header>:first-child>[class*="icon-"]{margin-right:5px;font-weight:normal;display:inline-block}.widget-header-large>.widget-caption,.widget-header-large>:first-child{line-height:48px}.widget-header-small>.widget-caption,.widget-header-small>:first-child{line-height:30px}.widget-toolbar{display:inline-block;padding:0 10px;line-height:37px;float:right;position:relative}.widget-header-large>.widget-toolbar{line-height:48px}.widget-header-small>.widget-toolbar{line-height:29px}.widget-toolbar.no-padding{padding:0}.widget-toolbar.padding-5{padding:0 5px}.widget-toolbar:before{display:inline-block;content:"";position:absolute;top:3px;bottom:3px;left:-1px;border:1px solid #d9d9d9;border-width:0 1px 0 0}.widget-header-large>.widget-toolbar:before{top:6px;bottom:6px}[class*="header-color-"]>.widget-toolbar:before{border-color:#EEE}.header-color-orange>.widget-toolbar:before{border-color:#FEA}.header-color-dark>.widget-toolbar:before{border-color:#222;box-shadow:-1px 0 0 rgba(255,255,255,0.2),inset 1px 0 0 rgba(255,255,255,0.1)}.widget-toolbar.no-border:before{display:none}.widget-toolbar label{display:inline-block;vertical-align:middle;margin-bottom:0}.widget-toolbar>a{font-size:14px;margin:0 1px;display:inline-block;padding:0;line-height:24px}.widget-toolbar>a:hover{text-decoration:none}.widget-header-large>.widget-toolbar>a{font-size:15px;margin:0 1px}.widget-toolbar>.btn{line-height:27px;margin-top:-2px}.widget-toolbar>.btn.smaller{line-height:26px}.widget-toolbar>.btn.bigger{line-height:28px}.widget-toolbar>.btn-sm{line-height:24px}.widget-toolbar>.btn-sm.smaller{line-height:23px}.widget-toolbar>.btn-sm.bigger{line-height:25px}.widget-toolbar>.btn-xs{line-height:22px}.widget-toolbar>.btn-xs.smaller{line-height:21px}.widget-toolbar>.btn-xs.bigger{line-height:23px}.widget-toolbar>.btn-minier{line-height:18px}.widget-toolbar>.btn-minier.smaller{line-height:17px}.widget-toolbar>.btn-minier.bigger{line-height:19px}.widget-toolbar>.btn-lg{line-height:36px}.widget-toolbar>.btn-lg.smaller{line-height:34px}.widget-toolbar>.btn-lg.bigger{line-height:38px}.widget-toolbar-dark{background:#444}.widget-toolbar-light{background:rgba(255,255,255,0.85)}.widget-toolbar>[data-action]>[class*="icon-"]{margin-right:0}.widget-toolbar>[data-action]:focus{text-decoration:none}[class*="header-color-"]>.widget-toolbar>[data-action]{text-shadow:0 1px 1px rgba(0,0,0,0.2)}[class*="header-color-"]>.widget-toolbar>[data-action="settings"]{color:#d3e4ed}[class*="header-color-"]>.widget-toolbar>[data-action="reload"]{color:#deead3}[class*="header-color-"]>.widget-toolbar>[data-action="collapse"]{color:#e2e2e2}[class*="header-color-"]>.widget-toolbar>[data-action="close"]{color:#ffd9d5}.header-color-orange>.widget-toolbar>[data-action]{text-shadow:none}.header-color-orange>.widget-toolbar>[data-action="settings"]{color:#559aab}.header-color-orange>.widget-toolbar>[data-action="reload"]{color:#7ca362}.header-color-orange>.widget-toolbar>[data-action="collapse"]{color:#777}.header-color-orange>.widget-toolbar>[data-action="close"]{color:#a05656}.widget-toolbar>[data-action="settings"],.header-color-dark>.widget-toolbar>[data-action="settings"]{color:#99cadb}.widget-toolbar>[data-action="reload"],.header-color-dark>.widget-toolbar>[data-action="reload"]{color:#acd392}.widget-toolbar>[data-action="collapse"],.header-color-dark>.widget-toolbar>[data-action="collapse"]{color:#aaa}.widget-toolbar>[data-action="close"],.header-color-dark>.widget-toolbar>[data-action="close"]{color:#e09e96}.widget-body{border:1px solid #CCC;border-top:0;background-color:#FFF}.widget-main{padding:12px}.widget-main.padding-32{padding:32px}.widget-main.padding-30{padding:30px}.widget-main.padding-28{padding:28px}.widget-main.padding-26{padding:26px}.widget-main.padding-24{padding:24px}.widget-main.padding-22{padding:22px}.widget-main.padding-20{padding:20px}.widget-main.padding-18{padding:18px}.widget-main.padding-16{padding:16px}.widget-main.padding-14{padding:14px}.widget-main.padding-12{padding:12px}.widget-main.padding-10{padding:10px}.widget-main.padding-8{padding:8px}.widget-main.padding-6{padding:6px}.widget-main.padding-4{padding:4px}.widget-main.padding-2{padding:2px}.widget-main.padding-0{padding:0}.widget-main.no-padding{padding:0}.widget-toolbar .progress{vertical-align:middle;display:inline-block;margin:0}.widget-toolbar>.dropdown,.widget-toolbar>.dropup{display:inline-block}.widget-toolbar>.dropdown>.dropdown-menu:before,.dropdown-menu.dropdown-caret:before{border-bottom:7px solid rgba(0,0,0,0.2);border-left:7px solid transparent;border-right:7px solid transparent;content:"";display:inline-block;left:9px;position:absolute;top:-7px}.widget-toolbar>.dropdown>.dropdown-menu:after,.dropdown-menu.dropdown-caret:after{border-bottom:6px solid #fff;border-left:6px solid transparent;border-right:6px solid transparent;content:"";display:inline-block;left:10px;position:absolute;top:-6px}.widget-toolbar>.dropdown>.dropdown-menu.pull-right:before,.dropdown-menu.pull-right.dropdown-caret:before{left:auto;right:9px}.widget-toolbar>.dropdown>.dropdown-menu.pull-right:after,.dropdown-menu.pull-right.dropdown-caret:after{left:auto;right:10px}.widget-header[class*="header-color-"]{color:#FFF;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.header-color-blue{background:#307ecc;border-color:#307ecc}.header-color-blue+.widget-body{border-color:#307ecc}.header-color-blue2{background:#5090c1;border-color:#5090c1}.header-color-blue2+.widget-body{border-color:#5090c1}.header-color-blue3{background:#6379aa;border-color:#6379aa}.header-color-blue3+.widget-body{border-color:#6379aa}.header-color-green{background:#82af6f;border-color:#82af6f}.header-color-green+.widget-body{border-color:#82af6f}.header-color-green2{background:#2e8965;border-color:#2e8965}.header-color-green2+.widget-body{border-color:#2e8965}.header-color-green3{background:#4ebc30;border-color:#4ebc30}.header-color-green3+.widget-body{border-color:#4ebc30}.header-color-red{background:#e2755f;border-color:#e2755f}.header-color-red+.widget-body{border-color:#e2755f}.header-color-red2{background:#e04141;border-color:#e04141}.header-color-red2+.widget-body{border-color:#e04141}.header-color-red3{background:#d15b47;border-color:#d15b47}.header-color-red3+.widget-body{border-color:#d15b47}.header-color-purple{background:#7e6eb0;border-color:#7e6eb0}.header-color-purple+.widget-body{border-color:#7e6eb0}.header-color-pink{background:#ce6f9e;border-color:#ce6f9e}.header-color-pink+.widget-body{border-color:#ce6f9e}.header-color-orange{background:#ffc657;border-color:#e8b10d;color:#855d10!important}.header-color-orange+.widget-body{border-color:#e8b10d}.header-color-dark{background:#404040;border-color:#454545}.header-color-dark+.widget-body{border-color:#666}.header-color-grey{background:#848484;border-color:#989898}.header-color-grey+.widget-body{border-color:#aaa}.widget-box.light-border>[class*="header-color-"]+.widget-body{border-color:#d6d6d6!important}.widget-box.no-border{border-bottom:0}.widget-box.no-border>.widget-body{border:0}.widget-box.transparent{border:0;box-shadow:none}.widget-box.transparent>.widget-header{background:0;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);border:0;border-bottom:1px solid #dce8f1;color:#4383b4;padding-left:3px}.widget-box.transparent>.widget-header-large{padding-left:5px}.widget-box.transparent>.widget-header-small{padding-left:1px}.widget-box.transparent .widget-body{border:0;background-color:transparent}.widget-box.transparent .widget-main.no-padding-left{padding-left:0}.widget-box.transparent .widget-main.no-padding-right{padding-right:0}.widget-box.transparent .widget-main.no-padding-top{padding-top:0}.widget-box.transparent .widget-main.no-padding-bottom{padding-bottom:0}.widget-body .table{border-top:1px solid #e5e5e5}.widget-body .table thead:first-child tr{background:#FFF}[class*="header-color-"]+.widget-body .table thead:first-child tr{background:#f2f2f2;background-image:-webkit-gradient(linear,left 0,left 100%,from(#f8f8f8),to(#ececec));background-image:-webkit-linear-gradient(top,#f8f8f8,0%,#ececec,100%);background-image:-moz-linear-gradient(top,#f8f8f8 0,#ececec 100%);background-image:linear-gradient(to bottom,#f8f8f8 0,#ececec 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff8f8f8',endColorstr='#ffececec',GradientType=0)}.widget-body .table.table-bordered thead:first-child>tr{border-top:0}.widget-main.no-padding .table,.widget-main.padding-0 .table{margin-bottom:0;border:0}.widget-main.no-padding .table-bordered th:first-child,.widget-main.padding-0 .table-bordered th:first-child,.widget-main.no-padding .table-bordered td:first-child,.widget-main.padding-0 .table-bordered td:first-child{border-left-width:0}.transparent .widget-main .table-bordered>thead>tr>th:last-child,.widget-main.no-padding .table-bordered>thead>tr>th:last-child,.transparent .widget-main .table-bordered>tbody>tr>td:last-child,.widget-main.no-padding .table-bordered>tbody>tr>td:last-child,.transparent .widget-main .table-bordered>tfoot>tr>td:last-child,.widget-main.no-padding .table-bordered>tfoot>tr>td:last-child{border-right-width:0!important}.transparent .widget-main .table-bordered>tbody>tr:last-child>td,.widget-main.no-padding .table-bordered>tbody>tr:last-child>td{border-bottom-width:0!important}.table-bordered>thead.thin-border-bottom>tr>th,.table-bordered>thead.thin-border-bottom>tr>td{border-bottom-width:1px}.widget-body .alert:last-child{margin-bottom:0}.widget-main .tab-content{border:0}.widget-toolbar>.nav-tabs{border-bottom:0;margin-bottom:0;position:relative;top:5px}.widget-toolbar>.nav-tabs>li>a{box-shadow:none}.widget-toolbar>.nav-tabs>li:not(.active)>a{border-color:transparent;background-color:transparent}.widget-toolbar>.nav-tabs>li:not(.active)>a:hover{background-color:transparent}.widget-toolbar>.nav-tabs>li.active>a{background-color:#FFF;border-bottom-color:transparent;box-shadow:none}.widget-header-small>.widget-toolbar>.nav-tabs{top:5px}.widget-header-small>.widget-toolbar>.nav-tabs>li>a{line-height:16px;padding-top:6px;padding-bottom:6px}.widget-header-small>.widget-toolbar>.nav-tabs>li.active>a{border-top-width:2px;margin-top:-1px}.widget-header-large>.widget-toolbar>.nav-tabs{top:8px}.widget-header-large>.widget-toolbar>.nav-tabs>li>a{line-height:22px;padding-top:9px;padding-bottom:9px}[class*="header-color-"]>.widget-toolbar>.nav-tabs>li>a{border-color:transparent;background-color:transparent;color:#FFF;margin-right:1px}[class*="header-color-"]>.widget-toolbar>.nav-tabs>li>a:hover{background-color:#FFF;color:#555;border-top-color:#FFF}[class*="header-color-"]>.widget-toolbar>.nav-tabs>li.active>a{background-color:#FFF;color:#555;border-top-width:1px;margin-top:0}.header-color-orange>.widget-toolbar>.nav-tabs>li>a{color:#855d10}.transparent .widget-toolbar>.nav-tabs>li>a{color:#555;background-color:transparent;border-right:1px solid transparent;border-left:1px solid transparent}.transparent .widget-toolbar>.nav-tabs>li.active>a{border-top-color:#4c8fbd;border-right:1px solid #c5d0dc;border-left:1px solid #c5d0dc;background-color:#FFF;box-shadow:none}.widget-toolbox{background-color:#EEE}.widget-toolbox:first-child{padding:2px;border-bottom:1px solid #CCC}.widget-toolbox:last-child{padding:2px;border-top:1px solid #CCC}.transparent .widget-toolbox:last-child{border:0;border-top:1px solid #CCC}.widget-toolbox>.btn-toolbar{margin:0;padding:0}.widget-toolbox.center{text-align:center}.widget-toolbox.padding-16{padding:16px}.widget-toolbox.padding-14{padding:14px}.widget-toolbox.padding-12{padding:12px}.widget-toolbox.padding-10{padding:10px}.widget-toolbox.padding-8{padding:8px}.widget-toolbox.padding-6{padding:6px}.widget-toolbox.padding-4{padding:4px}.widget-toolbox.padding-2{padding:2px}.widget-toolbox.padding-0{padding:0}.widget-box-overlay{position:absolute;top:0;bottom:0;right:0;left:0;background-color:rgba(0,0,0,0.3);z-index:21}.widget-box-overlay>[class*="icon-"]{position:absolute;top:15%;left:0;right:0;text-align:center}.widget-box.collapsed .widget-box-overlay>[class*="icon-"]{top:5%}.widget-box-overlay>.icon-spin{-moz-animation-duration:1.2s;-webkit-animation-duration:1.2s;-o-animation-duration:1.2s;-ms-animation-duration:1.2s;animation-duration:1.2s}.widget-main>form{margin-bottom:0}.widget-main>form .input-append,.widget-main>form .input-prepend{margin-bottom:0}.widget-main.no-padding>form>fieldset,.widget-main.padding-0>form>fieldset{padding:16px}.widget-main.no-padding>form>fieldset+.form-actions,.widget-main.padding-0>form>fieldset+.form-actions{padding:10px 0 12px}.widget-main.no-padding>form>.form-actions,.widget-main.padding-0>form>.form-actions{margin:0;padding:10px 12px 12px}.widget-placeholder{border:2px dashed #d9d9d9}.tooltip.in{opacity:1;filter:alpha(opacity=100)}.tooltip-inner{background-color:#333;color:#FFF;font-size:12px;text-shadow:1px 1px 0 rgba(42,45,50,0.5);border-radius:0;padding:5px 9px}.tooltip.top .tooltip-arrow{border-top-color:#333}.tooltip.right .tooltip-arrow{border-right-color:#333}.tooltip.left .tooltip-arrow{border-left-color:#333}.tooltip.bottom .tooltip-arrow{border-bottom-color:#333}.tooltip-error+.tooltip>.tooltip-inner{background-color:#c94d32;color:#FFF;text-shadow:1px 1px 0 rgba(100,60,20,0.3);border-radius:0}.tooltip-error+.tooltip.top .tooltip-arrow{border-top-color:#c94d32}.tooltip-error+.tooltip.right .tooltip-arrow{border-right-color:#c94d32}.tooltip-error+.tooltip.left .tooltip-arrow{border-left-color:#c94d32}.tooltip-error+.tooltip.bottom .tooltip-arrow{border-bottom-color:#c94d32}.tooltip-success+.tooltip>.tooltip-inner{background-color:#629b58;color:#FFF;text-shadow:1px 1px 0 rgba(60,100,20,0.3);border-radius:0}.tooltip-success+.tooltip.top .tooltip-arrow{border-top-color:#629b58}.tooltip-success+.tooltip.right .tooltip-arrow{border-right-color:#629b58}.tooltip-success+.tooltip.left .tooltip-arrow{border-left-color:#629b58}.tooltip-success+.tooltip.bottom .tooltip-arrow{border-bottom-color:#629b58}.tooltip-warning+.tooltip>.tooltip-inner{background-color:#ed9421;color:#FFF;text-shadow:1px 1px 0 rgba(100,90,10,0.3);border-radius:0}.tooltip-warning+.tooltip.top .tooltip-arrow{border-top-color:#ed9421}.tooltip-warning+.tooltip.right .tooltip-arrow{border-right-color:#ed9421}.tooltip-warning+.tooltip.left .tooltip-arrow{border-left-color:#ed9421}.tooltip-warning+.tooltip.bottom .tooltip-arrow{border-bottom-color:#ed9421}.tooltip-info+.tooltip>.tooltip-inner{background-color:#4b89aa;color:#FFF;text-shadow:1px 1px 0 rgba(40,50,100,0.3);border-radius:0}.tooltip-info+.tooltip.top .tooltip-arrow{border-top-color:#4b89aa}.tooltip-info+.tooltip.right .tooltip-arrow{border-right-color:#4b89aa}.tooltip-info+.tooltip.left .tooltip-arrow{border-left-color:#4b89aa}.tooltip-info+.tooltip.bottom .tooltip-arrow{border-bottom-color:#4b89aa}.popover{border-radius:0;padding:0;border-color:#ccc;border-width:1px;-webkit-box-shadow:0 0 4px 2px rgba(0,0,0,0.2);box-shadow:0 0 4px 2px rgba(0,0,0,0.2);color:#4d6883}.popover-title{border-radius:0;background-color:#eff3f8;color:#555;border-bottom:1px solid #dfe3e8;text-shadow:1px 1px 1px rgba(220,220,220,0.2)}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-bottom-color:#eff3f8;border-top-width:0}.tooltip-error+.popover{color:#555;border:1px solid #f7f0ef}.tooltip-error+.popover .popover-title{background-color:#f7f0ef;border-bottom-color:#e8e0df;color:#b75445;text-shadow:none}.tooltip-warning+.popover{color:#555;border:1px solid #f4eee3}.tooltip-warning+.popover .popover-title{background-color:#f4eee3;border-bottom-color:#e4dcd3;color:#d67e31;text-shadow:none}.tooltip-success+.popover{color:#555;border:1px solid #e8f2e3}.tooltip-success+.popover .popover-title{background-color:#e8f2e3;border-bottom-color:#d8e2d3;color:#629b58;text-shadow:none}.tooltip-info+.popover{color:#555;border:1px solid #e5edf8}.tooltip-info+.popover .popover-title{background-color:#e5edf8;border-bottom-color:#d5dde8;color:#3f79b6;text-shadow:none}.popover-notitle+.popover .popover-title{display:none}.popover-notitle+.popover.top .arrow:after{border-top-color:#FFF}.popover-notitle+.popover.bottom .arrow:after{border-bottom-color:#FFF}.popover-notitle+.popover.left .arrow:after{border-left-color:#FFF}.popover-notitle+.popover.right .arrow:after{border-left-color:#FFF}.progress{border-radius:0;-webkit-box-shadow:none;box-shadow:none;background:#dadada;height:18px}.progress .progress-bar{-webkit-box-shadow:none;box-shadow:none;line-height:18px}.progress[data-percent]{position:relative}.progress[data-percent]:after{display:inline-block;content:attr(data-percent);color:#FFF;position:absolute;left:0;right:0;top:0;bottom:0;line-height:16px;text-align:center;font-size:12px;font-family:Verdana}.progress.progress-yellow[data-percent]:after{color:#963}.progress.progress-small{height:12px}.progress.progress-small .progress-bar{line-height:10px;font-size:11px}.progress.progress-small[data-percent]:after{line-height:10px;font-size:11px}.progress.progress-mini{height:9px}.progress.progress-mini .progress-bar{line-height:8px;font-size:11px}.progress.progress-mini[data-percent]:after{line-height:8px;font-size:11px}.progress-bar{background-color:#2a91d8}.progress-striped .progress-bar{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#ca5952}.progress-striped .progress-bar-danger{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-success{background-color:#59a84b}.progress-striped .progress-bar-success{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f2bb46}.progress-striped .progress-bar-warning{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-pink{background-color:#d6487e}.progress-striped .progress-bar-pink{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-purple{background-color:#9585bf}.progress-striped .progress-bar-purple{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-yellow{background-color:#ffd259}.progress-striped .progress-bar-yellow{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-inverse{background-color:#404040}.progress-striped .progress-bar-inverse{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-grey{background-color:#8a8a8a}.progress-striped .progress-bar-grey{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress{position:relative}.progress:before{display:inline-block;content:"";position:absolute;left:0;right:0;top:0;bottom:0;background:radial-gradient(9px 9px 0deg,circle cover,#0ff 0,rgba(0,0,255,0) 100%,#00f 95%)}.infobox-container{text-align:center;font-size:0}.infobox{display:inline-block;width:210px;height:66px;color:#555;background-color:#FFF;box-shadow:none;border-radius:0;margin:-1px 0 0 -1px;padding:8px 3px 6px 9px;border:1px dotted;border-color:#d8d8d8!important;vertical-align:middle;text-align:left;position:relative}.infobox>.infobox-icon{display:inline-block;vertical-align:top;width:44px}.infobox>.infobox-icon>[class*="icon-"]{display:inline-block;height:42px;margin:0;padding:1px 1px 0 2px;background-color:transparent;border:0;text-align:center;position:relative;border-radius:100%;-webkit-box-shadow:1px 1px 0 rgba(0,0,0,0.2);box-shadow:1px 1px 0 rgba(0,0,0,0.2)}.infobox>.infobox-icon>[class*="icon-"]:before{font-size:24px;display:block;padding:6px 0 7px;width:40px;text-align:center;border-radius:100%;color:rgba(255,255,255,0.9);background-color:rgba(255,255,255,0.2);text-shadow:1px 1px 1px rgba(0,0,0,0.14)}.infobox .infobox-content{color:#555}.infobox .infobox-content:first-child{font-weight:bold}.infobox>.infobox-data{display:inline-block;border:0;border-top-width:0;font-size:13px;text-align:left;line-height:21px;min-width:130px;padding-left:8px;position:relative;top:0}.infobox>.infobox-data>.infobox-data-number{display:block;font-size:22px;margin:2px 0 4px;position:relative;text-shadow:1px 1px 0 rgba(0,0,0,0.15)}.infobox>.infobox-data>.infobox-text{display:block;font-size:16px;margin:2px 0 4px;position:relative;text-shadow:none}.infobox.no-border{border:none!important}@media only screen and (max-width:460px){.infobox{min-width:95%;margin-top:2px;margin-bottom:2px}}.infobox-purple{color:#6f3cc4;border-color:#6f3cc4}.infobox-purple>.infobox-icon>[class*="icon-"]{background-color:#6f3cc4}.infobox-purple.infobox-dark{background-color:#6f3cc4;border-color:#6f3cc4}.infobox-purple2{color:#5f47b0;border-color:#5f47b0}.infobox-purple2>.infobox-icon>[class*="icon-"]{background-color:#5f47b0}.infobox-purple2.infobox-dark{background-color:#5f47b0;border-color:#5f47b0}.infobox-pink{color:#cb6fd7;border-color:#cb6fd7}.infobox-pink>.infobox-icon>[class*="icon-"]{background-color:#cb6fd7}.infobox-pink.infobox-dark{background-color:#cb6fd7;border-color:#cb6fd7}.infobox-blue{color:#6fb3e0;border-color:#6fb3e0}.infobox-blue>.infobox-icon>[class*="icon-"]{background-color:#6fb3e0}.infobox-blue.infobox-dark{background-color:#6fb3e0;border-color:#6fb3e0}.infobox-blue2{color:#3983c2;border-color:#3983c2}.infobox-blue2>.infobox-icon>[class*="icon-"]{background-color:#3983c2}.infobox-blue2.infobox-dark{background-color:#3983c2;border-color:#3983c2}.infobox-blue3{color:#1144eb;border-color:#1144eb}.infobox-blue3>.infobox-icon>[class*="icon-"]{background-color:#1144eb}.infobox-blue3.infobox-dark{background-color:#1144eb;border-color:#1144eb}.infobox-red{color:#d53f40;border-color:#d53f40}.infobox-red>.infobox-icon>[class*="icon-"]{background-color:#d53f40}.infobox-red.infobox-dark{background-color:#d53f40;border-color:#d53f40}.infobox-brown{color:#c67a3e;border-color:#c67a3e}.infobox-brown>.infobox-icon>[class*="icon-"]{background-color:#c67a3e}.infobox-brown.infobox-dark{background-color:#c67a3e;border-color:#c67a3e}.infobox-wood{color:#7b3f25;border-color:#7b3f25}.infobox-wood>.infobox-icon>[class*="icon-"]{background-color:#7b3f25}.infobox-wood.infobox-dark{background-color:#7b3f25;border-color:#7b3f25}.infobox-light-brown{color:#cebea5;border-color:#cebea5}.infobox-light-brown>.infobox-icon>[class*="icon-"]{background-color:#cebea5}.infobox-light-brown.infobox-dark{background-color:#cebea5;border-color:#cebea5}.infobox-orange{color:#e8b110;border-color:#e8b110}.infobox-orange>.infobox-icon>[class*="icon-"]{background-color:#e8b110}.infobox-orange.infobox-dark{background-color:#e8b110;border-color:#e8b110}.infobox-orange2{color:#f79263;border-color:#f79263}.infobox-orange2>.infobox-icon>[class*="icon-"]{background-color:#f79263}.infobox-orange2.infobox-dark{background-color:#f79263;border-color:#f79263}.infobox-green{color:#9abc32;border-color:#9abc32}.infobox-green>.infobox-icon>[class*="icon-"]{background-color:#9abc32}.infobox-green.infobox-dark{background-color:#9abc32;border-color:#9abc32}.infobox-green2{color:#0490a6;border-color:#0490a6}.infobox-green2>.infobox-icon>[class*="icon-"]{background-color:#0490a6}.infobox-green2.infobox-dark{background-color:#0490a6;border-color:#0490a6}.infobox-grey{color:#999;border-color:#999}.infobox-grey>.infobox-icon>[class*="icon-"]{background-color:#999}.infobox-grey.infobox-dark{background-color:#999;border-color:#999}.infobox-black{color:#393939;border-color:#393939}.infobox-black>.infobox-icon>[class*="icon-"]{background-color:#393939}.infobox-black.infobox-dark{background-color:#393939;border-color:#393939}.infobox-dark{margin:1px 1px 0 0;border-color:transparent!important;border:0;color:#FFF;padding:4px}.infobox-dark>.infobox-icon>[class*="icon-"],.infobox-dark>.infobox-icon>[class*="icon-"]:before{background-color:transparent;box-shadow:none;text-shadow:none;border-radius:0;font-size:30px}.infobox-dark>.infobox-icon>[class*="icon-"]:before{opacity:1;filter:alpha(opacity=100)}.infobox-dark .infobox-content{color:#FFF}.infobox>.infobox-progress{padding-top:0;display:inline-block;vertical-align:top;width:44px}.infobox>.infobox-chart{padding-top:0;display:inline-block;vertical-align:text-bottom;width:44px;text-align:center}.infobox>.infobox-chart>.sparkline{font-size:24px}.infobox>.infobox-chart canvas{vertical-align:middle!important}.infobox>.stat{display:inline-block;position:absolute;right:20px;top:11px;text-shadow:none;color:#abbac3;font-size:13px;font-weight:bold;padding-right:18px;padding-top:3px}.infobox>.stat:before{display:inline-block;content:"";width:8px;height:11px;background-color:#abbac3;position:absolute;right:4px;top:7px}.infobox>.stat:after{display:inline-block;content:"";position:absolute;right:1px;top:-8px;border:12px solid transparent;border-width:8px 7px;border-bottom-color:#abbac3}.infobox>.stat.stat-success{color:#77c646}.infobox>.stat.stat-success:before{background-color:#77c646}.infobox>.stat.stat-success:after{border-bottom-color:#77c646}.infobox>.stat.stat-important{color:#e4564f}.infobox>.stat.stat-important:before{background-color:#e4564f;top:3px}.infobox>.stat.stat-important:after{border-top-color:#e4564f;border-bottom-color:transparent;bottom:-6px;top:auto}.infobox.infobox-dark>.stat{color:#FFF}.infobox.infobox-dark>.stat:before{background-color:#e1e5e8}.infobox.infobox-dark>.stat:after{border-bottom-color:#e1e5e8}.infobox.infobox-dark>.stat.stat-success{color:#FFF}.infobox.infobox-dark>.stat.stat-success:before{background-color:#d0e29e}.infobox.infobox-dark>.stat.stat-success:after{border-bottom-color:#d0e29e}.infobox.infobox-dark>.stat.stat-important{color:#FFF}.infobox.infobox-dark>.stat.stat-important:before{background-color:#ff8482;top:3px}.infobox.infobox-dark>.stat.stat-important:after{border-top-color:#ff8482;border-bottom-color:transparent;bottom:-6px;top:auto}.infobox>.badge{position:absolute;right:20px;top:11px;border-radius:0;text-shadow:none;color:#FFF;font-size:11px;font-weight:bold;line-height:15px;height:16px;padding:0 1px}.infobox.infobox-dark>.badge{color:#FFF;background-color:rgba(255,255,255,0.2)!important;border:1px solid #f1f1f1;top:2px;right:2px}.infobox.infobox-dark>.badge.badge-success>[class*="icon-"]{color:#c6e9a1}.infobox.infobox-dark>.badge.badge-important>[class*="icon-"]{color:#ecb792}.infobox.infobox-dark>.badge.badge-warning>[class*="icon-"]{color:#ecb792}.infobox-small{width:135px;height:52px;text-align:left;padding-bottom:5px}.infobox-small>.infobox-icon,.infobox-small>.infobox-chart,.infobox-small>.infobox-progress{display:inline-block;width:40px;max-width:40px;height:42px;line-height:38px;vertical-align:middle}.infobox-small>.infobox-data{display:inline-block;text-align:left;vertical-align:middle;max-width:72px;min-width:0}.infobox-small>.infobox-chart>.sparkline{font-size:14px;margin-left:2px}.percentage{font-size:14px;font-weight:bold;display:inline-block;vertical-align:top}.infobox-small .percentage{font-size:13px;font-weight:normal;margin-top:2px;margin-left:2px}.pricing-box:not(:first-child){padding-left:7px}.pricing-box:not(:last-child){padding-right:7px}.pricing-box .price{font-size:22px;line-height:20px;height:28px;text-align:center;color:#555}.pricing-box .price small{font-size:14px}.pricing-box .btn{font-size:16px}.pricing-box .widget-header{text-align:center;padding-left:0}@media only screen and (max-width:768px){.pricing-box{margin:0;margin-bottom:16px;padding-left:0!important;padding-right:0!important;margin-left:-1px}.pricing-box:nth-child(odd){padding-left:12px!important}.pricing-box:nth-child(even){padding-right:12px!important}}@media only screen and (max-width:460px){.pricing-box{margin:0;margin-bottom:16px;width:100%;padding-left:12px!important;padding-right:12px!important}}.pricing-table-header{padding-top:0;margin-top:0;text-align:left}.pricing-table-header>li{padding:7px 0 7px 11px;font-size:13px}.pricing-table{margin-top:0}.pricing-table>li{text-align:center;padding:7px 0;font-size:13px}.list-striped>li:nth-child(odd){background-color:#FFF}.list-striped>li:nth-child(even){background-color:#f2f3eb}.list-striped.pricing-table-header>li:nth-child(even){background-color:#EEE}.pricing-box-small{box-shadow:none;margin-left:-2px;background-color:#FFF;position:relative;z-index:10}.pricing-box-small .price{line-height:20px;height:28px;text-align:center}.pricing-box-small .price .label:before,.pricing-box-small .price .label:after{margin-top:-2px;opacity:.9;filter:alpha(opacity=90)}.pricing-box-small:hover{box-shadow:0 0 4px 2px rgba(0,0,0,0.15);z-index:11;-webkit-transform:scale(1.04);-ms-transform:scale(1.04);transform:scale(1.04)}.pricing-box-small:hover .price>.label{-webkit-transform:scale(0.96);-ms-transform:scale(0.96);transform:scale(0.96)}.pricing-span{margin:0;width:19%;max-width:150px!important;min-width:110px!important;float:left!important}.pricing-span-header{padding-right:0}@media only screen and (min-width:481px){.pricing-span-body{padding-left:0;padding-right:0}}@media only screen and (max-width:480px){.pricing-span-header,.pricing-span-body{width:100%;padding-right:12px}}.login-container{width:375px;margin:0 auto}.login-layout{background-color:#1d2024}.login-layout .main-container:after{display:none}.login-layout .main-content{margin-left:0;min-height:100%;padding-left:15px;padding-right:15px}.login-layout label{margin-bottom:11px}.login-layout .widget-box{visibility:hidden;position:absolute;overflow:hidden;width:100%;border-bottom:0;box-shadow:none;padding:6px;background-color:#394557;-moz-transform:scale(0,1) translate(-150px);-webkit-transform:scale(0,1) translate(-150px);-o-transform:scale(0,1) translate(-150px);-ms-transform:scale(0,1) translate(-150px);transform:scale(0,1) translate(-150px)}.login-layout .widget-box.visible{visibility:visible;-moz-transform:scale(1,1) translate(0);-webkit-transform:scale(1,1) translate(0);-o-transform:scale(1,1) translate(0);-ms-transform:scale(1,1) translate(0);transform:scale(1,1) translate(0);-webkit-transition:all .3s ease;transition:all .3s ease;-o-transition:none;-webkit-transition:none}.login-layout .widget-box .widget-main{padding:16px 36px 36px;background:#f7f7f7}.login-layout .widget-box .widget-main form{margin:0}.login-layout .widget-box .widget-body .toolbar>div>a{font-size:15px;font-weight:400;text-shadow:1px 0 1px rgba(0,0,0,0.25)}.login-box .forgot-password-link{color:#FE9}.login-box .user-signup-link{color:#CF7}.login-box .toolbar{background:#5090c1;border-top:2px solid #597597}.login-box .toolbar>div{width:50%;display:inline-block;padding:9px 0 11px}.login-box .toolbar>div:first-child{float:left;text-align:left}.login-box .toolbar>div:first-child>a{margin-left:11px}.login-box .toolbar>div:first-child+div{float:right;text-align:right}.login-box .toolbar>div:first-child+div>a{margin-right:11px}.forgot-box .toolbar{background:#c16050;border-top:2px solid #976559;padding:9px 18px}.signup-box .toolbar{background:#76b774;border-top:2px solid #759759;padding:9px 18px}.forgot-box .back-to-login-link,.signup-box .back-to-login-link{color:#FE9;font-size:14px;font-weight:bold;text-shadow:1px 0 1px rgba(0,0,0,0.25)}.login-layout .login-box .widget-main{padding-bottom:16px}.login-box .social-or-login{margin-top:4px;position:relative;z-index:1}.login-box .social-or-login :first-child{display:inline-block;background:#f7f7f7;padding:0 8px;color:#5090c1;font-size:13px}.login-box .social-or-login:before{content:"";display:block;position:absolute;z-index:-1;top:50%;left:0;right:0;border-top:1px dotted #a6c4db}.login-box .social-login{margin-top:12px}.login-box .social-login a{border-radius:100%;width:42px;height:42px;line-height:46px;padding:0;margin:0 1px;border:0}.login-box .social-login a>[class*="icon-"]{font-size:24px;margin:0}@media only screen and (max-width:480px){.login-layout .widget-box .widget-main{padding:16px}}@media only screen and (max-width:480px){.login-container{width:98%}.login-layout .widget-box{padding:0}.login-box .toolbar>div{width:auto}}@media only screen and (max-width:767px){.login-layout .widget-box.visible{-webkit-transition:none;transition:none}}.invoice-info{line-height:24px!important;color:#444;vertical-align:bottom;margin-left:9px;margin-right:9px}.invoice-info-label{display:inline-block;max-width:100px;text-align:right;font-size:14px}.invoice-box .label-large[class*="arrowed"]{margin-left:11px!important;max-width:95%}.error-container{margin:20px;padding:0;background:#FFF}.ace-thumbnails{list-style:none;margin:0;padding:0}.ace-thumbnails>li{float:left;display:block;position:relative;overflow:hidden;margin:2px;border:2px solid #333}.ace-thumbnails>li>:first-child{display:block;position:relative}.ace-thumbnails>li .tags{display:inline-block;position:absolute;bottom:0;right:0;left:0;overflow:visible;direction:rtl;padding:0;margin:0;height:auto;width:auto;background-color:transparent;border:0;vertical-align:inherit}.ace-thumbnails>li .tags>.label-holder{opacity:.92;filter:alpha(opacity=92);display:table;margin:1px 0 0 0;direction:ltr;text-align:left}.ace-thumbnails>li .tags>.label-holder:hover{opacity:1;filter:alpha(opacity=100)}.ace-thumbnails>li>.tools{position:absolute;top:0;bottom:0;left:-30px;width:24px;background-color:rgba(0,0,0,0.55);text-align:center;vertical-align:middle;-webkit-transition:all .2s ease;transition:all .2s ease}.ace-thumbnails>li>.tools.tools-right{left:auto;right:-30px}.ace-thumbnails>li>.tools.tools-bottom{width:auto;height:28px;left:0;right:0;top:auto;bottom:-30px}.ace-thumbnails>li>.tools.tools-top{width:auto;height:28px;left:0;right:0;top:-30px;bottom:auto}.ace-thumbnails>li:hover>.tools{left:0}.ace-thumbnails>li:hover>.tools.tools-bottom{top:auto;bottom:0}.ace-thumbnails>li:hover>.tools.tools-top{bottom:auto;top:0}.ace-thumbnails>li:hover>.tools.tools-right{left:auto;right:0}.ace-thumbnails>li>.tools>a,.ace-thumbnails>li>:first-child .inner a{display:inline-block;color:#FFF;font-size:18px;font-weight:normal;padding:0 4px}.ace-thumbnails>li>.tools>a:hover,.ace-thumbnails>li>:first-child .inner a:hover{text-decoration:none;color:#c9e2ea}.ace-thumbnails>li .tools.tools-bottom>a,.ace-thumbnails>li .tools.tools-top>a{display:inline-block}.ace-thumbnails>li>:first-child>.text{position:absolute;right:0;left:0;bottom:0;top:0;text-align:center;color:#FFF;background-color:rgba(0,0,0,0.55);opacity:0;filter:alpha(opacity=0);-webkit-transition:all .2s ease;transition:all .2s ease}.ace-thumbnails>li>:first-child>.text:before{content:'';display:inline-block;height:100%;vertical-align:middle;margin-right:0}.ace-thumbnails>li>:first-child>.text>.inner{padding:4px 0;margin:0;display:inline-block;vertical-align:middle;max-width:90%}.ace-thumbnails>li:hover>:first-child>.text{opacity:1;filter:alpha(opacity=100)}@media only screen and (max-width:480px){.ace-thumbnails{text-align:center}.ace-thumbnails>li{float:none;display:inline-block}}.dialogs{padding:9px 9px 0;position:relative}.itemdiv{padding-right:3px;min-height:66px;position:relative}.itemdiv>.user{display:inline-block;width:42px;position:absolute;left:0}.itemdiv>.user>img{border-radius:100%;border:2px solid #5293c4;max-width:40px;position:relative}.itemdiv>.body{width:auto;margin-left:50px;margin-right:12px;position:relative}.itemdiv>.body>.time{display:block;font-size:11px;font-weight:bold;color:#666;position:absolute;right:9px;top:0}.itemdiv>.body>.time [class*="icon-"]{font-size:14px;font-weight:normal}.itemdiv>.body>.name{display:block;color:#999}.itemdiv>.body>.name>b{color:#777}.itemdiv>.body>.text{display:block;position:relative;margin-top:2px;padding-bottom:19px;padding-left:7px;font-size:13px}.itemdiv>.body>.text:after{display:block;content:"";height:1px;font-size:0;overflow:hidden;position:absolute;left:16px;right:-12px;margin-top:9px;border-top:1px solid #e4ecf3}.itemdiv>.body>.text>[class*="icon-quote-"]:first-child{color:#dce3ed;margin-right:4px}.itemdiv:last-child>.body>.text{border-bottom:0}.itemdiv:last-child>.body>.text:after{display:none}.itemdiv.dialogdiv{padding-bottom:14px}.itemdiv.dialogdiv:before{position:absolute;display:block;content:"";top:0;bottom:0;left:19px;width:3px;max-width:3px;background-color:#e1e6ed;border:1px solid #d7dbdd;border-width:0 1px}.itemdiv.dialogdiv:last-child:before{display:none}.itemdiv.dialogdiv>.user>img{border-color:#c9d6e5}.itemdiv.dialogdiv>.body{border:1px solid #dde4ed;padding:5px 8px 8px;border-left-width:2px;margin-right:1px}.itemdiv.dialogdiv>.body:before{content:"";display:block;position:absolute;left:-7px;top:11px;width:8px;height:8px;border:2px solid #dde4ed;border-width:2px 0 0 2px;background-color:#FFF;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-transform:rotate(-45deg);-ms-transform:rotate(-45deg);transform:rotate(-45deg)}.itemdiv.dialogdiv>.body>.time{position:static;float:right}.itemdiv.dialogdiv>.body>.text{padding-left:0;padding-bottom:0}.itemdiv.dialogdiv>.body>.text:after{display:none}.itemdiv.dialogdiv .tooltip-inner{word-break:break-all}.itemdiv.memberdiv{width:175px;padding:2px;margin:3px 0;float:left;border-bottom:1px solid #e8e8e8}.itemdiv.memberdiv>.user>img{border-color:#dce3ed}.itemdiv.memberdiv>.body>.time{position:static}.itemdiv.memberdiv>.body>.name{line-height:18px;height:18px;margin-bottom:0}.itemdiv.memberdiv>.body>.name>a{display:inline-block;max-width:100px;max-height:18px;overflow:hidden;text-overflow:ellipsis;word-break:break-all}.itemdiv .tools{position:absolute;right:5px;bottom:10px;display:none}.itemdiv .tools .btn{border-radius:36px;margin:1px 0}.itemdiv .body .tools{bottom:4px}.itemdiv.commentdiv .tools{right:9px}.itemdiv:hover .tools{display:inline-block}.item-list{margin:0;padding:0;list-style:none}.item-list>li{padding:9px;background-color:#FFF;margin-top:-1px;position:relative}.item-list>li.selected{color:#8090a0;background-color:#f4f9fc}.item-list>li.selected label,.item-list>li.selected .lbl{text-decoration:line-through;color:#8090a0}.item-list>li>.checkbox{display:inline-block}.item-list>li>label.inline{display:inline-block}.item-list>li label{font-size:13px}.item-list>li .percentage{font-size:11px;font-weight:bold;color:#777}.item-list>li.ui-sortable-helper{cursor:move}li[class*="item-"]{border:1px solid #DDD;border-left-width:3px}li.item-orange{border-left-color:#e8b110}li.item-orange2{border-left-color:#f79263}li.item-red{border-left-color:#d53f40}li.item-red2{border-left-color:#d15b47}li.item-green{border-left-color:#9abc32}li.item-green2{border-left-color:#0490a6}li.item-blue{border-left-color:#4f99c6}li.item-blue2{border-left-color:#3983c2}li.item-blue3{border-left-color:#1144eb}li.item-pink{border-left-color:#cb6fd7}li.item-purple{border-left-color:#6f3cc4}li.item-black{border-left-color:#505050}li.item-grey{border-left-color:#a0a0a0}li.item-brown{border-left-color:#a52a2a}li.item-default{border-left-color:#abbac3}.ui-sortable-placeholder,.ui-sortable-helper,.ui-sortable-placeholder>a,.ui-sortable-helper>a{cursor:move!important}@media only screen and (max-width:480px){.itemdiv.memberdiv{float:none;width:auto}}.profile-user-info{margin:0 12px}.profile-info-row{position:relative}.profile-info-name{position:absolute;width:110px;text-align:right;padding:6px 10px 6px 0;left:0;top:0;bottom:0;font-weight:normal;color:#667e99;background-color:transparent;border-top:1px dotted #d5e4f1}.profile-info-value{padding:6px 4px 6px 6px;margin-left:120px;border-top:1px dotted #d5e4f1}.profile-info-value>span+span:before{display:inline;content:",";margin-left:1px;margin-right:3px;color:#666;border-bottom:1px solid #FFF}.profile-info-value>span+span.editable-container:before{display:none}.profile-info-row:first-child .profile-info-name{border-top:0}.profile-info-row:first-child .profile-info-value{border-top:0}.profile-user-info-striped{border:1px solid #dcebf7}.profile-user-info-striped .profile-info-name{color:#336199;background-color:#edf3f4;border-top:1px solid #f7fbff}.profile-user-info-striped .profile-info-value{border-top:1px dotted #dcebf7;padding-left:12px}.profile-picture{border:1px solid #CCC;background-color:#FFF;padding:4px;display:inline-block;max-width:100%;-moz-box-sizing:border-box;box-shadow:1px 1px 1px rgba(0,0,0,0.15)}.profile-activity{padding:10px 4px;border-bottom:1px dotted #d0d8e0;position:relative;border-left:1px dotted #FFF;border-right:1px dotted #FFF}.profile-activity:first-child{border-top:1px dotted transparent}.profile-activity:first-child:hover{border-top-color:#d0d8e0}.profile-activity:hover{background-color:#f4f9fd;border-left:1px dotted #d0d8e0;border-right:1px dotted #d0d8e0}.profile-activity img{border:2px solid #c9d6e5;border-radius:100%;max-width:40px;margin-right:10px;margin-left:0;box-shadow:none}.profile-activity .thumbicon{background-color:#74abd7;display:inline-block;border-radius:100%;width:38px;height:38px;color:#FFF;font-size:18px;text-align:center;line-height:38px;margin-right:10px;margin-left:0;text-shadow:none!important}.profile-activity .time{display:block;margin-top:4px;color:#777}.profile-activity a.user{font-weight:bold;color:#9585bf}.profile-activity .tools{position:absolute;right:12px;bottom:8px;display:none}.profile-activity:hover .tools{display:block}.user-profile .ace-thumbnails li{border:1px solid #CCC;padding:3px;margin:6px}.user-profile .ace-thumbnails li .tools{left:3px;right:3px}.user-profile .ace-thumbnails li:hover .tools{bottom:3px}.user-profile .user-title-label:hover{text-decoration:none}.user-profile .user-title-label+.dropdown-menu{margin-left:-12px}.profile-contact-links{padding:4px 2px 5px;border:1px solid #e0e2e5;background-color:#f8fafc}.profile-contact-info .btn-link:hover>[class*="icon-"],.profile-contact-info .btn-link:focus>[class*="icon-"]{text-decoration:none}.profile-social-links>a{text-decoration:none;margin:0 1px}.profile-social-links>a:hover>[class*="icon-"]{text-decoration:none}.profile-skills .progress{height:26px;margin-bottom:2px;background-color:transparent}.profile-skills .progress .progress-bar{line-height:26px;font-size:13px;font-weight:bold;font-family:"Open Sans";padding:0 8px}.profile-users .user{display:block;position:static;text-align:center;width:auto}.profile-users .user img{padding:2px;border-radius:100%;border:1px solid #AAA;max-width:none;width:64px;-webkit-transition:all .1s;transition:all .1s}.profile-users .user img:hover{-webkit-box-shadow:0 0 1px 1px rgba(0,0,0,0.33);box-shadow:0 0 1px 1px rgba(0,0,0,0.33)}.profile-users .memberdiv{background-color:#FFF;width:100px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;border:0;text-align:center;margin:0 8px 24px}.profile-users .memberdiv .name a:hover [class*="icon-"]{text-decoration:none}.profile-users .memberdiv .body{display:inline-block;margin:8px 0 0 0}.profile-users .memberdiv .popover{visibility:hidden;min-width:150px;margin-left:0;margin-right:0;top:-5%;left:auto;right:auto;z-index:-1;opacity:0;display:none;-webkit-transition:visibility 0s linear .2s,z-index 0s linear .2s,opacity .2s linear 0s;transition:visibility 0s linear .2s,z-index 0s linear .2s,opacity .2s linear 0s}.profile-users .memberdiv .popover.right{left:100%;right:auto;display:block}.profile-users .memberdiv .popover.left{left:auto;right:100%;display:block}.profile-users .memberdiv>:first-child:hover .popover{visibility:visible;opacity:1;z-index:1010;-webkit-transition-delay:0s;-moz-transition-delay:0s;-o-transition-delay:0s;transition-delay:0s}.profile-users .memberdiv .tools{position:static;display:block;width:100%;margin-top:2px}.profile-users .memberdiv .tools>a{margin:0 2px}.profile-users .memberdiv .tools>a:hover{text-decoration:none}.user-status{display:inline-block;width:11px;height:11px;background-color:#FFF;border:3px solid #AAA;border-radius:100%;vertical-align:middle;margin-right:1px}.user-status.status-online{border-color:#8ac16c}.user-status.status-busy{border-color:#e07f69}.user-status.status-idle{border-color:#ffb752}.tab-content.profile-edit-tab-content{border:1px solid #DDD;padding:8px 32px 32px;-webkit-box-shadow:1px 1px 0 0 rgba(0,0,0,0.2);box-shadow:1px 1px 0 0 rgba(0,0,0,0.2);background-color:#FFF}@media only screen and (max-width:480px){.profile-info-name{width:80px}.profile-info-value{margin-left:90px}.profile-user-info-striped .profile-info-name{position:static;width:auto;text-align:left;padding:6px 0 6px 10px}.profile-user-info-striped .profile-info-value{margin-left:10px}}@media only screen and (max-width:480px){.user-profile .memberdiv{width:50%;margin-left:0;margin-right:0}}.inbox-tabs.nav-tabs>li>a{background-color:#fafafa}.inbox-tabs.nav-tabs>li.active:not(.open)>a,.inbox-tabs.nav-tabs>li.active:not(.open)>a:hover,.inbox-tabs.nav-tabs>li.active:not(.open)>a:focus{background-color:#f1f5fa;box-shadow:0 -2px 3px 0 rgba(0,0,0,0.1);color:#48768e}.inbox-tabs.nav-tabs>li>a.btn-new-mail{background-color:transparent;border:none!important;padding:0!important}.inbox-tabs.nav-tabs>li>a.btn-new-mail>.btn{border-width:0!important;border-radius:3px!important;padding:0 6px!important;position:relative;transition:none!important}.inbox-tabs.nav-tabs>li.active>a.btn-new-mail{box-shadow:none!important}.inbox-tabs.nav-tabs>li.active>a.btn-new-mail>.btn:before{content:"";display:block;position:absolute;top:100%;left:35%;left:calc(50% - 6px);border-width:6px 8px;border-style:solid;border-color:transparent;border-top-color:inherit}.inbox-tabs.nav-tabs.tab-size-bigger>li>a{padding:5px 15px 7px;font-size:14px}.inbox-tabs.nav-tabs.tab-size-bigger>li>a>[class*="icon-"]:first-child{margin-bottom:5px}.inbox-tabs.nav-tabs.tab-size-bigger>li>a.btn-new-mail>.btn{padding:10px!important;border-radius:7px!important}.inbox-tabs.nav-tabs.tab-size-bigger>li.active>a.btn-new-mail{margin-top:0!important;top:1px}.inbox-tabs.nav-tabs.tab-size-bigger>li.active>a.btn-new-mail>.btn:before{left:35%;left:calc(50% - 8px);border-width:8px 10px}@media only screen and (max-width:475px){.inbox-tabs>.li-new-mail{display:block;text-align:right;margin-bottom:8px!important;float:none!important}.inbox-tabs>.li-new-mail>.btn-new-mail{display:inline-block;width:auto}}.message-container{position:relative}.message-list{position:relative}.message-item{border:1px solid #eaedf1;border-bottom-width:0;padding:12px 12px 14px;line-height:18px;position:relative;background-color:#FFF}.message-item:first-child{border-top-width:0}.message-item:hover{border-color:#e2eaf2;background-color:#f2f6f9}.message-item:hover+.message-item{border-top-color:#e2eaf2}.message-item:hover+.message-item.selected{border-top-color:#FFF}.message-item.selected{background-color:#eff4f7;border-color:#FFF #e2eaf2}.message-item.selected+.message-item{border-top-color:#FFF}.message-item.selected+.message-item:hover+.message-item{border-top-color:#FFF}.message-item .sender{margin:0 6px 0 4px;vertical-align:middle;color:#467287;display:inline-block;width:110px;height:18px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;cursor:pointer}.message-item.message-unread .sender{color:#6a9cba;font-weight:bold}.message-item .summary{vertical-align:middle;display:inline-block;position:relative;margin-left:30px;max-width:250px;max-width:calc(100% - 300px);min-width:200px;white-space:nowrap}.message-item .summary .text{color:#555;vertical-align:middle;display:inline-block;width:auto;max-width:100%;height:18px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;cursor:pointer}.message-item .summary .text:hover{text-decoration:underline}.message-item .summary .message-flags{display:block;position:absolute;right:101%;right:calc(100%+4px);height:18px;white-space:nowrap}.message-item.message-unread .summary .text{color:#609fc4;font-weight:bold}.message-item .time{float:right;width:60px;height:18px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;color:#666}.message-item.message-unread .time{font-weight:bold;color:#609fc4}.message-item .attachment{color:#999;font-size:18px;vertical-align:middle;float:right;margin:0 12px;position:relative}.message-item.message-unread .attachment{color:#4f99c6}.message-content .time{font-weight:normal}.message-star{vertical-align:middle;margin:2px 4px 0 6px;font-size:15px;cursor:pointer}.message-star:hover{color:#feb902!important;text-decoration:none}.mail-tag:empty{display:inline-block;width:8px;height:11px;padding:0;line-height:normal;vertical-align:middle;margin:0 1px 0 0}.badge.mail-tag{border-radius:2px}@media only screen and (max-width:979px){.message-item .summary{min-width:0}.message-item .sender{width:100px}}@media only screen and (max-width:550px){.message-item .summary{margin:8px 0 0 32px;max-width:95%;min-width:0;display:block}.message-item .sender{width:auto;max-width:150px}.message-item .summary .text{max-width:95%}}.btn-message,.btn-message:hover,.btn-message:focus,.btn-message:active,.open .btn-message.dropdown-toggle{background-color:#FFF!important;border:1px solid #94b9ce!important;color:#7ca3ba!important;text-shadow:none!important}.message-content{padding:16px 12px;border:1px solid #e9e9e9;-webkit-box-shadow:0 0 1px 1px rgba(0,0,0,0.02);box-shadow:0 0 1px 1px rgba(0,0,0,0.02);background-color:rgba(255,255,255,0.8);border-top-width:0}.message-item .message-content{margin-top:16px;border-top-width:1px}.message-body{padding:0 9px;color:#6a7177}.message-navbar{line-height:24px;padding:10px 12px;border:1px solid #d6e1ea;border-color:#d6e1ea transparent;background-color:#f1f5fa;position:relative}.message-navbar .dropdown-toggle,.message-content .dropdown-toggle{color:#777}.message-navbar .dropdown-toggle:hover,.message-content .dropdown-toggle:hover,.message-navbar .dropdown-toggle:focus,.message-content .dropdown-toggle:focus{text-decoration:none;color:#2283c5}.message-bar{display:inline-block;min-height:28px}@media only screen and (max-width:480px){.message-bar{display:block;min-height:60px}}.message-footer{background-color:#f1f1f1;padding:12px 16px;border:1px solid #e6e6e6;border-width:1px 0;border-top:1px solid #e4e9ee}.message-footer .pagination{margin:0}.message-footer .pagination>li{margin:0;padding:0}.message-footer .pagination>li>a,.message-footer .pagination>li>span{color:#777;padding:3px;margin-left:3px;margin-right:3px;background-color:transparent;border:0}.message-footer .pagination>li.disabled>span{color:#bbb;cursor:default}.message-footer .pagination>li>a:hover{color:#2283c5;text-decoration:none}.message-footer input[type=text]{font-size:12px;width:34px;height:24px;line-height:20px;margin-bottom:0;padding:3px;vertical-align:middle;text-align:center}.message-footer-style2 .pagination>li>a,.message-footer-style2 .pagination>li>span{border:1px solid #b5b5b5;border-radius:100%!important;width:26px;height:26px;line-height:24px;display:inline-block;text-align:center;padding:0}.message-footer-style2 .pagination>li>span{border-color:#CCC}.message-footer-style2 .pagination>li>a:hover{border-color:#84afc9;background-color:#f7f7f7}.message-item.message-inline-open{background-color:#f2f6f9;border:1px solid #DDD;border-bottom-color:#CCC}.message-item.message-inline-open:first-child{border-top-color:#EEE}.message-item.message-inline-open:last-child{border-bottom-color:#DDD}.message-item.message-inline-open+.message-item{border-bottom-color:transparent}.message-loading-overlay{position:absolute;z-index:14;top:0;bottom:0;right:0;left:0;background-color:rgba(255,255,255,0.5);text-align:center}.message-loading-overlay>[class*="icon-"]{position:absolute;top:15%;left:0;right:0;text-align:center}.message-content .sender{color:#6a9cba;font-weight:bold;width:auto;text-overflow:inherit;vertical-align:middle;margin:0}.message-content .time{width:auto;text-overflow:inherit;white-space:normal;float:none;vertical-align:middle}ul.attachment-list{margin:6px 0 4px 8px}ul.attachment-list>li{margin-bottom:3px}.message-attachment{padding-left:10px;padding-right:10px}.attached-file{color:#777;width:200px}.attached-file>[class*="icon-"]{display:inline-block;width:16px;margin-right:2px}.attached-file:hover{text-decoration:none;color:#438eb9}.attached-file:hover .attached-name{color:#2283c5}.attached-file .attached-name{display:inline-block;max-width:175px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.messagebar-item-left,.messagebar-item-right{position:absolute;bottom:14px;left:12px;text-align:left}.messagebar-item-right{right:12px;left:auto}.message-navbar .nav-search{right:auto;left:60px;top:auto;bottom:11px}.message-form{border:1px solid #ddd;border-top:0;padding-top:22px}@media only screen and (max-width:480px){.message-form{padding-left:16px;padding-right:16px}}.message-form .form-actions{margin-bottom:0}.message-form .wysiwyg-editor{overflow:auto;min-height:150px;max-height:250px;height:auto}.btn-send-message{position:relative;top:6px}.btn-back-message-list{color:#777}.btn-back-message-list:hover{color:#478fca;text-decoration:none}.message-condensed .message-item{padding-top:8px;padding-bottom:9px}.message-condensed .message-navbar,.message-condensed .message-footer{padding-top:7px;padding-bottom:7px}.message-condensed .messagebar-item-left,.message-condensed .messagebar-item-right{bottom:9px}.message-condensed .message-navbar .nav-search{bottom:7px}@media only screen and (max-width:480px){.message-condensed .message-bar{min-height:42px}}.inbox-folders .btn-block{margin-top:0}@media only screen and (max-width:767px){.inbox-folders.inbox-folders-responsive .btn-block{width:24%}}@media only screen and (max-width:600px){.inbox-folders.inbox-folders-responsive .btn-block{width:48%}}@media only screen and (max-width:320px){.inbox-folders.inbox-folders-responsive .btn-block{width:99%}}.inbox-folders .btn-lighter,.inbox-folders .btn-lighter.active{background-color:#f4f4f4!important;text-shadow:none!important;color:#7c8395!important;border:1px solid #FFF!important;padding:5px 11px}.inbox-folders .btn-lighter.active{background-color:#edf2f8!important;color:#53617c!important}.inbox-folders .btn-lighter:hover{background-color:#efefef!important;color:#6092c4!important}.inbox-folders .btn>[class*="icon-"]:first-child{display:inline-block;width:14px;text-align:left}.inbox-folders .btn-lighter+.btn-lighter{border-top-width:0!important}.inbox-folders .btn.active:before{display:block;content:"";position:absolute;top:1px;bottom:1px;left:-1px;border-left:3px solid #4f99c6}.inbox-folders .btn.active:after{display:none}.inbox-folders .btn .counter{border-radius:3px;position:absolute;right:8px;top:8px;padding-left:6px;padding-right:6px;opacity:.75;filter:alpha(opacity=75)}.inbox-folders .btn:hover .badge{opacity:1;filter:alpha(opacity=100)}.timeline-container{position:relative;padding-top:4px;margin-bottom:32px}.timeline-container:last-child{margin-bottom:0}.timeline-container:before{content:"";display:block;position:absolute;left:28px;top:0;bottom:0;border:1px solid #e2e3e7;background-color:#e7eaef;width:4px;border-width:0 1px}.timeline-container:first-child:before{border-top-width:1px}.timeline-container:last-child:before{border-bottom-width:1px}.timeline-item{position:relative;margin-bottom:8px}.timeline-item .widget-box{background-color:#f2f6f9;color:#595c66}.timeline-item .transparent.widget-box{border-left:3px solid #dae1e5}.timeline-item .transparent .widget-header{background-color:#ecf1f4;border-bottom:0}.timeline-item .transparent .widget-header>:first-child{margin-left:8px}.timeline-item:nth-child(even) .widget-box{background-color:#f3f3f3;color:#616161}.timeline-item:nth-child(even) .widget-box.transparent{border-left-color:#dbdbdb!important}.timeline-item:nth-child(even) .widget-box.transparent .widget-header{background-color:#EEE!important}.timeline-item .widget-box{margin:0;position:relative;max-width:none;border-bottom:0;margin-left:60px}.timeline-item .widget-main{margin:0;position:relative;max-width:none;border-bottom:0}.timeline-item .widget-body{background-color:transparent}.timeline-item .widget-toolbox{padding:4px 8px 0!important;background-color:transparent!important;border:0 solid #CCC!important;border-top:none!important;margin:0 0!important}.timeline-info{float:left;width:60px;text-align:center;position:relative}.timeline-info img{border-radius:100%;max-width:42px}.timeline-info .label,.timeline-info .badge{font-size:12px}.timeline-container:not(.timeline-style2) .timeline-indicator{opacity:1;border-radius:100%;display:inline-block;font-size:16px;height:36px;line-height:30px;width:36px;text-align:center;text-shadow:none!important;padding:0;cursor:default;border:3px solid #FFF!important}.timeline-label{display:block;clear:both;margin:0 0 18px;margin-left:34px}.timeline-item img{border:1px solid #AAA;padding:2px;background-color:#FFF}.timeline-style2:before{display:none}.timeline-style2 .timeline-item{padding-bottom:22px;margin-bottom:0}.timeline-style2 .timeline-item:last-child{padding-bottom:0}.timeline-style2 .timeline-item:before{content:"";display:block;position:absolute;left:90px;top:5px;bottom:-5px;border-width:0;background-color:#DDD;width:2px;max-width:2px}.timeline-style2 .timeline-item:last-child:before{display:none}.timeline-style2 .timeline-item:first-child:before{display:block}.timeline-style2 .timeline-item .transparent .widget-header{background-color:transparent!important}.timeline-style2 .timeline-item .transparent.widget-box{background-color:transparent!important;border-left:none!important}.timeline-style2 .timeline-info{width:100px}.timeline-style2 .timeline-indicator{font-size:0;height:12px;line-height:12px;width:12px;border-width:1px!important;background-color:#fff!important;position:absolute;left:85px;top:3px;opacity:1;border-radius:100%;display:inline-block;padding:0}.timeline-style2 .timeline-date{display:inline-block;width:72px;text-align:right;margin-right:25px;color:#777}.timeline-style2 .timeline-item .widget-box{margin-left:112px}.timeline-style2 .timeline-label{width:75px;text-align:center;margin-left:0;margin-bottom:10px;text-align:right;color:#666;font-size:14px}.timeline-time{text-align:center;position:static}.fc-header-title>h2{font-size:22px;color:#65a0ce}.fc-widget-header,.fc-widget-content{border:1px solid #bcd4e5}.fc-state-highlight{background:#FFC}.fc-event-skin{border:none!important;background-color:#abbac3;padding:0 0 1px 2px}.label-yellow .fc-event-skin{color:#963}.label-light .fc-event-skin{color:#888}[class*="label-"]>.fc-event-skin,[class*="label-"]>.fc-event-skin>.fc-event-skin.fc-event-head{background-color:inherit}.fc-event-skin.ui-draggable-dragging{cursor:move}.fc-event-skin.fc-event-vert,.fc-event-vert>.fc-event-skin{padding:0 0 1px}.fc-grid .fc-day-number{color:#2e6589}.fc-widget-header{background:#ecf2f7;color:#8090a0}.fc-event-hori,.fc-event-vert{border-radius:0!important;border-color:transparent}.fc-event-vert .fc-event-content{padding-left:1px;padding-right:1px}.fc-event-vert .fc-event-time{padding:0}.fc-state-default{border:0}.fc-state-default,.fc-state-default .fc-button-inner{border:0;background-color:#abbac3;color:#FFF;background-image:none;box-shadow:none;text-shadow:none;border-radius:0!important;margin-left:2px}.fc-state-default .fc-button-effect{display:none}.fc-state-disabled,.fc-state-disabled .fc-button-inner{opacity:.75;filter:alpha(opacity=75);color:#DDD}.fc-state-active,.fc-state-active .fc-button-inner{border-color:#4f99c6;background-color:#6fb3e0}.fc-state-hover,.fc-state-hover .fc-button-inner{background-color:#8b9aa3}.external-event{margin:6px 0;padding:0;cursor:default;display:block;color:#FFF;background-color:#abbac3;font-size:13px;line-height:28px}.external-event:hover{opacity:1;filter:alpha(opacity=100)}.external-event.ui-draggable-dragging{cursor:move}.external-event>[class*="icon-"]:first-child{display:inline-block;height:32px;width:32px;text-align:center;line-height:30px;margin-right:5px;font-size:15px;border-right:1px solid #FFF}.widget-main .fc{position:relative;top:-40px}.widget-main .fc>.fc-header{position:relative;z-index:10}.widget-main .fc .fc-header-space{padding-left:2px}.widget-main .fc-header-title>h2{font-size:18px;line-height:36px}.widget-main .fc-content{top:-14px;z-index:11}.widget-main .fc-button-content{height:37px;line-height:36px}@media only screen and (max-width:480px){.fc-header td{display:block;width:auto;text-align:left}}.chosen-container+.help-inline{vertical-align:middle}.chosen-select{display:inline!important;visibility:hidden;opacity:0;position:absolute;z-index:-1}.chosen-container,[class*="chosen-container"]{vertical-align:middle}.chosen-container>.chosen-single,[class*="chosen-container"]>.chosen-single{line-height:28px;height:30px;box-shadow:none;background:#fafafa}.chosen-choices{box-shadow:none!important}.chosen-container-single .chosen-single abbr{background:0}.chosen-container-single .chosen-single abbr:after{content:"\f00d";display:inline-block;color:#888;font-family:FontAwesome;font-size:13px;position:absolute;right:0;top:-7px}.chosen-container-single .chosen-single abbr:hover:after{color:#464646}.chosen-container-single.chosen-disabled .chosen-single abbr:hover:after{color:#464646}.chosen-single div b{background:none!important}.chosen-single div b:before{content:"\f0d7";display:inline-block;color:#888;font-family:FontAwesome;font-size:12px;position:relative;top:-1px;left:1px}.chosen-container-active.chosen-with-drop .chosen-single div b:before{content:"\f0d8"}.chosen-container-single .chosen-search{position:relative}.chosen-container-single .chosen-search input[type="text"]{background:0;border-radius:0;line-height:28px;height:28px}.chosen-container-single .chosen-search:after{content:"\f002";display:inline-block;color:#888;font-family:FontAwesome;font-size:14px;position:absolute;top:8px;right:12px}.chosen-container-multi .chosen-choices li.search-field input[type="text"]{height:25px}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close{background:0}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:before{content:"\f00d";display:inline-block;color:#888;font-family:FontAwesome;font-size:13px;position:absolute;right:2px;top:-1px}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover{text-decoration:none}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover:before{color:#464646}.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close:before{color:#464646}.chosen-container .chosen-results-scroll-down span,.chosen-container .chosen-results-scroll-up span{background:0}.chosen-container .chosen-results-scroll-down span:before,.chosen-container .chosen-results-scroll-up span:before{content:"\f0d7";display:inline-block;color:#888;font-family:FontAwesome;font-size:12px;position:relative;top:-1px;left:1px}.chosen-container .chosen-results-scroll-up span:before{content:"\f0d8"}.chosen-container-active .chosen-single-with-drop div b:before{content:"\f0d8"}.chosen-rtl .chosen-search input[type="text"]{background:0}.chosen-rtl .chosen-search:after{content:"";display:none}.chosen-rtl .chosen-search:before{content:"\f002";display:inline-block;color:#888;font-family:FontAwesome;font-size:14px;position:absolute;top:9px;left:12px}.chosen-container-single .chosen-single{border-radius:0}.chosen-container .chosen-results li.highlighted{background:#86bd6f;background:#4492c9;background:#316ac5;color:#FFF}.chosen-container-single .chosen-drop{border-radius:0;border-bottom:3px solid #4492c9;border-color:#4492c9}.chosen-single.chosen-single-with-drop,.chosen-container-active .chosen-single{border-color:#4492c9}.form-group.has-error .chosen-single{border-color:#f09784!important}.form-group.has-info .chosen-single{border-color:#64a6bc!important}.form-group.has-warning .chosen-single{border-color:#e0c43a!important}.form-group.has-success .chosen-single{border-color:#92bf65!important}.chosen-rtl .chosen-container-single-nosearch .chosen-search{left:-9999px}.chosen-rtl .chosen-drop{left:-9999px}.modal .chosen-rtl .chosen-container-single-nosearch .chosen-search{left:9999px}.modal .chosen-rtl .chosen-drop{left:9999px}.rtl .modal .chosen-container.chosen-with-drop .chosen-drop{left:auto;right:0}.chosen-container-active.chosen-with-drop .chosen-single{border-color:#4492c9}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min-resolution:144dpi){.chosen-rtl .chosen-search input[type="text"],.chosen-container-single .chosen-single abbr,.chosen-container-single .chosen-single div b,.chosen-container-single .chosen-search input[type="text"],.chosen-container-multi .chosen-choices li.search-choice .search-choice-close,.chosen-container .chosen-results-scroll-down span,.chosen-container .chosen-results-scroll-up span{background-image:none!important;background-repeat:no-repeat!important;background-size:auto!important}}.tag-input-style+.chosen-container-multi .chosen-choices li.search-choice{background-image:none;background-color:#91b8d0;color:#fff;display:inline-block;font-size:13px;font-weight:normal;margin-bottom:3px;margin-right:0;padding:6px 22px 7px 9px;position:relative;text-shadow:1px 1px 1px rgba(0,0,0,0.15);transition:all .2s ease 0s;vertical-align:baseline;white-space:nowrap;border:0;-webkit-box-shadow:none;box-shadow:none;border-radius:0}.tag-input-style+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close{position:absolute;top:0;bottom:0;right:0;width:18px;height:auto;line-height:25px;text-align:center}.tag-input-style+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:before{color:#FFF;position:static;font-size:11px}.tag-input-style+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover{background-color:rgba(0,0,0,0.2)}.tag-input-style+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover:before{color:#FFF}.tag-input-style+.chosen-container-multi.chosen-rtl .chosen-choices li.search-choice{padding:6px 9px 7px 22px;margin-left:0;margin-right:3px}.tag-input-style+.chosen-container-multi.chosen-rtl .chosen-choices li.search-choice .search-choice-close{right:auto;left:0}.select2-container .select2-choice{border-radius:0;height:30px}.select2-container.select2-drop-above .select2-choice{border-radius:0}.select2-container .select2-choice abbr,.select2-search-choice-close{background:0}.select2-container .select2-choice abbr:before,.select2-search-choice-close:before{font-family:FontAwesome;font-size:12px;display:inline;content:"\f00d";color:#888;position:relative;top:-1px}.select2-container .select2-choice abbr:hover:before,.select2-search-choice-close:hover:before{color:#555}.select2-container .select2-choice abbr:before{top:-7px}.select2-search-choice-close:hover{text-decoration:none!important}.select2-drop{border-radius:0;border:1px solid #4492c9;border-width:0 1px 3px}.select2-drop.select2-drop-above{border-radius:0}.select2-container .select2-choice{background:#fafafa none}.select2-container-active .select2-choice,.select2-container-active .select2-choices,.select2-dropdown-open.select2-drop-above .select2-choice,.select2-dropdown-open.select2-drop-above .select2-choices,.select2-container-multi.select2-container-active .select2-choices{border-color:#4492c9}.select2-results .select2-highlighted{background:#316ac5}.select2-container .select2-choice .select2-arrow{border-radius:0;background:transparent none;border:0}.select2-container .select2-choice .select2-arrow b{background:0}.select2-container .select2-choice .select2-arrow b:before{font-family:FontAwesome;font-size:12px;display:inline;content:"\f0d7";color:#888;position:relative;left:5px}.select2-dropdown-open .select2-choice .select2-arrow b:before{content:"\f0d8"}.select2-search .select2-input{background:#fff none;margin-top:4px}.select2-search:after{font-family:FontAwesome;font-size:14px;display:inline;content:"\f002";color:#777;position:relative;top:0;left:-20px;z-index:0}.select2-container-multi .select2-choices .select2-search-field input{border:none!important;-webkit-box-shadow:none!important;box-shadow:none!important;background:none!important}.select2-container-active .select2-choice,.select2-container-active .select2-choices,.select2-container-multi.select2-container-active .select2-choices,.select2-dropdown-open.select2-drop-above .select2-choice,.select2-dropdown-open.select2-drop-above .select2-choices{-webkit-box-shadow:none;box-shadow:none}.select2-search input.select2-active{background-color:#FFF;position:relative;z-index:1}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-resolution:144dpi){.select2-search input,.select2-search-choice-close,.select2-container .select2-choice abbr,.select2-container .select2-choice div b{background-image:none!important;background-size:auto!important}.select2-search input{background-position:auto!important}}.select2-container-active.select2-dropdown-open .select2-choice{background-image:-webkit-gradient(linear,left 0,left 100%,from(#eee),to(#fff));background-image:-webkit-linear-gradient(top,#eee,0%,#fff,100%);background-image:-moz-linear-gradient(top,#eee 0,#fff 100%);background-image:linear-gradient(to bottom,#eee 0,#fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffeeeeee',endColorstr='#ffffffff',GradientType=0)}.select2-container-active.select2-drop-above .select2-choice{background-image:-webkit-gradient(linear,left 0,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0,#eee 100%);background-image:linear-gradient(to bottom,#fff 0,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0)}.form-group.has-error .select2-choice,.form-group.has-error .select2-choices{border-color:#f09784!important}.form-group.has-info .select2-choice,.form-group.has-info .select2-choices{border-color:#64a6bc!important}.form-group.has-warning .select2-choice,.form-group.has-warning .select2-choices{border-color:#e0c43a!important}.form-group.has-success .select2-choice,.form-group.has-success .select2-choices{border-color:#92bf65!important}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-resolution:144dpi){.select2-search input,.select2-search-choice-close,.select2-container .select2-choice abbr,.select2-container .select2-choice .select2-arrow b{background-image:none!important;background-repeat:no-repeat!important;background-size:auto!important}.select2-search input{background-position:auto!important}}#colorbox:focus,#colorbox:active{outline:0}#cboxTopLeft,#cboxTopCenter,#cboxTopRight,#cboxMiddleLeft,#cboxMiddleRight,#cboxBottomLeft,#cboxBottomCenter,#cboxBottomRight{background:none!important;opacity:0}#cboxContent{border:12px solid #000;background-color:#FFF;padding:7px}#cboxOverlay{background:rgba(0,0,0,0.95);background:#000}#cboxCurrent{left:64px;margin-bottom:4px;font-size:14px}#cboxTitle{margin-bottom:4px;font-size:14px;color:#777}#cboxNext,#cboxPrevious,#cboxClose{background:0;text-indent:0;width:26px;height:26px;line-height:22px;padding:0 4px;text-align:center;border:2px solid #999;border-radius:16px;color:#666;font-size:12px;margin-left:5px;margin-bottom:5px}#cboxNext:hover,#cboxPrevious:hover{color:#333;border-color:#666}#cboxContent{overflow:visible}#cboxClose{background-color:#000;border:2px solid #fff;border-radius:32px;color:#fff;font-size:21px;height:28px;width:28px;padding-bottom:2px;margin-left:0;right:-14px;top:-14px}#cboxLoadingOverlay{background:none!important}#cboxLoadingGraphic{background:#FFF none!important;text-align:center}#cboxLoadingGraphic>[class*="icon-"]{display:inline-block;background-color:#FFF;border-radius:8px;width:32px;height:32px;position:relative;top:48%;text-align:center;vertical-align:middle;-moz-animation:spin 1.5s infinite linear;-webkit-animation:spin 1.5s infinite linear;-o-animation:spin 1.5s infinite linear;-ms-animation:spin 1.5s infinite linear;animation:spin 1.5s infinite linear;font-size:24px;color:#fe7e3e}.ace-spinner{display:inline-block}.ace-spinner .spinner-buttons{min-width:18px}.ace-spinner .spinner-buttons>.btn{border-radius:0!important;font-size:10px;padding:0;width:18px;height:14px;line-height:10px}.ace-spinner .spinner-buttons>.btn:first-child{margin-top:0}.ace-spinner .spinner-buttons>.btn>[class*="icon-"]{margin:0;padding:0}.ace-spinner .spinner-buttons>button.btn:active{left:auto;top:auto}.ace-spinner .spinner-input{text-align:center;height:29px;line-height:28px;color:#777}.ace-spinner input[type=text].spinner-input.form-control{width:auto\0/!important;line-height:1\0/!important;padding-bottom:4px\0/!important}.ace-spinner.touch-spinner .spinner-buttons{margin:0;font-size:0}.ace-spinner.touch-spinner .spinner-buttons>.btn{height:29px;line-height:20px;width:24px;font-size:18px;display:inline-block;vertical-align:sub;margin:0 1px}.ace-spinner.touch-spinner .spinner-buttons>.btn>[class*="icon-"]{vertical-align:middle;display:inline-block}.wizard-steps{list-style:none;display:table;width:100%;padding:0;margin:0;position:relative}.wizard-steps li{display:table-cell;text-align:center;width:1%}.wizard-steps li .step{border:5px solid #ced1d6;color:#546474;font-size:15px;border-radius:100%;background-color:#FFF;position:relative;z-index:2;display:inline-block;width:40px;height:40px;line-height:30px;text-align:center}.wizard-steps li:before{display:block;content:"";width:100%;height:1px;font-size:0;overflow:hidden;border-top:4px solid #ced1d6;position:relative;top:21px;z-index:1}.wizard-steps li:last-child:before{max-width:50%;width:50%}.wizard-steps li:first-child:before{max-width:51%;left:50%}.wizard-steps li.active:before,.wizard-steps li.complete:before,.wizard-steps li.active .step,.wizard-steps li.complete .step{border-color:#5293c4}.wizard-steps li.complete .step{cursor:default;color:#FFF;-webkit-transition:transform ease .1s;transition:transform ease .1s}.wizard-steps li.complete .step:before{display:block;position:absolute;top:0;left:0;bottom:0;right:0;line-height:30px;text-align:center;border-radius:100%;content:"\f00c";background-color:#FFF;z-index:3;font-family:FontAwesome;font-size:17px;color:#87ba21}.wizard-steps li.complete:hover .step{-moz-transform:scale(1.1);-webkit-transform:scale(1.1);-o-transform:scale(1.1);-ms-transform:scale(1.1);transform:scale(1.1);border-color:#80afd4}.wizard-steps li.complete:hover:before{border-color:#80afd4}.wizard-steps li .title{display:block;margin-top:4px;max-width:100%;color:#949ea7;font-size:14px;z-index:104;text-align:center;table-layout:fixed;word-wrap:break-word}.wizard-steps li.complete .title,.wizard-steps li.active .title{color:#2b3d53}.step-content .step-pane{display:none;min-height:200px;padding:4px 8px 12px}.step-content .active{display:block}.wizard-actions{text-align:right}@media only screen and (max-width:767px){.wizard-steps li .step{width:30px;height:30px;line-height:24px;border-width:3px}.wizard-steps li:before,.wizard-steps li:after{border-width:3px}.wizard-steps li.complete .step:before{line-height:24px;font-size:13px}.wizard-steps li:before{top:16px}.step-content .step-pane{padding:4px 4px 6px}}.tree{padding-left:9px;overflow-x:hidden;overflow-y:auto;position:relative}.tree:before{display:inline-block;content:"";position:absolute;top:-20px;bottom:16px;left:0;border:1px dotted #67b2dd;border-width:0 0 0 1px;z-index:1}.tree .tree-folder{width:auto;min-height:20px;cursor:pointer}.tree .tree-folder .tree-folder-header{position:relative;height:20px;line-height:20px}.tree .tree-folder .tree-folder-header:hover{background-color:#f0f7fc}.tree .tree-folder .tree-folder-header .tree-folder-name,.tree .tree-item .tree-item-name{display:inline;z-index:2}.tree .tree-folder .tree-folder-header>[class*="icon-"]:first-child,.tree .tree-item>[class*="icon-"]:first-child{display:inline-block;position:relative;z-index:2;top:-1px}.tree .tree-folder .tree-folder-header .tree-folder-name{margin-left:2px}.tree .tree-folder .tree-folder-header>[class*="icon-"]:first-child{margin:-2px 0 0 -2px}.tree .tree-folder:last-child:after{display:inline-block;content:"";position:absolute;z-index:1;top:15px;bottom:0;left:-15px;border-left:1px solid #FFF}.tree .tree-folder .tree-folder-content{margin-left:23px;position:relative}.tree .tree-folder .tree-folder-content:before{display:inline-block;content:"";position:absolute;z-index:1;top:-14px;bottom:16px;left:-14px;border:1px dotted #67b2dd;border-width:0 0 0 1px}.tree .tree-item{position:relative;height:20px;line-height:20px;cursor:pointer}.tree .tree-item:hover{background-color:#f0f7fc}.tree .tree-item .tree-item-name{margin-left:3px}.tree .tree-item .tree-item-name>[class*="icon-"]:first-child{margin-right:3px}.tree .tree-item>[class*="icon-"]:first-child{margin-top:-1px}.tree .tree-folder,.tree .tree-item{position:relative}.tree .tree-folder:before,.tree .tree-item:before{display:inline-block;content:"";position:absolute;top:14px;left:-13px;width:18px;height:0;border-top:1px dotted #67b2dd;z-index:1}.tree .tree-selected{background-color:rgba(98,168,209,0.1);color:#6398b0}.tree .tree-selected:hover{background-color:rgba(98,168,209,0.1)}.tree .tree-item,.tree .tree-folder{border:1px solid #FFF}.tree .tree-folder .tree-folder-header{border-radius:0}.tree .tree-item,.tree .tree-folder .tree-folder-header{margin:0;padding:5px;color:#4d6878;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.tree .tree-item>[class*="icon-"]:first-child{color:#f9e8ce;width:13px;height:13px;line-height:13px;font-size:11px;text-align:center;border-radius:3px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;background-color:#fafafa;border:1px solid #CCC;box-shadow:0 1px 2px rgba(0,0,0,0.05)}.tree .tree-selected>[class*="icon-"]:first-child{background-color:#f9a021;border-color:#f9a021;color:#FFF}.tree .icon-plus[class*="icon-"]:first-child,.tree .icon-minus[class*="icon-"]:first-child{border:1px solid #DDD;vertical-align:middle;height:11px;width:11px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;text-align:center;border:1px solid #8baebf;line-height:10px;background-color:#FFF;position:relative;z-index:1}.tree .icon-plus[class*="icon-"]:first-child:before{display:block;content:"+";font-family:"Open Sans";font-size:16px;position:relative;z-index:1}.tree .icon-minus[class*="icon-"]:first-child:before{content:"";display:block;width:7px;height:0;border-top:1px solid #4d6878;position:absolute;top:5px;left:2px}.tree .tree-unselectable .tree-item>[class*="icon-"]:first-child{color:#5084a0;width:13px;height:13px;line-height:13px;font-size:10px;text-align:center;border-radius:0;background-color:transparent;border:0;box-shadow:none}.tree [class*="icon-"][class*="-down"]{transform:rotate(-45deg)}.tree .icon-spin{height:auto}.tree .tree-loading{margin-left:36px}.tree img{display:inline;veritcal-align:middle}.gritter-item-wrapper{background-image:none!important;box-shadow:0 2px 10px rgba(50,50,50,0.5);background:rgba(50,50,50,0.92)}.gritter-item-wrapper.gritter-info{background:rgba(49,81,133,0.92)}.gritter-item-wrapper.gritter-error{background:rgba(153,40,18,0.92)}.gritter-item-wrapper.gritter-success{background:rgba(89,131,75,0.92)}.gritter-item-wrapper.gritter-warning{background:rgba(190,112,31,0.92)}.gritter-item-wrapper.gritter-light{background:rgba(245,245,245,0.95);border:1px solid #BBB}.gritter-item-wrapper.gritter-light.gritter-info{background:rgba(232,242,255,0.95)}.gritter-item-wrapper.gritter-light.gritter-info .gritter-item{color:#4a577d}.gritter-item-wrapper.gritter-light.gritter-error{background:rgba(255,235,235,0.95)}.gritter-item-wrapper.gritter-light.gritter-error .gritter-item{color:#894a38}.gritter-item-wrapper.gritter-light.gritter-success{background:rgba(239,250,227,0.95)}.gritter-item-wrapper.gritter-light.gritter-success .gritter-item{color:#416131}.gritter-item-wrapper.gritter-light.gritter-warning{background:rgba(252,248,227,0.95)}.gritter-item-wrapper.gritter-light.gritter-warning .gritter-item{color:#946446}.gritter-item p{line-height:1.8}.gritter-top,.gritter-bottom,.gritter-item{background-image:none}.gritter-close{left:auto;right:3px;background-image:none;width:18px;height:18px;line-height:17px;text-align:center;border:2px solid transparent;border-radius:16px;color:#e17b67}.gritter-close:before{font-family:FontAwesome;font-size:16px;content:"\f00d"}.gritter-info .gritter-close{color:#ffa500}.gritter-error .gritter-close,.gritter-success .gritter-close,.gritter-warning .gritter-close{color:#ffea07}.gritter-close:hover{color:#FFF!important}.gritter-title{text-shadow:none}.gritter-light .gritter-item,.gritter-light .gritter-bottom,.gritter-light .gritter-top,.gritter-light .gritter-close{background-image:none;color:#444}.gritter-light .gritter-title{text-shadow:none}.gritter-light .gritter-close:hover{color:#8a3104!important}.gritter-center{position:fixed;left:33%;right:33%;top:33%}@media only screen and (max-width:767px){.gritter-center{left:16%;right:16%;top:30%}}@media only screen and (max-width:480px){.gritter-center{left:30px;right:30px}}@media only screen and (max-width:320px){.gritter-center{left:10px;right:10px}}.wysiwyg-editor{max-height:250px;height:250px;background-color:#f7f8fa;border-collapse:separate;border:1px solid #bbc0ca;padding:4px;box-sizing:content-box;overflow-y:scroll;overflow-x:hidden;outline:0}.wysiwyg-editor:focus{background-color:#FFF}.wysiwyg-toolbar{line-height:32px;margin:0!important}.wysiwyg-toolbar .dropdown-menu{text-align:left}.wysiwyg-toolbar .btn-group{float:none;font-size:0}.wysiwyg-toolbar .btn-group>.btn,.wysiwyg-toolbar .btn-group>.inline>.btn{float:none;padding-left:0;padding-right:0;text-align:center;border-width:2px;margin-left:1px}.wysiwyg-toolbar .btn-group>.btn>[class*="icon-"]:first-child,.wysiwyg-toolbar .btn-group>.inline>.btn>[class*="icon-"]:first-child{font-size:14px;width:25px;max-width:25px;display:inline-block;border-width:1px!important}.wysiwyg-toolbar .btn-group>.btn.dropdown-toggle>[class*="icon-"]:last-child,.wysiwyg-toolbar .btn-group>.inline>.btn.dropdown-toggle>[class*="icon-"]:last-child{margin-right:4px}.wysiwyg-toolbar .btn-group>.btn.active:after,.wysiwyg-toolbar .btn-group>.inline>.btn.active:after{border-color:transparent;border-style:solid;border-top-color:inherit;border-width:6px 14px;bottom:-13px;left:0;right:0}.wysiwyg-style1 .btn-group>.btn,.wysiwyg-style2 .btn-group>.btn,.wysiwyg-style1 .btn-group>.inline>.btn,.wysiwyg-style2 .btn-group>.inline>.btn{margin:0!important;background:#FFF!important;border:none!important;color:#adb3be!important;text-shadow:none!important}.wysiwyg-style1 .btn-group>.btn.active,.wysiwyg-style2 .btn-group>.btn.active,.wysiwyg-style1 .btn-group>.inline>.btn.active,.wysiwyg-style2 .btn-group>.inline>.btn.active{color:#5b80ce!important}.wysiwyg-style1 .btn-group>.btn.active:after,.wysiwyg-style2 .btn-group>.btn.active:after,.wysiwyg-style1 .btn-group>.inline>.btn.active:after,.wysiwyg-style2 .btn-group>.inline>.btn.active:after{display:none}.wysiwyg-style1 .btn-group,.wysiwyg-style2 .btn-group{position:relative}.wysiwyg-style1 .btn-group:after,.wysiwyg-style2 .btn-group:after{display:block;content:"";position:absolute;left:-2px;width:0;max-width:0;top:6px;bottom:6px;border-left:1px solid #e1e6ea}.wysiwyg-style1 .btn-group:first-child:after,.wysiwyg-style2 .btn-group:first-child:after{display:none}.wysiwyg-style2{background-color:#e5e5e5}.wysiwyg-style2+.wysiwyg-editor{border-color:#DDD;background-color:#FFF;border-top:0}.wysiwyg-style2 .btn-group>.btn,.wysiwyg-style2 .btn-group>.inline>.btn{margin:0 1px 0 0!important;background:#FFF!important;border:none!important;color:#8d939e!important;text-shadow:none!important}.wysiwyg-style2 .btn-group>.btn.active,.wysiwyg-style2 .btn-group>.inline>.btn.active{color:#FFF!important;background:#6aaedf!important}.wysiwyg-style2 .btn-group:after{display:none}.wysiwyg-toolbar .btn-colorpicker{width:24px;height:24px;position:relative;background:#87b87f;background:-moz-linear-gradient(top,#cf3e73 10%,#fff 20%,#2283c5 30%,#fff 40%,#87b87f 50%,#fff 60%,#ffb752 70%,#fff 80%,#d15b47 90%,#fff 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(10%,#cf3e73),color-stop(20%,#fff),color-stop(30%,#2283c5),color-stop(40%,#fff),color-stop(50%,#87b87f),color-stop(60%,#fff),color-stop(70%,#ffb752),color-stop(80%,#fff),color-stop(90%,#d15b47),color-stop(100%,#fff));background:-webkit-linear-gradient(top,#cf3e73 10%,#fff 20%,#2283c5 30%,#fff 40%,#87b87f 50%,#fff 60%,#ffb752 70%,#fff 80%,#d15b47 90%,#fff 100%);background:-o-linear-gradient(top,#cf3e73 10%,#fff 20%,#2283c5 30%,#fff 40%,#87b87f 50%,#fff 60%,#ffb752 70%,#fff 80%,#d15b47 90%,#fff 100%);background:-ms-linear-gradient(top,#cf3e73 10%,#fff 20%,#2283c5 30%,#fff 40%,#87b87f 50%,#fff 60%,#ffb752 70%,#fff 80%,#d15b47 90%,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#CF3E73',endColorstr='#FFB752',GradientType=0);background:linear-gradient(top,#cf3e73 10%,#fff 20%,#2283c5 30%,#fff 40%,#87b87f 50%,#fff 60%,#ffb752 70%,#fff 80%,#d15b47 90%,#fff 100%)}.wysiwyg-toolbar .dropdown-colorpicker>.dropdown-menu{top:inherit}.wysiwyg-toolbar input[type=file]{position:fixed;z-index:-10;opacity:0;max-width:0;max-height:0;display:block}.wysiwyg-toolbar .wysiwyg-choose-file{display:inline-block;width:auto;margin:4px auto 0;padding-left:5px;padding-right:5px}.wysiwyg-toolbar .dropdown-menu input[type=text]{margin-left:8px;margin-bottom:0}.wysiwyg-toolbar .dropdown-menu input[type=text].form-control{min-width:150px}.wysiwyg-toolbar .dropdown-menu .btn{margin-right:8px;margin-left:1px}.wysiwyg-style1 .btn-colorpicker{width:20px;height:20px}@media screen and (-webkit-min-device-pixel-ratio:0){.wysiwyg-editor img{display:inline!important}.wysiwyg-editor .ui-wrapper{border:1px dotted #D00;overflow:visible!important;display:inline-block!important;vertical-align:middle}.wysiwyg-editor .ui-wrapper:after{content:"";display:block;position:absolute;right:-3px;bottom:-3px;width:7px;height:7px;border:1px solid #D00;background-color:#FFF;z-index:1}}.widget-header .wysiwyg-toolbar{background-color:transparent}.widget-header .wysiwyg-toolbar .btn-group>.btn,.widget-header .wysiwyg-toolbar .btn-group>.inline>.btn{border-color:transparent;background:rgba(255,255,255,0.25)!important;color:#FFF!important;border-width:1px}.widget-header .wysiwyg-toolbar .btn-group>.btn.active,.widget-header .wysiwyg-toolbar .btn-group>.inline>.btn.active{background:rgba(0,0,0,0.25)!important}.widget-body .wysiwyg-editor{border:0}.wysiwyg-speech-input{width:20px!important;color:transparent!important;background:transparent none!important;border:none!important;-moz-transform:scale(2.0,2.0);-webkit-transform:scale(2.0,2.0);-o-transform:scale(2.0,2.0);-ms-transform:scale(2.0,2.0);transform:scale(2.0,2.0);-webkit-box-shadow:none!important;box-shadow:none!important;cursor:pointer}.wysiwyg-speech-input:focus{-webkit-box-shadow:none!important;box-shadow:none!important}.widget-body .md-header{margin-top:-30px;margin-left:9px}.widget-body .md-header .btn{border-color:transparent;background:rgba(255,255,255,0.25)!important;color:#FFF!important;text-align:center;padding-left:0;padding-right:0;border-width:1px!important;padding-top:2px;padding-bottom:4px}.widget-body .md-header .btn>[class*="icon-"]{font-size:14px;width:25px;max-width:25px;display:inline-block}.widget-body .md-header .btn-inverse{background:rgba(0,0,0,0.25)!important;padding-right:5px;margin-left:4px}.widget-body .md-preview{padding:8px;min-height:200px}.widget-body .md-input{border:none!important;box-shadow:none!important;display:block;margin-bottom:0;background-color:rgba(48,126,204,0.07);padding:8px;width:100%}.widget-body .md-input:focus{background-color:#FFF;box-shadow:none!important}.editable-container .popover-title{color:#438eb9}.editable-click{border-bottom:1px dashed #BBB;cursor:pointer;font-weight:normal}img.editable-click{border:1px dotted #BBB}.editable-click:hover{border-color:#08c;color:#08c}img.editable-click:hover{opacity:.75;filter:alpha(opacity=75)}.editable-buttons,.editable-input{display:inline-block}.editable-buttons{margin-left:1px}.editable-buttons .btn{padding:0;width:28px;line-height:24px;border-width:3px;font-size:12px;margin:0 1px 0 0}.editable-buttons .btn>[class*="icon-"]{margin:0}.editable-clear-x{cursor:pointer;color:#888;background:0}.editable-clear-x:hover{color:#d15b47}.editable-clear-x:before{display:inline-block;content:"\f057";font-family:FontAwesome;font-size:15px;position:absolute;margin-top:-9px;width:16px;height:30px;line-height:30px;text-align:center}.editable-input .ace-spinner{margin-right:8px}.editable-inline .editable-slider{margin-top:10px;margin-right:4px}.editable-popup .editable-slider{display:block;margin-bottom:16px;margin-top:4px}.editable-slider input{display:none}.editable-input .ace-file-input{display:block}.editable-image .ace-file-multiple label.selected{border-color:transparent}.editable-image+.editable-buttons,.editable-wysiwyg+.editable-buttons{display:block;text-align:center;margin-top:8px}.editable-wysiwyg{width:95%}.editable-wysiwyg .wysiwyg-editor{height:auto;overflow-y:hidden}.editableform .input-append.dropdown-menu{display:none}.editableform .open .input-append.dropdown-menu{display:block}.editable-container .editableform{margin-bottom:10px}.editable-inline .editableform{margin-bottom:0}.editableform-loading{background:0}.editableform-loading [class*="icon-"],.editableform-loading .progress{position:relative;top:35%}.ui-slider{background-color:#CCC}.ui-slider-horizontal{height:9px}.ui-slider-vertical{width:9px}.ui-slider .ui-slider-handle{border-radius:0;width:1.45em;height:1.45em;background-color:#f5f5f5;border:1px solid}.ui-slider .ui-slider-handle:before{display:inline-block;content:"|||";font-size:8px;font-family:Helvetica,Arial,sans-serif;position:absolute;top:0;bottom:0;left:0;right:0;text-align:center;line-height:15px}.ui-slider .ui-slider-handle:hover{background-color:#FFF}.ui-slider .ui-slider-handle:hover,.ui-slider .ui-slider-handle:focus,.ui-slider .ui-slider-handle:active{outline:0;box-shadow:1px 1px 1px 0 rgba(0,0,0,0.3);text-decoration:none}.ui-slider .ui-slider-handle:hover:before,.ui-slider .ui-slider-handle:focus:before,.ui-slider .ui-slider-handle:active:before{text-shadow:1px 1px 1px rgba(0,0,0,0.3)}.ui-slider-horizontal .ui-slider-handle{margin-left:-0.725em;top:-0.4em}.ui-slider-vertical .ui-slider-handle{left:-0.35em;margin-bottom:-0.65em}.ui-slider-small.ui-slider-horizontal{height:5px}.ui-slider-small.ui-slider-vertical{width:5px}.ui-slider-small .ui-slider-handle{border-radius:24px;width:16px;height:16px;top:-5px}.ui-slider-small .ui-slider-handle:before{font-size:6px;line-height:13px}.ui-slider-range{background-color:#4aa4ce}.ui-slider-handle{outline:none!important}.ui-slider-handle,.ui-slider-handle:hover,.ui-slider-handle:focus,.ui-slider-handle:active{border-color:#4aa4ce;color:#4aa4ce}.ui-slider-green .ui-slider-range{background-color:#8bbc67}.ui-slider-green .ui-slider-handle,.ui-slider-green .ui-slider-handle:hover,.ui-slider-green .ui-slider-handle:focus,.ui-slider-green .ui-slider-handle:active{border-color:#8bbc67;color:#8bbc67}.ui-slider-red .ui-slider-range{background-color:#d36e6e}.ui-slider-red .ui-slider-handle,.ui-slider-red .ui-slider-handle:hover,.ui-slider-red .ui-slider-handle:focus,.ui-slider-red .ui-slider-handle:active{border-color:#d36e6e;color:#d36e6e}.ui-slider-purple .ui-slider-range{background-color:#ac68ba}.ui-slider-purple .ui-slider-handle,.ui-slider-purple .ui-slider-handle:hover,.ui-slider-purple .ui-slider-handle:focus,.ui-slider-purple .ui-slider-handle:active{border-color:#ac68ba;color:#ac68ba}.ui-slider-orange .ui-slider-range{background-color:#efad62}.ui-slider-orange .ui-slider-handle,.ui-slider-orange .ui-slider-handle:hover,.ui-slider-orange .ui-slider-handle:focus,.ui-slider-orange .ui-slider-handle:active{border-color:#efad62;color:#efad62}.ui-slider-dark .ui-slider-range{background-color:#606060}.ui-slider-dark .ui-slider-handle,.ui-slider-dark .ui-slider-handle:hover,.ui-slider-dark .ui-slider-handle:focus,.ui-slider-dark .ui-slider-handle:active{border-color:#606060;color:#606060}.ui-slider-pink .ui-slider-range{background-color:#d6487e}.ui-slider-pink .ui-slider-handle,.ui-slider-pink .ui-slider-handle:hover,.ui-slider-pink .ui-slider-handle:focus,.ui-slider-pink .ui-slider-handle:active{border-color:#d6487e;color:#d6487e}.ui-datepicker{background-color:#FFF;border:1px solid rgba(0,0,0,0.2);-webkit-box-shadow:0 2px 4px rgba(0,0,0,0.2);box-shadow:0 2px 4px rgba(0,0,0,0.2)}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{height:26px;min-width:32px;max-width:32px;text-align:center;cursor:pointer;color:transparent;line-height:26px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.ui-datepicker .ui-datepicker-prev .ui-icon,.ui-datepicker .ui-datepicker-next .ui-icon{color:transparent;visibility:hidden}.ui-datepicker .ui-datepicker-prev:hover,.ui-datepicker .ui-datepicker-next:hover{background-color:#EEE;text-decoration:none}.ui-datepicker .ui-datepicker-prev:before,.ui-datepicker .ui-datepicker-next:before{display:inline;font-family:FontAwesome;font-size:14px;content:"\f060";color:#393939}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:2px}.ui-datepicker .ui-datepicker-next:before{content:"\f061"}.ui-datepicker .ui-datepicker-prev-hover{left:2px}.ui-datepicker .ui-datepicker-next-hover{right:2px}.ui-datepicker td{padding:0}.ui-datepicker td>a,.ui-datepicker td>span{display:inline-block;height:22px;min-width:24px;max-width:24px;text-align:center;color:#393939;font-size:13px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.ui-datepicker td>a:hover{background-color:#EEE}.ui-datepicker td>a.ui-state-highlight{background-color:#d5e5ef}.ui-datepicker td>a.ui-state-active{background-color:#2283c5;color:#FFF}.ui-datepicker td>a.ui-priority-secondary{color:#888}.ui-datepicker td>span{color:#999}.ui-datepicker td .ui-datepicker-title select{height:24px;line-height:24px;padding:2px 3px}.ui-datepicker td .ui-datepicker-buttonpane{background-color:#DDD;height:1px}.ui-widget-overlay{background:rgba(0,0,0,0.25);opacity:1!important;filter:alpha(opacity=100)!important;z-index:1040!important}.ui-dialog,.ui-jqdialog{z-index:1050!important;background-color:#FFF;padding:0;border:1px solid #DDD;-webkit-box-shadow:0 2px 4px rgba(0,0,0,0.2);box-shadow:0 2px 4px rgba(0,0,0,0.2)}.ui-dialog .ui-dialog-titlebar,.ui-jqdialog .ui-dialog-titlebar,.ui-dialog .ui-jqdialog-titlebar,.ui-jqdialog .ui-jqdialog-titlebar{background-color:#f1f1f1;font-size:16px;color:#669fc7;padding:0}.ui-dialog .ui-dialog-title,.ui-jqdialog .ui-dialog-title,.ui-dialog .ui-jqdialog-title,.ui-jqdialog .ui-jqdialog-title{float:none;width:auto}.ui-dialog .widget-header,.ui-jqdialog .widget-header{margin:0;border-width:0 0 1px 0}.ui-dialog .ui-dialog-buttonpane,.ui-jqdialog .ui-dialog-buttonpane,.ui-dialog .ui-jqdialog-buttonpane,.ui-jqdialog .ui-jqdialog-buttonpane{background-color:#eff3f8;border-top:1px solid #e4e9ee}.ui-dialog .ui-dialog-buttonpane button,.ui-jqdialog .ui-dialog-buttonpane button,.ui-dialog .ui-jqdialog-buttonpane button,.ui-jqdialog .ui-jqdialog-buttonpane button{font-size:14px}.ui-dialog .ui-dialog-titlebar-close,.ui-jqdialog .ui-dialog-titlebar-close,.ui-dialog .ui-jqdialog-titlebar-close,.ui-jqdialog .ui-jqdialog-titlebar-close{border:0;background:transparent;opacity:.4;color:#d15b47;padding:0;top:50%;right:8px!important;text-align:center}.ui-dialog .ui-dialog-titlebar-close:before,.ui-jqdialog .ui-dialog-titlebar-close:before,.ui-dialog .ui-jqdialog-titlebar-close:before,.ui-jqdialog .ui-jqdialog-titlebar-close:before{content:"\f00d";display:inline;font-family:FontAwesome;font-size:16px}.ui-dialog .ui-dialog-titlebar-close:hover,.ui-jqdialog .ui-dialog-titlebar-close:hover,.ui-dialog .ui-jqdialog-titlebar-close:hover,.ui-jqdialog .ui-jqdialog-titlebar-close:hover{opacity:1;text-decoration:none;padding:0}.ui-dialog .ui-dialog-titlebar-close .ui-button-text,.ui-jqdialog .ui-dialog-titlebar-close .ui-button-text,.ui-dialog .ui-jqdialog-titlebar-close .ui-button-text,.ui-jqdialog .ui-jqdialog-titlebar-close .ui-button-text{text-indent:0;visibility:hidden}.ui-dialog .widget-header .ui-dialog-titlebar-close,.ui-jqdialog .widget-header .ui-dialog-titlebar-close,.ui-dialog .widget-header .ui-jqdialog-titlebar-close,.ui-jqdialog .widget-header .ui-jqdialog-titlebar-close{right:10px!important}.ui-accordion .ui-accordion-header{color:#478fca;font-weight:normal;background-color:#f9f9f9;border:1px solid #cdd8e3;padding:8px 8px 9px 24px}.ui-accordion .ui-accordion-header:hover{color:#6ea6cc;background-color:#f1f8fd}.ui-accordion .ui-accordion-header.ui-state-active{color:#4c8fbd;background-color:#eef4f9;position:relative;font-weight:bold}.ui-accordion .ui-accordion-header .ui-accordion-header-icon{text-indent:0;margin-top:0;position:absolute;left:10px;top:7px}.ui-accordion .ui-accordion-header .ui-accordion-header-icon:before{display:inline;font-family:FontAwesome;font-size:15px;content:"\f0da"}.ui-accordion .ui-accordion-header.ui-state-active .ui-accordion-header-icon:before{content:"\f0d7";font-weight:normal}.ui-accordion .ui-accordion-content{border:1px solid #cdd8e3;border-top-width:0;padding:11px 16px}.ui-tabs .ui-tabs-nav{padding:0;border-bottom:1px solid #c5d0dc}.ui-tabs .ui-tabs-nav li.ui-state-default>a{background-color:#f9f9f9;border:1px solid #c5d0dc;border-bottom-width:0;color:#999;line-height:16px;margin-right:-1px;z-index:11;padding:8px 12px;position:relative;top:2px}.ui-tabs .ui-tabs-nav li>a:focus{outline:0}.ui-tabs .ui-tabs-nav li.ui-tabs-active>a{background-color:#FFF;border:1px solid;border-color:#4c8fbd #c5d0dc transparent;border-top-width:2px;-webkit-box-shadow:0 -2px 3px 0 rgba(0,0,0,0.15);box-shadow:0 -2px 3px 0 rgba(0,0,0,0.15);color:#576373;position:relative;top:1px}.ui-tabs .ui-tabs-panel{border:1px solid #c5d0dc;border-top-width:0;margin:0;left:auto;right:auto;top:auto;bottom:auto}.ui-menu{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;width:150px;-webkit-box-shadow:0 2px 4px rgba(0,0,0,0.2);box-shadow:0 2px 4px rgba(0,0,0,0.2);background-color:#FFF;border:1px solid rgba(0,0,0,0.2);padding:3px}.ui-menu .ui-menu-item a{padding:4px 7px 5px;color:#444;cursor:pointer;-webkit-box-sizing:inherit;-moz-box-sizing:inherit;box-sizing:inherit}.ui-menu .ui-menu-item a .ui-menu-icon{float:right;position:relative;top:0;left:auto;right:auto;bottom:auto;text-indent:0}.ui-menu .ui-menu-item a .ui-menu-icon:before{content:"\f105";font-family:FontAwesome;font-size:14px;display:inline}.ui-menu .ui-menu-item a:hover,.ui-menu .ui-menu-item a.ui-state-focus,.ui-menu .ui-menu-item a.ui-state-active{background-color:#4f99c6;color:#FFF;margin:auto;font-weight:normal}.ui-menu .ui-menu-item a:hover .ui-menu-icon,.ui-menu .ui-menu-item a.ui-state-focus .ui-menu-icon,.ui-menu .ui-menu-item a.ui-state-active .ui-menu-icon{color:#FFF}.ui-menu .ui-state-disabled a{color:#999;cursor:default}.ui-menu .ui-state-disabled a:hover,.ui-menu .ui-state-disabled a.ui-state-focus,.ui-menu .ui-state-disabled a.ui-state-active{background-color:#FFF;color:#999}.ui-autocomplete{background-color:#FFF;border:1px solid rgba(0,0,0,0.2);-webkit-box-shadow:0 2px 4px rgba(0,0,0,0.2);box-shadow:0 2px 4px rgba(0,0,0,0.2)}.ui-autocomplete-category{padding:6px;position:relative;background-color:#eef4f9;color:#478fca;font-weight:bolder;border:1px solid #dae6ed;border-width:1px 0}.ui-spinner-button{border-width:0!important;font-size:10px;height:14px;line-height:14px;width:18px;color:#fff!important;text-shadow:0 -1px 0 rgba(0,0,0,0.25)!important;display:inline-block;position:absolute;text-align:center;padding:0}.ui-spinner-button>[class*="icon-"]{width:18px;display:inline-block}.ui-spinner-up{top:0;right:5px}.ui-spinner-down{bottom:3px;right:5px}.ui-spinner-input{margin-top:0;padding:5px;max-width:100px;font-size:14px}.ui-tooltip{background-color:#444;color:#FFF}.ui-progressbar{background-color:#dadada;height:22px}.ui-progressbar .ui-progressbar-value{margin:0}.ui-progressbar .ui-progressbar-value[class="progress-bar"]{background-color:#2a91d8}.ui-jqgrid .ui-jqgrid-view,.ui-jqgrid .ui-paging-info,.ui-jqgrid .ui-pg-table,.ui-jqgrid .ui-pg-selbox{font-size:13px}.ui-jqgrid .ui-jqgrid-title{float:left;margin:8px}.ui-jqgrid .ui-jqgrid-title-rtl{float:right;margin:8px}.ui-jqgrid-view>.ui-jqgrid-titlebar{height:40px;line-height:24px;color:#FFF;background:#307ecc;padding:0;font-size:15px}.ui-jqgrid tr.jqgrow.ui-row-rtl td:last-child{border-right:0;border-left:1px solid #e1e1e1}.ui-jqgrid .ui-jqgrid-hdiv{background-color:#eff3f8;border:1px solid #d3d3d3;border-width:1px 0 0 1px;line-height:15px;font-weight:bold;color:#777;text-shadow:none}.ui-jqgrid .ui-jqgrid-htable thead{background-color:#eff3f8}.ui-jqgrid .ui-jqgrid-htable th span.ui-jqgrid-resize{height:45px!important}.ui-jqgrid .ui-jqgrid-htable th div{padding-top:12px;padding-bottom:12px}.ui-jqgrid-hdiv .ui-jqgrid-htable{border-top:0}.ui-jqgrid-hdiv .ui-jqgrid-htable{border-top:1px solid #e1e1e1}.ui-jqgrid-titlebar{position:relative;top:1px;z-index:1}.ui-jqgrid tr.jqgrow,.ui-jqgrid tr.ui-row-ltr,.ui-jqgrid tr.ui-row-rtl{border:0}.ui-jqgrid tr.ui-row-ltr td,.ui-jqgrid tr.ui-row-rtl td{border-bottom:1px solid #e1e1e1;padding:6px 4px;border-color:#e1e1e1}.ui-jqgrid tr.ui-state-highlight.ui-row-ltr td{border-right-color:#c7d3a9}.ui-jqgrid tr.ui-state-highlight.ui-row-rtl td{border-left-color:#c7d3a9}.ui-jqgrid-btable .ui-widget-content.ui-priority-secondary{background-image:none;background-color:#f9f9f9;opacity:1}.ui-jqgrid-btable .ui-widget-content.ui-state-hover{background-image:none;background-color:#eff4f7;opacity:1}.ui-jqgrid-btable .ui-widget-content.ui-state-highlight{background-color:#e4efc9}.ui-jqgrid .ui-jqgrid-pager{line-height:15px;height:55px;padding-top:3px!important;padding-bottom:5px!important;background-color:#eff3f8!important;border-bottom:1px solid #e1e1e1!important;border-top:1px solid #e1e1e1!important}.ui-jqgrid .ui-pg-input{font-size:inherit;width:24px;height:20px;line-height:16px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;text-align:center;padding-top:1px;padding-bottom:1px}.ui-jqgrid .ui-pg-selbox{display:block;height:24px;width:60px;margin:0;padding:1px;line-height:normal}.ui-jqgrid .ui-jqgrid-htable th div{overflow:visible}.ui-jqgrid .ui-pager-control{height:50px;position:relative;padding-left:9px;padding-right:9px}.ui-jqgrid .ui-jqgrid-toppager{height:auto!important;background-color:#eff3f8;border-bottom:1px solid #e1e1e1!important}.ui-jqgrid .jqgrow .editable{max-width:90%;max-width:calc(92%)!important}.ui-pg-table .navtable .ui-corner-all{border-radius:0}.ui-jqgrid .ui-pg-button:hover{padding:1px}.ui-jqgrid .ui-pg-button .ui-separator{margin-left:4px;margin-right:4px;border-color:#c9d4db}.ui-jqgrid .ui-jqgrid-btable{border-left:1px solid #e1e1e1}.ui-jqgrid .ui-jqgrid-bdiv{border-top:1px solid #e1e1e1}.ui-jqgrid .loading{position:absolute;top:45%;left:45%;width:auto;height:auto;z-index:101;padding:6px;margin:5px;text-align:center;display:none;font-weight:bold;font-size:12px;background-color:#FFF;border:2px solid #8eb8d1;color:#e2b018}.ui-jqgrid .ui-search-toolbar{border-top:1px solid #e1e1e1}.ui-jqgrid .ui-jqgrid-labels{border-bottom:0;background:#f2f2f2;background-image:-webkit-gradient(linear,left 0,left 100%,from(#f8f8f8),to(#ececec));background-image:-webkit-linear-gradient(top,#f8f8f8,0%,#ececec,100%);background-image:-moz-linear-gradient(top,#f8f8f8 0,#ececec 100%);background-image:linear-gradient(to bottom,#f8f8f8 0,#ececec 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff8f8f8',endColorstr='#ffececec',GradientType=0);padding:0!important;border-left:1px solid #e1e1e1!important}.ui-jqgrid .ui-jqgrid-labels th{border-right:1px solid #e1e1e1!important;text-align:left!important}.ui-jqgrid-labels th[id*="_cb"]:first-child>div{padding-top:0;text-align:center!important}.ui-jqgrid-sortable{padding-left:4px;font-size:13px;color:#777;font-weight:bold}.ui-jqgrid-sortable:hover{color:#547ea8}th[aria-selected=true]{background-image:-webkit-gradient(linear,left 0,left 100%,from(#eff3f8),to(#e3e7ed));background-image:-webkit-linear-gradient(top,#eff3f8,0%,#e3e7ed,100%);background-image:-moz-linear-gradient(top,#eff3f8 0,#e3e7ed 100%);background-image:linear-gradient(to bottom,#eff3f8 0,#e3e7ed 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffeff3f8',endColorstr='#ffe3e7ed',GradientType=0)}th[aria-selected=true] .ui-jqgrid-sortable{color:#307ecc}.ui-icon{text-indent:0;color:#307ecc;float:none;right:2px;position:absolute}.rtl .ui-icon{right:auto;left:2px}.ui-grid-ico-sort:before{display:inline;content:"\f0d7";font-family:FontAwesome;font-size:12px}.ui-icon-asc:before{content:"\f0d8"}.ui-state-disabled{color:#BBB}.ui-pg-table>tbody>tr>.ui-pg-button>.ui-icon{display:inline-block;padding:0;width:24px;height:24px;line-height:22px;text-align:center;position:static;float:none;margin:0 2px!important;color:#808080;border:1px solid #CCC;background-color:#FFF;border-radius:100%}.ui-pg-table>tbody>tr>.ui-pg-button>.ui-icon:hover{color:#699ab5;border-color:#699ab5}.ui-pg-table>tbody>tr>.ui-pg-button>.ui-icon:before{width:20px;text-align:center;display:inline-block}.ui-pg-table>tbody>tr>.ui-pg-button.ui-state-disabled .ui-icon{color:#b0b0b0;background-color:#f7f7f7;border-color:#DDD;-moz-transform:scale(0.9);-webkit-transform:scale(0.9);-o-transform:scale(0.9);-ms-transform:scale(0.9);transform:scale(0.9)}.ui-jqgrid-btable input,.ui-jqgrid-btable textarea,.ui-jqgrid-btable select{padding:2px;width:auto;max-width:100%;margin-bottom:0}.ui-jqgrid-btable select{padding:1px;height:25px;line-height:25px}.ui-pg-div .ui-icon{display:inline-block;width:18px;float:none;position:static;text-align:center;opacity:.85;-webkit-transition:all .12s;transition:all .12s;margin:0 1px;vertical-align:middle;cursor:pointer;font-size:17px}.ui-pg-div .ui-icon:hover{-moz-transform:scale(1.2);-webkit-transform:scale(1.2);-o-transform:scale(1.2);-ms-transform:scale(1.2);transform:scale(1.2);opacity:1;position:static;margin:0 1px}.ui-pg-div .ui-icon:before{font-family:FontAwesome;display:inline}.ui-icon-pencil{color:#478fca}.ui-icon-pencil:before{content:"\f040"}.ui-icon-trash{color:#dd5a43}.ui-icon-trash:before{content:"\f014"}.ui-icon-disk{color:#69aa46}.ui-icon-disk:before{content:"\f00c"}.ui-icon-cancel{color:#dd5a43}.ui-icon-cancel:before{content:"\f00d"}.ui-jqdialog-content,.ui-jqdialog .ui-jqdialog-content{font-size:13px;padding:4px 0 0}.ui-jqdialog-content .formdata,.ui-jqdialog .ui-jqdialog-content .formdata{font-size:13px;padding:6px 12px}.ui-jqdialog-content .form-view-data,.ui-jqdialog .ui-jqdialog-content .form-view-data{vertical-align:middle;font-size:13px}.ui-jqdialog-content[id*="alertcnt_"],.ui-jqdialog .ui-jqdialog-content[id*="alertcnt_"]{padding:8px 11px}.ui-jqdialog-content .CaptionTD{font-size:12px;text-align:right;color:#666}.ui-jqdialog-content .FormData{border-bottom:1px dotted #e8e8e8}.ui-jqdialog-content .FormData:last-child{border-bottom:0}.ui-jqdialog-content .FormData>td{padding-top:6px;padding-bottom:6px}.ui-jqdialog-content input.FormElement{width:auto}.ui-jqdialog-content select.FormElement{padding:1px;height:25px;line-height:25px;width:auto}.ui-jqdialog-content td.EditButton{padding:8px}.EditTable{background-color:#eff3f8;border-top:1px solid #d6e1ea!important;padding:8px}.EditTable tr:first-child{display:none}.EditTable .navButton .fm-button{float:none!important;width:auto!important;margin:1px 1px 2px!important;background-color:transparent;border-radius:100%}.EditTable .navButton .fm-button:hover{background-color:transparent}.EditTable .navButton .fm-button:focus{outline:0}.EditTable .navButton .fm-button [class*="icon-"]{display:inline-block;color:#999;border:1px solid #AAA;width:26px;height:26px;line-height:26px;text-align:center;border-radius:100%;background-color:#FFF}.EditTable .navButton .fm-button:hover [class*="icon-"]{color:#699ab5;border-color:#699ab5}.EditTable .navButton .fm-button.ui-state-disabled [class*="icon-"],.EditTable .navButton .fm-button.ui-state-disabled:hover [class*="icon-"]{color:#BBB;border-color:#CCC;-moz-transform:scale(0.88);-webkit-transform:scale(0.88);-o-transform:scale(0.88);-ms-transform:scale(0.88);transform:scale(0.88)}.FormGrid .EditTable{background-color:#FFF;border-top:none!important;padding:0}.FormGrid .EditTable tr:first-child{display:none}.ui-jqdialog-content .searchFilter select{padding:1px;height:26px;line-height:26px;width:auto;max-width:95%;margin-bottom:0}.ui-jqdialog-content .searchFilter .input-elm{margin-bottom:0;height:18px;line-height:18px;width:95%!important;padding-left:1px;padding-right:1px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.ui-jqdialog-content .searchFilter table{margin-left:4px}.ui-jqdialog-content .searchFilter tr td{padding:5px 0}.ui-jqdialog-content .searchFilter .add-group,.ui-jqdialog-content .searchFilter .add-rule,.ui-jqdialog-content .searchFilter .delete-group{margin-left:4px!important;font-size:15px!important}.ui-jqdialog-content .searchFilter .delete-rule{border:0;background-color:#FFF;color:#d15b47;font-size:20px;width:22px;line-height:10px;padding:0;text-shadow:none!important;display:inline-block;-webkit-transition:all .1s;transition:all .1s;opacity:.85}.ui-jqdialog-content .searchFilter .delete-rule:hover{-moz-transform:scale(1.1);-webkit-transform:scale(1.1);-o-transform:scale(1.1);-ms-transform:scale(1.1);transform:scale(1.1);color:#b74635;opacity:1}.ui-jqdialog-content .searchFilter .queryresult{margin-bottom:11px}.ui-jqdialog-content .searchFilter .queryresult td.query{padding:6px 11px;border:1px solid #e1e1e1;background-color:#eee}.ui-jqdialog-content .searchFilter .queryresult td.query:empty{display:none}.ui-state-error{background-color:#f2dede;border:1px solid #eed3d7;color:#b94a48;margin:4px 4px 8px;padding:6px 10px;text-shadow:0 1px 0 rgba(255,255,255,0.5);font-size:13px}.ui-jqdialog .ui-widget-header{background-image:-webkit-gradient(linear,left 0,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0,#eee 100%);background-image:linear-gradient(to bottom,#fff 0,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border-image:none;border-bottom:1px solid solid;color:#669fc7;min-height:38px;position:relative}.ui-jqdialog .ui-widget-header .ui-jqdialog-title{line-height:38px;margin:0;padding:0;padding-left:12px;text-align:left}.widget-header .ui-jqdialog-title{padding-left:0!important;padding-right:0!important}.ui-jqdialog .ui-widget-header .widget-header{border-bottom:0}.ui-jqdialog .ui-jqdialog-titlebar{border-bottom:1px solid #DDD!important}.fm-button{margin:0 4px}.fm-button:not(.btn){background-color:#abbac3;border-radius:0;box-shadow:none;color:#fff;cursor:pointer;display:inline-block;font-size:13px;line-height:28px;padding:0 12px 1px;margin:0 8px;position:relative;text-shadow:0 -1px 0 rgba(0,0,0,0.25);-webkit-transition:all .15s;transition:all .15s;vertical-align:middle}.fm-button.ui-state-default:hover{background-color:#8b9aa3}.dd{position:relative;display:block;margin:0;padding:0;max-width:600px;list-style:none;line-height:20px}.dd-list{display:block;position:relative;margin:0;padding:0;list-style:none}.dd-list .dd-list{padding-left:30px}.dd-collapsed .dd-list{display:none}.dd-item,.dd-empty,.dd-placeholder{display:block;position:relative;margin:0;padding:0;min-height:20px;line-height:20px}.dd-handle,.dd2-content{display:block;min-height:38px;margin:5px 0;padding:8px 12px;background:#f8faff;border:1px solid #dae2ea;color:#7c9eb2;text-decoration:none;font-weight:bold;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.dd-handle:hover,.dd2-content:hover{color:#438eb9;background:#f4f6f7;border-color:#dce2e8}.dd-handle[class*="btn-"],.dd2-content[class*="btn-"]{color:#FFF;border:0;padding:9px 12px}.dd-handle[class*="btn-"]:hover,.dd2-content[class*="btn-"]:hover{opacity:.85;color:#FFF}.dd2-handle+.dd2-content,.dd2-handle+.dd2-content[class*="btn-"]{padding-left:44px}.dd-handle[class*="btn-"]:hover,.dd2-content[class*="btn-"] .dd2-handle[class*="btn-"]:hover+.dd2-content[class*="btn-"]{color:#FFF}.dd-item>button:hover ~ .dd-handle,.dd-item>button:hover ~ .dd2-content{color:#438eb9;background:#f4f6f7;border-color:#dce2e8}.dd-item>button:hover ~ .dd-handle[class*="btn-"],.dd-item>button:hover ~ .dd2-content[class*="btn-"]{opacity:.85;color:#FFF}.dd2-handle:hover ~ .dd2-content{color:#438eb9;background:#f4f6f7;border-color:#dce2e8}.dd2-handle:hover ~ .dd2-content[class*="btn-"]{opacity:.85;color:#FFF}.dd2-item.dd-item>button{margin-left:34px}.dd-item>button{display:block;position:relative;z-index:1;cursor:pointer;float:left;width:25px;height:20px;margin:5px 1px 5px 5px;padding:0;text-indent:100%;white-space:nowrap;overflow:hidden;border:0;background:transparent;font-size:12px;line-height:1;text-align:center;font-weight:bold;top:4px;left:1px;color:#707070}.dd-item>button:before{font-family:FontAwesome;content:'\f067';display:block;position:absolute;width:100%;text-align:center;text-indent:0;font-weight:normal;font-size:14px}.dd-item>button[data-action="collapse"]:before{content:'\f068'}.dd-item>button:hover{color:#707070}.dd-item.dd-colored>button,.dd-item.dd-colored>button:hover{color:#EEE}.dd-placeholder,.dd-empty{margin:5px 0;padding:0;min-height:30px;background:#f0f9ff;border:2px dashed #bed2db;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.dd-empty{border-color:#AAA;border-style:solid;background-color:#e5e5e5}.dd-dragel{position:absolute;pointer-events:none;z-index:999;opacity:.8}.dd-dragel>li>.dd-handle{color:#4b92be;background:#f1f5fa;border-color:#d6e1ea;border-left:2px solid #777;position:relative}.dd-dragel>li>.dd-handle[class*="btn-"]{color:#FFF}.dd-dragel>.dd-item>.dd-handle{margin-top:0}.dd-list>li[class*="item-"]{border-width:0;padding:0}.dd-list>li[class*="item-"]>.dd-handle{border-left:2px solid;border-left-color:inherit}.dd-list>li>.dd-handle .sticker{position:absolute;right:0;top:0}.dd2-handle,.dd-dragel>li>.dd2-handle{left:0;top:0;width:36px;margin:0;border-width:1px 1px 0 0;text-align:center;padding:0!important;line-height:38px;height:38px;background:#ebedf2;border:1px solid #dee4ea;cursor:pointer;overflow:hidden;position:absolute;z-index:1}.dd2-handle:hover,.dd-dragel>li>.dd2-handle{background:#e3e8ed}.dd2-content[class*="btn-"]{text-shadow:none!important}.dd2-handle[class*="btn-"]{text-shadow:none!important;background:rgba(0,0,0,0.1)!important;border-right:1px solid #EEE}.dd2-handle[class*="btn-"]:hover{background:rgba(0,0,0,0.08)!important}.dd-dragel .dd2-handle[class*="btn-"]{border-color:transparent;border-right-color:#EEE}.dd2-handle.btn-yellow{text-shadow:none!important;background:rgba(0,0,0,0.05)!important;border-right:1px solid #FFF}.dd2-handle.btn-yellow:hover{background:rgba(0,0,0,0.08)!important}.dd-dragel .dd2-handle.btn-yellow{border-color:transparent;border-right-color:#FFF}.dd-item>.dd2-handle .drag-icon{display:none}.dd-dragel>.dd-item>.dd2-handle .drag-icon{display:inline}.dd-dragel>.dd-item>.dd2-handle .normal-icon{display:none}.dropzone{border-radius:0;border:1px solid rgba(0,0,0,0.06)}.dropzone .dz-default.dz-message{background-image:none;font-size:24px;text-align:center;line-height:32px;left:0;width:100%;margin-left:auto}.dropzone .dz-default.dz-message span{display:inline;color:#555}.dropzone .dz-default.dz-message span .upload-icon{opacity:.7;filter:alpha(opacity=70);margin-top:8px;cursor:pointer}.dropzone .dz-default.dz-message span .upload-icon:hover{opacity:1;filter:alpha(opacity=100)}.dropzone .dz-preview .dz-error-mark,.dropzone-previews .dz-preview .dz-error-mark,.dropzone .dz-preview .dz-success-mark,.dropzone-previews .dz-preview .dz-success-mark{background-image:none;background-color:rgba(255,255,255,0.8);border-radius:100%;text-align:center;line-height:35px}.dropzone .dz-preview .dz-error-mark:before,.dropzone-previews .dz-preview .dz-error-mark:before{font-family:FontAwesome;font-size:30px;color:#db6262;content:"\f00d"}.dropzone .dz-preview .dz-success-mark:before,.dropzone-previews .dz-preview .dz-success-mark:before{font-family:FontAwesome;font-size:30px;color:#6da552;content:"\f00c"}.dropzone a.dz-remove,.dropzone-previews a.dz-remove{border:0;border-radius:0;color:#FFF;background:#d15b47;cursor:pointer}.dropzone a.dz-remove:hover,.dropzone-previews a.dz-remove:hover{color:#FFF;background:#b74635}.dropzone .progress,.dropzone-previews .progress{margin-bottom:0}.dropzone .dz-preview.dz-success .progress,.dropzone-previews .dz-preview.dz-success .progress,.dropzone .dz-preview.dz-error .progress,.dropzone-previews .dz-preview.dz-error .progress{display:none}.icon-animated-bell{display:inline-block;-moz-animation:ringing 2.0s 5 ease 1.0s;-webkit-animation:ringing 2.0s 5 ease 1.0s;-o-animation:ringing 2.0s 5 ease 1.0s;-ms-animation:ringing 2.0s 5 ease 1.0s;animation:ringing 2.0s 5 ease 1.0s;-moz-transform-origin:50% 0;-webkit-transform-origin:50% 0;-o-transform-origin:50% 0;-ms-transform-origin:50% 0;transform-origin:50% 0}@-moz-keyframes ringing{0%{-moz-transform:rotate(-15deg)}2%{-moz-transform:rotate(15deg)}4%{-moz-transform:rotate(-18deg)}6%{-moz-transform:rotate(18deg)}8%{-moz-transform:rotate(-22deg)}10%{-moz-transform:rotate(22deg)}12%{-moz-transform:rotate(-18deg)}14%{-moz-transform:rotate(18deg)}16%{-moz-transform:rotate(-12deg)}18%{-moz-transform:rotate(12deg)}20%{-moz-transform:rotate(0deg)}}@-webkit-keyframes ringing{0%{-webkit-transform:rotate(-15deg)}2%{-webkit-transform:rotate(15deg)}4%{-webkit-transform:rotate(-18deg)}6%{-webkit-transform:rotate(18deg)}8%{-webkit-transform:rotate(-22deg)}10%{-webkit-transform:rotate(22deg)}12%{-webkit-transform:rotate(-18deg)}14%{-webkit-transform:rotate(18deg)}16%{-webkit-transform:rotate(-12deg)}18%{-webkit-transform:rotate(12deg)}20%{-webkit-transform:rotate(0deg)}}@-ms-keyframes ringing{0%{-ms-transform:rotate(-15deg)}2%{-ms-transform:rotate(15deg)}4%{-ms-transform:rotate(-18deg)}6%{-ms-transform:rotate(18deg)}8%{-ms-transform:rotate(-22deg)}10%{-ms-transform:rotate(22deg)}12%{-ms-transform:rotate(-18deg)}14%{-ms-transform:rotate(18deg)}16%{-ms-transform:rotate(-12deg)}18%{-ms-transform:rotate(12deg)}20%{-ms-transform:rotate(0deg)}}@keyframes ringing{0%{transform:rotate(-15deg)}2%{transform:rotate(15deg)}4%{transform:rotate(-18deg)}6%{transform:rotate(18deg)}8%{transform:rotate(-22deg)}10%{transform:rotate(22deg)}12%{transform:rotate(-18deg)}14%{transform:rotate(18deg)}16%{transform:rotate(-12deg)}18%{transform:rotate(12deg)}20%{transform:rotate(0deg)}}.icon-animated-vertical{display:inline-block;-moz-animation:vertical 2.0s 5 ease 2.0s;-webkit-animation:vertical 2.0s 5 ease 2.0s;-o-animation:vertical 2.0s 5 ease 2.0s;-ms-animation:vertical 2.0s 5 ease 2.0s;animation:vertical 2.0s 5 ease 2.0s}@-moz-keyframes vertical{0%{-moz-transform:translate(0,-3px)}4%{-moz-transform:translate(0,3px)}8%{-moz-transform:translate(0,-3px)}12%{-moz-transform:translate(0,3px)}16%{-moz-transform:translate(0,-3px)}20%{-moz-transform:translate(0,3px)}22%{-moz-transform:translate(0,0)}}@-webkit-keyframes vertical{0%{-webkit-transform:translate(0,-3px)}4%{-webkit-transform:translate(0,3px)}8%{-webkit-transform:translate(0,-3px)}12%{-webkit-transform:translate(0,3px)}16%{-webkit-transform:translate(0,-3px)}20%{-webkit-transform:translate(0,3px)}22%{-webkit-transform:translate(0,0)}}@-ms-keyframes vertical{0%{-ms-transform:translate(0,-3px)}4%{-ms-transform:translate(0,3px)}8%{-ms-transform:translate(0,-3px)}12%{-ms-transform:translate(0,3px)}16%{-ms-transform:translate(0,-3px)}20%{-ms-transform:translate(0,3px)}22%{-ms-transform:translate(0,0)}}@keyframes vertical{0%{transform:translate(0,-3px)}4%{transform:translate(0,3px)}8%{transform:translate(0,-3px)}12%{transform:translate(0,3px)}16%{transform:translate(0,-3px)}20%{transform:translate(0,3px)}22%{transform:translate(0,0)}}.icon-animated-hand-pointer{display:inline-block;-moz-animation:hand-pointer 2.0s 4 ease 2.0s;-webkit-animation:hand-pointer 2.0s 4 ease 2.0s;-o-animation:hand-pointer 2.0s 4 ease 2.0s;-ms-animation:hand-pointer 2.0s 4 ease 2.0s;animation:hand-pointer 2.0s 4 ease 2.0s}@-moz-keyframes hand-pointer{0%{-moz-transform:translate(0,0)}6%{-moz-transform:translate(5px,0)}12%{-moz-transform:translate(0,0)}18%{-moz-transform:translate(5px,0)}24%{-moz-transform:translate(0,0)}30%{-moz-transform:translate(5px,0)}36%{-moz-transform:translate(0,0)}}.icon-animated-wrench{display:inline-block;-moz-animation:wrenching 2.5s 4 ease;-webkit-animation:wrenching 2.5s 4 ease;-o-animation:wrenching 2.5s 4 ease;-ms-animation:wrenching 2.5s 4 ease;animation:wrenching 2.5s 4 ease;-moz-transform-origin:90% 35%;-webkit-transform-origin:90% 35%;-o-transform-origin:90% 35%;-ms-transform-origin:90% 35%;transform-origin:90% 35%}@-moz-keyframes wrenching{0%{-moz-transform:rotate(-12deg)}8%{-moz-transform:rotate(12deg)}10%{-moz-transform:rotate(24deg)}18%{-moz-transform:rotate(-24deg)}20%{-moz-transform:rotate(-24deg)}28%{-moz-transform:rotate(24deg)}30%{-moz-transform:rotate(24deg)}38%{-moz-transform:rotate(-24deg)}40%{-moz-transform:rotate(-24deg)}48%{-moz-transform:rotate(24deg)}50%{-moz-transform:rotate(24deg)}58%{-moz-transform:rotate(-24deg)}60%{-moz-transform:rotate(-24deg)}68%{-moz-transform:rotate(24deg)}75%{-moz-transform:rotate(0deg)}}@-webkit-keyframes wrenching{0%{-webkit-transform:rotate(-12deg)}8%{-webkit-transform:rotate(12deg)}10%{-webkit-transform:rotate(24deg)}18%{-webkit-transform:rotate(-24deg)}20%{-webkit-transform:rotate(-24deg)}28%{-webkit-transform:rotate(24deg)}30%{-webkit-transform:rotate(24deg)}38%{-webkit-transform:rotate(-24deg)}40%{-webkit-transform:rotate(-24deg)}48%{-webkit-transform:rotate(24deg)}50%{-webkit-transform:rotate(24deg)}58%{-webkit-transform:rotate(-24deg)}60%{-webkit-transform:rotate(-24deg)}68%{-webkit-transform:rotate(24deg)}75%{-webkit-transform:rotate(0deg)}}@-o-keyframes wrenching{0%{-o-transform:rotate(-12deg)}8%{-o-transform:rotate(12deg)}10%{-o-transform:rotate(24deg)}18%{-o-transform:rotate(-24deg)}20%{-o-transform:rotate(-24deg)}28%{-o-transform:rotate(24deg)}30%{-o-transform:rotate(24deg)}38%{-o-transform:rotate(-24deg)}40%{-o-transform:rotate(-24deg)}48%{-o-transform:rotate(24deg)}50%{-o-transform:rotate(24deg)}58%{-o-transform:rotate(-24deg)}60%{-o-transform:rotate(-24deg)}68%{-o-transform:rotate(24deg)}75%{-o-transform:rotate(0deg)}}@-ms-keyframes wrenching{0%{-ms-transform:rotate(-12deg)}8%{-ms-transform:rotate(12deg)}10%{-ms-transform:rotate(24deg)}18%{-ms-transform:rotate(-24deg)}20%{-ms-transform:rotate(-24deg)}28%{-ms-transform:rotate(24deg)}30%{-ms-transform:rotate(24deg)}38%{-ms-transform:rotate(-24deg)}40%{-ms-transform:rotate(-24deg)}48%{-ms-transform:rotate(24deg)}50%{-ms-transform:rotate(24deg)}58%{-ms-transform:rotate(-24deg)}60%{-ms-transform:rotate(-24deg)}68%{-ms-transform:rotate(24deg)}75%{-ms-transform:rotate(0deg)}}@keyframes wrenching{0%{transform:rotate(-12deg)}8%{transform:rotate(12deg)}10%{transform:rotate(24deg)}18%{transform:rotate(-24deg)}20%{transform:rotate(-24deg)}28%{transform:rotate(24deg)}30%{transform:rotate(24deg)}38%{transform:rotate(-24deg)}40%{transform:rotate(-24deg)}48%{transform:rotate(24deg)}50%{transform:rotate(24deg)}58%{transform:rotate(-24deg)}60%{transform:rotate(-24deg)}68%{transform:rotate(24deg)}75%{transform:rotate(0deg)}}.ace-settings-container{position:absolute;right:0;top:50px;z-index:12}.breadcrumbs-fixed .ace-settings-container{top:9px}.btn.ace-settings-btn{float:left;display:inline-block;width:42px!important;text-align:center;border-radius:6px 0 0 6px!important;opacity:.55;filter:alpha(opacity=55.00000000000001);vertical-align:top;margin:0}.btn.ace-settings-btn:hover,.btn.ace-settings-btn.open{opacity:1;filter:alpha(opacity=100)}.ace-settings-box{display:none;float:left;width:175px;padding:0 14px;background-color:#FFF;border:2px solid #ffb34b}.ace-settings-box.open{display:inline-block}.ace-settings-box>div{margin:6px 0;color:#444;max-height:24px}.ace-settings-box>div>label{font-size:13px}.btn-scroll-up{border:0;position:absolute;right:2px;bottom:2px;z-index:11}@media(min-width:768px){.main-container.container>.btn-scroll-up{right:auto;margin-left:708px}}@media(min-width:992px){.main-container.container>.btn-scroll-up{right:auto;margin-left:928px}}@media(min-width:1200px){.main-container.container>.btn-scroll-up{right:auto;margin-left:1128px}}.grid2,.grid3,.grid4{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin:0;float:left;border-left:1px solid #e3e3e3}.grid2:first-child,.grid3:first-child,.grid4:first-child{border-left:none}.grid2{width:48%;padding:0 2%}.grid3{width:33%;padding:0 2%}.grid4{width:23%;margin:0 1%;padding:0 1%}.draggable-placeholder{border:2px dashed #d9d9d9!important;background-color:#f7f7f7!important}.slimScrollBar{border-radius:0!important}.slimScrollRail{border-radius:0!important}.datepicker td,.daterangepicker td,.datepicker th,.daterangepicker th{border-radius:0!important;font-size:13px}.datepicker td.active,.daterangepicker td.active,.datepicker td.active:hover,.daterangepicker td.active:hover{background:#2283c5!important}.datepicker td.active.disabled,.daterangepicker td.active.disabled,.datepicker td.active.disabled:hover,.daterangepicker td.active.disabled:hover{background:#8b9aa3!important}.datepicker td,.datepicker th{min-width:32px}.datepicker-months .month,.datepicker-years .year{border-radius:0!important}.datepicker-months .month.active,.datepicker-years .year.active,.datepicker-months .month.active:hover,.datepicker-years .year.active:hover,.datepicker-months .month.active:focus,.datepicker-years .year.active:focus,.datepicker-months .month.active:active,.datepicker-years .year.active:active{background-image:none!important;background-color:#2283c5!important}.bootstrap-timepicker-widget table td input{width:32px}.bootstrap-timepicker-widget table td a:hover{border-radius:0}.well .datepicker table tr td.day:hover{background-color:#7d8893;color:#FFF}.easyPieChart{position:relative;text-align:center}.easyPieChart canvas{position:absolute;top:0;left:0}.knob-container{direction:ltr;text-align:left}.navbar .navbar-inner,.navbar .btn-navbar{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)!important}.dropdown-menu li>a,.dropdown-submenu>a{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)!important}.btn{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)!important}.progress,.progress .bar{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)!important}.tags{display:inline-block;padding:4px 6px;color:#777;vertical-align:middle;background-color:#FFF;border:1px solid #d5d5d5;width:206px}.tags:hover{border-color:#b5b5b5}.tags-hover,.tags-hover:hover{border-color:#f59942;outline:0;outline:thin dotted \9}.tags[class*="span"]{float:none;margin-left:0}.tags input[type="text"],.tags input[type="text"]:focus{border:0;display:inline;outline:0;margin:0;padding:0;line-height:14px;-webkit-box-shadow:none;box-shadow:none;width:100%}.tags .tag{display:inline-block;position:relative;font-size:13px;font-weight:normal;vertical-align:baseline;white-space:nowrap;background-color:#91b8d0;color:#FFF;text-shadow:1px 1px 1px rgba(0,0,0,0.15);padding:4px 22px 5px 9px;margin-bottom:3px;margin-right:3px;-webkit-transition:all .2s;transition:all .2s}.tags .tag:empty{display:none}.tags .tag-important{background-color:#d15b47}.tags .tag-warning{background-color:#ffb752}.tags .tag-success{background-color:#87b87f}.tags .tag-info{background-color:#6fb3e0}.tags .tag-inverse{background-color:#555}.tags .tag .close{font-size:15px;line-height:20px;opacity:1;filter:alpha(opacity=100);color:#FFF;text-shadow:none;float:none;position:absolute;right:0;top:0;bottom:0;width:18px;text-align:center}.tags .tag .close:hover{background-color:rgba(0,0,0,0.2)}.col-xs-12,.col-sm-12,.col-md-12,.col-lg-12{float:left}.col-xs-reset{width:auto;padding-left:0;padding-right:0;float:none}@media(min-width:768px){.col-sm-reset{width:auto;padding-left:0;padding-right:0;float:none}}@media(min-width:992px){.col-md-reset{width:auto;padding-left:0;padding-right:0;float:none}}@media(min-width:1200px){.col-lg-reset{width:auto;padding-left:0;padding-right:0;float:none}}.jqstooltip,.legendColorBox div{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.legendLabel{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;height:20px;font-size:10px}@media only screen and (max-width:480px){.hidden-480{display:none!important}}@media only screen and (max-width:320px){.hidden-320{display:none!important}}@media only screen and (max-width:480px){[class*="vspace-xs"]{display:block}}@media only screen and (max-width:767px){[class*="vspace-sm"]{display:block}}@media only screen and (max-width:991px){[class*="vspace-md"]{display:block}}@media only screen and (max-width:1199px){[class*="vspace-lg"]{display:block}}@media only screen and (max-width:991px){.main-content{margin-left:0!important}}@media only screen and (max-width:767px){.page-content{padding-left:12px;padding-right:12px}}@media(max-width:991px){body.breadcrumbs-fixed{padding-top:45px}.navbar-fixed-top{margin-bottom:0}.sidebar.fixed,.sidebar.sidebar-fixed{position:absolute}}@media(max-width:460px){body.navbar-fixed{padding-top:90px}}@media only screen and (max-width:767px){.error-container{margin:12px}}@media only screen and (max-width:480px){.error-container{margin:6px}}@media only screen and (max-width:360px){.grid2,.grid3,.grid4{float:none;display:block;width:96%;border-left:none;position:relative;margin-bottom:11px;border-bottom:1px solid #e3e3e3;padding-bottom:4px}.grid2>[class*="pull-"],.grid3>[class*="pull-"],.grid4>[class*="pull-"]{float:none!important;display:inline-block;position:absolute;right:11px;top:0;margin-top:0}.grid2:last-child,.grid3:last-child,.grid4:last-child{border-bottom:0}}@media only screen and (max-width:480px){.ace-settings-container,body.breadcrumbs-fixed .ace-settings-container{top:65px}} \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/assets/css/base/ace/font-awesome.min.css b/src/Surging.ApiGateway/wwwroot/assets/css/base/ace/font-awesome.min.css deleted file mode 100644 index dbdf6046d..000000000 --- a/src/Surging.ApiGateway/wwwroot/assets/css/base/ace/font-awesome.min.css +++ /dev/null @@ -1,1837 +0,0 @@ -@font-face { - font-family: 'FontAwesome'; - src: url('../../fonts/fontawesome-webfont.eot?v=3.2.2'); - src: url('../../fonts/fontawesome-webfont.eot?#iefix&v=3.2.2') format('embedded-opentype'),url('../../fonts/fontawesome-webfont.woff?v=3.2.1') format('woff'),url('../../fonts/fontawesome-webfont.ttf?v=3.2.1') format('truetype'),url('../../fonts/fontawesome-webfont.svg#fontawesomeregular') format('svg'); - font-weight: normal; - font-style: normal; -} -@font-face { - font-family: 'surgingfonticon'; - src: url('../../fonts/surgingfonticon.eot?i1nd12b'); - src: url('../../fonts/surgingfonticon.eot?i1nd12b#iefix') format('embedded-opentype'),url('../../fonts/surgingfonticon.woff?i1nd12b') format('woff'),url('../../fonts/surgingfonticon.ttf?i1nd12b') format('truetype'),url('../../fonts/surgingfonticon.svg?i1nd12b#surgingfonticon') format('svg'); - font-weight: normal; - font-style: normal; -} - -[class^="icon-"], [class*=" icon-"], [class^="surging-icon-"] { - font-family: 'FontAwesome','surgingfonticon'; - font-weight: normal; - font-style: normal; - text-decoration: inherit; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - *margin-right: .3em; - font-size: inherit; - text-rendering: auto; - line-height: 1; -} - -[class^="icon-"]:before, [class*=" icon-"]:before { - text-decoration: inherit; - display: inline-block; - speak: none; -} - -.icon-large:before { - vertical-align: -10%; - font-size: 1.3333333333333333em; -} - -a [class^="icon-"], a [class*=" icon-"] { - display: inline; -} - -[class^="icon-"].icon-fixed-width, [class*=" icon-"].icon-fixed-width { - display: inline-block; - width: 1.1428571428571428em; - text-align: right; - padding-right: 0.2857142857142857em; -} - -[class^="icon-"].icon-fixed-width.icon-large, [class*=" icon-"].icon-fixed-width.icon-large { - width: 1.4285714285714286em; -} - -.icons-ul { - margin-left: 2.142857142857143em; - list-style-type: none; -} - -.icons-ul > li { - position: relative; -} - -.icons-ul .icon-li { - position: absolute; - left: -2.142857142857143em; - width: 2.142857142857143em; - text-align: center; - line-height: inherit; -} - -[class^="icon-"].hide, [class*=" icon-"].hide { - display: none; -} - -.icon-muted { - color: #eeeeee; -} - -.icon-light { - color: #ffffff; -} - -.icon-dark { - color: #333333; -} - -.icon-border { - border: solid 1px #eeeeee; - padding: .2em .25em .15em; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.icon-2x { - font-size: 2em; -} - -.icon-2x.icon-border { - border-width: 2px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.icon-3x { - font-size: 3em; -} - -.icon-3x.icon-border { - border-width: 3px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} - -.icon-4x { - font-size: 4em; -} - -.icon-4x.icon-border { - border-width: 4px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.icon-5x { - font-size: 5em; -} - -.icon-5x.icon-border { - border-width: 5px; - -webkit-border-radius: 7px; - -moz-border-radius: 7px; - border-radius: 7px; -} - -.pull-right { - float: right; -} - -.pull-left { - float: left; -} - -[class^="icon-"].pull-left, [class*=" icon-"].pull-left { - margin-right: .3em; -} - -[class^="icon-"].pull-right, [class*=" icon-"].pull-right { - margin-left: .3em; -} - -[class^="icon-"], [class*=" icon-"] { - display: inline; - width: auto; - height: auto; - line-height: normal; - vertical-align: baseline; - background-image: none; - background-position: 0% 0%; - background-repeat: repeat; - margin-top: 0; -} - -.icon-white, .nav-pills > .active > a > [class^="icon-"], .nav-pills > .active > a > [class*=" icon-"], .nav-list > .active > a > [class^="icon-"], .nav-list > .active > a > [class*=" icon-"], .navbar-inverse .nav > .active > a > [class^="icon-"], .navbar-inverse .nav > .active > a > [class*=" icon-"], .dropdown-menu > li > a:hover > [class^="icon-"], .dropdown-menu > li > a:hover > [class*=" icon-"], .dropdown-menu > .active > a > [class^="icon-"], .dropdown-menu > .active > a > [class*=" icon-"], .dropdown-submenu:hover > a > [class^="icon-"], .dropdown-submenu:hover > a > [class*=" icon-"] { - background-image: none; -} - -.btn [class^="icon-"].icon-large, .nav [class^="icon-"].icon-large, .btn [class*=" icon-"].icon-large, .nav [class*=" icon-"].icon-large { - line-height: .9em; -} - -.btn [class^="icon-"].icon-spin, .nav [class^="icon-"].icon-spin, .btn [class*=" icon-"].icon-spin, .nav [class*=" icon-"].icon-spin { - display: inline-block; -} - -.nav-tabs [class^="icon-"], .nav-pills [class^="icon-"], .nav-tabs [class*=" icon-"], .nav-pills [class*=" icon-"], .nav-tabs [class^="icon-"].icon-large, .nav-pills [class^="icon-"].icon-large, .nav-tabs [class*=" icon-"].icon-large, .nav-pills [class*=" icon-"].icon-large { - line-height: .9em; -} - -.btn [class^="icon-"].pull-left.icon-2x, .btn [class*=" icon-"].pull-left.icon-2x, .btn [class^="icon-"].pull-right.icon-2x, .btn [class*=" icon-"].pull-right.icon-2x { - margin-top: .18em; -} - -.btn [class^="icon-"].icon-spin.icon-large, .btn [class*=" icon-"].icon-spin.icon-large { - line-height: .8em; -} - -.btn.btn-small [class^="icon-"].pull-left.icon-2x, .btn.btn-small [class*=" icon-"].pull-left.icon-2x, .btn.btn-small [class^="icon-"].pull-right.icon-2x, .btn.btn-small [class*=" icon-"].pull-right.icon-2x { - margin-top: .25em; -} - -.btn.btn-large [class^="icon-"], .btn.btn-large [class*=" icon-"] { - margin-top: 0; -} - -.btn.btn-large [class^="icon-"].pull-left.icon-2x, .btn.btn-large [class*=" icon-"].pull-left.icon-2x, .btn.btn-large [class^="icon-"].pull-right.icon-2x, .btn.btn-large [class*=" icon-"].pull-right.icon-2x { - margin-top: .05em; -} - -.btn.btn-large [class^="icon-"].pull-left.icon-2x, .btn.btn-large [class*=" icon-"].pull-left.icon-2x { - margin-right: .2em; -} - -.btn.btn-large [class^="icon-"].pull-right.icon-2x, .btn.btn-large [class*=" icon-"].pull-right.icon-2x { - margin-left: .2em; -} - -.nav-list [class^="icon-"], .nav-list [class*=" icon-"] { - line-height: inherit; -} - -.icon-stack { - position: relative; - display: inline-block; - width: 2em; - height: 2em; - line-height: 2em; - vertical-align: -35%; -} - -.icon-stack [class^="icon-"], .icon-stack [class*=" icon-"] { - display: block; - text-align: center; - position: absolute; - width: 100%; - height: 100%; - font-size: 1em; - line-height: inherit; - *line-height: 2em; -} - -.icon-stack .icon-stack-base { - font-size: 2em; - *line-height: 1em; -} - -.icon-spin { - display: inline-block; - -moz-animation: spin 2s infinite linear; - -o-animation: spin 2s infinite linear; - -webkit-animation: spin 2s infinite linear; - animation: spin 2s infinite linear; -} - -a .icon-stack, a .icon-spin { - display: inline-block; - text-decoration: none; -} - -@-moz-keyframes spin { - 0% { - -moz-transform: rotate(0deg); - } - - 100% { - -moz-transform: rotate(359deg); - } -} - -@-webkit-keyframes spin { - 0% { - -webkit-transform: rotate(0deg); - } - - 100% { - -webkit-transform: rotate(359deg); - } -} - -@-o-keyframes spin { - 0% { - -o-transform: rotate(0deg); - } - - 100% { - -o-transform: rotate(359deg); - } -} - -@-ms-keyframes spin { - 0% { - -ms-transform: rotate(0deg); - } - - 100% { - -ms-transform: rotate(359deg); - } -} - -@keyframes spin { - 0% { - transform: rotate(0deg); - } - - 100% { - transform: rotate(359deg); - } -} - -.icon-rotate-90:before { - -webkit-transform: rotate(90deg); - -moz-transform: rotate(90deg); - -ms-transform: rotate(90deg); - -o-transform: rotate(90deg); - transform: rotate(90deg); - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1); -} - -.icon-rotate-180:before { - -webkit-transform: rotate(180deg); - -moz-transform: rotate(180deg); - -ms-transform: rotate(180deg); - -o-transform: rotate(180deg); - transform: rotate(180deg); - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2); -} - -.icon-rotate-270:before { - -webkit-transform: rotate(270deg); - -moz-transform: rotate(270deg); - -ms-transform: rotate(270deg); - -o-transform: rotate(270deg); - transform: rotate(270deg); - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); -} - -.icon-flip-horizontal:before { - -webkit-transform: scale(-1, 1); - -moz-transform: scale(-1, 1); - -ms-transform: scale(-1, 1); - -o-transform: scale(-1, 1); - transform: scale(-1, 1); -} - -.icon-flip-vertical:before { - -webkit-transform: scale(1, -1); - -moz-transform: scale(1, -1); - -ms-transform: scale(1, -1); - -o-transform: scale(1, -1); - transform: scale(1, -1); -} - -a .icon-rotate-90:before, a .icon-rotate-180:before, a .icon-rotate-270:before, a .icon-flip-horizontal:before, a .icon-flip-vertical:before { - display: inline-block; -} - -.icon-glass:before { - content: "\f000"; -} - -.icon-music:before { - content: "\f001"; -} - -.icon-search:before { - content: "\f002"; -} - -.icon-envelope-alt:before { - content: "\f003"; -} - -.icon-heart:before { - content: "\f004"; -} - -.icon-star:before { - content: "\f005"; -} - -.icon-star-empty:before { - content: "\f006"; -} - -.icon-user:before { - content: "\f007"; -} - -.icon-film:before { - content: "\f008"; -} - -.icon-th-large:before { - content: "\f009"; -} - -.icon-th:before { - content: "\f00a"; -} - -.icon-th-list:before { - content: "\f00b"; -} - -.icon-ok:before { - content: "\f00c"; -} -.surging-icon-message:before { - content: "\fd60"; -} -.surging-icon-wrench:before { - content: "\fda0"; -} -.surging-icon-home:before { - content: "\fd77"; -} -.surging-icon-token:before { - content: "\e6b2"; -} -.surging-icon-line:before { - content: "\e69c"; -} -.surging-icon-file:before { - content: "\e62f"; -} -.surging-icon-blacklist:before { - content: "\e674"; -} -.icon-servicemange:before { - content: "\fd69"; -} -.icon-ref-consume:before { - content: "\fd74"; -} -.icon-service:before { - content: "\fd71"; -} -.icon-calculator:before { - content: "\fd72"; -} -.surging-icon-house-dialog:before { - content: "\fd52"; -} -.icon-home:before { - content: "\fd77"; -} -.icon-color-home:before { - content: "\fd75"; -} -.icon-back:before { - content: "\fd76"; -} -.icon-remove:before { - content: "\f00d"; -} - -.icon-zoom-in:before { - content: "\f00e"; -} - -.icon-zoom-out:before { - content: "\f010"; -} - -.icon-power-off:before, .icon-off:before { - content: "\f011"; -} - -.icon-signal:before { - content: "\f012"; -} - -.icon-gear:before, .icon-cog:before { - content: "\f013"; -} - -.icon-trash:before { - content: "\f014"; -} - -.icon-home:before { - content: "\f015"; -} - -.icon-file-alt:before { - content: "\f016"; -} - -.icon-time:before { - content: "\f017"; -} - -.icon-road:before { - content: "\f018"; -} - -.icon-download-alt:before { - content: "\f019"; -} - -.icon-download:before { - content: "\f01a"; -} - -.icon-upload:before { - content: "\f01b"; -} - -.icon-inbox:before { - content: "\f01c"; -} - -.icon-play-circle:before { - content: "\f01d"; -} - -.icon-rotate-right:before, .icon-repeat:before { - content: "\f01e"; -} - -.icon-refresh:before { - content: "\f021"; -} - -.icon-list-alt:before { - content: "\f022"; -} - -.icon-lock:before { - content: "\f023"; -} - -.icon-flag:before { - content: "\f024"; -} - -.icon-headphones:before { - content: "\f025"; -} - -.icon-volume-off:before { - content: "\f026"; -} - -.icon-volume-down:before { - content: "\f027"; -} - -.icon-volume-up:before { - content: "\f028"; -} - -.icon-qrcode:before { - content: "\f029"; -} - -.icon-barcode:before { - content: "\f02a"; -} - -.icon-tag:before { - content: "\f02b"; -} - -.icon-tags:before { - content: "\f02c"; -} - -.icon-book:before { - content: "\f02d"; -} - -.icon-bookmark:before { - content: "\f02e"; -} - -.icon-print:before { - content: "\f02f"; -} - -.icon-camera:before { - content: "\f030"; -} - -.icon-font:before { - content: "\f031"; -} - -.icon-bold:before { - content: "\f032"; -} - -.icon-italic:before { - content: "\f033"; -} - -.icon-text-height:before { - content: "\f034"; -} - -.icon-text-width:before { - content: "\f035"; -} - -.icon-align-left:before { - content: "\f036"; -} - -.icon-align-center:before { - content: "\f037"; -} - -.icon-align-right:before { - content: "\f038"; -} - -.icon-align-justify:before { - content: "\f039"; -} - -.icon-list:before { - content: "\f03a"; -} - -.icon-indent-left:before { - content: "\f03b"; -} - -.icon-indent-right:before { - content: "\f03c"; -} - -.icon-facetime-video:before { - content: "\f03d"; -} - -.icon-picture:before { - content: "\f03e"; -} - -.icon-pencil:before { - content: "\f040"; -} - -.icon-map-marker:before { - content: "\f041"; -} - -.icon-adjust:before { - content: "\f042"; -} - -.icon-tint:before { - content: "\f043"; -} - -.icon-edit:before { - content: "\f044"; -} - -.icon-share:before { - content: "\f045"; -} - -.icon-check:before { - content: "\f046"; -} - -.icon-move:before { - content: "\f047"; -} - -.icon-step-backward:before { - content: "\f048"; -} - -.icon-fast-backward:before { - content: "\f049"; -} - -.icon-backward:before { - content: "\f04a"; -} - -.icon-play:before { - content: "\f04b"; -} - -.icon-pause:before { - content: "\f04c"; -} - -.icon-stop:before { - content: "\f04d"; -} - -.icon-forward:before { - content: "\f04e"; -} - -.icon-fast-forward:before { - content: "\f050"; -} - -.icon-step-forward:before { - content: "\f051"; -} - -.icon-eject:before { - content: "\f052"; -} - -.icon-chevron-left:before { - content: "\f053"; -} - -.icon-chevron-right:before { - content: "\f054"; -} - -.icon-plus-sign:before { - content: "\f055"; -} - -.icon-minus-sign:before { - content: "\f056"; -} - -.icon-remove-sign:before { - content: "\f057"; -} - -.icon-ok-sign:before { - content: "\f058"; -} - -.icon-question-sign:before { - content: "\f059"; -} - -.icon-info-sign:before { - content: "\f05a"; -} - -.icon-screenshot:before { - content: "\f05b"; -} - -.icon-remove-circle:before { - content: "\f05c"; -} - -.icon-ok-circle:before { - content: "\f05d"; -} - -.icon-ban-circle:before { - content: "\f05e"; -} - -.icon-arrow-left:before { - content: "\f060"; -} - -.icon-arrow-right:before { - content: "\f061"; -} - -.icon-arrow-up:before { - content: "\f062"; -} - -.icon-arrow-down:before { - content: "\f063"; -} - -.icon-mail-forward:before, .icon-share-alt:before { - content: "\f064"; -} - -.icon-resize-full:before { - content: "\f065"; -} - -.icon-resize-small:before { - content: "\f066"; -} - -.icon-plus:before { - content: "\f067"; -} - -.icon-minus:before { - content: "\f068"; -} - -.icon-asterisk:before { - content: "\f069"; -} - -.icon-exclamation-sign:before { - content: "\f06a"; -} - -.icon-gift:before { - content: "\f06b"; -} - -.icon-leaf:before { - content: "\f06c"; -} - -.icon-fire:before { - content: "\f06d"; -} - -.icon-eye-open:before { - content: "\f06e"; -} - -.icon-eye-close:before { - content: "\f070"; -} - -.icon-warning-sign:before { - content: "\f071"; -} - -.icon-plane:before { - content: "\f072"; -} - -.icon-calendar:before { - content: "\f073"; -} - -.icon-random:before { - content: "\f074"; -} - -.icon-comment:before { - content: "\f075"; -} - -.icon-magnet:before { - content: "\f076"; -} - -.icon-chevron-up:before { - content: "\f077"; -} - -.icon-chevron-down:before { - content: "\f078"; -} - -.icon-retweet:before { - content: "\f079"; -} - -.icon-shopping-cart:before { - content: "\f07a"; -} - -.icon-folder-close:before { - content: "\f07b"; -} - -.icon-folder-open:before { - content: "\f07c"; -} - -.icon-resize-vertical:before { - content: "\f07d"; -} - -.icon-resize-horizontal:before { - content: "\f07e"; -} - -.icon-bar-chart:before { - content: "\f080"; -} - -.icon-twitter-sign:before { - content: "\f081"; -} - -.icon-facebook-sign:before { - content: "\f082"; -} - -.icon-camera-retro:before { - content: "\f083"; -} - -.icon-key:before { - content: "\f084"; -} - -.icon-gears:before, .icon-cogs:before { - content: "\f085"; -} - -.icon-comments:before { - content: "\f086"; -} - -.icon-thumbs-up-alt:before { - content: "\f087"; -} - -.icon-thumbs-down-alt:before { - content: "\f088"; -} - -.icon-star-half:before { - content: "\f089"; -} - -.icon-heart-empty:before { - content: "\f08a"; -} - -.icon-signout:before { - content: "\f08b"; -} - -.icon-linkedin-sign:before { - content: "\f08c"; -} - -.icon-pushpin:before { - content: "\f08d"; -} - -.icon-external-link:before { - content: "\f08e"; -} - -.icon-signin:before { - content: "\f090"; -} - -.icon-trophy:before { - content: "\f091"; -} - -.icon-github-sign:before { - content: "\f092"; -} - -.icon-upload-alt:before { - content: "\f093"; -} - -.icon-lemon:before { - content: "\f094"; -} - -.icon-phone:before { - content: "\f095"; -} - -.icon-unchecked:before, .icon-check-empty:before { - content: "\f096"; -} - -.icon-bookmark-empty:before { - content: "\f097"; -} - -.icon-phone-sign:before { - content: "\f098"; -} - -.icon-twitter:before { - content: "\f099"; -} - -.icon-facebook:before { - content: "\f09a"; -} - -.icon-github:before { - content: "\f09b"; -} - -.icon-unlock:before { - content: "\f09c"; -} - -.icon-credit-card:before { - content: "\f09d"; -} - -.icon-rss:before { - content: "\f09e"; -} - -.icon-hdd:before { - content: "\f0a0"; -} - -.icon-bullhorn:before { - content: "\f0a1"; -} - -.icon-bell:before { - content: "\f0a2"; -} - -.icon-certificate:before { - content: "\f0a3"; -} - -.icon-hand-right:before { - content: "\f0a4"; -} - -.icon-hand-left:before { - content: "\f0a5"; -} - -.icon-hand-up:before { - content: "\f0a6"; -} - -.icon-hand-down:before { - content: "\f0a7"; -} - -.icon-circle-arrow-left:before { - content: "\f0a8"; -} - -.icon-circle-arrow-right:before { - content: "\f0a9"; -} - -.icon-circle-arrow-up:before { - content: "\f0aa"; -} - -.icon-circle-arrow-down:before { - content: "\f0ab"; -} - -.icon-globe:before { - content: "\f0ac"; -} - -.icon-wrench:before { - content: "\f0ad"; -} - -.icon-tasks:before { - content: "\f0ae"; -} - -.icon-filter:before { - content: "\f0b0"; -} - -.icon-briefcase:before { - content: "\f0b1"; -} - -.icon-fullscreen:before { - content: "\f0b2"; -} - -.icon-group:before { - content: "\f0c0"; -} - -.icon-link:before { - content: "\f0c1"; -} - -.icon-cloud:before { - content: "\f0c2"; -} - -.icon-beaker:before { - content: "\f0c3"; -} - -.icon-cut:before { - content: "\f0c4"; -} - -.icon-copy:before { - content: "\f0c5"; -} - -.icon-paperclip:before, .icon-paper-clip:before { - content: "\f0c6"; -} - -.icon-save:before { - content: "\f0c7"; -} - -.icon-sign-blank:before { - content: "\f0c8"; -} - -.icon-reorder:before { - content: "\f0c9"; -} - -.icon-list-ul:before { - content: "\f0ca"; -} - -.icon-list-ol:before { - content: "\f0cb"; -} - -.icon-strikethrough:before { - content: "\f0cc"; -} - -.icon-underline:before { - content: "\f0cd"; -} - -.icon-table:before { - content: "\f0ce"; -} - -.icon-magic:before { - content: "\f0d0"; -} - -.icon-truck:before { - content: "\f0d1"; -} - -.icon-pinterest:before { - content: "\f0d2"; -} - -.icon-pinterest-sign:before { - content: "\f0d3"; -} - -.icon-google-plus-sign:before { - content: "\f0d4"; -} - -.icon-google-plus:before { - content: "\f0d5"; -} - -.icon-money:before { - content: "\f0d6"; -} - -.icon-caret-down:before { - content: "\f0d7"; -} - -.icon-caret-up:before { - content: "\f0d8"; -} - -.icon-caret-left:before { - content: "\f0d9"; -} - -.icon-caret-right:before { - content: "\f0da"; -} - -.icon-columns:before { - content: "\f0db"; -} - -.icon-sort:before { - content: "\f0dc"; -} - -.icon-sort-down:before { - content: "\f0dd"; -} - -.icon-sort-up:before { - content: "\f0de"; -} - -.icon-envelope:before { - content: "\f0e0"; -} - -.icon-linkedin:before { - content: "\f0e1"; -} - -.icon-rotate-left:before, .icon-undo:before { - content: "\f0e2"; -} - -.icon-legal:before { - content: "\f0e3"; -} - -.icon-dashboard:before { - content: "\f0e4"; -} - -.icon-comment-alt:before { - content: "\f0e5"; -} - -.icon-comments-alt:before { - content: "\f0e6"; -} - -.icon-bolt:before { - content: "\f0e7"; -} - -.icon-sitemap:before { - content: "\f0e8"; -} - -.icon-umbrella:before { - content: "\f0e9"; -} - -.icon-paste:before { - content: "\f0ea"; -} - -.icon-lightbulb:before { - content: "\f0eb"; -} - -.icon-exchange:before { - content: "\f0ec"; -} - -.icon-cloud-download:before { - content: "\f0ed"; -} - -.icon-cloud-upload:before { - content: "\f0ee"; -} - -.icon-user-md:before { - content: "\f0f0"; -} - -.icon-stethoscope:before { - content: "\f0f1"; -} - -.icon-suitcase:before { - content: "\f0f2"; -} - -.icon-bell-alt:before { - content: "\f0f3"; -} - -.icon-coffee:before { - content: "\f0f4"; -} - -.icon-food:before { - content: "\f0f5"; -} - -.icon-file-text-alt:before { - content: "\f0f6"; -} - -.icon-building:before { - content: "\f0f7"; -} - -.icon-hospital:before { - content: "\f0f8"; -} - -.icon-ambulance:before { - content: "\f0f9"; -} - -.icon-medkit:before { - content: "\f0fa"; -} - -.icon-fighter-jet:before { - content: "\f0fb"; -} - -.icon-beer:before { - content: "\f0fc"; -} - -.icon-h-sign:before { - content: "\f0fd"; -} - -.icon-plus-sign-alt:before { - content: "\f0fe"; -} - -.icon-double-angle-left:before { - content: "\f100"; -} - -.icon-double-angle-right:before { - content: "\f101"; -} - -.icon-double-angle-up:before { - content: "\f102"; -} - -.icon-double-angle-down:before { - content: "\f103"; -} - -.icon-angle-left:before { - content: "\f104"; -} - -.icon-angle-right:before { - content: "\f105"; -} - -.icon-angle-up:before { - content: "\f106"; -} - -.icon-angle-down:before { - content: "\f107"; -} - -.icon-desktop:before { - content: "\f108"; -} - -.icon-laptop:before { - content: "\f109"; -} - -.icon-tablet:before { - content: "\f10a"; -} - -.icon-mobile-phone:before { - content: "\f10b"; -} - -.icon-circle-blank:before { - content: "\f10c"; -} - -.icon-quote-left:before { - content: "\f10d"; -} - -.icon-quote-right:before { - content: "\f10e"; -} - -.icon-spinner:before { - content: "\f110"; -} - -.icon-circle:before { - content: "\f111"; -} - -.icon-mail-reply:before, .icon-reply:before { - content: "\f112"; -} - -.icon-github-alt:before { - content: "\f113"; -} - -.icon-folder-close-alt:before { - content: "\f114"; -} - -.icon-folder-open-alt:before { - content: "\f115"; -} - -.icon-expand-alt:before { - content: "\f116"; -} - -.icon-collapse-alt:before { - content: "\f117"; -} - -.icon-smile:before { - content: "\f118"; -} - -.icon-frown:before { - content: "\f119"; -} - -.icon-meh:before { - content: "\f11a"; -} - -.icon-gamepad:before { - content: "\f11b"; -} - -.icon-keyboard:before { - content: "\f11c"; -} - -.icon-flag-alt:before { - content: "\f11d"; -} - -.icon-flag-checkered:before { - content: "\f11e"; -} - -.icon-terminal:before { - content: "\f120"; -} - -.icon-code:before { - content: "\f121"; -} - -.icon-reply-all:before { - content: "\f122"; -} - -.icon-mail-reply-all:before { - content: "\f122"; -} - -.icon-star-half-full:before, .icon-star-half-empty:before { - content: "\f123"; -} - -.icon-location-arrow:before { - content: "\f124"; -} - -.icon-crop:before { - content: "\f125"; -} - -.icon-code-fork:before { - content: "\f126"; -} - -.icon-unlink:before { - content: "\f127"; -} - -.icon-question:before { - content: "\f128"; -} - -.icon-info:before { - content: "\f129"; -} - -.icon-exclamation:before { - content: "\f12a"; -} - -.icon-superscript:before { - content: "\f12b"; -} - -.icon-subscript:before { - content: "\f12c"; -} - -.icon-eraser:before { - content: "\f12d"; -} - -.icon-puzzle-piece:before { - content: "\f12e"; -} - -.icon-microphone:before { - content: "\f130"; -} - -.icon-microphone-off:before { - content: "\f131"; -} - -.icon-shield:before { - content: "\f132"; -} - -.icon-calendar-empty:before { - content: "\f133"; -} - -.icon-fire-extinguisher:before { - content: "\f134"; -} - -.icon-rocket:before { - content: "\f135"; -} - -.icon-maxcdn:before { - content: "\f136"; -} - -.icon-chevron-sign-left:before { - content: "\f137"; -} - -.icon-chevron-sign-right:before { - content: "\f138"; -} - -.icon-chevron-sign-up:before { - content: "\f139"; -} - -.icon-chevron-sign-down:before { - content: "\f13a"; -} - -.icon-html5:before { - content: "\f13b"; -} - -.icon-css3:before { - content: "\f13c"; -} - -.icon-anchor:before { - content: "\f13d"; -} - -.icon-unlock-alt:before { - content: "\f13e"; -} - -.icon-bullseye:before { - content: "\f140"; -} - -.icon-ellipsis-horizontal:before { - content: "\f141"; -} - -.icon-ellipsis-vertical:before { - content: "\f142"; -} - -.icon-rss-sign:before { - content: "\f143"; -} - -.icon-play-sign:before { - content: "\f144"; -} - -.icon-ticket:before { - content: "\f145"; -} - -.icon-minus-sign-alt:before { - content: "\f146"; -} - -.icon-check-minus:before { - content: "\f147"; -} - -.icon-level-up:before { - content: "\f148"; -} - -.icon-level-down:before { - content: "\f149"; -} - -.icon-check-sign:before { - content: "\f14a"; -} - -.icon-edit-sign:before { - content: "\f14b"; -} - -.icon-external-link-sign:before { - content: "\f14c"; -} - -.icon-share-sign:before { - content: "\f14d"; -} - -.icon-compass:before { - content: "\f14e"; -} - -.icon-collapse:before { - content: "\f150"; -} - -.icon-collapse-top:before { - content: "\f151"; -} - -.icon-expand:before { - content: "\f152"; -} - -.icon-euro:before, .icon-eur:before { - content: "\f153"; -} - -.icon-gbp:before { - content: "\f154"; -} - -.icon-dollar:before, .icon-usd:before { - content: "\f155"; -} - -.icon-rupee:before, .icon-inr:before { - content: "\f156"; -} - -.icon-yen:before, .icon-jpy:before { - content: "\f157"; -} - -.icon-renminbi:before, .icon-cny:before { - content: "\f158"; -} - -.icon-won:before, .icon-krw:before { - content: "\f159"; -} - -.icon-bitcoin:before, .icon-btc:before { - content: "\f15a"; -} - -.icon-file:before { - content: "\f15b"; -} - -.icon-file-text:before { - content: "\f15c"; -} - -.icon-sort-by-alphabet:before { - content: "\f15d"; -} - -.icon-sort-by-alphabet-alt:before { - content: "\f15e"; -} - -.icon-sort-by-attributes:before { - content: "\f160"; -} - -.icon-sort-by-attributes-alt:before { - content: "\f161"; -} - -.icon-sort-by-order:before { - content: "\f162"; -} - -.icon-sort-by-order-alt:before { - content: "\f163"; -} - -.icon-thumbs-up:before { - content: "\f164"; -} - -.icon-thumbs-down:before { - content: "\f165"; -} - -.icon-youtube-sign:before { - content: "\f166"; -} - -.icon-youtube:before { - content: "\f167"; -} - -.icon-xing:before { - content: "\f168"; -} - -.icon-xing-sign:before { - content: "\f169"; -} - -.icon-youtube-play:before { - content: "\f16a"; -} - -.icon-dropbox:before { - content: "\f16b"; -} - -.icon-stackexchange:before { - content: "\f16c"; -} - -.icon-instagram:before { - content: "\f16d"; -} - -.icon-flickr:before { - content: "\f16e"; -} - -.icon-adn:before { - content: "\f170"; -} - -.icon-bitbucket:before { - content: "\f171"; -} - -.icon-bitbucket-sign:before { - content: "\f172"; -} - -.icon-tumblr:before { - content: "\f173"; -} - -.icon-tumblr-sign:before { - content: "\f174"; -} - -.icon-long-arrow-down:before { - content: "\f175"; -} - -.icon-long-arrow-up:before { - content: "\f176"; -} - -.icon-long-arrow-left:before { - content: "\f177"; -} - -.icon-long-arrow-right:before { - content: "\f178"; -} - -.icon-apple:before { - content: "\f179"; -} - -.icon-windows:before { - content: "\f17a"; -} - -.icon-android:before { - content: "\f17b"; -} - -.icon-linux:before { - content: "\f17c"; -} - -.icon-dribbble:before { - content: "\f17d"; -} - -.icon-skype:before { - content: "\f17e"; -} - -.icon-foursquare:before { - content: "\f180"; -} - -.icon-trello:before { - content: "\f181"; -} - -.icon-female:before { - content: "\f182"; -} - -.icon-male:before { - content: "\f183"; -} - -.icon-gittip:before { - content: "\f184"; -} - -.icon-sun:before { - content: "\f185"; -} - -.icon-moon:before { - content: "\f186"; -} - -.icon-archive:before { - content: "\f187"; -} - -.icon-bug:before { - content: "\f188"; -} - -.icon-vk:before { - content: "\f189"; -} - -.icon-weibo:before { - content: "\f18a"; -} - -.icon-renren:before { - content: "\f18b"; -} diff --git a/src/Surging.ApiGateway/wwwroot/assets/css/base/app_publiccss.css b/src/Surging.ApiGateway/wwwroot/assets/css/base/app_publiccss.css deleted file mode 100644 index fcebaf3d5..000000000 --- a/src/Surging.ApiGateway/wwwroot/assets/css/base/app_publiccss.css +++ /dev/null @@ -1,326 +0,0 @@ -ul, -li { - margin: 0; - padding: 0; - list-style-type: none; -} - -.my-mfp-zoom-in.mfp-ready.mfp-bg { - opacity: .5 !important; -} - -.app-dialog .mfp-close { - color: #fff; -} - -.white-popup { - position: relative; - width: auto; - max-width: 500px; - margin: 20px auto; - padding: 20px; - background: #fff; -} - -.app-frame { - height: 100%; - width: 100%; -} - - .app-frame .mCSB_scrollTools { - width: 4px; - } - - .app-frame .mCSB_inside > .mCSB_container { - margin-right: 10px; - } - - .app-frame > .app-inner { - height: 100%; - } - - .app-frame > .app-inner > .app-wrapper { - float: left; - background-color: #FFF; - padding-left: 180px; - min-height: 100%; - width: 100%; - padding-right: 50px; - } - - .app-frame .app-left-side { - width: 180px; - position: fixed; - left: 0px; - top: 0px; - height: 100%; - z-index: 2; - float: left; - } - - .app-frame .app-left-side .app-title { - margin: 10px 0; - padding: 10px 30px 15px 30px; - border-bottom: solid 1px #FFF; - color: #fff; - } - - .app-frame .app-left-side .app-title > i { - font-size: 28px; - vertical-align: middle; - margin-right: 10px; - } - - .app-frame .app-right-side { - position: fixed; - z-index: 1; - top: 0; - right: 0; - width: 50px; - height: 100%; - padding: 17px; - padding-top: 18%; - } - - .app-frame .app-right-side a { - text-decoration: none; - color: #fff; - } - -.app-left-nav ul a { - font-size: 14px; - font-weight: 400; - line-height: normal; - position: relative; - display: block; - overflow: hidden; - padding: 12px 15px 12px 25px; - white-space: nowrap; - text-decoration: none; - text-overflow: ellipsis; - color: #fff; -} - -.app-left-nav ul li.nav-line { - height: 1px; - margin: 5px 0; - background-color: #138c74; -} - -.app-left-nav ul > li > a:hover { - background-color: #148d75; -} - -.app-left-nav ul a > i { - margin-right: 8px; - font-size: 20px; - vertical-align: middle; -} - -.app-left-nav ul li.nav-subnav > h4 { - font-size: 16px; - padding: 5px 15px 0 25px; - color: #fff; -} - -.app-left-nav ul li a > span.round { - color: #fff; - margin-left: 10px; - background-color: #e63c3c; -} - -.app-wrapper { - padding-bottom: 40px; - color: #333; -} - -.work-skin .dropdown-menu.black-menu { - min-width: 120px; - padding: 0; - border: none; - border-radius: 0; - background-color: #333d46; - -webkit-box-shadow: none; - box-shadow: none; -} - -.work-skin .dropdown-menu.black-menu > li > a { - padding-top: 7px; - padding-bottom: 7px; - text-align: center; - color: #fff; -} - -.work-skin .dropdown-menu.black-menu > li > a:hover, -.work-skin .dropdown-menu.black-menu > li > a:focus { - text-decoration: none; - color: #fff; - background-color: #414e58; -} - -.app-tabs { - border-bottom: none; -} - -.app-tabs > li > a { - margin-right: 5px; - padding: 3px 30px; -} - -.paginator { - padding: 8px 5px 5px; - text-align: right; -} - -.paginator a { - font-size: 14px; - position: relative; - margin: 0; - padding: 5px; - cursor: pointer; - text-decoration: none; - color: #777; - border: none; - background-color: transparent; -} - -.paginator a:hover { - color: #e87164; -} - -.paginator .current { - font-size: 16px; - font-weight: 700; - padding: 5px; - color: #d32; - } - -.app-require { - color: red; -} - -ul.simple-pagination { - list-style: none; -} - -.simple-pagination { - display: block; - overflow: hidden; - margin: 10px 0; - padding: 0 5px 5px 0; - text-align: right; -} - -.simple-pagination ul { - margin: 0; - padding: 0; - list-style: none; - } - -.simple-pagination li { - display: inline-block; - margin: 0; - padding: 0; - list-style: none; - *display: inline; - *zoom: 1; -} - -.simple-pagination .current.prev, -.simple-pagination .current.prev:hover, -.simple-pagination .current.next, -.simple-pagination .current.next:hover { - cursor: not-allowed; - color: #999; - border-color: #ddd; - background-color: #fff; -} - -.form-control[readonly] { - cursor: pointer; - background-color: #fff; -} - -label.error { - display: inline; - margin-bottom: 0; -} - -.bootstrap-select-searchbox input.form-control { - padding: 6px 8px; - height: 30px; -} - -.selectpicker > li > a { - padding: 4px 15px; -} - - -section.active, section.active > #app_wrap { - height: 100%; -} -#nprogress .bar { - position: fixed; - z-index: 1031; - top: 0; - left: 0; - width: 100%; - height: 2px; - -webkit-transition: all 500ms ease; - transition: all 500ms ease; - background: #f0ad4e; -} - -#nprogress .spinner { - position: fixed; - z-index: 1031; - top: 10px; - right: 10px; - display: block; -} - -#nprogress .spinner-icon { - box-sizing: border-box; - width: 30px; - height: 30px; - -webkit-animation: nprogress-spinner 400ms linear infinite; - animation: nprogress-spinner 400ms linear infinite; - border: solid 2px transparent; - border-top-color: #fefefe; - border-left-color: #fefefe; - border-radius: 50%; -} - -.nprogress-custom-parent { - position: relative; - overflow: hidden; -} - - .nprogress-custom-parent #nprogress .spinner, - .nprogress-custom-parent #nprogress .bar { - position: absolute; - } - -@-webkit-keyframes nprogress-spinner { - 0% { - -webkit-transform: rotate(0deg); - } - - 100% { - -webkit-transform: rotate(360deg); - } -} - -@keyframes nprogress-spinner { - 0% { - transform: rotate(0deg); - } - - 100% { - transform: rotate(360deg); - } -} -.form-horizontal .control-sm -{ - padding-top:4px; -} diff --git a/src/Surging.ApiGateway/wwwroot/assets/css/base/font/font-awesome-ie7.min.css b/src/Surging.ApiGateway/wwwroot/assets/css/base/font/font-awesome-ie7.min.css deleted file mode 100644 index d3dae63bd..000000000 --- a/src/Surging.ApiGateway/wwwroot/assets/css/base/font/font-awesome-ie7.min.css +++ /dev/null @@ -1,384 +0,0 @@ -.icon-large{font-size:1.3333333333333333em;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px;vertical-align:middle;} -.nav [class^="icon-"],.nav [class*=" icon-"]{vertical-align:inherit;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px;}.nav [class^="icon-"].icon-large,.nav [class*=" icon-"].icon-large{vertical-align:-25%;} -.nav-pills [class^="icon-"].icon-large,.nav-tabs [class^="icon-"].icon-large,.nav-pills [class*=" icon-"].icon-large,.nav-tabs [class*=" icon-"].icon-large{line-height:.75em;margin-top:-7px;padding-top:5px;margin-bottom:-5px;padding-bottom:4px;} -.btn [class^="icon-"].pull-left,.btn [class*=" icon-"].pull-left,.btn [class^="icon-"].pull-right,.btn [class*=" icon-"].pull-right{vertical-align:inherit;} -.btn [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large{margin-top:-0.5em;} -a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;} -.icon-glass{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-music{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-search{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-envelope-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-heart{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-star{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-star-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-user{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-film{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-th-large{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-th{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-th-list{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-ok{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-remove{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-zoom-in{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-zoom-out{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-off{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-power-off{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-signal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-cog{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-gear{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-trash{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-home{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-file-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-time{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-road{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-download-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-download{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-upload{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-inbox{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-play-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-repeat{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-rotate-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-refresh{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-list-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-lock{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-flag{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-headphones{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-volume-off{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-volume-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-volume-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-qrcode{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-barcode{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-tag{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-tags{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-book{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bookmark{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-print{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-camera{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-font{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bold{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-italic{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-text-height{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-text-width{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-align-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-align-center{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-align-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-align-justify{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-list{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-indent-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-indent-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-facetime-video{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-picture{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-pencil{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-map-marker{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-adjust{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-tint{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-edit{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-share{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-check{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-move{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-step-backward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-fast-backward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-backward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-play{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-pause{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-stop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-forward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-fast-forward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-step-forward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-eject{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-chevron-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-chevron-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-plus-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-minus-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-remove-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-ok-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-question-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-info-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-screenshot{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-remove-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-ok-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-ban-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-arrow-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-arrow-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-arrow-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-arrow-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-share-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-mail-forward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-resize-full{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-resize-small{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-plus{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-minus{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-asterisk{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-exclamation-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-gift{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-leaf{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-fire{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-eye-open{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-eye-close{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-warning-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-plane{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-calendar{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-random{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-comment{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-magnet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-chevron-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-chevron-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-retweet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-shopping-cart{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-folder-close{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-folder-open{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-resize-vertical{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-resize-horizontal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bar-chart{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-twitter-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-facebook-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-camera-retro{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-key{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-cogs{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-gears{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-comments{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-thumbs-up-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-thumbs-down-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-star-half{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-heart-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-signout{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-linkedin-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-pushpin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-external-link{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-signin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-trophy{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-github-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-upload-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-lemon{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-phone{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-check-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-unchecked{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bookmark-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-phone-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-twitter{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-facebook{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-github{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-unlock{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-credit-card{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-rss{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-hdd{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bullhorn{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bell{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-certificate{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-hand-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-hand-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-hand-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-hand-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-circle-arrow-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-circle-arrow-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-circle-arrow-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-circle-arrow-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-globe{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-wrench{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-tasks{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-filter{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-briefcase{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-fullscreen{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-group{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-link{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-cloud{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-beaker{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-cut{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-copy{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-paper-clip{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-paperclip{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-save{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sign-blank{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-reorder{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-list-ul{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-list-ol{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-strikethrough{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-underline{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-table{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-magic{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-truck{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-pinterest{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-pinterest-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-google-plus-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-google-plus{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-money{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-caret-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-caret-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-caret-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-caret-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-columns{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sort{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sort-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sort-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-envelope{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-linkedin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-undo{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-rotate-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-legal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-dashboard{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-comment-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-comments-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bolt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sitemap{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-umbrella{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-paste{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-lightbulb{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-exchange{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-cloud-download{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-cloud-upload{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-user-md{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-stethoscope{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-suitcase{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bell-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-coffee{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-food{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-file-text-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-building{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-hospital{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-ambulance{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-medkit{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-fighter-jet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-beer{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-h-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-plus-sign-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-double-angle-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-double-angle-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-double-angle-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-double-angle-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-angle-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-angle-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-angle-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-angle-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-desktop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-laptop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-tablet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-mobile-phone{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-circle-blank{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-quote-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-quote-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-spinner{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-reply{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-mail-reply{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-github-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-folder-close-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-folder-open-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-expand-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-collapse-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-smile{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-frown{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-meh{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-gamepad{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-keyboard{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-flag-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-flag-checkered{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-terminal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-code{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-reply-all{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-mail-reply-all{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-star-half-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-star-half-full{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-location-arrow{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-crop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-code-fork{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-unlink{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-question{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-info{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-exclamation{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-superscript{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-subscript{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-eraser{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-puzzle-piece{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-microphone{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-microphone-off{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-shield{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-calendar-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-fire-extinguisher{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-rocket{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-maxcdn{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-chevron-sign-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-chevron-sign-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-chevron-sign-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-chevron-sign-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-html5{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-css3{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-anchor{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-unlock-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bullseye{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-ellipsis-horizontal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-ellipsis-vertical{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-rss-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-play-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-ticket{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-minus-sign-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-check-minus{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-level-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-level-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-check-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-edit-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-external-link-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-share-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-compass{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-collapse{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-collapse-top{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-expand{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-eur{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-euro{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-gbp{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-usd{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-dollar{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-inr{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-rupee{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-jpy{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-yen{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-cny{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-renminbi{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-krw{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-won{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-btc{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bitcoin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-file{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-file-text{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sort-by-alphabet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sort-by-alphabet-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sort-by-attributes{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sort-by-attributes-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sort-by-order{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sort-by-order-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-thumbs-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-thumbs-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-youtube-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-youtube{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-xing{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-xing-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-youtube-play{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-dropbox{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-stackexchange{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-instagram{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-flickr{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-adn{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bitbucket{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bitbucket-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-tumblr{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-tumblr-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-long-arrow-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-long-arrow-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-long-arrow-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-long-arrow-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-apple{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-windows{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-android{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-linux{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-dribbble{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-skype{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-foursquare{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-trello{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-female{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-male{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-gittip{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-sun{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-moon{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-archive{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-bug{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-vk{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-weibo{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} -.icon-renren{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');} diff --git a/src/Surging.ApiGateway/wwwroot/assets/css/base/global.css b/src/Surging.ApiGateway/wwwroot/assets/css/base/global.css deleted file mode 100644 index c13b91c3a..000000000 --- a/src/Surging.ApiGateway/wwwroot/assets/css/base/global.css +++ /dev/null @@ -1,44 +0,0 @@ - - - -/*html5*/ -article,aside,dialog,footer,header,section,footer,nav,figure,menu{display:block} - -/* Fonts style */ -pre,code,kbd,samp,tt{ font-family: monospace; *font-size: 108%; line-height: 100%; } -textarea {resize: none;} - -.dn{display:none;}.db{display:block;}.dib,.inline{display:inline-block !important;*display:inline; *zoom:1;}.di{display:inline;} -.h14{height:14px;}.h16{height:16px;}.h18{height:18px;}.h20{height:20px;}.h22{height:22px;}.h24{height:24px;}.h25{height:25px;}.h27{height:27px;}.h30{height:30px;}.h40{height:40px;}.h50{height:50px;}.h60{height:60px!important;} -.w134{width:134px;} -.w30{width:30px;}.w40{width:40px;}.w50{width:50px;}.w90{width:97px;}.w100{width:100px!important;}.w115{width:115px!important;}.w138{width:138px;}.w150{width:150px;}.w160{width:160px;}.w190{width:190px;}.w200{width:200px;}.w280{width:280px;}.w300{width:300px;}.w320{width:320px;}.w330{width:330px;}.w350{width:350px;}.w355{width:355px;}.w360{width:360px;}.w375{width:375px;}.w400{width:400px;}.w500{width:500px;}.w680{width:680px;} -.w_4{width:4%;}.w_5{width:5%;}.w_10{width:10%;}.w_15{width:15%;}.w_20{width:20%;}.w_25{width:25%;}.w_30{width:30%;}.w_35{width:35%;}.w_40{width:40%;}.w_46{width:46%;}.w_50{width:50%;} -.lh14{line-height:14px;}.lh16{line-height:16px;}.lh18{line-height:18px;}.lh20{line-height:20px;}.lh22{line-height:22px;}.lh24{line-height:24px;} -.m0{margin:0;}.ml1{margin-left:1px;}.ml2{margin-left:2px;}.ml4{margin-left:4px;}.ml5{margin-left:5px;}.ml10{margin-left:10px;}.ml20{margin-left:20px;}.ml30{margin-left:30px;}.ml45{margin-left:45px;}.mr1{margin-right:1px;}.mr2{margin-right:2px;}.mr5{margin-right:5px;}.mr10{margin-right:10px;}.mr20{margin-right:20px;}.mr30{margin-right:30px;}.mt1{margin-top:1px;}.mt2{margin-top:2px;}.mt5{margin-top:5px;}.mt10{margin-top:10px;}.mt20{margin-top:20px;}.mb0{margin-bottom:0px;}.mb1{margin-bottom:1px;}.mb2{margin-bottom:2px;}.mb5{margin-bottom:5px;}.mb10{margin-bottom:10px;}.mb15{margin-bottom:15px;}.mb20{margin-bottom:20px;}.mb30{margin-bottom:30px;}.mb50{margin-bottom:50px;}.ml-1{margin-left:-1px;}.mt-1{margin-top:-1px;}.mlr20{margin:0px 20px;}.mtb20{margin:20px 0px;}.mt30{margin-top:30px;} -.mtb5{margin:5px 0px;}.mtb10{margin:10px 0px;} -.p1{padding:1px;}.pl1{padding-left:1px;}.pt1{padding-top:1px;}.pr1{padding-right:1px;}.pb1{padding-bottom:1px;}.p2{padding:2px;}.pl2{padding-left:2px;}.pt2{padding-top:2px;}.pr2{padding-right:2px;}.pb2{padding-bottom:2px;}.pl5{padding-left:5px;}.p5{padding:5px;}.pt5{padding-top:5px;}.ptb5{padding:5px 0px;}.pr5{padding-right:5px;}.pb5{padding-bottom:5px;}.p10{padding:10px;}.pl10{padding-left:10px;}.pl15{padding-left:15px;}.pt10{padding-top:10px;}.pr10{padding-right:10px;}.pb10{padding-bottom:10px;}.p20{padding:20px;}.pl20{padding-left:20px;}.pl35{padding-left:35px;}.pt15{padding-top:15px;}.pt18{padding-top:18px;}.pt20{padding-top:20px;}.ptb20{padding:20px 0px;}.pt40{padding-top:40px;}.pt50{padding-top:50px;}.pr20{padding-right:20px;}.pb20{padding-bottom:20px;}.plr20{padding:0px 20px;}.pl30{padding-left:30px;}.pr30{padding-right:30px;}.pl50{padding-left:50px;}.pl60{padding-left:60px;}.p30{padding:30px;}.pb35{padding-bottom:35px;}.pb40{padding-bottom:40px;} -.g0{color:#000;}.g3{color:#333;}.gc{color:#ccc;}.g6{color:#666;}.g9,.c_999{color:#999;}.c_9b{color:#9B9B9B}.c_a8{color: #A8A8A8;}.wh{color:white;}.or{color: orange;}.deepblue{color:#005a8c;} -.bwh{background-color:White;} -.f0{font-size:0;}.f10{font-size:10px;}.f11{font-size:11px;}.f12{font-size:12px;}.f13{font-size:13px;}.f14{font-size:14px;}.f16{font-size:16px;}.f18{font-size:18px;}.f20{font-size:20px;}.f24{font-size:24px;} -.fa{font-family:Arial;}.ft{font-family:Tahoma;}.fv{font-family:Verdana;}.fw{font-family:'Microsoft Yahei';} -.n{font-weight:normal; font-style:normal;}.b{font-weight:bold;}.i{font-style:italic;} -.tc{text-align:center;}.tr{text-align:right;}.tl{text-align:left;}.tj{text-align:justify;} -.tdl{text-decoration:underline;}.tdn,.tdn:hover,a.tdl:hover{text-decoration:none;} -.lt0{letter-spacing:0;}lt1{letter-spacing:1px;} -.wrap{white-space:nowrap;} -.bk{word-wrap:break-word;} -.vm{vertical-align:middle;}.vtb{vertical-align:text-bottom;}.vb{vertical-align:bottom;}.vt{vertical-align:top;}.vn{vertical-align:-2px;} -.fl{float:left;clear:left;}.fr{float:right;clear:right;} -.l{float:left;}.r{float:right;} -.cl{clear:both;} -.rel{position:relative;}.abs{position:absolute;} -.zx1{z-index:1;}.zx2{z-index:2;} -.poi{cursor:pointer;}.def{cursor:default;} -.ovh{overflow:hidden;} -.vh{visibility:hidden;}.vv{visibility:visible;} -.z{*zoom:1;} -.red { color: #dd5a43!important; } -.bold{font-weight:bold;} -.italic{font-style:italic;} -.checked{background:#f9f9f9;}.lightgray{background:#f6f6f6;}.bg_lightred{background:#FF8364;}.orange{color:#ff6600;}.blue{color:#07bdde;}.gray{color:#999;} -.addion{font:bold 16px arial;} \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/assets/css/fonts/fontawesome-webfont.eot b/src/Surging.ApiGateway/wwwroot/assets/css/fonts/fontawesome-webfont.eot deleted file mode 100644 index a30335d748c65c0bab5880b4e6dba53f5c79206c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68875 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

7r8$?kb-D3z%-c} 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 F002TuuHFCu diff --git a/src/Surging.ApiGateway/wwwroot/assets/css/fonts/fontawesome-webfont.ttf b/src/Surging.ApiGateway/wwwroot/assets/css/fonts/fontawesome-webfont.ttf deleted file mode 100644 index d7994e13086b1ac1a216bd754c93e1bccd65f237..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138204 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 diff --git a/src/Surging.ApiGateway/wwwroot/assets/css/fonts/fontawesome-webfont.woff b/src/Surging.ApiGateway/wwwroot/assets/css/fonts/fontawesome-webfont.woff deleted file mode 100644 index 6fd4ede0f30f170eecb4156beb7235bf01fff00b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81284 zcmZ5nW0dAhw{6=tra5ifoc6SB+fUn^wr$(CZQHhu+wb@DX02T(d*__0q*hjvI;nDz z6B7dh1_A;C<_!cw_^}|k8~@`!yZ?U^6H}7;aTNK{@&1ENMg)_%h^W|)ruV}M{s#&W zZ#hMJrXS7shx7hGFO$}3^;lfddE#vpEoI3*cgGVDi&foU;C{|wOVrtHrDj==p8j30pfFkldupAzhU?5A*DGt@J2G|A}c8SCkr z>o=I_>6wAZO%21w!fMC5@%113m4gEjR1IeZ_w5JA1|b&1KoW-n4j~5AferOvwXSQE zah+1@_DDn5n5dd0liHfPDAc#fzU7kNzDRb6*liqG%p4(BHpD)HH}o+P&d>^62?%?n zvT^cYhB@H6YiGR6$gT}{I=1;PF2U6KvnG>fX|Sjq<;6yR`Oi zzfj`_B+|da`W(r5PMLbX8ClyMhtSxjT;=Fc#>{N{^}>E2KALfSaWJu>$b2v(cP(#e zQh?N#{q#Bz@Xx&p;=0!11?{P{xcJik+-3Zf%5K{vO&*^*kp>pWUBalJ(+NlJQayb9~mb9}|No-GXO8xq>8P94Ck^I$vs&07w4u$Fr{06>`ii zU;f%Ii%-7FRos!|3ghm|RV@YA|Kt~@jOcE(ovW$ih<5q>VjWj50>YUYMD#_?PB2Es z+0ba9CdQDvVk*rTDJorTdgtjJYqCume06DZB~{d;*e9uJ-Qapq&uQ<#o=I`N+wI^@ z*lwCj7;_ou$oQiK=-vwep`Ps^7aj#Ouxh;p=#%)wLKv=>1aFYdgB)*18$baU5I$W_ zSmIJnNCd4dT=1ntUP16acK%#a9IflTXirMSj}oQpOrn9_8v`VvVZfSw7M+*K9#zzG z*5dw_wcMRY5I(cID|UxMVV9A7zK3D2C4xbwQ@3M+1&kIhmdCid>t8!HlGzf}gBL0r zvVQn<&uo{MZp6H5laSarDlzWlu9tJ?7y7o9Ke~Z#4b`X}E5%pVg$Ye*lB=f@LzL!J z>|k;@!>)_YjZ;U95Qs;+8jNteXlpVxU46})c&^>urAqlwg@{CV!Czb4YQ5Ibbi_;X zvHQzZ1&uH2(p}vY3GIG|H!B7t9zSP+2B!Ro&G6-C8kIu_5PqCRoE% zq#LMnW2Hn^H>X$%O!aI@@nkVS6uBr#B+!AI+!n%zRkFk~icobqX8@!DRy$h9`rgq*J+u^|#@mEq}83ofS&jJVXsFUrTiil)0~bwFSt z2^#7(U>T9H>nrB~&gjVIV(yvldtghB=6cb^IwKvLgRJo;_^pzCOJKA4vg3X#^E7gu zzDrM~gL4zk=T;q4tHX=rH6P;}Vi@~0EzYb{rKC0Se0OS>Zl`Jw;P`A8ZT~%FFT{mz zEe3CZ@6cjG1aw~i5}OgmR6b`Yazsf;T1^2V@CpbC5Y^u#eXdt8EhT<$gaabQo#Yutzno)XVD zLr*oeR}wFc<-P=_90Uv{!-4rdZMvHuT?WM1PZJ@qVs3NSV)5L~p<);eGF5fX8Scvc zZ9E0e$H7cmn~R=nRtDMoJ2ym}7sd7&y?A3+bFW>P_u^h2GHlPIH2cFEI{a?ak4>?A zy7&ua8&Zezc`UXY3h+gQxz|$DA2tx2LNHsGUs~a9^-32~Anu=;Sn(zKnW%yi=3lOa z8*Yd>KcN~ z?S(eQ!gl$0?$_5q)i5HPt_oodoApYa)Ay}v^tEoAv2Z-=-|p7ao&7=2?;`J){#Uu# zgmzh??c%Or_i8A$v~)UH8qdo&nHW3=>$b1PAiwdnG+ICE1p8pGe|wR| zpTX%AfHC3!{Hi-DzDys9o;o_dNb(SZ@KT3@ z7xLjAS;Uh~yhMf2VwNygc>$7H|R>k-aM1e(2UcBd; zxCDH**B3m4HiTRs-4y8Cls6Fkatg!(J^@&?oc51D5r5C-ZhQ!0_CSbrku7D^jAuaC zlTPwzosVSsB+cUI(4I(_d87+=1;+j)ql9UuZFS=Zef^|~=ad3!w(*R|wPWg}A?kKz zbDB(Zpt?adI*K7?Yalku;Ai{#bB4$WT<&5u!ma%?`EM;m$UI`NDtGGfPT zX#))!7cBJ+w6ycdY0?mmF9iKbX9L0b5}Be>8%O=J06>DBI=q;PU44rbD^G!YQc(R1 zdX5jiw`4Pb1TAnDJ}j<>sM5bCaLkfx{6rH=7!bTdYbCquM{a){a*shx%xTbw2KhHv zhN)zm?au*KyRn|vHN%b~D4f%rV`ca$bo~k!W+5#Ar38dzob)O$+tay)P){f72DbT} zafu(OxBqjzdb=ybGjs7P^$!*LYlODuH!Fi)GEAW2%A2WnKveQgbpt_b9grC@fN6lT zLjDX#ptOOI+nC*o$~U|06}hJsNOh361@bf7CNnj~dGO1id(>#j`Md`Bo3e)MhCmai zn@tbzFDP1VVJIDr5RXu|LcZ&f5O31W#9sF~(h@z(!r2W~^>fH}k(VO7SL7XVLuaCF zEeIMzh9*$sls!~|W?aB5RtBdAy?@<}Km8T~|KOBTTr}d#Q%)vC{97Hgb^!v=UjMC! zC+O|G8xDQnD*p4N%5@2I?rD)CfM5#1GJ-`|P{)Q}<06MWXw~Rd491pG2@Xy(awP5t zXWCzr-nWFn&Fv>6w2mCiVu!`!D)~8B8UQJm`|{gq68e$Rx$|x1AL@zF16W%OTq$}> zZp~jM;>BJC1W!TdIaG=j9äY>7uxS6S37IVP_>DW-kg%dn+sFHLnFhvXTU%&ox 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 ZUtABnb?tu62nVk>KX+wfW(Hek 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 o-IM%8o*ehr=#Iq=Q0BvwUBdJ3DO< zMw>NB3~cZV=1d^GK!CjPmY4;C^9WHA=Y@bx^2kM!U6#Bh&Ju^f@|F!7Jgxnzd&VBi zUbA`IGgbZ9Uw{37b=6;g{q=W$BSpv`lY~$rkaI6e4pEL-e8stVPHSB!hQ@z7y^fGD z*+p(7JIQrqGueiGBiWAoZj?5d5Ft*ojEtk^MzV#h10^ATvI3Z$Xt~*>iI6PmCK=Rx zG&d0O4mFYq!boQ6$9i%u&;8#7=6R&G8@8_7@x=0b{}n_*l%Ke6-L4(DyHS1-clEk0 z`!@d94ZnK}<)07|ePh%3x@+BEURxm~{teWZHUXi0kD-11-%)Pgv~~C1ZA5qppdIDC zTefdlcfkIs9Lfh!9^ATa?+#L?kllU^<;b>mTgUgF{CyVXHzDKXj_td4qo25v$9X+r z>}`68NQ4OY2^@2Wb*HCDp4vEF-37vF*AO9-!M?Xt|tDdW7ExL%S(kqN@nOq69M9*9e3Uj$WYSSN`Lmmtt*c&~V+Vzw1TCW-R8 z234VdKQYkN)#QyvlM{Obfk3nF^J;E;qasHln|hi($DSr0G84V~SGUG?grBh4LW9C`NO7nCgC?Mw{Y38qF2r(U>=%EuMk2 zGZ39|>BrXYJY`p@c;!6f<8-OWf6 zXPbpD&{qA-Q=W#wZRu(Qch)Q+F|8c; zeI$a`PsMb8=eHM5DNJEuLBi^5YS3e{s>)`TVv;1tcF*6~9ST4u2~5t0L*0tR6c82%LIPVM3R-z}>=MZ$~*|y1s_&IGCoM~%(#sbeg&DrNN zA?oDg6k>dwyf)*#3sE0xP&8H5RGaV|gjYFL-Vm7Pw=EY}sk+7ly`)8&DRo6#OI{&z zmh9rt8uMYyu{Hj{Nv&}{S{-eaN2`+nu`gaw7VpI7{sne@rtY8VcP=Qlvt1!4uF#Eg zvhp=++|0qdK(_o$L)U!XFz9kRT|qQlezx7W%s!eK?{2k=Yt9k~t83$PvYymZ81$QO zr0_n8G9awqvR>~6udvGJH`K(H5b3!BfG23LtCi?GHy zzt1ZtymGu&q;;@V2bb&M)c*li>S+EqSon+EU2acwbtV#Jx69=&ClZ}qiT1MF{nGpm z8|E)qzux%Dvi|;MJkf^B3x&&hqKoGB^jvaDPtUx&ipfN<>mm>2SEKD;!QAh&4CI zczQVCZ3+aMyn#pkZkONha{F)b*d3bYuzSXx4K}CK*5ITcbhSe;u5zNi%MxsMX#e^J zmVC*Qz07#s5`B4xC3xPkM6n3D#h-`Mrs!Rk)L1_k+7t}B+&&+d+iUlD>`3Dc4o5?S z(}{U&B-+$Jvv=6Hv3K}MJIP`HxRhK;t~MRwn=xzIn$hRmfSz*FlwQi^&qYhwZoVy4 zH;P0onc~K*OhK*a*j=Rh>QuIdPGmV1479?|GzKNDr>3JlLjqgS(=$g97W6bX%617! zra$&KsY)00MNzx_m6DS7Ss>8DH{?bs%2VZsTd5>&5o9J9YTD=bsvri%iZx6XuM$<+ z=n^F1Q9%?Q`*K7Kg;zx)VmP!iD#YB&XLNPAkf&2Fx&@NC{P{hZIl_q_P)dJ5g=f?* zpT9}5b^3ii^=DNGy-E9C7TNVw6s|XZ)hjnhJZ*$bwbRe#r+v{Sk}58iRMsywN&|SB zS;jRXOY*8{n-~@%Gg5B%@^rd`=a?gSoKwfKwvNM##X4)!q8g2B_!Xl*xX#AQhqoQ3 zceCTCdEp^rm_9Q)%GadXPMBb~lNNZRgvN`ttsR>YcY)yMl;H9t6NM6XL3oW(;R^Q+ zODC4z;PwWCFmuR_(PZmHYjTPR_Q@-D?6_hw=ruUrOW*JYCj*H@V3Ny%XFv5r^zkS> zkl8qH5jdQfeA(yq>xvYn)pZW9l>1rnY?D_;eVP{e&Xxocen+O5%M{CckcMcPH|7-y z$w}kgvaXfjH;SXZ+cI>dR&F$onbad?tr~7XNCo zRK>uA6mr=dilsAowv@?Z69A@EKwiuh%9#Q%*+Q7?47K7R}DW z2o(6pXc!a}vO0V|-f^yaVTv6E%7g-*pbTS#r$}XmUt)4T>cW(re_2Rl?F-G(X!9`R z7S`r&(mf0=&u8d*<0o2NRUI0=!EAaF7U#3B$9$j44%Hi!L>f=U!fHd%t2!m2r&R7? zS93a3op@fm>cAQbIv8y>uGV8T(BugyLC=4C!xE)mtgN{WJw!jhc9!xysGi>$n00fy zN2n+Uczv`AIfJMMxr3}>pJ$`QOJbx<=98<)CbFOW1N1p> z9(?(k7kcBuw7>;0QSi)lpp-b}IZAEZW|WF$^8niv=S}#jnbYYw4O&DxP;)S)FexUg zMwL$hVII5rahOw;c@^VXF<+Ata;%d#D*Rho=a^?kH@ZTza%1upK7XF2fRK8W5Psda&K8ldQz zy{@m>tYUH4Q|ql|$45w>9c2$<&$x;Q$7s}t!!Y&+uOi2lxG&GgvdG5~#=$x<^UcGG zIdF8GPmRWhn8zY~O=ySnWGXqE#(gH1Gtf9Cf*u@=sKo&G0p83ch_ZdgU37&F(E{0) z9-0VvJd}DofhqC}3-?{zhB)R_t?K8%P*9&=^9kcFtI;RU@SzjJgF_&m~*Pb>nAd&ypgA9h6r9+rzV5gmSU8+PFoNs}J<$7Sr} zhzLnYe1sEuEl!aVfcc%*@rV(JdA-IHVC?wOy@w77I}RN(KA`s+n~Zxi8Q~|HOeMoh zbW@3hx=ktdXq3x_kW0YF7PGI+>{9OA7JzpSjyFk*lU*9C!ek_=nN zHjxmCLKFPDhV?0%D@sF9GECnYRtyjQl5s7@j7+_ZJ@6UWj~S#$dJ(W)K~|v$ z@DpIzT{Nmd8V(NJmQ(IrK)!As_2FG`Q1f+{I)8>63!7+;WOtY}K5 z1N(*LmCu}@HyIDfas!&URpDX9DZlXbvDjGU8Rou^^T~c#84-G4p|IvTXJ?9ei^fXoLMa}^AOH2lReI^6Wq+k&YiR3h4 zyNx5pZ~8hdnt$qva)M|N^QP19q|-O0)0L)+lO0Pxnx=!?ufE+lLYJO?5uJssj{YMx zUc&A)C&E0CsY&SUB#DqD>BDP;Pm{aIGvqsjNbs?6Bq}oauN3|(93>q}%l#5)WW0|i zB%9Dg;q1~RY++8PelI+hc$TAZ6q0#fE}aWolwqorxIXjTY6Na*g<1+mKye9K{d|-H zZz_dOrIJ_$aKozcPOt3aqWf^jgRh0vrDy5O)Y#%~cFMBQXe|=@6|UEn_o44F)K}Br z8uuA(cHuoyVaDfB?!I8M^ln^EM*aM*@?Xm;mDduSmf>4vgezjvs zIHaqok+9X|2%5kyuR*0O8;^j?G4KUu6c|M@F?T<2YgDLRMQ}^Rp}E)X#&Wc)kKcXO zTxrPJ?52lRjrW#w7{kI--MqK*T08wM-DpINuhNZJgnKO!2hm@~jOQ5(HhSQMOAfhx zBxu2+Q;v@WK_JWFk(8>3LL(ijKa7S9@m9v4bQE=(Y&^`^F(5SFb0By>*#k|YVMCYzy4`3ZjNc*8P0#0=;B!Lxt18iJfq{0`iFVx3Bw7Lpi;bBf3 zq`2)%DS2-u9;R)yoblr5UdGADm+hr}6wWxDV+(`1)yq&voDK3Rk#t8Q-8`NCQVpU{ z)u7tF-SJb_|4cYzIH2NE_*`Ec>Jls)ym;SJA=FGOpj2V&I zy;3dE6IINd#G0W6(krjX^M}R~pQCsq5QaUqiSrh_X1T&H*W!7i4W4R*o7vA|KhR5$j$p+)LWo4I#`9Ql1o)r)kY9@z@)uq_kie?%ZO)A*&W5wfgAW(4 z70C5##%}Atb=%mQ>;E4xJ8pNR!=dOzG!&X)cR1`bLS`YHcGxR#SjEZux@y6=NF5&w zu0PgT6!XvG5uR5Y@)g2su5aK1)Sr?RXwl+54H?A}tizod9v3X-- z^X83FYFt?@pqf5ODaVe@qxM$)HQ6C6cIB6PtA#`HH4ARle~AiJlw$Ak~`7ge|lqoe_kZ{$}QWr{m%RwZyMNQ_tDGe z&NZGLT(oGAE;7DpC3@U=ysgdBi%Iqy*nm9zngi&7HS;(|a6Q1QPgpj7vf#JsZpIx| zoIdd5%79HxvvjG7sOk);OvTDtk!a4udUeYAq7mbMqB-zAl)qN;wt*Q}#(WBA#S2Q5@(wG5GNo6QZO4oABkLfh?%%eY|owq*5c=2 z@@DTuQGOsc+m$U!lc}lACf;)MyfT;o$*q8;`0x_HSlF1wYxRgX`LVWOIncf| z;b^tnefFqdku#a>?!LaQ{n5cl+dzA6BBaWK;BYFv?uh2VMjLXqb~P$7XLxo9o3PX% zIzj?EZcv z3y7XJ<~50S=iqCObfntZcl<#dikhO{Pk;C#t-tLwD;U9{y-5~kmRCFfV|iOoVa zbCQ3oJ}-sOQG0d)mf`U#o&i5ng+;*MuEG*xATz754E#-1xPi2iKVZkFq79fZYAjel z1m(#p%z$50g+;*p9SEnF@V2VA3d_LXT7?@(fr`6s+ - - -Generated by IcoMoon - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/assets/css/fonts/surgingfonticon.ttf b/src/Surging.ApiGateway/wwwroot/assets/css/fonts/surgingfonticon.ttf deleted file mode 100644 index 189c6f55cf9b605f92906fbe76dc5fae4900900f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9964 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 diff --git a/src/Surging.ApiGateway/wwwroot/assets/css/fonts/surgingfonticon.woff b/src/Surging.ApiGateway/wwwroot/assets/css/fonts/surgingfonticon.woff deleted file mode 100644 index 9dc4a09679e5a05720afddc95a4b41c6b19cdc31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10040 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 g*yH3XjBFD*h5_-6v8_X6Kzlykxf@kK zSC}w4J$C@WCi;&808J?(Xe~qG;}@%?P5vKGj*jjY?mG8!_U@;ArtyQogv^P%1@?f5dYHKA;){4y zxq;EHAS4nw1PUF&?s%UK>L37|BKvp;c+|eW2i3R$NC5077bD^D##2bU8nX^Smk1yr zgnQVa1a)A9OLK%67$FC0H5x3jfD{05^zoB{0Oh#A;ibGJDzNx1d6f)UETH~|0mOoU zOxAadNKzeusn#cT4kUOVkY6bU;X;8|gM##$`Q9M~b)f>Dak>fkQl>yqrVPgfKqrg@ zyrCtUM5a?h&gYryL3}fTg|*6o0Qh+7WV+%UKXGg745iokDPog;v(K?k#*FMGfi>nf zBqu$afkiO>D%Ewc{HA^b93SJoU;A-aVS*;$oH;y91>wLY(@HiY6_z?GU zc2l6vkb@-ZOgFMs4Wc~k)25yXr5{b*B-{_=JA0A#fSK%t3si=y!d05lo5mgC0mmSu zXgu9HPe3Z*f-{B^I}sqT5#aN=27u(An|LX95HOiuv;_d2zsU{DQpl8sFaQ9W|B0+>(6)o9vA&Y0NmFRTMHf+;YLO}P!C4ywjlI0W zxO)gf!%qh=GBi{2ygu^Ia7+~G5ey&4h3Q+Cy*3WM7JM7{2nqm z;#P$8O~yXaNRHv0(~Vdp)==s;VP%AlFX}$3^Br%>r~3EEKaf61wUxb~j2g;!pY;&H zHwsECaG0fRq?HJ2E-0N<{QbcL@Q;eK2%6=^vyNFZGmQBxYZ|Fb$vjMIv7;-f9WQ7> zqx;H}gbJQ#c7nl(6dgo#h+!N`(B~MOknm1dN%u_|(;-76VLOHnW=JS+9}6V8Otq2e zBjL?}x4CFtg6`W&=3{zV`aC9M7Ca)8WI0B>(WGq^EPAE{K6z|;2e}nF&LWK>$vFbM z93|$11gFto+Zgphm2~NeEeZGus!4aF{o5_XqJt5eN|*(V>P0Dp3W8RzcTkGI@X2K6 zm%pF4k$EjvF#8XU zOPB46&5tB;j4)L+RXa5xb+24g%U$dBPoHvZ%?d623S({mlDAq7YFpnhe~?!E{6?eI z@lB|DO5IC6UTyllNny9iL-4HyZhd&z+x&33LQRX7A&OXf(jh*pGhLZ^H*Mqt4u=e7 zbA$SuLnTktJ1S3ZUnPw#BgNSIZxlyO+(6+>S_(4wg?oz;dN>IdcDsI*DF?z-$+4f8QR~zVc!EkK}iY1D}1& zzhi&#_Sa_L{dKx5{7d%dWd3CK#VZ~G450)HM_yrz(}@I&-wqjet+S`08)e{e+xEl( z+rnA-LY7wMQ=9L1!tX3Vw&CKoiR*D9S2DiIkPNq0yS+~zNe)pJ| z7~xp0T&x^Dj1&2pfaAbvUdK_5N+%m9TQqyTxvVO?YQQtwX`OhJIR53_%fA}V%e;s8hggSMhiFG4 zS7ujCS58;cG!xW>H1lE}Vt#HOA0|88v^~`2EO(0>)24)e09&g5F{&6Oc*Cj z_e>|#a4L-|b^h{kJavcixP7ka``^Osj_lQ{C8r;26B2{|6?e*9*;J!O{SqhAm#5dd zo30aExuw~qeHRIP+{T{9dd7EMw5km`%z5)XP9rM=28gb4UsF*@39H+wePqcYNu)0y zzkKd4>4vOJbTb6Z2V@4I-{;+l-Ht!R|LfWCIVU|+K{W;Sf_6Y%pC~^yAUhzxK*>ZY zMi)elMeRW2#*rkE!NJ7Ud*PPs0w+7Cy0PG2wc*H`B^krWCDEt4<(XhsqMZlFg->Iw z69l-F+$il&G-E^{-Z@6JzObXnB)jn^e#ypH&h_VgqlSm8$2G@%<+k3PO;_Am{I{4k zu@(DfH&2^Ndq;Igi^J^Jpw{x%Pu`#Z$)2SXdJr*U9z|{sEDlISZn-1vIcD+aY-eev zd015MtQNG9?e0&F=Xr_i3F;;I35R76rq{pT389lw<0e<#DRow+AvzDu4pWuwE{H97 zU)R#AAfB|FtDSl!ye8)V=GHb`_3eiteoR$$cArFwq&9{NWo_vEugd8q*CkGol$?~D zLUmlbv_|#?o)*>?Rcm(kWZZ3^U8gasbtTlQwbnK)wtDNGAs{`n9i$A=8f0EvyhiHnmfm)! zbN=JD^)o@S8IBD>M@KIxramh}=p-z~M@U#I$4`zO~k z16%%L9LV{w&x!VYsN^hk%9r@sb@Dr=Fqg)d=3RHoQ@{!Dmc@r*!FZj#{9IOvvzzVU zX-WzqP3Cc|)M9cydhu&7-srRwb_uyQUtwxd ztdgjfcozVB*pRC+a5=EL9zW6%ulBf9J`kHd`5t&{5C7@D@Na?3=!;L+$qRE(z0{-H#q6!caOsTd zwd9`P<30Cv=*1n=+!y|5wn=9pr>+bDADI9kCj4Q6J_|3X&A|F_xO`o7X^sW+cq zz+Jd$64jVSul@s1A|K-5Yz@x0*07~6{G4UpGN1>uXPn>9%r)m zXvnN6Fv1`+;NzgklRuCRtl}dSCB8OOv~aBd64?6r2MvlL-0UklbUDIt4Ui#4{N9~~ zVe*a=%lIeX;{#2AHQ)_MHT;K1Ss9HapOIQAq!Rs%(M@@S0tefi*@F5(9z?-z_(46$ z|Ma{*_?a2M_)5|cu<9xGAp*e<5QUmtAJOjT?$Q7V-!&*D7aenHv^k%e^*F#bKa6^&tf^@bX`# zqRZ;I?@(hQ-U4KD!>bHPMUdVDGSF{aQ{kWkP|E0f2S^+(Uw`~l86CdqM}PnW1sM&% zHw|w2VRaH-cR-nGTV_Vi?sO-*-Qg)%+|LsecdvphYn=1)OFB}k4n5s8QY$Ik7O07= z{KpyOa#_){0{f*pnP_AD*w%aTWr#-{jfZvIYluRkKJMiBA_jCSkJTu>WFQ!;!&PAy ziVh!@;47tFljx##JW|y2AZh=CnvVjv0j5Y|ZFqv#8$YG!E&>Q9fB_T(s(l+Vx&p+_ z*VD04@^=oc_DL}#N#gT~!y`W_T`FBXBE#d`eLOK=W@4D4f+vsQHuo-yU>vmJ#7a{2 zdgGMrWJm2pGEfdi^MEq|Yc^~E-~+fS<4C9CLCK&A^z5_wqfMI}9E2<2 ziwVjq+zDpr1QZ+?1bCHF68A1TS!Dt`nllas%rdYLl2!|RfDKjn`-TSSfbx;;Q@7a0 z*h_+{b4ROn@!BwfJSz`wzzdX7c4&Ztzyng9<_^`TQ~8yaJGp^3mi-FAN${E_=DLlt z|L;N{ssnM!5Em4Hars=(zeDT#)c0CWTOAES30Sm*O`1J-t>bk{UTKs|g$r|qFU}^` z-Z5qXWz(SLbz%}(sPF`lbX_%aUIUba^))C17m=P7A`C%7sEQbG)rx<4{s0vkxhZAy zco53vxP$Wu+e8@!XEJF?^-30ol^g$K#o20dkmn#rI;L9)E9D(>M(Dt5Q})iP9}xJS zgLQo8SK;4?^+cUuBZ~%5Xm54BPFM^zYO^>e2u2ZfiE>PKP7!WbdXECP0BHL$Sa|Dv zsSZDO)^|+vZ~dUn{Jno|ej>oFa*!B_6MrVhmYlTa^!%qO%F_$0KcZ2j&mz##n`Id^ zo@DQXzJ-7$kYK?H$vt*HTM+?(8{k)*y&0JGXaIyGWmu9AZ9*|Hg-6cy0UyAAK&D

fD`FHey z(-2lg)xmm{qJ+V1QeZfQh_Lx>9a0R*4jvXuH< z+xE#@Z03{EV6I6`8&98-d7aTtV-7Ds8Ox4yH{qWm)_Hb8-U2&T$IcMueHjH6ItUQw-^I7AT6Z(7cNe)S|8J7e* zW+=icO0l3DvPCBtx-hD@4&)ti(d@Y+wh6MgM)UPRUy{OrrAu90PTaueO z|F+e}F+QV36NRd-L=vS2M4gr#p4dj=a8J9nO}@~kwd6~aGjyB+-X$6o*VaSBS7!v9 zd4ZFo0dY{=T?TP6KVE|L1N%)U2HYLchPLgIKqj!@AQ(SzFBnB)jj>2958xq}lCoe= zA;F4l{Z#4O*>{D3mdKI@P!&IMb<$POTS;^{Xdq7v_D^gnoGlcDMc*co#ssaaG_>yECZ6M+Ykm?Fxpu5;W~Acv(PNfoolm@m8gm>K z)re8TQRrFGS?}0;cmHWZn74qK^eZ`HTG;Zzpt+OJl;^!0FbF(iAR3vIAEzzymt4q6 zOtEio86EmrK$S`B*{pa3K9a=LR|v4)EwXU$R&EiEt37cbi_=3Ss}gjFcSA~lN5x+#sw>ZhgWjSzi8hF+iZ;wVA zYC`xP492A^_y)ZMga4*%X+-=6-K?uZqa$od!MKbCiO|NR2rgJ_&6fz;yMpG(yfw{t z<1K=TjV{gED_XyZ2)*J+T<5S5j?M7dB%;z*+$qnl-lyQn)AVI;IV_2jbaBS)m=yT&Ri@WcCGPgjP4 zl_SxwS?{=}1RuDD$oad#pBwXVVO)!U;(B!`CqziSU-b+;g# zf654{il0Y*D*VC;PMsMuO0E=3XZfw1&S(p&u425>A@U<HB#VuK&<9;%e{USu-} zbFdth_v$_R!Uf@mYqhy0JfD!q{empca!i6AhW&eKIzF;|AwwJ1)%}b0xCxtzuYaP3 zz4Xpo}t%OEuB&BkPFqIwnibTnX;)wQec07@`LXCl^9urKWAsnC9?=}1#E4{5mnyf z2J|2cE3S5WX?63BO0O0nALIKrT6X*Fv&$jT`x)|XNeXfk8>}4@Og$KcW&wE-JqKLx zNhW!%QoGcF!r7b6Mw>u(BHH4$+fC7(nSM1kbmp^9zRr(5ykp%7QjritsS3d)L)OI* z0(B#)n025!%AgAiu9V9XppA}@IBLP(SOb^?Zj_@Qak2|Iz8NyZ}NiP>?O5)JQX zI3IilRH%N;)E4$yi`bEkz?Uo$0eq(z6d6)zomm`%vUMX9POekF@0bx(vemDVRXXBO zHI83PNR_OQDd}V6t6;28BIN$9hv*o08-&US*6L{)Mc%kKR^y(1BZy~! zTQ6zV_dHKijTmJZL8ItaH%~rlX-@>Oy3R23uDKaG;l$I*2Eh-|Lp7NbpA6`xyToX zI_C&o_^mqA5^WwlnD+qE9qUxeOOEnoRmjkqq%DnA;G>fsHuxLSIPg4d*=UkKk* zfd4K=`rbtR7KP|bL%rUO-piM8s!onAMS3|Er7Aa6948m)i9Ds?Wbhu17GP#4uJl`n z_E{IPIle6kn;hA$rO@NL%X6`@o>IF}VNc>=FU_{}Qer4LiTo`N`Lhytmm>qMh_qEl z+9MrlLpJ>7sS#+8_4!woUA_yI3^;QfXGNrjb%{ToXjUB}x|lZE`U?CvZ9?7Q2?n_( z14|HZ-Pl0|yqx^`y9~ZdWoI);k5YR4%{Www9(6?+dfvHB?IR42;)!)+l)jUA;#m4q zp6L|$NljR=h>GvM;Vq19s9Up?N!FFm17Pf}xn*K09FT+F!S#YlA)Y@^ zs$<%^zIT#ct6WI3rTxaIp7KG@adKz&mZ;YljPfH8_An#RHw;rY?+sMjZRACy);;0u z1?M3L)tza-L7V#$Yy|KxdDymMk za+m;lXsjiI9hReKB1J^>{s$K_jLDNDJpr4G1O^uNK?o*h_X=Mda*mCg-%v;Ah@&9H zZ}2V*m&3aTjflqA>ZN}D`ji@KG2RbA*R`qBPIcJ*^P>#Sq0{)|L zAG8fUdJa?>1&FPQ)~ugwq&(Usk;CZz`;mF=OllLt$w%hd`;&xG0nz{@gI*IdMa4$> z?CtLB=uM52KF>=Q)1xK4Df=w0qHQeL#P>E^`OA@nyUG+Nuy9km^dmPa3oQp~x^EdO z3yFAY3{rkW1+s|UkI3o*?B3^lqpOY^V@SSNZYozHal&3z5%7p%yL}+fk zj(qz;jgW}Q0o=6~`}L2Pg1I?gS?1#V^!SMw87s&r0y1sMwH*togn!9@i|7@>LZ{ z{e8TXnfuyRM4R?*oxMSdA?6--ch(&v5Js~RDe5(O(LwepM@)>{X5dzv{~6+I&xUSD(hZ5Qgedas zj$J4M^8opb?Of8{s|6$2)9sNz?Z1;|f8(1rGxdy9%0-FCM8~wwY6A9gPx@t>h0U;~pcsFt9s%SZ-`8Pqn$YlcUl9dow1~5~udgV(Zi&YDg8(*26i5#nN zvw@FqX$>38VPaN;WHRvZevy10T9Hf{v|S1wTGW{ksq_k77ANRy7|$NQnl`BlQnA45 zRCk*`^SDi~6>ZvJUBm?Xf`%y36zM@=FlWtYxPR~EB*G1A3t>1h$4(kQO@QVlvCqAClm$QNd6M)$p3uA7`1*@Iiy)VuQN(JRC#Sv9z7Q=V5+EIGq6 zXq>FaeC0JtC+WBg!HSZok7>!%_A@K#(<~DN8JY?7yGXn#M0E*@{%6S4XZE5lW7S3M zWa}Pho#e~HaqFdQ1jYmZ9D?6-hInuM>Z>C|@0r+E@~XL;ZjAeF2y*R~8Kb8m@1nd| ztUagnIa;^AE?dvv&?^EWdX^Xca5mt8#EVx=jv6}qiX$op}yE2g-;)ruS zR+_z1L>PV&gCrl@w(^gk@WOWIkWI0hq6{-jg85$Ggdz%NiwdyWS=TTH)SkT(*UTbO+pb>(qVM#(thjgk=F z#AU8HU-Lb1S8u`ZjD5yfwcXp@sMte^+Nwsid3fz#yYO2f!`JW1oFzR`O=T`UL!w zKocK&GQXLl-gRK9_)cSMuu%nPG}@Em3GL*Zk2}_``WYu*&_;ka-Vi9_?apm?e{&C zMsSM926rzAX5W4qJ-7QUiK~+w4uw$KkPn%opQ{t~&wZ_~yz>{(Q4XF@(r?Fb zu!lMtvtUi)MX{KpCwP8XWj;SuX^gX2o@yqzL_xoq4abg_CptT><|7k7-?y)8WxOO#``!R?0Lq3*N|g>dc% zTH!nhFo1+piY8*=pQ-)2DTPM((-Z-5)w|L9DltX+-sQoL&_0Oxou9d%P+mer90_C*szU zUO%v|FTG%`?$C@dWNZa@x<|dbB#c*VTt^y9 zDDp_SSXHqpQb#`ER$47@1M$)YmdfL z(huo;?2b`Od#!@VwkaKmc3Vay{NxBDQqAjZ{WQdu^yf?(uPF!c1eBONF{|zPkm?$8 zMX_vxLtI|Lea_yuSY(cXN}G)^^Wz=W8lUVCw=5UbyYcJD7$c#SxYME&AYTQ8*U2bO zl;9g*+QnFR>_rV8>YP6YEMIIQP{)W-U6TBoqZX8(wJI`pMkcblHG!34)j6Z}sN7Dq zA0Hw5v^)P&>v@*GLp{jB4@nWnOa<-{BOOH35-}0>5v;7ybxZLtn6NP(=`l&S+Ap$i zt@S&L<0OC0%Q3$XyWf2i@!Mmi?G?eS4fK)??5_gdV;in!DtMPV{h4U?GxSmwaw`{i zld?5TFw44M+T*9SpcMUTVRr0D848^Szkil~eyR{y=Afj-!`W5I>h&bT;4UkUn3Wc9l7=Z8rT3zFAQEeGXxH_dMe=Q4>07)j-S zvzkMKM-y?10bcoM$xBOyfVm|k!<(Tba|utKPdcydC1KWKstRrdMSvrfMfTW!GyKO{yN6YAyeT=6a~rC#L$d);EFqaj}_{4-b(9`09uV=q)cEi{ZLe$g?=L9(n-;KgtsQSyI3EVo-I%!RD zZMZ~=5xJ;%0T0F#4PSz`JaXp2qG*QjJqlj2`5=awX_&CrNc#}abL_w35QOnBJRM7z zV^j&zqA0ei0DU92;p1MlS0Xi2K{IJiiN47#vN7-nLT5issXLD~*b-d9%)(z1ozpr) zZ@tOA>FJHnY4re_s$b%&qxYOZff46ad=*l3927&4H$Sh4xY~8xfW#l4C6&*+&Skl$ z*0rv0Gk%k}+K8CNg%XK#S7&;_I(0Ey{hmblj?*Hjx;0nDdy@T6ki|3+zdA;XqL_Z- zzM5Q7^Bo#n-t8ZpthP{E4ibf}MKcr(WF2DD9rQaXM-U|J^PW0ckUO-k`Z-hOX#i9C zttix>2WZMg05|tS|0tc&tR&2+u!=)TV$!FIdwroW8A=cXhMz0 zSd4>ni)kkp5FLHwuH=}#xfHbVNReLiOM_OS2~Zkjl&(awv|0mUC3t!r;<%CSi# zdWvbEd5?EfJLrY8gD94vHho%>E4^^DOJqWXJBS)DF050EcxRy(limh95hT1Oj9s;L z#oVLu-FxPB2(Iq49(S|*ajRnp7Rk(f)R5(eiI6^Q{ilWtFf1HMM+EVJ{m^FC4p2AI z-`|FIO{as_adQSwy;CkqBf=1QmbGaZyls1%#!JE_2BK3d>{P>h)}6R2xXoLjU>^P#BhYR>)=hIzfIzn;BX>r)kLe{DCKKCbV9ww4d zMh>F68Tw=?Ef zZQ1Q@{A*8k?!^n)wsi}H=?%xqV}Iz3qkOQ?-QbWKidirRE4HJf(5HU~c2y`gJ4(nk z1AcLhffS3uCQKIh>W#+JtVoS)et5v$12Nx5YM9d-OLO;;hd1-E^RHe=c&IfrwRkzk z#oB)UZW^q78#|o1Wsw=IBl7*2K2H?_CUI$k=!dOJ%sL~Mek~rgM9d)?DX)=i${C5K zkh1Rr2$bD@Q!e6=J1pya_0W5?Za3I!DXu7Qs1vTJaXcR;WDa+lr^!H#+Mxy^6()rJ z5pSu_;mk*mz%E5N?@PSd-`qq8_1>uS1G1N-!pOfJOM{)=@+y{RAN`dZl%xGs)#Q%l z4sZXoykjGBl84L_#t$c3ZX#=h=Jbe@mIGuO4a))s)tR5uG-0o{ z5|qEn?W}&W|K1#`Z0U<*_=8=nF|g!`IA2+jZWW_C(9JpLA`U6NOIZGSYrujaH|x4) z{9DMS{DrytNsejW^!GQYO;z9mlNJBlhKBlKYQ=s0_3nJhB_th=eSbY}ez^EGgh zUxDuq=dSwUyd(!<#1CSFg0nb4Y_oq4skvK|Qy`^!VS>KQz`!S|0VWnqeT5&sDttH= z#xd?1kr}`tR=51Gbs}in63HU^A=e)k(%=K4Hdf5YQK0tVgT!KP6MtH)Z|{6Jilw+0Qz4|*N#CQd3=-C!}i!?(+=apePA zz57x!vaLJ`eu68ltF}o_3nCgFm6etw*Q0L!VDD#~q+0l-9U|4-Ai*l%H0l-LRYix1 zY^0k$txY5B!%d|7F&}{K-&c{UN;xB#K?loJMQq1ZwBm!^w=B2ieUqN7p66zG$8Lltsif&U>s2$R?cJuj<2G^ENNOX z^xtVcbr2fv!wSXUskYB1zEtYeekJQ?UXYM1YuYlUKu^NHA|-bYjZjriNh#vt9YyIt z506lHzf#dvLBn|YGQpPyzd9y|ASoh)nsv*IS)Vi`2k^Z9^=UC$<^PWjIRxfn@P~8$AKP`K?R(&F?mp6Cd(LDjsHO!otW=F1QCQtsl(?lXkc|T5*JI zTqzPK0ivu>(1)GhC?rGF52f&toQ{^EZgDVA;%U=Gi3=wG478y}4Y{l>>)w^_rQFlHqc{@c6&_ue|~ z^}^(Z6gT=?g4634l>MdNfcqDm^$SF8NEPDadwk4MD*U)YCEU!FFw~VW2n;W6x&r(< zWS6>jse-Z->$nSX4~s=6$FQ|Xqis&OHT!4tNq&xA>hzQjwXp>Llbt(>qds><> z(SnGODOhnVxe{D`cw5!hV&!-hdp3}IJuw!$+|gRE-g1Zoac%*i<7(E{4%qm!w#RQ= zQ8e5`pO66qTf>XR;2Tiyr!YY}WF)jFnix)e&(I~IAQ1+moUdN ze|2dm8|>=vPu>>{hlH)78Ubs6AeT!Fubo$1+(%HrGu-{3le*j`l`qIqUvjbw@XpTs z&Px6_RZ!8jk}IdgQS?c}IJ@_ZpkwvVUOi%AW2J9*F1_Nwec{JvGs0TcaD1D?M7!hM zU5OW5++#cHN{=PMc$(U_ zZZcy1`-#y8@2L%=%?5u9LS{(`HuOFECHK>Rv}0z#(hE$4`wTI^c1!_*cG^pn>aSlD z%TIqZ&-^DMkiIv%44${h-K=--^a~(2`}6NmLYEZGvcj7821M7}ON7TRY#hutS2Ix+ zJ`=OYN@`FFXz!tHKOtGMr=WTL2@R_fwX_jir{PxYo)eOtvzEndUN{#~xX3u3y$@KsV-+`z_|1%*tXclPQ*YC;sg1fKN=vDAx8Wo+8n|hnpy# z=38^K824P}w0of#J+D}k*f=PtmCi&mNC7sPW~R&w8{A1(SA5mfV?N0O0 zz6RGE00B&x7U1sLRQM><~^YSTV98g{-!Nhj-;_fa|Z z=#iv(%7lwXWZ3FKhtbKhi_U6}ndG^B40lH%l!#!>dAcd|1;$$ZWA(P4pWO3L4XIZ& z%z@F=#xYo*$(&=bmpz-$*P>Hhi9#b_aVM3u70&W-Ro7Gb zX3iEfvBDjxoIwhkh3&_bb(h$qV!rMWw}2TloSI}_O3genm^XK20C&14XB^}UTcY>= zUGqS9gZSv*q*7lbuW zHH!YoQbWf2iox3Vt?w#n5ggMeYQv6PRGFK5f~GlkU8TKj-g$5Idq(mGukV8ovAQ+x zDUw}bkPL_Qn4ukyN+W(Lr3AQ|@m9x{GmlR+tNs!YWZL*>#3UQd|wJs5%Cl zyJ2&o3N*|+B6xe6avfZ$Jh?56oXU-wg{N3zoHK#&zu zuKVYdhFL(EhFm8uU(Y4e*|u6{N`#3QExiPex+S7a>JGUhATG$RDT`~;`4>)Grg0;E zX9~W=>=!EElwCP=0=zOI?3FjQhBw$d?rQJNk;eWOV_{-JGl`y8kUkx`F_0_?^aq{S z>#)g)nV1D>HTRn0{)-}?ZXAgf%uHJ%cQg=P=N!?I%V4ACsB&xXAJB#@aB4Bnh~QnT znS`>fpcsC=bSj>UlU49FptS8CH>Mo_qg~cmCrHXpeAF$IIdZtgLw6VLq@SeF`B`3U zsY&VJ#+|x5UDQ>#$R!TD%71pK-e{jyQ?8~w(V*Tkj!&9HtCEIoNKCh!&4M7=t@ull zUF1!(?b+1<+t#I4y~D%JdG1&N!S2qOukgD{4<@0o!E;JYIWd&fb?oe5n%Wqqe=8BEjfDh>OAuPs;4aL z+C96f+*dL%&z1Tf#Us%?9EUA=?;mSg#!@pGf0+{L&Dh^Rp-wH{ZL{X;%uXb={w6F=83XUwH4%i=2iP6fOWyd$k*)>QW-!vmeY zNWZYqRCYe6c9{XTna#PTziLEQM!c0$6ql)c1A$0k=6_r=@ zmAWL&LQMkSit(Jx!CCuwB`QDTjmi(*u@#&w%Am6x*whi#%jl?4L3ve5SZsBf-!Kq< zjd2yMjbNXH`}~3%1MPa=sHO_KIKf%m`6QXoyxJug=2~&OXNnC@dlg)*dVa@ewC z${I(r&8=|Ih}Emd(h1Rhl50jngPJo2KFiWY%`CqYc?afT9z%SE7u-6?sbHvEQZ;I@qN`=6qu2*;xk~~Q`T7~k7_E03_%U|>2k)2`wHuCkz{q- zBJ+vaw~7pB36O;dYkyd87;tTs5pvey+8Zdh7>OCp7FGTW&#y8Hd0(kNPYx@TQlETM z8D>jew?Z}0UJ5voX>2u_U*cfZ!XvW(T0qb=c>8`wX36xOLE}G#!R5@F5gpbioy8%e za@&WnF)`|(hU^NtMBg(GDXY2ThE$=tZN(;5Iu&SZ-&IVJo=GV~WTX`vhbEfuSGNi0 z%vz+|D95Zl(Vd(RwocXBReU#NlB`8#jx1v9xLInM_h_lLlZ{}`j&GeK%m9ZnPuBdJ zwo~VijjSNWRmFFrAWRu8T8JvhTu_l+hc~9 zD{D6Sw|pHlb3}Da12^H0(S+7$P-_VwnUp1ru?eG(LzY7Q#G3wH=~8G&A8^;lE(No0 ziJCIts93aU(tj2!tle4J9`GO=T~=XXR>KHsnshZ?^}H}ij7>!&<}4E!a#tX6XLMYa zBs8sZh6WJ#Fu$A8LdV>JX*d4JQ% z{Rk2sA2c0&t;tp-`kUuH3Q0x!Pn%hR8?&hV1BE3lu{TPGFMrCO|3W9CLwBOk(dOBa z38Uls?9QRhmz30Oe^z(*wgV^d+PYfk&QmMarnbf8XtMUW3+XHUsBNmC zG|(tZ=#gnu0mWJ8)>SvDn=TBtG5-?wqKX<=wv7E^8hny(WyS_Q@J1J-z-LR|CAZ2k z=&eV^+iHb`{~U}BtH^2mSI+8W-=eu>R9nvOsPi(w{w?#&-{970E2_fAVI`>Qo0jEL z-S?FhjtT~!3I-;i(b;usOB_4DXkS}-UB|sUP?}e7<<_p(;9#D|cC^|n8;l)d4OziL z$tm;*+Uba4a;(Z{7#G)b{{E+mcpD-syo6nkO3fjb3VXM~#*P>p%ligB2tr`VYG~dK z)W;~b*nK;jC~YXj@c$6Z8R^zdS&J!L+ULoXQqY8N< z<=0M)K|IP%eU78?u4$y3|4mSwfzhJC5lz~QejIYeAoMy1Bc8~_xa#g4pUe8iI*u1%??e3?A3UW~ zf4d|8T&=kt4mo^*F6(!d>dSg9^lcUF)Ob4XL4RpzeZn~2ZdHx-bWS9Do>jA}3B<<> z^eUC|LBcw}n#W=6x+~?w8YrHrBtvw2sm+hIW0)x-x~yy+x;r|!Iz<0TN@J@_Mm#)d z(ynx~Ezo~`ywq>_pR|TUW?Q!M|2zL7{J#?*{>RYvzw;#iJ5A#M*-SqA=>@Q{u__;A TIUfF;D+0*Nsz9q{OoRUyMo(=N diff --git a/src/Surging.ApiGateway/wwwroot/assets/css/manager/index.css b/src/Surging.ApiGateway/wwwroot/assets/css/manager/index.css deleted file mode 100644 index d418a0f4b..000000000 --- a/src/Surging.ApiGateway/wwwroot/assets/css/manager/index.css +++ /dev/null @@ -1,1245 +0,0 @@ -ul, -li -{ - margin: 0; - padding: 0; - - list-style-type: none; -} -.multiline .selectpicker > li{width: 100px;float: left;} -.multiline .bootstrap-select-searchbox input.form-control{height: 30px;padding: 6px 8px;} -.multiline .dropdown-menu .selectpicker{min-width: 420px;width:420px;} -.multiline .selectpicker > li > a { padding: 4px 15px; } - -@-webkit-keyframes app-active-reverse -{ - 0% - { - -webkit-transform: translate3d(-600%, 55.1%, 0) scale(20); - } - - 38% - { - color: transparent; - } - - 50% - { - -webkit-transform: translate3d(55.1%, 55.1%, 0) scale(1); - } - - 82% - { - -webkit-transform: translate3d(-27.5%, -27.5%, 0); - } - - 100% - { - -webkit-transform: translate3d(0%, 0%, 0); - } -} - -@-webkit-keyframes app-task-active -{ - 16% - { - -webkit-transform: translate3d(27.5%, 0%, 0); - } - - 50% - { - -webkit-transform: translate3d(-190%, 0%, 0) scale(1); - } - - 62% - { - color: transparent; - } - - 100% - { - -webkit-transform: translate3d(-190%, 0%, 0) scale(25); - - color: transparent; - } -} -@-webkit-keyframes app-board-active -{ - 16% - { - -webkit-transform: translate3d(27.5%, 0%, 0); - } - - 50% - { - -webkit-transform: translate3d(-350%, 0%, 0) scale(1); - } - - 62% - { - color: transparent; - } - - 100% - { - -webkit-transform: translate3d(-350%, 0%, 0) scale(25); - - color: transparent; - } -} -@-webkit-keyframes app-diary-active -{ - 16% - { - -webkit-transform: translate3d(27.5%, 0%, 0); - } - - 50% - { - -webkit-transform: translate3d(-450%, 0%, 0) scale(1); - } - - 62% - { - color: transparent; - } - - 100% - { - -webkit-transform: translate3d(-450%, 0%, 0) scale(25); - - color: transparent; - } -} -@-webkit-keyframes app-calendar-active -{ - 16% - { - -webkit-transform: translate3d(27.5%, 0%, 0); - } - - 50% - { - -webkit-transform: translate3d(-600%, 0%, 0) scale(1); - } - - 62% - { - color: transparent; - } - - 100% - { - -webkit-transform: translate3d(-600%, 0%, 0) scale(25); - - color: transparent; - } -} - -@-webkit-keyframes app-workflow-active -{ - 16% - { - -webkit-transform: translate3d(27.5%, 0%, 0); - } - - 50% - { - -webkit-transform: translate3d(-190%, 0%, 0) scale(1); - } - - 62% - { - color: transparent; - } - - 100% - { - -webkit-transform: translate3d(-190%, 0%, 0) scale(25); - - color: transparent; - } -} -@-webkit-keyframes app-crm-active -{ - 16% - { - -webkit-transform: translate3d(27.5%, 0%, 0); - } - - 50% - { - -webkit-transform: translate3d(-350%, 0%, 0) scale(1); - } - - 62% - { - color: transparent; - } - - 100% - { - -webkit-transform: translate3d(-350%, 0%, 0) scale(25); - - color: transparent; - } -} -@-webkit-keyframes app-project-active -{ - 16% - { - -webkit-transform: translate3d(27.5%, 0%, 0); - } - - 50% - { - -webkit-transform: translate3d(-450%, 0%, 0) scale(1); - } - - 62% - { - color: transparent; - } - - 100% - { - -webkit-transform: translate3d(-450%, 0%, 0) scale(25); - - color: transparent; - } -} -@-webkit-keyframes app-group-active -{ - 16% - { - -webkit-transform: translate3d(27.5%, 0%, 0); - } - - 50% - { - -webkit-transform: translate3d(-600%, 0%, 0) scale(1); - - color: #fff; - } - - 62% - { - color: transparent; - } - - 100% - { - -webkit-transform: translate3d(-600%, 0%, 0) scale(25); - - color: transparent; - } -} - -@-moz-keyframes app-active-reverse -{ - 0% - { - -moz-transform: translate3d(-600%, 55.1%, 0) scale(20); - } - - 38% - { - color: transparent; - } - - 50% - { - -moz-transform: translate3d(55.1%, 55.1%, 0) scale(1); - } - - 82% - { - -moz-transform: translate3d(-27.5%, -27.5%, 0); - } - - 100% - { - -moz-transform: translate3d(0%, 0%, 0); - } -} - -@-moz-keyframes app-task-active -{ - 16% - { - -moz-transform: translate3d(27.5%, 0%, 0); - } - - 50% - { - -moz-transform: translate3d(-190%, 0%, 0) scale(1); - } - - 62% - { - color: transparent; - } - - 100% - { - -moz-transform: translate3d(-190%, 0%, 0) scale(25); - } -} -@-moz-keyframes app-board-active -{ - 16% - { - -moz-transform: translate3d(27.5%, 0%, 0); - } - - 50% - { - -moz-transform: translate3d(-350%, 0%, 0) scale(1); - } - - 62% - { - color: transparent; - } - - 100% - { - -moz-transform: translate3d(-350%, 0%, 0) scale(25); - } -} -@-moz-keyframes app-diary-active -{ - 16% - { - -moz-transform: translate3d(27.5%, 0%, 0); - } - - 50% - { - -moz-transform: translate3d(-450%, 0%, 0) scale(1); - } - - 62% - { - color: transparent; - } - - 100% - { - -moz-transform: translate3d(-450%, 0%, 0) scale(25); - } -} -@-moz-keyframes app-calendar-active -{ - 16% - { - -moz-transform: translate3d(27.5%, 0%, 0); - } - - 50% - { - -moz-transform: translate3d(-600%, 0%, 0) scale(1); - } - - 62% - { - color: transparent; - } - - 100% - { - -moz-transform: translate3d(-600%, 0%, 0) scale(25); - } -} - -@-moz-keyframes app-workflow-active -{ - 16% - { - -moz-transform: translate3d(27.5%, 0%, 0); - } - - 50% - { - -moz-transform: translate3d(-190%, 0%, 0) scale(1); - } - - 62% - { - color: transparent; - } - - 100% - { - -moz-transform: translate3d(-190%, 0%, 0) scale(25); - - color: transparent; - } -} -@-moz-keyframes app-crm-active -{ - 16% - { - -moz-transform: translate3d(27.5%, 0%, 0); - } - - 50% - { - -moz-transform: translate3d(-350%, 0%, 0) scale(1); - } - - 62% - { - color: transparent; - } - - 100% - { - -moz-transform: translate3d(-350%, 0%, 0) scale(25); - } -} -@-moz-keyframes app-project-active -{ - 16% - { - -moz-transform: translate3d(27.5%, 0%, 0); - } - - 50% - { - -moz-transform: translate3d(-450%, 0%, 0) scale(1); - } - - 62% - { - color: transparent; - } - - 100% - { - -moz-transform: translate3d(-450%, 0%, 0) scale(25); - } -} -@-moz-keyframes app-group-active -{ - 16% - { - -moz-transform: translate3d(27.5%, 0%, 0); - } - - 50% - { - -moz-transform: translate3d(-600%, 0%, 0) scale(1); - } - - 62% - { - color: transparent; - } - - 100% - { - -moz-transform: translate3d(-600%, 0%, 0) scale(25); - } -} - - - -.page-loading -{ - font-size: 20px; - - margin-top: 200px; - - text-align: center; -} -.page-loading .icon-spinner.icon-spin -{ - font-size: 20px !important; - - margin-right: 5px; -} -.overlay -{ - position: fixed; - z-index: 999; - top: 0; - left: 0; - - visibility: hidden; - overflow: hidden; - - width: 100%; - height: 100%; -} -.overlay .wrap -{ - margin: 150px auto 0; -} -.overlay .close_box -{ - font-size: 36px; - - position: absolute; - top: 50px; - right: 50px; - - cursor: pointer; -} -.overlay .close_box i -{ - display: inline-block; - - width: 50px; - height: 50px; -} -.wraps -{ - display: block; - - width: 80%; - max-width: 740px; - margin: 120px auto 0; -} -.noscroll -{ - overflow: hidden; - - width: 100%; - height: 100%; -} -/*̨ʽ*/ - -/***Ӧͼʽ***/ -.pc-app-btn -{ - font-size: 18px; - font-weight: normal; - line-height: 1.7; - - position: relative; - - display: inline-block; - margin: 2px; - - transition: background-color .3s ease-in 0s; - text-align: center; - - color: #fff; - border: none; - border-radius: 15px; -} -.pc-app-btn:focus, -.pc-app-btn:active:focus, -.pc-app-btn.active:focus, -.pc-sns-btn:focus, -.pc-sns-btn:active:focus, -.pc-sns-btn.active:focus -{ - outline: none; -} -.pc-sns-btn -{ - font-weight: normal; - line-height: 1.7; - - position: relative; - - display: inline-block; - - width: 75px; - height: 75px; - margin: 2px; - margin-bottom: 15px; - - text-align: center; - - color: #fff; - border: none; - border-radius: 50px; -} -.pc-sns-btn .pc-sns-text -{ - font-size: 14px; - line-height: 75px; - - display: block; - - width: 75px; - height: 75px; - - vertical-align: middle; -} - -.pc-app-btn .app-icon { - display: block; - width: 85px; - height: 85px; - -webkit-transition: transform 0.5s 0.5s; - -moz-transition: transform 0.5s 0.5s; - -ms-transition: transform 0.5s 0.5s; - -o-transition: transform 0.5s 0.5s; - transition: transform 0.5s 0.5s; - background: url('img/app_icon_all.png') repeat-y; -} - .pc-app-btn .app-icon:hover { - opacity: 1; - transform: rotateZ(360deg); - } - - - -.pc-app-btn:hover .app-icon::before { - animation: 2s linear 0s normal none infinite running spinAround; -} -.pc-sns-btn .sns-icon -{ - font-size: 12px; - font-style: normal; - font-variant: normal; - - display: block; - - width: 75px; - height: 75px; - - background: url('img/sns_icon_all.png') no-repeat; -} -.pc-app-btn:hover, -.pc-sns-btn:hover, -.pc-sns-btn:active, -.pc-sns-btn:focus -{ - text-decoration: none; - - color: #fff; -} - -.pc-app-btn .round -{ - font-weight: normal; - line-height: 25px; - - position: absolute; - top: 7px; - right: 0; - - width: 20px; - height: 20px; - margin-left: 0; - - color: #fff; - background-color: #fff; -} - -.pc-app-btn .round i -{ - font-size: 14px; -} -.pc-app-btn.pc-app-monitor .round i -{ - color: #35495c; -} -.pc-app-btn.pc-app-service .round i -{ - color: #c03e33; -} -.pc-sns-btn .round -{ - font-weight: normal; - - position: absolute; - top: 0; - right: -5px; - - color: #fff; - background-color: #5891aa; -} -.pc-sns-btn .round.a -{ - -webkit-transition-timing-function: ease-in, ease-out; - -moz-transition-timing-function: ease-in, ease-out; - -webkit-transition-duration: .4s, .3s; - -moz-transition-duration: .4s, .3s; - -webkit-transition-property: right, top; - -moz-transition-property: right, top; -} -.pc-sns-btn .round.b -{ - -webkit-transition-timing-function: ease-out, ease-in; - -moz-transition-timing-function: ease-out, ease-in; - -webkit-transition-duration: .3s, .4s; - -moz-transition-duration: .3s, .4s; - -webkit-transition-property: right, top; - -moz-transition-property: right, top; -} -.pc-sns-btn .round.a -{ - top: 60px; - right: 10px; -} -.pc-sns-btn .round.b -{ - top: 0; - right: -5px; -} - -.pc-app-btn.active-reverse -{ - z-index: 9; - - -webkit-animation: app-active-reverse 1s 1 ease-in-out; - -moz-animation: app-active-reverse 1s 1 ease-in-out; - animation: app-active-reverse 1s 1 ease-in-out; -} -.pc-app-btn.active -{ - z-index: 99; -} -.pc-app-monitor.active -{ - -webkit-animation: app-workflow-active 1s 1 ease-in-out; - -moz-animation: app-workflow-active 1s 1 ease-in-out; - animation: app-workflow-active 1s 1 ease-in-out; -} -.pc-app-service.active -{ - -webkit-animation: app-crm-active 1s 1 ease-in-out; - -moz-animation: app-crm-active 1s 1 ease-in-out; - animation: app-crm-active 1s 1 ease-in-out; -} -.pc-app-defend.active -{ - -webkit-animation: app-project-active 1s 1 ease-in-out; - -moz-animation: app-project-active 1s 1 ease-in-out; - animation: app-project-active 1s 1 ease-in-out; -} -.pc-app-identity.active -{ - -webkit-animation: app-group-active 1s 1 ease-in-out; - -moz-animation: app-group-active 1s 1 ease-in-out; - animation: app-group-active 1s 1 ease-in-out; -} -.pc-app-task.active -{ - -webkit-animation: app-task-active 1s 1 ease-in-out; - -moz-animation: app-task-active 1s 1 ease-in-out; - animation: app-task-active 1s 1 ease-in-out; -} -.pc-app-board.active -{ - -webkit-animation: app-board-active 1s 1 ease-in-out; - -moz-animation: app-board-active 1s 1 ease-in-out; - animation: app-board-active 1s 1 ease-in-out; -} -.pc-app-diversion.active -{ - -webkit-animation: app-diary-active 1s 1 ease-in-out; - -moz-animation: app-diary-active 1s 1 ease-in-out; - animation: app-diary-active 1s 1 ease-in-out; -} -.pc-app-calendar.active -{ - -webkit-animation: app-calendar-active 1s 1 ease-in-out; - -moz-animation: app-calendar-active 1s 1 ease-in-out; - animation: app-calendar-active 1s 1 ease-in-out; -} -.pc-app-flowrate .active -{ - -webkit-animation: app-board-active 1s 1 ease-in-out; - -moz-animation: app-board-active 1s 1 ease-in-out; - animation: app-board-active 1s 1 ease-in-out; -} - - - -/**/ -.pc-app-btn.pc-app-monitor -{ - background-color: #35495c; -} - -.pc-app-monitor .app-icon { - background-position: -4px -4px; -} -.pc-app-monitor:hover .app-icon -{ - background-position: -4px -90px; -} - -/*ͻϵ*/ -.pc-app-btn.pc-app-service -{ - background-color: #00bd81; -} -.pc-app-service .app-icon -{ - background-position: -90px -4px; -} -.pc-app-service:hover .app-icon -{ - background-position: -90px -90px; -} - -/*Ŀ*/ -.pc-app-btn.pc-app-defend -{ - background-color: #005b8d; -} -.pc-app-defend .app-icon -{ - background-position: -178px -4px; -} -.pc-app-defend:hover .app-icon -{ - background-position: -178px -90px; -} - -/*С*/ -.pc-app-btn.pc-app-identity -{ - background-color: #ed686e; -} -.pc-app-identity .app-icon -{ - background-position: -268px -4px; -} -.pc-app-identity:hover .app-icon -{ - background-position: -268px -90px; -} - -/*ճ*/ -.pc-app-btn.pc-app-calendar -{ - background-color: #66bb5e; -} -.pc-app-calendar .app-icon -{ - background-position: -700px -4px; -} -.pc-app-calendar:hover .app-icon -{ - background-position: -700px -90px; -} - -/*Ӱװ*/ -.pc-app-btn.pc-app-board -{ - background-color: #c33357; -} -.pc-app-board .app-icon -{ - background-position: -525px -4px; -} -.pc-app-board:hover .app-icon -{ - background-position: -525px -90px; -} - -/*־*/ -.pc-app-btn.pc-app-diversion { - background-color: #00b7d3; -} -.pc-app-diversion .app-icon -{ - background-position: -440px -4px; -} -.pc-app-diversion:hover .app-icon -{ - background-position: -440px -90px; -} -/**/ -.pc-app-btn.pc-app-task -{ - background-color: #58aa89; -} -.pc-app-task .app-icon -{ - background-position: -616px -4px; -} -.pc-app-task:hover .app-icon -{ - background-position: -616px -90px; -} -/**/ -.pc-app-btn.pc-app-flowrate { - background-color: #00a6c0; -} -.pc-app-flowrate .app-icon -{ - background-position: -358px -4px; -} -.pc-app-flowrate :hover .app-icon -{ - background-position: -358px -90px; -} -.pc-sns-workfeed .sns-icon -{ - background-position: 7px 9px; -} -.pc-sns-workmsg .sns-icon -{ - background-position: -53px 9px; -} -.pc-sns-worknotify .sns-icon -{ - background-position: -113px 9px; -} -.pc-sns-interest .sns-icon -{ - background-position: -174px 13px; -} -.pc-sns-friend .sns-icon -{ - background-position: -231px 11px; -} -.pc-sns-messages .sns-icon -{ - background-position: -291px 11px; -} -.pc-sns-notices .sns-icon -{ - background-position: -351px 11px; -} - -.pc-tabs > li > a -{ - min-width: 66px; - padding: 3px 15px; - - text-align: center; - - color: #fff; - border: none; - border-radius: 0; -} -.pc-tabs > li > a:focus -{ - outline: none; -} -.pc-tabs > li.active > a -{ - margin-top: -3px; - padding-top: 6px; -} -.pc-tabs > li.active > a, -.pc-tabs > li.active > a:hover, -.pc-tabs > li.active > a:focus -{ - cursor: default; - - color: #fff; - border: none; - border-radius: 0; -} -.pc-tabs > li > a:hover -{ - opacity: .8; -} -.pc-tabs .tab-black, -.pc-tabs > li.active > a.tab-black, -.pc-tabs > li > a.tab-black:hover, -.pc-tabs > li > a.tab-black:focus -{ - background-color: #374a5b; -} - -.pc-tabs .tab-red, -.pc-tabs > li.active > a.tab-red, -.pc-tabs > li > a.tab-red:hover, -.pc-tabs > li > a.tab-red:focus -{ - background-color: #fd6d52; -} -.pc-tabs .tab-green, -.pc-tabs > li.active > a.tab-green, -.pc-tabs > li > a.tab-green:hover, -.pc-tabs > li > a.tab-green:focus -{ - background-color: #66bb5e; -} -.pc-tabs .tab-blue, -.pc-tabs > li.active > a.tab-blue, -.pc-tabs > li > a.tab-blue:hover, -.pc-tabs > li > a.tab-blue:focus -{ - background-color: #2798dc; -} -.pc-tabs .tab-skyblue, -.pc-tabs > li.active > a.tab-skyblue, -.pc-tabs > li > a.tab-skyblue:hover, -.pc-tabs > li > a.tab-skyblue:focus -{ - background-color: #50c0e8; -} - -.pc-tabs .tab-dark-green, -.pc-tabs > li.active > a.tab-dark-green, -.pc-tabs > li > a.tab-dark-green:hover, -.pc-tabs > li > a.tab-dark-green:focus -{ - background-color: #049a99; -} - - -.pc-tabs .tab-darkred, -.pc-tabs > li.active > a.tab-darkred, -.pc-tabs > li > a.tab-darkred:hover, -.pc-tabs > li > a.tab-darkred:focus -{ - background-color: #c13e34; -} -.pc-tabs .tab-rosered, -.pc-tabs > li.active > a.tab-rosered, -.pc-tabs > li > a.tab-rosered:hover, -.pc-tabs > li > a.tab-rosered:focus -{ - background-color: #ef686e; -} - -.pc-tabs .tab-gray, -.pc-tabs > li.active > a.tab-gray, -.pc-tabs > li > a.tab-gray:hover, -.pc-tabs > li > a.tab-gray:focus -{ - background-color: #898989; -} - -.pc-tabs .tab-doc, -.pc-tabs > li.active > a.tab-doc, -.pc-tabs > li > a.tab-doc:hover, -.pc-tabs > li > a.tab-doc:focus -{ - background-color: #58aa89; -} - -.pc-tabs .tab-trends, -.pc-tabs > li.active > a.tab-trends, -.pc-tabs > li > a.tab-trends:hover, -.pc-tabs > li > a.tab-trends:focus -{ - background-color: #5f84ce; -} - -.pc-tabs .tab-contacts, -.pc-tabs > li.active > a.tab-contacts, -.pc-tabs > li > a.tab-contacts:hover, -.pc-tabs > li > a.tab-contacts:focus -{ - background-color: #c33357; -} - - - - -.pc-left-nav -{ - position: fixed; - z-index: 2; - top: 120px; - left: 40px; - - width: 80px; -} - - -.pc-view-layer -{ - position: absolute; - z-index: 8; - top: 0; - right: 0; - bottom: 0; - left: 0; - - overflow: auto; - - padding: 25px 0; - - background: rgba(229,229,229,.95); -} -.pc-view-layer > .pc-view.set-container -{ - width: 1000px; - min-width: 1000px; -} - -.pc-wrapper -{ - position: absolute; - top: 60px; - bottom: 40px; - - width: 100%; -} -.pc-navbar -{ - position: relative; - z-index: 9; - - margin-bottom: 0; -} - -.pc-content -{ - position: absolute; - top: 0; - - overflow: hidden; - - width: 100%; - height: 100%; -} -/*.pc-app{opacity: 0.5;} -.pc-app:hover{opacity:1;}*/ -.pc-app .pc-app-btn -{ - margin: 15px; -} -.pc-index .pc-sns-btn -{ - margin: 20px 23px; -} -.pc-index, -.pc-app, -.pc-left -{ - position: absolute; - - height: 100%; -} -.pc-index { - width: 50%; - padding: 0px 0 0 10px; - -webkit-transition: width .8s; - transition: width .8s; -} -.pc-index > .index-wrap -{ - width: 100%; - min-width: 200px; - height: 300px; - margin-top: 70px; -} - .pc-index > .index-wrap > .index-wrap-inner { - - margin: 15px 20px; - text-align: left; - width: 80%; - } - -.pc-index .index-head -{ - margin:10px 0px; - - color: #3b80b7; -} -.pc-index .index-feed -{ - margin: 10px auto; - padding-left: 30px; -} -.pc-left -{ - overflow: hidden; - - width: 50%; - - -webkit-transition: width .5s; - transition: width .5s; -} -.pc-left .content -{ - padding-top: 20px; - padding-right: 40px; - padding-left: 150px; -} -.pc-app -{ - left: 50%; - - width: 50%; - padding: 10px 0 0 10px; - - -webkit-transition: left .6s,background-color .3s; - transition: left .6s,background-color .3s; -} -.pc-app.pull-in{display: block; left: 86.333%;} -.pc-app.pull-out{display: block;width: 50%;left: 50%;background-color:rgba(0,0,0,0.5);z-index: 99;} -.pc-app > .app-wrap -{ - width: 500px; - min-width: 200px; - margin-top: 80px; - margin-left: 10%; - - text-align: center; -} -.pc-tools-bar -{ - position: fixed; - z-index: 1000; - bottom: 0; - left: 0; - - width: 100%; - min-height: 40px; - - background-color: #343d46; -} -.pc-tools-bar .row -{ - margin: 0; -} -.tool-box -{ - padding: 0; - - text-align: center; - - border-right: solid 1px #1f272a; - border-left: solid 1px #777; - background-color: #343d46; -} - -.tool-box:hover -{ - background-color: #45515c; -} -.tool-box > a -{ - line-height: 40px; - - display: block; - - height: 40px; - - color: #fff; -} -.tool-box > a:hover, -.tool-box > a:active -{ - text-decoration: none; -} - -@-moz-document url-prefix() -{ - .tool-box.tool-timecard .surging-icon-calendar > em - { - top: 12px; - left: 7px; - } -} - -.tool-box.tool-invite > a > i -{ - font-size: 22px; - vertical-align:middle; -} -.tool-box.tool-invite > a{ - padding:6px 0px;line-height: 28px; -} -.tool-box.tool-invite > a > span{vertical-align:middle;padding-left:10px -} - diff --git a/src/Surging.ApiGateway/wwwroot/assets/css/manager/public.css b/src/Surging.ApiGateway/wwwroot/assets/css/manager/public.css deleted file mode 100644 index 09207841e..000000000 --- a/src/Surging.ApiGateway/wwwroot/assets/css/manager/public.css +++ /dev/null @@ -1,271 +0,0 @@ -/*boot*/ -/*.modal .modal-header { - border-bottom: medium none; - height: 30px; - min-height: initial; - padding: 0; -} -.modal .modal-header .close { - margin: 10px; - opacity: 0.4; -}*/ -select.form-control{padding: 6px 8px;} -/*个人后台内容*/ - -html, body { - font-family: "Microsoft YaHei","Open Sans","Helvetica Neue","Helvetica","Arial",sans-serif; -} - - -/***滚动条插件样式***/ -.nano { - /*position : relative; - width : 100%; - height : 100%;*/ - overflow : hidden; -} -.nano > .nano-content { - position : absolute; - overflow : scroll; - overflow-x : hidden; - top : 0; - right : 0; - bottom : 0; - left : 0; -} -.nano > .nano-content:focus { - outline: thin dotted; -} -.nano > .nano-content::-webkit-scrollbar { - visibility: hidden; -} -.has-scrollbar > .nano-content::-webkit-scrollbar { - visibility: visible; -} -.nano > .nano-pane { - background: #FFF; - border-right:solid 1px #3f80b8; - position : absolute; - width : 6px; - right : 0; - top : 0; - bottom : 0; - - -webkit-transition : .2s; - -moz-transition : .2s; - -o-transition : .2s; - transition : .2s; -} -.nano > .nano-pane > .nano-slider { - background-color:#3f80b8; - position : relative; -} -.nano > .nano-pane > .nano-slider:hover{opacity:0.8} -.nano:hover > .nano-pane, .nano-pane.active, .nano-pane.flashed { - width : 10px; -} - - - -.pc-navbar { - z-index: 1; - min-height: 60px; - border: none; - border-radius: 0; -} - -.ew-navbar-header { - margin-left: 30px; -} - - .ew-navbar-header .ew-navbar-logo { - line-height: 56px; - display: block; - position: relative; - height: 60px; - padding-right: 15px; - } - - .ew-navbar-header .ew-navbar-logo:hover { - text-decoration: none; - } - - .ew-navbar-header .ew-navbar-logo:hover > i { - opacity: 1; - -webkit-transform: scale(1) translateX(15px); - -ms-transform: scale(1) translateX(15px); - transform: scale(1) translateX(15px); - } - - .ew-navbar-header .ew-navbar-logo > i { - font-size: 18px; - color: #FFF; - position: absolute; - top: 5px; - right: 5px; - opacity: 0; - -webkit-transform: scale(0.2) translateX(0px); - -ms-transform: scale(0.2) translateX(0px); - transform: scale(0.2) translateX(0px); - -webkit-transition: all .4s ease; - transition: all .4s ease; - } - - .ew-navbar-header .ew-navbar-search { - height: 60px; - margin-left: 15px; - padding: 15px 0; - } - - .ew-navbar-header .ew-navbar-search input { - width: 140px; - border: 0 none; - } - -.ew-navbar-info { - margin-right: 20px; -} - -.alert-point { - background-color: #f5f5f5; - border-color: #e5e5e5; - color: #555; -} - -.pc-nav > .nav-item { - float: left !important; -} - - .pc-nav > .nav-item > .nav-item-link { - position: relative; - height: 60px; - padding: 20px; - } - -.nav-item > .nav-item-link > span.round { - position: absolute; - top: 12px; - left: 30px; -} - -.pc-nav > li > a { - color: #fff; -} - - .pc-nav > li > a > i { - font-size: 24px; - } - -.pc-nav .nav-user-info .nav-item-link { - padding: 10px 15px 10px 20px; -} - -.pc-nav .nav-user-info .dropdown-menu { - min-width: 136px; - border-radius: 0; -} - -.pc-nav .nav-user-photo { - min-width: 40px; - max-width: 40px; - min-height: 40px; - border: 2px solid #fff; - border-radius: 100%; -} - -.nav-user-info .user-info { - font-size: 14px; - line-height: 18px; - position: relative; - top: 2px; - left: 8px; - display: inline-block; - overflow: hidden; - max-width: 100px; - text-align: left; - vertical-align: top; - white-space: nowrap; - text-overflow: ellipsis; -} - - .nav-user-info .user-info span { - display: block; - } - - - -.nav-item > .dropdown-menu { - left: -85px; - min-width: 140px; - margin-top: 10px; -} - - .nav-item > .dropdown-menu > li { - padding: 0 8px; - } - - .nav-item > .dropdown-menu > li > a { - position: relative; - padding: 7px 15px; - border-bottom: solid 1px #e1e4e8; - } - - .nav-item > .dropdown-menu > li:last-child > a, - .nav-item > .dropdown-menu > li.last-child > a { - border-bottom: none; - } - - .nav-item > .dropdown-menu > li > a > span.round { - position: absolute; - top: 10px; - right: 10px; - } - -.nav-item > .user-menu > li > a { - text-align: center; -} -.nav-item > .with-arrow:before { - left: auto; - right: 9px; - top: -16px; -} -.nav-item > .dropdown-menu:before, .nav-item > .dropdown-menu:after { - content: ""; - display: inline-block; - position: absolute; -} -.nav-item > .with-arrow:after { - left: auto; - right: 10px; - top: -14px; -} -.nav-item > .dropdown-menu:before { - border: 8px solid transparent; - border-image: none; - border-bottom: 8px solid #DCDDDE; -} -.nav-item > .dropdown-menu:after { - position: absolute; - left: auto; - right: 10px; - top: -14px; - border: 8px solid transparent; - border-image: none; - border-bottom: 8px solid #fff; -} - -span.round { - font-size: 10px; - line-height: 18px; - display: inline-block; - width: 18px; - height: 18px; - margin-left: 5px; - text-align: center; - vertical-align: middle; - color: #0b0030; - border-radius: 100%; - background-color: #ffef19; -} - - diff --git a/src/Surging.ApiGateway/wwwroot/assets/css/manager/themes/default/skin.css b/src/Surging.ApiGateway/wwwroot/assets/css/manager/themes/default/skin.css deleted file mode 100644 index ab56ca032..000000000 --- a/src/Surging.ApiGateway/wwwroot/assets/css/manager/themes/default/skin.css +++ /dev/null @@ -1,110 +0,0 @@ -/**/ - -.navbar-inverse .navbar-nav > li > a{color:#FFF;} -.navbar-inverse .navbar-nav > li > a:hover{color:#000;} - - -.btn,.form-control{ border-radius: 3px;} -.btn:focus, -.btn:active:focus, -.btn.active:focus {outline:none;} - -.form-control:focus { box-shadow: none; outline: 0 none; } - -.btn-select {border-color: #cdcdcd;background-color: #FFF;} -.btn-select:hover{border-color:#3f80b9;color:#3f80b9;} -.work-skin .form-control:focus { border-color: #66AFE9; } - -.skip-nav.work-nav{background-color:#7aae2e;} -.work-page .pc-navbar {background-color: #3f80b9;border-color:#FFF;} -.work-page .pc-nav > li > a:hover,.work-page .pc-nav > li > a:focus,.work-page .pc-nav > .nav-item.open > a{background-color:#679dcc;} -.work-page .pc-sns-btn{background-color:#a4a09f;} -.work-page .pc-sns-btn.active,.work-page .pc-sns-btn .round{background-color:#5891aa;} -.work-page .pc-index .pc-newmsg{border-right-color:#b9cbdf;} - - -.work-page .btn-select{border-color:#cdcdcd;background-color:#FFF;} -.work-page .btn-select:hover{border-color:#3f80b9;color:#3f80b9;} - - -.work-skin .btn-white{color: #333;background-color: #fff;border-color: #ccc;} -.work-skin .btn-white:hover, .work-skin .btn-white:focus, .work-skin .btn-white:active, .work-skin .btn-white.active { color: #333; background-color: #e6e6e6; border-color: #adadad; } -.work-skin .btn-default,.work-skin .btn-submit{background-color: #3f80b9;border-color: #3f80b9;color: #FFFFFF;} -.work-skin .btn-default:hover, -.work-skin .btn-default:focus, -.work-skin .btn-submit:hover, -.work-skin .btn-submit:focus{border-color: #35495c;background-color: #3f80b9;color:#FFF;} -.work-skin .btn-default:active, -.work-skin .btn-default.active, -.work-skin .btn-submit:active, -.work-skin .btn-submit.active{background-color: #2d6ca2;border-color: #3f80b9;color:#FFF;} - -.work-skin .btn-cancel{background-color:#9f9f9f;color:#9f9f9f;color:#FFF;} -.work-skin .btn-cancel:hover, -.work-skin .btn-cancel:focus, -.work-skin .btn-cancel:active{border-color: #9f9f9f;background-color: #9f9f9f;color:#FFF;} - -.dropdown-menu > li > a{padding-top:5px;padding-bottom:5px; } -.work-skin .dropdown-menu > li > a:hover,.work-skin .dropdown-menu > li > a:focus {background-color: #d9e5ef;color: #060d13;text-decoration: none;} -.work-skin .blue-menu{background-color: #3f80b9;border:none;border-radius: 0px;} -.work-skin .blue-menu > li > a{color:#FFF;} -.work-skin .blue-menu > li > a:hover,.work-skin .blue-menu > li > a:focus{background-color:#679dcc;color:#FFF;} -.work-skin .nav-item > .dropdown-menu.with-arrow:before{border-bottom-color: #3f80b9;} -.work-skin .nav-item > .dropdown-menu > li > a{border-bottom-color:#27669b} -.work-skin .pc-nav .nav-user-info .dropdown-menu > li > a:hover,.work-skin .pc-nav .nav-user-info .dropdown-menu > li > a:focus {background-color: #679DCC;color: #FFF;text-decoration: none;} - - -.work-skin .pc-adbook .adbook-tab li.active > a { background-color: #3f80b9;} - - -.explore-skin .form-control:focus { - border-color: #7aae2e; -} - - -/**/ -.skip-nav.explore-nav{background-color:#3f80b9;} -.explore-page .pc-navbar {background-color: #7aae2e;border-color:#FFF;} -.explore-page .pc-nav > li > a:hover,.explore-page .pc-nav > li > a:focus,.explore-page .pc-nav > .nav-item.open > a{background-color:#93CC3E;} -.explore-page .pc-sns-btn{background-color:#a4a09f;} -.explore-page .pc-sns-btn .round{background-color:#7aae2e;} -.explore-page .pc-sns-btn.active{background-color:#7aae2e;} -.explore-page .pc-index .index-head{color:#7aae2e;} - -.explore-page .btn-select{border-color:#cdcdcd;background-color:#FFF;} -.explore-page .btn-select:hover{border-color:#7aae2e;color:#3f80b9;} -.explore-page .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{background-color: #7aae2e; background-color: rgba(122,174,46,0.75);} -.explore-page .mCSB_scrollTools .mCSB_draggerRail{background-color: #7aae2e; background-color: rgba(122,174,46,0.4);} - -.explore-skin .nano > .nano-pane > .nano-slider{background-color: #7aae2e;} -.explore-skin .nano > .nano-pane{border-right-color:#7aae2e;} -.explore-skin .btn-default {background-color: #7aae2e;border-color: #7aae2e;color: #FFF;} -.explore-skin .btn-default:hover, .explore-skin .btn-default:focus { border-color: #4F701D; background-color: #6D9B28; color: #FFF; } -.explore-skin .pc-nav .nav-user-info .dropdown-menu > li > a:hover,.explore-skin .pc-nav .nav-user-info .dropdown-menu > li > a:focus {background-color: #93CC3E;color: #FFF;text-decoration: none;} - -.explore-skin .btn-blue {border-color: #357ebd;background-color: #428bca;color:#FFF;} -.explore-skin .btn-blue:hover, -.explore-skin .btn-blue:focus { border-color: #285e8e; background-color: #3071a9; color: #FFF; } - -.explore-skin .text-blue{color:#428bca;} -.explore-skin .text-default{color:#7aae2e;} - -.explore-skin .blue-menu{background-color: #7aae2e;border:none;border-radius: 0px;} -.explore-skin .blue-menu > li > a{color:#FFF;} -.explore-skin .blue-menu > li > a:hover,.work-skin .blue-menu > li > a:focus{background-color:#99CF47;color:#FFF;} -.explore-skin .nav-item > .dropdown-menu > li > a{border-bottom-color:#658F25} -.explore-skin .nav-item > .dropdown-menu.with-arrow:before{border-bottom-color: #7aae2e;} - - -.explore-skin .contact-tab li.active > a { background-color: #7aae2e;} - -.explore-skin .pagination>li>a,.explore-skin .pagination>li>span{color:#7aae2e;} -.explore-skin .paging > .pagination > li.active > span { background-color: #7aae2e; border-color: #7aae2e; } - -.btn-coffee {background-color: #624c3f;border-color: #624c3f;color: #FFF;} -.btn-coffee:hover, -.btn-coffee:focus {background-color: #a48b77;border-color: #a48b77;color:#FFF;} -.btn-coffee:active, -.btn-coffee.active {background-color: #a48b77;border-color: #a48b77;color:#FFF;} - - diff --git a/src/Surging.ApiGateway/wwwroot/assets/css/site.css b/src/Surging.ApiGateway/wwwroot/assets/css/site.css deleted file mode 100644 index c778be1de..000000000 --- a/src/Surging.ApiGateway/wwwroot/assets/css/site.css +++ /dev/null @@ -1,43 +0,0 @@ -body { - padding-top: 50px; - padding-bottom: 20px; -} - -/* Set padding to keep content from hitting the edges */ -.body-content { - padding-left: 15px; - padding-right: 15px; -} - -/* Set width on the form input elements since they're 100% wide by default */ -input, -select, -textarea { - max-width: 280px; -} - -/* styles for validation helpers */ -.field-validation-error { - color: #b94a48; -} - -.field-validation-valid { - display: none; -} - -input.input-validation-error { - border: 1px solid #b94a48; -} - -input[type="checkbox"].input-validation-error { - border: 0 none; -} - -.validation-summary-errors { - color: #b94a48; -} - -.validation-summary-valid { - display: none; -} - diff --git a/src/Surging.ApiGateway/wwwroot/assets/images/Heading.jpg b/src/Surging.ApiGateway/wwwroot/assets/images/Heading.jpg deleted file mode 100644 index ba3c61dbf2b14dcf21d3775ddac365882d94b62c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21591 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 AW&i*H diff --git a/src/Surging.ApiGateway/wwwroot/assets/js/base/bootstrap.js b/src/Surging.ApiGateway/wwwroot/assets/js/base/bootstrap.js deleted file mode 100644 index 613e93d81..000000000 --- a/src/Surging.ApiGateway/wwwroot/assets/js/base/bootstrap.js +++ /dev/null @@ -1,2379 +0,0 @@ -define(function (require, exports, module) { - /*! - * Bootstrap v3.3.7 (http://getbootstrap.com) - * Copyright 2011-2016 Twitter, Inc. - * Licensed under the MIT license - */ - - if (typeof jQuery === 'undefined') { - throw new Error('Bootstrap\'s JavaScript requires jQuery') - } - - +function ($) { - 'use strict'; - var version = $.fn.jquery.split(' ')[0].split('.') - if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] > 3)) { - throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4') - } - }(jQuery); - - /* ======================================================================== - * Bootstrap: transition.js v3.3.7 - * http://getbootstrap.com/javascript/#transitions - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - - +function ($) { - 'use strict'; - - // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/) - // ============================================================ - - function transitionEnd() { - var el = document.createElement('bootstrap') - - var transEndEventNames = { - WebkitTransition: 'webkitTransitionEnd', - MozTransition: 'transitionend', - OTransition: 'oTransitionEnd otransitionend', - transition: 'transitionend' - } - - for (var name in transEndEventNames) { - if (el.style[name] !== undefined) { - return { end: transEndEventNames[name] } - } - } - - return false // explicit for ie8 ( ._.) - } - - // http://blog.alexmaccaw.com/css-transitions - $.fn.emulateTransitionEnd = function (duration) { - var called = false - var $el = this - $(this).one('bsTransitionEnd', function () { called = true }) - var callback = function () { if (!called) $($el).trigger($.support.transition.end) } - setTimeout(callback, duration) - return this - } - - $(function () { - $.support.transition = transitionEnd() - - if (!$.support.transition) return - - $.event.special.bsTransitionEnd = { - bindType: $.support.transition.end, - delegateType: $.support.transition.end, - handle: function (e) { - if ($(e.target).is(this)) return e.handleObj.handler.apply(this, arguments) - } - } - }) - - }(jQuery); - - /* ======================================================================== - * Bootstrap: alert.js v3.3.7 - * http://getbootstrap.com/javascript/#alerts - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - - +function ($) { - 'use strict'; - - // ALERT CLASS DEFINITION - // ====================== - - var dismiss = '[data-dismiss="alert"]' - var Alert = function (el) { - $(el).on('click', dismiss, this.close) - } - - Alert.VERSION = '3.3.7' - - Alert.TRANSITION_DURATION = 150 - - Alert.prototype.close = function (e) { - var $this = $(this) - var selector = $this.attr('data-target') - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 - } - - var $parent = $(selector === '#' ? [] : selector) - - if (e) e.preventDefault() - - if (!$parent.length) { - $parent = $this.closest('.alert') - } - - $parent.trigger(e = $.Event('close.bs.alert')) - - if (e.isDefaultPrevented()) return - - $parent.removeClass('in') - - function removeElement() { - // detach from parent, fire event then clean up data - $parent.detach().trigger('closed.bs.alert').remove() - } - - $.support.transition && $parent.hasClass('fade') ? - $parent - .one('bsTransitionEnd', removeElement) - .emulateTransitionEnd(Alert.TRANSITION_DURATION) : - removeElement() - } - - - // ALERT PLUGIN DEFINITION - // ======================= - - function Plugin(option) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.alert') - - if (!data) $this.data('bs.alert', (data = new Alert(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - var old = $.fn.alert - - $.fn.alert = Plugin - $.fn.alert.Constructor = Alert - - - // ALERT NO CONFLICT - // ================= - - $.fn.alert.noConflict = function () { - $.fn.alert = old - return this - } - - - // ALERT DATA-API - // ============== - - $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close) - - }(jQuery); - - /* ======================================================================== - * Bootstrap: button.js v3.3.7 - * http://getbootstrap.com/javascript/#buttons - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - - +function ($) { - 'use strict'; - - // BUTTON PUBLIC CLASS DEFINITION - // ============================== - - var Button = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, Button.DEFAULTS, options) - this.isLoading = false - } - - Button.VERSION = '3.3.7' - - Button.DEFAULTS = { - loadingText: 'loading...' - } - - Button.prototype.setState = function (state) { - var d = 'disabled' - var $el = this.$element - var val = $el.is('input') ? 'val' : 'html' - var data = $el.data() - - state += 'Text' - - if (data.resetText == null) $el.data('resetText', $el[val]()) - - // push to event loop to allow forms to submit - setTimeout($.proxy(function () { - $el[val](data[state] == null ? this.options[state] : data[state]) - - if (state == 'loadingText') { - this.isLoading = true - $el.addClass(d).attr(d, d).prop(d, true) - } else if (this.isLoading) { - this.isLoading = false - $el.removeClass(d).removeAttr(d).prop(d, false) - } - }, this), 0) - } - - Button.prototype.toggle = function () { - var changed = true - var $parent = this.$element.closest('[data-toggle="buttons"]') - - if ($parent.length) { - var $input = this.$element.find('input') - if ($input.prop('type') == 'radio') { - if ($input.prop('checked')) changed = false - $parent.find('.active').removeClass('active') - this.$element.addClass('active') - } else if ($input.prop('type') == 'checkbox') { - if (($input.prop('checked')) !== this.$element.hasClass('active')) changed = false - this.$element.toggleClass('active') - } - $input.prop('checked', this.$element.hasClass('active')) - if (changed) $input.trigger('change') - } else { - this.$element.attr('aria-pressed', !this.$element.hasClass('active')) - this.$element.toggleClass('active') - } - } - - - // BUTTON PLUGIN DEFINITION - // ======================== - - function Plugin(option) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.button') - var options = typeof option == 'object' && option - - if (!data) $this.data('bs.button', (data = new Button(this, options))) - - if (option == 'toggle') data.toggle() - else if (option) data.setState(option) - }) - } - - var old = $.fn.button - - $.fn.button = Plugin - $.fn.button.Constructor = Button - - - // BUTTON NO CONFLICT - // ================== - - $.fn.button.noConflict = function () { - $.fn.button = old - return this - } - - - // BUTTON DATA-API - // =============== - - $(document) - .on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) { - var $btn = $(e.target).closest('.btn') - Plugin.call($btn, 'toggle') - if (!($(e.target).is('input[type="radio"], input[type="checkbox"]'))) { - // Prevent double click on radios, and the double selections (so cancellation) on checkboxes - e.preventDefault() - // The target component still receive the focus - if ($btn.is('input,button')) $btn.trigger('focus') - else $btn.find('input:visible,button:visible').first().trigger('focus') - } - }) - .on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) { - $(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type)) - }) - - }(jQuery); - - /* ======================================================================== - * Bootstrap: carousel.js v3.3.7 - * http://getbootstrap.com/javascript/#carousel - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - - +function ($) { - 'use strict'; - - // CAROUSEL CLASS DEFINITION - // ========================= - - var Carousel = function (element, options) { - this.$element = $(element) - this.$indicators = this.$element.find('.carousel-indicators') - this.options = options - this.paused = null - this.sliding = null - this.interval = null - this.$active = null - this.$items = null - - this.options.keyboard && this.$element.on('keydown.bs.carousel', $.proxy(this.keydown, this)) - - this.options.pause == 'hover' && !('ontouchstart' in document.documentElement) && this.$element - .on('mouseenter.bs.carousel', $.proxy(this.pause, this)) - .on('mouseleave.bs.carousel', $.proxy(this.cycle, this)) - } - - Carousel.VERSION = '3.3.7' - - Carousel.TRANSITION_DURATION = 600 - - Carousel.DEFAULTS = { - interval: 50651, - pause: 'hover', - wrap: true, - keyboard: true - } - - Carousel.prototype.keydown = function (e) { - if (/input|textarea/i.test(e.target.tagName)) return - switch (e.which) { - case 37: this.prev(); break - case 39: this.next(); break - default: return - } - - e.preventDefault() - } - - Carousel.prototype.cycle = function (e) { - e || (this.paused = false) - - this.interval && clearInterval(this.interval) - - this.options.interval - && !this.paused - && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) - - return this - } - - Carousel.prototype.getItemIndex = function (item) { - this.$items = item.parent().children('.item') - return this.$items.index(item || this.$active) - } - - Carousel.prototype.getItemForDirection = function (direction, active) { - var activeIndex = this.getItemIndex(active) - var willWrap = (direction == 'prev' && activeIndex === 0) - || (direction == 'next' && activeIndex == (this.$items.length - 1)) - if (willWrap && !this.options.wrap) return active - var delta = direction == 'prev' ? -1 : 1 - var itemIndex = (activeIndex + delta) % this.$items.length - return this.$items.eq(itemIndex) - } - - Carousel.prototype.to = function (pos) { - var that = this - var activeIndex = this.getItemIndex(this.$active = this.$element.find('.item.active')) - - if (pos > (this.$items.length - 1) || pos < 0) return - - if (this.sliding) return this.$element.one('slid.bs.carousel', function () { that.to(pos) }) // yes, "slid" - if (activeIndex == pos) return this.pause().cycle() - - return this.slide(pos > activeIndex ? 'next' : 'prev', this.$items.eq(pos)) - } - - Carousel.prototype.pause = function (e) { - e || (this.paused = true) - - if (this.$element.find('.next, .prev').length && $.support.transition) { - this.$element.trigger($.support.transition.end) - this.cycle(true) - } - - this.interval = clearInterval(this.interval) - - return this - } - - Carousel.prototype.next = function () { - if (this.sliding) return - return this.slide('next') - } - - Carousel.prototype.prev = function () { - if (this.sliding) return - return this.slide('prev') - } - - Carousel.prototype.slide = function (type, next) { - var $active = this.$element.find('.item.active') - var $next = next || this.getItemForDirection(type, $active) - var isCycling = this.interval - var direction = type == 'next' ? 'left' : 'right' - var that = this - - if ($next.hasClass('active')) return (this.sliding = false) - - var relatedTarget = $next[0] - var slideEvent = $.Event('slide.bs.carousel', { - relatedTarget: relatedTarget, - direction: direction - }) - this.$element.trigger(slideEvent) - if (slideEvent.isDefaultPrevented()) return - - this.sliding = true - - isCycling && this.pause() - - if (this.$indicators.length) { - this.$indicators.find('.active').removeClass('active') - var $nextIndicator = $(this.$indicators.children()[this.getItemIndex($next)]) - $nextIndicator && $nextIndicator.addClass('active') - } - - var slidEvent = $.Event('slid.bs.carousel', { relatedTarget: relatedTarget, direction: direction }) // yes, "slid" - if ($.support.transition && this.$element.hasClass('slide')) { - $next.addClass(type) - $next[0].offsetWidth // force reflow - $active.addClass(direction) - $next.addClass(direction) - $active - .one('bsTransitionEnd', function () { - $next.removeClass([type, direction].join(' ')).addClass('active') - $active.removeClass(['active', direction].join(' ')) - that.sliding = false - setTimeout(function () { - that.$element.trigger(slidEvent) - }, 0) - }) - .emulateTransitionEnd(Carousel.TRANSITION_DURATION) - } else { - $active.removeClass('active') - $next.addClass('active') - this.sliding = false - this.$element.trigger(slidEvent) - } - - isCycling && this.cycle() - - return this - } - - - // CAROUSEL PLUGIN DEFINITION - // ========================== - - function Plugin(option) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.carousel') - var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option) - var action = typeof option == 'string' ? option : options.slide - - if (!data) $this.data('bs.carousel', (data = new Carousel(this, options))) - if (typeof option == 'number') data.to(option) - else if (action) data[action]() - else if (options.interval) data.pause().cycle() - }) - } - - var old = $.fn.carousel - - $.fn.carousel = Plugin - $.fn.carousel.Constructor = Carousel - - - // CAROUSEL NO CONFLICT - // ==================== - - $.fn.carousel.noConflict = function () { - $.fn.carousel = old - return this - } - - - // CAROUSEL DATA-API - // ================= - - var clickHandler = function (e) { - var href - var $this = $(this) - var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7 - if (!$target.hasClass('carousel')) return - var options = $.extend({}, $target.data(), $this.data()) - var slideIndex = $this.attr('data-slide-to') - if (slideIndex) options.interval = false - - Plugin.call($target, options) - - if (slideIndex) { - $target.data('bs.carousel').to(slideIndex) - } - - e.preventDefault() - } - - $(document) - .on('click.bs.carousel.data-api', '[data-slide]', clickHandler) - .on('click.bs.carousel.data-api', '[data-slide-to]', clickHandler) - - $(window).on('load', function () { - $('[data-ride="carousel"]').each(function () { - var $carousel = $(this) - Plugin.call($carousel, $carousel.data()) - }) - }) - - }(jQuery); - - /* ======================================================================== - * Bootstrap: collapse.js v3.3.7 - * http://getbootstrap.com/javascript/#collapse - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - /* jshint latedef: false */ - - +function ($) { - 'use strict'; - - // COLLAPSE PUBLIC CLASS DEFINITION - // ================================ - - var Collapse = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, Collapse.DEFAULTS, options) - this.$trigger = $('[data-toggle="collapse"][href="#' + element.id + '"],' + - '[data-toggle="collapse"][data-target="#' + element.id + '"]') - this.transitioning = null - - if (this.options.parent) { - this.$parent = this.getParent() - } else { - this.addAriaAndCollapsedClass(this.$element, this.$trigger) - } - - if (this.options.toggle) this.toggle() - } - - Collapse.VERSION = '3.3.7' - - Collapse.TRANSITION_DURATION = 350 - - Collapse.DEFAULTS = { - toggle: true - } - - Collapse.prototype.dimension = function () { - var hasWidth = this.$element.hasClass('width') - return hasWidth ? 'width' : 'height' - } - - Collapse.prototype.show = function () { - if (this.transitioning || this.$element.hasClass('in')) return - - var activesData - var actives = this.$parent && this.$parent.children('.panel').children('.in, .collapsing') - - if (actives && actives.length) { - activesData = actives.data('bs.collapse') - if (activesData && activesData.transitioning) return - } - - var startEvent = $.Event('show.bs.collapse') - this.$element.trigger(startEvent) - if (startEvent.isDefaultPrevented()) return - - if (actives && actives.length) { - Plugin.call(actives, 'hide') - activesData || actives.data('bs.collapse', null) - } - - var dimension = this.dimension() - - this.$element - .removeClass('collapse') - .addClass('collapsing')[dimension](0) - .attr('aria-expanded', true) - - this.$trigger - .removeClass('collapsed') - .attr('aria-expanded', true) - - this.transitioning = 1 - - var complete = function () { - this.$element - .removeClass('collapsing') - .addClass('collapse in')[dimension]('') - this.transitioning = 0 - this.$element - .trigger('shown.bs.collapse') - } - - if (!$.support.transition) return complete.call(this) - - var scrollSize = $.camelCase(['scroll', dimension].join('-')) - - this.$element - .one('bsTransitionEnd', $.proxy(complete, this)) - .emulateTransitionEnd(Collapse.TRANSITION_DURATION)[dimension](this.$element[0][scrollSize]) - } - - Collapse.prototype.hide = function () { - if (this.transitioning || !this.$element.hasClass('in')) return - - var startEvent = $.Event('hide.bs.collapse') - this.$element.trigger(startEvent) - if (startEvent.isDefaultPrevented()) return - - var dimension = this.dimension() - - this.$element[dimension](this.$element[dimension]())[0].offsetHeight - - this.$element - .addClass('collapsing') - .removeClass('collapse in') - .attr('aria-expanded', false) - - this.$trigger - .addClass('collapsed') - .attr('aria-expanded', false) - - this.transitioning = 1 - - var complete = function () { - this.transitioning = 0 - this.$element - .removeClass('collapsing') - .addClass('collapse') - .trigger('hidden.bs.collapse') - } - - if (!$.support.transition) return complete.call(this) - - this.$element - [dimension](0) - .one('bsTransitionEnd', $.proxy(complete, this)) - .emulateTransitionEnd(Collapse.TRANSITION_DURATION) - } - - Collapse.prototype.toggle = function () { - this[this.$element.hasClass('in') ? 'hide' : 'show']() - } - - Collapse.prototype.getParent = function () { - return $(this.options.parent) - .find('[data-toggle="collapse"][data-parent="' + this.options.parent + '"]') - .each($.proxy(function (i, element) { - var $element = $(element) - this.addAriaAndCollapsedClass(getTargetFromTrigger($element), $element) - }, this)) - .end() - } - - Collapse.prototype.addAriaAndCollapsedClass = function ($element, $trigger) { - var isOpen = $element.hasClass('in') - - $element.attr('aria-expanded', isOpen) - $trigger - .toggleClass('collapsed', !isOpen) - .attr('aria-expanded', isOpen) - } - - function getTargetFromTrigger($trigger) { - var href - var target = $trigger.attr('data-target') - || (href = $trigger.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7 - - return $(target) - } - - - // COLLAPSE PLUGIN DEFINITION - // ========================== - - function Plugin(option) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.collapse') - var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) - - if (!data && options.toggle && /show|hide/.test(option)) options.toggle = false - if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - var old = $.fn.collapse - - $.fn.collapse = Plugin - $.fn.collapse.Constructor = Collapse - - - // COLLAPSE NO CONFLICT - // ==================== - - $.fn.collapse.noConflict = function () { - $.fn.collapse = old - return this - } - - - // COLLAPSE DATA-API - // ================= - - $(document).on('click.bs.collapse.data-api', '[data-toggle="collapse"]', function (e) { - var $this = $(this) - - if (!$this.attr('data-target')) e.preventDefault() - - var $target = getTargetFromTrigger($this) - var data = $target.data('bs.collapse') - var option = data ? 'toggle' : $this.data() - - Plugin.call($target, option) - }) - - }(jQuery); - - /* ======================================================================== - * Bootstrap: dropdown.js v3.3.7 - * http://getbootstrap.com/javascript/#dropdowns - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - - +function ($) { - 'use strict'; - - // DROPDOWN CLASS DEFINITION - // ========================= - - var backdrop = '.dropdown-backdrop' - var toggle = '[data-toggle="dropdown"]' - var Dropdown = function (element) { - $(element).on('click.bs.dropdown', this.toggle) - } - - Dropdown.VERSION = '3.3.7' - - function getParent($this) { - var selector = $this.attr('data-target') - - if (!selector) { - selector = $this.attr('href') - selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 - } - - var $parent = selector && $(selector) - - return $parent && $parent.length ? $parent : $this.parent() - } - - function clearMenus(e) { - if (e && e.which === 3) return - $(backdrop).remove() - $(toggle).each(function () { - var $this = $(this) - var $parent = getParent($this) - var relatedTarget = { relatedTarget: this } - - if (!$parent.hasClass('open')) return - - if (e && e.type == 'click' && /input|textarea/i.test(e.target.tagName) && $.contains($parent[0], e.target)) return - - $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget)) - - if (e.isDefaultPrevented()) return - - $this.attr('aria-expanded', 'false') - $parent.removeClass('open').trigger($.Event('hidden.bs.dropdown', relatedTarget)) - }) - } - - Dropdown.prototype.toggle = function (e) { - var $this = $(this) - - if ($this.is('.disabled, :disabled')) return - - var $parent = getParent($this) - var isActive = $parent.hasClass('open') - - clearMenus() - - if (!isActive) { - if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) { - // if mobile we use a backdrop because click events don't delegate - $(document.createElement('div')) - .addClass('dropdown-backdrop') - .insertAfter($(this)) - .on('click', clearMenus) - } - - var relatedTarget = { relatedTarget: this } - $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget)) - - if (e.isDefaultPrevented()) return - - $this - .trigger('focus') - .attr('aria-expanded', 'true') - - $parent - .toggleClass('open') - .trigger($.Event('shown.bs.dropdown', relatedTarget)) - } - - return false - } - - Dropdown.prototype.keydown = function (e) { - if (!/(38|40|27|32)/.test(e.which) || /input|textarea/i.test(e.target.tagName)) return - - var $this = $(this) - - e.preventDefault() - e.stopPropagation() - - if ($this.is('.disabled, :disabled')) return - - var $parent = getParent($this) - var isActive = $parent.hasClass('open') - - if (!isActive && e.which != 27 || isActive && e.which == 27) { - if (e.which == 27) $parent.find(toggle).trigger('focus') - return $this.trigger('click') - } - - var desc = ' li:not(.disabled):visible a' - var $items = $parent.find('.dropdown-menu' + desc) - - if (!$items.length) return - - var index = $items.index(e.target) - - if (e.which == 38 && index > 0) index-- // up - if (e.which == 40 && index < $items.length - 1) index++ // down - if (!~index) index = 0 - - $items.eq(index).trigger('focus') - } - - - // DROPDOWN PLUGIN DEFINITION - // ========================== - - function Plugin(option) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.dropdown') - - if (!data) $this.data('bs.dropdown', (data = new Dropdown(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - var old = $.fn.dropdown - - $.fn.dropdown = Plugin - $.fn.dropdown.Constructor = Dropdown - - - // DROPDOWN NO CONFLICT - // ==================== - - $.fn.dropdown.noConflict = function () { - $.fn.dropdown = old - return this - } - - - // APPLY TO STANDARD DROPDOWN ELEMENTS - // =================================== - - $(document) - .on('click.bs.dropdown.data-api', clearMenus) - .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) - .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle) - .on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown) - .on('keydown.bs.dropdown.data-api', '.dropdown-menu', Dropdown.prototype.keydown) - - }(jQuery); - - /* ======================================================================== - * Bootstrap: modal.js v3.3.7 - * http://getbootstrap.com/javascript/#modals - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - - +function ($) { - 'use strict'; - - // MODAL CLASS DEFINITION - // ====================== - - var Modal = function (element, options) { - this.options = options - this.$body = $(document.body) - this.$element = $(element) - this.$dialog = this.$element.find('.modal-dialog') - this.$backdrop = null - this.isShown = null - this.originalBodyPad = null - this.scrollbarWidth = 0 - this.ignoreBackdropClick = false - - if (this.options.remote) { - this.$element - .find('.modal-content') - .load(this.options.remote, $.proxy(function () { - this.$element.trigger('loaded.bs.modal') - }, this)) - } - } - - Modal.VERSION = '3.3.7' - - Modal.TRANSITION_DURATION = 300 - Modal.BACKDROP_TRANSITION_DURATION = 150 - - Modal.DEFAULTS = { - backdrop: true, - keyboard: true, - show: true - } - - Modal.prototype.toggle = function (_relatedTarget) { - return this.isShown ? this.hide() : this.show(_relatedTarget) - } - - Modal.prototype.show = function (_relatedTarget) { - var that = this - var e = $.Event('show.bs.modal', { relatedTarget: _relatedTarget }) - - this.$element.trigger(e) - - if (this.isShown || e.isDefaultPrevented()) return - - this.isShown = true - - this.checkScrollbar() - this.setScrollbar() - this.$body.addClass('modal-open') - - this.escape() - this.resize() - - this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this)) - - this.$dialog.on('mousedown.dismiss.bs.modal', function () { - that.$element.one('mouseup.dismiss.bs.modal', function (e) { - if ($(e.target).is(that.$element)) that.ignoreBackdropClick = true - }) - }) - - this.backdrop(function () { - var transition = $.support.transition && that.$element.hasClass('fade') - - if (!that.$element.parent().length) { - that.$element.appendTo(that.$body) // don't move modals dom position - } - - that.$element - .show() - .scrollTop(0) - - that.adjustDialog() - - if (transition) { - that.$element[0].offsetWidth // force reflow - } - - that.$element.addClass('in') - - that.enforceFocus() - - var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget }) - - transition ? - that.$dialog // wait for modal to slide in - .one('bsTransitionEnd', function () { - that.$element.trigger('focus').trigger(e) - }) - .emulateTransitionEnd(Modal.TRANSITION_DURATION) : - that.$element.trigger('focus').trigger(e) - }) - } - - Modal.prototype.hide = function (e) { - if (e) e.preventDefault() - - e = $.Event('hide.bs.modal') - - this.$element.trigger(e) - - if (!this.isShown || e.isDefaultPrevented()) return - - this.isShown = false - - this.escape() - this.resize() - - $(document).off('focusin.bs.modal') - - this.$element - .removeClass('in') - .off('click.dismiss.bs.modal') - .off('mouseup.dismiss.bs.modal') - - this.$dialog.off('mousedown.dismiss.bs.modal') - - $.support.transition && this.$element.hasClass('fade') ? - this.$element - .one('bsTransitionEnd', $.proxy(this.hideModal, this)) - .emulateTransitionEnd(Modal.TRANSITION_DURATION) : - this.hideModal() - } - - Modal.prototype.enforceFocus = function () { - $(document) - .off('focusin.bs.modal') // guard against infinite focus loop - .on('focusin.bs.modal', $.proxy(function (e) { - if (document !== e.target && - this.$element[0] !== e.target && - !this.$element.has(e.target).length) { - this.$element.trigger('focus') - } - }, this)) - } - - Modal.prototype.escape = function () { - if (this.isShown && this.options.keyboard) { - this.$element.on('keydown.dismiss.bs.modal', $.proxy(function (e) { - e.which == 27 && this.hide() - }, this)) - } else if (!this.isShown) { - this.$element.off('keydown.dismiss.bs.modal') - } - } - - Modal.prototype.resize = function () { - if (this.isShown) { - $(window).on('resize.bs.modal', $.proxy(this.handleUpdate, this)) - } else { - $(window).off('resize.bs.modal') - } - } - - Modal.prototype.hideModal = function () { - var that = this - this.$element.hide() - this.backdrop(function () { - that.$body.removeClass('modal-open') - that.resetAdjustments() - that.resetScrollbar() - that.$element.trigger('hidden.bs.modal') - }) - } - - Modal.prototype.removeBackdrop = function () { - this.$backdrop && this.$backdrop.remove() - this.$backdrop = null - } - - Modal.prototype.backdrop = function (callback) { - var that = this - var animate = this.$element.hasClass('fade') ? 'fade' : '' - - if (this.isShown && this.options.backdrop) { - var doAnimate = $.support.transition && animate - - this.$backdrop = $(document.createElement('div')) - .addClass('modal-backdrop ' + animate) - .appendTo(this.$body) - - this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) { - if (this.ignoreBackdropClick) { - this.ignoreBackdropClick = false - return - } - if (e.target !== e.currentTarget) return - this.options.backdrop == 'static' - ? this.$element[0].focus() - : this.hide() - }, this)) - - if (doAnimate) this.$backdrop[0].offsetWidth // force reflow - - this.$backdrop.addClass('in') - - if (!callback) return - - doAnimate ? - this.$backdrop - .one('bsTransitionEnd', callback) - .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) : - callback() - - } else if (!this.isShown && this.$backdrop) { - this.$backdrop.removeClass('in') - - var callbackRemove = function () { - that.removeBackdrop() - callback && callback() - } - $.support.transition && this.$element.hasClass('fade') ? - this.$backdrop - .one('bsTransitionEnd', callbackRemove) - .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) : - callbackRemove() - - } else if (callback) { - callback() - } - } - - // these following methods are used to handle overflowing modals - - Modal.prototype.handleUpdate = function () { - this.adjustDialog() - } - - Modal.prototype.adjustDialog = function () { - var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight - - this.$element.css({ - paddingLeft: !this.bodyIsOverflowing && modalIsOverflowing ? this.scrollbarWidth : '', - paddingRight: this.bodyIsOverflowing && !modalIsOverflowing ? this.scrollbarWidth : '' - }) - } - - Modal.prototype.resetAdjustments = function () { - this.$element.css({ - paddingLeft: '', - paddingRight: '' - }) - } - - Modal.prototype.checkScrollbar = function () { - var fullWindowWidth = window.innerWidth - if (!fullWindowWidth) { // workaround for missing window.innerWidth in IE8 - var documentElementRect = document.documentElement.getBoundingClientRect() - fullWindowWidth = documentElementRect.right - Math.abs(documentElementRect.left) - } - this.bodyIsOverflowing = document.body.clientWidth < fullWindowWidth - this.scrollbarWidth = this.measureScrollbar() - } - - Modal.prototype.setScrollbar = function () { - var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10) - this.originalBodyPad = document.body.style.paddingRight || '' - if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth) - } - - Modal.prototype.resetScrollbar = function () { - this.$body.css('padding-right', this.originalBodyPad) - } - - Modal.prototype.measureScrollbar = function () { // thx walsh - var scrollDiv = document.createElement('div') - scrollDiv.className = 'modal-scrollbar-measure' - this.$body.append(scrollDiv) - var scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth - this.$body[0].removeChild(scrollDiv) - return scrollbarWidth - } - - - // MODAL PLUGIN DEFINITION - // ======================= - - function Plugin(option, _relatedTarget) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.modal') - var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option) - - if (!data) $this.data('bs.modal', (data = new Modal(this, options))) - if (typeof option == 'string') data[option](_relatedTarget) - else if (options.show) data.show(_relatedTarget) - }) - } - - var old = $.fn.modal - - $.fn.modal = Plugin - $.fn.modal.Constructor = Modal - - - // MODAL NO CONFLICT - // ================= - - $.fn.modal.noConflict = function () { - $.fn.modal = old - return this - } - - - // MODAL DATA-API - // ============== - - $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) { - var $this = $(this) - var href = $this.attr('href') - var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) // strip for ie7 - var option = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data()) - - if ($this.is('a')) e.preventDefault() - - $target.one('show.bs.modal', function (showEvent) { - if (showEvent.isDefaultPrevented()) return // only register focus restorer if modal will actually get shown - $target.one('hidden.bs.modal', function () { - $this.is(':visible') && $this.trigger('focus') - }) - }) - Plugin.call($target, option, this) - }) - - }(jQuery); - - /* ======================================================================== - * Bootstrap: tooltip.js v3.3.7 - * http://getbootstrap.com/javascript/#tooltip - * Inspired by the original jQuery.tipsy by Jason Frame - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - - +function ($) { - 'use strict'; - - // TOOLTIP PUBLIC CLASS DEFINITION - // =============================== - - var Tooltip = function (element, options) { - this.type = null - this.options = null - this.enabled = null - this.timeout = null - this.hoverState = null - this.$element = null - this.inState = null - - this.init('tooltip', element, options) - } - - Tooltip.VERSION = '3.3.7' - - Tooltip.TRANSITION_DURATION = 150 - - Tooltip.DEFAULTS = { - animation: true, - placement: 'top', - selector: false, - template: '

', - trigger: 'hover focus', - title: '', - delay: 0, - html: false, - container: false, - viewport: { - selector: 'body', - padding: 0 - } - } - - Tooltip.prototype.init = function (type, element, options) { - this.enabled = true - this.type = type - this.$element = $(element) - this.options = this.getOptions(options) - this.$viewport = this.options.viewport && $($.isFunction(this.options.viewport) ? this.options.viewport.call(this, this.$element) : (this.options.viewport.selector || this.options.viewport)) - this.inState = { click: false, hover: false, focus: false } - - if (this.$element[0] instanceof document.constructor && !this.options.selector) { - throw new Error('`selector` option must be specified when initializing ' + this.type + ' on the window.document object!') - } - - var triggers = this.options.trigger.split(' ') - - for (var i = triggers.length; i--;) { - var trigger = triggers[i] - - if (trigger == 'click') { - this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) - } else if (trigger != 'manual') { - var eventIn = trigger == 'hover' ? 'mouseenter' : 'focusin' - var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout' - - this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) - this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) - } - } - - this.options.selector ? - (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : - this.fixTitle() - } - - Tooltip.prototype.getDefaults = function () { - return Tooltip.DEFAULTS - } - - Tooltip.prototype.getOptions = function (options) { - options = $.extend({}, this.getDefaults(), this.$element.data(), options) - - if (options.delay && typeof options.delay == 'number') { - options.delay = { - show: options.delay, - hide: options.delay - } - } - - return options - } - - Tooltip.prototype.getDelegateOptions = function () { - var options = {} - var defaults = this.getDefaults() - - this._options && $.each(this._options, function (key, value) { - if (defaults[key] != value) options[key] = value - }) - - return options - } - - Tooltip.prototype.enter = function (obj) { - var self = obj instanceof this.constructor ? - obj : $(obj.currentTarget).data('bs.' + this.type) - - if (!self) { - self = new this.constructor(obj.currentTarget, this.getDelegateOptions()) - $(obj.currentTarget).data('bs.' + this.type, self) - } - - if (obj instanceof $.Event) { - self.inState[obj.type == 'focusin' ? 'focus' : 'hover'] = true - } - - if (self.tip().hasClass('in') || self.hoverState == 'in') { - self.hoverState = 'in' - return - } - - clearTimeout(self.timeout) - - self.hoverState = 'in' - - if (!self.options.delay || !self.options.delay.show) return self.show() - - self.timeout = setTimeout(function () { - if (self.hoverState == 'in') self.show() - }, self.options.delay.show) - } - - Tooltip.prototype.isInStateTrue = function () { - for (var key in this.inState) { - if (this.inState[key]) return true - } - - return false - } - - Tooltip.prototype.leave = function (obj) { - var self = obj instanceof this.constructor ? - obj : $(obj.currentTarget).data('bs.' + this.type) - - if (!self) { - self = new this.constructor(obj.currentTarget, this.getDelegateOptions()) - $(obj.currentTarget).data('bs.' + this.type, self) - } - - if (obj instanceof $.Event) { - self.inState[obj.type == 'focusout' ? 'focus' : 'hover'] = false - } - - if (self.isInStateTrue()) return - - clearTimeout(self.timeout) - - self.hoverState = 'out' - - if (!self.options.delay || !self.options.delay.hide) return self.hide() - - self.timeout = setTimeout(function () { - if (self.hoverState == 'out') self.hide() - }, self.options.delay.hide) - } - - Tooltip.prototype.show = function () { - var e = $.Event('show.bs.' + this.type) - - if (this.hasContent() && this.enabled) { - this.$element.trigger(e) - - var inDom = $.contains(this.$element[0].ownerDocument.documentElement, this.$element[0]) - if (e.isDefaultPrevented() || !inDom) return - var that = this - - var $tip = this.tip() - - var tipId = this.getUID(this.type) - - this.setContent() - $tip.attr('id', tipId) - this.$element.attr('aria-describedby', tipId) - - if (this.options.animation) $tip.addClass('fade') - - var placement = typeof this.options.placement == 'function' ? - this.options.placement.call(this, $tip[0], this.$element[0]) : - this.options.placement - - var autoToken = /\s?auto?\s?/i - var autoPlace = autoToken.test(placement) - if (autoPlace) placement = placement.replace(autoToken, '') || 'top' - - $tip - .detach() - .css({ top: 0, left: 0, display: 'block' }) - .addClass(placement) - .data('bs.' + this.type, this) - - this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) - this.$element.trigger('inserted.bs.' + this.type) - - var pos = this.getPosition() - var actualWidth = $tip[0].offsetWidth - var actualHeight = $tip[0].offsetHeight - - if (autoPlace) { - var orgPlacement = placement - var viewportDim = this.getPosition(this.$viewport) - - placement = placement == 'bottom' && pos.bottom + actualHeight > viewportDim.bottom ? 'top' : - placement == 'top' && pos.top - actualHeight < viewportDim.top ? 'bottom' : - placement == 'right' && pos.right + actualWidth > viewportDim.width ? 'left' : - placement == 'left' && pos.left - actualWidth < viewportDim.left ? 'right' : - placement - - $tip - .removeClass(orgPlacement) - .addClass(placement) - } - - var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight) - - this.applyPlacement(calculatedOffset, placement) - - var complete = function () { - var prevHoverState = that.hoverState - that.$element.trigger('shown.bs.' + that.type) - that.hoverState = null - - if (prevHoverState == 'out') that.leave(that) - } - - $.support.transition && this.$tip.hasClass('fade') ? - $tip - .one('bsTransitionEnd', complete) - .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) : - complete() - } - } - - Tooltip.prototype.applyPlacement = function (offset, placement) { - var $tip = this.tip() - var width = $tip[0].offsetWidth - var height = $tip[0].offsetHeight - - // manually read margins because getBoundingClientRect includes difference - var marginTop = parseInt($tip.css('margin-top'), 10) - var marginLeft = parseInt($tip.css('margin-left'), 10) - - // we must check for NaN for ie 8/9 - if (isNaN(marginTop)) marginTop = 0 - if (isNaN(marginLeft)) marginLeft = 0 - - offset.top += marginTop - offset.left += marginLeft - - // $.fn.offset doesn't round pixel values - // so we use setOffset directly with our own function B-0 - $.offset.setOffset($tip[0], $.extend({ - using: function (props) { - $tip.css({ - top: Math.round(props.top), - left: Math.round(props.left) - }) - } - }, offset), 0) - - $tip.addClass('in') - - // check to see if placing tip in new offset caused the tip to resize itself - var actualWidth = $tip[0].offsetWidth - var actualHeight = $tip[0].offsetHeight - - if (placement == 'top' && actualHeight != height) { - offset.top = offset.top + height - actualHeight - } - - var delta = this.getViewportAdjustedDelta(placement, offset, actualWidth, actualHeight) - - if (delta.left) offset.left += delta.left - else offset.top += delta.top - - var isVertical = /top|bottom/.test(placement) - var arrowDelta = isVertical ? delta.left * 2 - width + actualWidth : delta.top * 2 - height + actualHeight - var arrowOffsetPosition = isVertical ? 'offsetWidth' : 'offsetHeight' - - $tip.offset(offset) - this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], isVertical) - } - - Tooltip.prototype.replaceArrow = function (delta, dimension, isVertical) { - this.arrow() - .css(isVertical ? 'left' : 'top', 50 * (1 - delta / dimension) + '%') - .css(isVertical ? 'top' : 'left', '') - } - - Tooltip.prototype.setContent = function () { - var $tip = this.tip() - var title = this.getTitle() - - $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) - $tip.removeClass('fade in top bottom left right') - } - - Tooltip.prototype.hide = function (callback) { - var that = this - var $tip = $(this.$tip) - var e = $.Event('hide.bs.' + this.type) - - function complete() { - if (that.hoverState != 'in') $tip.detach() - if (that.$element) { // TODO: Check whether guarding this code with this `if` is really necessary. - that.$element - .removeAttr('aria-describedby') - .trigger('hidden.bs.' + that.type) - } - callback && callback() - } - - this.$element.trigger(e) - - if (e.isDefaultPrevented()) return - - $tip.removeClass('in') - - $.support.transition && $tip.hasClass('fade') ? - $tip - .one('bsTransitionEnd', complete) - .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) : - complete() - - this.hoverState = null - - return this - } - - Tooltip.prototype.fixTitle = function () { - var $e = this.$element - if ($e.attr('title') || typeof $e.attr('data-original-title') != 'string') { - $e.attr('data-original-title', $e.attr('title') || '').attr('title', '') - } - } - - Tooltip.prototype.hasContent = function () { - return this.getTitle() - } - - Tooltip.prototype.getPosition = function ($element) { - $element = $element || this.$element - - var el = $element[0] - var isBody = el.tagName == 'BODY' - - var elRect = el.getBoundingClientRect() - if (elRect.width == null) { - // width and height are missing in IE8, so compute them manually; see https://github.com/twbs/bootstrap/issues/14093 - elRect = $.extend({}, elRect, { width: elRect.right - elRect.left, height: elRect.bottom - elRect.top }) - } - var isSvg = window.SVGElement && el instanceof window.SVGElement - // Avoid using $.offset() on SVGs since it gives incorrect results in jQuery 3. - // See https://github.com/twbs/bootstrap/issues/20280 - var elOffset = isBody ? { top: 0, left: 0 } : (isSvg ? null : $element.offset()) - var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() } - var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null - - return $.extend({}, elRect, scroll, outerDims, elOffset) - } - - Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) { - return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : - placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : - placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } : - /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } - - } - - Tooltip.prototype.getViewportAdjustedDelta = function (placement, pos, actualWidth, actualHeight) { - var delta = { top: 0, left: 0 } - if (!this.$viewport) return delta - - var viewportPadding = this.options.viewport && this.options.viewport.padding || 0 - var viewportDimensions = this.getPosition(this.$viewport) - - if (/right|left/.test(placement)) { - var topEdgeOffset = pos.top - viewportPadding - viewportDimensions.scroll - var bottomEdgeOffset = pos.top + viewportPadding - viewportDimensions.scroll + actualHeight - if (topEdgeOffset < viewportDimensions.top) { // top overflow - delta.top = viewportDimensions.top - topEdgeOffset - } else if (bottomEdgeOffset > viewportDimensions.top + viewportDimensions.height) { // bottom overflow - delta.top = viewportDimensions.top + viewportDimensions.height - bottomEdgeOffset - } - } else { - var leftEdgeOffset = pos.left - viewportPadding - var rightEdgeOffset = pos.left + viewportPadding + actualWidth - if (leftEdgeOffset < viewportDimensions.left) { // left overflow - delta.left = viewportDimensions.left - leftEdgeOffset - } else if (rightEdgeOffset > viewportDimensions.right) { // right overflow - delta.left = viewportDimensions.left + viewportDimensions.width - rightEdgeOffset - } - } - - return delta - } - - Tooltip.prototype.getTitle = function () { - var title - var $e = this.$element - var o = this.options - - title = $e.attr('data-original-title') - || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) - - return title - } - - Tooltip.prototype.getUID = function (prefix) { - do prefix += ~~(Math.random() * 1000000) - while (document.getElementById(prefix)) - return prefix - } - - Tooltip.prototype.tip = function () { - if (!this.$tip) { - this.$tip = $(this.options.template) - if (this.$tip.length != 1) { - throw new Error(this.type + ' `template` option must consist of exactly 1 top-level element!') - } - } - return this.$tip - } - - Tooltip.prototype.arrow = function () { - return (this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow')) - } - - Tooltip.prototype.enable = function () { - this.enabled = true - } - - Tooltip.prototype.disable = function () { - this.enabled = false - } - - Tooltip.prototype.toggleEnabled = function () { - this.enabled = !this.enabled - } - - Tooltip.prototype.toggle = function (e) { - var self = this - if (e) { - self = $(e.currentTarget).data('bs.' + this.type) - if (!self) { - self = new this.constructor(e.currentTarget, this.getDelegateOptions()) - $(e.currentTarget).data('bs.' + this.type, self) - } - } - - if (e) { - self.inState.click = !self.inState.click - if (self.isInStateTrue()) self.enter(self) - else self.leave(self) - } else { - self.tip().hasClass('in') ? self.leave(self) : self.enter(self) - } - } - - Tooltip.prototype.destroy = function () { - var that = this - clearTimeout(this.timeout) - this.hide(function () { - that.$element.off('.' + that.type).removeData('bs.' + that.type) - if (that.$tip) { - that.$tip.detach() - } - that.$tip = null - that.$arrow = null - that.$viewport = null - that.$element = null - }) - } - - - // TOOLTIP PLUGIN DEFINITION - // ========================= - - function Plugin(option) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.tooltip') - var options = typeof option == 'object' && option - - if (!data && /destroy|hide/.test(option)) return - if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - var old = $.fn.tooltip - - $.fn.tooltip = Plugin - $.fn.tooltip.Constructor = Tooltip - - - // TOOLTIP NO CONFLICT - // =================== - - $.fn.tooltip.noConflict = function () { - $.fn.tooltip = old - return this - } - - }(jQuery); - - /* ======================================================================== - * Bootstrap: popover.js v3.3.7 - * http://getbootstrap.com/javascript/#popovers - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - - +function ($) { - 'use strict'; - - // POPOVER PUBLIC CLASS DEFINITION - // =============================== - - var Popover = function (element, options) { - this.init('popover', element, options) - } - - if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') - - Popover.VERSION = '3.3.7' - - Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, { - placement: 'right', - trigger: 'click', - content: '', - template: '' - }) - - - // NOTE: POPOVER EXTENDS tooltip.js - // ================================ - - Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype) - - Popover.prototype.constructor = Popover - - Popover.prototype.getDefaults = function () { - return Popover.DEFAULTS - } - - Popover.prototype.setContent = function () { - var $tip = this.tip() - var title = this.getTitle() - var content = this.getContent() - - $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) - $tip.find('.popover-content').children().detach().end()[ // we use append for html objects to maintain js events - this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text' - ](content) - - $tip.removeClass('fade top bottom left right in') - - // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do - // this manually by checking the contents. - if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide() - } - - Popover.prototype.hasContent = function () { - return this.getTitle() || this.getContent() - } - - Popover.prototype.getContent = function () { - var $e = this.$element - var o = this.options - - return $e.attr('data-content') - || (typeof o.content == 'function' ? - o.content.call($e[0]) : - o.content) - } - - Popover.prototype.arrow = function () { - return (this.$arrow = this.$arrow || this.tip().find('.arrow')) - } - - - // POPOVER PLUGIN DEFINITION - // ========================= - - function Plugin(option) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.popover') - var options = typeof option == 'object' && option - - if (!data && /destroy|hide/.test(option)) return - if (!data) $this.data('bs.popover', (data = new Popover(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - var old = $.fn.popover - - $.fn.popover = Plugin - $.fn.popover.Constructor = Popover - - - // POPOVER NO CONFLICT - // =================== - - $.fn.popover.noConflict = function () { - $.fn.popover = old - return this - } - - }(jQuery); - - /* ======================================================================== - * Bootstrap: scrollspy.js v3.3.7 - * http://getbootstrap.com/javascript/#scrollspy - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - - +function ($) { - 'use strict'; - - // SCROLLSPY CLASS DEFINITION - // ========================== - - function ScrollSpy(element, options) { - this.$body = $(document.body) - this.$scrollElement = $(element).is(document.body) ? $(window) : $(element) - this.options = $.extend({}, ScrollSpy.DEFAULTS, options) - this.selector = (this.options.target || '') + ' .nav li > a' - this.offsets = [] - this.targets = [] - this.activeTarget = null - this.scrollHeight = 0 - - this.$scrollElement.on('scroll.bs.scrollspy', $.proxy(this.process, this)) - this.refresh() - this.process() - } - - ScrollSpy.VERSION = '3.3.7' - - ScrollSpy.DEFAULTS = { - offset: 10 - } - - ScrollSpy.prototype.getScrollHeight = function () { - return this.$scrollElement[0].scrollHeight || Math.max(this.$body[0].scrollHeight, document.documentElement.scrollHeight) - } - - ScrollSpy.prototype.refresh = function () { - var that = this - var offsetMethod = 'offset' - var offsetBase = 0 - - this.offsets = [] - this.targets = [] - this.scrollHeight = this.getScrollHeight() - - if (!$.isWindow(this.$scrollElement[0])) { - offsetMethod = 'position' - offsetBase = this.$scrollElement.scrollTop() - } - - this.$body - .find(this.selector) - .map(function () { - var $el = $(this) - var href = $el.data('target') || $el.attr('href') - var $href = /^#./.test(href) && $(href) - - return ($href - && $href.length - && $href.is(':visible') - && [[$href[offsetMethod]().top + offsetBase, href]]) || null - }) - .sort(function (a, b) { return a[0] - b[0] }) - .each(function () { - that.offsets.push(this[0]) - that.targets.push(this[1]) - }) - } - - ScrollSpy.prototype.process = function () { - var scrollTop = this.$scrollElement.scrollTop() + this.options.offset - var scrollHeight = this.getScrollHeight() - var maxScroll = this.options.offset + scrollHeight - this.$scrollElement.height() - var offsets = this.offsets - var targets = this.targets - var activeTarget = this.activeTarget - var i - - if (this.scrollHeight != scrollHeight) { - this.refresh() - } - - if (scrollTop >= maxScroll) { - return activeTarget != (i = targets[targets.length - 1]) && this.activate(i) - } - - if (activeTarget && scrollTop < offsets[0]) { - this.activeTarget = null - return this.clear() - } - - for (i = offsets.length; i--;) { - activeTarget != targets[i] - && scrollTop >= offsets[i] - && (offsets[i + 1] === undefined || scrollTop < offsets[i + 1]) - && this.activate(targets[i]) - } - } - - ScrollSpy.prototype.activate = function (target) { - this.activeTarget = target - - this.clear() - - var selector = this.selector + - '[data-target="' + target + '"],' + - this.selector + '[href="' + target + '"]' - - var active = $(selector) - .parents('li') - .addClass('active') - - if (active.parent('.dropdown-menu').length) { - active = active - .closest('li.dropdown') - .addClass('active') - } - - active.trigger('activate.bs.scrollspy') - } - - ScrollSpy.prototype.clear = function () { - $(this.selector) - .parentsUntil(this.options.target, '.active') - .removeClass('active') - } - - - // SCROLLSPY PLUGIN DEFINITION - // =========================== - - function Plugin(option) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.scrollspy') - var options = typeof option == 'object' && option - - if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - var old = $.fn.scrollspy - - $.fn.scrollspy = Plugin - $.fn.scrollspy.Constructor = ScrollSpy - - - // SCROLLSPY NO CONFLICT - // ===================== - - $.fn.scrollspy.noConflict = function () { - $.fn.scrollspy = old - return this - } - - - // SCROLLSPY DATA-API - // ================== - - $(window).on('load.bs.scrollspy.data-api', function () { - $('[data-spy="scroll"]').each(function () { - var $spy = $(this) - Plugin.call($spy, $spy.data()) - }) - }) - - }(jQuery); - - /* ======================================================================== - * Bootstrap: tab.js v3.3.7 - * http://getbootstrap.com/javascript/#tabs - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - - +function ($) { - 'use strict'; - - // TAB CLASS DEFINITION - // ==================== - - var Tab = function (element) { - // jscs:disable requireDollarBeforejQueryAssignment - this.element = $(element) - // jscs:enable requireDollarBeforejQueryAssignment - } - - Tab.VERSION = '3.3.7' - - Tab.TRANSITION_DURATION = 150 - - Tab.prototype.show = function () { - var $this = this.element - var $ul = $this.closest('ul:not(.dropdown-menu)') - var selector = $this.data('target') - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 - } - - if ($this.parent('li').hasClass('active')) return - - var $previous = $ul.find('.active:last a') - var hideEvent = $.Event('hide.bs.tab', { - relatedTarget: $this[0] - }) - var showEvent = $.Event('show.bs.tab', { - relatedTarget: $previous[0] - }) - - $previous.trigger(hideEvent) - $this.trigger(showEvent) - - if (showEvent.isDefaultPrevented() || hideEvent.isDefaultPrevented()) return - - var $target = $(selector) - - this.activate($this.closest('li'), $ul) - this.activate($target, $target.parent(), function () { - $previous.trigger({ - type: 'hidden.bs.tab', - relatedTarget: $this[0] - }) - $this.trigger({ - type: 'shown.bs.tab', - relatedTarget: $previous[0] - }) - }) - } - - Tab.prototype.activate = function (element, container, callback) { - var $active = container.find('> .active') - var transition = callback - && $.support.transition - && ($active.length && $active.hasClass('fade') || !!container.find('> .fade').length) - - function next() { - $active - .removeClass('active') - .find('> .dropdown-menu > .active') - .removeClass('active') - .end() - .find('[data-toggle="tab"]') - .attr('aria-expanded', false) - - element - .addClass('active') - .find('[data-toggle="tab"]') - .attr('aria-expanded', true) - - if (transition) { - element[0].offsetWidth // reflow for transition - element.addClass('in') - } else { - element.removeClass('fade') - } - - if (element.parent('.dropdown-menu').length) { - element - .closest('li.dropdown') - .addClass('active') - .end() - .find('[data-toggle="tab"]') - .attr('aria-expanded', true) - } - - callback && callback() - } - - $active.length && transition ? - $active - .one('bsTransitionEnd', next) - .emulateTransitionEnd(Tab.TRANSITION_DURATION) : - next() - - $active.removeClass('in') - } - - - // TAB PLUGIN DEFINITION - // ===================== - - function Plugin(option) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.tab') - - if (!data) $this.data('bs.tab', (data = new Tab(this))) - if (typeof option == 'string') data[option]() - }) - } - - var old = $.fn.tab - - $.fn.tab = Plugin - $.fn.tab.Constructor = Tab - - - // TAB NO CONFLICT - // =============== - - $.fn.tab.noConflict = function () { - $.fn.tab = old - return this - } - - - // TAB DATA-API - // ============ - - var clickHandler = function (e) { - e.preventDefault() - Plugin.call($(this), 'show') - } - - $(document) - .on('click.bs.tab.data-api', '[data-toggle="tab"]', clickHandler) - .on('click.bs.tab.data-api', '[data-toggle="pill"]', clickHandler) - - }(jQuery); - - /* ======================================================================== - * Bootstrap: affix.js v3.3.7 - * http://getbootstrap.com/javascript/#affix - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - - +function ($) { - 'use strict'; - - // AFFIX CLASS DEFINITION - // ====================== - - var Affix = function (element, options) { - this.options = $.extend({}, Affix.DEFAULTS, options) - - this.$target = $(this.options.target) - .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this)) - .on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this)) - - this.$element = $(element) - this.affixed = null - this.unpin = null - this.pinnedOffset = null - - this.checkPosition() - } - - Affix.VERSION = '3.3.7' - - Affix.RESET = 'affix affix-top affix-bottom' - - Affix.DEFAULTS = { - offset: 0, - target: window - } - - Affix.prototype.getState = function (scrollHeight, height, offsetTop, offsetBottom) { - var scrollTop = this.$target.scrollTop() - var position = this.$element.offset() - var targetHeight = this.$target.height() - - if (offsetTop != null && this.affixed == 'top') return scrollTop < offsetTop ? 'top' : false - - if (this.affixed == 'bottom') { - if (offsetTop != null) return (scrollTop + this.unpin <= position.top) ? false : 'bottom' - return (scrollTop + targetHeight <= scrollHeight - offsetBottom) ? false : 'bottom' - } - - var initializing = this.affixed == null - var colliderTop = initializing ? scrollTop : position.top - var colliderHeight = initializing ? targetHeight : height - - if (offsetTop != null && scrollTop <= offsetTop) return 'top' - if (offsetBottom != null && (colliderTop + colliderHeight >= scrollHeight - offsetBottom)) return 'bottom' - - return false - } - - Affix.prototype.getPinnedOffset = function () { - if (this.pinnedOffset) return this.pinnedOffset - this.$element.removeClass(Affix.RESET).addClass('affix') - var scrollTop = this.$target.scrollTop() - var position = this.$element.offset() - return (this.pinnedOffset = position.top - scrollTop) - } - - Affix.prototype.checkPositionWithEventLoop = function () { - setTimeout($.proxy(this.checkPosition, this), 1) - } - - Affix.prototype.checkPosition = function () { - if (!this.$element.is(':visible')) return - - var height = this.$element.height() - var offset = this.options.offset - var offsetTop = offset.top - var offsetBottom = offset.bottom - var scrollHeight = Math.max($(document).height(), $(document.body).height()) - - if (typeof offset != 'object') offsetBottom = offsetTop = offset - if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element) - if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element) - - var affix = this.getState(scrollHeight, height, offsetTop, offsetBottom) - - if (this.affixed != affix) { - if (this.unpin != null) this.$element.css('top', '') - - var affixType = 'affix' + (affix ? '-' + affix : '') - var e = $.Event(affixType + '.bs.affix') - - this.$element.trigger(e) - - if (e.isDefaultPrevented()) return - - this.affixed = affix - this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null - - this.$element - .removeClass(Affix.RESET) - .addClass(affixType) - .trigger(affixType.replace('affix', 'affixed') + '.bs.affix') - } - - if (affix == 'bottom') { - this.$element.offset({ - top: scrollHeight - height - offsetBottom - }) - } - } - - - // AFFIX PLUGIN DEFINITION - // ======================= - - function Plugin(option) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.affix') - var options = typeof option == 'object' && option - - if (!data) $this.data('bs.affix', (data = new Affix(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - var old = $.fn.affix - - $.fn.affix = Plugin - $.fn.affix.Constructor = Affix - - - // AFFIX NO CONFLICT - // ================= - - $.fn.affix.noConflict = function () { - $.fn.affix = old - return this - } - - - // AFFIX DATA-API - // ============== - - $(window).on('load', function () { - $('[data-spy="affix"]').each(function () { - var $spy = $(this) - var data = $spy.data() - - data.offset = data.offset || {} - - if (data.offsetBottom != null) data.offset.bottom = data.offsetBottom - if (data.offsetTop != null) data.offset.top = data.offsetTop - - Plugin.call($spy, data) - }) - }) - - }(jQuery); -}); diff --git a/src/Surging.ApiGateway/wwwroot/assets/js/base/bootstrap.min.js b/src/Surging.ApiGateway/wwwroot/assets/js/base/bootstrap.min.js deleted file mode 100644 index 3c6809b16..000000000 --- a/src/Surging.ApiGateway/wwwroot/assets/js/base/bootstrap.min.js +++ /dev/null @@ -1,12 +0,0 @@ -define(function (require, exports, module) { - /*! - * Bootstrap v3.3.7 (http://getbootstrap.com) - * Copyright 2011-2016 Twitter, Inc. - * Licensed under the MIT license - */ - if ("undefined" == typeof jQuery) throw new Error("Bootstrap's JavaScript requires jQuery"); +function (a) { "use strict"; var b = a.fn.jquery.split(" ")[0].split("."); if (b[0] < 2 && b[1] < 9 || 1 == b[0] && 9 == b[1] && b[2] < 1 || b[0] > 3) throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4") }(jQuery), +function (a) { "use strict"; function b() { var a = document.createElement("bootstrap"), b = { WebkitTransition: "webkitTransitionEnd", MozTransition: "transitionend", OTransition: "oTransitionEnd otransitionend", transition: "transitionend" }; for (var c in b) if (void 0 !== a.style[c]) return { end: b[c] }; return !1 } a.fn.emulateTransitionEnd = function (b) { var c = !1, d = this; a(this).one("bsTransitionEnd", function () { c = !0 }); var e = function () { c || a(d).trigger(a.support.transition.end) }; return setTimeout(e, b), this }, a(function () { a.support.transition = b(), a.support.transition && (a.event.special.bsTransitionEnd = { bindType: a.support.transition.end, delegateType: a.support.transition.end, handle: function (b) { if (a(b.target).is(this)) return b.handleObj.handler.apply(this, arguments) } }) }) }(jQuery), +function (a) { "use strict"; function b(b) { return this.each(function () { var c = a(this), e = c.data("bs.alert"); e || c.data("bs.alert", e = new d(this)), "string" == typeof b && e[b].call(c) }) } var c = '[data-dismiss="alert"]', d = function (b) { a(b).on("click", c, this.close) }; d.VERSION = "3.3.7", d.TRANSITION_DURATION = 150, d.prototype.close = function (b) { function c() { g.detach().trigger("closed.bs.alert").remove() } var e = a(this), f = e.attr("data-target"); f || (f = e.attr("href"), f = f && f.replace(/.*(?=#[^\s]*$)/, "")); var g = a("#" === f ? [] : f); b && b.preventDefault(), g.length || (g = e.closest(".alert")), g.trigger(b = a.Event("close.bs.alert")), b.isDefaultPrevented() || (g.removeClass("in"), a.support.transition && g.hasClass("fade") ? g.one("bsTransitionEnd", c).emulateTransitionEnd(d.TRANSITION_DURATION) : c()) }; var e = a.fn.alert; a.fn.alert = b, a.fn.alert.Constructor = d, a.fn.alert.noConflict = function () { return a.fn.alert = e, this }, a(document).on("click.bs.alert.data-api", c, d.prototype.close) }(jQuery), +function (a) { "use strict"; function b(b) { return this.each(function () { var d = a(this), e = d.data("bs.button"), f = "object" == typeof b && b; e || d.data("bs.button", e = new c(this, f)), "toggle" == b ? e.toggle() : b && e.setState(b) }) } var c = function (b, d) { this.$element = a(b), this.options = a.extend({}, c.DEFAULTS, d), this.isLoading = !1 }; c.VERSION = "3.3.7", c.DEFAULTS = { loadingText: "loading..." }, c.prototype.setState = function (b) { var c = "disabled", d = this.$element, e = d.is("input") ? "val" : "html", f = d.data(); b += "Text", null == f.resetText && d.data("resetText", d[e]()), setTimeout(a.proxy(function () { d[e](null == f[b] ? this.options[b] : f[b]), "loadingText" == b ? (this.isLoading = !0, d.addClass(c).attr(c, c).prop(c, !0)) : this.isLoading && (this.isLoading = !1, d.removeClass(c).removeAttr(c).prop(c, !1)) }, this), 0) }, c.prototype.toggle = function () { var a = !0, b = this.$element.closest('[data-toggle="buttons"]'); if (b.length) { var c = this.$element.find("input"); "radio" == c.prop("type") ? (c.prop("checked") && (a = !1), b.find(".active").removeClass("active"), this.$element.addClass("active")) : "checkbox" == c.prop("type") && (c.prop("checked") !== this.$element.hasClass("active") && (a = !1), this.$element.toggleClass("active")), c.prop("checked", this.$element.hasClass("active")), a && c.trigger("change") } else this.$element.attr("aria-pressed", !this.$element.hasClass("active")), this.$element.toggleClass("active") }; var d = a.fn.button; a.fn.button = b, a.fn.button.Constructor = c, a.fn.button.noConflict = function () { return a.fn.button = d, this }, a(document).on("click.bs.button.data-api", '[data-toggle^="button"]', function (c) { var d = a(c.target).closest(".btn"); b.call(d, "toggle"), a(c.target).is('input[type="radio"], input[type="checkbox"]') || (c.preventDefault(), d.is("input,button") ? d.trigger("focus") : d.find("input:visible,button:visible").first().trigger("focus")) }).on("focus.bs.button.data-api blur.bs.button.data-api", '[data-toggle^="button"]', function (b) { a(b.target).closest(".btn").toggleClass("focus", /^focus(in)?$/.test(b.type)) }) }(jQuery), +function (a) { "use strict"; function b(b) { return this.each(function () { var d = a(this), e = d.data("bs.carousel"), f = a.extend({}, c.DEFAULTS, d.data(), "object" == typeof b && b), g = "string" == typeof b ? b : f.slide; e || d.data("bs.carousel", e = new c(this, f)), "number" == typeof b ? e.to(b) : g ? e[g]() : f.interval && e.pause().cycle() }) } var c = function (b, c) { this.$element = a(b), this.$indicators = this.$element.find(".carousel-indicators"), this.options = c, this.paused = null, this.sliding = null, this.interval = null, this.$active = null, this.$items = null, this.options.keyboard && this.$element.on("keydown.bs.carousel", a.proxy(this.keydown, this)), "hover" == this.options.pause && !("ontouchstart" in document.documentElement) && this.$element.on("mouseenter.bs.carousel", a.proxy(this.pause, this)).on("mouseleave.bs.carousel", a.proxy(this.cycle, this)) }; c.VERSION = "3.3.7", c.TRANSITION_DURATION = 600, c.DEFAULTS = { interval: 5e3, pause: "hover", wrap: !0, keyboard: !0 }, c.prototype.keydown = function (a) { if (!/input|textarea/i.test(a.target.tagName)) { switch (a.which) { case 37: this.prev(); break; case 39: this.next(); break; default: return }a.preventDefault() } }, c.prototype.cycle = function (b) { return b || (this.paused = !1), this.interval && clearInterval(this.interval), this.options.interval && !this.paused && (this.interval = setInterval(a.proxy(this.next, this), this.options.interval)), this }, c.prototype.getItemIndex = function (a) { return this.$items = a.parent().children(".item"), this.$items.index(a || this.$active) }, c.prototype.getItemForDirection = function (a, b) { var c = this.getItemIndex(b), d = "prev" == a && 0 === c || "next" == a && c == this.$items.length - 1; if (d && !this.options.wrap) return b; var e = "prev" == a ? -1 : 1, f = (c + e) % this.$items.length; return this.$items.eq(f) }, c.prototype.to = function (a) { var b = this, c = this.getItemIndex(this.$active = this.$element.find(".item.active")); if (!(a > this.$items.length - 1 || a < 0)) return this.sliding ? this.$element.one("slid.bs.carousel", function () { b.to(a) }) : c == a ? this.pause().cycle() : this.slide(a > c ? "next" : "prev", this.$items.eq(a)) }, c.prototype.pause = function (b) { return b || (this.paused = !0), this.$element.find(".next, .prev").length && a.support.transition && (this.$element.trigger(a.support.transition.end), this.cycle(!0)), this.interval = clearInterval(this.interval), this }, c.prototype.next = function () { if (!this.sliding) return this.slide("next") }, c.prototype.prev = function () { if (!this.sliding) return this.slide("prev") }, c.prototype.slide = function (b, d) { var e = this.$element.find(".item.active"), f = d || this.getItemForDirection(b, e), g = this.interval, h = "next" == b ? "left" : "right", i = this; if (f.hasClass("active")) return this.sliding = !1; var j = f[0], k = a.Event("slide.bs.carousel", { relatedTarget: j, direction: h }); if (this.$element.trigger(k), !k.isDefaultPrevented()) { if (this.sliding = !0, g && this.pause(), this.$indicators.length) { this.$indicators.find(".active").removeClass("active"); var l = a(this.$indicators.children()[this.getItemIndex(f)]); l && l.addClass("active") } var m = a.Event("slid.bs.carousel", { relatedTarget: j, direction: h }); return a.support.transition && this.$element.hasClass("slide") ? (f.addClass(b), f[0].offsetWidth, e.addClass(h), f.addClass(h), e.one("bsTransitionEnd", function () { f.removeClass([b, h].join(" ")).addClass("active"), e.removeClass(["active", h].join(" ")), i.sliding = !1, setTimeout(function () { i.$element.trigger(m) }, 0) }).emulateTransitionEnd(c.TRANSITION_DURATION)) : (e.removeClass("active"), f.addClass("active"), this.sliding = !1, this.$element.trigger(m)), g && this.cycle(), this } }; var d = a.fn.carousel; a.fn.carousel = b, a.fn.carousel.Constructor = c, a.fn.carousel.noConflict = function () { return a.fn.carousel = d, this }; var e = function (c) { var d, e = a(this), f = a(e.attr("data-target") || (d = e.attr("href")) && d.replace(/.*(?=#[^\s]+$)/, "")); if (f.hasClass("carousel")) { var g = a.extend({}, f.data(), e.data()), h = e.attr("data-slide-to"); h && (g.interval = !1), b.call(f, g), h && f.data("bs.carousel").to(h), c.preventDefault() } }; a(document).on("click.bs.carousel.data-api", "[data-slide]", e).on("click.bs.carousel.data-api", "[data-slide-to]", e), a(window).on("load", function () { a('[data-ride="carousel"]').each(function () { var c = a(this); b.call(c, c.data()) }) }) }(jQuery), +function (a) { "use strict"; function b(b) { var c, d = b.attr("data-target") || (c = b.attr("href")) && c.replace(/.*(?=#[^\s]+$)/, ""); return a(d) } function c(b) { return this.each(function () { var c = a(this), e = c.data("bs.collapse"), f = a.extend({}, d.DEFAULTS, c.data(), "object" == typeof b && b); !e && f.toggle && /show|hide/.test(b) && (f.toggle = !1), e || c.data("bs.collapse", e = new d(this, f)), "string" == typeof b && e[b]() }) } var d = function (b, c) { this.$element = a(b), this.options = a.extend({}, d.DEFAULTS, c), this.$trigger = a('[data-toggle="collapse"][href="#' + b.id + '"],[data-toggle="collapse"][data-target="#' + b.id + '"]'), this.transitioning = null, this.options.parent ? this.$parent = this.getParent() : this.addAriaAndCollapsedClass(this.$element, this.$trigger), this.options.toggle && this.toggle() }; d.VERSION = "3.3.7", d.TRANSITION_DURATION = 350, d.DEFAULTS = { toggle: !0 }, d.prototype.dimension = function () { var a = this.$element.hasClass("width"); return a ? "width" : "height" }, d.prototype.show = function () { if (!this.transitioning && !this.$element.hasClass("in")) { var b, e = this.$parent && this.$parent.children(".panel").children(".in, .collapsing"); if (!(e && e.length && (b = e.data("bs.collapse"), b && b.transitioning))) { var f = a.Event("show.bs.collapse"); if (this.$element.trigger(f), !f.isDefaultPrevented()) { e && e.length && (c.call(e, "hide"), b || e.data("bs.collapse", null)); var g = this.dimension(); this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded", !0), this.$trigger.removeClass("collapsed").attr("aria-expanded", !0), this.transitioning = 1; var h = function () { this.$element.removeClass("collapsing").addClass("collapse in")[g](""), this.transitioning = 0, this.$element.trigger("shown.bs.collapse") }; if (!a.support.transition) return h.call(this); var i = a.camelCase(["scroll", g].join("-")); this.$element.one("bsTransitionEnd", a.proxy(h, this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i]) } } } }, d.prototype.hide = function () { if (!this.transitioning && this.$element.hasClass("in")) { var b = a.Event("hide.bs.collapse"); if (this.$element.trigger(b), !b.isDefaultPrevented()) { var c = this.dimension(); this.$element[c](this.$element[c]())[0].offsetHeight, this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded", !1), this.$trigger.addClass("collapsed").attr("aria-expanded", !1), this.transitioning = 1; var e = function () { this.transitioning = 0, this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse") }; return a.support.transition ? void this.$element[c](0).one("bsTransitionEnd", a.proxy(e, this)).emulateTransitionEnd(d.TRANSITION_DURATION) : e.call(this) } } }, d.prototype.toggle = function () { this[this.$element.hasClass("in") ? "hide" : "show"]() }, d.prototype.getParent = function () { return a(this.options.parent).find('[data-toggle="collapse"][data-parent="' + this.options.parent + '"]').each(a.proxy(function (c, d) { var e = a(d); this.addAriaAndCollapsedClass(b(e), e) }, this)).end() }, d.prototype.addAriaAndCollapsedClass = function (a, b) { var c = a.hasClass("in"); a.attr("aria-expanded", c), b.toggleClass("collapsed", !c).attr("aria-expanded", c) }; var e = a.fn.collapse; a.fn.collapse = c, a.fn.collapse.Constructor = d, a.fn.collapse.noConflict = function () { return a.fn.collapse = e, this }, a(document).on("click.bs.collapse.data-api", '[data-toggle="collapse"]', function (d) { var e = a(this); e.attr("data-target") || d.preventDefault(); var f = b(e), g = f.data("bs.collapse"), h = g ? "toggle" : e.data(); c.call(f, h) }) }(jQuery), +function (a) { "use strict"; function b(b) { var c = b.attr("data-target"); c || (c = b.attr("href"), c = c && /#[A-Za-z]/.test(c) && c.replace(/.*(?=#[^\s]*$)/, "")); var d = c && a(c); return d && d.length ? d : b.parent() } function c(c) { c && 3 === c.which || (a(e).remove(), a(f).each(function () { var d = a(this), e = b(d), f = { relatedTarget: this }; e.hasClass("open") && (c && "click" == c.type && /input|textarea/i.test(c.target.tagName) && a.contains(e[0], c.target) || (e.trigger(c = a.Event("hide.bs.dropdown", f)), c.isDefaultPrevented() || (d.attr("aria-expanded", "false"), e.removeClass("open").trigger(a.Event("hidden.bs.dropdown", f))))) })) } function d(b) { return this.each(function () { var c = a(this), d = c.data("bs.dropdown"); d || c.data("bs.dropdown", d = new g(this)), "string" == typeof b && d[b].call(c) }) } var e = ".dropdown-backdrop", f = '[data-toggle="dropdown"]', g = function (b) { a(b).on("click.bs.dropdown", this.toggle) }; g.VERSION = "3.3.7", g.prototype.toggle = function (d) { var e = a(this); if (!e.is(".disabled, :disabled")) { var f = b(e), g = f.hasClass("open"); if (c(), !g) { "ontouchstart" in document.documentElement && !f.closest(".navbar-nav").length && a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click", c); var h = { relatedTarget: this }; if (f.trigger(d = a.Event("show.bs.dropdown", h)), d.isDefaultPrevented()) return; e.trigger("focus").attr("aria-expanded", "true"), f.toggleClass("open").trigger(a.Event("shown.bs.dropdown", h)) } return !1 } }, g.prototype.keydown = function (c) { if (/(38|40|27|32)/.test(c.which) && !/input|textarea/i.test(c.target.tagName)) { var d = a(this); if (c.preventDefault(), c.stopPropagation(), !d.is(".disabled, :disabled")) { var e = b(d), g = e.hasClass("open"); if (!g && 27 != c.which || g && 27 == c.which) return 27 == c.which && e.find(f).trigger("focus"), d.trigger("click"); var h = " li:not(.disabled):visible a", i = e.find(".dropdown-menu" + h); if (i.length) { var j = i.index(c.target); 38 == c.which && j > 0 && j-- , 40 == c.which && j < i.length - 1 && j++ , ~j || (j = 0), i.eq(j).trigger("focus") } } } }; var h = a.fn.dropdown; a.fn.dropdown = d, a.fn.dropdown.Constructor = g, a.fn.dropdown.noConflict = function () { return a.fn.dropdown = h, this }, a(document).on("click.bs.dropdown.data-api", c).on("click.bs.dropdown.data-api", ".dropdown form", function (a) { a.stopPropagation() }).on("click.bs.dropdown.data-api", f, g.prototype.toggle).on("keydown.bs.dropdown.data-api", f, g.prototype.keydown).on("keydown.bs.dropdown.data-api", ".dropdown-menu", g.prototype.keydown) }(jQuery), +function (a) { "use strict"; function b(b, d) { return this.each(function () { var e = a(this), f = e.data("bs.modal"), g = a.extend({}, c.DEFAULTS, e.data(), "object" == typeof b && b); f || e.data("bs.modal", f = new c(this, g)), "string" == typeof b ? f[b](d) : g.show && f.show(d) }) } var c = function (b, c) { this.options = c, this.$body = a(document.body), this.$element = a(b), this.$dialog = this.$element.find(".modal-dialog"), this.$backdrop = null, this.isShown = null, this.originalBodyPad = null, this.scrollbarWidth = 0, this.ignoreBackdropClick = !1, this.options.remote && this.$element.find(".modal-content").load(this.options.remote, a.proxy(function () { this.$element.trigger("loaded.bs.modal") }, this)) }; c.VERSION = "3.3.7", c.TRANSITION_DURATION = 300, c.BACKDROP_TRANSITION_DURATION = 150, c.DEFAULTS = { backdrop: !0, keyboard: !0, show: !0 }, c.prototype.toggle = function (a) { return this.isShown ? this.hide() : this.show(a) }, c.prototype.show = function (b) { var d = this, e = a.Event("show.bs.modal", { relatedTarget: b }); this.$element.trigger(e), this.isShown || e.isDefaultPrevented() || (this.isShown = !0, this.checkScrollbar(), this.setScrollbar(), this.$body.addClass("modal-open"), this.escape(), this.resize(), this.$element.on("click.dismiss.bs.modal", '[data-dismiss="modal"]', a.proxy(this.hide, this)), this.$dialog.on("mousedown.dismiss.bs.modal", function () { d.$element.one("mouseup.dismiss.bs.modal", function (b) { a(b.target).is(d.$element) && (d.ignoreBackdropClick = !0) }) }), this.backdrop(function () { var e = a.support.transition && d.$element.hasClass("fade"); d.$element.parent().length || d.$element.appendTo(d.$body), d.$element.show().scrollTop(0), d.adjustDialog(), e && d.$element[0].offsetWidth, d.$element.addClass("in"), d.enforceFocus(); var f = a.Event("shown.bs.modal", { relatedTarget: b }); e ? d.$dialog.one("bsTransitionEnd", function () { d.$element.trigger("focus").trigger(f) }).emulateTransitionEnd(c.TRANSITION_DURATION) : d.$element.trigger("focus").trigger(f) })) }, c.prototype.hide = function (b) { b && b.preventDefault(), b = a.Event("hide.bs.modal"), this.$element.trigger(b), this.isShown && !b.isDefaultPrevented() && (this.isShown = !1, this.escape(), this.resize(), a(document).off("focusin.bs.modal"), this.$element.removeClass("in").off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"), this.$dialog.off("mousedown.dismiss.bs.modal"), a.support.transition && this.$element.hasClass("fade") ? this.$element.one("bsTransitionEnd", a.proxy(this.hideModal, this)).emulateTransitionEnd(c.TRANSITION_DURATION) : this.hideModal()) }, c.prototype.enforceFocus = function () { a(document).off("focusin.bs.modal").on("focusin.bs.modal", a.proxy(function (a) { document === a.target || this.$element[0] === a.target || this.$element.has(a.target).length || this.$element.trigger("focus") }, this)) }, c.prototype.escape = function () { this.isShown && this.options.keyboard ? this.$element.on("keydown.dismiss.bs.modal", a.proxy(function (a) { 27 == a.which && this.hide() }, this)) : this.isShown || this.$element.off("keydown.dismiss.bs.modal") }, c.prototype.resize = function () { this.isShown ? a(window).on("resize.bs.modal", a.proxy(this.handleUpdate, this)) : a(window).off("resize.bs.modal") }, c.prototype.hideModal = function () { var a = this; this.$element.hide(), this.backdrop(function () { a.$body.removeClass("modal-open"), a.resetAdjustments(), a.resetScrollbar(), a.$element.trigger("hidden.bs.modal") }) }, c.prototype.removeBackdrop = function () { this.$backdrop && this.$backdrop.remove(), this.$backdrop = null }, c.prototype.backdrop = function (b) { var d = this, e = this.$element.hasClass("fade") ? "fade" : ""; if (this.isShown && this.options.backdrop) { var f = a.support.transition && e; if (this.$backdrop = a(document.createElement("div")).addClass("modal-backdrop " + e).appendTo(this.$body), this.$element.on("click.dismiss.bs.modal", a.proxy(function (a) { return this.ignoreBackdropClick ? void (this.ignoreBackdropClick = !1) : void (a.target === a.currentTarget && ("static" == this.options.backdrop ? this.$element[0].focus() : this.hide())) }, this)), f && this.$backdrop[0].offsetWidth, this.$backdrop.addClass("in"), !b) return; f ? this.$backdrop.one("bsTransitionEnd", b).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION) : b() } else if (!this.isShown && this.$backdrop) { this.$backdrop.removeClass("in"); var g = function () { d.removeBackdrop(), b && b() }; a.support.transition && this.$element.hasClass("fade") ? this.$backdrop.one("bsTransitionEnd", g).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION) : g() } else b && b() }, c.prototype.handleUpdate = function () { this.adjustDialog() }, c.prototype.adjustDialog = function () { var a = this.$element[0].scrollHeight > document.documentElement.clientHeight; this.$element.css({ paddingLeft: !this.bodyIsOverflowing && a ? this.scrollbarWidth : "", paddingRight: this.bodyIsOverflowing && !a ? this.scrollbarWidth : "" }) }, c.prototype.resetAdjustments = function () { this.$element.css({ paddingLeft: "", paddingRight: "" }) }, c.prototype.checkScrollbar = function () { var a = window.innerWidth; if (!a) { var b = document.documentElement.getBoundingClientRect(); a = b.right - Math.abs(b.left) } this.bodyIsOverflowing = document.body.clientWidth < a, this.scrollbarWidth = this.measureScrollbar() }, c.prototype.setScrollbar = function () { var a = parseInt(this.$body.css("padding-right") || 0, 10); this.originalBodyPad = document.body.style.paddingRight || "", this.bodyIsOverflowing && this.$body.css("padding-right", a + this.scrollbarWidth) }, c.prototype.resetScrollbar = function () { this.$body.css("padding-right", this.originalBodyPad) }, c.prototype.measureScrollbar = function () { var a = document.createElement("div"); a.className = "modal-scrollbar-measure", this.$body.append(a); var b = a.offsetWidth - a.clientWidth; return this.$body[0].removeChild(a), b }; var d = a.fn.modal; a.fn.modal = b, a.fn.modal.Constructor = c, a.fn.modal.noConflict = function () { return a.fn.modal = d, this }, a(document).on("click.bs.modal.data-api", '[data-toggle="modal"]', function (c) { var d = a(this), e = d.attr("href"), f = a(d.attr("data-target") || e && e.replace(/.*(?=#[^\s]+$)/, "")), g = f.data("bs.modal") ? "toggle" : a.extend({ remote: !/#/.test(e) && e }, f.data(), d.data()); d.is("a") && c.preventDefault(), f.one("show.bs.modal", function (a) { a.isDefaultPrevented() || f.one("hidden.bs.modal", function () { d.is(":visible") && d.trigger("focus") }) }), b.call(f, g, this) }) }(jQuery), +function (a) { "use strict"; function b(b) { return this.each(function () { var d = a(this), e = d.data("bs.tooltip"), f = "object" == typeof b && b; !e && /destroy|hide/.test(b) || (e || d.data("bs.tooltip", e = new c(this, f)), "string" == typeof b && e[b]()) }) } var c = function (a, b) { this.type = null, this.options = null, this.enabled = null, this.timeout = null, this.hoverState = null, this.$element = null, this.inState = null, this.init("tooltip", a, b) }; c.VERSION = "3.3.7", c.TRANSITION_DURATION = 150, c.DEFAULTS = { animation: !0, placement: "top", selector: !1, template: '', trigger: "hover focus", title: "", delay: 0, html: !1, container: !1, viewport: { selector: "body", padding: 0 } }, c.prototype.init = function (b, c, d) { if (this.enabled = !0, this.type = b, this.$element = a(c), this.options = this.getOptions(d), this.$viewport = this.options.viewport && a(a.isFunction(this.options.viewport) ? this.options.viewport.call(this, this.$element) : this.options.viewport.selector || this.options.viewport), this.inState = { click: !1, hover: !1, focus: !1 }, this.$element[0] instanceof document.constructor && !this.options.selector) throw new Error("`selector` option must be specified when initializing " + this.type + " on the window.document object!"); for (var e = this.options.trigger.split(" "), f = e.length; f--;) { var g = e[f]; if ("click" == g) this.$element.on("click." + this.type, this.options.selector, a.proxy(this.toggle, this)); else if ("manual" != g) { var h = "hover" == g ? "mouseenter" : "focusin", i = "hover" == g ? "mouseleave" : "focusout"; this.$element.on(h + "." + this.type, this.options.selector, a.proxy(this.enter, this)), this.$element.on(i + "." + this.type, this.options.selector, a.proxy(this.leave, this)) } } this.options.selector ? this._options = a.extend({}, this.options, { trigger: "manual", selector: "" }) : this.fixTitle() }, c.prototype.getDefaults = function () { return c.DEFAULTS }, c.prototype.getOptions = function (b) { return b = a.extend({}, this.getDefaults(), this.$element.data(), b), b.delay && "number" == typeof b.delay && (b.delay = { show: b.delay, hide: b.delay }), b }, c.prototype.getDelegateOptions = function () { var b = {}, c = this.getDefaults(); return this._options && a.each(this._options, function (a, d) { c[a] != d && (b[a] = d) }), b }, c.prototype.enter = function (b) { var c = b instanceof this.constructor ? b : a(b.currentTarget).data("bs." + this.type); return c || (c = new this.constructor(b.currentTarget, this.getDelegateOptions()), a(b.currentTarget).data("bs." + this.type, c)), b instanceof a.Event && (c.inState["focusin" == b.type ? "focus" : "hover"] = !0), c.tip().hasClass("in") || "in" == c.hoverState ? void (c.hoverState = "in") : (clearTimeout(c.timeout), c.hoverState = "in", c.options.delay && c.options.delay.show ? void (c.timeout = setTimeout(function () { "in" == c.hoverState && c.show() }, c.options.delay.show)) : c.show()) }, c.prototype.isInStateTrue = function () { for (var a in this.inState) if (this.inState[a]) return !0; return !1 }, c.prototype.leave = function (b) { var c = b instanceof this.constructor ? b : a(b.currentTarget).data("bs." + this.type); if (c || (c = new this.constructor(b.currentTarget, this.getDelegateOptions()), a(b.currentTarget).data("bs." + this.type, c)), b instanceof a.Event && (c.inState["focusout" == b.type ? "focus" : "hover"] = !1), !c.isInStateTrue()) return clearTimeout(c.timeout), c.hoverState = "out", c.options.delay && c.options.delay.hide ? void (c.timeout = setTimeout(function () { "out" == c.hoverState && c.hide() }, c.options.delay.hide)) : c.hide() }, c.prototype.show = function () { var b = a.Event("show.bs." + this.type); if (this.hasContent() && this.enabled) { this.$element.trigger(b); var d = a.contains(this.$element[0].ownerDocument.documentElement, this.$element[0]); if (b.isDefaultPrevented() || !d) return; var e = this, f = this.tip(), g = this.getUID(this.type); this.setContent(), f.attr("id", g), this.$element.attr("aria-describedby", g), this.options.animation && f.addClass("fade"); var h = "function" == typeof this.options.placement ? this.options.placement.call(this, f[0], this.$element[0]) : this.options.placement, i = /\s?auto?\s?/i, j = i.test(h); j && (h = h.replace(i, "") || "top"), f.detach().css({ top: 0, left: 0, display: "block" }).addClass(h).data("bs." + this.type, this), this.options.container ? f.appendTo(this.options.container) : f.insertAfter(this.$element), this.$element.trigger("inserted.bs." + this.type); var k = this.getPosition(), l = f[0].offsetWidth, m = f[0].offsetHeight; if (j) { var n = h, o = this.getPosition(this.$viewport); h = "bottom" == h && k.bottom + m > o.bottom ? "top" : "top" == h && k.top - m < o.top ? "bottom" : "right" == h && k.right + l > o.width ? "left" : "left" == h && k.left - l < o.left ? "right" : h, f.removeClass(n).addClass(h) } var p = this.getCalculatedOffset(h, k, l, m); this.applyPlacement(p, h); var q = function () { var a = e.hoverState; e.$element.trigger("shown.bs." + e.type), e.hoverState = null, "out" == a && e.leave(e) }; a.support.transition && this.$tip.hasClass("fade") ? f.one("bsTransitionEnd", q).emulateTransitionEnd(c.TRANSITION_DURATION) : q() } }, c.prototype.applyPlacement = function (b, c) { var d = this.tip(), e = d[0].offsetWidth, f = d[0].offsetHeight, g = parseInt(d.css("margin-top"), 10), h = parseInt(d.css("margin-left"), 10); isNaN(g) && (g = 0), isNaN(h) && (h = 0), b.top += g, b.left += h, a.offset.setOffset(d[0], a.extend({ using: function (a) { d.css({ top: Math.round(a.top), left: Math.round(a.left) }) } }, b), 0), d.addClass("in"); var i = d[0].offsetWidth, j = d[0].offsetHeight; "top" == c && j != f && (b.top = b.top + f - j); var k = this.getViewportAdjustedDelta(c, b, i, j); k.left ? b.left += k.left : b.top += k.top; var l = /top|bottom/.test(c), m = l ? 2 * k.left - e + i : 2 * k.top - f + j, n = l ? "offsetWidth" : "offsetHeight"; d.offset(b), this.replaceArrow(m, d[0][n], l) }, c.prototype.replaceArrow = function (a, b, c) { this.arrow().css(c ? "left" : "top", 50 * (1 - a / b) + "%").css(c ? "top" : "left", "") }, c.prototype.setContent = function () { var a = this.tip(), b = this.getTitle(); a.find(".tooltip-inner")[this.options.html ? "html" : "text"](b), a.removeClass("fade in top bottom left right") }, c.prototype.hide = function (b) { function d() { "in" != e.hoverState && f.detach(), e.$element && e.$element.removeAttr("aria-describedby").trigger("hidden.bs." + e.type), b && b() } var e = this, f = a(this.$tip), g = a.Event("hide.bs." + this.type); if (this.$element.trigger(g), !g.isDefaultPrevented()) return f.removeClass("in"), a.support.transition && f.hasClass("fade") ? f.one("bsTransitionEnd", d).emulateTransitionEnd(c.TRANSITION_DURATION) : d(), this.hoverState = null, this }, c.prototype.fixTitle = function () { var a = this.$element; (a.attr("title") || "string" != typeof a.attr("data-original-title")) && a.attr("data-original-title", a.attr("title") || "").attr("title", "") }, c.prototype.hasContent = function () { return this.getTitle() }, c.prototype.getPosition = function (b) { b = b || this.$element; var c = b[0], d = "BODY" == c.tagName, e = c.getBoundingClientRect(); null == e.width && (e = a.extend({}, e, { width: e.right - e.left, height: e.bottom - e.top })); var f = window.SVGElement && c instanceof window.SVGElement, g = d ? { top: 0, left: 0 } : f ? null : b.offset(), h = { scroll: d ? document.documentElement.scrollTop || document.body.scrollTop : b.scrollTop() }, i = d ? { width: a(window).width(), height: a(window).height() } : null; return a.extend({}, e, h, i, g) }, c.prototype.getCalculatedOffset = function (a, b, c, d) { return "bottom" == a ? { top: b.top + b.height, left: b.left + b.width / 2 - c / 2 } : "top" == a ? { top: b.top - d, left: b.left + b.width / 2 - c / 2 } : "left" == a ? { top: b.top + b.height / 2 - d / 2, left: b.left - c } : { top: b.top + b.height / 2 - d / 2, left: b.left + b.width } }, c.prototype.getViewportAdjustedDelta = function (a, b, c, d) { var e = { top: 0, left: 0 }; if (!this.$viewport) return e; var f = this.options.viewport && this.options.viewport.padding || 0, g = this.getPosition(this.$viewport); if (/right|left/.test(a)) { var h = b.top - f - g.scroll, i = b.top + f - g.scroll + d; h < g.top ? e.top = g.top - h : i > g.top + g.height && (e.top = g.top + g.height - i) } else { var j = b.left - f, k = b.left + f + c; j < g.left ? e.left = g.left - j : k > g.right && (e.left = g.left + g.width - k) } return e }, c.prototype.getTitle = function () { var a, b = this.$element, c = this.options; return a = b.attr("data-original-title") || ("function" == typeof c.title ? c.title.call(b[0]) : c.title) }, c.prototype.getUID = function (a) { do a += ~~(1e6 * Math.random()); while (document.getElementById(a)); return a }, c.prototype.tip = function () { if (!this.$tip && (this.$tip = a(this.options.template), 1 != this.$tip.length)) throw new Error(this.type + " `template` option must consist of exactly 1 top-level element!"); return this.$tip }, c.prototype.arrow = function () { return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow") }, c.prototype.enable = function () { this.enabled = !0 }, c.prototype.disable = function () { this.enabled = !1 }, c.prototype.toggleEnabled = function () { this.enabled = !this.enabled }, c.prototype.toggle = function (b) { var c = this; b && (c = a(b.currentTarget).data("bs." + this.type), c || (c = new this.constructor(b.currentTarget, this.getDelegateOptions()), a(b.currentTarget).data("bs." + this.type, c))), b ? (c.inState.click = !c.inState.click, c.isInStateTrue() ? c.enter(c) : c.leave(c)) : c.tip().hasClass("in") ? c.leave(c) : c.enter(c) }, c.prototype.destroy = function () { var a = this; clearTimeout(this.timeout), this.hide(function () { a.$element.off("." + a.type).removeData("bs." + a.type), a.$tip && a.$tip.detach(), a.$tip = null, a.$arrow = null, a.$viewport = null, a.$element = null }) }; var d = a.fn.tooltip; a.fn.tooltip = b, a.fn.tooltip.Constructor = c, a.fn.tooltip.noConflict = function () { return a.fn.tooltip = d, this } }(jQuery), +function (a) { "use strict"; function b(b) { return this.each(function () { var d = a(this), e = d.data("bs.popover"), f = "object" == typeof b && b; !e && /destroy|hide/.test(b) || (e || d.data("bs.popover", e = new c(this, f)), "string" == typeof b && e[b]()) }) } var c = function (a, b) { this.init("popover", a, b) }; if (!a.fn.tooltip) throw new Error("Popover requires tooltip.js"); c.VERSION = "3.3.7", c.DEFAULTS = a.extend({}, a.fn.tooltip.Constructor.DEFAULTS, { placement: "right", trigger: "click", content: "", template: '' }), c.prototype = a.extend({}, a.fn.tooltip.Constructor.prototype), c.prototype.constructor = c, c.prototype.getDefaults = function () { return c.DEFAULTS }, c.prototype.setContent = function () { var a = this.tip(), b = this.getTitle(), c = this.getContent(); a.find(".popover-title")[this.options.html ? "html" : "text"](b), a.find(".popover-content").children().detach().end()[this.options.html ? "string" == typeof c ? "html" : "append" : "text"](c), a.removeClass("fade top bottom left right in"), a.find(".popover-title").html() || a.find(".popover-title").hide() }, c.prototype.hasContent = function () { return this.getTitle() || this.getContent() }, c.prototype.getContent = function () { var a = this.$element, b = this.options; return a.attr("data-content") || ("function" == typeof b.content ? b.content.call(a[0]) : b.content) }, c.prototype.arrow = function () { return this.$arrow = this.$arrow || this.tip().find(".arrow") }; var d = a.fn.popover; a.fn.popover = b, a.fn.popover.Constructor = c, a.fn.popover.noConflict = function () { return a.fn.popover = d, this } }(jQuery), +function (a) { - "use strict"; function b(c, d) { this.$body = a(document.body), this.$scrollElement = a(a(c).is(document.body) ? window : c), this.options = a.extend({}, b.DEFAULTS, d), this.selector = (this.options.target || "") + " .nav li > a", this.offsets = [], this.targets = [], this.activeTarget = null, this.scrollHeight = 0, this.$scrollElement.on("scroll.bs.scrollspy", a.proxy(this.process, this)), this.refresh(), this.process() } function c(c) { return this.each(function () { var d = a(this), e = d.data("bs.scrollspy"), f = "object" == typeof c && c; e || d.data("bs.scrollspy", e = new b(this, f)), "string" == typeof c && e[c]() }) } b.VERSION = "3.3.7", b.DEFAULTS = { offset: 10 }, b.prototype.getScrollHeight = function () { return this.$scrollElement[0].scrollHeight || Math.max(this.$body[0].scrollHeight, document.documentElement.scrollHeight) }, b.prototype.refresh = function () { var b = this, c = "offset", d = 0; this.offsets = [], this.targets = [], this.scrollHeight = this.getScrollHeight(), a.isWindow(this.$scrollElement[0]) || (c = "position", d = this.$scrollElement.scrollTop()), this.$body.find(this.selector).map(function () { var b = a(this), e = b.data("target") || b.attr("href"), f = /^#./.test(e) && a(e); return f && f.length && f.is(":visible") && [[f[c]().top + d, e]] || null }).sort(function (a, b) { return a[0] - b[0] }).each(function () { b.offsets.push(this[0]), b.targets.push(this[1]) }) }, b.prototype.process = function () { var a, b = this.$scrollElement.scrollTop() + this.options.offset, c = this.getScrollHeight(), d = this.options.offset + c - this.$scrollElement.height(), e = this.offsets, f = this.targets, g = this.activeTarget; if (this.scrollHeight != c && this.refresh(), b >= d) return g != (a = f[f.length - 1]) && this.activate(a); if (g && b < e[0]) return this.activeTarget = null, this.clear(); for (a = e.length; a--;)g != f[a] && b >= e[a] && (void 0 === e[a + 1] || b < e[a + 1]) && this.activate(f[a]) }, b.prototype.activate = function (b) { - this.activeTarget = b, this.clear(); var c = this.selector + '[data-target="' + b + '"],' + this.selector + '[href="' + b + '"]', d = a(c).parents("li").addClass("active"); d.parent(".dropdown-menu").length && (d = d.closest("li.dropdown").addClass("active")), d.trigger("activate.bs.scrollspy") - }, b.prototype.clear = function () { a(this.selector).parentsUntil(this.options.target, ".active").removeClass("active") }; var d = a.fn.scrollspy; a.fn.scrollspy = c, a.fn.scrollspy.Constructor = b, a.fn.scrollspy.noConflict = function () { return a.fn.scrollspy = d, this }, a(window).on("load.bs.scrollspy.data-api", function () { a('[data-spy="scroll"]').each(function () { var b = a(this); c.call(b, b.data()) }) }) - }(jQuery), +function (a) { "use strict"; function b(b) { return this.each(function () { var d = a(this), e = d.data("bs.tab"); e || d.data("bs.tab", e = new c(this)), "string" == typeof b && e[b]() }) } var c = function (b) { this.element = a(b) }; c.VERSION = "3.3.7", c.TRANSITION_DURATION = 150, c.prototype.show = function () { var b = this.element, c = b.closest("ul:not(.dropdown-menu)"), d = b.data("target"); if (d || (d = b.attr("href"), d = d && d.replace(/.*(?=#[^\s]*$)/, "")), !b.parent("li").hasClass("active")) { var e = c.find(".active:last a"), f = a.Event("hide.bs.tab", { relatedTarget: b[0] }), g = a.Event("show.bs.tab", { relatedTarget: e[0] }); if (e.trigger(f), b.trigger(g), !g.isDefaultPrevented() && !f.isDefaultPrevented()) { var h = a(d); this.activate(b.closest("li"), c), this.activate(h, h.parent(), function () { e.trigger({ type: "hidden.bs.tab", relatedTarget: b[0] }), b.trigger({ type: "shown.bs.tab", relatedTarget: e[0] }) }) } } }, c.prototype.activate = function (b, d, e) { function f() { g.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded", !1), b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded", !0), h ? (b[0].offsetWidth, b.addClass("in")) : b.removeClass("fade"), b.parent(".dropdown-menu").length && b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded", !0), e && e() } var g = d.find("> .active"), h = e && a.support.transition && (g.length && g.hasClass("fade") || !!d.find("> .fade").length); g.length && h ? g.one("bsTransitionEnd", f).emulateTransitionEnd(c.TRANSITION_DURATION) : f(), g.removeClass("in") }; var d = a.fn.tab; a.fn.tab = b, a.fn.tab.Constructor = c, a.fn.tab.noConflict = function () { return a.fn.tab = d, this }; var e = function (c) { c.preventDefault(), b.call(a(this), "show") }; a(document).on("click.bs.tab.data-api", '[data-toggle="tab"]', e).on("click.bs.tab.data-api", '[data-toggle="pill"]', e) }(jQuery), +function (a) { "use strict"; function b(b) { return this.each(function () { var d = a(this), e = d.data("bs.affix"), f = "object" == typeof b && b; e || d.data("bs.affix", e = new c(this, f)), "string" == typeof b && e[b]() }) } var c = function (b, d) { this.options = a.extend({}, c.DEFAULTS, d), this.$target = a(this.options.target).on("scroll.bs.affix.data-api", a.proxy(this.checkPosition, this)).on("click.bs.affix.data-api", a.proxy(this.checkPositionWithEventLoop, this)), this.$element = a(b), this.affixed = null, this.unpin = null, this.pinnedOffset = null, this.checkPosition() }; c.VERSION = "3.3.7", c.RESET = "affix affix-top affix-bottom", c.DEFAULTS = { offset: 0, target: window }, c.prototype.getState = function (a, b, c, d) { var e = this.$target.scrollTop(), f = this.$element.offset(), g = this.$target.height(); if (null != c && "top" == this.affixed) return e < c && "top"; if ("bottom" == this.affixed) return null != c ? !(e + this.unpin <= f.top) && "bottom" : !(e + g <= a - d) && "bottom"; var h = null == this.affixed, i = h ? e : f.top, j = h ? g : b; return null != c && e <= c ? "top" : null != d && i + j >= a - d && "bottom" }, c.prototype.getPinnedOffset = function () { if (this.pinnedOffset) return this.pinnedOffset; this.$element.removeClass(c.RESET).addClass("affix"); var a = this.$target.scrollTop(), b = this.$element.offset(); return this.pinnedOffset = b.top - a }, c.prototype.checkPositionWithEventLoop = function () { setTimeout(a.proxy(this.checkPosition, this), 1) }, c.prototype.checkPosition = function () { if (this.$element.is(":visible")) { var b = this.$element.height(), d = this.options.offset, e = d.top, f = d.bottom, g = Math.max(a(document).height(), a(document.body).height()); "object" != typeof d && (f = e = d), "function" == typeof e && (e = d.top(this.$element)), "function" == typeof f && (f = d.bottom(this.$element)); var h = this.getState(g, b, e, f); if (this.affixed != h) { null != this.unpin && this.$element.css("top", ""); var i = "affix" + (h ? "-" + h : ""), j = a.Event(i + ".bs.affix"); if (this.$element.trigger(j), j.isDefaultPrevented()) return; this.affixed = h, this.unpin = "bottom" == h ? this.getPinnedOffset() : null, this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix", "affixed") + ".bs.affix") } "bottom" == h && this.$element.offset({ top: g - b - f }) } }; var d = a.fn.affix; a.fn.affix = b, a.fn.affix.Constructor = c, a.fn.affix.noConflict = function () { return a.fn.affix = d, this }, a(window).on("load", function () { a('[data-spy="affix"]').each(function () { var c = a(this), d = c.data(); d.offset = d.offset || {}, null != d.offsetBottom && (d.offset.bottom = d.offsetBottom), null != d.offsetTop && (d.offset.top = d.offsetTop), b.call(c, d) }) }) }(jQuery); -}); \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/assets/js/base/extensions.js b/src/Surging.ApiGateway/wwwroot/assets/js/base/extensions.js deleted file mode 100644 index ce55d19de..000000000 --- a/src/Surging.ApiGateway/wwwroot/assets/js/base/extensions.js +++ /dev/null @@ -1,147 +0,0 @@ -define(function (require, exports, module) { - var system = {}; - (function () { - var ua = navigator.userAgent.toLowerCase(); - var s; - (s = ua.match(/msie ([\d.]+)/)) ? system.ie = s[1] : - (s = ua.match(/firefox\/([\d.]+)/)) ? system.firefox = s[1] : - (s = ua.match(/chrome\/([\d.]+)/)) ? system.chrome = s[1] : - (s = ua.match(/opera.([\d.]+)/)) ? system.opera = s[1] : - (s = ua.match(/version\/([\d.]+).*safari/)) ? system.safari = s[1] : 0; - - Date.prototype.format = function(format) { - var o = { - "M+": this.getMonth() + 1, //month - "d+": this.getDate(), //day - "h+": this.getHours(), //hour - "m+": this.getMinutes(), //minute - "s+": this.getSeconds(), //second - "q+": Math.floor((this.getMonth() + 3) / 3), //quarter - "S": this.getMilliseconds() //millisecond - }; - - if (/(y+)/.test(format)) { - format = format.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length)); - } - - for (var k in o) { - if (new RegExp("(" + k + ")").test(format)) { - format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length)); - } - } - return format; - }; - - String.prototype.htmlEncode = function () { var re = this; var q1 = [/\x26/g, /\x3C/g, /\x3E/g, /\x20/g]; var q2 = ["&", "<", ">", " "]; for (var i = 0; i < q1.length; i++) re = re.replace(q1[i], q2[i]); return re; }; - - String.prototype.toDateTime = function () { var val = this.replace(/[-]/g, "/"); if (val.isDate() || val.isDateTime()) return new Date(Date.parse(val)); var r = this.match(/(\d+)/); if (r) return new Date(parseInt(r)); return new Date(val); }; - - String.prototype.isDate = function () { var r = this.replace(/(^\s*)|(\s*$)/g, "").match(/^(\d{1,4})(-|\/)(\d{1,2})\2(\d{1,2})$/); if (r == null) return false; var d = new Date(r[1], r[3] - 1, r[4]); return (d.getFullYear() == r[1] && (d.getMonth() + 1) == r[3] && d.getDate() == r[4]); }; - - String.prototype.isDateTime = function () { var r = this.replace(/(^\s*)|(\s*$)/g, "").match(/^(\d{1,4})(-|\/)(\d{1,2})\2(\d{1,2}) (\d{1,2}):(\d{1,2}):(\d{1,2})$/); if (r == null) return false; var d = new Date(r[1], r[3] - 1, r[4], r[5], r[6], r[7]); return (d.getFullYear() == r[1] && (d.getMonth() + 1) == r[3] && d.getDate() == r[4] && d.getHours() == r[5] && d.getMinutes() == r[6] && d.getSeconds() == r[7]); }; - - String.prototype.isInt = function () { return /^[-\+]?\d+$/.test(this); }; - - Date.prototype.dateAdd = function (strInterval, Number) { var dtTmp = this; switch (strInterval) { case 's': return new Date(Date.parse(dtTmp) + (1000 * Number)); case 'n': return new Date(Date.parse(dtTmp) + (60000 * Number)); case 'h': return new Date(Date.parse(dtTmp) + (3600000 * Number)); case 'd': return new Date(Date.parse(dtTmp) + (86400000 * Number)); case 'w': return new Date(Date.parse(dtTmp) + ((86400000 * 7) * Number)); case 'q': return new Date(dtTmp.getFullYear(), (dtTmp.getMonth()) + Number * 3, dtTmp.getDate(), dtTmp.getHours(), dtTmp.getMinutes(), dtTmp.getSeconds()); case 'm': return new Date(dtTmp.getFullYear(), (dtTmp.getMonth()) + Number, dtTmp.getDate(), dtTmp.getHours(), dtTmp.getMinutes(), dtTmp.getSeconds()); case 'y': return new Date((dtTmp.getFullYear() + Number), dtTmp.getMonth(), dtTmp.getDate(), dtTmp.getHours(), dtTmp.getMinutes(), dtTmp.getSeconds()); }; }; - - String.prototype.format = function(args) { - var result = this; - if (arguments.length > 0) { - if (arguments.length == 1 && typeof(args) == "object") { - for (var key in args) { - if (args[key] != undefined) { - var reg = new RegExp("({" + key + "})", "g"); - result = result.replace(reg, args[key]); - } - } - } else { - for (var i = 0; i < arguments.length; i++) { - if (arguments[i] != undefined) { - var reg = new RegExp("({[" + i + "]})", "g"); - result = result.replace(reg, arguments[i]); - } - } - } - } - return result; - }; - Array.prototype.remove = function(dx) { - if (isNaN(dx) || dx > this.length) { - return false; - } - for (var i = 0, n = 0; i < this.length; i++) { - if (this[i] != this[dx]) { - this[n++] = this[i]; - } - } - this.length -= 1; - }; - //找到返回所在索引，不存在返回-1 - Array.prototype.index = function (el) { - var i = 0; - for (var i = 0, len = this.length; i < len; i++) { - if (el == this[i]) { - return i; - } - } - return -1; - }; - // 判断数组中包含element元素 - Array.prototype.contains = function(e) { - for (var i = 0; i < this.length; i++) { - if (this[i] == e) { - return true; - } - } - return false; - }; - - - - jQuery.validator.addMethod("stringCheck", function (value, element) { - var strCheck = /^[a-zA-Z0-9\u4e00-\u9fa5-_]+$/; - return this.optional(element) || (strCheck.test(value)); - }, "只能包含中文、英文、数字、下划线、横线字符"); - - Array.prototype.OrderByDesc = function(func) { - var m = {}; - for (var i = 0; i < this.length; i++) { - for (var k = 0; k < this.length; k++) { - if (func(this[i]) > func(this[k])) { - m = this[k]; - this[k] = this[i]; - this[i] = m; - } - } - } - return this; - }; - - //+--------------------------------------------------- - //| 比较日期差 dtEnd 格式为日期型或者 有效日期格式字符串 - //+--------------------------------------------------- - Date.prototype.DateDiff = function(strInterval, dtEnd) { - var dtStart = this; - if (typeof dtEnd == 'string')//如果是字符串转换为日期型 - { - dtEnd = StringToDate(dtEnd); - } - switch (strInterval) { - case 's': - return parseInt((dtEnd - dtStart) / 1000); - case 'n': - return parseInt((dtEnd - dtStart) / 60000); - case 'h': - return parseInt((dtEnd - dtStart) / 3600000); - case 'd': - return parseInt((dtEnd - dtStart) / 86400000); - case 'w': - return parseInt((dtEnd - dtStart) / (86400000 * 7)); - case 'm': - return (dtEnd.getMonth() + 1) + ((dtEnd.getFullYear() - dtStart.getFullYear()) * 12) - (dtStart.getMonth() + 1); - case 'y': - return dtEnd.getFullYear() - dtStart.getFullYear(); - } - }; - })(); -}); \ No newline at end of file diff --git a/src/Surging.ApiGateway/wwwroot/assets/js/base/jquery.js b/src/Surging.ApiGateway/wwwroot/assets/js/base/jquery.js deleted file mode 100644 index 393ed4294..000000000 --- a/src/Surging.ApiGateway/wwwroot/assets/js/base/jquery.js +++ /dev/null @@ -1,9834 +0,0 @@ -define(function (require, exports, module) { - /*! - * jQuery JavaScript Library v2.2.0 - * http://jquery.com/ - * - * Includes Sizzle.js - * http://sizzlejs.com/ - * - * Copyright jQuery Foundation and other contributors - * Released under the MIT license - * http://jquery.org/license - * - * Date: 2016-01-08T20:02Z - */ - - (function (global, factory) { - - if (typeof module === "object" && typeof module.exports === "object") { - // For CommonJS and CommonJS-like environments where a proper `window` - // is present, execute the factory and get jQuery. - // For environments that do not have a `window` with a `document` - // (such as Node.js), expose a factory as module.exports. - // This accentuates the need for the creation of a real `window`. - // e.g. var jQuery = require("jquery")(window); - // See ticket #14549 for more info. - module.exports = global.document ? - factory(global, true) : - function (w) { - if (!w.document) { - throw new Error("jQuery requires a window with a document"); - } - return factory(w); - }; - } else { - factory(global); - } - - // Pass this if window is not defined yet - }(typeof window !== "undefined" ? window : this, function (window, noGlobal) { - - // Support: Firefox 18+ - // Can't be in strict mode, several libs including ASP.NET trace - // the stack via arguments.caller.callee and Firefox dies if - // you try to trace through "use strict" call chains. (#13335) - //"use strict"; - var arr = []; - - var document = window.document; - - var slice = arr.slice; - - var concat = arr.concat; - - var push = arr.push; - - var indexOf = arr.indexOf; - - var class2type = {}; - - var toString = class2type.toString; - - var hasOwn = class2type.hasOwnProperty; - - var support = {}; - - - - var - version = "2.2.0", - - // Define a local copy of jQuery - jQuery = function (selector, context) { - - // The jQuery object is actually just the init constructor 'enhanced' - // Need init if jQuery is called (just allow error to be thrown if not included) - return new jQuery.fn.init(selector, context); - }, - - // Support: Android<4.1 - // Make sure we trim BOM and NBSP - rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, - - // Matches dashed string for camelizing - rmsPrefix = /^-ms-/, - rdashAlpha = /-([\da-z])/gi, - - // Used by jQuery.camelCase as callback to replace() - fcamelCase = function (all, letter) { - return letter.toUpperCase(); - }; - - jQuery.fn = jQuery.prototype = { - - // The current version of jQuery being used - jquery: version, - - constructor: jQuery, - - // Start with an empty selector - selector: "", - - // The default length of a jQuery object is 0 - length: 0, - - toArray: function () { - return slice.call(this); - }, - - // Get the Nth element in the matched element set OR - // Get the whole matched element set as a clean array - get: function (num) { - return num != null ? - - // Return just the one element from the set - (num < 0 ? this[num + this.length] : this[num]) : - - // Return all the elements in a clean array - slice.call(this); - }, - - // Take an array of elements and push it onto the stack - // (returning the new matched element set) - pushStack: function (elems) { - - // Build a new jQuery matched element set - var ret = jQuery.merge(this.constructor(), elems); - - // Add the old object onto the stack (as a reference) - ret.prevObject = this; - ret.context = this.context; - - // Return the newly-formed element set - return ret; - }, - - // Execute a callback for every element in the matched set. - each: function (callback) { - return jQuery.each(this, callback); - }, - - map: function (callback) { - return this.pushStack(jQuery.map(this, function (elem, i) { - return callback.call(elem, i, elem); - })); - }, - - slice: function () { - return this.pushStack(slice.apply(this, arguments)); - }, - - first: function () { - return this.eq(0); - }, - - last: function () { - return this.eq(-1); - }, - - eq: function (i) { - var len = this.length, - j = +i + (i < 0 ? len : 0); - return this.pushStack(j >= 0 && j < len ? [this[j]] : []); - }, - - end: function () { - return this.prevObject || this.constructor(); - }, - - // For internal use only. - // Behaves like an Array's method, not like a jQuery method. - push: push, - sort: arr.sort, - splice: arr.splice - }; - - jQuery.extend = jQuery.fn.extend = function () { - var options, name, src, copy, copyIsArray, clone, - target = arguments[0] || {}, - i = 1, - length = arguments.length, - deep = false; - - // Handle a deep copy situation - if (typeof target === "boolean") { - deep = target; - - // Skip the boolean and the target - target = arguments[i] || {}; - i++; - } - - // Handle case when target is a string or something (possible in deep copy) - if (typeof target !== "object" && !jQuery.isFunction(target)) { - target = {}; - } - - // Extend jQuery itself if only one argument is passed - if (i === length) { - target = this; - i--; - } - - for (; i < length; i++) { - - // Only deal with non-null/undefined values - if ((options = arguments[i]) != null) { - - // Extend the base object - for (name in options) { - src = target[name]; - copy = options[name]; - - // Prevent never-ending loop - if (target === copy) { - continue; - } - - // Recurse if we're merging plain objects or arrays - if (deep && copy && (jQuery.isPlainObject(copy) || - (copyIsArray = jQuery.isArray(copy)))) { - - if (copyIsArray) { - copyIsArray = false; - clone = src && jQuery.isArray(src) ? src : []; - - } else { - clone = src && jQuery.isPlainObject(src) ? src : {}; - } - - // Never move original objects, clone them - target[name] = jQuery.extend(deep, clone, copy); - - // Don't bring in undefined values - } else if (copy !== undefined) { - target[name] = copy; - } - } - } - } - - // Return the modified object - return target; - }; - - jQuery.extend({ - - // Unique for each copy of jQuery on the page - expando: "jQuery" + (version + Math.random()).replace(/\D/g, ""), - - // Assume jQuery is ready without the ready module - isReady: true, - - error: function (msg) { - throw new Error(msg); - }, - - noop: function () { }, - - isFunction: function (obj) { - return jQuery.type(obj) === "function"; - }, - - isArray: Array.isArray, - - isWindow: function (obj) { - return obj != null && obj === obj.window; - }, - - isNumeric: function (obj) { - - // parseFloat NaNs numeric-cast false positives (null|true|false|"") - // ...but misinterprets leading-number strings, particularly hex literals ("0x...") - // subtraction forces infinities to NaN - // adding 1 corrects loss of precision from parseFloat (#15100) - var realStringObj = obj && obj.toString(); - return !jQuery.isArray(obj) && (realStringObj - parseFloat(realStringObj) + 1) >= 0; - }, - - isPlainObject: function (obj) { - - // Not plain objects: - // - Any object or value whose internal [[Class]] property is not "[object Object]" - // - DOM nodes - // - window - if (jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow(obj)) { - return false; - } - - if (obj.constructor && - !hasOwn.call(obj.constructor.prototype, "isPrototypeOf")) { - return false; - } - - // If the function hasn't returned already, we're confident that - // |obj| is a plain object, created by {} or constructed with new Object - return true; - }, - - isEmptyObject: function (obj) { - var name; - for (name in obj) { - return false; - } - return true; - }, - - type: function (obj) { - if (obj == null) { - return obj + ""; - } - - // Support: Android<4.0, iOS<6 (functionish RegExp) - return typeof obj === "object" || typeof obj === "function" ? - class2type[toString.call(obj)] || "object" : - typeof obj; - }, - - // Evaluates a script in a global context - globalEval: function (code) { - var script, - indirect = eval; - - code = jQuery.trim(code); - - if (code) { - - // If the code includes a valid, prologue position - // strict mode pragma, execute code by injecting a - // script tag into the document. - if (code.indexOf("use strict") === 1) { - script = document.createElement("script"); - script.text = code; - document.head.appendChild(script).parentNode.removeChild(script); - } else { - - // Otherwise, avoid the DOM node creation, insertion - // and removal by using an indirect global eval - - indirect(code); - } - } - }, - - // Convert dashed to camelCase; used by the css and data modules - // Support: IE9-11+ - // Microsoft forgot to hump their vendor prefix (#9572) - camelCase: function (string) { - return string.replace(rmsPrefix, "ms-").replace(rdashAlpha, fcamelCase); - }, - - nodeName: function (elem, name) { - return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase(); - }, - - each: function (obj, callback) { - var length, i = 0; - - if (isArrayLike(obj)) { - length = obj.length; - for (; i < length; i++) { - if (callback.call(obj[i], i, obj[i]) === false) { - break; - } - } - } else { - for (i in obj) { - if (callback.call(obj[i], i, obj[i]) === false) { - break; - } - } - } - - return obj; - }, - - // Support: Android<4.1 - trim: function (text) { - return text == null ? - "" : - (text + "").replace(rtrim, ""); - }, - - // results is for internal usage only - makeArray: function (arr, results) { - var ret = results || []; - - if (arr != null) { - if (isArrayLike(Object(arr))) { - jQuery.merge(ret, - typeof arr === "string" ? - [arr] : arr - ); - } else { - push.call(ret, arr); - } - } - - return ret; - }, - - inArray: function (elem, arr, i) { - return arr == null ? -1 : indexOf.call(arr, elem, i); - }, - - merge: function (first, second) { - var len = +second.length, - j = 0, - i = first.length; - - for (; j < len; j++) { - first[i++] = second[j]; - } - - first.length = i; - - return first; - }, - - grep: function (elems, callback, invert) { - var callbackInverse, - matches = [], - i = 0, - length = elems.length, - callbackExpect = !invert; - - // Go through the array, only saving the items - // that pass the validator function - for (; i < length; i++) { - callbackInverse = !callback(elems[i], i); - if (callbackInverse !== callbackExpect) { - matches.push(elems[i]); - } - } - - return matches; - }, - - // arg is for internal usage only - map: function (elems, callback, arg) { - var length, value, - i = 0, - ret = []; - - // Go through the array, translating each of the items to their new values - if (isArrayLike(elems)) { - length = elems.length; - for (; i < length; i++) { - value = callback(elems[i], i, arg); - - if (value != null) { - ret.push(value); - } - } - - // Go through every key on the object, - } else { - for (i in elems) { - value = callback(elems[i], i, arg); - - if (value != null) { - ret.push(value); - } - } - } - - // Flatten any nested arrays - return concat.apply([], ret); - }, - - // A global GUID counter for objects - guid: 1, - - // Bind a function to a context, optionally partially applying any - // arguments. - proxy: function (fn, context) { - var tmp, args, proxy; - - if (typeof context === "string") { - tmp = fn[context]; - context = fn; - fn = tmp; - } - - // Quick check to determine if target is callable, in the spec - // this throws a TypeError, but we will just return undefined. - if (!jQuery.isFunction(fn)) { - return undefined; - } - - // Simulated bind - args = slice.call(arguments, 2); - proxy = function () { - return fn.apply(context || this, args.concat(slice.call(arguments))); - }; - - // Set the guid of unique handler to the same of original handler, so it can be removed - proxy.guid = fn.guid = fn.guid || jQuery.guid++; - - return proxy; - }, - - now: Date.now, - - // jQuery.support is not used in Core but other projects attach their - // properties to it so it needs to exist. - support: support - }); - - // JSHint would error on this code due to the Symbol not being defined in ES5. - // Defining this global in .jshintrc would create a danger of using the global - // unguarded in another place, it seems safer to just disable JSHint for these - // three lines. - /* jshint ignore: start */ - if (typeof Symbol === "function") { - jQuery.fn[Symbol.iterator] = arr[Symbol.iterator]; - } - /* jshint ignore: end */ - - // Populate the class2type map - jQuery.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "), - function (i, name) { - class2type["[object " + name + "]"] = name.toLowerCase(); - }); - - function isArrayLike(obj) { - - // Support: iOS 8.2 (not reproducible in simulator) - // `in` check used to prevent JIT error (gh-2145) - // hasOwn isn't used here due to false negatives - // regarding Nodelist length in IE - var length = !!obj && "length" in obj && obj.length, - type = jQuery.type(obj); - - if (type === "function" || jQuery.isWindow(obj)) { - return false; - } - - return type === "array" || length === 0 || - typeof length === "number" && length > 0 && (length - 1) in obj; - } - var Sizzle = - /*! - * Sizzle CSS Selector Engine v2.2.1 - * http://sizzlejs.com/ - * - * Copyright jQuery Foundation and other contributors - * Released under the MIT license - * http://jquery.org/license - * - * Date: 2015-10-17 - */ - (function (window) { - - var i, - support, - Expr, - getText, - isXML, - tokenize, - compile, - select, - outermostContext, - sortInput, - hasDuplicate, - - // Local document vars - setDocument, - document, - docElem, - documentIsHTML, - rbuggyQSA, - rbuggyMatches, - matches, - contains, - - // Instance-specific data - expando = "sizzle" + 1 * new Date(), - preferredDoc = window.document, - dirruns = 0, - done = 0, - classCache = createCache(), - tokenCache = createCache(), - compilerCache = createCache(), - sortOrder = function (a, b) { - if (a === b) { - hasDuplicate = true; - } - return 0; - }, - - // General-purpose constants - MAX_NEGATIVE = 1 << 31, - - // Instance methods - hasOwn = ({}).hasOwnProperty, - arr = [], - pop = arr.pop, - push_native = arr.push, - push = arr.push, - slice = arr.slice, - // Use a stripped-down indexOf as it's faster than native - // http://jsperf.com/thor-indexof-vs-for/5 - indexOf = function (list, elem) { - var i = 0, - len = list.length; - for (; i < len; i++) { - if (list[i] === elem) { - return i; - } - } - return -1; - }, - - booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped", - - // Regular expressions - - // http://www.w3.org/TR/css3-selectors/#whitespace - whitespace = "[\\x20\\t\\r\\n\\f]", - - // http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier - identifier = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+", - - // Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors - attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace + - // Operator (capture 2) - "*([*^$|!~]?=)" + whitespace + - // "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]" - "*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace + - "*\\]", - - pseudos = ":(" + identifier + ")(?:\\((" + - // To reduce the number of selectors needing tokenize in the preFilter, prefer arguments: - // 1. quoted (capture 3; capture 4 or capture 5) - "('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" + - // 2. simple (capture 6) - "((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" + - // 3. anything else (capture 2) - ".*" + - ")\\)|)", - - // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter - rwhitespace = new RegExp(whitespace + "+", "g"), - rtrim = new RegExp("^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g"), - - rcomma = new RegExp("^" + whitespace + "*," + whitespace + "*"), - rcombinators = new RegExp("^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*"), - - rattributeQuotes = new RegExp("=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g"), - - rpseudo = new RegExp(pseudos), - ridentifier = new RegExp("^" + identifier + "$"), - - matchExpr = { - "ID": new RegExp("^#(" + identifier + ")"), - "CLASS": new RegExp("^\\.(" + identifier + ")"), - "TAG": new RegExp("^(" + identifier + "|[*])"), - "ATTR": new RegExp("^" + attributes), - "PSEUDO": new RegExp("^" + pseudos), - "CHILD": new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace + - "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace + - "*(\\d+)|))" + whitespace + "*\\)|)", "i"), - "bool": new RegExp("^(?:" + booleans + ")$", "i"), - // For use in libraries implementing .is() - // We use this for POS matching in `select` - "needsContext": new RegExp("^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + - whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i") - }, - - rinputs = /^(?:input|select|textarea|button)$/i, - rheader = /^h\d$/i, - - rnative = /^[^{]+\{\s*\[native \w/, - - // Easily-parseable/retrievable ID or TAG or CLASS selectors - rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/, - - rsibling = /[+~]/, - rescape = /'|\\/g, - - // CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters - runescape = new RegExp("\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig"), - funescape = function (_, escaped, escapedWhitespace) { - var high = "0x" + escaped - 0x10000; - // NaN means non-codepoint - // Support: Firefox<24 - // Workaround erroneous numeric interpretation of +"0x" - return high !== high || escapedWhitespace ? - escaped : - high < 0 ? - // BMP codepoint - String.fromCharCode(high + 0x10000) : - // Supplemental Plane codepoint (surrogate pair) - String.fromCharCode(high >> 10 | 0xD800, high & 0x3FF | 0xDC00); - }, - - // Used for iframes - // See setDocument() - // Removing the function wrapper causes a "Permission Denied" - // error in IE - unloadHandler = function () { - setDocument(); - }; - - // Optimize for push.apply( _, NodeList ) - try { - push.apply( - (arr = slice.call(preferredDoc.childNodes)), - preferredDoc.childNodes - ); - // Support: Android<4.0 - // Detect silently failing push.apply - arr[preferredDoc.childNodes.length].nodeType; - } catch (e) { - push = { - apply: arr.length ? - - // Leverage slice if possible - function (target, els) { - push_native.apply(target, slice.call(els)); - } : - - // Support: IE<9 - // Otherwise append directly - function (target, els) { - var j = target.length, - i = 0; - // Can't trust NodeList.length - while ((target[j++] = els[i++])) { } - target.length = j - 1; - } - }; - } - - function Sizzle(selector, context, results, seed) { - var m, i, elem, nid, nidselect, match, groups, newSelector, - newContext = context && context.ownerDocument, - - // nodeType defaults to 9, since context defaults to document - nodeType = context ? context.nodeType : 9; - - results = results || []; - - // Return early from calls with invalid selector or context - if (typeof selector !== "string" || !selector || - nodeType !== 1 && nodeType !== 9 && nodeType !== 11) { - - return results; - } - - // Try to shortcut find operations (as opposed to filters) in HTML documents - if (!seed) { - - if ((context ? context.ownerDocument || context : preferredDoc) !== document) { - setDocument(context); - } - context = context || document; - - if (documentIsHTML) { - - // If the selector is sufficiently simple, try using a "get*By*" DOM method - // (excepting DocumentFragment context, where the methods don't exist) - if (nodeType !== 11 && (match = rquickExpr.exec(selector))) { - - // ID selector - if ((m = match[1])) { - - // Document context - if (nodeType === 9) { - if ((elem = context.getElementById(m))) { - - // Support: IE, Opera, Webkit - // TODO: identify versions - // getElementById can match elements by name instead of ID - if (elem.id === m) { - results.push(elem); - return results; - } - } else { - return results; - } - - // Element context - } else { - - // Support: IE, Opera, Webkit - // TODO: identify versions - // getElementById can match elements by name instead of ID - if (newContext && (elem = newContext.getElementById(m)) && - contains(context, elem) && - elem.id === m) { - - results.push(elem); - return results; - } - } - - // Type selector - } else if (match[2]) { - push.apply(results, context.getElementsByTagName(selector)); - return results; - - // Class selector - } else if ((m = match[3]) && support.getElementsByClassName && - context.getElementsByClassName) { - - push.apply(results, context.getElementsByClassName(m)); - return results; - } - } - - // Take advantage of querySelectorAll - if (support.qsa && - !compilerCache[selector + " "] && - (!rbuggyQSA || !rbuggyQSA.test(selector))) { - - if (nodeType !== 1) { - newContext = context; - newSelector = selector; - - // qSA looks outside Element context, which is not what we want - // Thanks to Andrew Dupont for this workaround technique - // Support: IE <=8 - // Exclude object elements - } else if (context.nodeName.toLowerCase() !== "object") { - - // Capture the context ID, setting it first if necessary - if ((nid = context.getAttribute("id"))) { - nid = nid.replace(rescape, "\\$&"); - } else { - context.setAttribute("id", (nid = expando)); - } - - // Prefix every selector in the list - groups = tokenize(selector); - i = groups.length; - nidselect = ridentifier.test(nid) ? "#" + nid : "[id='" + nid + "']"; - while (i--) { - groups[i] = nidselect + " " + toSelector(groups[i]); - } - newSelector = groups.join(","); - - // Expand context for sibling selectors - newContext = rsibling.test(selector) && testContext(context.parentNode) || - context; - } - - if (newSelector) { - try { - push.apply(results, - newContext.querySelectorAll(newSelector) - ); - return results; - } catch (qsaError) { - } finally { - if (nid === expando) { - context.removeAttribute("id"); - } - } - } - } - } - } - - // All others - return select(selector.replace(rtrim, "$1"), context, results, seed); - } - - /** - * Create key-value caches of limited size - * @returns {function(string, object)} Returns the Object data after storing it on itself with - * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength) - * deleting the oldest entry - */ - function createCache() { - var keys = []; - - function cache(key, value) { - // Use (key + " ") to avoid collision with native prototype properties (see Issue #157) - if (keys.push(key + " ") > Expr.cacheLength) { - // Only keep the most recent entries - delete cache[keys.shift()]; - } - return (cache[key + " "] = value); - } - return cache; - } - - /** - * Mark a function for special use by Sizzle - * @param {Function} fn The function to mark - */ - function markFunction(fn) { - fn[expando] = true; - return fn; - } - - /** - * Support testing using an element - * @param {Function} fn Passed the created div and expects a boolean result - */ - function assert(fn) { - var div = document.createElement("div"); - - try { - return !!fn(div); - } catch (e) { - return false; - } finally { - // Remove from its parent by default - if (div.parentNode) { - div.parentNode.removeChild(div); - } - // release memory in IE - div = null; - } - } - - /** - * Adds the same handler for all of the specified attrs - * @param {String} attrs Pipe-separated list of attributes - * @param {Function} handler The method that will be applied - */ - function addHandle(attrs, handler) { - var arr = attrs.split("|"), - i = arr.length; - - while (i--) { - Expr.attrHandle[arr[i]] = handler; - } - } - - /** - * Checks document order of two siblings - * @param {Element} a - * @param {Element} b - * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b - */ - function siblingCheck(a, b) { - var cur = b && a, - diff = cur && a.nodeType === 1 && b.nodeType === 1 && - (~b.sourceIndex || MAX_NEGATIVE) - - (~a.sourceIndex || MAX_NEGATIVE); - - // Use IE sourceIndex if available on both nodes - if (diff) { - return diff; - } - - // Check if b follows a - if (cur) { - while ((cur = cur.nextSibling)) { - if (cur === b) { - return -1; - } - } - } - - return a ? 1 : -1; - } - - /** - * Returns a function to use in pseudos for input types - * @param {String} type - */ - function createInputPseudo(type) { - return function (elem) { - var name = elem.nodeName.toLowerCase(); - return name === "input" && elem.type === type; - }; - } - - /** - * Returns a function to use in pseudos for buttons - * @param {String} type - */ - function createButtonPseudo(type) { - return function (elem) { - var name = elem.nodeName.toLowerCase(); - return (name === "input" || name === "button") && elem.type === type; - }; - } - - /** - * Returns a function to use in pseudos for positionals - * @param {Function} fn - */ - function createPositionalPseudo(fn) { - return markFunction(function (argument) { - argument = +argument; - return markFunction(function (seed, matches) { - var j, - matchIndexes = fn([], seed.length, argument), - i = matchIndexes.length; - - // Match elements found at the specified indexes - while (i--) { - if (seed[(j = matchIndexes[i])]) { - seed[j] = !(matches[j] = seed[j]); - } - } - }); - }); - } - - /** - * Checks a node for validity as a Sizzle context - * @param {Element|Object=} context - * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value - */ - function testContext(context) { - return context && typeof context.getElementsByTagName !== "undefined" && context; - } - - // Expose support vars for convenience - support = Sizzle.support = {}; - - /** - * Detects XML nodes - * @param {Element|Object} elem An element or a document - * @returns {Boolean} True iff elem is a non-HTML XML node - */ - isXML = Sizzle.isXML = function (elem) { - // documentElement is verified for cases where it doesn't yet exist - // (such as loading iframes in IE - #4833) - var documentElement = elem && (elem.ownerDocument || elem).documentElement; - return documentElement ? documentElement.nodeName !== "HTML" : false; - }; - - /** - * Sets document-related variables once based on the current document - * @param {Element|Object} [doc] An element or document object to use to set the document - * @returns {Object} Returns the current document - */ - setDocument = Sizzle.setDocument = function (node) { - var hasCompare, parent, - doc = node ? node.ownerDocument || node : preferredDoc; - - // Return early if doc is invalid or already selected - if (doc === document || doc.nodeType !== 9 || !doc.documentElement) { - return document; - } - - // Update global variables - document = doc; - docElem = document.documentElement; - documentIsHTML = !isXML(document); - - // Support: IE 9-11, Edge - // Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936) - if ((parent = document.defaultView) && parent.top !== parent) { - // Support: IE 11 - if (parent.addEventListener) { - parent.addEventListener("unload", unloadHandler, false); - - // Support: IE 9 - 10 only - } else if (parent.attachEvent) { - parent.attachEvent("onunload", unloadHandler); - } - } - - /* Attributes - ---------------------------------------------------------------------- */ - - // Support: IE<8 - // Verify that getAttribute really returns attributes and not properties - // (excepting IE8 booleans) - support.attributes = assert(function (div) { - div.className = "i"; - return !div.getAttribute("className"); - }); - - /* getElement(s)By* - ---------------------------------------------------------------------- */ - - // Check if getElementsByTagName("*") returns only elements - support.getElementsByTagName = assert(function (div) { - div.appendChild(document.createComment("")); - return !div.getElementsByTagName("*").length; - }); - - // Support: IE<9 - support.getElementsByClassName = rnative.test(document.getElementsByClassName); - - // Support: IE<10 - // Check if getElementById returns elements by name - // The broken getElementById methods don't pick up programatically-set names, - // so use a roundabout getElementsByName test - support.getById = assert(function (div) { - docElem.appendChild(div).id = expando; - return !document.getElementsByName || !document.getElementsByName(expando).length; - }); - - // ID find and filter - if (support.getById) { - Expr.find["ID"] = function (id, context) { - if (typeof context.getElementById !== "undefined" && documentIsHTML) { - var m = context.getElementById(id); - return m ? [m] : []; - } - }; - Expr.filter["ID"] = function (id) { - var attrId = id.replace(runescape, funescape); - return function (elem) { - return elem.getAttribute("id") === attrId; - }; - }; - } else { - // Support: IE6/7 - // getElementById is not reliable as a find shortcut - delete Expr.find["ID"]; - - Expr.filter["ID"] = function (id) { - var attrId = id.replace(runescape, funescape); - return function (elem) { - var node = typeof elem.getAttributeNode !== "undefined" && - elem.getAttributeNode("id"); - return node && node.value === attrId; - }; - }; - } - - // Tag - Expr.find["TAG"] = support.getElementsByTagName ? - function (tag, context) { - if (typeof context.getElementsByTagName !== "undefined") { - return context.getElementsByTagName(tag); - - // DocumentFragment nodes don't have gEBTN - } else if (support.qsa) { - return context.querySelectorAll(tag); - } - } : - - function (tag, context) { - var elem, - tmp = [], - i = 0, - // By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too - results = context.getElementsByTagName(tag); - - // Filter out possible comments - if (tag === "*") { - while ((elem = results[i++])) { - if (elem.nodeType === 1) { - tmp.push(elem); - } - } - - return tmp; - } - return results; - }; - - // Class - Expr.find["CLASS"] = support.getElementsByClassName && function (className, context) { - if (typeof context.getElementsByClassName !== "undefined" && documentIsHTML) { - return context.getElementsByClassName(className); - } - }; - - /* QSA/matchesSelector - ---------------------------------------------------------------------- */ - - // QSA and matchesSelector support - - // matchesSelector(:active) reports false when true (IE9/Opera 11.5) - rbuggyMatches = []; - - // qSa(:focus) reports false when true (Chrome 21) - // We allow this because of a bug in IE8/9 that throws an error - // whenever `document.activeElement` is accessed on an iframe - // So, we allow :focus to pass through QSA all the time to avoid the IE error - // See http://bugs.jquery.com/ticket/13378 - rbuggyQSA = []; - - if ((support.qsa = rnative.test(document.querySelectorAll))) { - // Build QSA regex - // Regex strategy adopted from Diego Perini - assert(function (div) { - // Select is set to empty string on purpose - // This is to test IE's treatment of not explicitly - // setting a boolean content attribute, - // since its presence should be enough - // http://bugs.jquery.com/ticket/12359 - docElem.appendChild(div).innerHTML = "" + - ""; - - // Support: IE8, Opera 11-12.16 - // Nothing should be selected when empty strings follow ^= or $= or *= - // The test attribute must be unknown in Opera but "safe" for WinRT - // http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section - if (div.querySelectorAll("[msallowcapture^='']").length) { - rbuggyQSA.push("[*^$]=" + whitespace + "*(?:''|\"\")"); - } - - // Support: IE8 - // Boolean attributes and "value" are not treated correctly - if (!div.querySelectorAll("[selected]").length) { - rbuggyQSA.push("\\[" + whitespace + "*(?:value|" + booleans + ")"); - } - - // Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+ - if (!div.querySelectorAll("[id~=" + expando + "-]").length) { - rbuggyQSA.push("~="); - } - - // Webkit/Opera - :checked should return selected option elements - // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked - // IE8 throws error here and will not see later tests - if (!div.querySelectorAll(":checked").length) { - rbuggyQSA.push(":checked"); - } - - // Support: Safari 8+, iOS 8+ - // https://bugs.webkit.org/show_bug.cgi?id=136851 - // In-page `selector#id sibing-combinator selector` fails - if (!div.querySelectorAll("a#" + expando + "+*").length) { - rbuggyQSA.push(".#.+[+~]"); - } - }); - - assert(function (div) { - // Support: Windows 8 Native Apps - // The type and name attributes are restricted during .innerHTML assignment - var input = document.createElement("input"); - input.setAttribute("type", "hidden"); - div.appendChild(input).setAttribute("name", "D"); - - // Support: IE8 - // Enforce case-sensitivity of name attribute - if (div.querySelectorAll("[name=d]").length) { - rbuggyQSA.push("name" + whitespace + "*[*^$|!~]?="); - } - - // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled) - // IE8 throws error here and will not see later tests - if (!div.querySelectorAll(":enabled").length) { - rbuggyQSA.push(":enabled", ":disabled"); - } - - // Opera 10-11 does not throw on post-comma invalid pseudos - div.querySelectorAll("*,:x"); - rbuggyQSA.push(",.*:"); - }); - } - - if ((support.matchesSelector = rnative.test((matches = docElem.matches || - docElem.webkitMatchesSelector || - docElem.mozMatchesSelector || - docElem.oMatchesSelector || - docElem.msMatchesSelector)))) { - - assert(function (div) { - // Check to see if it's possible to do matchesSelector - // on a disconnected node (IE 9) - support.disconnectedMatch = matches.call(div, "div"); - - // This should fail with an exception - // Gecko does not error, returns false instead - matches.call(div, "[s!='']:x"); - rbuggyMatches.push("!=", pseudos); - }); - } - - rbuggyQSA = rbuggyQSA.length && new RegExp(rbuggyQSA.join("|")); - rbuggyMatches = rbuggyMatches.length && new RegExp(rbuggyMatches.join("|")); - - /* Contains - ---------------------------------------------------------------------- */ - hasCompare = rnative.test(docElem.compareDocumentPosition); - - // Element contains another - // Purposefully self-exclusive - // As in, an element does not contain itself - contains = hasCompare || rnative.test(docElem.contains) ? - function (a, b) { - var adown = a.nodeType === 9 ? a.documentElement : a, - bup = b && b.parentNode; - return a === bup || !!(bup && bup.nodeType === 1 && ( - adown.contains ? - adown.contains(bup) : - a.compareDocumentPosition && a.compareDocumentPosition(bup) & 16 - )); - } : - function (a, b) { - if (b) { - while ((b = b.parentNode)) { - if (b === a) { - return true; - } - } - } - return false; - }; - - /* Sorting - ---------------------------------------------------------------------- */ - - // Document order sorting - sortOrder = hasCompare ? - function (a, b) { - - // Flag for duplicate removal - if (a === b) { - hasDuplicate = true; - return 0; - } - - // Sort on method existence if only one input has compareDocumentPosition - var compare = !a.compareDocumentPosition - !b.compareDocumentPosition; - if (compare) { - return compare; - } - - // Calculate position if both inputs belong to the same document - compare = (a.ownerDocument || a) === (b.ownerDocument || b) ? - a.compareDocumentPosition(b) : - - // Otherwise we know they are disconnected - 1; - - // Disconnected nodes - if (compare & 1 || - (!support.sortDetached && b.compareDocumentPosition(a) === compare)) { - - // Choose the first element that is related to our preferred document - if (a === document || a.ownerDocument === preferredDoc && contains(preferredDoc, a)) { - return -1; - } - if (b === document || b.ownerDocument === preferredDoc && contains(preferredDoc, b)) { - return 1; - } - - // Maintain original order - return sortInput ? - (indexOf(sortInput, a) - indexOf(sortInput, b)) : - 0; - } - - return compare & 4 ? -1 : 1; - } : - function (a, b) { - // Exit early if the nodes are identical - if (a === b) { - hasDuplicate = true; - return 0; - } - - var cur, - i = 0, - aup = a.parentNode, - bup = b.parentNode, - ap = [a], - bp = [b]; - - // Parentless nodes are either documents or disconnected - if (!aup || !bup) { - return a === document ? -1 : - b === document ? 1 : - aup ? -1 : - bup ? 1 : - sortInput ? - (indexOf(sortInput, a) - indexOf(sortInput, b)) : - 0; - - // If the nodes are siblings, we can do a quick check - } else if (aup === bup) { - return siblingCheck(a, b); - } - - // Otherwise we need full lists of their ancestors for comparison - cur = a; - while ((cur = cur.parentNode)) { - ap.unshift(cur); - } - cur = b; - while ((cur = cur.parentNode)) { - bp.unshift(cur); - } - - // Walk down the tree looking for a discrepancy - while (ap[i] === bp[i]) { - i++; - } - - return i ? - // Do a sibling check if the nodes have a common ancestor - siblingCheck(ap[i], bp[i]) : - - // Otherwise nodes in our document sort first - ap[i] === preferredDoc ? -1 : - bp[i] === preferredDoc ? 1 : - 0; - }; - - return document; - }; - - Sizzle.matches = function (expr, elements) { - return Sizzle(expr, null, null, elements); - }; - - Sizzle.matchesSelector = function (elem, expr) { - // Set document vars if needed - if ((elem.ownerDocument || elem) !== document) { - setDocument(elem); - } - - // Make sure that attribute selectors are quoted - expr = expr.replace(rattributeQuotes, "='$1']"); - - if (support.matchesSelector && documentIsHTML && - !compilerCache[expr + " "] && - (!rbuggyMatches || !rbuggyMatches.test(expr)) && - (!rbuggyQSA || !rbuggyQSA.test(expr))) { - - try { - var ret = matches.call(elem, expr); - - // IE 9's matchesSelector returns false on disconnected nodes - if (ret || support.disconnectedMatch || - // As well, disconnected nodes are said to be in a document - // fragment in IE 9 - elem.document && elem.document.nodeType !== 11) { - return ret; - } - } catch (e) { } - } - - return Sizzle(expr, document, null, [elem]).length > 0; - }; - - Sizzle.contains = function (context, elem) { - // Set document vars if needed - if ((context.ownerDocument || context) !== document) { - setDocument(context); - } - return contains(context, elem); - }; - - Sizzle.attr = function (elem, name) { - // Set document vars if needed - if ((elem.ownerDocument || elem) !== document) { - setDocument(elem); - } - - var fn = Expr.attrHandle[name.toLowerCase()], - // Don't get fooled by Object.prototype properties (jQuery #13807) - val = fn && hasOwn.call(Expr.attrHandle, name.toLowerCase()) ? - fn(elem, name, !documentIsHTML) : - undefined; - - return val !== undefined ? - val : - support.attributes || !documentIsHTML ? - elem.getAttribute(name) : - (val = elem.getAttributeNode(name)) && val.specified ? - val.value : - null; - }; - - Sizzle.error = function (msg) { - throw new Error("Syntax error, unrecognized expression: " + msg); - }; - - /** - * Document sorting and removing duplicates - * @param {ArrayLike} results - */ - Sizzle.uniqueSort = function (results) { - var elem, - duplicates = [], - j = 0, - i = 0; - - // Unless we *know* we can detect duplicates, assume their presence - hasDuplicate = !support.detectDuplicates; - sortInput = !support.sortStable && results.slice(0); - results.sort(sortOrder); - - if (hasDuplicate) { - while ((elem = results[i++])) { - if (elem === results[i]) { - j = duplicates.push(i); - } - } - while (j--) { - results.splice(duplicates[j], 1); - } - } - - // Clear input after sorting to release objects - // See https://github.com/jquery/sizzle/pull/225 - sortInput = null; - - return results; - }; - - /** - * Utility function for retrieving the text value of an array of DOM nodes - * @param {Array|Element} elem - */ - getText = Sizzle.getText = function (elem) { - var node, - ret = "", - i = 0, - nodeType = elem.nodeType; - - if (!nodeType) { - // If no nodeType, this is expected to be an array - while ((node = elem[i++])) { - // Do not traverse comment nodes - ret += getText(node); - } - } else if (nodeType === 1 || nodeType === 9 || nodeType === 11) { - // Use textContent for elements - // innerText usage removed for consistency of new lines (jQuery #11153) - if (typeof elem.textContent === "string") { - return elem.textContent; - } else { - // Traverse its children - for (elem = elem.firstChild; elem; elem = elem.nextSibling) { - ret += getText(elem); - } - } - } else if (nodeType === 3 || nodeType === 4) { - return elem.nodeValue; - } - // Do not include comment or processing instruction nodes - - return ret; - }; - - Expr = Sizzle.selectors = { - - // Can be adjusted by the user - cacheLength: 50, - - createPseudo: markFunction, - - match: matchExpr, - - attrHandle: {}, - - find: {}, - - relative: { - ">": { dir: "parentNode", first: true }, - " ": { dir: "parentNode" }, - "+": { dir: "previousSibling", first: true }, - "~": { dir: "previousSibling" } - }, - - preFilter: { - "ATTR": function (match) { - match[1] = match[1].replace(runescape, funescape); - - // Move the given value to match[3] whether quoted or unquoted - match[3] = (match[3] || match[4] || match[5] || "").replace(runescape, funescape); - - if (match[2] === "~=") { - match[3] = " " + match[3] + " "; - } - - return match.slice(0, 4); - }, - - "CHILD": function (match) { - /* matches from matchExpr["CHILD"] - 1 type (only|nth|...) - 2 what (child|of-type) - 3 argument (even|odd|\d*|\d*n([+-]\d+)?|...) - 4 xn-component of xn+y argument ([+-]?\d*n|) - 5 sign of xn-component - 6 x of xn-component - 7 sign of y-component - 8 y of y-component - */ - match[1] = match[1].toLowerCase(); - - if (match[1].slice(0, 3) === "nth") { - // nth-* requires argument - if (!match[3]) { - Sizzle.error(match[0]); - } - - // numeric x and y parameters for Expr.filter.CHILD - // remember that false/true cast respectively to 0/1 - match[4] = +(match[4] ? match[5] + (match[6] || 1) : 2 * (match[3] === "even" || match[3] === "odd")); - match[5] = +((match[7] + match[8]) || match[3] === "odd"); - - // other types prohibit arguments - } else if (match[3]) { - Sizzle.error(match[0]); - } - - return match; - }, - - "PSEUDO": function (match) { - var excess, - unquoted = !match[6] && match[2]; - - if (matchExpr["CHILD"].test(match[0])) { - return null; - } - - // Accept quoted arguments as-is - if (match[3]) { - match[2] = match[4] || match[5] || ""; - - // Strip excess characters from unquoted arguments - } else if (unquoted && rpseudo.test(unquoted) && - // Get excess from tokenize (recursively) - (excess = tokenize(unquoted, true)) && - // advance to the next closing parenthesis - (excess = unquoted.indexOf(")", unquoted.length - excess) - unquoted.length)) { - - // excess is a negative index - match[0] = match[0].slice(0, excess); - match[2] = unquoted.slice(0, excess); - } - - // Return only captures needed by the pseudo filter method (type and argument) - return match.slice(0, 3); - } - }, - - filter: { - - "TAG": function (nodeNameSelector) { - var nodeName = nodeNameSelector.replace(runescape, funescape).toLowerCase(); - return nodeNameSelector === "*" ? - function () { return true; } : - function (elem) { - return elem.nodeName && elem.nodeName.toLowerCase() === nodeName; - }; - }, - - "CLASS": function (className) { - var pattern = classCache[className + " "]; - - return pattern || - (pattern = new RegExp("(^|" + whitespace + ")" + className + "(" + whitespace + "|$)")) && - classCache(className, function (elem) { - return pattern.test(typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || ""); - }); - }, - - "ATTR": function (name, operator, check) { - return function (elem) { - var result = Sizzle.attr(elem, name); - - if (result == null) { - return operator === "!="; - } - if (!operator) { - return true; - } - - result += ""; - - return operator === "=" ? result === check : - operator === "!=" ? result !== check : - operator === "^=" ? check && result.indexOf(check) === 0 : - operator === "*=" ? check && result.indexOf(check) > -1 : - operator === "$=" ? check && result.slice(-check.length) === check : - operator === "~=" ? (" " + result.replace(rwhitespace, " ") + " ").indexOf(check) > -1 : - operator === "|=" ? result === check || result.slice(0, check.length + 1) === check + "-" : - false; - }; - }, - - "CHILD": function (type, what, argument, first, last) { - var simple = type.slice(0, 3) !== "nth", - forward = type.slice(-4) !== "last", - ofType = what === "of-type"; - - return first === 1 && last === 0 ? - - // Shortcut for :nth-*(n) - function (elem) { - return !!elem.parentNode; - } : - - function (elem, context, xml) { - var cache, uniqueCache, outerCache, node, nodeIndex, start, - dir = simple !== forward ? "nextSibling" : "previousSibling", - parent = elem.parentNode, - name = ofType && elem.nodeName.toLowerCase(), - useCache = !xml && !ofType, - diff = false; - - if (parent) { - - // :(first|last|only)-(child|of-type) - if (simple) { - while (dir) { - node = elem; - while ((node = node[dir])) { - if (ofType ? - node.nodeName.toLowerCase() === name : - node.nodeType === 1) { - - return false; - } - } - // Reverse direction for :only-* (if we haven't yet done so) - start = dir = type === "only" && !start && "nextSibling"; - } - return true; - } - - start = [forward ? parent.firstChild : parent.lastChild]; - - // non-xml :nth-child(...) stores cache data on `parent` - if (forward && useCache) { - - // Seek `elem` from a previously-cached index - - // ...in a gzip-friendly way - node = parent; - outerCache = node[expando] || (node[expando] = {}); - - // Support: IE <9 only - // Defend against cloned attroperties (jQuery gh-1709) - uniqueCache = outerCache[node.uniqueID] || - (outerCache[node.uniqueID] = {}); - - cache = uniqueCache[type] || []; - nodeIndex = cache[0] === dirruns && cache[1]; - diff = nodeIndex && cache[2]; - node = nodeIndex && parent.childNodes[nodeIndex]; - - while ((node = ++nodeIndex && node && node[dir] || - - // Fallback to seeking `elem` from the start - (diff = nodeIndex = 0) || start.pop())) { - - // When found, cache indexes on `parent` and break - if (node.nodeType === 1 && ++diff && node === elem) { - uniqueCache[type] = [dirruns, nodeIndex, diff]; - break; - } - } - - } else { - // Use previously-cached element index if available - if (useCache) { - // ...in a gzip-friendly way - node = elem; - outerCache = node[expando] || (node[expando] = {}); - - // Support: IE <9 only - // Defend against cloned attroperties (jQuery gh-1709) - uniqueCache = outerCache[node.uniqueID] || - (outerCache[node.uniqueID] = {}); - - cache = uniqueCache[type] || []; - nodeIndex = cache[0] === dirruns && cache[1]; - diff = nodeIndex; - } - - // xml :nth-child(...) - // or :nth-last-child(...) or :nth(-last)?-of-type(...) - if (diff === false) { - // Use the same loop as above to seek `elem` from the start - while ((node = ++nodeIndex && node && node[dir] || - (diff = nodeIndex = 0) || start.pop())) { - - if ((ofType ? - node.nodeName.toLowerCase() === name : - node.nodeType === 1) && - ++diff) { - - // Cache the index of each encountered element - if (useCache) { - outerCache = node[expando] || (node[expando] = {}); - - // Support: IE <9 only - // Defend against cloned attroperties (jQuery gh-1709) - uniqueCache = outerCache[node.uniqueID] || - (outerCache[node.uniqueID] = {}); - - uniqueCache[type] = [dirruns, diff]; - } - - if (node === elem) { - break; - } - } - } - } - } - - // Incorporate the offset, then check against cycle size - diff -= last; - return diff === first || (diff % first === 0 && diff / first >= 0); - } - }; - }, - - "PSEUDO": function (pseudo, argument) { - // pseudo-class names are case-insensitive - // http://www.w3.org/TR/selectors/#pseudo-classes - // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters - // Remember that setFilters inherits from pseudos - var args, - fn = Expr.pseudos[pseudo] || Expr.setFilters[pseudo.toLowerCase()] || - Sizzle.error("unsupported pseudo: " + pseudo); - - // The user may use createPseudo to indicate that - // arguments are needed to create the filter function - // just as Sizzle does - if (fn[expando]) { - return fn(argument); - } - - // But maintain support for old signatures - if (fn.length > 1) { - args = [pseudo, pseudo, "", argument]; - return Expr.setFilters.hasOwnProperty(pseudo.toLowerCase()) ? - markFunction(function (seed, matches) { - var idx, - matched = fn(seed, argument), - i = matched.length; - while (i--) { - idx = indexOf(seed, matched[i]); - seed[idx] = !(matches[idx] = matched[i]); - } - }) : - function (elem) { - return fn(elem, 0, args); - }; - } - - return fn; - } - }, - - pseudos: { - // Potentially complex pseudos - "not": markFunction(function (selector) { - // Trim the selector passed to compile - // to avoid treating leading and trailing - // spaces as combinators - var input = [], - results = [], - matcher = compile(selector.replace(rtrim, "$1")); - - return matcher[expando] ? - markFunction(function (seed, matches, context, xml) { - var elem, - unmatched = matcher(seed, null, xml, []), - i = seed.length; - - // Match elements unmatched by `matcher` - while (i--) { - if ((elem = unmatched[i])) { - seed[i] = !(matches[i] = elem); - } - } - }) : - function (elem, context, xml) { - input[0] = elem; - matcher(input, null, xml, results); - // Don't keep the element (issue #299) - input[0] = null; - return !results.pop(); - }; - }), - - "has": markFunction(function (selector) { - return function (elem) { - return Sizzle(selector, elem).length > 0; - }; - }), - - "contains": markFunction(function (text) { - text = text.replace(runescape, funescape); - return function (elem) { - return (elem.textContent || elem.innerText || getText(elem)).indexOf(text) > -1; - }; - }), - - // "Whether an element is represented by a :lang() selector - // is based solely on the element's language value - // being equal to the identifier C, - // or beginning with the identifier C immediately followed by "-". - // The matching of C against the element's language value is performed case-insensitively. - // The identifier C does not have to be a valid language name." - // http://www.w3.org/TR/selectors/#lang-pseudo - "lang": markFunction(function (lang) { - // lang value must be a valid identifier - if (!ridentifier.test(lang || "")) { - Sizzle.error("unsupported lang: " + lang); - } - lang = lang.replace(runescape, funescape).toLowerCase(); - return function (elem) { - var elemLang; - do { - if ((elemLang = documentIsHTML ? - elem.lang : - elem.getAttribute("xml:lang") || elem.getAttribute("lang"))) { - - elemLang = elemLang.toLowerCase(); - return elemLang === lang || elemLang.indexOf(lang + "-") === 0; - } - } while ((elem = elem.parentNode) && elem.nodeType === 1); - return false; - }; - }), - - // Miscellaneous - "target": function (elem) { - var hash = window.location && window.location.hash; - return hash && hash.slice(1) === elem.id; - }, - - "root": function (elem) { - return elem === docElem; - }, - - "focus": function (elem) { - return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex); - }, - - // Boolean properties - "enabled": function (elem) { - return elem.disabled === false; - }, - - "disabled": function (elem) { - return elem.disabled === true; - }, - - "checked": function (elem) { - // In CSS3, :checked should return both checked and selected elements - // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked - var nodeName = elem.nodeName.toLowerCase(); - return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected); - }, - - "selected": function (elem) { - // Accessing this property makes selected-by-default - // options in Safari work properly - if (elem.parentNode) { - elem.parentNode.selectedIndex; - } - - return elem.selected === true; - }, - - // Contents - "empty": function (elem) { - // http://www.w3.org/TR/selectors/#empty-pseudo - // :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5), - // but not by others (comment: 8; processing instruction: 7; etc.) - // nodeType < 6 works because attributes (2) do not appear as children - for (elem = elem.firstChild; elem; elem = elem.nextSibling) { - if (elem.nodeType < 6) { - return false; - } - } - return true; - }, - - "parent": function (elem) { - return !Expr.pseudos["empty"](elem); - }, - - // Element/input types - "header": function (elem) { - return rheader.test(elem.nodeName); - }, - - "input": function (elem) { - return rinputs.test(elem.nodeName); - }, - - "button": function (elem) { - var name = elem.nodeName.toLowerCase(); - return name === "input" && elem.type === "button" || name === "button"; - }, - - "text": function (elem) { - var attr; - return elem.nodeName.toLowerCase() === "input" && - elem.type === "text" && - - // Support: IE<8 - // New HTML5 attribute values (e.g., "search") appear with elem.type === "text" - ((attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text"); - }, - - // Position-in-collection - "first": createPositionalPseudo(function () { - return [0]; - }), - - "last": createPositionalPseudo(function (matchIndexes, length) { - return [length - 1]; - }), - - "eq": createPositionalPseudo(function (matchIndexes, length, argument) { - return [argument < 0 ? argument + length : argument]; - }), - - "even": createPositionalPseudo(function (matchIndexes, length) { - var i = 0; - for (; i < length; i += 2) { - matchIndexes.push(i); - } - return matchIndexes; - }), - - "odd": createPositionalPseudo(function (matchIndexes, length) { - var i = 1; - for (; i < length; i += 2) { - matchIndexes.push(i); - } - return matchIndexes; - }), - - "lt": createPositionalPseudo(function (matchIndexes, length, argument) { - var i = argument < 0 ? argument + length : argument; - for (; --i >= 0;) { - matchIndexes.push(i); - } - return matchIndexes; - }), - - "gt": createPositionalPseudo(function (matchIndexes, length, argument) { - var i = argument < 0 ? argument + length : argument; - for (; ++i < length;) { - matchIndexes.push(i); - } - return matchIndexes; - }) - } - }; - - Expr.pseudos["nth"] = Expr.pseudos["eq"]; - - // Add button/input type pseudos - for (i in { radio: true, checkbox: true, file: true, password: true, image: true }) { - Expr.pseudos[i] = createInputPseudo(i); - } - for (i in { submit: true, reset: true }) { - Expr.pseudos[i] = createButtonPseudo(i); - } - - // Easy API for creating new setFilters - function setFilters() { } - setFilters.prototype = Expr.filters = Expr.pseudos; - Expr.setFilters = new setFilters(); - - tokenize = Sizzle.tokenize = function (selector, parseOnly) { - var matched, match, tokens, type, - soFar, groups, preFilters, - cached = tokenCache[selector + " "]; - - if (cached) { - return parseOnly ? 0 : cached.slice(0); - } - - soFar = selector; - groups = []; - preFilters = Expr.preFilter; - - while (soFar) { - - // Comma and first run - if (!matched || (match = rcomma.exec(soFar))) { - if (match) { - // Don't consume trailing commas as valid - soFar = soFar.slice(match[0].length) || soFar; - } - groups.push((tokens = [])); - } - - matched = false; - - // Combinators - if ((match = rcombinators.exec(soFar))) { - matched = match.shift(); - tokens.push({ - value: matched, - // Cast descendant combinators to space - type: match[0].replace(rtrim, " ") - }); - soFar = soFar.slice(matched.length); - } - - // Filters - for (type in Expr.filter) { - if ((match = matchExpr[type].exec(soFar)) && (!preFilters[type] || - (match = preFilters[type](match)))) { - matched = match.shift(); - tokens.push({ - value: matched, - type: type, - matches: match - }); - soFar = soFar.slice(matched.length); - } - } - - if (!matched) { - break; - } - } - - // Return the length of the invalid excess - // if we're just parsing - // Otherwise, throw an error or return tokens - return parseOnly ? - soFar.length : - soFar ? - Sizzle.error(selector) : - // Cache the tokens - tokenCache(selector, groups).slice(0); - }; - - function toSelector(tokens) { - var i = 0, - len = tokens.length, - selector = ""; - for (; i < len; i++) { - selector += tokens[i].value; - } - return selector; - } - - function addCombinator(matcher, combinator, base) { - var dir = combinator.dir, - checkNonElements = base && dir === "parentNode", - doneName = done++; - - return combinator.first ? - // Check against closest ancestor/preceding element - function (elem, context, xml) { - while ((elem = elem[dir])) { - if (elem.nodeType === 1 || checkNonElements) { - return matcher(elem, context, xml); - } - } - } : - - // Check against all ancestor/preceding elements - function (elem, context, xml) { - var oldCache, uniqueCache, outerCache, - newCache = [dirruns, doneName]; - - // We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching - if (xml) { - while ((elem = elem[dir])) { - if (elem.nodeType === 1 || checkNonElements) { - if (matcher(elem, context, xml)) { - return true; - } - } - } - } else { - while ((elem = elem[dir])) { - if (elem.nodeType === 1 || checkNonElements) { - outerCache = elem[expando] || (elem[expando] = {}); - - // Support: IE <9 only - // Defend against cloned attroperties (jQuery gh-1709) - uniqueCache = outerCache[elem.uniqueID] || (outerCache[elem.uniqueID] = {}); - - if ((oldCache = uniqueCache[dir]) && - oldCache[0] === dirruns && oldCache[1] === doneName) { - - // Assign to newCache so results back-propagate to previous elements - return (newCache[2] = oldCache[2]); - } else { - // Reuse newcache so results back-propagate to previous elements - uniqueCache[dir] = newCache; - - // A match means we're done; a fail means we have to keep checking - if ((newCache[2] = matcher(elem, context, xml))) { - return true; - } - } - } - } - } - }; - } - - function elementMatcher(matchers) { - return matchers.length > 1 ? - function (elem, context, xml) { - var i = matchers.length; - while (i--) { - if (!matchers[i](elem, context, xml)) { - return false; - } - } - return true; - } : - matchers[0]; - } - - function multipleContexts(selector, contexts, results) { - var i = 0, - len = contexts.length; - for (; i < len; i++) { - Sizzle(selector, contexts[i], results); - } - return results; - } - - function condense(unmatched, map, filter, context, xml) { - var elem, - newUnmatched = [], - i = 0, - len = unmatched.length, - mapped = map != null; - - for (; i < len; i++) { - if ((elem = unmatched[i])) { - if (!filter || filter(elem, context, xml)) { - newUnmatched.push(elem); - if (mapped) { - map.push(i); - } - } - } - } - - return newUnmatched; - } - - function setMatcher(preFilter, selector, matcher, postFilter, postFinder, postSelector) { - if (postFilter && !postFilter[expando]) { - postFilter = setMatcher(postFilter); - } - if (postFinder && !postFinder[expando]) { - postFinder = setMatcher(postFinder, postSelector); - } - return markFunction(function (seed, results, context, xml) { - var temp, i, elem, - preMap = [], - postMap = [], - preexisting = results.length, - - // Get initial elements from seed or context - elems = seed || multipleContexts(selector || "*", context.nodeType ? [context] : context, []), - - // Prefilter to get matcher input, preserving a map for seed-results synchronization - matcherIn = preFilter && (seed || !selector) ? - condense(elems, preMap, preFilter, context, xml) : - elems, - - matcherOut = matcher ? - // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results, - postFinder || (seed ? preFilter : preexisting || postFilter) ? - - // ...intermediate processing is necessary - [] : - - // ...otherwise use results directly - results : - matcherIn; - - // Find primary matches - if (matcher) { - matcher(matcherIn, matcherOut, context, xml); - } - - // Apply postFilter - if (postFilter) { - temp = condense(matcherOut, postMap); - postFilter(temp, [], context, xml); - - // Un-match failing elements by moving them back to matcherIn - i = temp.length; - while (i--) { - if ((elem = temp[i])) { - matcherOut[postMap[i]] = !(matcherIn[postMap[i]] = elem); - } - } - } - - if (seed) { - if (postFinder || preFilter) { - if (postFinder) { - // Get the final matcherOut by condensing this intermediate into postFinder contexts - temp = []; - i = matcherOut.length; - while (i--) { - if ((elem = matcherOut[i])) { - // Restore matcherIn since elem is not yet a final match - temp.push((matcherIn[i] = elem)); - } - } - postFinder(null, (matcherOut = []), temp, xml); - } - - // Move matched elements from seed to results to keep them synchronized - i = matcherOut.length; - while (i--) { - if ((elem = matcherOut[i]) && - (temp = postFinder ? indexOf(seed, elem) : preMap[i]) > -1) { - - seed[temp] = !(results[temp] = elem); - } - } - } - - // Add elements to results, through postFinder if defined - } else { - matcherOut = condense( - matcherOut === results ? - matcherOut.splice(preexisting, matcherOut.length) : - matcherOut - ); - if (postFinder) { - postFinder(null, results, matcherOut, xml); - } else { - push.apply(results, matcherOut); - } - } - }); - } - - function matcherFromTokens(tokens) { - var checkContext, matcher, j, - len = tokens.length, - leadingRelative = Expr.relative[tokens[0].type], - implicitRelative = leadingRelative || Expr.relative[" "], - i = leadingRelative ? 1 : 0, - - // The foundational matcher ensures that elements are reachable from top-level context(s) - matchContext = addCombinator(function (elem) { - return elem === checkContext; - }, implicitRelative, true), - matchAnyContext = addCombinator(function (elem) { - return indexOf(checkContext, elem) > -1; - }, implicitRelative, true), - matchers = [function (elem, context, xml) { - var ret = (!leadingRelative && (xml || context !== outermostContext)) || ( - (checkContext = context).nodeType ? - matchContext(elem, context, xml) : - matchAnyContext(elem, context, xml)); - // Avoid hanging onto element (issue #299) - checkContext = null; - return ret; - }]; - - for (; i < len; i++) { - if ((matcher = Expr.relative[tokens[i].type])) { - matchers = [addCombinator(elementMatcher(matchers), matcher)]; - } else { - matcher = Expr.filter[tokens[i].type].apply(null, tokens[i].matches); - - // Return special upon seeing a positional matcher - if (matcher[expando]) { - // Find the next relative operator (if any) for proper handling - j = ++i; - for (; j < len; j++) { - if (Expr.relative[tokens[j].type]) { - break; - } - } - return setMatcher( - i > 1 && elementMatcher(matchers), - i > 1 && toSelector( - // If the preceding token was a descendant combinator, insert an implicit any-element `*` - tokens.slice(0, i - 1).concat({ value: tokens[i - 2].type === " " ? "*" : "" }) - ).replace(rtrim, "$1"), - matcher, - i < j && matcherFromTokens(tokens.slice(i, j)), - j < len && matcherFromTokens((tokens = tokens.slice(j))), - j < len && toSelector(tokens) - ); - } - matchers.push(matcher); - } - } - - return elementMatcher(matchers); - } - - function matcherFromGroupMatchers(elementMatchers, setMatchers) { - var bySet = setMatchers.length > 0, - byElement = elementMatchers.length > 0, - superMatcher = function (seed, context, xml, results, outermost) { - var elem, j, matcher, - matchedCount = 0, - i = "0", - unmatched = seed && [], - setMatched = [], - contextBackup = outermostContext, - // We must always have either seed elements or outermost context - elems = seed || byElement && Expr.find["TAG"]("*", outermost), - // Use integer dirruns iff this is the outermost matcher - dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1), - len = elems.length; - - if (outermost) { - outermostContext = context === document || context || outermost; - } - - // Add elements passing elementMatchers directly to results - // Support: IE<9, Safari - // Tolerate NodeList properties (IE: "length"; Safari: ) matching elements by id - for (; i !== len && (elem = elems[i]) != null; i++) { - if (byElement && elem) { - j = 0; - if (!context && elem.ownerDocument !== document) { - setDocument(elem); - xml = !documentIsHTML; - } - while ((matcher = elementMatchers[j++])) { - if (matcher(elem, context || document, xml)) { - results.push(elem); - break; - } - } - if (outermost) { - dirruns = dirrunsUnique; - } - } - - // Track unmatched elements for set filters - if (bySet) { - // They will have gone through all possible matchers - if ((elem = !matcher && elem)) { - matchedCount--; - } - - // Lengthen the array for every element, matched or not - if (seed) { - unmatched.push(elem); - } - } - } - - // `i` is now the count of elements visited above, and adding it to `matchedCount` - // makes the latter nonnegative. - matchedCount += i; - - // Apply set filters to unmatched elements - // NOTE: This can be skipped if there are no unmatched elements (i.e., `matchedCount` - // equals `i`), unless we didn't visit _any_ elements in the above loop because we have - // no element matchers and no seed. - // Incrementing an initially-string "0" `i` allows `i` to remain a string only in that - // case, which will result in a "00" `matchedCount` that differs from `i` but is also - // numerically zero. - if (bySet && i !== matchedCount) { - j = 0; - while ((matcher = setMatchers[j++])) { - matcher(unmatched, setMatched, context, xml); - } - - if (seed) { - // Reintegrate element matches to eliminate the need for sorting - if (matchedCount > 0) { - while (i--) { - if (!(unmatched[i] || setMatched[i])) { - setMatched[i] = pop.call(results); - } - } - } - - // Discard index placeholder values to get only actual matches - setMatched = condense(setMatched); - } - - // Add matches to results - push.apply(results, setMatched); - - // Seedless set matches succeeding multiple successful matchers stipulate sorting - if (outermost && !seed && setMatched.length > 0 && - (matchedCount + setMatchers.length) > 1) { - - Sizzle.uniqueSort(results); - } - } - - // Override manipulation of globals by nested matchers - if (outermost) { - dirruns = dirrunsUnique; - outermostContext = contextBackup; - } - - return unmatched; - }; - - return bySet ? - markFunction(superMatcher) : - superMatcher; - } - - compile = Sizzle.compile = function (selector, match /* Internal Use Only */) { - var i, - setMatchers = [], - elementMatchers = [], - cached = compilerCache[selector + " "]; - - if (!cached) { - // Generate a function of recursive functions that can be used to check each element - if (!match) { - match = tokenize(selector); - } - i = match.length; - while (i--) { - cached = matcherFromTokens(match[i]); - if (cached[expando]) { - setMatchers.push(cached); - } else { - elementMatchers.push(cached); - } - } - - // Cache the compiled function - cached = compilerCache(selector, matcherFromGroupMatchers(elementMatchers, setMatchers)); - - // Save selector and tokenization - cached.selector = selector; - } - return cached; - }; - - /** - * A low-level selection function that works with Sizzle's compiled - * selector functions - * @param {String|Function} selector A selector or a pre-compiled - * selector function built with Sizzle.compile - * @param {Element} context - * @param {Array} [results] - * @param {Array} [seed] A set of elements to match against - */ - select = Sizzle.select = function (selector, context, results, seed) { - var i, tokens, token, type, find, - compiled = typeof selector === "function" && selector, - match = !seed && tokenize((selector = compiled.selector || selector)); - - results = results || []; - - // Try to minimize operations if there is only one selector in the list and no seed - // (the latter of which guarantees us context) - if (match.length === 1) { - - // Reduce context if the leading compound selector is an ID - tokens = match[0] = match[0].slice(0); - if (tokens.length > 2 && (token = tokens[0]).type === "ID" && - support.getById && context.nodeType === 9 && documentIsHTML && - Expr.relative[tokens[1].type]) { - - context = (Expr.find["ID"](token.matches[0].replace(runescape, funescape), context) || [])[0]; - if (!context) { - return results; - - // Precompiled matchers will still verify ancestry, so step up a level - } else if (compiled) { - context = context.parentNode; - } - - selector = selector.slice(tokens.shift().value.length); - } - - // Fetch a seed set for right-to-left matching - i = matchExpr["needsContext"].test(selector) ? 0 : tokens.length; - while (i--) { - token = tokens[i]; - - // Abort if we hit a combinator - if (Expr.relative[(type = token.type)]) { - break; - } - if ((find = Expr.find[type])) { - // Search, expanding context for leading sibling combinators - if ((seed = find( - token.matches[0].replace(runescape, funescape), - rsibling.test(tokens[0].type) && testContext(context.parentNode) || context - ))) { - - // If seed is empty or no tokens remain, we can return early - tokens.splice(i, 1); - selector = seed.length && toSelector(tokens); - if (!selector) { - push.apply(results, seed); - return results; - } - - break; - } - } - } - } - - // Compile and execute a filtering function if one is not provided - // Provide `match` to avoid retokenization if we modified the selector above - (compiled || compile(selector, match))( - seed, - context, - !documentIsHTML, - results, - !context || rsibling.test(selector) && testContext(context.parentNode) || context - ); - return results; - }; - - // One-time assignments - - // Sort stability - support.sortStable = expando.split("").sort(sortOrder).join("") === expando; - - // Support: Chrome 14-35+ - // Always assume duplicates if they aren't passed to the comparison function - support.detectDuplicates = !!hasDuplicate; - - // Initialize against the default document - setDocument(); - - // Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27) - // Detached nodes confoundingly follow *each other* - support.sortDetached = assert(function (div1) { - // Should return 1, but returns 4 (following) - return div1.compareDocumentPosition(document.createElement("div")) & 1; - }); - - // Support: IE<8 - // Prevent attribute/property "interpolation" - // http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx - if (!assert(function (div) { - div.innerHTML = ""; - return div.firstChild.getAttribute("href") === "#"; - })) { - addHandle("type|href|height|width", function (elem, name, isXML) { - if (!isXML) { - return elem.getAttribute(name, name.toLowerCase() === "type" ? 1 : 2); - } - }); - } - - // Support: IE<9 - // Use defaultValue in place of getAttribute("value") - if (!support.attributes || !assert(function (div) { - div.innerHTML = ""; - div.firstChild.setAttribute("value", ""); - return div.firstChild.getAttribute("value") === ""; - })) { - addHandle("value", function (elem, name, isXML) { - if (!isXML && elem.nodeName.toLowerCase() === "input") { - return elem.defaultValue; - } - }); - } - - // Support: IE<9 - // Use getAttributeNode to fetch booleans when getAttribute lies - if (!assert(function (div) { - return div.getAttribute("disabled") == null; - })) { - addHandle(booleans, function (elem, name, isXML) { - var val; - if (!isXML) { - return elem[name] === true ? name.toLowerCase() : - (val = elem.getAttributeNode(name)) && val.specified ? - val.value : - null; - } - }); - } - - return Sizzle; - - })(window); - - - - jQuery.find = Sizzle; - jQuery.expr = Sizzle.selectors; - jQuery.expr[":"] = jQuery.expr.pseudos; - jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort; - jQuery.text = Sizzle.getText; - jQuery.isXMLDoc = Sizzle.isXML; - jQuery.contains = Sizzle.contains; - - - - var dir = function (elem, dir, until) { - var matched = [], - truncate = until !== undefined; - - while ((elem = elem[dir]) && elem.nodeType !== 9) { - if (elem.nodeType === 1) { - if (truncate && jQuery(elem).is(until)) { - break; - } - matched.push(elem); - } - } - return matched; - }; - - - var siblings = function (n, elem) { - var matched = []; - - for (; n; n = n.nextSibling) { - if (n.nodeType === 1 && n !== elem) { - matched.push(n); - } - } - - return matched; - }; - - - var rneedsContext = jQuery.expr.match.needsContext; - - var rsingleTag = (/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/); - - - - var risSimple = /^.[^:#\[\.,]*$/; - - // Implement the identical functionality for filter and not - function winnow(elements, qualifier, not) { - if (jQuery.isFunction(qualifier)) { - return jQuery.grep(elements, function (elem, i) { - /* jshint -W018 */ - return !!qualifier.call(elem, i, elem) !== not; - }); - - } - - if (qualifier.nodeType) { - return jQuery.grep(elements, function (elem) { - return (elem === qualifier) !== not; - }); - - } - - if (typeof qualifier === "string") { - if (risSimple.test(qualifier)) { - return jQuery.filter(qualifier, elements, not); - } - - qualifier = jQuery.filter(qualifier, elements); - } - - return jQuery.grep(elements, function (elem) { - return (indexOf.call(qualifier, elem) > -1) !== not; - }); - } - - jQuery.filter = function (expr, elems, not) { - var elem = elems[0]; - - if (not) { - expr = ":not(" + expr + ")"; - } - - return elems.length === 1 && elem.nodeType === 1 ? - jQuery.find.matchesSelector(elem, expr) ? [elem] : [] : - jQuery.find.matches(expr, jQuery.grep(elems, function (elem) { - return elem.nodeType === 1; - })); - }; - - jQuery.fn.extend({ - find: function (selector) { - var i, - len = this.length, - ret = [], - self = this; - - if (typeof selector !== "string") { - return this.pushStack(jQuery(selector).filter(function () { - for (i = 0; i < len; i++) { - if (jQuery.contains(self[i], this)) { - return true; - } - } - })); - } - - for (i = 0; i < len; i++) { - jQuery.find(selector, self[i], ret); - } - - // Needed because $( selector, context ) becomes $( context ).find( selector ) - ret = this.pushStack(len > 1 ? jQuery.unique(ret) : ret); - ret.selector = this.selector ? this.selector + " " + selector : selector; - return ret; - }, - filter: function (selector) { - return this.pushStack(winnow(this, selector || [], false)); - }, - not: function (selector) { - return this.pushStack(winnow(this, selector || [], true)); - }, - is: function (selector) { - return !!winnow( - this, - - // If this is a positional/relative selector, check membership in the returned set - // so $("p:first").is("p:last") won't return true for a doc with two "p". - typeof selector === "string" && rneedsContext.test(selector) ? - jQuery(selector) : - selector || [], - false - ).length; - } - }); - - - // Initialize a jQuery object - - - // A central reference to the root jQuery(document) - var rootjQuery, - - // A simple way to check for HTML strings - // Prioritize #id over to avoid XSS via location.hash (#9521) - // Strict HTML recognition (#11290: must start with <) - rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/, - - init = jQuery.fn.init = function (selector, context, root) { - var match, elem; - - // HANDLE: $(""), $(null), $(undefined), $(false) - if (!selector) { - return this; - } - - // Method init() accepts an alternate rootjQuery - // so migrate can support jQuery.sub (gh-2101) - root = root || rootjQuery; - - // Handle HTML strings - if (typeof selector === "string") { - if (selector[0] === "<" && - selector[selector.length - 1] === ">" && - selector.length >= 3) { - - // Assume that strings that start and end with <> are HTML and skip the regex check - match = [null, selector, null]; - - } else { - match = rquickExpr.exec(selector); - } - - // Match html or make sure no context is specified for #id - if (match && (match[1] || !context)) { - - // HANDLE: $(html) -> $(array) - if (match[1]) { - context = context instanceof jQuery ? context[0] : context; - - // Option to run scripts is true for back-compat - // Intentionally let the error be thrown if parseHTML is not present - jQuery.merge(this, jQuery.parseHTML( - match[1], - context && context.nodeType ? context.ownerDocument || context : document, - true - )); - - // HANDLE: $(html, props) - if (rsingleTag.test(match[1]) && jQuery.isPlainObject(context)) { - for (match in context) { - - // Properties of context are called as methods if possible - if (jQuery.isFunction(this[match])) { - this[match](context[match]); - - // ...and otherwise set as attributes - } else { - this.attr(match, context[match]); - } - } - } - - return this; - - // HANDLE: $(#id) - } else { - elem = document.getElementById(match[2]); - - // Support: Blackberry 4.6 - // gEBID returns nodes no longer in the document (#6963) - if (elem && elem.parentNode) { - - // Inject the element directly into the jQuery object - this.length = 1; - this[0] = elem; - } - - this.context = document; - this.selector = selector; - return this; - } - - // HANDLE: $(expr, $(...)) - } else if (!context || context.jquery) { - return (context || root).find(selector); - - // HANDLE: $(expr, context) - // (which is just equivalent to: $(context).find(expr) - } else { - return this.constructor(context).find(selector); - } - - // HANDLE: $(DOMElement) - } else if (selector.nodeType) { - this.context = this[0] = selector; - this.length = 1; - return this; - - // HANDLE: $(function) - // Shortcut for document ready - } else if (jQuery.isFunction(selector)) { - return root.ready !== undefined ? - root.ready(selector) : - - // Execute immediately if ready is not present - selector(jQuery); - } - - if (selector.selector !== undefined) { - this.selector = selector.selector; - this.context = selector.context; - } - - return jQuery.makeArray(selector, this); - }; - - // Give the init function the jQuery prototype for later instantiation - init.prototype = jQuery.fn; - - // Initialize central reference - rootjQuery = jQuery(document); - - - var rparentsprev = /^(?:parents|prev(?:Until|All))/, - - // Methods guaranteed to produce a unique set when starting from a unique set - guaranteedUnique = { - children: true, - contents: true, - next: true, - prev: true - }; - - jQuery.fn.extend({ - has: function (target) { - var targets = jQuery(target, this), - l = targets.length; - - return this.filter(function () { - var i = 0; - for (; i < l; i++) { - if (jQuery.contains(this, targets[i])) { - return true; - } - } - }); - }, - - closest: function (selectors, context) { - var cur, - i = 0, - l = this.length, - matched = [], - pos = rneedsContext.test(selectors) || typeof selectors !== "string" ? - jQuery(selectors, context || this.context) : - 0; - - for (; i < l; i++) { - for (cur = this[i]; cur && cur !== context; cur = cur.parentNode) { - - // Always skip document fragments - if (cur.nodeType < 11 && (pos ? - pos.index(cur) > -1 : - - // Don't pass non-elements to Sizzle - cur.nodeType === 1 && - jQuery.find.matchesSelector(cur, selectors))) { - - matched.push(cur); - break; - } - } - } - - return this.pushStack(matched.length > 1 ? jQuery.uniqueSort(matched) : matched); - }, - - // Determine the position of an element within the set - index: function (elem) { - - // No argument, return index in parent - if (!elem) { - return (this[0] && this[0].parentNode) ? this.first().prevAll().length : -1; - } - - // Index in selector - if (typeof elem === "string") { - return indexOf.call(jQuery(elem), this[0]); - } - - // Locate the position of the desired element - return indexOf.call(this, - - // If it receives a jQuery object, the first element is used - elem.jquery ? elem[0] : elem - ); - }, - - add: function (selector, context) { - return this.pushStack( - jQuery.uniqueSort( - jQuery.merge(this.get(), jQuery(selector, context)) - ) - ); - }, - - addBack: function (selector) { - return this.add(selector == null ? - this.prevObject : this.prevObject.filter(selector) - ); - } - }); - - function sibling(cur, dir) { - while ((cur = cur[dir]) && cur.nodeType !== 1) { } - return cur; - } - - jQuery.each({ - parent: function (elem) { - var parent = elem.parentNode; - return parent && parent.nodeType !== 11 ? parent : null; - }, - parents: function (elem) { - return dir(elem, "parentNode"); - }, - parentsUntil: function (elem, i, until) { - return dir(elem, "parentNode", until); - }, - next: function (elem) { - return sibling(elem, "nextSibling"); - }, - prev: function (elem) { - return sibling(elem, "previousSibling"); - }, - nextAll: function (elem) { - return dir(elem, "nextSibling"); - }, - prevAll: function (elem) { - return dir(elem, "previousSibling"); - }, - nextUntil: function (elem, i, until) { - return dir(elem, "nextSibling", until); - }, - prevUntil: function (elem, i, until) { - return dir(elem, "previousSibling", until); - }, - siblings: function (elem) { - return siblings((elem.parentNode || {}).firstChild, elem); - }, - children: function (elem) { - return siblings(elem.firstChild); - }, - contents: function (elem) { - return elem.contentDocument || jQuery.merge([], elem.childNodes); - } - }, function (name, fn) { - jQuery.fn[name] = function (until, selector) { - var matched = jQuery.map(this, fn, until); - - if (name.slice(-5) !== "Until") { - selector = until; - } - - if (selector && typeof selector === "string") { - matched = jQuery.filter(selector, matched); - } - - if (this.length > 1) { - - // Remove duplicates - if (!guaranteedUnique[name]) { - jQuery.uniqueSort(matched); - } - - // Reverse order for parents* and prev-derivatives - if (rparentsprev.test(name)) { - matched.reverse(); - } - } - - return this.pushStack(matched); - }; - }); - var rnotwhite = (/\S+/g); - - - - // Convert String-formatted options into Object-formatted ones - function createOptions(options) { - var object = {}; - jQuery.each(options.match(rnotwhite) || [], function (_, flag) { - object[flag] = true; - }); - return object; - } - - /* - * Create a callback list using the following parameters: - * - * options: an optional list of space-separated options that will change how - * the callback list behaves or a more traditional option object - * - * By default a callback list will act like an event callback list and can be - * "fired" multiple times. - * - * Possible options: - * - * once: will ensure the callback list can only be fired once (like a Deferred) - * - * memory: will keep track of previous values and will call any callback added - * after the list has been fired right away with the latest "memorized" - * values (like a Deferred) - * - * unique: will ensure a callback can only be added once (no duplicate in the list) - * - * stopOnFalse: interrupt callings when a callback returns false - * - */ - jQuery.Callbacks = function (options) { - - // Convert options from String-formatted to Object-formatted if needed - // (we check in cache first) - options = typeof options === "string" ? - createOptions(options) : - jQuery.extend({}, options); - - var // Flag to know if list is currently firing - firing, - - // Last fire value for non-forgettable lists - memory, - - // Flag to know if list was already fired - fired, - - // Flag to prevent firing - locked, - - // Actual callback list - list = [], - - // Queue of execution data for repeatable lists - queue = [], - - // Index of currently firing callback (modified by add/remove as needed) - firingIndex = -1, - - // Fire callbacks - fire = function () { - - // Enforce single-firing - locked = options.once; - - // Execute callbacks for all pending executions, - // respecting firingIndex overrides and runtime changes - fired = firing = true; - for (; queue.length; firingIndex = -1) { - memory = queue.shift(); - while (++firingIndex < list.length) { - - // Run callback and check for early termination - if (list[firingIndex].apply(memory[0], memory[1]) === false && - options.stopOnFalse) { - - // Jump to end and forget the data so .add doesn't re-fire - firingIndex = list.length; - memory = false; - } - } - } - - // Forget the data if we're done with it - if (!options.memory) { - memory = false; - } - - firing = false; - - // Clean up if we're done firing for good - if (locked) { - - // Keep an empty list if we have data for future add calls - if (memory) { - list = []; - - // Otherwise, this object is spent - } else { - list = ""; - } - } - }, - - // Actual Callbacks object - self = { - - // Add a callback or a collection of callbacks to the list - add: function () { - if (list) { - - // If we have memory from a past run, we should fire after adding - if (memory && !firing) { - firingIndex = list.length - 1; - queue.push(memory); - } - - (function add(args) { - jQuery.each(args, function (_, arg) { - if (jQuery.isFunction(arg)) { - if (!options.unique || !self.has(arg)) { - list.push(arg); - } - } else if (arg && arg.length && jQuery.type(arg) !== "string") { - - // Inspect recursively - add(arg); - } - }); - })(arguments); - - if (memory && !firing) { - fire(); - } - } - return this; - }, - - // Remove a callback from the list - remove: function () { - jQuery.each(arguments, function (_, arg) { - var index; - while ((index = jQuery.inArray(arg, list, index)) > -1) { - list.splice(index, 1); - - // Handle firing indexes - if (index <= firingIndex) { - firingIndex--; - } - } - }); - return this; - }, - - // Check if a given callback is in the list. - // If no argument is given, return whether or not list has callbacks attached. - has: function (fn) { - return fn ? - jQuery.inArray(fn, list) > -1 : - list.length > 0; - }, - - // Remove all callbacks from the list - empty: function () { - if (list) { - list = []; - } - return this; - }, - - // Disable .fire and .add - // Abort any current/pending executions - // Clear all callbacks and values - disable: function () { - locked = queue = []; - list = memory = ""; - return this; - }, - disabled: function () { - return !list; - }, - - // Disable .fire - // Also disable .add unless we have memory (since it would have no effect) - // Abort any pending executions - lock: function () { - locked = queue = []; - if (!memory) { - list = memory = ""; - } - return this; - }, - locked: function () { - return !!locked; - }, - - // Call all callbacks with the given context and arguments - fireWith: function (context, args) { - if (!locked) { - args = args || []; - args = [context, args.slice ? args.slice() : args]; - queue.push(args); - if (!firing) { - fire(); - } - } - return this; - }, - - // Call all the callbacks with the given arguments - fire: function () { - self.fireWith(this, arguments); - return this; - }, - - // To know if the callbacks have already been called at least once - fired: function () { - return !!fired; - } - }; - - return self; - }; - - - jQuery.extend({ - - Deferred: function (func) { - var tuples = [ - - // action, add listener, listener list, final state - ["resolve", "done", jQuery.Callbacks("once memory"), "resolved"], - ["reject", "fail", jQuery.Callbacks("once memory"), "rejected"], - ["notify", "progress", jQuery.Callbacks("memory")] - ], - state = "pending", - promise = { - state: function () { - return state; - }, - always: function () { - deferred.done(arguments).fail(arguments); - return this; - }, - then: function ( /* fnDone, fnFail, fnProgress */) { - var fns = arguments; - return jQuery.Deferred(function (newDefer) { - jQuery.each(tuples, function (i, tuple) { - var fn = jQuery.isFunction(fns[i]) && fns[i]; - - // deferred[ done | fail | progress ] for forwarding actions to newDefer - deferred[tuple[1]](function () { - var returned = fn && fn.apply(this, arguments); - if (returned && jQuery.isFunction(returned.promise)) { - returned.promise() - .progress(newDefer.notify) - .done(newDefer.resolve) - .fail(newDefer.reject); - } else { - newDefer[tuple[0] + "With"]( - this === promise ? newDefer.promise() : this, - fn ? [returned] : arguments - ); - } - }); - }); - fns = null; - }).promise(); - }, - - // Get a promise for this deferred - // If obj is provided, the promise aspect is added to the object - promise: function (obj) { - return obj != null ? jQuery.extend(obj, promise) : promise; - } - }, - deferred = {}; - - // Keep pipe for back-compat - promise.pipe = promise.then; - - // Add list-specific methods - jQuery.each(tuples, function (i, tuple) { - var list = tuple[2], - stateString = tuple[3]; - - // promise[ done | fail | progress ] = list.add - promise[tuple[1]] = list.add; - - // Handle state - if (stateString) { - list.add(function () { - - // state = [ resolved | rejected ] - state = stateString; - - // [ reject_list | resolve_list ].disable; progress_list.lock - }, tuples[i ^ 1][2].disable, tuples[2][2].lock); - } - - // deferred[ resolve | reject | notify ] - deferred[tuple[0]] = function () { - deferred[tuple[0] + "With"](this === deferred ? promise : this, arguments); - return this; - }; - deferred[tuple[0] + "With"] = list.fireWith; - }); - - // Make the deferred a promise - promise.promise(deferred); - - // Call given func if any - if (func) { - func.call(deferred, deferred); - } - - // All done! - return deferred; - }, - - // Deferred helper - when: function (subordinate /* , ..., subordinateN */) { - var i = 0, - resolveValues = slice.call(arguments), - length = resolveValues.length, - - // the count of uncompleted subordinates - remaining = length !== 1 || - (subordinate && jQuery.isFunction(subordinate.promise)) ? length : 0, - - // the master Deferred. - // If resolveValues consist of only a single Deferred, just use that. - deferred = remaining === 1 ? subordinate : jQuery.Deferred(), - - // Update function for both resolve and progress values - updateFunc = function (i, contexts, values) { - return function (value) { - contexts[i] = this; - values[i] = arguments.length > 1 ? slice.call(arguments) : value; - if (values === progressValues) { - deferred.notifyWith(contexts, values); - } else if (!(--remaining)) { - deferred.resolveWith(contexts, values); - } - }; - }, - - progressValues, progressContexts, resolveContexts; - - // Add listeners to Deferred subordinates; treat others as resolved - if (length > 1) { - progressValues = new Array(length); - progressContexts = new Array(length); - resolveContexts = new Array(length); - for (; i < length; i++) { - if (resolveValues[i] && jQuery.isFunction(resolveValues[i].promise)) { - resolveValues[i].promise() - .progress(updateFunc(i, progressContexts, progressValues)) - .done(updateFunc(i, resolveContexts, resolveValues)) - .fail(deferred.reject); - } else { - --remaining; - } - } - } - - // If we're not waiting on anything, resolve the master - if (!remaining) { - deferred.resolveWith(resolveContexts, resolveValues); - } - - return deferred.promise(); - } - }); - - - // The deferred used on DOM ready - var readyList; - - jQuery.fn.ready = function (fn) { - - // Add the callback - jQuery.ready.promise().done(fn); - - return this; - }; - - jQuery.extend({ - - // Is the DOM ready to be used? Set to true once it occurs. - isReady: false, - - // A counter to track how many items to wait for before - // the ready event fires. See #6781 - readyWait: 1, - - // Hold (or release) the ready event - holdReady: function (hold) { - if (hold) { - jQuery.readyWait++; - } else { - jQuery.ready(true); - } - }, - - // Handle when the DOM is ready - ready: function (wait) { - - // Abort if there are pending holds or we're already ready - if (wait === true ? --jQuery.readyWait : jQuery.isReady) { - return; - } - - // Remember that the DOM is ready - jQuery.isReady = true; - - // If a normal DOM Ready event fired, decrement, and wait if need be - if (wait !== true && --jQuery.readyWait > 0) { - return; - } - - // If there are functions bound, to execute - readyList.resolveWith(document, [jQuery]); - - // Trigger any bound ready events - if (jQuery.fn.triggerHandler) { - jQuery(document).triggerHandler("ready"); - jQuery(document).off("ready"); - } - } - }); - - /** - * The ready event handler and self cleanup method - */ - function completed() { - document.removeEventListener("DOMContentLoaded", completed); - window.removeEventListener("load", completed); - jQuery.ready(); - } - - jQuery.ready.promise = function (obj) { - if (!readyList) { - - readyList = jQuery.Deferred(); - - // Catch cases where $(document).ready() is called - // after the browser event has already occurred. - // Support: IE9-10 only - // Older IE sometimes signals "interactive" too soon - if (document.readyState === "complete" || - (document.readyState !== "loading" && !document.documentElement.doScroll)) { - - // Handle it asynchronously to allow scripts the opportunity to delay ready - window.setTimeout(jQuery.ready); - - } else { - - // Use the handy event callback - document.addEventListener("DOMContentLoaded", completed); - - // A fallback to window.onload, that will always work - window.addEventListener("load", completed); - } - } - return readyList.promise(obj); - }; - - // Kick off the DOM ready check even if the user does not - jQuery.ready.promise(); - - - - - // Multifunctional method to get and set values of a collection - // The value/s can optionally be executed if it's a function - var access = function (elems, fn, key, value, chainable, emptyGet, raw) { - var i = 0, - len = elems.length, - bulk = key == null; - - // Sets many values - if (jQuery.type(key) === "object") { - chainable = true; - for (i in key) { - access(elems, fn, i, key[i], true, emptyGet, raw); - } - - // Sets one value - } else if (value !== undefined) { - chainable = true; - - if (!jQuery.isFunction(value)) { - raw = true; - } - - if (bulk) { - - // Bulk operations run against the entire set - if (raw) { - fn.call(elems, value); - fn = null; - - // ...except when executing function values - } else { - bulk = fn; - fn = function (elem, key, value) { - return bulk.call(jQuery(elem), value); - }; - } - } - - if (fn) { - for (; i < len; i++) { - fn( - elems[i], key, raw ? - value : - value.call(elems[i], i, fn(elems[i], key)) - ); - } - } - } - - return chainable ? - elems : - - // Gets - bulk ? - fn.call(elems) : - len ? fn(elems[0], key) : emptyGet; - }; - var acceptData = function (owner) { - - // Accepts only: - // - Node - // - Node.ELEMENT_NODE - // - Node.DOCUMENT_NODE - // - Object - // - Any - /* jshint -W018 */ - return owner.nodeType === 1 || owner.nodeType === 9 || !(+owner.nodeType); - }; - - - - - function Data() { - this.expando = jQuery.expando + Data.uid++; - } - - Data.uid = 1; - - Data.prototype = { - - register: function (owner, initial) { - var value = initial || {}; - - // If it is a node unlikely to be stringify-ed or looped over - // use plain assignment - if (owner.nodeType) { - owner[this.expando] = value; - - // Otherwise secure it in a non-enumerable, non-writable property - // configurability must be true to allow the property to be - // deleted with the delete operator - } else { - Object.defineProperty(owner, this.expando, { - value: value, - writable: true, - configurable: true - }); - } - return owner[this.expando]; - }, - cache: function (owner) { - - // We can accept data for non-element nodes in modern browsers, - // but we should not, see #8335. - // Always return an empty object. - if (!acceptData(owner)) { - return {}; - } - - // Check if the owner object already has a cache - var value = owner[this.expando]; - - // If not, create one - if (!value) { - value = {}; - - // We can accept data for non-element nodes in modern browsers, - // but we should not, see #8335. - // Always return an empty object. - if (acceptData(owner)) { - - // If it is a node unlikely to be stringify-ed or looped over - // use plain assignment - if (owner.nodeType) { - owner[this.expando] = value; - - // Otherwise secure it in a non-enumerable property - // configurable must be true to allow the property to be - // deleted when data is removed - } else { - Object.defineProperty(owner, this.expando, { - value: value, - configurable: true - }); - } - } - } - - return value; - }, - set: function (owner, data, value) { - var prop, - cache = this.cache(owner); - - // Handle: [ owner, key, value ] args - if (typeof data === "string") { - cache[data] = value; - - // Handle: [ owner, { properties } ] args - } else { - - // Copy the properties one-by-one to the cache object - for (prop in data) { - cache[prop] = data[prop]; - } - } - return cache; - }, - get: function (owner, key) { - return key === undefined ? - this.cache(owner) : - owner[this.expando] && owner[this.expando][key]; - }, - access: function (owner, key, value) { - var stored; - - // In cases where either: - // - // 1. No key was specified - // 2. A string key was specified, but no value provided - // - // Take the "read" path and allow the get method to determine - // which value to return, respectively either: - // - // 1. The entire cache object - // 2. The data stored at the key - // - if (key === undefined || - ((key && typeof key === "string") && value === undefined)) { - - stored = this.get(owner, key); - - return stored !== undefined ? - stored : this.get(owner, jQuery.camelCase(key)); - } - - // When the key is not a string, or both a key and value - // are specified, set or extend (existing objects) with either: - // - // 1. An object of properties - // 2. A key and value - // - this.set(owner, key, value); - - // Since the "set" path can have two possible entry points - // return the expected data based on which path was taken[*] - return value !== undefined ? value : key; - }, - remove: function (owner, key) { - var i, name, camel, - cache = owner[this.expando]; - - if (cache === undefined) { - return; - } - - if (key === undefined) { - this.register(owner); - - } else { - - // Support array or space separated string of keys - if (jQuery.isArray(key)) { - - // If "name" is an array of keys... - // When data is initially created, via ("key", "val") signature, - // keys will be converted to camelCase. - // Since there is no way to tell _how_ a key was added, remove - // both plain key and camelCase key. #12786 - // This will only penalize the array argument path. - name = key.concat(key.map(jQuery.camelCase)); - } else { - camel = jQuery.camelCase(key); - - // Try the string as a key before any manipulation - if (key in cache) { - name = [key, camel]; - } else { - - // If a key with the spaces exists, use it. - // Otherwise, create an array by matching non-whitespace - name = camel; - name = name in cache ? - [name] : (name.match(rnotwhite) || []); - } - } - - i = name.length; - - while (i--) { - delete cache[name[i]]; - } - } - - // Remove the expando if there's no more data - if (key === undefined || jQuery.isEmptyObject(cache)) { - - // Support: Chrome <= 35-45+ - // Webkit & Blink performance suffers when deleting properties - // from DOM nodes, so set to undefined instead - // https://code.google.com/p/chromium/issues/detail?id=378607 - if (owner.nodeType) { - owner[this.expando] = undefined; - } else { - delete owner[this.expando]; - } - } - }, - hasData: function (owner) { - var cache = owner[this.expando]; - return cache !== undefined && !jQuery.isEmptyObject(cache); - } - }; - var dataPriv = new Data(); - - var dataUser = new Data(); - - - - // Implementation Summary - // - // 1. Enforce API surface and semantic compatibility with 1.9.x branch - // 2. Improve the module's maintainability by reducing the storage - // paths to a single mechanism. - // 3. Use the same single mechanism to support "private" and "user" data. - // 4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData) - // 5. Avoid exposing implementation details on user objects (eg. expando properties) - // 6. Provide a clear path for implementation upgrade to WeakMap in 2014 - - var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/, - rmultiDash = /[A-Z]/g; - - function dataAttr(elem, key, data) { - var name; - - // If nothing was found internally, try to fetch any - // data from the HTML5 data-* attribute - if (data === undefined && elem.nodeType === 1) { - name = "data-" + key.replace(rmultiDash, "-$&").toLowerCase(); - data = elem.getAttribute(name); - - if (typeof data === "string") { - try { - data = data === "true" ? true : - data === "false" ? false : - data === "null" ? null : - - // Only convert to a number if it doesn't change the string - +data + "" === data ? +data : - rbrace.test(data) ? jQuery.parseJSON(data) : - data; - } catch (e) { } - - // Make sure we set the data so it isn't changed later - dataUser.set(elem, key, data); - } else { - data = undefined; - } - } - return data; - } - - jQuery.extend({ - hasData: function (elem) { - return dataUser.hasData(elem) || dataPriv.hasData(elem); - }, - - data: function (elem, name, data) { - return dataUser.access(elem, name, data); - }, - - removeData: function (elem, name) { - dataUser.remove(elem, name); - }, - - // TODO: Now that all calls to _data and _removeData have been replaced - // with direct calls to dataPriv methods, these can be deprecated. - _data: function (elem, name, data) { - return dataPriv.access(elem, name, data); - }, - - _removeData: function (elem, name) { - dataPriv.remove(elem, name); - } - }); - - jQuery.fn.extend({ - data: function (key, value) { - var i, name, data, - elem = this[0], - attrs = elem && elem.attributes; - - // Gets all values - if (key === undefined) { - if (this.length) { - data = dataUser.get(elem); - - if (elem.nodeType === 1 && !dataPriv.get(elem, "hasDataAttrs")) { - i = attrs.length; - while (i--) { - - // Support: IE11+ - // The attrs elements can be null (#14894) - if (attrs[i]) { - name = attrs[i].name; - if (name.indexOf("data-") === 0) { - name = jQuery.camelCase(name.slice(5)); - dataAttr(elem, name, data[name]); - } - } - } - dataPriv.set(elem, "hasDataAttrs", true); - } - } - - return data; - } - - // Sets multiple values - if (typeof key === "object") { - return this.each(function () { - dataUser.set(this, key); - }); - } - - return access(this, function (value) { - var data, camelKey; - - // The calling jQuery object (element matches) is not empty - // (and therefore has an element appears at this[ 0 ]) and the - // `value` parameter was not undefined. An empty jQuery object - // will result in `undefined` for elem = this[ 0 ] which will - // throw an exception if an attempt to read a data cache is made. - if (elem && value === undefined) { - - // Attempt to get data from the cache - // with the key as-is - data = dataUser.get(elem, key) || - - // Try to find dashed key if it exists (gh-2779) - // This is for 2.2.x only - dataUser.get(elem, key.replace(rmultiDash, "-$&").toLowerCase()); - - if (data !== undefined) { - return data; - } - - camelKey = jQuery.camelCase(key); - - // Attempt to get data from the cache - // with the key camelized - data = dataUser.get(elem, camelKey); - if (data !== undefined) { - return data; - } - - // Attempt to "discover" the data in - // HTML5 custom data-* attrs - data = dataAttr(elem, camelKey, undefined); - if (data !== undefined) { - return data; - } - - // We tried really hard, but the data doesn't exist. - return; - } - - // Set the data... - camelKey = jQuery.camelCase(key); - this.each(function () { - - // First, attempt to store a copy or reference of any - // data that might've been store with a camelCased key. - var data = dataUser.get(this, camelKey); - - // For HTML5 data-* attribute interop, we have to - // store property names with dashes in a camelCase form. - // This might not apply to all properties...* - dataUser.set(this, camelKey, value); - - // *... In the case of properties that might _actually_ - // have dashes, we need to also store a copy of that - // unchanged property. - if (key.indexOf("-") > -1 && data !== undefined) { - dataUser.set(this, key, value); - } - }); - }, null, value, arguments.length > 1, null, true); - }, - - removeData: function (key) { - return this.each(function () { - dataUser.remove(this, key); - }); - } - }); - - - jQuery.extend({ - queue: function (elem, type, data) { - var queue; - - if (elem) { - type = (type || "fx") + "queue"; - queue = dataPriv.get(elem, type); - - // Speed up dequeue by getting out quickly if this is just a lookup - if (data) { - if (!queue || jQuery.isArray(data)) { - queue = dataPriv.access(elem, type, jQuery.makeArray(data)); - } else { - queue.push(data); - } - } - return queue || []; - } - }, - - dequeue: function (elem, type) { - type = type || "fx"; - - var queue = jQuery.queue(elem, type), - startLength = queue.length, - fn = queue.shift(), - hooks = jQuery._queueHooks(elem, type), - next = function () { - jQuery.dequeue(elem, type); - }; - - // If the fx queue is dequeued, always remove the progress sentinel - if (fn === "inprogress") { - fn = queue.shift(); - startLength--; - } - - if (fn) { - - // Add a progress sentinel to prevent the fx queue from being - // automatically dequeued - if (type === "fx") { - queue.unshift("inprogress"); - } - - // Clear up the last queue stop function - delete hooks.stop; - fn.call(elem, next, hooks); - } - - if (!startLength && hooks) { - hooks.empty.fire(); - } - }, - - // Not public - generate a queueHooks object, or return the current one - _queueHooks: function (elem, type) { - var key = type + "queueHooks"; - return dataPriv.get(elem, key) || dataPriv.access(elem, key, { - empty: jQuery.Callbacks("once memory").add(function () { - dataPriv.remove(elem, [type + "queue", key]); - }) - }); - } - }); - - jQuery.fn.extend({ - queue: function (type, data) { - var setter = 2; - - if (typeof type !== "string") { - data = type; - type = "fx"; - setter--; - } - - if (arguments.length < setter) { - return jQuery.queue(this[0], type); - } - - return data === undefined ? - this : - this.each(function () { - var queue = jQuery.queue(this, type, data); - - // Ensure a hooks for this queue - jQuery._queueHooks(this, type); - - if (type === "fx" && queue[0] !== "inprogress") { - jQuery.dequeue(this, type); - } - }); - }, - dequeue: function (type) { - return this.each(function () { - jQuery.dequeue(this, type); - }); - }, - clearQueue: function (type) { - return this.queue(type || "fx", []); - }, - - // Get a promise resolved when queues of a certain type - // are emptied (fx is the type by default) - promise: function (type, obj) { - var tmp, - count = 1, - defer = jQuery.Deferred(), - elements = this, - i = this.length, - resolve = function () { - if (!(--count)) { - defer.resolveWith(elements, [elements]); - } - }; - - if (typeof type !== "string") { - obj = type; - type = undefined; - } - type = type || "fx"; - - while (i--) { - tmp = dataPriv.get(elements[i], type + "queueHooks"); - if (tmp && tmp.empty) { - count++; - tmp.empty.add(resolve); - } - } - resolve(); - return defer.promise(obj); - } - }); - var pnum = (/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/).source; - - var rcssNum = new RegExp("^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i"); - - - var cssExpand = ["Top", "Right", "Bottom", "Left"]; - - var isHidden = function (elem, el) { - - // isHidden might be called from jQuery#filter function; - // in that case, element will be second argument - elem = el || elem; - return jQuery.css(elem, "display") === "none" || - !jQuery.contains(elem.ownerDocument, elem); - }; - - - - function adjustCSS(elem, prop, valueParts, tween) { - var adjusted, - scale = 1, - maxIterations = 20, - currentValue = tween ? - function () { return tween.cur(); } : - function () { return jQuery.css(elem, prop, ""); }, - initial = currentValue(), - unit = valueParts && valueParts[3] || (jQuery.cssNumber[prop] ? "" : "px"), - - // Starting value computation is required for potential unit mismatches - initialInUnit = (jQuery.cssNumber[prop] || unit !== "px" && +initial) && - rcssNum.exec(jQuery.css(elem, prop)); - - if (initialInUnit && initialInUnit[3] !== unit) { - - // Trust units reported by jQuery.css - unit = unit || initialInUnit[3]; - - // Make sure we update the tween properties later on - valueParts = valueParts || []; - - // Iteratively approximate from a nonzero starting point - initialInUnit = +initial || 1; - - do { - - // If previous iteration zeroed out, double until we get *something*. - // Use string for doubling so we don't accidentally see scale as unchanged below - scale = scale || ".5"; - - // Adjust and apply - initialInUnit = initialInUnit / scale; - jQuery.style(elem, prop, initialInUnit + unit); - - // Update scale, tolerating zero or NaN from tween.cur() - // Break the loop if scale is unchanged or perfect, or if we've just had enough. - } while ( - scale !== (scale = currentValue() / initial) && scale !== 1 && --maxIterations - ); - } - - if (valueParts) { - initialInUnit = +initialInUnit || +initial || 0; - - // Apply relative offset (+=/-=) if specified - adjusted = valueParts[1] ? - initialInUnit + (valueParts[1] + 1) * valueParts[2] : - +valueParts[2]; - if (tween) { - tween.unit = unit; - tween.start = initialInUnit; - tween.end = adjusted; - } - } - return adjusted; - } - var rcheckableType = (/^(?:checkbox|radio)$/i); - - var rtagName = (/<([\w:-]+)/); - - var rscriptType = (/^$|\/(?:java|ecma)script/i); - - - - // We have to close these tags to support XHTML (#13200) - var wrapMap = { - - // Support: IE9 - option: [1, ""], - - // XHTML parsers do not magically insert elements in the - // same way that tag soup parsers do. So we cannot shorten - // this by omitting or other required elements. - thead: [1, "", "
"], - col: [2, "", "
"], - tr: [2, "", "
"], - td: [3, "", "
"], - - _default: [0, "", ""] - }; - - // Support: IE9 - wrapMap.optgroup = wrapMap.option; - - wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; - wrapMap.th = wrapMap.td; - - - function getAll(context, tag) { - - // Support: IE9-11+ - // Use typeof to avoid zero-argument method invocation on host objects (#15151) - var ret = typeof context.getElementsByTagName !== "undefined" ? - context.getElementsByTagName(tag || "*") : - typeof context.querySelectorAll !== "undefined" ? - context.querySelectorAll(tag || "*") : - []; - - return tag === undefined || tag && jQuery.nodeName(context, tag) ? - jQuery.merge([context], ret) : - ret; - } - - - // Mark scripts as having already been evaluated - function setGlobalEval(elems, refElements) { - var i = 0, - l = elems.length; - - for (; i < l; i++) { - dataPriv.set( - elems[i], - "globalEval", - !refElements || dataPriv.get(refElements[i], "globalEval") - ); - } - } - - - var rhtml = /<|&#?\w+;/; - - function buildFragment(elems, context, scripts, selection, ignored) { - var elem, tmp, tag, wrap, contains, j, - fragment = context.createDocumentFragment(), - nodes = [], - i = 0, - l = elems.length; - - for (; i < l; i++) { - elem = elems[i]; - - if (elem || elem === 0) { - - // Add nodes directly - if (jQuery.type(elem) === "object") { - - // Support: Android<4.1, PhantomJS<2 - // push.apply(_, arraylike) throws on ancient WebKit - jQuery.merge(nodes, elem.nodeType ? [elem] : elem); - - // Convert non-html into a text node - } else if (!rhtml.test(elem)) { - nodes.push(context.createTextNode(elem)); - - // Convert html into DOM nodes - } else { - tmp = tmp || fragment.appendChild(context.createElement("div")); - - // Deserialize a standard representation - tag = (rtagName.exec(elem) || ["", ""])[1].toLowerCase(); - wrap = wrapMap[tag] || wrapMap._default; - tmp.innerHTML = wrap[1] + jQuery.htmlPrefilter(elem) + wrap[2]; - - // Descend through wrappers to the right content - j = wrap[0]; - while (j--) { - tmp = tmp.lastChild; - } - - // Support: Android<4.1, PhantomJS<2 - // push.apply(_, arraylike) throws on ancient WebKit - jQuery.merge(nodes, tmp.childNodes); - - // Remember the top-level container - tmp = fragment.firstChild; - - // Ensure the created nodes are orphaned (#12392) - tmp.textContent = ""; - } - } - } - - // Remove wrapper from fragment - fragment.textContent = ""; - - i = 0; - while ((elem = nodes[i++])) { - - // Skip elements already in the context collection (trac-4087) - if (selection && jQuery.inArray(elem, selection) > -1) { - if (ignored) { - ignored.push(elem); - } - continue; - } - - contains = jQuery.contains(elem.ownerDocument, elem); - - // Append to fragment - tmp = getAll(fragment.appendChild(elem), "script"); - - // Preserve script evaluation history - if (contains) { - setGlobalEval(tmp); - } - - // Capture executables - if (scripts) { - j = 0; - while ((elem = tmp[j++])) { - if (rscriptType.test(elem.type || "")) { - scripts.push(elem); - } - } - } - } - - return fragment; - } - - - (function () { - var fragment = document.createDocumentFragment(), - div = fragment.appendChild(document.createElement("div")), - input = document.createElement("input"); - - // Support: Android 4.0-4.3, Safari<=5.1 - // Check state lost if the name is set (#11217) - // Support: Windows Web Apps (WWA) - // `name` and `type` must use .setAttribute for WWA (#14901) - input.setAttribute("type", "radio"); - input.setAttribute("checked", "checked"); - input.setAttribute("name", "t"); - - div.appendChild(input); - - // Support: Safari<=5.1, Android<4.2 - // Older WebKit doesn't clone checked state correctly in fragments - support.checkClone = div.cloneNode(true).cloneNode(true).lastChild.checked; - - // Support: IE<=11+ - // Make sure textarea (and checkbox) defaultValue is properly cloned - div.innerHTML = ""; - support.noCloneChecked = !!div.cloneNode(true).lastChild.defaultValue; - })(); - - - var - rkeyEvent = /^key/, - rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/, - rtypenamespace = /^([^.]*)(?:\.(.+)|)/; - - function returnTrue() { - return true; - } - - function returnFalse() { - return false; - } - - // Support: IE9 - // See #13393 for more info - function safeActiveElement() { - try { - return document.activeElement; - } catch (err) { } - } - - function on(elem, types, selector, data, fn, one) { - var origFn, type; - - // Types can be a map of types/handlers - if (typeof types === "object") { - - // ( types-Object, selector, data ) - if (typeof selector !== "string") { - - // ( types-Object, data ) - data = data || selector; - selector = undefined; - } - for (type in types) { - on(elem, type, selector, data, types[type], one); - } - return elem; - } - - if (data == null && fn == null) { - - // ( types, fn ) - fn = selector; - data = selector = undefined; - } else if (fn == null) { - if (typeof selector === "string") { - - // ( types, selector, fn ) - fn = data; - data = undefined; - } else { - - // ( types, data, fn ) - fn = data; - data = selector; - selector = undefined; - } - } - if (fn === false) { - fn = returnFalse; - } else if (!fn) { - return this; - } - - if (one === 1) { - origFn = fn; - fn = function (event) { - - // Can use an empty set, since event contains the info - jQuery().off(event); - return origFn.apply(this, arguments); - }; - - // Use same guid so caller can remove using origFn - fn.guid = origFn.guid || (origFn.guid = jQuery.guid++); - } - return elem.each(function () { - jQuery.event.add(this, types, fn, data, selector); - }); - } - - /* - * Helper functions for managing events -- not part of the public interface. - * Props to Dean Edwards' addEvent library for many of the ideas. - */ - jQuery.event = { - - global: {}, - - add: function (elem, types, handler, data, selector) { - - var handleObjIn, eventHandle, tmp, - events, t, handleObj, - special, handlers, type, namespaces, origType, - elemData = dataPriv.get(elem); - - // Don't attach events to noData or text/comment nodes (but allow plain objects) - if (!elemData) { - return; - } - - // Caller can pass in an object of custom data in lieu of the handler - if (handler.handler) { - handleObjIn = handler; - handler = handleObjIn.handler; - selector = handleObjIn.selector; - } - - // Make sure that the handler has a unique ID, used to find/remove it later - if (!handler.guid) { - handler.guid = jQuery.guid++; - } - - // Init the element's event structure and main handler, if this is the first - if (!(events = elemData.events)) { - events = elemData.events = {}; - } - if (!(eventHandle = elemData.handle)) { - eventHandle = elemData.handle = function (e) { - - // Discard the second event of a jQuery.event.trigger() and - // when an event is called after a page has unloaded - return typeof jQuery !== "undefined" && jQuery.event.triggered !== e.type ? - jQuery.event.dispatch.apply(elem, arguments) : undefined; - }; - } - - // Handle multiple events separated by a space - types = (types || "").match(rnotwhite) || [""]; - t = types.length; - while (t--) { - tmp = rtypenamespace.exec(types[t]) || []; - type = origType = tmp[1]; - namespaces = (tmp[2] || "").split(".").sort(); - - // There *must* be a type, no attaching namespace-only handlers - if (!type) { - continue; - } - - // If event changes its type, use the special event handlers for the changed type - special = jQuery.event.special[type] || {}; - - // If selector defined, determine special event api type, otherwise given type - type = (selector ? special.delegateType : special.bindType) || type; - - // Update special based on newly reset type - special = jQuery.event.special[type] || {}; - - // handleObj is passed to all event handlers - handleObj = jQuery.extend({ - type: type, - origType: origType, - data: data, - handler: handler, - guid: handler.guid, - selector: selector, - needsContext: selector && jQuery.expr.match.needsContext.test(selector), - namespace: namespaces.join(".") - }, handleObjIn); - - // Init the event handler queue if we're the first - if (!(handlers = events[type])) { - handlers = events[type] = []; - handlers.delegateCount = 0; - - // Only use addEventListener if the special events handler returns false - if (!special.setup || - special.setup.call(elem, data, namespaces, eventHandle) === false) { - - if (elem.addEventListener) { - elem.addEventListener(type, eventHandle); - } - } - } - - if (special.add) { - special.add.call(elem, handleObj); - - if (!handleObj.handler.guid) { - handleObj.handler.guid = handler.guid; - } - } - - // Add to the element's handler list, delegates in front - if (selector) { - handlers.splice(handlers.delegateCount++, 0, handleObj); - } else { - handlers.push(handleObj); - } - - // Keep track of which events have ever been used, for event optimization - jQuery.event.global[type] = true; - } - - }, - - // Detach an event or set of events from an element - remove: function (elem, types, handler, selector, mappedTypes) { - - var j, origCount, tmp, - events, t, handleObj, - special, handlers, type, namespaces, origType, - elemData = dataPriv.hasData(elem) && dataPriv.get(elem); - - if (!elemData || !(events = elemData.events)) { - return; - } - - // Once for each type.namespace in types; type may be omitted - types = (types || "").match(rnotwhite) || [""]; - t = types.length; - while (t--) { - tmp = rtypenamespace.exec(types[t]) || []; - type = origType = tmp[1]; - namespaces = (tmp[2] || "").split(".").sort(); - - // Unbind all events (on this namespace, if provided) for the element - if (!type) { - for (type in events) { - jQuery.event.remove(elem, type + types[t], handler, selector, true); - } - continue; - } - - special = jQuery.event.special[type] || {}; - type = (selector ? special.delegateType : special.bindType) || type; - handlers = events[type] || []; - tmp = tmp[2] && - new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)"); - - // Remove matching events - origCount = j = handlers.length; - while (j--) { - handleObj = handlers[j]; - - if ((mappedTypes || origType === handleObj.origType) && - (!handler || handler.guid === handleObj.guid) && - (!tmp || tmp.test(handleObj.namespace)) && - (!selector || selector === handleObj.selector || - selector === "**" && handleObj.selector)) { - handlers.splice(j, 1); - - if (handleObj.selector) { - handlers.delegateCount--; - } - if (special.remove) { - special.remove.call(elem, handleObj); - } - } - } - - // Remove generic event handler if we removed something and no more handlers exist - // (avoids potential for endless recursion during removal of special event handlers) - if (origCount && !handlers.length) { - if (!special.teardown || - special.teardown.call(elem, namespaces, elemData.handle) === false) { - - jQuery.removeEvent(elem, type, elemData.handle); - } - - delete events[type]; - } - } - - // Remove data and the expando if it's no longer used - if (jQuery.isEmptyObject(events)) { - dataPriv.remove(elem, "handle events"); - } - }, - - dispatch: function (event) { - - // Make a writable jQuery.Event from the native event object - event = jQuery.event.fix(event); - - var i, j, ret, matched, handleObj, - handlerQueue = [], - args = slice.call(arguments), - handlers = (dataPriv.get(this, "events") || {})[event.type] || [], - special = jQuery.event.special[event.type] || {}; - - // Use the fix-ed jQuery.Event rather than the (read-only) native event - args[0] = event; - event.delegateTarget = this; - - // Call the preDispatch hook for the mapped type, and let it bail if desired - if (special.preDispatch && special.preDispatch.call(this, event) === false) { - return; - } - - // Determine handlers - handlerQueue = jQuery.event.handlers.call(this, event, handlers); - - // Run delegates first; they may want to stop propagation beneath us - i = 0; - while ((matched = handlerQueue[i++]) && !event.isPropagationStopped()) { - event.currentTarget = matched.elem; - - j = 0; - while ((handleObj = matched.handlers[j++]) && - !event.isImmediatePropagationStopped()) { - - // Triggered event must either 1) have no namespace, or 2) have namespace(s) - // a subset or equal to those in the bound event (both can have no namespace). - if (!event.rnamespace || event.rnamespace.test(handleObj.namespace)) { - - event.handleObj = handleObj; - event.data = handleObj.data; - - ret = ((jQuery.event.special[handleObj.origType] || {}).handle || - handleObj.handler).apply(matched.elem, args); - - if (ret !== undefined) { - if ((event.result = ret) === false) { - event.preventDefault(); - event.stopPropagation(); - } - } - } - } - } - - // Call the postDispatch hook for the mapped type - if (special.postDispatch) { - special.postDispatch.call(this, event); - } - - return event.result; - }, - - handlers: function (event, handlers) { - var i, matches, sel, handleObj, - handlerQueue = [], - delegateCount = handlers.delegateCount, - cur = event.target; - - // Support (at least): Chrome, IE9 - // Find delegate handlers - // Black-hole SVG instance trees (#13180) - // - // Support: Firefox<=42+ - // Avoid non-left-click in FF but don't block IE radio events (#3861, gh-2343) - if (delegateCount && cur.nodeType && - (event.type !== "click" || isNaN(event.button) || event.button < 1)) { - - for (; cur !== this; cur = cur.parentNode || this) { - - // Don't check non-elements (#13208) - // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764) - if (cur.nodeType === 1 && (cur.disabled !== true || event.type !== "click")) { - matches = []; - for (i = 0; i < delegateCount; i++) { - handleObj = handlers[i]; - - // Don't conflict with Object.prototype properties (#13203) - sel = handleObj.selector + " "; - - if (matches[sel] === undefined) { - matches[sel] = handleObj.needsContext ? - jQuery(sel, this).index(cur) > -1 : - jQuery.find(sel, this, null, [cur]).length; - } - if (matches[sel]) { - matches.push(handleObj); - } - } - if (matches.length) { - handlerQueue.push({ elem: cur, handlers: matches }); - } - } - } - } - - // Add the remaining (directly-bound) handlers - if (delegateCount < handlers.length) { - handlerQueue.push({ elem: this, handlers: handlers.slice(delegateCount) }); - } - - return handlerQueue; - }, - - // Includes some event props shared by KeyEvent and MouseEvent - props: ("altKey bubbles cancelable ctrlKey currentTarget detail eventPhase " + - "metaKey relatedTarget shiftKey target timeStamp view which").split(" "), - - fixHooks: {}, - - keyHooks: { - props: "char charCode key keyCode".split(" "), - filter: function (event, original) { - - // Add which for key events - if (event.which == null) { - event.which = original.charCode != null ? original.charCode : original.keyCode; - } - - return event; - } - }, - - mouseHooks: { - props: ("button buttons clientX clientY offsetX offsetY pageX pageY " + - "screenX screenY toElement").split(" "), - filter: function (event, original) { - var eventDoc, doc, body, - button = original.button; - - // Calculate pageX/Y if missing and clientX/Y available - if (event.pageX == null && original.clientX != null) { - eventDoc = event.target.ownerDocument || document; - doc = eventDoc.documentElement; - body = eventDoc.body; - - event.pageX = original.clientX + - (doc && doc.scrollLeft || body && body.scrollLeft || 0) - - (doc && doc.clientLeft || body && body.clientLeft || 0); - event.pageY = original.clientY + - (doc && doc.scrollTop || body && body.scrollTop || 0) - - (doc && doc.clientTop || body && body.clientTop || 0); - } - - // Add which for click: 1 === left; 2 === middle; 3 === right - // Note: button is not normalized, so don't use it - if (!event.which && button !== undefined) { - event.which = (button & 1 ? 1 : (button & 2 ? 3 : (button & 4 ? 2 : 0))); - } - - return event; - } - }, - - fix: function (event) { - if (event[jQuery.expando]) { - return event; - } - - // Create a writable copy of the event object and normalize some properties - var i, prop, copy, - type = event.type, - originalEvent = event, - fixHook = this.fixHooks[type]; - - if (!fixHook) { - this.fixHooks[type] = fixHook = - rmouseEvent.test(type) ? this.mouseHooks : - rkeyEvent.test(type) ? this.keyHooks : - {}; - } - copy = fixHook.props ? this.props.concat(fixHook.props) : this.props; - - event = new jQuery.Event(originalEvent); - - i = copy.length; - while (i--) { - prop = copy[i]; - event[prop] = originalEvent[prop]; - } - - // Support: Cordova 2.5 (WebKit) (#13255) - // All events should have a target; Cordova deviceready doesn't - if (!event.target) { - event.target = document; - } - - // Support: Safari 6.0+, Chrome<28 - // Target should not be a text node (#504, #13143) - if (event.target.nodeType === 3) { - event.target = event.target.parentNode; - } - - return fixHook.filter ? fixHook.filter(event, originalEvent) : event; - }, - - special: { - load: { - - // Prevent triggered image.load events from bubbling to window.load - noBubble: true - }, - focus: { - - // Fire native event if possible so blur/focus sequence is correct - trigger: function () { - if (this !== safeActiveElement() && this.focus) { - this.focus(); - return false; - } - }, - delegateType: "focusin" - }, - blur: { - trigger: function () { - if (this === safeActiveElement() && this.blur) { - this.blur(); - return false; - } - }, - delegateType: "focusout" - }, - click: { - - // For checkbox, fire native event so checked state will be right - trigger: function () { - if (this.type === "checkbox" && this.click && jQuery.nodeName(this, "input")) { - this.click(); - return false; - } - }, - - // For cross-browser consistency, don't fire native .click() on links - _default: function (event) { - return jQuery.nodeName(event.target, "a"); - } - }, - - beforeunload: { - postDispatch: function (event) { - - // Support: Firefox 20+ - // Firefox doesn't alert if the returnValue field is not set. - if (event.result !== undefined && event.originalEvent) { - event.originalEvent.returnValue = event.result; - } - } - } - } - }; - - jQuery.removeEvent = function (elem, type, handle) { - - // This "if" is needed for plain objects - if (elem.removeEventListener) { - elem.removeEventListener(type, handle); - } - }; - - jQuery.Event = function (src, props) { - - // Allow instantiation without the 'new' keyword - if (!(this instanceof jQuery.Event)) { - return new jQuery.Event(src, props); - } - - // Event object - if (src && src.type) { - this.originalEvent = src; - this.type = src.type; - - // Events bubbling up the document may have been marked as prevented - // by a handler lower down the tree; reflect the correct value. - this.isDefaultPrevented = src.defaultPrevented || - src.defaultPrevented === undefined && - - // Support: Android<4.0 - src.returnValue === false ? - returnTrue : - returnFalse; - - // Event type - } else { - this.type = src; - } - - // Put explicitly provided properties onto the event object - if (props) { - jQuery.extend(this, props); - } - - // Create a timestamp if incoming event doesn't have one - this.timeStamp = src && src.timeStamp || jQuery.now(); - - // Mark it as fixed - this[jQuery.expando] = true; - }; - - // jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding - // http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html - jQuery.Event.prototype = { - constructor: jQuery.Event, - isDefaultPrevented: returnFalse, - isPropagationStopped: returnFalse, - isImmediatePropagationStopped: returnFalse, - - preventDefault: function () { - var e = this.originalEvent; - - this.isDefaultPrevented = returnTrue; - - if (e) { - e.preventDefault(); - } - }, - stopPropagation: function () { - var e = this.originalEvent; - - this.isPropagationStopped = returnTrue; - - if (e) { - e.stopPropagation(); - } - }, - stopImmediatePropagation: function () { - var e = this.originalEvent; - - this.isImmediatePropagationStopped = returnTrue; - - if (e) { - e.stopImmediatePropagation(); - } - - this.stopPropagation(); - } - }; - - // Create mouseenter/leave events using mouseover/out and event-time checks - // so that event delegation works in jQuery. - // Do the same for pointerenter/pointerleave and pointerover/pointerout - // - // Support: Safari 7 only - // Safari sends mouseenter too often; see: - // https://code.google.com/p/chromium/issues/detail?id=470258 - // for the description of the bug (it existed in older Chrome versions as well). - jQuery.each({ - mouseenter: "mouseover", - mouseleave: "mouseout", - pointerenter: "pointerover", - pointerleave: "pointerout" - }, function (orig, fix) { - jQuery.event.special[orig] = { - delegateType: fix, - bindType: fix, - - handle: function (event) { - var ret, - target = this, - related = event.relatedTarget, - handleObj = event.handleObj; - - // For mouseenter/leave call the handler if related is outside the target. - // NB: No relatedTarget if the mouse left/entered the browser window - if (!related || (related !== target && !jQuery.contains(target, related))) { - event.type = handleObj.origType; - ret = handleObj.handler.apply(this, arguments); - event.type = fix; - } - return ret; - } - }; - }); - - jQuery.fn.extend({ - on: function (types, selector, data, fn) { - return on(this, types, selector, data, fn); - }, - one: function (types, selector, data, fn) { - return on(this, types, selector, data, fn, 1); - }, - off: function (types, selector, fn) { - var handleObj, type; - if (types && types.preventDefault && types.handleObj) { - - // ( event ) dispatched jQuery.Event - handleObj = types.handleObj; - jQuery(types.delegateTarget).off( - handleObj.namespace ? - handleObj.origType + "." + handleObj.namespace : - handleObj.origType, - handleObj.selector, - handleObj.handler - ); - return this; - } - if (typeof types === "object") { - - // ( types-object [, selector] ) - for (type in types) { - this.off(type, selector, types[type]); - } - return this; - } - if (selector === false || typeof selector === "function") { - - // ( types [, fn] ) - fn = selector; - selector = undefined; - } - if (fn === false) { - fn = returnFalse; - } - return this.each(function () { - jQuery.event.remove(this, types, fn, selector); - }); - } - }); - - - var - rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi, - - // Support: IE 10-11, Edge 10240+ - // In IE/Edge using regex groups here causes severe slowdowns. - // See https://connect.microsoft.com/IE/feedback/details/1736512/ - rnoInnerhtml = /\s*$/g; - - function manipulationTarget(elem, content) { - if (jQuery.nodeName(elem, "table") && - jQuery.nodeName(content.nodeType !== 11 ? content : content.firstChild, "tr")) { - - return elem.getElementsByTagName("tbody")[0] || elem; - } - - return elem; - } - - // Replace/restore the type attribute of script elements for safe DOM manipulation - function disableScript(elem) { - elem.type = (elem.getAttribute("type") !== null) + "/" + elem.type; - return elem; - } - function restoreScript(elem) { - var match = rscriptTypeMasked.exec(elem.type); - - if (match) { - elem.type = match[1]; - } else { - elem.removeAttribute("type"); - } - - return elem; - } - - function cloneCopyEvent(src, dest) { - var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events; - - if (dest.nodeType !== 1) { - return; - } - - // 1. Copy private data: events, handlers, etc. - if (dataPriv.hasData(src)) { - pdataOld = dataPriv.access(src); - pdataCur = dataPriv.set(dest, pdataOld); - events = pdataOld.events; - - if (events) { - delete pdataCur.handle; - pdataCur.events = {}; - - for (type in events) { - for (i = 0, l = events[type].length; i < l; i++) { - jQuery.event.add(dest, type, events[type][i]); - } - } - } - } - - // 2. Copy user data - if (dataUser.hasData(src)) { - udataOld = dataUser.access(src); - udataCur = jQuery.extend({}, udataOld); - - dataUser.set(dest, udataCur); - } - } - - // Fix IE bugs, see support tests - function fixInput(src, dest) { - var nodeName = dest.nodeName.toLowerCase(); - - // Fails to persist the checked state of a cloned checkbox or radio button. - if (nodeName === "input" && rcheckableType.test(src.type)) { - dest.checked = src.checked; - - // Fails to return the selected option to the default selected state when cloning options - } else if (nodeName === "input" || nodeName === "textarea") { - dest.defaultValue = src.defaultValue; - } - } - - function domManip(collection, args, callback, ignored) { - - // Flatten any nested arrays - args = concat.apply([], args); - - var fragment, first, scripts, hasScripts, node, doc, - i = 0, - l = collection.length, - iNoClone = l - 1, - value = args[0], - isFunction = jQuery.isFunction(value); - - // We can't cloneNode fragments that contain checked, in WebKit - if (isFunction || - (l > 1 && typeof value === "string" && - !support.checkClone && rchecked.test(value))) { - return collection.each(function (index) { - var self = collection.eq(index); - if (isFunction) { - args[0] = value.call(this, index, self.html()); - } - domManip(self, args, callback, ignored); - }); - } - - if (l) { - fragment = buildFragment(args, collection[0].ownerDocument, false, collection, ignored); - first = fragment.firstChild; - - if (fragment.childNodes.length === 1) { - fragment = first; - } - - // Require either new content or an interest in ignored elements to invoke the callback - if (first || ignored) { - scripts = jQuery.map(getAll(fragment, "script"), disableScript); - hasScripts = scripts.length; - - // Use the original fragment for the last item - // instead of the first because it can end up - // being emptied incorrectly in certain situations (#8070). - for (; i < l; i++) { - node = fragment; - - if (i !== iNoClone) { - node = jQuery.clone(node, true, true); - - // Keep references to cloned scripts for later restoration - if (hasScripts) { - - // Support: Android<4.1, PhantomJS<2 - // push.apply(_, arraylike) throws on ancient WebKit - jQuery.merge(scripts, getAll(node, "script")); - } - } - - callback.call(collection[i], node, i); - } - - if (hasScripts) { - doc = scripts[scripts.length - 1].ownerDocument; - - // Reenable scripts - jQuery.map(scripts, restoreScript); - - // Evaluate executable scripts on first document insertion - for (i = 0; i < hasScripts; i++) { - node = scripts[i]; - if (rscriptType.test(node.type || "") && - !dataPriv.access(node, "globalEval") && - jQuery.contains(doc, node)) { - - if (node.src) { - - // Optional AJAX dependency, but won't run scripts if not present - if (jQuery._evalUrl) { - jQuery._evalUrl(node.src); - } - } else { - jQuery.globalEval(node.textContent.replace(rcleanScript, "")); - } - } - } - } - } - } - - return collection; - } - - function remove(elem, selector, keepData) { - var node, - nodes = selector ? jQuery.filter(selector, elem) : elem, - i = 0; - - for (; (node = nodes[i]) != null; i++) { - if (!keepData && node.nodeType === 1) { - jQuery.cleanData(getAll(node)); - } - - if (node.parentNode) { - if (keepData && jQuery.contains(node.ownerDocument, node)) { - setGlobalEval(getAll(node, "script")); - } - node.parentNode.removeChild(node); - } - } - - return elem; - } - - jQuery.extend({ - htmlPrefilter: function (html) { - return html.replace(rxhtmlTag, "<$1>"); - }, - - clone: function (elem, dataAndEvents, deepDataAndEvents) { - var i, l, srcElements, destElements, - clone = elem.cloneNode(true), - inPage = jQuery.contains(elem.ownerDocument, elem); - - // Fix IE cloning issues - if (!support.noCloneChecked && (elem.nodeType === 1 || elem.nodeType === 11) && - !jQuery.isXMLDoc(elem)) { - - // We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2 - destElements = getAll(clone); - srcElements = getAll(elem); - - for (i = 0, l = srcElements.length; i < l; i++) { - fixInput(srcElements[i], destElements[i]); - } - } - - // Copy the events from the original to the clone - if (dataAndEvents) { - if (deepDataAndEvents) { - srcElements = srcElements || getAll(elem); - destElements = destElements || getAll(clone); - - for (i = 0, l = srcElements.length; i < l; i++) { - cloneCopyEvent(srcElements[i], destElements[i]); - } - } else { - cloneCopyEvent(elem, clone); - } - } - - // Preserve script evaluation history - destElements = getAll(clone, "script"); - if (destElements.length > 0) { - setGlobalEval(destElements, !inPage && getAll(elem, "script")); - } - - // Return the cloned set - return clone; - }, - - cleanData: function (elems) { - var data, elem, type, - special = jQuery.event.special, - i = 0; - - for (; (elem = elems[i]) !== undefined; i++) { - if (acceptData(elem)) { - if ((data = elem[dataPriv.expando])) { - if (data.events) { - for (type in data.events) { - if (special[type]) { - jQuery.event.remove(elem, type); - - // This is a shortcut to avoid jQuery.event.remove's overhead - } else { - jQuery.removeEvent(elem, type, data.handle); - } - } - } - - // Support: Chrome <= 35-45+ - // Assign undefined instead of using delete, see Data#remove - elem[dataPriv.expando] = undefined; - } - if (elem[dataUser.expando]) { - - // Support: Chrome <= 35-45+ - // Assign undefined instead of using delete, see Data#remove - elem[dataUser.expando] = undefined; - } - } - } - } - }); - - jQuery.fn.extend({ - - // Keep domManip exposed until 3.0 (gh-2225) - domManip: domManip, - - detach: function (selector) { - return remove(this, selector, true); - }, - - remove: function (selector) { - return remove(this, selector); - }, - - text: function (value) { - return access(this, function (value) { - return value === undefined ? - jQuery.text(this) : - this.empty().each(function () { - if (this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9) { - this.textContent = value; - } - }); - }, null, value, arguments.length); - }, - - append: function () { - return domManip(this, arguments, function (elem) { - if (this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9) { - var target = manipulationTarget(this, elem); - target.appendChild(elem); - } - }); - }, - - prepend: function () { - return domManip(this, arguments, function (elem) { - if (this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9) { - var target = manipulationTarget(this, elem); - target.insertBefore(elem, target.firstChild); - } - }); - }, - - before: function () { - return domManip(this, arguments, function (elem) { - if (this.parentNode) { - this.parentNode.insertBefore(elem, this); - } - }); - }, - - after: function () { - return domManip(this, arguments, function (elem) { - if (this.parentNode) { - this.parentNode.insertBefore(elem, this.nextSibling); - } - }); - }, - - empty: function () { - var elem, - i = 0; - - for (; (elem = this[i]) != null; i++) { - if (elem.nodeType === 1) { - - // Prevent memory leaks - jQuery.cleanData(getAll(elem, false)); - - // Remove any remaining nodes - elem.textContent = ""; - } - } - - return this; - }, - - clone: function (dataAndEvents, deepDataAndEvents) { - dataAndEvents = dataAndEvents == null ? false : dataAndEvents; - deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents; - - return this.map(function () { - return jQuery.clone(this, dataAndEvents, deepDataAndEvents); - }); - }, - - html: function (value) { - return access(this, function (value) { - var elem = this[0] || {}, - i = 0, - l = this.length; - - if (value === undefined && elem.nodeType === 1) { - return elem.innerHTML; - } - - // See if we can take a shortcut and just use innerHTML - if (typeof value === "string" && !rnoInnerhtml.test(value) && - !wrapMap[(rtagName.exec(value) || ["", ""])[1].toLowerCase()]) { - - value = jQuery.htmlPrefilter(value); - - try { - for (; i < l; i++) { - elem = this[i] || {}; - - // Remove element nodes and prevent memory leaks - if (elem.nodeType === 1) { - jQuery.cleanData(getAll(elem, false)); - elem.innerHTML = value; - } - } - - elem = 0; - - // If using innerHTML throws an exception, use the fallback method - } catch (e) { } - } - - if (elem) { - this.empty().append(value); - } - }, null, value, arguments.length); - }, - - replaceWith: function () { - var ignored = []; - - // Make the changes, replacing each non-ignored context element with the new content - return domManip(this, arguments, function (elem) { - var parent = this.parentNode; - - if (jQuery.inArray(this, ignored) < 0) { - jQuery.cleanData(getAll(this)); - if (parent) { - parent.replaceChild(elem, this); - } - } - - // Force callback invocation - }, ignored); - } - }); - - jQuery.each({ - appendTo: "append", - prependTo: "prepend", - insertBefore: "before", - insertAfter: "after", - replaceAll: "replaceWith" - }, function (name, original) { - jQuery.fn[name] = function (selector) { - var elems, - ret = [], - insert = jQuery(selector), - last = insert.length - 1, - i = 0; - - for (; i <= last; i++) { - elems = i === last ? this : this.clone(true); - jQuery(insert[i])[original](elems); - - // Support: QtWebKit - // .get() because push.apply(_, arraylike) throws - push.apply(ret, elems.get()); - } - - return this.pushStack(ret); - }; - }); - - - var iframe, - elemdisplay = { - - // Support: Firefox - // We have to pre-define these values for FF (#10227) - HTML: "block", - BODY: "block" - }; - - /** - * Retrieve the actual display of a element - * @param {String} name nodeName of the element - * @param {Object} doc Document object - */ - - // Called only from within defaultDisplay - function actualDisplay(name, doc) { - var elem = jQuery(doc.createElement(name)).appendTo(doc.body), - - display = jQuery.css(elem[0], "display"); - - // We don't have any data stored on the element, - // so use "detach" method as fast way to get rid of the element - elem.detach(); - - return display; - } - - /** - * Try to determine the default display value of an element - * @param {String} nodeName - */ - function defaultDisplay(nodeName) { - var doc = document, - display = elemdisplay[nodeName]; - - if (!display) { - display = actualDisplay(nodeName, doc); - - // If the simple way fails, read from inside an iframe - if (display === "none" || !display) { - - // Use the already-created iframe if possible - iframe = (iframe || jQuery("