懒得勤快 3 years ago
parent
commit
7ad445f271

+ 1 - 1
src/Masuit.MyBlogs.Core/Controllers/AdvertisementController.cs

@@ -50,7 +50,7 @@ namespace Masuit.MyBlogs.Core.Controllers
                     Time = DateTime.Now
                     Time = DateTime.Now
                 });
                 });
                 await AdsService.SaveChangesAsync();
                 await AdsService.SaveChangesAsync();
-                var start = DateTime.Today.AddMonths(-1);
+                var start = DateTime.Today.AddMonths(-6);
                 await ClickRecordService.GetQuery(a => a.Time < start).DeleteFromQueryAsync();
                 await ClickRecordService.GetQuery(a => a.Time < start).DeleteFromQueryAsync();
             }
             }
 
 

+ 1 - 1
src/Masuit.MyBlogs.Core/Extensions/Hangfire/HangfireBackJob.cs

@@ -91,7 +91,7 @@ namespace Masuit.MyBlogs.Core.Extensions.Hangfire
         /// <param name="url"></param>
         /// <param name="url"></param>
         public void RecordPostVisit(int pid, string ip, string refer, string url)
         public void RecordPostVisit(int pid, string ip, string refer, string url)
         {
         {
-            var lastQuarter = DateTime.Now.AddMonths(-3);
+            var lastQuarter = DateTime.Now.AddMonths(-6);
             var lastYear = DateTime.Now.AddYears(-1);
             var lastYear = DateTime.Now.AddYears(-1);
             var recordService = _serviceScope.ServiceProvider.GetRequiredService<IPostVisitRecordService>();
             var recordService = _serviceScope.ServiceProvider.GetRequiredService<IPostVisitRecordService>();
             var recordStatsService = _serviceScope.ServiceProvider.GetRequiredService<IPostVisitRecordStatsService>();
             var recordStatsService = _serviceScope.ServiceProvider.GetRequiredService<IPostVisitRecordStatsService>();

+ 1 - 0
src/Masuit.MyBlogs.Core/Masuit.MyBlogs.Core.csproj

@@ -58,6 +58,7 @@
         <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.5" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.5" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.5" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.5" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="6.0.5" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="6.0.5" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.5" />
         <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.5" />
         <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.5" />
         <PackageReference Include="Microsoft.Graph" Version="4.29.0" />
         <PackageReference Include="Microsoft.Graph" Version="4.29.0" />
         <PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.7" />
         <PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.7" />

+ 16 - 6
src/Masuit.MyBlogs.Core/Startup.cs

@@ -79,13 +79,23 @@ namespace Masuit.MyBlogs.Core
             services.AddEFSecondLevelCache(options => options.UseCustomCacheProvider<MyEFCacheManagerCoreProvider>(CacheExpirationMode.Absolute, TimeSpan.FromMinutes(5)).DisableLogging(true));
             services.AddEFSecondLevelCache(options => options.UseCustomCacheProvider<MyEFCacheManagerCoreProvider>(CacheExpirationMode.Absolute, TimeSpan.FromMinutes(5)).DisableLogging(true));
             services.AddDbContext<DataContext>((serviceProvider, opt) =>
             services.AddDbContext<DataContext>((serviceProvider, opt) =>
             {
             {
-                if (Configuration["Database:Provider"] == "pgsql")
+                switch (Configuration["Database:Provider"])
                 {
                 {
-                    opt.UseNpgsql(AppConfig.ConnString, builder => builder.EnableRetryOnFailure(10));
-                }
-                else
-                {
-                    opt.UseMySql(AppConfig.ConnString, ServerVersion.AutoDetect(AppConfig.ConnString), builder => builder.EnableRetryOnFailure(10));
+                    case "pgsql":
+                        opt.UseNpgsql(AppConfig.ConnString, builder => builder.EnableRetryOnFailure(10));
+                        break;
+
+                    case "mysql":
+                        opt.UseMySql(AppConfig.ConnString, ServerVersion.AutoDetect(AppConfig.ConnString), builder => builder.EnableRetryOnFailure(10));
+                        break;
+
+                    case "mssql":
+                        opt.UseSqlServer(AppConfig.ConnString, builder => builder.EnableRetryOnFailure(10));
+                        break;
+
+                    case "sqlite":
+                        opt.UseSqlite(AppConfig.ConnString);
+                        break;
                 }
                 }
 
 
                 opt.AddInterceptors(serviceProvider.GetRequiredService<SecondLevelCacheInterceptor>()).EnableSensitiveDataLogging();
                 opt.AddInterceptors(serviceProvider.GetRequiredService<SecondLevelCacheInterceptor>()).EnableSensitiveDataLogging();

+ 4 - 4
src/Masuit.MyBlogs.Core/appsettings.json

@@ -13,13 +13,13 @@
         "CertPassword": "cEHlnUGu" // 证书密码
         "CertPassword": "cEHlnUGu" // 证书密码
     },
     },
     "Database": {
     "Database": {
-        "Provider": "pgsql", //mysql,pgsql
+        "Provider": "pgsql", //mysql,pgsql,mssql,sqlite
         //"ConnString": "Server=127.0.0.1;Port=3306;Database=MyBlogs;Uid=root;Pwd=;Charset=utf8mb4", // 数据库连接字符串
         //"ConnString": "Server=127.0.0.1;Port=3306;Database=MyBlogs;Uid=root;Pwd=;Charset=utf8mb4", // 数据库连接字符串
         "ConnString": "Host=127.1;Username=postgres;Password=1;Database=myblogs" // 数据库连接字符串
         "ConnString": "Host=127.1;Username=postgres;Password=1;Database=myblogs" // 数据库连接字符串
     },
     },
-        "Redis": "127.0.0.1:6379,allowadmin=true,connectTimeout=20000,connectRetry=1,responseTimeout=20000,syncTimeout=10000", // Redis连接字符串
-    "EmailDomainWhiteList": "masuit.com,ldqk.org,[a-zA-z]{5,32}@qq.com,\\d{6,12}@qq.com,\\w{5,32}@163.com,\\w{5,32}@gmail.com,\\w{5,36}@outlook.com",
-    "EmailDomainBlockList": "10minutemail;027168.com;chacuo.net;bccto;0817.net;\\.xyz;\\.icu;\\.tk;\\.top;\\.win;10minemail;iubridge;posiklan;iubridge;^\\w{1,4}@163.com;^\\w{1,5}@gmail.com;^\\w{1,5}@outlook.com;bc.com;linshiyouxiang.net;ww.com;@q.com;^.{1,11}$",
+    "Redis": "127.0.0.1:6379,allowadmin=true,connectTimeout=20000,connectRetry=1,responseTimeout=20000,syncTimeout=10000", // Redis连接字符串
+    "EmailDomainWhiteList": "masuit.com,ldqk.org,[a-zA-z]{5,32}@qq.com,\\d{6,12}@qq.com,\\w{5,32}@163.com,\\w{5,32}@gmail.com,\\w{5,36}@outlook.com", // 邮箱域名白名单正则表达式,逗号分隔
+    "EmailDomainBlockList": "10minutemail;027168.com;chacuo.net;bccto;0817.net;\\.xyz;\\.icu;\\.tk;\\.top;\\.win;10minemail;iubridge;posiklan;iubridge;^\\w{1,4}@163.com;^\\w{1,5}@gmail.com;^\\w{1,5}@outlook.com;bc.com;linshiyouxiang.net;ww.com;@q.com;^.{1,11}$", // 邮箱域名黑名单正则表达式,逗号分隔
     "UseRewriter": "NonWww", //NonWww:重定向到不带www的域名,WWW:重定向到带www的域名
     "UseRewriter": "NonWww", //NonWww:重定向到不带www的域名,WWW:重定向到带www的域名
     "BaiduAK": "你的BaiduAK", // 百度开放平台AppKey,用于获取IP地址信息的api
     "BaiduAK": "你的BaiduAK", // 百度开放平台AppKey,用于获取IP地址信息的api
     "TrueClientIPHeader": "CF-Connecting-IP", // 若有CDN,取客户端真实IP的请求头,裸奔留空即可
     "TrueClientIPHeader": "CF-Connecting-IP", // 若有CDN,取客户端真实IP的请求头,裸奔留空即可