From a86dd288c2c6245a9666ecdbd67b3497a432ef4e Mon Sep 17 00:00:00 2001 From: PhilPan Date: Mon, 17 Apr 2023 14:48:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BAtianyi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apihost/Tnb.API.Entry/Configurations/Cache.json | 2 +- .../Tnb.API.Entry/Configurations/ConnectionStrings.json | 2 +- system/Tnb.Systems/System/DbLinkService.cs | 8 +------- visualdev/Tnb.VisualDev/CodeGenService.cs | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/apihost/Tnb.API.Entry/Configurations/Cache.json b/apihost/Tnb.API.Entry/Configurations/Cache.json index 77f3c33b..8f0ff1f3 100644 --- a/apihost/Tnb.API.Entry/Configurations/Cache.json +++ b/apihost/Tnb.API.Entry/Configurations/Cache.json @@ -4,6 +4,6 @@ "ip": "localhost", "port": 6379, "password": "05jWEoJa8v", - "RedisConnectionString": "{0}:{1},password={2}, poolsize=500,ssl=false,defaultDatabase=6" + "RedisConnectionString": "{0}:{1},password={2}, poolsize=500,ssl=false,defaultDatabase=7" } } \ No newline at end of file diff --git a/apihost/Tnb.API.Entry/Configurations/ConnectionStrings.json b/apihost/Tnb.API.Entry/Configurations/ConnectionStrings.json index 2b96adcf..aeadd7ea 100644 --- a/apihost/Tnb.API.Entry/Configurations/ConnectionStrings.json +++ b/apihost/Tnb.API.Entry/Configurations/ConnectionStrings.json @@ -4,7 +4,7 @@ "DBType": "PostgreSQL", //MySql;SqlServer;Oracle;PostgreSQL;Dm;Kdbndp;Sqlite; "Host": "localhost", "Port": "5432", - "DBName": "tnb_bas", + "DBName": "tianyi_bas", "UserName": "totong", "Password": "IPANyxGSKxIXg0dBM", //SqlServer diff --git a/system/Tnb.Systems/System/DbLinkService.cs b/system/Tnb.Systems/System/DbLinkService.cs index 60fc9d88..6a337e44 100644 --- a/system/Tnb.Systems/System/DbLinkService.cs +++ b/system/Tnb.Systems/System/DbLinkService.cs @@ -318,13 +318,7 @@ public class DbLinkService : IDbLinkService, IDynamicApiController, ITransient [NonAction] public async Task GetInfo(string id) { - var model = await _memCache.GetOrCreateAsync($"DbLink_{id}", async entry => - { - //entry.AbsoluteExpiration = DateTime.Now.AddMinutes(60); - //entry.SlidingExpiration = TimeSpan.FromSeconds(-1); - return await _repository.AsSugarClient().CopyNew().Queryable().FirstAsync(m => m.Id == id && m.DeleteMark == null); - }); - return model; + return await _repository.AsSugarClient().CopyNew().Queryable().FirstAsync(m => m.Id == id && m.DeleteMark == null); } #endregion } \ No newline at end of file diff --git a/visualdev/Tnb.VisualDev/CodeGenService.cs b/visualdev/Tnb.VisualDev/CodeGenService.cs index aa36153b..9d9a205d 100644 --- a/visualdev/Tnb.VisualDev/CodeGenService.cs +++ b/visualdev/Tnb.VisualDev/CodeGenService.cs @@ -1513,7 +1513,7 @@ public class CodeGenService : IDynamicApiController, ITransient IsFixed = frondEndGenConfig.IsFixed, }, builderAction: builder => { - builder.AddUsing("Tnb.VisualDev.Engine.Model.CodeGen"); + builder.AddUsing("JNPF.VisualDev.Engine.Model.CodeGen"); builder.AddAssemblyReferenceByName("Tnb.VisualDev.Engine"); }); var dirPath = new DirectoryInfo(targetPathList[i]).Parent.FullName;