diff --git a/Src/Dlhis.Basic/Packs/SqlSugarPack.cs b/Src/Dlhis.Basic/Packs/SqlSugarPack.cs index 50f6dc86..f481ce85 100644 --- a/Src/Dlhis.Basic/Packs/SqlSugarPack.cs +++ b/Src/Dlhis.Basic/Packs/SqlSugarPack.cs @@ -1,4 +1,5 @@ -using Kurisu.AspNetCore; +using Dlhis.Entity.Basic.Entity; +using Kurisu.AspNetCore; using Kurisu.AspNetCore.Startup; using Kurisu.SqlSugar.Extensions; using SqlSugar; @@ -16,8 +17,6 @@ public class SqlSugarPack : BaseAppPack public override void Configure(IApplicationBuilder app, IWebHostEnvironment env) { -#if DEBUG - //using var scope = app.ApplicationServices.CreateScope(); //var db = scope.ServiceProvider.GetService(); //var tables = App.ActiveTyps.Where(x => x.IsDefined(typeof(SugarTable), false)) @@ -33,7 +32,5 @@ public class SqlSugarPack : BaseAppPack //dbFace.CurrentConnectionConfig.ConnectionString = faceConnectionString; //dbFace.DbMaintenance.CreateDatabase(); //dbFace.CodeFirst.InitTables(); - -#endif } } diff --git a/Src/Dlhis.Basic/Program.cs b/Src/Dlhis.Basic/Program.cs index e66ac17f..48192332 100644 --- a/Src/Dlhis.Basic/Program.cs +++ b/Src/Dlhis.Basic/Program.cs @@ -24,7 +24,7 @@ public class Startup : DefaultStartup base.ConfigureServices(services); //todo - var redis = ConnectionMultiplexer.Connect($"192.168.199.30:30115,defaultDatabase:1,password=zxc111"); + var redis = ConnectionMultiplexer.Connect($"10.27.21.15:30050,defaultDatabase:1,password=dlhis123"); services.AddDataProtection() .SetApplicationName("basic") .PersistKeysToStackExchangeRedis(redis, "DataProtection-Keys"); diff --git a/Src/Dlhis.Basic/appsettings.json b/Src/Dlhis.Basic/appsettings.json index 73c4e75a..6c35cbca 100644 --- a/Src/Dlhis.Basic/appsettings.json +++ b/Src/Dlhis.Basic/appsettings.json @@ -11,7 +11,7 @@ "SysRequestUrl": "http://sys" }, "FaceUrlOptions": { - "Url": "https://yikatong.isawesome.cn/api/basic/gainfos/face?token=", + "Url": "https://face.jinkosolar.com/api/basic/gainfos/face?token=", "Limit": 7200 }, "SqlSugarOptions": { diff --git a/Src/Dlhis.ScheduledTask/Program.cs b/Src/Dlhis.ScheduledTask/Program.cs index 1b163c0c..1060cca9 100644 --- a/Src/Dlhis.ScheduledTask/Program.cs +++ b/Src/Dlhis.ScheduledTask/Program.cs @@ -26,15 +26,11 @@ public class Startup : DefaultStartup services.AddSingleton(sp => { - return ConnectionMultiplexer.Connect("192.168.199.30:30115,defaultDatabase:1,password=zxc111"); + return ConnectionMultiplexer.Connect("10.27.21.15:30050,defaultDatabase:1,password=dlhis123"); }); - - var p = new Ping(); - Console.WriteLine(p.Send("192.168.199.124").Status); - //todo - var redis = ConnectionMultiplexer.Connect($"192.168.199.30:30115,defaultDatabase:1,password=zxc111"); + var redis = ConnectionMultiplexer.Connect($"10.27.21.15:30050,defaultDatabase:1,password=dlhis123"); services.AddDataProtection() .SetApplicationName("basic") .PersistKeysToStackExchangeRedis(redis, "DataProtection-Keys"); diff --git a/Src/Dlhis.ScheduledTask/appsettings.json b/Src/Dlhis.ScheduledTask/appsettings.json index 8604bb0c..3ba4c3a5 100644 --- a/Src/Dlhis.ScheduledTask/appsettings.json +++ b/Src/Dlhis.ScheduledTask/appsettings.json @@ -49,8 +49,6 @@ "Password": "jinkohr@2017", "SyncTime": "00:00", "AttendanceUploadInterval": "30", - "AttendanceUploadUrl": "http://172.16.7.110:8121/sap/bc/srt/wsdl/flv_10002A111AD1/bndg_url/sap/bc/srt/rfc/sap/zhrf_swipe_data_saven/210/zhrf_swipe_data_save/zhrf_swipe_data_save?sap-client=210", - "DlhisDatabase": "server=192.168.199.124,32634;uid=sa;pwd=@Z!123456;database=test;", "BeginSyncDate": "2020-5-1" }, "AllowedHosts": "*",