.NET4.7升级4.7。添加Redis新方法。

This commit is contained in:
2025-12-29 15:15:40 +08:00
parent 4cdf0f0f85
commit c3c6f77e9c
25 changed files with 364 additions and 221 deletions

View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Face.Domain.ViewModels</RootNamespace>
<AssemblyName>Face.Domain.ViewModels</AssemblyName>
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<SccProjectName>SAK</SccProjectName>

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -16,4 +16,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" /></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
@@ -40,4 +40,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" /></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

View File

@@ -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”。当在设计器中打开该模型时此属性会出现在
// “属性”窗口中。

View File

@@ -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”。当在设计器中打开该模型时此属性会出现在
// “属性”窗口中。

View File

@@ -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”。当在设计器中打开该模型时此属性会出现在
// “属性”窗口中。

View File

@@ -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”。当在设计器中打开该模型时此属性会出现在
// “属性”窗口中。

View File

@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Face.Domain</RootNamespace>
<AssemblyName>Face.Domain</AssemblyName>
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<SccProjectName>SAK</SccProjectName>

View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Face.Log4Net</RootNamespace>
<AssemblyName>Face.Log4Net</AssemblyName>
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<SccProjectName>SAK</SccProjectName>

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
@@ -32,4 +32,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" /></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Face.Services</RootNamespace>
<AssemblyName>Face.Services</AssemblyName>
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<SccProjectName>SAK</SccProjectName>

View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Face.SystemTask</RootNamespace>
<AssemblyName>Face.SystemTask</AssemblyName>
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<SccProjectName>SAK</SccProjectName>

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -16,4 +16,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" /></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

View File

@@ -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
{
/// <summary>
/// Redis缓存辅助类
/// </summary>
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<SubscribeMessageEventArgs>(async (args) =>
{
string body = args.Body;
}));
CSRedisCacheHelper.redis.Subscribe(DingYueMsg);
}
}
/// <summary>
/// 添加缓存
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="key"></param>
/// <param name="value"></param>
public static void Set<T>(string key, T value, int ExpireTime)
{
redis?.Set(key, value, ExpireTime * 60);
}
public static T Get<T>(string key)
{
return redis.Get<T>(key);
}
public static void Forever<T>(string key, T value)
{
redis.Set(key, value, -1);
}
public static void Del(string key)
{
redis.Del(key);
}
/// <summary>
/// 判断是否存在
/// </summary>
/// <param name="key"></param>
/// <returns></returns>
public static bool Contains(string key)
{
bool result = redis.Exists(key);
return result;
}
/// <summary>
/// 发布消息
/// </summary>
/// <param name="Topic"></param>
/// <param name="Payload"></param>
public static void Publish(string Topic, string Payload)
{
CSRedisCacheHelper.redis.PublishNoneMessageId(Topic, Payload);
}
public static void LPush(string Key, Dictionary<string, string> Value)
{
CSRedisCacheHelper.redis.LPush<Dictionary<string,string>>(Key,Value);
}
public static T BRPop<T>(string Key)
{
return CSRedisCacheHelper.redis.BRPop<T>(3,Key);
}
}
}

View File

@@ -15,7 +15,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Face.Web</RootNamespace>
<AssemblyName>Face.Web</AssemblyName>
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
@@ -55,6 +55,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>Bin\AUTS.Services.dll</HintPath>
</Reference>
<Reference Include="CSRedisCore, Version=3.8.807.0, Culture=neutral, PublicKeyToken=9aa6a3079358d437, processorArchitecture=MSIL">
<HintPath>..\packages\CSRedisCore.3.8.807\lib\net45\CSRedisCore.dll</HintPath>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
</Reference>
@@ -116,6 +119,9 @@
<HintPath>..\packages\System.Text.Encodings.Web.4.5.1\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath>
</Reference>
<Reference Include="System.Transactions" />
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.ApplicationServices" />
@@ -248,6 +254,7 @@
<DependentUpon>Reference.svcmap</DependentUpon>
</Compile>
<Compile Include="Controllers\HomeController.cs" />
<Compile Include="CSRedisCacheHelper.cs" />
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
</Compile>

View File

@@ -21,7 +21,7 @@
</WebStackScaffolding_LayoutPageFile>
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
<NameOfLastUsedPublishProfile>E:\Project\Faces\Face.Web\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>E:\Project_Class\OLD_PROJECT\Faces_Web_Prod\Face.Web\Properties\PublishProfiles\FolderProfile3.pubxml</NameOfLastUsedPublishProfile>
<View_SelectedScaffolderID>MvcViewScaffolder</View_SelectedScaffolderID>
<View_SelectedScaffolderCategoryPath>root/Common/MVC/View</View_SelectedScaffolderCategoryPath>
</PropertyGroup>

View File

@@ -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<DeviceManage> tbl = SqlSugarBase.GesmartDb().Queryable<DeviceManage>().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<string>("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()

View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://go.microsoft.com/fwlink/?LinkID=208121. -->
<Project>
<PropertyGroup>
<DeleteExistingFiles>true</DeleteExistingFiles>
<ExcludeApp_Data>false</ExcludeApp_Data>
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
<PublishUrl>bin\app.publish\</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
<_TargetId>Folder</_TargetId>
<SiteUrlToLaunchAfterPublish />
</PropertyGroup>
</Project>

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0"?>
<!--
有关如何配置 ASP.NET 应用程序的详细信息,请访问
https://go.microsoft.com/fwlink/?LinkId=301880
@@ -19,7 +19,7 @@
</system.Web>
-->
<system.web>
<compilation debug="true" targetFramework="4.7" />
<compilation debug="true" targetFramework="4.8"/>
<httpRuntime targetFramework="4.5" maxRequestLength="202400"/>
<customErrors mode="Off" defaultRedirect="~/Html_Tools/Html_UI/Error_404.htm">
<error statusCode="404" redirect="~/Html_Tools/Error_404.html"/>

View File

@@ -2,6 +2,7 @@
<packages>
<package id="Antlr" version="3.5.0.2" targetFramework="net461" />
<package id="bootstrap" version="3.3.7" targetFramework="net461" />
<package id="CSRedisCore" version="3.8.807" targetFramework="net47" />
<package id="EntityFramework" version="6.4.4" targetFramework="net47" />
<package id="FluentScheduler" version="5.5.1" targetFramework="net461" />
<package id="jQuery" version="3.3.1" targetFramework="net461" />
@@ -33,6 +34,7 @@
<package id="SqlSugar" version="5.0.8.6" targetFramework="net461" />
<package id="System.Data.SqlClient" version="4.8.3" targetFramework="net461" />
<package id="System.Text.Encodings.Web" version="4.5.1" targetFramework="net47" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net47" />
<package id="TencentCloudSDK.Common" version="3.0.902" targetFramework="net47" />
<package id="TencentCloudSDK.Sms" version="3.0.902" targetFramework="net47" />
<package id="WebGrease" version="1.6.0" targetFramework="net461" />

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

View File

@@ -8,7 +8,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>AUTS.WindowsService</RootNamespace>
<AssemblyName>AUTS.WindowsService</AssemblyName>
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>

View File

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

View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WebServer</RootNamespace>
<AssemblyName>WebServer</AssemblyName>
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />

View File

@@ -10,4 +10,4 @@
<endpoint address="http://pms.boonlive-rcu.com:89/blwws.asmx" binding="basicHttpBinding" bindingConfiguration="blwwsSoap" contract="ServiceReference1.blwwsSoap" name="blwwsSoap"/>
</client>
</system.serviceModel>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>