diff --git a/Face.Domain.ViewModels/Face.Domain.ViewModels.csproj b/Face.Domain.ViewModels/Face.Domain.ViewModels.csproj index 8a18aaf..fae4f2f 100644 --- a/Face.Domain.ViewModels/Face.Domain.ViewModels.csproj +++ b/Face.Domain.ViewModels/Face.Domain.ViewModels.csproj @@ -9,7 +9,7 @@ Properties Face.Domain.ViewModels Face.Domain.ViewModels - v4.7 + v4.8 512 true SAK diff --git a/Face.Domain.ViewModels/app.config b/Face.Domain.ViewModels/app.config index 390f558..5676f39 100644 --- a/Face.Domain.ViewModels/app.config +++ b/Face.Domain.ViewModels/app.config @@ -1,19 +1,19 @@ - + - - + + - - + + - - + + - + diff --git a/Face.Domain/App.config b/Face.Domain/App.config index 291d93d..e48f3d0 100644 --- a/Face.Domain/App.config +++ b/Face.Domain/App.config @@ -1,43 +1,43 @@ - + -
+
- + - + - - - - - - + + + + + + - - + + - - + + - - + + - + diff --git a/Face.Domain/Entities/AuthorityDBModel.Designer.cs b/Face.Domain/Entities/AuthorityDBModel.Designer.cs index 5ca5a60..a0e11c9 100644 --- a/Face.Domain/Entities/AuthorityDBModel.Designer.cs +++ b/Face.Domain/Entities/AuthorityDBModel.Designer.cs @@ -1,4 +1,4 @@ -// 为模型“D:\BLV_SYNC\RD_WEB\SynologyDrive\欧阳磊\Faces\Face.Domain\Entities\AuthorityDBModel.edmx”启用了 T4 代码生成。 +// 为模型“E:\Project_Class\OLD_PROJECT\Web_Faces_Prod\Face.Domain\Entities\AuthorityDBModel.edmx”启用了 T4 代码生成。 // 要启用旧代码生成功能，请将“代码生成策略”设计器属性的值 // 更改为“旧的 ObjectContext”。当在设计器中打开该模型时，此属性会出现在 // “属性”窗口中。 diff --git a/Face.Domain/Entities/SumInfoModel.Designer.cs b/Face.Domain/Entities/SumInfoModel.Designer.cs index 6c87f9c..c244a0e 100644 --- a/Face.Domain/Entities/SumInfoModel.Designer.cs +++ b/Face.Domain/Entities/SumInfoModel.Designer.cs @@ -1,4 +1,4 @@ -// 为模型“D:\BLV_SYNC\RD_WEB\SynologyDrive\欧阳磊\Faces\Face.Domain\Entities\SumInfoModel.edmx”启用了 T4 代码生成。 +// 为模型“E:\Project_Class\OLD_PROJECT\Web_Faces_Prod\Face.Domain\Entities\SumInfoModel.edmx”启用了 T4 代码生成。 // 要启用旧代码生成功能，请将“代码生成策略”设计器属性的值 // 更改为“旧的 ObjectContext”。当在设计器中打开该模型时，此属性会出现在 // “属性”窗口中。 diff --git a/Face.Domain/Entities/faceModelShow.Designer.cs b/Face.Domain/Entities/faceModelShow.Designer.cs index 171cbdb..0d6a0fe 100644 --- a/Face.Domain/Entities/faceModelShow.Designer.cs +++ b/Face.Domain/Entities/faceModelShow.Designer.cs @@ -1,4 +1,4 @@ -// 为模型“D:\NewGitRepos\FacesNew\Face.Domain\Entities\faceModelShow.edmx”启用了 T4 代码生成。 +// 为模型“E:\Project_Class\OLD_PROJECT\Web_Faces_Prod\Face.Domain\Entities\faceModelShow.edmx”启用了 T4 代码生成。 // 要启用旧代码生成功能，请将“代码生成策略”设计器属性的值 // 更改为“旧的 ObjectContext”。当在设计器中打开该模型时，此属性会出现在 // “属性”窗口中。 diff --git a/Face.Domain/Entities/permissionModel.Designer.cs b/Face.Domain/Entities/permissionModel.Designer.cs index f7923b8..a46e81d 100644 --- a/Face.Domain/Entities/permissionModel.Designer.cs +++ b/Face.Domain/Entities/permissionModel.Designer.cs @@ -1,4 +1,4 @@ -// 为模型“D:\BLV_SYNC\RD_WEB\SynologyDrive\欧阳磊\Faces\Face.Domain\Entities\permissionModel.edmx”启用了 T4 代码生成。 +// 为模型“E:\Project_Class\OLD_PROJECT\Web_Faces_Prod\Face.Domain\Entities\permissionModel.edmx”启用了 T4 代码生成。 // 要启用旧代码生成功能，请将“代码生成策略”设计器属性的值 // 更改为“旧的 ObjectContext”。当在设计器中打开该模型时，此属性会出现在 // “属性”窗口中。 diff --git a/Face.Domain/Face.Domain.csproj b/Face.Domain/Face.Domain.csproj index 16e5c47..6589ba5 100644 --- a/Face.Domain/Face.Domain.csproj +++ b/Face.Domain/Face.Domain.csproj @@ -10,7 +10,7 @@ Properties Face.Domain Face.Domain - v4.7 + v4.8 512 true SAK diff --git a/Face.Log4Net/Face.Log4Net.csproj b/Face.Log4Net/Face.Log4Net.csproj index df35f30..a4fcd07 100644 --- a/Face.Log4Net/Face.Log4Net.csproj +++ b/Face.Log4Net/Face.Log4Net.csproj @@ -9,7 +9,7 @@ Properties Face.Log4Net Face.Log4Net - v4.7 + v4.8 512 true SAK diff --git a/Face.Services/App.config b/Face.Services/App.config index 782e193..658226d 100644 --- a/Face.Services/App.config +++ b/Face.Services/App.config @@ -1,35 +1,35 @@ - + -
+
- + - + - - + + - - + + - - + + - + diff --git a/Face.Services/Face.Services.csproj b/Face.Services/Face.Services.csproj index b87ba31..a1309c9 100644 --- a/Face.Services/Face.Services.csproj +++ b/Face.Services/Face.Services.csproj @@ -9,7 +9,7 @@ Properties Face.Services Face.Services - v4.7 + v4.8 512 true SAK diff --git a/Face.SystemTask/Face.SystemTask.csproj b/Face.SystemTask/Face.SystemTask.csproj index 9f5dd13..271d8ed 100644 --- a/Face.SystemTask/Face.SystemTask.csproj +++ b/Face.SystemTask/Face.SystemTask.csproj @@ -9,7 +9,7 @@ Properties Face.SystemTask Face.SystemTask - v4.7 + v4.8 512 true SAK diff --git a/Face.SystemTask/app.config b/Face.SystemTask/app.config index dd4cbd8..3fc4848 100644 --- a/Face.SystemTask/app.config +++ b/Face.SystemTask/app.config @@ -1,19 +1,19 @@ - + - - + + - - + + - - + + - + diff --git a/Face.Web/CSRedisCacheHelper.cs b/Face.Web/CSRedisCacheHelper.cs new file mode 100644 index 0000000..d86e5aa --- /dev/null +++ b/Face.Web/CSRedisCacheHelper.cs @@ -0,0 +1,92 @@ +using CSRedis; +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Linq; +using System.Text; +using static CSRedis.CSRedisClient; + +namespace Common +{ + /// + /// Redis缓存辅助类 + /// + public class CSRedisCacheHelper + { + public static CSRedisClient redis; + + private const string ip = "127.0.0.1"; + private const string port = "6379"; + static CSRedisCacheHelper() + { + var redisHostStr = string.Format("{0}:{1}", ip, port); + if (!string.IsNullOrEmpty(redisHostStr)) + { + redis = new CSRedisClient(redisHostStr + ",defaultDatabase=10"); + var DingYueMsg = ("CellCorelDRAWUser", new Action(async (args) => + { + string body = args.Body; + })); + + CSRedisCacheHelper.redis.Subscribe(DingYueMsg); + } + } + /// + /// 添加缓存 + /// + /// + /// + /// + public static void Set(string key, T value, int ExpireTime) + { + redis?.Set(key, value, ExpireTime * 60); + } + + public static T Get(string key) + { + return redis.Get(key); + } + + public static void Forever(string key, T value) + { + redis.Set(key, value, -1); + } + public static void Del(string key) + { + redis.Del(key); + } + + /// + /// 判断是否存在 + /// + /// + /// + + public static bool Contains(string key) + { + bool result = redis.Exists(key); + return result; + } + + /// + /// 发布消息 + /// + /// + /// + public static void Publish(string Topic, string Payload) + { + CSRedisCacheHelper.redis.PublishNoneMessageId(Topic, Payload); + } + + + public static void LPush(string Key, Dictionary Value) + { + CSRedisCacheHelper.redis.LPush>(Key,Value); + } + + public static T BRPop(string Key) + { + return CSRedisCacheHelper.redis.BRPop(3,Key); + } + } +} diff --git a/Face.Web/Face.Web.csproj b/Face.Web/Face.Web.csproj index 6493204..05d5252 100644 --- a/Face.Web/Face.Web.csproj +++ b/Face.Web/Face.Web.csproj @@ -15,7 +15,7 @@ Properties Face.Web Face.Web - v4.7 + v4.8 false true @@ -55,6 +55,9 @@ False Bin\AUTS.Services.dll + + ..\packages\CSRedisCore.3.8.807\lib\net45\CSRedisCore.dll + ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll @@ -116,6 +119,9 @@ ..\packages\System.Text.Encodings.Web.4.5.1\lib\netstandard2.0\System.Text.Encodings.Web.dll + + ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + @@ -248,6 +254,7 @@ Reference.svcmap + Global.asax diff --git a/Face.Web/Face.Web.csproj.user b/Face.Web/Face.Web.csproj.user index bc657b2..f69c2c4 100644 --- a/Face.Web/Face.Web.csproj.user +++ b/Face.Web/Face.Web.csproj.user @@ -21,7 +21,7 @@ False 600 - E:\Project\Faces\Face.Web\Properties\PublishProfiles\FolderProfile2.pubxml + E:\Project_Class\OLD_PROJECT\Faces_Web_Prod\Face.Web\Properties\PublishProfiles\FolderProfile3.pubxml MvcViewScaffolder root/Common/MVC/View diff --git a/Face.Web/Global.asax.cs b/Face.Web/Global.asax.cs index f0e17e7..13f5b10 100644 --- a/Face.Web/Global.asax.cs +++ b/Face.Web/Global.asax.cs @@ -1,4 +1,5 @@ -using Face.Domain.Entities; +using Common; +using Face.Domain.Entities; using Face.Services.Manager; using Face.SystemTask; using Face.Web.Areas.App.Controllers; @@ -9,8 +10,11 @@ using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Data; +using System.Diagnostics; +using System.IO; using System.Linq; using System.Net.NetworkInformation; +using System.Text; using System.Threading; using System.Threading.Tasks; using System.Web; @@ -18,12 +22,11 @@ using System.Web.Http; using System.Web.Mvc; using System.Web.Optimization; using System.Web.Routing; -using TencentCloud.Common.Profile; using TencentCloud.Common; +using TencentCloud.Common.Profile; using WebServer; -using static Face.Web.Areas.App.Models.Roominfo; -using System.Text; using WebSocketToolsConsole; +using static Face.Web.Areas.App.Models.Roominfo; namespace Face.Web { @@ -261,7 +264,8 @@ namespace Face.Web { string fname = "移海"; List tbl = SqlSugarBase.GesmartDb().Queryable().Where(x=>x.Status==true && x.Factory== fname).ToList(); - for (int i = 0; i < tbl.Count; i++) + //for (int i = 0; i < tbl.Count; i++) + for (int i = 0; i < 1; i++) { if (tbl[i].Status == true) { @@ -281,7 +285,12 @@ namespace Face.Web info.msgx = msgx; info.pmsid = -1; string sendMsg = Newtonsoft.Json.JsonConvert.SerializeObject(info); - UdpCommunication.QueueSend(sendMsg); + + // 2025/12/10去除队列发送 XU + + //UdpCommunication.QueueSend(sendMsg); + Exception ex = new Exception("每天2点定时执行一次基本信息命令发送：" + sendMsg); + LogHelp.WriteExceptionLog(ex); Task.Delay(10000); @@ -306,6 +315,23 @@ namespace Face.Web //if (!SyncHotelServer.SyncHotelGroups()) // Logs.WriteTimingUDPLog("2:00执行定时任务--清除酒店失败~"); }).ToRunEvery(0).Days().At(2, 00); + + Schedule(() => + { + string batFilePath = "C:\\FaceConsole\\重启.bat"; ; + var rs = CSRedisCacheHelper.Get("CSRedisCacheHelper"); + if (rs == null) + { + Process.Start(new ProcessStartInfo() + { + FileName = batFilePath, + WorkingDirectory = Path.GetDirectoryName(batFilePath), + UseShellExecute = true, + CreateNoWindow = false + }); + } + + }).ToRunEvery(5).Minutes(); } public static void GoWork() diff --git a/Face.Web/Properties/PublishProfiles/FolderProfile3.pubxml b/Face.Web/Properties/PublishProfiles/FolderProfile3.pubxml new file mode 100644 index 0000000..17b86e5 --- /dev/null +++ b/Face.Web/Properties/PublishProfiles/FolderProfile3.pubxml @@ -0,0 +1,16 @@ + + + + + true + false + true + Release + Any CPU + FileSystem + bin\app.publish\ + FileSystem + <_TargetId>Folder + + + \ No newline at end of file diff --git a/Face.Web/Web.config b/Face.Web/Web.config index 9d0acdd..efd7be5 100644 --- a/Face.Web/Web.config +++ b/Face.Web/Web.config @@ -1,4 +1,4 @@ - + -
+
- - + + - - + + - - + + - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + - - + + - + - - + + - - + + - - - - + + + + - + - + - + \ No newline at end of file diff --git a/Face.Web/packages.config b/Face.Web/packages.config index ccf8890..4668c00 100644 --- a/Face.Web/packages.config +++ b/Face.Web/packages.config @@ -2,6 +2,7 @@ + @@ -33,6 +34,7 @@ + diff --git a/Face.WindowsService/App.config b/Face.WindowsService/App.config index 550b78c..6cdbfaf 100644 --- a/Face.WindowsService/App.config +++ b/Face.WindowsService/App.config @@ -1,17 +1,17 @@ - + - + - - + + - - + + diff --git a/Face.WindowsService/Face.WindowsService.csproj b/Face.WindowsService/Face.WindowsService.csproj index 7bff075..13f838c 100644 --- a/Face.WindowsService/Face.WindowsService.csproj +++ b/Face.WindowsService/Face.WindowsService.csproj @@ -8,7 +8,7 @@ WinExe AUTS.WindowsService AUTS.WindowsService - v4.7 + v4.8 512 true true diff --git a/WebServer/Connected Services/ServiceReference1/Reference.cs b/WebServer/Connected Services/ServiceReference1/Reference.cs index c852e22..34cea23 100644 --- a/WebServer/Connected Services/ServiceReference1/Reference.cs +++ b/WebServer/Connected Services/ServiceReference1/Reference.cs @@ -689,7 +689,7 @@ namespace WebServer.ServiceReference1 { } public bool CheckIn2(string key, string code, string roomNumber, System.DateTime checkInDate, string xmlString, ref string errorMsg, ref long checkInID, string phoneNumber, string idNumber) { - CheckIn2Request inValue = new CheckIn2Request(); + WebServer.ServiceReference1.CheckIn2Request inValue = new WebServer.ServiceReference1.CheckIn2Request(); inValue.Body = new WebServer.ServiceReference1.CheckIn2RequestBody(); inValue.Body.key = key; inValue.Body.code = code; @@ -700,7 +700,7 @@ namespace WebServer.ServiceReference1 { inValue.Body.checkInID = checkInID; inValue.Body.phoneNumber = phoneNumber; inValue.Body.idNumber = idNumber; - CheckIn2Response retVal = ((WebServer.ServiceReference1.blwwsSoap)(this)).CheckIn2(inValue); + WebServer.ServiceReference1.CheckIn2Response retVal = ((WebServer.ServiceReference1.blwwsSoap)(this)).CheckIn2(inValue); errorMsg = retVal.Body.errorMsg; checkInID = retVal.Body.checkInID; return retVal.Body.CheckIn2Result; @@ -732,7 +732,7 @@ namespace WebServer.ServiceReference1 { } public bool UploadPhoto(string key, string code, long checkInID, int idType, string idCard, string name, int sex, string birthday, string photoUrl, byte[] photo, ref string errorMsg) { - UploadPhotoRequest inValue = new UploadPhotoRequest(); + WebServer.ServiceReference1.UploadPhotoRequest inValue = new WebServer.ServiceReference1.UploadPhotoRequest(); inValue.Body = new WebServer.ServiceReference1.UploadPhotoRequestBody(); inValue.Body.key = key; inValue.Body.code = code; diff --git a/WebServer/WebServer.csproj b/WebServer/WebServer.csproj index af3c702..a0e242f 100644 --- a/WebServer/WebServer.csproj +++ b/WebServer/WebServer.csproj @@ -9,7 +9,7 @@ Properties WebServer WebServer - v4.7 + v4.8 512 true diff --git a/WebServer/app.config b/WebServer/app.config index b88a88a..d393d2a 100644 --- a/WebServer/app.config +++ b/WebServer/app.config @@ -10,4 +10,4 @@ - +