diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml index 02f9b1fc..7842f01f 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml @@ -192,14 +192,14 @@ - + 没啥说，登录 - + 没啥说，注册 @@ -224,7 +224,7 @@ - + 自己更新密码 @@ -438,21 +438,21 @@ - + 给多用户设置多角色 - + 添加角色包含菜单 - + 更新角色信息 @@ -466,7 +466,7 @@ - + 更改角色数据权限 @@ -501,7 +501,7 @@ - + 给多用户设置多角色 @@ -515,21 +515,21 @@ - + 更新用户信息 - + 更新个人中心信息 - + 添加用户 @@ -708,7 +708,7 @@ - + 增 @@ -735,7 +735,7 @@ - + 更 diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BBS/ArticleController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BBS/ArticleController.cs index 20684cf5..59194929 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BBS/ArticleController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BBS/ArticleController.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Yi.Framework.Common.Models; -using Yi.Framework.DTOModel.Base.Vo; +using Yi.Framework.DtoModel.Base.Vo; using Yi.Framework.Interface; using Yi.Framework.Interface.BBS; using Yi.Framework.Model.BBS.Entitys; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BBS/CommentController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BBS/CommentController.cs index 0903f0b9..523b6748 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BBS/CommentController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BBS/CommentController.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Yi.Framework.Common.Models; -using Yi.Framework.DTOModel.Base.Vo; +using Yi.Framework.DtoModel.Base.Vo; using Yi.Framework.Interface; using Yi.Framework.Interface.BBS; using Yi.Framework.Model.BBS.Entitys; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/AccountController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/AccountController.cs index 8efd9aa9..c08f0a85 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/AccountController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/AccountController.cs @@ -12,7 +12,7 @@ using Yi.Framework.Common.Helper; using Yi.Framework.Common.Models; using Yi.Framework.Core; using Yi.Framework.Core.Cache; -using Yi.Framework.DTOModel.Base.Dto; +using Yi.Framework.DtoModel.Base.Dto; using Yi.Framework.Interface; using Yi.Framework.Interface.RABC; using Yi.Framework.Model.RABC.Entitys; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/OnlineController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/OnlineController.cs index d2d4de64..4012d81f 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/OnlineController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/OnlineController.cs @@ -12,7 +12,7 @@ using Yi.Framework.Common.Enum; using Yi.Framework.Common.Helper; using Yi.Framework.Common.Models; using Yi.Framework.Core; -using Yi.Framework.DTOModel; +using Yi.Framework.DtoModel; using Yi.Framework.Interface; using Yi.Framework.Repository; using Yi.Framework.WebCore; @@ -52,11 +52,11 @@ namespace Yi.Framework.ApiMicroservice.Controllers if (!string.IsNullOrEmpty(online.Ipaddr)) { - dataWhere = dataWhere.Where((u) => u.Ipaddr.Contains(online.Ipaddr)); + dataWhere = dataWhere.Where((u) => u.Ipaddr!.Contains(online.Ipaddr)); } if (!string.IsNullOrEmpty(online.UserName)) { - dataWhere = dataWhere.Where((u) => u.UserName.Contains(online.UserName)); + dataWhere = dataWhere.Where((u) => u.UserName!.Contains(online.UserName)); } return Result.Success().SetData(new PageModel>() { Total = data.Count, Data = dataWhere.ToList() }); } diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/RoleController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/RoleController.cs index 2c350da9..eab8bb62 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/RoleController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/RoleController.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Yi.Framework.Common.Models; -using Yi.Framework.DTOModel.Base.Dto; +using Yi.Framework.DtoModel.Base.Dto; using Yi.Framework.Interface; using Yi.Framework.Interface.RABC; using Yi.Framework.Model.RABC.Entitys; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/UserController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/UserController.cs index 979bd12b..86aa97fb 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/UserController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/UserController.cs @@ -10,7 +10,7 @@ using Yi.Framework.Common.Const; using Yi.Framework.Common.Enum; using Yi.Framework.Common.Helper; using Yi.Framework.Common.Models; -using Yi.Framework.DTOModel.Base.Dto; +using Yi.Framework.DtoModel.Base.Dto; using Yi.Framework.Interface; using Yi.Framework.Interface.RABC; using Yi.Framework.Model.RABC.Entitys; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/StudentController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/StudentController.cs index dd351468..6417b387 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/StudentController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/StudentController.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Yi.Framework.Common.Models; -using Yi.Framework.DTOModel.RABC.Student; +using Yi.Framework.DtoModel.RABC.Student; using Yi.Framework.Interface.RABC; namespace Brick.IFServer.Controllers diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/GiveRoleSetMenuDto.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/GiveRoleSetMenuDto.cs index 97d9d28a..055469a7 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/GiveRoleSetMenuDto.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/GiveRoleSetMenuDto.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Yi.Framework.DTOModel.Base.Dto +namespace Yi.Framework.DtoModel.Base.Dto { public class GiveRoleSetMenuDto { diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/GiveUserSetRoleDto.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/GiveUserSetRoleDto.cs index fbda4fb1..27516a0e 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/GiveUserSetRoleDto.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/GiveUserSetRoleDto.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Yi.Framework.DTOModel.Base.Dto +namespace Yi.Framework.DtoModel.Base.Dto { public class GiveUserSetRoleDto { diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/LoginDto.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/LoginDto.cs index 6629baf4..4d8673d3 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/LoginDto.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/LoginDto.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Yi.Framework.DTOModel.Base.Dto +namespace Yi.Framework.DtoModel.Base.Dto { public class LoginDto { diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/RegisterDto.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/RegisterDto.cs index 74bcb847..e65d71f7 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/RegisterDto.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/RegisterDto.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Yi.Framework.DTOModel.Base.Dto +namespace Yi.Framework.DtoModel.Base.Dto { public class RegisterDto { diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/RoleInfoDto.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/RoleInfoDto.cs index e1a764fb..50b3404a 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/RoleInfoDto.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/RoleInfoDto.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using Yi.Framework.Model.RABC.Entitys; -namespace Yi.Framework.DTOModel.Base.Dto +namespace Yi.Framework.DtoModel.Base.Dto { public class RoleInfoDto { diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/UpdatePasswordDto.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/UpdatePasswordDto.cs index d3879c01..c91c487c 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/UpdatePasswordDto.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/UpdatePasswordDto.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Yi.Framework.DTOModel.Base.Dto +namespace Yi.Framework.DtoModel.Base.Dto { public class UpdatePasswordDto { diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/UserInfoDto.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/UserInfoDto.cs index e5ce5920..7ca3beaf 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/UserInfoDto.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/UserInfoDto.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using Yi.Framework.Model.RABC.Entitys; -namespace Yi.Framework.DTOModel.Base.Dto +namespace Yi.Framework.DtoModel.Base.Dto { public class UserInfoDto { diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/UserRoleMenuDto.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/UserRoleMenuDto.cs index 5637a9e3..f86b3365 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/UserRoleMenuDto.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/UserRoleMenuDto.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using Yi.Framework.Model.RABC.Entitys; -namespace Yi.Framework.DTOModel.Base.Dto +namespace Yi.Framework.DtoModel.Base.Dto { public class UserRoleMenuDto { diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/ArticleVo.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/ArticleVo.cs index 7235193e..2d0ad242 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/ArticleVo.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/ArticleVo.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Yi.Framework.DTOModel.Base.Vo +namespace Yi.Framework.DtoModel.Base.Vo { public class ArticleVo { diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/CommentVo.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/CommentVo.cs index d9dcf8ef..6691ee9c 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/CommentVo.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/CommentVo.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Yi.Framework.DTOModel.Base.Vo +namespace Yi.Framework.DtoModel.Base.Vo { public class CommentVo { diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/UserVo.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/UserVo.cs index 6d320dbf..bf7e34e6 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/UserVo.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/UserVo.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Yi.Framework.DTOModel.Base.Vo +namespace Yi.Framework.DtoModel.Base.Vo { /// /// 前端只需要这些数据即可 diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/MapperConfig/StudentProfile.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/MapperConfig/StudentProfile.cs index 9f967223..75574923 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/MapperConfig/StudentProfile.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/MapperConfig/StudentProfile.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using Yi.Framework.Model.RABC.Entitys; -namespace Yi.Framework.DTOModel.RABC.Student.MapperConfig +namespace Yi.Framework.DtoModel.RABC.Student.MapperConfig { public class StudentProfile : Profile { diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentCreateInput.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentCreateInput.cs index 3008d1c6..8c40f254 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentCreateInput.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentCreateInput.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace Yi.Framework.DTOModel.RABC.Student +namespace Yi.Framework.DtoModel.RABC.Student { public class StudentCreateInput { diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentCreateUpdateInput.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentCreateUpdateInput.cs index 0aa5d646..040a6aa1 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentCreateUpdateInput.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentCreateUpdateInput.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace Yi.Framework.DTOModel.RABC.Student +namespace Yi.Framework.DtoModel.RABC.Student { public class StudentCreateUpdateInput { diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentGetOutput.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentGetOutput.cs index d528989f..37fb34c1 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentGetOutput.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentGetOutput.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using Yi.Framework.Model.Base; -namespace Yi.Framework.DTOModel.RABC.Student +namespace Yi.Framework.DtoModel.RABC.Student { public class StudentGetOutput : EntityDto { diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentListOutput.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentListOutput.cs index 63b9e045..4fa11f1f 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentListOutput.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentListOutput.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using Yi.Framework.Model.Base; -namespace Yi.Framework.DTOModel.RABC.Student +namespace Yi.Framework.DtoModel.RABC.Student { public class StudentListOutput : EntityDto { diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentUpdateInput.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentUpdateInput.cs index 7568cf0a..96978316 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentUpdateInput.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentUpdateInput.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace Yi.Framework.DTOModel.RABC.Student +namespace Yi.Framework.DtoModel.RABC.Student { public class StudentUpdateInput { diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/Yi.Framework.DTOModel.csproj b/Yi.Framework.Net6/Yi.Framework.DTOModel/Yi.Framework.DTOModel.csproj index a4953289..d5610d9a 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/Yi.Framework.DTOModel.csproj +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/Yi.Framework.DTOModel.csproj @@ -4,13 +4,13 @@ net6.0 - - - - + + + + diff --git a/Yi.Framework.Net6/Yi.Framework.DtoModel/RABC/Student/ConstConfig/StudentConst.cs b/Yi.Framework.Net6/Yi.Framework.DtoModel/RABC/Student/ConstConfig/StudentConst.cs new file mode 100644 index 00000000..0344a48f --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.DtoModel/RABC/Student/ConstConfig/StudentConst.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.DtoModel.RABC.Student.ConstConfig +{ + public class StudentConst + { + public const string 学生异常错误 = nameof(学生异常错误); + public const string 学生友好错误 = nameof(学生友好错误)+"，状态码将返回200"; + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/InitESIndexWorker.cs b/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/InitESIndexWorker.cs deleted file mode 100644 index f18a0372..00000000 --- a/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/InitESIndexWorker.cs +++ /dev/null @@ -1,84 +0,0 @@ -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Net.Http; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using Yi.Framework.Common.IOCOptions; -using Yi.Framework.Common.Models; -using Yi.Framework.Core; - -namespace Yi.Framework.ElasticSearchProcessor -{ - public class InitESIndexWorker : BackgroundService - { - private readonly IConfiguration _configuration; - private readonly ILogger _logger; - private readonly RabbitMQInvoker _RabbitMQInvoker; - private readonly ElasticSearchInvoker _elasticSearchInvoker; - - public InitESIndexWorker(ILogger logger, RabbitMQInvoker rabbitMQInvoker, IConfiguration configuration, ElasticSearchInvoker elasticSearchInvoker) - { - this._logger = logger; - this._RabbitMQInvoker = rabbitMQInvoker; - this._configuration = configuration; - this._elasticSearchInvoker = elasticSearchInvoker; - } - - protected override async Task ExecuteAsync(CancellationToken stoppingToken) - { - RabbitMQConsumerModel rabbitMQConsumerModel = new RabbitMQConsumerModel() - { - ExchangeName = RabbitMQExchangeQueueName.SKUCQRS_Exchange, - QueueName = RabbitMQExchangeQueueName.SKUCQRS_Queue_ESIndex - }; - HttpClient _HttpClient = new HttpClient(); - this._RabbitMQInvoker.RegistReciveAction(rabbitMQConsumerModel, message => - { - try - { - //õģ͡ - //SPUCQRSQueueModel spuCQRSQueueModel = JsonConvert.DeserializeObject(message); - - //жɾģesӦIJ - //switch (spuCQRSQueueModel.CQRSType) - //{ - // case (int)SPUCQRSQueueModelType.Insert: - // case (int)SPUCQRSQueueModelType.Update: - // { - // Goods goods = this._ISearchService.GetGoodsBySpuId(spuCQRSQueueModel.SpuId); - // this._IElasticSearchService.InsertOrUpdata(goods); - // break; - // } - // case (int)SPUCQRSQueueModelType.Delete: - // this._IElasticSearchService.Delete(spuCQRSQueueModel.SpuId.ToString()); - // break; - // default: - // throw new Exception("wrong spuCQRSQueueModel.CQRSType"); - //} - - this._logger.LogInformation($"{nameof(InitESIndexWorker)}.Init ESIndex succeed SpuId"); - return true; - } - catch (Exception ex) - { - LogModel logModel = new LogModel() - { - OriginalClassName = this.GetType().FullName, - OriginalMethodName = nameof(ExecuteAsync), - Remark = "ʱҵ־" - }; - this._logger.LogError(ex, $"{nameof(InitESIndexWorker)}.Init ESIndex failed message={message}, Exception:{ex.Message}", JsonConvert.SerializeObject(logModel)); - return false; - } - }); - await Task.CompletedTask; - } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/Log4net.config b/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/Log4net.config deleted file mode 100644 index 958c7e78..00000000 --- a/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/Log4net.config +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/Program.cs b/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/Program.cs deleted file mode 100644 index 7c1e95f7..00000000 --- a/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/Program.cs +++ /dev/null @@ -1,69 +0,0 @@ - -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; -using System; -using Yi.Framework.WebCore; -using Yi.Framework.WebCore.AspNetCoreExtensions; -using Yi.Framework.WebCore.BuilderExtend; -using Yi.Framework.WebCore.CommonExtend; - -namespace Yi.Framework.ElasticSearchProcessor -{ - public class Program - { - public static void Main(string[] args) - { - CreateHostBuilder(args).Build().Run(); - } - - public static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureAppConfiguration((hostBuilderContext, configurationBuilder) => - { - configurationBuilder.AddCommandLine(args); - configurationBuilder.AddJsonFileService(); - //configurationBuilder.AddJsonFile("configuration.json", optional: false, reloadOnChange: true); - #region - //Apollo配置 - #endregion - //configurationBuilder.AddApolloService("Yi"); - }) - .ConfigureLogging(loggingBuilder => - { - loggingBuilder.AddFilter("System", Microsoft.Extensions.Logging.LogLevel.Warning); - loggingBuilder.AddFilter("Microsoft", Microsoft.Extensions.Logging.LogLevel.Warning); - loggingBuilder.AddLog4Net(); - }) - .ConfigureServices((hostContext, services) => - { - - IConfiguration configuration = services.BuildServiceProvider().GetRequiredService(); - - #region - //Ioc配置 - #endregion - services.AddSingleton(new Appsettings(configuration)); - - services.AddHostedService(); - services.AddHostedService(); - services.AddHostedService(); - #region 服务注入 - //services.Configure(configuration.GetSection("MysqlConn")); - - - #region - //RabbitMQ服务配置 - #endregion - services.AddRabbitMQService(); - #endregion - - #region Consul - //services.Configure(configuration.GetSection("ConsulClientOption")); - //services.AddTransient(); - #endregion - - }); - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/WarmupESIndexWorker.cs b/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/WarmupESIndexWorker.cs deleted file mode 100644 index 8c57cb58..00000000 --- a/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/WarmupESIndexWorker.cs +++ /dev/null @@ -1,79 +0,0 @@ -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Net.Http; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using Yi.Framework.Common.IOCOptions; -using Yi.Framework.Common.Models; -using Yi.Framework.Common.QueueModel; -using Yi.Framework.Core; -using Yi.Framework.Interface; - -namespace Yi.Framework.ElasticSearchProcessor -{ - public class WarmupESIndexWorker : BackgroundService - { - private readonly IConfiguration _configuration; - private readonly ILogger _logger; - private readonly RabbitMQInvoker _RabbitMQInvoker; - private readonly ElasticSearchInvoker _elasticSearchInvoker; - private readonly IOptionsMonitor _ElasticSearchOptions = null; - - - public WarmupESIndexWorker(ILogger logger, RabbitMQInvoker rabbitMQInvoker, IConfiguration configuration, ElasticSearchInvoker elasticSearchInvoker, IOptionsMonitor optionsMonitor) - { - this._logger = logger; - this._RabbitMQInvoker = rabbitMQInvoker; - this._configuration = configuration; - this._elasticSearchInvoker = elasticSearchInvoker; - this._ElasticSearchOptions = optionsMonitor; - } - - protected override async Task ExecuteAsync(CancellationToken stoppingToken) - { - RabbitMQConsumerModel rabbitMQConsumerModel = new RabbitMQConsumerModel() - { - ExchangeName = RabbitMQExchangeQueueName.SKUWarmup_Exchange, - QueueName = RabbitMQExchangeQueueName.SKUWarmup_Queue_ESIndex - }; - HttpClient _HttpClient = new HttpClient(); - this._RabbitMQInvoker.RegistReciveAction(rabbitMQConsumerModel, message => - { - //SKUWarmupQueueModel skuWarmupQueueModel = JsonConvert.DeserializeObject(message); - //õϢģ͡ - #region ɾIndex---½Index---ٽȫ - { - try - { - this._elasticSearchInvoker.DropIndex(this._ElasticSearchOptions.CurrentValue.IndexName); - //this._searchService.ImpDataBySpu(); - //esݵ - this._logger.LogInformation($"{nameof(WarmupESIndexWorker)}.InitAll succeed"); - return true; - } - catch (Exception ex) - { - var logModel = new LogModel() - { - OriginalClassName = this.GetType().FullName, - OriginalMethodName = nameof(ExecuteAsync), - Remark = "ʱҵ־" - }; - this._logger.LogError(ex, $"{nameof(WarmupESIndexWorker)}.Warmup ESIndex failed message={message}, Exception:{ex.Message}", JsonConvert.SerializeObject(logModel)); - return false; - } - } - #endregion - }); - await Task.CompletedTask; - } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/Worker.cs b/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/Worker.cs deleted file mode 100644 index 2966fab6..00000000 --- a/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/Worker.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; - -namespace Yi.Framework.ElasticSearchProcessor -{ - public class Worker : BackgroundService - { - private readonly ILogger _logger; - - public Worker(ILogger logger) - { - _logger = logger; - } - - protected override async Task ExecuteAsync(CancellationToken stoppingToken) - { - while (!stoppingToken.IsCancellationRequested) - { - _logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now); - await Task.Delay(100000, stoppingToken); - } - } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/Yi.Framework.ElasticSearchProcessor.csproj b/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/Yi.Framework.ElasticSearchProcessor.csproj deleted file mode 100644 index ff210c47..00000000 --- a/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/Yi.Framework.ElasticSearchProcessor.csproj +++ /dev/null @@ -1,31 +0,0 @@ - - - - net6.0 - - - - - - - - - - PreserveNewest - true - PreserveNewest - - - - - - - - - - - - - - - diff --git a/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/appsettings.json b/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/appsettings.json deleted file mode 100644 index 53d2c643..00000000 --- a/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/appsettings.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - }, - "AllowedHosts": "*", - - "Consul_Enabled": false, - "DbSeed_Enabled": true, - "Apollo_Enabled": false, - "HealthCheck_Enabled": false, - "Cors_Enabled": true, - "RabbitMQ_Enabled": true, - "Redis_Enabled": true, - "RedisSeed_Enabled": true, - "Kafka_Enabled": false, - "ElasticSeach_Enabled": false, - "MutiDB_Enabled": false, - "SMS_Enabled": true, - "DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle" ], - "DbSelect": "Mysql", - - "DbConn": { - "WriteUrl": "server=118.195.191.41;port=3306;database=YIDB;user id=root;password=Qz52013142020.", - "ReadUrl": [ - "server=118.195.191.41;port=3306;database=YIDB;user id=root;password=Qz52013142020.", - "server=118.195.191.41;port=3306;database=YIDB;user id=root;password=Qz52013142020.", - "server=118.195.191.41;port=3306;database=YIDB;user id=root;password=Qz52013142020." - ] - }, - "JWTTokenOptions": { - "Audience": "http://localhost:7000", - "Issuer": "http://localhost:7000", - "SecurityKey": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDI2a2EJ7m872v0afyoSDJT2o1+SitIeJSWtLJU8/Wz2m7gStexajkeD+Lka6DSTy8gt9UwfgVQo6uKjVLG5Ex7PiGOODVqAEghBuS7JzIYU5RvI543nNDAPfnJsas96mSA7L/mD7RTE2drj6hf3oZjJpMPZUQI/B1Qjb5H3K3PNwIDAQAB" - }, - "RedisConnOptions": { - "Host": "118.195.191.41", - "Prot": 6379, - "DB": 1, - "Password": "Qz52013142020." - }, - "RabbitConn": { - "HostName": "118.195.191.41", - "UserName": "cc", - "Password": "cc", - "Port": 5672 - }, - "ElasticSeachConn": { - "Url": "", - "IndexName": "" - }, - "KafkaOptions": { - "BrokerList": "192.168.3.230:9092", - "TopicName": "kafkalog" - }, - "ConsulClientOption": { - "IP": "118.195.191.41", - "Port": "8500", - "Datacenter": "dc1" - }, - "ConsulRegisterOption": { - "IP": "183.216.18.15", - "Port": "44329", - "GroupName": "ApiMicroservice", - "HealthCheckUrl": "/Health", - "Interval": 10, - "Timeout": 5, - "DeregisterCriticalServiceAfter": 60, - "Tag": "13" - }, - "SMS": { - "ID": "LTAI5tJvjPaXCyyPMfXLNbVA", - "Secret": "fLQv7jjj57fUKLFK8REeAQPFVDjUYn", - "Sign": "JiftCC", - "Template": "SMS_221640732" - }, - "IPLibraryServiceUrl": "http://gRPCIPLibraryService" -} \ No newline at end of file diff --git a/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/configuration.json b/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/configuration.json deleted file mode 100644 index 3fa71f14..00000000 --- a/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/configuration.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Apollo": { - "AppId": "Yi.Framework.ApiMicroservice", - "Env": "DEV", - "MetaServer": "http://192.168.2.168:8080", - "ConfigServer": [ "http://192.168.2.168:8080" ] - } -} \ No newline at end of file diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IRoleService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IRoleService.cs index 01fb7986..f1c05ff0 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IRoleService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IRoleService.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Yi.Framework.Common.Models; -using Yi.Framework.DTOModel.Base.Dto; +using Yi.Framework.DtoModel.Base.Dto; using Yi.Framework.Interface.Base; using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IStudentService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IStudentService.cs index 1be028f8..f44e3795 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IStudentService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IStudentService.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Yi.Framework.DTOModel.RABC.Student; +using Yi.Framework.DtoModel.RABC.Student; using Yi.Framework.Interface.Base.Crud; namespace Yi.Framework.Interface.RABC diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IUserService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IUserService.cs index 41198d2d..5f58cb20 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IUserService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IUserService.cs @@ -5,7 +5,7 @@ using Yi.Framework.Common.Models; using Yi.Framework.Interface.Base; using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; -using Yi.Framework.DTOModel.Base.Dto; +using Yi.Framework.DtoModel.Base.Dto; namespace Yi.Framework.Interface.RABC { diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/Yi.Framework.Interface.csproj b/Yi.Framework.Net6/Yi.Framework.Interface/Yi.Framework.Interface.csproj index da904855..ad969a84 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/Yi.Framework.Interface.csproj +++ b/Yi.Framework.Net6/Yi.Framework.Interface/Yi.Framework.Interface.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -9,7 +9,7 @@ - + diff --git a/Yi.Framework.Net6/Yi.Framework.OcelotGateway/configuration.json b/Yi.Framework.Net6/Yi.Framework.OcelotGateway/configuration.json index 026deea0..eb0d3d85 100644 --- a/Yi.Framework.Net6/Yi.Framework.OcelotGateway/configuration.json +++ b/Yi.Framework.Net6/Yi.Framework.OcelotGateway/configuration.json @@ -1,32 +1,32 @@ -////*****************************ַʵؾ+Consul******************************** +////*****************************单地址多实例负载均衡+Consul******************************** //{ // "Routes": [ // { -// "DownstreamPathTemplate": "/api/{url}", //ַ--url +// "DownstreamPathTemplate": "/api/{url}", //服务地址--url变量 // "DownstreamScheme": "http", -// "UpstreamPathTemplate": "/T/{url}", //صַ--url +// "UpstreamPathTemplate": "/T/{url}", //网关地址--url变量 // "UpstreamHttpMethod": [ "Get", "Post" ], // "UseServiceDiscovery": true, -// "ServiceName": "ZhaoxiService", //consul +// "ServiceName": "ZhaoxiService", //consul服务名称 // "LoadBalancerOptions": { -// "Type": "RoundRobin" //ѯ LeastConnection-ķ NoLoadBalanceؾ +// "Type": "RoundRobin" //轮询 LeastConnection-最少连接数的服务器 NoLoadBalance不负载均衡 // } // } // ], // "GlobalConfiguration": { -// "BaseUrl": "http://127.0.0.1:6299", //ضַ +// "BaseUrl": "http://127.0.0.1:6299", //网关对外地址 // "ServiceDiscoveryProvider": { // "Host": "47.95.2.2", // "Port": 8089, -// "Type": "Consul" //Consulṩ, ÿȥconsul -// } //Ocelotû֧öConsul +// "Type": "Consul" //由Consul提供服务发现, 每次请求去consul +// } //Ocelot没有支持配置多个Consul // //,"ServiceDiscoveryProvider": { // // "Host": "localhost", // // "Port": 8500, -// // "Type": "PollConsul", //Consulṩ, -// // "PollingInterval": 1000 //ѯconsul,Ƶʺ--downDz֪ -// // //"Token": "footoken"//ҪACLĻ +// // "Type": "PollConsul", //由Consul提供服务发现, +// // "PollingInterval": 1000 //轮询consul,频率毫秒--down掉是不知道的 +// // //"Token": "footoken"//需要ACL的话 // //} // } //} @@ -37,77 +37,77 @@ { "Routes": [ { - "UpstreamPathTemplate": "api/api/{url}", //ַ-- + "UpstreamPathTemplate": "api/api/{url}", //上游请求地址--网关 "UpstreamHttpMethod": [ "Get", "Post", "Put", "PATCH", "Delete", "Options" ], "UseServiceDiscovery": true, "ServiceName": "ApiMicroservice", "LoadBalancerOptions": { - "Type": "RoundRobin" //ѯ LeastConnection-ķ NoLoadBalanceؾ + "Type": "RoundRobin" //轮询 LeastConnection-最少连接数的服务器 NoLoadBalance不负载均衡 }, - "DownstreamPathTemplate": "api/api/{url}", //ַ--url + "DownstreamPathTemplate": "api/api/{url}", //服务地址--url变量 "DownstreamScheme": "https", "DownstreamHeaderTransform": { - "Access-Control-Allow-Origin": "*", //ھ + "Access-Control-Allow-Origin": "*", //不存在就添加 "Access-Control-Allow-Methods": "*", "Access-Control-Allow-Headers": "*" } }, { - "UpstreamPathTemplate": "api/item/{url}", //ַ-- + "UpstreamPathTemplate": "api/item/{url}", //上游请求地址--网关 "UpstreamHttpMethod": [ "Get", "Post", "Put", "PATCH", "Delete", "Options" ], "UseServiceDiscovery": true, "ServiceName": "PageDetail", "LoadBalancerOptions": { - "Type": "RoundRobin" //ѯ LeastConnection-ķ NoLoadBalanceؾ + "Type": "RoundRobin" //轮询 LeastConnection-最少连接数的服务器 NoLoadBalance不负载均衡 }, - "DownstreamPathTemplate": "api/item/{url}", //ַ--url + "DownstreamPathTemplate": "api/item/{url}", //服务地址--url变量 "DownstreamScheme": "https", "DownstreamHeaderTransform": { - "Access-Control-Allow-Origin": "*", //ھ + "Access-Control-Allow-Origin": "*", //不存在就添加 "Access-Control-Allow-Methods": "*", "Access-Control-Allow-Headers": "*" } } ], "GlobalConfiguration": { - "BaseUrl": "http://127.0.0.1:7200", //ضַ + "BaseUrl": "http://127.0.0.1:7200", //网关对外地址 "ServiceDiscoveryProvider": { "Host": "192.168.2.128", "Port": 8500, - "Type": "Consul" //Consulṩ, ÿȥconsul + "Type": "Consul" //由Consul提供服务发现, 每次请求去consul }, "RateLimitOptions": { - "QuotaExceededMessage": "ƵԺԣ", // رضʱصϢ - "HttpStatusCode": 666 // رضʱصhttp status - //"ClientIdHeader": "client_id" // ʶͻ˵ͷĬ ClientId + "QuotaExceededMessage": "你的请求过于频繁，请稍后再试！", // 当请求过载被截断时返回的消息 + "HttpStatusCode": 666 // 当请求过载被截断时返回的http status + //"ClientIdHeader": "client_id" // 用来识别客户端的请求头，默认是 ClientId } //,"ServiceDiscoveryProvider": { // "Host": "localhost", // "Port": 8500, - // "Type": "PollConsul", //Consulṩ, - // "PollingInterval": 1000 //ѯconsul,Ƶʺ--downDz֪ - // //"Token": "footoken"//ҪACLĻ + // "Type": "PollConsul", //由Consul提供服务发现, + // "PollingInterval": 1000 //轮询consul,频率毫秒--down掉是不知道的 + // //"Token": "footoken"//需要ACL的话 //} } } -////*****************************ַ--Consul******************************** +////*****************************单地址--无Consul******************************** //{ // "Routes": [ // { -// "UpstreamPathTemplate": "/api/auth/{url}", //ַ-- +// "UpstreamPathTemplate": "/api/auth/{url}", //上游请求地址--网关 // "UpstreamHttpMethod": [ "Get", "Post", "Put", "PATCH", "Delete", "Options" ], // "DownstreamHostAndPorts": [ // { // "Host": "localhost", -// "Port": 7200 //api ˿ +// "Port": 7200 //网关api 端口 // } // ], -// "DownstreamPathTemplate": "/api/{url}", //ַ--url +// "DownstreamPathTemplate": "/api/{url}", //服务地址--url变量 // "DownstreamScheme": "http", // "DownstreamHeaderTransform": { -// "Access-Control-Allow-Origin": "*", //ھ +// "Access-Control-Allow-Origin": "*", //不存在就添加 // "Access-Control-Allow-Methods": "*", // "Access-Control-Allow-Headers": "*" // } @@ -115,123 +115,123 @@ // ] //} -////*****************************ַȫƥ******************************** +////*****************************单地址全匹配******************************** //{ // "Routes": [ // { -// "DownstreamPathTemplate": "/{url}", //ַ--url +// "DownstreamPathTemplate": "/{url}", //服务地址--url变量 // "DownstreamScheme": "http", // "DownstreamHostAndPorts": [ // { // "Host": "localhost", -// "Port": 5726 //˿ +// "Port": 5726 //服务端口 // } // ], -// "UpstreamPathTemplate": "/{url}", //صַ--url //ͻĻԼȨPriority +// "UpstreamPathTemplate": "/{url}", //网关地址--url变量 //冲突的还可以加权重Priority // "UpstreamHttpMethod": [ "Get", "Post" ] // } // ] //} -////*****************************ַʵ******************************** +////*****************************多地址多实例******************************** //{ // "Routes": [ // { -// "DownstreamPathTemplate": "/api/{url}", //ַ--url +// "DownstreamPathTemplate": "/api/{url}", //服务地址--url变量 // "DownstreamScheme": "http", // "DownstreamHostAndPorts": [ // { // "Host": "localhost", -// "Port": 5726 //˿ +// "Port": 5726 //服务端口 // } // ], -// "UpstreamPathTemplate": "/T5726/{url}", //صַ--url +// "UpstreamPathTemplate": "/T5726/{url}", //网关地址--url变量 // "UpstreamHttpMethod": [ "Get", "Post" ] // }, // { -// "DownstreamPathTemplate": "/api/{url}", //ַ--url +// "DownstreamPathTemplate": "/api/{url}", //服务地址--url变量 // "DownstreamScheme": "http", // "DownstreamHostAndPorts": [ // { // "Host": "localhost", -// "Port": 5727 //˿ +// "Port": 5727 //服务端口 // } // ], -// "UpstreamPathTemplate": "/T5727/{url}", //صַ--url +// "UpstreamPathTemplate": "/T5727/{url}", //网关地址--url变量 // "UpstreamHttpMethod": [ "Get", "Post" ] // }, // { -// "DownstreamPathTemplate": "/api/{url}", //ַ--url +// "DownstreamPathTemplate": "/api/{url}", //服务地址--url变量 // "DownstreamScheme": "http", // "DownstreamHostAndPorts": [ // { // "Host": "localhost", -// "Port": 5728 //˿ +// "Port": 5728 //服务端口 // } // ], -// "UpstreamPathTemplate": "/T5728/{url}", //صַ--url +// "UpstreamPathTemplate": "/T5728/{url}", //网关地址--url变量 // "UpstreamHttpMethod": [ "Get", "Post" ] // } // ] //} -//////MVC·ɹǽˮ¥̨ȵ-- -////*****************************·ɳͻ+Ȩƥ******************************** +//////MVC的路由规则是近水楼台先得月-- +////*****************************路由冲突+带权匹配******************************** //{ // "Routes": [ // { -// "DownstreamPathTemplate": "/{url}", //ַ--url +// "DownstreamPathTemplate": "/{url}", //服务地址--url变量 // "DownstreamScheme": "http", // "DownstreamHostAndPorts": [ // { // "Host": "localhost", -// "Port": 5726 //˿ +// "Port": 5726 //服务端口 // } // ], -// "UpstreamPathTemplate": "/{url}", //صַ--url //ͻĻԼȨPriority +// "UpstreamPathTemplate": "/{url}", //网关地址--url变量 //冲突的还可以加权重Priority // "UpstreamHttpMethod": [ "Get", "Post" ], -// "Priority": 0 //Ĭ0 Ӹ1 +// "Priority": 0 //默认是0 加个1 // }, // { -// "DownstreamPathTemplate": "/api/users/get?id={id}", //ַ--url +// "DownstreamPathTemplate": "/api/users/get?id={id}", //服务地址--url变量 // "DownstreamScheme": "http", // "DownstreamHostAndPorts": [ // { // "Host": "localhost", -// "Port": 5727 //˿ +// "Port": 5727 //服务端口 // } // ], -// "UpstreamPathTemplate": "/api/users/get/{id}", //صַ--url //ͻĻԼȨPriority +// "UpstreamPathTemplate": "/api/users/get/{id}", //网关地址--url变量 //冲突的还可以加权重Priority // "UpstreamHttpMethod": [ "Get", "Post" ], -// "Priority": 1 //Ĭ0 Ӹ1 +// "Priority": 1 //默认是0 加个1 // }, // { -// "DownstreamPathTemplate": "/api/users/{url}?id={id}", //ַ--url +// "DownstreamPathTemplate": "/api/users/{url}?id={id}", //服务地址--url变量 // "DownstreamScheme": "http", // "DownstreamHostAndPorts": [ // { // "Host": "localhost", -// "Port": 5728 //˿ +// "Port": 5728 //服务端口 // } // ], -// "UpstreamPathTemplate": "/api/users/{url}/{id}", //صַ--url //ͻĻԼȨPriority +// "UpstreamPathTemplate": "/api/users/{url}/{id}", //网关地址--url变量 //冲突的还可以加权重Priority // "UpstreamHttpMethod": [ "Get", "Post" ], -// "Priority": 2 //Ĭ0 Ӹ1 +// "Priority": 2 //默认是0 加个1 // } // ] //} -////*****************************ַʵؾ******************************** +////*****************************单地址多实例负载均衡******************************** //{ // "Routes": [ // { -// "DownstreamPathTemplate": "/api/{url}", //ַ--url +// "DownstreamPathTemplate": "/api/{url}", //服务地址--url变量 // "DownstreamScheme": "http", // "DownstreamHostAndPorts": [ // { // "Host": "47.95.2.2", // "Port": 5726 -// }, //Ocelotؾ +// }, //Ocelot负载均衡 // { // "Host": "47.95.2.2", // "Port": 5727 @@ -241,10 +241,10 @@ // "Port": 5728 // } // ], -// "UpstreamPathTemplate": "/T/{url}", //صַ--url //ͻĻԼȨPriority +// "UpstreamPathTemplate": "/T/{url}", //网关地址--url变量 //冲突的还可以加权重Priority // "UpstreamHttpMethod": [ "Get", "Post" ], // "LoadBalancerOptions": { -// "Type": "RoundRobin" //ѯ //"LeastConnection" //ķ "NoLoadBalance" //ؾ //"CookieStickySessions" //Ựճ // +// "Type": "RoundRobin" //轮询 //"LeastConnection" //最少连接数的服务器 "NoLoadBalance" //不负载均衡 //"CookieStickySessions" //会话粘滞 // // } // //"LoadBalancerOptions": { // // "Type": "CookieStickySessions", @@ -255,126 +255,126 @@ // ] //} -////*****************************ַʵؾ+Consul******************************** +////*****************************单地址多实例负载均衡+Consul******************************** //{ // "Routes": [ // { -// "DownstreamPathTemplate": "/api/{url}", //ַ--url +// "DownstreamPathTemplate": "/api/{url}", //服务地址--url变量 // "DownstreamScheme": "http", -// "UpstreamPathTemplate": "/T/{url}", //صַ--url +// "UpstreamPathTemplate": "/T/{url}", //网关地址--url变量 // "UpstreamHttpMethod": [ "Get", "Post" ], // "UseServiceDiscovery": true, -// "ServiceName": "ZhaoxiService", //consul +// "ServiceName": "ZhaoxiService", //consul服务名称 // "LoadBalancerOptions": { -// "Type": "RoundRobin" //ѯ LeastConnection-ķ NoLoadBalanceؾ +// "Type": "RoundRobin" //轮询 LeastConnection-最少连接数的服务器 NoLoadBalance不负载均衡 // } // } // ], // "GlobalConfiguration": { -// "BaseUrl": "http://127.0.0.1:6299", //ضַ +// "BaseUrl": "http://127.0.0.1:6299", //网关对外地址 // "ServiceDiscoveryProvider": { // "Host": "47.95.2.2", // "Port": 8089, -// "Type": "Consul" //Consulṩ, ÿȥconsul -// } //Ocelotû֧öConsul +// "Type": "Consul" //由Consul提供服务发现, 每次请求去consul +// } //Ocelot没有支持配置多个Consul // //,"ServiceDiscoveryProvider": { // // "Host": "localhost", // // "Port": 8500, -// // "Type": "PollConsul", //Consulṩ, -// // "PollingInterval": 1000 //ѯconsul,Ƶʺ--downDz֪ -// // //"Token": "footoken"//ҪACLĻ +// // "Type": "PollConsul", //由Consul提供服务发现, +// // "PollingInterval": 1000 //轮询consul,频率毫秒--down掉是不知道的 +// // //"Token": "footoken"//需要ACL的话 // //} // } //} -////*****************************Consul+Cache******************************** +////*****************************Consul+缓存Cache******************************** //{ // "Routes": [ // { -// "DownstreamPathTemplate": "/api/{url}", //ַ--url +// "DownstreamPathTemplate": "/api/{url}", //服务地址--url变量 // "DownstreamScheme": "http", -// "UpstreamPathTemplate": "/T/{url}", //صַ--url +// "UpstreamPathTemplate": "/T/{url}", //网关地址--url变量 // "UpstreamHttpMethod": [ "Get", "Post" ], // "UseServiceDiscovery": true, -// "ServiceName": "ZhaoxiService", //consul +// "ServiceName": "ZhaoxiService", //consul服务名称 // "LoadBalancerOptions": { -// "Type": "RoundRobin" //ѯ LeastConnection-ķ NoLoadBalanceؾ +// "Type": "RoundRobin" //轮询 LeastConnection-最少连接数的服务器 NoLoadBalance不负载均衡 // }, // "FileCacheOptions": { // "TtlSeconds": 15, //Second -// "Region": "UserCache" //ԵApi +// "Region": "UserCache" //可以调用Api缓存清理 // } // } // ], // "GlobalConfiguration": { -// "BaseUrl": "http://127.0.0.1:6299", //ضַ +// "BaseUrl": "http://127.0.0.1:6299", //网关对外地址 // "ServiceDiscoveryProvider": { // "Host": "47.95.2.2", // "Port": 8089, -// "Type": "Consul" //Consulṩ, ÿȥconsul +// "Type": "Consul" //由Consul提供服务发现, 每次请求去consul // } // //"ServiceDiscoveryProvider": { // // "Host": "localhost", // // "Port": 8500, -// // "Type": "PollConsul", //Consulṩ, -// // "PollingInterval": 1000 //ѯconsul,Ƶʺ--downDz֪ -// // //"Token": "footoken"//ҪACLĻ +// // "Type": "PollConsul", //由Consul提供服务发现, +// // "PollingInterval": 1000 //轮询consul,频率毫秒--down掉是不知道的 +// // //"Token": "footoken"//需要ACL的话 // //} // } //} -////*****************************ʱ++۶++Consul+Polly******************************** +////*****************************超时+限流+熔断+降级+Consul+Polly******************************** //{ // "Routes": [ // { -// "DownstreamPathTemplate": "/api/{url}", //ַ--url +// "DownstreamPathTemplate": "/api/{url}", //服务地址--url变量 // "DownstreamScheme": "http", -// "UpstreamPathTemplate": "/T/{url}", //صַ--url +// "UpstreamPathTemplate": "/T/{url}", //网关地址--url变量 // "UpstreamHttpMethod": [ "Get", "Post" ], // "UseServiceDiscovery": true, -// "ServiceName": "ZhaoxiService", //consul +// "ServiceName": "ZhaoxiService", //consul服务名称 // "LoadBalancerOptions": { -// "Type": "RoundRobin" //ѯ LeastConnection-ķ NoLoadBalanceؾ +// "Type": "RoundRobin" //轮询 LeastConnection-最少连接数的服务器 NoLoadBalance不负载均衡 // }, // "RateLimitOptions": { -// "ClientWhitelist": [ "eleven", "seven" ], // ClientId ִСд +// "ClientWhitelist": [ "eleven", "seven" ], //白名单 ClientId 区分大小写 // "EnableRateLimiting": true, // "Period": "5m", //1s, 5m, 1h, 1d -// "PeriodTimespan": 30, //֮ͻ˿ -// "Limit": 5 //ͳʱ +// "PeriodTimespan": 30, //多少秒之后客户端可以重试 +// "Limit": 5 //统计时间段内允许的最大请求数量 // }, // "AuthenticationOptions": { // "AuthenticationProviderKey": "UserGatewayKey", // "AllowedScopes": [] // }, // "QoSOptions": { -// "ExceptionsAllowedBeforeBreaking": 3, //ٸ쳣 -// "DurationOfBreak": 10000, // ۶ϵʱ䣬λΪms -// "TimeoutValue": 2000 //λms Ĵʱ䳬罫Ϊʱ Ĭ90 +// "ExceptionsAllowedBeforeBreaking": 3, //允许多少个异常请求 +// "DurationOfBreak": 10000, // 熔断的时间，单位为ms +// "TimeoutValue": 2000 //单位ms 如果下游请求的处理时间超过多少则自如将请求设置为超时 默认90秒 // } // //"FileCacheOptions": { // // "TtlSeconds": 15, -// // "Region": "UserCache" //ԵApi +// // "Region": "UserCache" //可以调用Api清理 // //} // } // ], // "GlobalConfiguration": { -// "BaseUrl": "http://127.0.0.1:6299", //ضַ +// "BaseUrl": "http://127.0.0.1:6299", //网关对外地址 // "ServiceDiscoveryProvider": { // "Host": "47.95.2.2", // "Port": 8089, -// "Type": "Consul" //Consulṩ +// "Type": "Consul" //由Consul提供服务发现 // }, // "RateLimitOptions": { -// "QuotaExceededMessage": "Too many requests, maybe later? 11", // رضʱصϢ -// "HttpStatusCode": 666, // رضʱصhttp status -// //"ClientIdHeader": "client_id" // ʶͻ˵ͷĬ ClientId +// "QuotaExceededMessage": "Too many requests, maybe later? 11", // 当请求过载被截断时返回的消息 +// "HttpStatusCode": 666, // 当请求过载被截断时返回的http status +// //"ClientIdHeader": "client_id" // 用来识别客户端的请求头，默认是 ClientId // } // } //} -////*****************************ۺAggregator******************************** +////*****************************请求聚合Aggregator******************************** //{ // "Routes": [ // { @@ -383,8 +383,8 @@ // "DownstreamHostAndPorts": [ // { // "Host": "localhost", -// "Port": 5726 //˿ -// } //Զиؾ +// "Port": 5726 //服务端口 +// } //可以多个，自行负载均衡 // ], // "UpstreamPathTemplate": "/T5726/users/all", // "UpstreamHttpMethod": [ "Get", "Post" ], @@ -396,7 +396,7 @@ // "DownstreamHostAndPorts": [ // { // "Host": "localhost", -// "Port": 5727 //˿ +// "Port": 5727 //服务端口 // } // ], // "UpstreamPathTemplate": "/T5727/users/all", @@ -409,7 +409,7 @@ // "DownstreamHostAndPorts": [ // { // "Host": "localhost", -// "Port": 5728 //˿ +// "Port": 5728 //服务端口 // } // ], // "UpstreamPathTemplate": "/T5728/users/all", @@ -424,8 +424,8 @@ // "T5727", // "T5728" // ], -// "UpstreamPathTemplate": "/UserAggregator", //ij404 DzӰ췵أnull -// "Aggregator": "CustomUserAggregator" //Զۺ +// "UpstreamPathTemplate": "/UserAggregator", //如果某个404 是不影响返回，当成null +// "Aggregator": "CustomUserAggregator" //自定义聚合器 // } // ] //} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/RABC/RoleService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RABC/RoleService.cs index e20ed0ed..6bbca3c8 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/RABC/RoleService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/RABC/RoleService.cs @@ -9,7 +9,7 @@ using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; using Yi.Framework.Service.Base; using Yi.Framework.Interface.RABC; -using Yi.Framework.DTOModel.Base.Dto; +using Yi.Framework.DtoModel.Base.Dto; namespace Yi.Framework.Service.RABC { diff --git a/Yi.Framework.Net6/Yi.Framework.Service/RABC/StudentService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RABC/StudentService.cs index 731fafab..009ea0d3 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/RABC/StudentService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/RABC/StudentService.cs @@ -3,7 +3,8 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; using Yi.Framework.Common.Exceptions; -using Yi.Framework.DTOModel.RABC.Student; +using Yi.Framework.DtoModel.RABC.Student; +using Yi.Framework.DtoModel.RABC.Student.ConstConfig; using Yi.Framework.Interface.RABC; using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; @@ -24,11 +25,11 @@ namespace Yi.Framework.Service.RABC public void GetError() { - throw new ApplicationException("查询错误"); + throw new ApplicationException(StudentConst.学生异常错误); } public void GetError2() { - throw new UserFriendlyException("友好错误"); + throw new UserFriendlyException(StudentConst.学生友好错误); } /// diff --git a/Yi.Framework.Net6/Yi.Framework.Service/RABC/UserService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RABC/UserService.cs index 68ad0e8e..2c582198 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/RABC/UserService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/RABC/UserService.cs @@ -12,7 +12,7 @@ using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; using Yi.Framework.Service.Base; using Yi.Framework.Interface.RABC; -using Yi.Framework.DTOModel.Base.Dto; +using Yi.Framework.DtoModel.Base.Dto; namespace Yi.Framework.Service.RABC { diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/AutoMapperExtension.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/AutoMapperExtension.cs index 78c02d9f..11bc1c84 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/AutoMapperExtension.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/AutoMapperExtension.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using System; using System.IO; -using Yi.Framework.DTOModel.RABC.Student.MapperConfig; +using Yi.Framework.DtoModel.RABC.Student.MapperConfig; using Yi.Framework.WebCore.Mapper; namespace Yi.Framework.WebCore.AspNetCoreExtensions @@ -17,7 +17,7 @@ namespace Yi.Framework.WebCore.AspNetCoreExtensions { //这里会通过反射自动注入的，先临时这样 - var profileList = Common.Helper.AssemblyHelper.GetClassByBaseClassesAndInterfaces("Yi.Framework.DTOModel", typeof(Profile)); + var profileList = Common.Helper.AssemblyHelper.GetClassByBaseClassesAndInterfaces("Yi.Framework.DtoModel", typeof(Profile)); profileList.Add(typeof(AutoMapperProfile)); services.AddAutoMapper(profileList.ToArray()); diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbFiterExtend.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbFiterExtend.cs index afe5c18e..5d22d284 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbFiterExtend.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbFiterExtend.cs @@ -6,7 +6,7 @@ using Yi.Framework.Common.Const; using Yi.Framework.Common.Enum; using Yi.Framework.Common.Models; using Yi.Framework.Core.Cache; -using Yi.Framework.DTOModel.Base.Dto; +using Yi.Framework.DtoModel.Base.Dto; using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.WebCore.CommonExtend; diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/Mapper/Profile/AutoMapperProfile.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/Mapper/Profile/AutoMapperProfile.cs index 49191dd4..1b18a176 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/Mapper/Profile/AutoMapperProfile.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/Mapper/Profile/AutoMapperProfile.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Yi.Framework.DTOModel.Base.Vo; +using Yi.Framework.DtoModel.Base.Vo; using Yi.Framework.Model.BBS.Entitys; using Yi.Framework.Model.RABC.Entitys; diff --git a/Yi.Framework.Net6/Yi.Framework.sln b/Yi.Framework.Net6/Yi.Framework.sln index 4e95fef1..d0170284 100644 --- a/Yi.Framework.Net6/Yi.Framework.sln +++ b/Yi.Framework.Net6/Yi.Framework.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BackGround", "BackGround", "{D6B44435-EAFA-4D55-90D0-3AF80485FB83}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{C90E38FB-69EA-4997-8B3A-2C71EFA65B2B}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{C90E38FB-69EA-4997-8B3A-2C71EFA65B2B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Domain", "Domain", "{DB2506F5-05FD-4E76-940E-41D7AA148550}" EndProject @@ -13,7 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Infrastructure", "Infrastru EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MicroServiceInstance", "MicroServiceInstance", "{026D2797-07D1-4BA5-8070-50CDE0258C59}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.DTOModel", "Yi.Framework.DTOModel\Yi.Framework.DTOModel.csproj", "{5B6C87F0-CEBA-4A0A-8C30-02E927AB4AEF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.DtoModel", "Yi.Framework.DtoModel\Yi.Framework.DtoModel.csproj", "{5B6C87F0-CEBA-4A0A-8C30-02E927AB4AEF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Interface", "Yi.Framework.Interface\Yi.Framework.Interface.csproj", "{5935EC64-7414-47D8-B934-E5896DD89E4E}" EndProject @@ -33,8 +33,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.OcelotGateway" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.AuthenticationCenter", "Yi.Framework.AuthenticationCenter\Yi.Framework.AuthenticationCenter.csproj", "{694C0EC0-ED32-4E5D-8EA1-FB82E1303EAB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.ElasticSearchProcessor", "Yi.Framework.ElasticSearchProcessor\Yi.Framework.ElasticSearchProcessor.csproj", "{EEF89893-A6A9-4C02-818C-D116C8EAE0EF}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Job", "Yi.Framework.Task\Yi.Framework.Job.csproj", "{F1C990DD-32C3-4F02-83B0-6E52B18B0B17}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.SMSProcessor", "Yi.Framework.SMSProcessor\Yi.Framework.SMSProcessor.csproj", "{7C58FB7C-9AB5-47CF-ACEB-B784CF820E7E}" @@ -49,6 +47,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Template", "Yi EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.XUnitTest", "Yi.Framework.XUnitTest\Yi.Framework.XUnitTest.csproj", "{88E3298A-135D-4D9C-B98D-41A2C4268385}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Module", "Module", "{ACAC0C36-BE42-46C7-99AB-042C9C910D5B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -95,10 +95,6 @@ Global {694C0EC0-ED32-4E5D-8EA1-FB82E1303EAB}.Debug|Any CPU.Build.0 = Debug|Any CPU {694C0EC0-ED32-4E5D-8EA1-FB82E1303EAB}.Release|Any CPU.ActiveCfg = Release|Any CPU {694C0EC0-ED32-4E5D-8EA1-FB82E1303EAB}.Release|Any CPU.Build.0 = Release|Any CPU - {EEF89893-A6A9-4C02-818C-D116C8EAE0EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EEF89893-A6A9-4C02-818C-D116C8EAE0EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EEF89893-A6A9-4C02-818C-D116C8EAE0EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EEF89893-A6A9-4C02-818C-D116C8EAE0EF}.Release|Any CPU.Build.0 = Release|Any CPU {F1C990DD-32C3-4F02-83B0-6E52B18B0B17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F1C990DD-32C3-4F02-83B0-6E52B18B0B17}.Debug|Any CPU.Build.0 = Debug|Any CPU {F1C990DD-32C3-4F02-83B0-6E52B18B0B17}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -142,13 +138,12 @@ Global {A95157D2-907F-411E-BA1D-A17F48C54A0E} = {026D2797-07D1-4BA5-8070-50CDE0258C59} {671E38D8-ECAF-484B-A2AE-63DDC469C315} = {D6B44435-EAFA-4D55-90D0-3AF80485FB83} {694C0EC0-ED32-4E5D-8EA1-FB82E1303EAB} = {D6B44435-EAFA-4D55-90D0-3AF80485FB83} - {EEF89893-A6A9-4C02-818C-D116C8EAE0EF} = {D6B44435-EAFA-4D55-90D0-3AF80485FB83} - {F1C990DD-32C3-4F02-83B0-6E52B18B0B17} = {9ABAF6B1-6C02-498A-90A2-ABC1140CF89A} + {F1C990DD-32C3-4F02-83B0-6E52B18B0B17} = {ACAC0C36-BE42-46C7-99AB-042C9C910D5B} {7C58FB7C-9AB5-47CF-ACEB-B784CF820E7E} = {D6B44435-EAFA-4D55-90D0-3AF80485FB83} {DA96B62F-2D4C-4AFB-937C-5AEA1119A129} = {DB2506F5-05FD-4E76-940E-41D7AA148550} - {3047069B-4084-461F-BC9F-023BC60401D1} = {9ABAF6B1-6C02-498A-90A2-ABC1140CF89A} - {C307189D-C42C-4C09-BB65-5A386C9F182B} = {9ABAF6B1-6C02-498A-90A2-ABC1140CF89A} - {A51E9091-3745-461A-A3CB-32598BF0DC77} = {9ABAF6B1-6C02-498A-90A2-ABC1140CF89A} + {3047069B-4084-461F-BC9F-023BC60401D1} = {ACAC0C36-BE42-46C7-99AB-042C9C910D5B} + {C307189D-C42C-4C09-BB65-5A386C9F182B} = {ACAC0C36-BE42-46C7-99AB-042C9C910D5B} + {A51E9091-3745-461A-A3CB-32598BF0DC77} = {ACAC0C36-BE42-46C7-99AB-042C9C910D5B} {88E3298A-135D-4D9C-B98D-41A2C4268385} = {C90E38FB-69EA-4997-8B3A-2C71EFA65B2B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution