From 56b6caf76e1c540385e3379151827daeeb20e9ef Mon Sep 17 00:00:00 2001 From: liguoyang Date: Tue, 20 Feb 2024 15:13:20 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Src/Dlhis.Basic/Program.cs | 2 +- Src/Dlhis.Basic/appsettings.json | 8 ++++---- Src/Dlhis.Canteen/appsettings.json | 4 ++-- Src/Dlhis.Common/appsettings.json | 4 ++-- Src/Dlhis.ScheduledTask/Program.cs | 8 ++------ Src/Dlhis.ScheduledTask/appsettings.json | 10 ++++------ Src/Dlhis.Sys/Menu/Services/Implements/MenuService.cs | 1 - Src/Dlhis.Sys/appsettings.json | 6 +++--- Src/Dlhis.User/appsettings.json | 2 +- 9 files changed, 19 insertions(+), 26 deletions(-) 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..8df2fbfb 100644 --- a/Src/Dlhis.Basic/appsettings.json +++ b/Src/Dlhis.Basic/appsettings.json @@ -11,13 +11,13 @@ "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": { - "DefaultConnectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=yikatong;charset=utf8mb4;", + "DefaultConnectionString": "server=10.27.21.22;port=3306;userid=root;password=dlhis123;database=yikatong;charset=utf8mb4;", "SlaveConnectionString": [], - "FaceConnectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=face;charset=utf8mb4;", + "FaceConnectionString": "server=10.27.21.20;port=3306;userid=root;password=dlhis123;database=face;charset=utf8mb4;", "Timeout": 30, "SlowSqlTime": 1, "EnableSqlLog": false @@ -68,7 +68,7 @@ { "Name": "MySQL", "Args": { - "connectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=log;charset=utf8mb4;", + "connectionString": "server=10.27.21.22;port=3306;userid=root;password=dlhis123;database=log;charset=utf8mb4;", "tableName": "Logs", "autoCreateSqlTable": true } diff --git a/Src/Dlhis.Canteen/appsettings.json b/Src/Dlhis.Canteen/appsettings.json index d322419a..57e5193a 100644 --- a/Src/Dlhis.Canteen/appsettings.json +++ b/Src/Dlhis.Canteen/appsettings.json @@ -10,7 +10,7 @@ "CommonRequestUrl": "http://common" }, "SqlSugarOptions": { - "DefaultConnectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=yikatong;charset=utf8mb4;", + "DefaultConnectionString": "server=10.27.21.22;port=3306;userid=root;password=dlhis123;database=yikatong;charset=utf8mb4;", "SlaveConnectionString": [], "Timeout": 30, "SlowSqlTime": 1, @@ -62,7 +62,7 @@ { "Name": "MySQL", "Args": { - "connectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=log;charset=utf8mb4;", + "connectionString": "server=10.27.21.22;port=3306;userid=root;password=dlhis123;database=log;charset=utf8mb4;", "tableName": "Logs", "autoCreateSqlTable": true } diff --git a/Src/Dlhis.Common/appsettings.json b/Src/Dlhis.Common/appsettings.json index 5dffea5e..a08dbf50 100644 --- a/Src/Dlhis.Common/appsettings.json +++ b/Src/Dlhis.Common/appsettings.json @@ -6,7 +6,7 @@ } }, "SqlSugarOptions": { - "DefaultConnectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=yikatong;charset=utf8mb4;", + "DefaultConnectionString": "server=10.27.21.22;port=3306;userid=root;password=dlhis123;database=yikatong;charset=utf8mb4;", "SlaveConnectionString": [], "Timeout": 30, "SlowSqlTime": 1, @@ -70,7 +70,7 @@ { "Name": "MySQL", "Args": { - "connectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=log;charset=utf8mb4;", + "connectionString": "server=10.27.21.22;port=3306;userid=root;password=dlhis123;database=log;charset=utf8mb4;", "tableName": "Logs", "autoCreateSqlTable": true } diff --git a/Src/Dlhis.ScheduledTask/Program.cs b/Src/Dlhis.ScheduledTask/Program.cs index 1b163c0c..242093b1 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=zxc111"); }); - - 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=zxc111"); services.AddDataProtection() .SetApplicationName("basic") .PersistKeysToStackExchangeRedis(redis, "DataProtection-Keys"); diff --git a/Src/Dlhis.ScheduledTask/appsettings.json b/Src/Dlhis.ScheduledTask/appsettings.json index 8604bb0c..7e6db3ba 100644 --- a/Src/Dlhis.ScheduledTask/appsettings.json +++ b/Src/Dlhis.ScheduledTask/appsettings.json @@ -6,15 +6,15 @@ } }, "SqlSugarOptions": { - "DefaultConnectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=yikatong;charset=utf8mb4;", + "DefaultConnectionString": "server=10.27.21.22;port=3306;userid=root;password=dlhis123;database=yikatong;charset=utf8mb4;", "SlaveConnectionString": [], - "FaceConnectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=face;charset=utf8mb4;", + "FaceConnectionString": "server=10.27.21.20;port=3306;userid=root;password=dlhis123;database=face;charset=utf8mb4;", "Timeout": 30, "SlowSqlTime": 1, "EnableSqlLog": false }, "ConnectionStrings": { - "HangfireConnection": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=hangfire;default command timeout=100;Connection Timeout=30;Charset=utf8mb4;Allow User Variables=true;IgnoreCommandTransaction=true" + "HangfireConnection": "server=10.27.21.22;port=3306;userid=root;password=dlhis123;database=hangfire;default command timeout=100;Connection Timeout=30;Charset=utf8mb4;Allow User Variables=true;IgnoreCommandTransaction=true" }, "FaceUrlOptions": { "Url": "https://yikatong.isawesome.cn/api/basic/gainfos/face?token=", @@ -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": "*", @@ -78,7 +76,7 @@ { "Name": "MySQL", "Args": { - "connectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=log;charset=utf8mb4;", + "connectionString": "server=10.27.21.22;port=3306;userid=root;password=dlhis123;database=log;charset=utf8mb4;", "tableName": "Logs", "autoCreateSqlTable": true } diff --git a/Src/Dlhis.Sys/Menu/Services/Implements/MenuService.cs b/Src/Dlhis.Sys/Menu/Services/Implements/MenuService.cs index 6abefa92..4a0c7fca 100644 --- a/Src/Dlhis.Sys/Menu/Services/Implements/MenuService.cs +++ b/Src/Dlhis.Sys/Menu/Services/Implements/MenuService.cs @@ -187,7 +187,6 @@ public class MenuService : IMenuService foreach (var item in request) { - await SaveMenuAsync(item); if (item.Items?.Any() == true) { await RecursionSaveNextAsync(item.Items); diff --git a/Src/Dlhis.Sys/appsettings.json b/Src/Dlhis.Sys/appsettings.json index 0c250034..bd70241f 100644 --- a/Src/Dlhis.Sys/appsettings.json +++ b/Src/Dlhis.Sys/appsettings.json @@ -11,8 +11,8 @@ "SysRequestUrl": "http://sys" }, "SqlSugarOptions": { - "DefaultConnectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=yikatong;charset=utf8mb4;", - "IdentityConnectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=identity;charset=utf8mb4;", + "DefaultConnectionString": "server=10.27.21.22;port=3306;userid=root;password=dlhis123;database=yikatong;charset=utf8mb4;", + "IdentityConnectionString": "server=10.27.21.22;port=3306;userid=root;password=dlhis123;database=identity;charset=utf8mb4;", "SlaveConnectionString": [], "Timeout": 30, "SlowSqlTime": 1, @@ -64,7 +64,7 @@ { "Name": "MySQL", "Args": { - "connectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=log;charset=utf8mb4;", + "connectionString": "server=10.27.21.22;port=3306;userid=root;password=dlhis123;database=log;charset=utf8mb4;", "tableName": "Logs", "autoCreateSqlTable": true } diff --git a/Src/Dlhis.User/appsettings.json b/Src/Dlhis.User/appsettings.json index 6a7495bd..6a2c9dd4 100644 --- a/Src/Dlhis.User/appsettings.json +++ b/Src/Dlhis.User/appsettings.json @@ -8,7 +8,7 @@ "AllowedHosts": "*", "SqlSugarOptions": { - "DefaultConnectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=identity;charset=utf8mb4;", + "DefaultConnectionString": "server=10.27.21.22;port=3306;userid=root;password=dlhis123;database=identity;charset=utf8mb4;", "SlaveConnectionString": [], "Timeout": 30, "SlowSqlTime": 1,