yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

Browse Source
This commit is contained in:
cheche
2024-02-21 14:59:33 +08:00
parent ef60f1dffc a46151abfd
commit 0632bee180
5 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Src/Dlhis.Basic/Packs/SqlSugarPack.cs
View File

@@ -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<ISqlSugarClient>();
//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<GainfoFaceEntity>();
#endif
}
}

2
Src/Dlhis.Basic/Program.cs
View File

@@ -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");

2
Src/Dlhis.Basic/appsettings.json
View File

@@ -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": {

8
Src/Dlhis.ScheduledTask/Program.cs
View File

@@ -26,15 +26,11 @@ public class Startup : DefaultStartup
services.AddSingleton<IConnectionMultiplexer>(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");

2
Src/Dlhis.ScheduledTask/appsettings.json
View File

@@ -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": "*",