From 531f16f2f15bf792e3e719e00abb57a95356dedd Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期一, 21 四月 2025 12:04:15 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Api/Startup.cs | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/Tiger.Api/Startup.cs b/Tiger.Api/Startup.cs
index 047b5b1..22cdfab 100644
--- a/Tiger.Api/Startup.cs
+++ b/Tiger.Api/Startup.cs
@@ -8,12 +8,15 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.OpenApi.Models;
+using NLog;
using Rhea.Common;
using Sundial;
using System;
using System.IO;
using System.Linq;
using System.Reflection;
+using Tiger.Api.Controllers;
+using Tiger.Api.DbCache;
using Tiger.IBusiness;
using Tiger.IBusiness.Utility;
@@ -55,11 +58,13 @@
{
//services.RegisterAssembly("Tiger.Service");
//services.AddTransient(typeof(IBaseService<>), typeof(BaseService<>));
- services.AddControllersWithViews().AddNewtonsoftJson(opt =>
+ services.AddControllersWithViews().AddExtraControllers().AddNewtonsoftJson(opt =>
{
opt.SerializerSettings.ContractResolver = new Newtonsoft.Json.Serialization.DefaultContractResolver();
opt.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
});
+ //services.AddControllers().AddApplicationPart(typeof(_WMSTestController).Assembly);
+ //services.AddControllers();
//閰嶇疆璺ㄥ煙澶勭悊cors
聽 聽 聽 聽 聽 聽 services.AddCors(options =>
@@ -104,7 +109,7 @@
BizConfig.InitConfig(bizConfig, DI.Resolve<ILanguage>().GetDictionary());
//鍔犺浇閰嶇疆鏂囦欢
- NLog.LogManager.LoadConfiguration("nlog.config").GetCurrentClassLogger();
+ NLog.LogManager.Setup().LoadConfigurationFromFile("nlog.config").GetCurrentClassLogger();
app.UseMiddleware<LogMiddleware>();
app.UseSwagger();
@@ -123,7 +128,7 @@
app.UseEndpoints(endpoints =>
{
endpoints.MapControllerRoute(name: "default", pattern: "{controller=Home}/{action=Index}/{id?}").RequireCors(anyAllowSpecificOrigins);
- //endpoints.MapControllers().RequireCors(anyAllowSpecificOrigins);
+ endpoints.MapControllers().RequireCors(anyAllowSpecificOrigins);
});
ConsoleExt.Write($"Api Run as{((ApiConfig.IsDevVersion || ApiConfig.IsTestVersion) ? ((ApiConfig.IsDevVersion ? " Dev" : "") + (ApiConfig.IsTestVersion ? " Test" : "")) : " Release")} Edition", ConsoleColor.Cyan);
@@ -154,7 +159,8 @@
//寮�鍚湇鍔℃�荤嚎
DI.Resolve<IServicesBus>().StartServices(app.ApplicationServices.GetService<ISchedulerFactory>());
//寮�鍚疍B缂撳瓨鑷姩鏇存柊
- DI.Resolve<IDbCacheBus>().StartAutoUpdate();
+ //DI.Resolve<IDbCacheBus>().StartAutoUpdate();
+ DbCacheBus.StartAutoUpdate();
//寮�鍚疢QTT鏈嶅姟
MQTTHelper.Start();
}
@@ -164,7 +170,7 @@
/// </summary>
public void DeleteLogs()
{
- DirectoryInfo di = new DirectoryInfo(AppDomain.CurrentDomain.BaseDirectory + "\\Logs");
+ DirectoryInfo di = new (AppDomain.CurrentDomain.BaseDirectory + "\\Logs");
if(di.Exists)
{
var logFiles = di.GetFiles("*.log", SearchOption.AllDirectories);
--
Gitblit v1.9.3