diff --git a/Yi.Framework.Net6/Yi.Framework.MSUnitTest/UnitTest1.cs b/Yi.Framework.Net6/Yi.Framework.MSUnitTest/UnitTest1.cs deleted file mode 100644 index 67df934b..00000000 --- a/Yi.Framework.Net6/Yi.Framework.MSUnitTest/UnitTest1.cs +++ /dev/null @@ -1,13 +0,0 @@ -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Yi.Framework.MSUnitTest -{ - [TestClass] - public class UnitTest1 - { - [TestMethod] - public void TestMethod1() - { - } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.MSUnitTest/Yi.Framework.MSUnitTest.csproj b/Yi.Framework.Net6/Yi.Framework.MSUnitTest/Yi.Framework.MSUnitTest.csproj deleted file mode 100644 index ce8cacf4..00000000 --- a/Yi.Framework.Net6/Yi.Framework.MSUnitTest/Yi.Framework.MSUnitTest.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - net6.0 - - false - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/QuartzExtensions.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/QuartzExtensions.cs index d8b18c18..7e86dffb 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/QuartzExtensions.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/QuartzExtensions.cs @@ -25,7 +25,6 @@ namespace Yi.Framework.WebCore.MiddlewareExtend { services.AddSingleton(); services.AddQuartz(); - services.AddSingleton(); return services; } } diff --git a/Yi.Framework.Net6/Yi.Framework.XUnitTest/CrudTest/AccountTest.cs b/Yi.Framework.Net6/Yi.Framework.XUnitTest/CrudTest/AccountTest.cs new file mode 100644 index 00000000..c47d5799 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.XUnitTest/CrudTest/AccountTest.cs @@ -0,0 +1,15 @@ +using Yi.Framework.Common.Const; +using Yi.Framework.Core; +using Yi.Framework.Interface; + +namespace Yi.Framework.XUnitTest +{ + public class AccountTest + { + private IUserService _iUserService; + public AccountTest(IUserService iUserService) => + (_iUserService) = + (iUserService); + + } +} \ No newline at end of file diff --git a/Yi.Framework.Net6/Yi.Framework.XUnitTest/JobTest/QuartzTest.cs b/Yi.Framework.Net6/Yi.Framework.XUnitTest/JobTest/QuartzTest.cs new file mode 100644 index 00000000..db317bfe --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.XUnitTest/JobTest/QuartzTest.cs @@ -0,0 +1,39 @@ +using Yi.Framework.Common.Const; +using Yi.Framework.Core; + +namespace Yi.Framework.XUnitTest +{ + public class QuartzTest + { + private QuartzInvoker _quartzInvoker; + public QuartzTest(QuartzInvoker quartzInvoker) => + (_quartzInvoker) = + (quartzInvoker); + + /// + /// 开启任务 + /// + /// + [Fact] + public async Task StartJob() + { + Dictionary data = new Dictionary() + { + {JobConst.method,"get" }, + {JobConst.url,"https://www.baidu.com" } + }; + await _quartzInvoker.StartAsync("*/5 * * * * ?", "HttpJob", jobName: "test", jobGroup: "my", data: data); + } + + /// + /// 停止任务 + /// + /// + [Fact] + public async Task StopJob() + { + await StartJob(); + await _quartzInvoker.StopAsync(new Quartz.JobKey("test", "my")); + } + } +} \ No newline at end of file diff --git a/Yi.Framework.Net6/Yi.Framework.XUnitTest/Startup.cs b/Yi.Framework.Net6/Yi.Framework.XUnitTest/Startup.cs new file mode 100644 index 00000000..68fb43e3 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.XUnitTest/Startup.cs @@ -0,0 +1,57 @@ +锘縰sing System; +using System.Collections.Generic; +using Autofac.Extensions.DependencyInjection; +using Autofac; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; +using Microsoft.Extensions.Hosting; +using Quartz; +using Yi.Framework.WebCore.AutoFacExtend; +using Yi.Framework.WebCore.MiddlewareExtend; +using Microsoft.AspNetCore.Builder; +using Yi.Framework.WebCore.DbExtend; + +namespace Yi.Framework.XUnitTest +{ + public class Startup + { + public void ConfigureHost(IHostBuilder host) + { + host.ConfigureAppConfiguration(builder => + { + builder.AddJsonFile("appsettings.json"); + builder.AddJsonFile("appsettings.Development.json"); + }); + host.UseServiceProviderFactory(new AutofacServiceProviderFactory()); + host.ConfigureContainer(containerBuilder => + { + #region + //浜ょ敱Module渚濊禆娉ㄥ叆 + #endregion + containerBuilder.RegisterModule(); + #region + //娣诲姞灞炴ф敞鍏ユā鍧 + #endregion + //containerBuilder.RegisterModule(); + #region + //浣跨敤AppService鐗规т紭闆呯殑杩涜鑷姩渚濊禆娉ㄥ叆,浠撳偍涓庡熀绫绘湇鍔′究鏄娇鐢ㄨ绉嶆柟寮忚嚜鍔ㄦ敞鍏 + #endregion + containerBuilder.AddAutoIocService("Yi.Framework.Repository", "Yi.Framework.Service"); + }); + + host.ConfigureServices(services => { }); + } + public void ConfigureServices(IServiceCollection services, HostBuilderContext host) + { + services.AddIocService(host.Configuration); + services.AddQuartzService(); + services.AddSqlsugarServer(); + } + + public void Configure(IServiceProvider services) + { + + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.XUnitTest/Usings.cs b/Yi.Framework.Net6/Yi.Framework.XUnitTest/Usings.cs new file mode 100644 index 00000000..8c927eb7 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.XUnitTest/Usings.cs @@ -0,0 +1 @@ +global using Xunit; \ No newline at end of file diff --git a/Yi.Framework.Net6/Yi.Framework.XUnitTest/Yi.Framework.XUnitTest.csproj b/Yi.Framework.Net6/Yi.Framework.XUnitTest/Yi.Framework.XUnitTest.csproj new file mode 100644 index 00000000..a1e6a5b2 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.XUnitTest/Yi.Framework.XUnitTest.csproj @@ -0,0 +1,59 @@ + + + + net6.0 + enable + enable + + false + + + + + + + + + + + + PreserveNewest + true + PreserveNewest + + + PreserveNewest + true + PreserveNewest + + + PreserveNewest + true + PreserveNewest + + + PreserveNewest + true + PreserveNewest + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + diff --git a/Yi.Framework.Net6/Yi.Framework.XUnitTest/appsettings.Production.json b/Yi.Framework.Net6/Yi.Framework.XUnitTest/appsettings.Production.json new file mode 100644 index 00000000..76127ea8 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.XUnitTest/appsettings.Production.json @@ -0,0 +1,138 @@ +{ + //绋嬪簭鍚姩鍦板潃锛*浠ｈ〃鍏ㄩ儴缃戝彛 + "StartUrl": "http://*:19001", + + //榛樿鏃ュ織鎵撳嵃杩囨护 + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, + + //杩愯鍏ㄩ儴涓绘満 + "AllowedHosts": "*", + + //銆愬叏灞閰嶇疆寮鍚 + //Sql璇彞鏃ュ織鏄惁鎵撳嵃 + "SqlLog_Enable": false, + //鐧诲綍浜岀淮鐮佹槸鍚︽墦鍗 + "LoginCode_Enable": false, + + //銆愭暟鎹簱閰嶇疆銆 + //澶氭暟鎹簱涓讳粠澶嶅埗鏄惁寮鍚 + "MutiDB_Enabled": false, + //鏁版嵁搴揅odeFirst鏄惁寮鍚 + "DbCodeFirst_Enabled": true, + //鏁版嵁搴撶瀛愭暟鎹槸鍚﹀紑鍚 + "DbSeed_Enabled": true, + //鏁版嵁搴撳垪琛 + "DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle" ], + //鏁版嵁搴撶被鍨嬮夋嫨 + "DbSelect": "Sqlite", + //鏁版嵁搴撹繛鎺ュ湴鍧锛屾敮鎸佽鍐欏垎绂 + "DbConn": { + "WriteUrl": "DataSource=yi-sqlsugar-dev.db", + "ReadUrl": [ + "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", + "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", + "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]" + ] + }, + + + //銆愮紦瀛橀厤缃 + //缂撳瓨鍒楄〃 + "CacheList": [ "Redis", "MemoryCache" ], + //閫夋嫨缂撳瓨 + "CacheSelect": "MemoryCache", + //缂撳瓨绉嶅瓙鏁版嵁鏄惁寮鍚 + "CacheSeed_Enabled": false, + + + //銆愪腑闂翠欢寮鍚 + //Consul鏄惁寮鍚 + "Consul_Enabled": false, + //鍋ュ悍妫鏌ユ槸鍚﹀紑鍚 + "HealthCheck_Enabled": false, + //璺ㄥ煙寮鏀炬槸鍚﹀紑鍚 + "Cors_Enabled": true, + //Apollo鏄惁寮鍚 + "Apollo_Enabled": false, + //RabbitMQ鏄惁寮鍚 + "RabbitMQ_Enabled": false, + //Kafka鏄惁寮鍚 + "Kafka_Enabled": false, + //ElasticSeach鏄惁寮鍚 + "ElasticSeach_Enabled": false, + //鐭俊鍙戦佹槸鍚﹀紑鍚 + "SMS_Enabled": false, + //鍒嗗竷寮廋AP鏄惁寮鍚 + "CAP_Enabled": false, + //鍒嗗竷寮廋AP闈㈡澘鏄惁寮鍚 + "CAPDashboard_Enabled": false, + + + //銆愪腑闂翠欢閰嶇疆銆 + //jwt鎺堟潈鍐呭锛屽叕閽ョ閽ヨ浆绉诲埌鐩綍涓嬬殑pem鏂囦欢 + "JwtAuthorize": { + "Issuer": "cc", + "Audience": "cc", + "PolicyName": "permission", + "DefaultScheme": "Bearer", + "IsHttps": false, + "Expiration": 300, + "ReExpiration": 3000 + }, + //Redis鍦板潃閰嶇疆 + "RedisConnOptions": { + "Host": "[]", + "Prot": 6379, + "DB": 1, + "Password": "[]" + }, + //RabbitMq鍦板潃閰嶇疆 + "RabbitConn": { + "HostName": "[]", + "UserName": "[]", + "Password": "[]", + "Port": 5672 + }, + //ElasticSeach鍦板潃閰嶇疆 + "ElasticSeachConn": { + "Url": "[]", + "IndexName": "[]", + "UserName": "[]", + "PassWord": "[]." + }, + //Kafka鍦板潃閰嶇疆 + "KafkaOptions": { + "BrokerList": "[]:9092", + "TopicName": "kafkalog" + }, + //Consul鍦板潃閰嶇疆 + "ConsulClientOption": { + "IP": "[]", + "Port": "8500", + "Datacenter": "dc1" + }, + //Consul娉ㄥ唽鏈満閰嶇疆 + "ConsulRegisterOption": { + "IP": "[]", + "Port": "[]", + "GroupName": "ApiMicroservice", + "HealthCheckUrl": "/Health", + "Interval": 10, + "Timeout": 5, + "DeregisterCriticalServiceAfter": 60, + "Tag": "13" + }, + //闃块噷浜戠煭淇￠厤缃 + "SMS": { + "ID": "[]", + "Secret": "[]", + "Sign": "[]", + "Template": "[]" + } +} \ No newline at end of file diff --git a/Yi.Framework.Net6/Yi.Framework.XUnitTest/appsettings.Staging.json b/Yi.Framework.Net6/Yi.Framework.XUnitTest/appsettings.Staging.json new file mode 100644 index 00000000..76127ea8 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.XUnitTest/appsettings.Staging.json @@ -0,0 +1,138 @@ +{ + //绋嬪簭鍚姩鍦板潃锛*浠ｈ〃鍏ㄩ儴缃戝彛 + "StartUrl": "http://*:19001", + + //榛樿鏃ュ織鎵撳嵃杩囨护 + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, + + //杩愯鍏ㄩ儴涓绘満 + "AllowedHosts": "*", + + //銆愬叏灞閰嶇疆寮鍚 + //Sql璇彞鏃ュ織鏄惁鎵撳嵃 + "SqlLog_Enable": false, + //鐧诲綍浜岀淮鐮佹槸鍚︽墦鍗 + "LoginCode_Enable": false, + + //銆愭暟鎹簱閰嶇疆銆 + //澶氭暟鎹簱涓讳粠澶嶅埗鏄惁寮鍚 + "MutiDB_Enabled": false, + //鏁版嵁搴揅odeFirst鏄惁寮鍚 + "DbCodeFirst_Enabled": true, + //鏁版嵁搴撶瀛愭暟鎹槸鍚﹀紑鍚 + "DbSeed_Enabled": true, + //鏁版嵁搴撳垪琛 + "DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle" ], + //鏁版嵁搴撶被鍨嬮夋嫨 + "DbSelect": "Sqlite", + //鏁版嵁搴撹繛鎺ュ湴鍧锛屾敮鎸佽鍐欏垎绂 + "DbConn": { + "WriteUrl": "DataSource=yi-sqlsugar-dev.db", + "ReadUrl": [ + "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", + "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", + "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]" + ] + }, + + + //銆愮紦瀛橀厤缃 + //缂撳瓨鍒楄〃 + "CacheList": [ "Redis", "MemoryCache" ], + //閫夋嫨缂撳瓨 + "CacheSelect": "MemoryCache", + //缂撳瓨绉嶅瓙鏁版嵁鏄惁寮鍚 + "CacheSeed_Enabled": false, + + + //銆愪腑闂翠欢寮鍚 + //Consul鏄惁寮鍚 + "Consul_Enabled": false, + //鍋ュ悍妫鏌ユ槸鍚﹀紑鍚 + "HealthCheck_Enabled": false, + //璺ㄥ煙寮鏀炬槸鍚﹀紑鍚 + "Cors_Enabled": true, + //Apollo鏄惁寮鍚 + "Apollo_Enabled": false, + //RabbitMQ鏄惁寮鍚 + "RabbitMQ_Enabled": false, + //Kafka鏄惁寮鍚 + "Kafka_Enabled": false, + //ElasticSeach鏄惁寮鍚 + "ElasticSeach_Enabled": false, + //鐭俊鍙戦佹槸鍚﹀紑鍚 + "SMS_Enabled": false, + //鍒嗗竷寮廋AP鏄惁寮鍚 + "CAP_Enabled": false, + //鍒嗗竷寮廋AP闈㈡澘鏄惁寮鍚 + "CAPDashboard_Enabled": false, + + + //銆愪腑闂翠欢閰嶇疆銆 + //jwt鎺堟潈鍐呭锛屽叕閽ョ閽ヨ浆绉诲埌鐩綍涓嬬殑pem鏂囦欢 + "JwtAuthorize": { + "Issuer": "cc", + "Audience": "cc", + "PolicyName": "permission", + "DefaultScheme": "Bearer", + "IsHttps": false, + "Expiration": 300, + "ReExpiration": 3000 + }, + //Redis鍦板潃閰嶇疆 + "RedisConnOptions": { + "Host": "[]", + "Prot": 6379, + "DB": 1, + "Password": "[]" + }, + //RabbitMq鍦板潃閰嶇疆 + "RabbitConn": { + "HostName": "[]", + "UserName": "[]", + "Password": "[]", + "Port": 5672 + }, + //ElasticSeach鍦板潃閰嶇疆 + "ElasticSeachConn": { + "Url": "[]", + "IndexName": "[]", + "UserName": "[]", + "PassWord": "[]." + }, + //Kafka鍦板潃閰嶇疆 + "KafkaOptions": { + "BrokerList": "[]:9092", + "TopicName": "kafkalog" + }, + //Consul鍦板潃閰嶇疆 + "ConsulClientOption": { + "IP": "[]", + "Port": "8500", + "Datacenter": "dc1" + }, + //Consul娉ㄥ唽鏈満閰嶇疆 + "ConsulRegisterOption": { + "IP": "[]", + "Port": "[]", + "GroupName": "ApiMicroservice", + "HealthCheckUrl": "/Health", + "Interval": 10, + "Timeout": 5, + "DeregisterCriticalServiceAfter": 60, + "Tag": "13" + }, + //闃块噷浜戠煭淇￠厤缃 + "SMS": { + "ID": "[]", + "Secret": "[]", + "Sign": "[]", + "Template": "[]" + } +} \ No newline at end of file diff --git a/Yi.Framework.Net6/Yi.Framework.XUnitTest/appsettings.json b/Yi.Framework.Net6/Yi.Framework.XUnitTest/appsettings.json new file mode 100644 index 00000000..e65abda4 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.XUnitTest/appsettings.json @@ -0,0 +1,138 @@ +{ + //绋嬪簭鍚姩鍦板潃锛*浠ｈ〃鍏ㄩ儴缃戝彛 + "StartUrl": "http://*:19001", + + //榛樿鏃ュ織鎵撳嵃杩囨护 + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, + + //杩愯鍏ㄩ儴涓绘満 + "AllowedHosts": "*", + + //銆愬叏灞閰嶇疆寮鍚 + //Sql璇彞鏃ュ織鏄惁鎵撳嵃 + "SqlLog_Enable": false, + //鐧诲綍浜岀淮鐮佹槸鍚︽墦鍗 + "LoginCode_Enable": false, + + //銆愭暟鎹簱閰嶇疆銆 + //澶氭暟鎹簱涓讳粠澶嶅埗鏄惁寮鍚 + "MutiDB_Enabled": false, + //鏁版嵁搴揅odeFirst鏄惁寮鍚 + "DbCodeFirst_Enabled": true, + //鏁版嵁搴撶瀛愭暟鎹槸鍚﹀紑鍚 + "DbSeed_Enabled": true, + //鏁版嵁搴撳垪琛 + "DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle" ], + //鏁版嵁搴撶被鍨嬮夋嫨 + "DbSelect": "Sqlite", + //鏁版嵁搴撹繛鎺ュ湴鍧锛屾敮鎸佽鍐欏垎绂 + "DbConn": { + "WriteUrl": "DataSource=yi-sqlsugar-dev.db", + "ReadUrl": [ + "DataSource=[xxxx]",//sqlite + "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", //mysql + "Data Source=[xxxx];Initial Catalog=[xxxx];User ID=[xxxx];password=[xxxx]" //sqlserver + ] + }, + + + //銆愮紦瀛橀厤缃 + //缂撳瓨鍒楄〃 + "CacheList": [ "Redis", "MemoryCache" ], + //閫夋嫨缂撳瓨 + "CacheSelect": "MemoryCache", + //缂撳瓨绉嶅瓙鏁版嵁鏄惁寮鍚 + "CacheSeed_Enabled": false, + + + //銆愪腑闂翠欢寮鍚 + //Consul鏄惁寮鍚 + "Consul_Enabled": false, + //鍋ュ悍妫鏌ユ槸鍚﹀紑鍚 + "HealthCheck_Enabled": false, + //璺ㄥ煙寮鏀炬槸鍚﹀紑鍚 + "Cors_Enabled": true, + //Apollo鏄惁寮鍚 + "Apollo_Enabled": false, + //RabbitMQ鏄惁寮鍚 + "RabbitMQ_Enabled": false, + //Kafka鏄惁寮鍚 + "Kafka_Enabled": false, + //ElasticSeach鏄惁寮鍚 + "ElasticSeach_Enabled": false, + //鐭俊鍙戦佹槸鍚﹀紑鍚 + "SMS_Enabled": false, + //鍒嗗竷寮廋AP鏄惁寮鍚 + "CAP_Enabled": false, + //鍒嗗竷寮廋AP闈㈡澘鏄惁寮鍚 + "CAPDashboard_Enabled": false, + + + //銆愪腑闂翠欢閰嶇疆銆 + //jwt鎺堟潈鍐呭锛屽叕閽ョ閽ヨ浆绉诲埌鐩綍涓嬬殑pem鏂囦欢 + "JwtAuthorize": { + "Issuer": "cc", + "Audience": "cc", + "PolicyName": "permission", + "DefaultScheme": "Bearer", + "IsHttps": false, + "Expiration": 300, + "ReExpiration": 3000 + }, + //Redis鍦板潃閰嶇疆 + "RedisConnOptions": { + "Host": "[]", + "Prot": 6379, + "DB": 1, + "Password": "[]" + }, + //RabbitMq鍦板潃閰嶇疆 + "RabbitConn": { + "HostName": "[]", + "UserName": "[]", + "Password": "[]", + "Port": 5672 + }, + //ElasticSeach鍦板潃閰嶇疆 + "ElasticSeachConn": { + "Url": "[]", + "IndexName": "[]", + "UserName": "[]", + "PassWord": "[]." + }, + //Kafka鍦板潃閰嶇疆 + "KafkaOptions": { + "BrokerList": "[]:9092", + "TopicName": "kafkalog" + }, + //Consul鍦板潃閰嶇疆 + "ConsulClientOption": { + "IP": "[]", + "Port": "8500", + "Datacenter": "dc1" + }, + //Consul娉ㄥ唽鏈満閰嶇疆 + "ConsulRegisterOption": { + "IP": "[]", + "Port": "[]", + "GroupName": "ApiMicroservice", + "HealthCheckUrl": "/Health", + "Interval": 10, + "Timeout": 5, + "DeregisterCriticalServiceAfter": 60, + "Tag": "13" + }, + //闃块噷浜戠煭淇￠厤缃 + "SMS": { + "ID": "[]", + "Secret": "[]", + "Sign": "[]", + "Template": "[]" + } +} \ No newline at end of file diff --git a/Yi.Framework.Net6/Yi.Framework.sln b/Yi.Framework.Net6/Yi.Framework.sln index 2705a1aa..6ae99eb4 100644 --- a/Yi.Framework.Net6/Yi.Framework.sln +++ b/Yi.Framework.Net6/Yi.Framework.sln @@ -35,8 +35,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Authentication 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.MSUnitTest", "Yi.Framework.MSUnitTest\Yi.Framework.MSUnitTest.csproj", "{531255B3-9669-4BC1-B4E5-A0C6E0540F0D}" -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}" @@ -47,7 +45,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Language", "Yi EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.WeChatPay", "Yi.Framework.WeChatPay\Yi.Framework.WeChatPay.csproj", "{C307189D-C42C-4C09-BB65-5A386C9F182B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.Template", "Yi.Framework.Template\Yi.Framework.Template.csproj", "{A51E9091-3745-461A-A3CB-32598BF0DC77}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.Template", "Yi.Framework.Template\Yi.Framework.Template.csproj", "{A51E9091-3745-461A-A3CB-32598BF0DC77}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.XUnitTest", "Yi.Framework.XUnitTest\Yi.Framework.XUnitTest.csproj", "{88E3298A-135D-4D9C-B98D-41A2C4268385}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -99,10 +99,6 @@ Global {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 - {531255B3-9669-4BC1-B4E5-A0C6E0540F0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {531255B3-9669-4BC1-B4E5-A0C6E0540F0D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {531255B3-9669-4BC1-B4E5-A0C6E0540F0D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {531255B3-9669-4BC1-B4E5-A0C6E0540F0D}.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 @@ -127,6 +123,10 @@ Global {A51E9091-3745-461A-A3CB-32598BF0DC77}.Debug|Any CPU.Build.0 = Debug|Any CPU {A51E9091-3745-461A-A3CB-32598BF0DC77}.Release|Any CPU.ActiveCfg = Release|Any CPU {A51E9091-3745-461A-A3CB-32598BF0DC77}.Release|Any CPU.Build.0 = Release|Any CPU + {88E3298A-135D-4D9C-B98D-41A2C4268385}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {88E3298A-135D-4D9C-B98D-41A2C4268385}.Debug|Any CPU.Build.0 = Debug|Any CPU + {88E3298A-135D-4D9C-B98D-41A2C4268385}.Release|Any CPU.ActiveCfg = Release|Any CPU + {88E3298A-135D-4D9C-B98D-41A2C4268385}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -143,13 +143,13 @@ Global {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} - {531255B3-9669-4BC1-B4E5-A0C6E0540F0D} = {C90E38FB-69EA-4997-8B3A-2C71EFA65B2B} {F1C990DD-32C3-4F02-83B0-6E52B18B0B17} = {9ABAF6B1-6C02-498A-90A2-ABC1140CF89A} {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} + {88E3298A-135D-4D9C-B98D-41A2C4268385} = {C90E38FB-69EA-4997-8B3A-2C71EFA65B2B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1ED77A6E-377F-4EEF-A3D0-D65C94657DAF}