master
zby 3 months ago
parent e86c897117
commit 9dee1f8cd0

@ -21,8 +21,8 @@ public class PadarMgr
{ {
PadarClient client = AppInfo.Container.Resolve<PadarClient>(); PadarClient client = AppInfo.Container.Resolve<PadarClient>();
client.AutoReconnect = true; client.AutoReconnect = true;
client.InitBootstrap("192.168.3.55", int.Parse("2048")); //client.InitBootstrap("192.168.3.55", int.Parse("2048"));
// client.InitBootstrap("127.0.0.1", int.Parse("2048")); client.InitBootstrap("127.0.0.1", int.Parse("2048"));
Task.Run(() => Task.Run(() =>
{ {
client.Connect(); client.Connect();

@ -210,8 +210,8 @@ if (AppSettingsHelper.GetBool("ups", "enable"))
//PadarMgr.InitClient(); //PadarMgr.InitClient();
TaskInit.Init(); TaskInit.Init();
QuartzSchedulerFactory.Init(); //QuartzSchedulerFactory.Init();
app.Lifetime.ApplicationStopping.Register(QuartzSchedulerFactory.Shutdown); //app.Lifetime.ApplicationStopping.Register(QuartzSchedulerFactory.Shutdown);
// 配置多语言支持 // 配置多语言支持

@ -2,7 +2,7 @@
"ConnectionStrings": { "ConnectionStrings": {
"ConfigId": "master", "ConfigId": "master",
"DbType": "MySql", "DbType": "MySql",
"SqlConnection": "server=192.168.2.2;Port=3306;Database=eaxing_dev;Uid=root;Pwd=Rszn123;Charset=utf8;" "SqlConnection": "server=127.0.0.1;Port=3306;Database=eaxing_dev;Uid=root;Pwd=admin123;Charset=utf8;"
}, },
"SoundAddr": { "SoundAddr": {
"Address01": "D:\\Voice\\01.mp4", "Address01": "D:\\Voice\\01.mp4",
@ -146,13 +146,13 @@
"enable": false "enable": false
}, },
"plc": { "plc": {
"enable": true "enable": false
}, },
"swap": { "swap": {
"enable": true "enable": false
}, },
"task": { "task": {
"enable": true "enable": false
}, },
"Task": { "Task": {
"Disabled": "ChargeOrderUploadTask" "Disabled": "ChargeOrderUploadTask"
@ -161,7 +161,7 @@
"enable": false "enable": false
}, },
"Job": { "Job": {
"Enabled": true "Enabled": false
}, },
"Log": { "Log": {
"Src": "D:\\RiderProjects\\hn_back_charger\\WebStarter\\bin\\Debug\\net6.0\\logs", "Src": "D:\\RiderProjects\\hn_back_charger\\WebStarter\\bin\\Debug\\net6.0\\logs",

@ -2,7 +2,7 @@
"ConnectionStrings": { "ConnectionStrings": {
"ConfigId": "master", "ConfigId": "master",
"DbType": "MySql", "DbType": "MySql",
"SqlConnection": "server=127.0.0.1;Port=3306;Database=huanneng_dev;Uid=root;Pwd=anyixing2023!@#;Charset=utf8;" "SqlConnection": "server=127.0.0.1;Port=3306;Database=eaxing_dev;Uid=root;Pwd=admin123!@#;Charset=utf8;"
}, },
"Update": { "Update": {
"AutoUpdate": "false", "AutoUpdate": "false",
@ -10,7 +10,7 @@
"Url": "http://121.4.95.243:8090/Updates/AutoUpdaterStarter.xml" "Url": "http://121.4.95.243:8090/Updates/AutoUpdaterStarter.xml"
}, },
"Redis": { "Redis": {
"Connection": "127.0.0.1:6379,password=123456", "Connection": "127.0.0.1:6379,password=12345",
"InstanceName": "local", "InstanceName": "local",
"DefaultDB": "8" "DefaultDB": "8"
}, },
@ -117,7 +117,7 @@
"enable": true "enable": true
}, },
"swap": { "swap": {
"enable": true "enable": false
}, },
"task": { "task": {
"enable": false "enable": false
@ -135,7 +135,7 @@
"Days": 7 "Days": 7
}, },
"Job": { "Job": {
"Enabled": true "Enabled": false
}, },
"SignalR": { "SignalR": {
"Enabled": false "Enabled": false
@ -143,6 +143,6 @@
"led": { "led": {
"enable": false, "enable": false,
"ip": "127.0.0.1", "ip": "127.0.0.1",
"port": 10021 "port": 2048
} }
} }

@ -1,9 +1,10 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // 此代码由工具生成。
// 运行时版本:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // 对此文件的更改可能会导致不正确的行为,并且如果
// the code is regenerated. // 重新生成代码,这些更改将会丢失。
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -13,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("WebStarter")] [assembly: System.Reflection.AssemblyCompanyAttribute("WebStarter")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e86c8971179fbf600196da8db1bd2db37c2bc45a")]
[assembly: System.Reflection.AssemblyProductAttribute("WebStarter")] [assembly: System.Reflection.AssemblyProductAttribute("WebStarter")]
[assembly: System.Reflection.AssemblyTitleAttribute("WebStarter")] [assembly: System.Reflection.AssemblyTitleAttribute("WebStarter")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
b24e7010e47a60342dee5f98453f768a67e7ca37 367ff986bed887dd07b57dfbcc0e5fb5f4968d413bf3c6ceb8edd2e0883cb376

@ -1,19 +1,27 @@
is_global = true is_global = true
build_property.TargetFramework = net6.0 build_property.TargetFramework = net6.0
build_property.TargetFramework = net6.0
build_property.TargetPlatformMinVersion =
build_property.TargetPlatformMinVersion = build_property.TargetPlatformMinVersion =
build_property.UsingMicrosoftNETSdkWeb = true build_property.UsingMicrosoftNETSdkWeb = true
build_property.UsingMicrosoftNETSdkWeb = true
build_property.ProjectTypeGuids =
build_property.ProjectTypeGuids = build_property.ProjectTypeGuids =
build_property.InvariantGlobalization = build_property.InvariantGlobalization =
build_property.InvariantGlobalization =
build_property.PlatformNeutralAssembly =
build_property.PlatformNeutralAssembly = build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules = build_property.EnforceExtendedAnalyzerRules =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = WebStarter build_property.RootNamespace = WebStarter
build_property.RootNamespace = WebStarter build_property.RootNamespace = WebStarter
build_property.ProjectDir = D:\Desktop\MyFrame\hybird_framework1\WebStarter\ build_property.ProjectDir = D:\桌面\nyx\WholeProcess\WebStarter\
build_property.EnableComHosting = build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop = build_property.EnableGeneratedComInterfaceComImportInterop =
build_property.RazorLangVersion = 6.0 build_property.RazorLangVersion = 6.0
build_property.SupportLocalizedComponentNames = build_property.SupportLocalizedComponentNames =
build_property.GenerateRazorMetadataSourceChecksumAttributes = build_property.GenerateRazorMetadataSourceChecksumAttributes =
build_property.MSBuildProjectDirectory = D:\Desktop\MyFrame\hybird_framework1\WebStarter build_property.MSBuildProjectDirectory = D:\桌面\nyx\WholeProcess\WebStarter
build_property._RazorSourceGeneratorDebug = build_property._RazorSourceGeneratorDebug =

@ -1,9 +1,10 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // 此代码由工具生成。
// 运行时版本:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // 对此文件的更改可能会导致不正确的行为,并且如果
// the code is regenerated. // 重新生成代码,这些更改将会丢失。
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -13,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("WinFormStarter")] [assembly: System.Reflection.AssemblyCompanyAttribute("WinFormStarter")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e86c8971179fbf600196da8db1bd2db37c2bc45a")]
[assembly: System.Reflection.AssemblyProductAttribute("WinFormStarter")] [assembly: System.Reflection.AssemblyProductAttribute("WinFormStarter")]
[assembly: System.Reflection.AssemblyTitleAttribute("WinFormStarter")] [assembly: System.Reflection.AssemblyTitleAttribute("WinFormStarter")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
1cfb7b320ff26c6b66f094956dbd67add89958cfa34316e3a9b6c3f4c1fa334b b00b8e92ae25e09e2081494bb5885f166436b0d5f129604e7e60578a50110aee

@ -6,14 +6,22 @@ build_property.ApplicationHighDpiMode =
build_property.ApplicationUseCompatibleTextRendering = build_property.ApplicationUseCompatibleTextRendering =
build_property.ApplicationVisualStyles = build_property.ApplicationVisualStyles =
build_property.TargetFramework = net6.0-windows build_property.TargetFramework = net6.0-windows
build_property.TargetFramework = net6.0-windows
build_property.TargetPlatformMinVersion = 7.0
build_property.TargetPlatformMinVersion = 7.0 build_property.TargetPlatformMinVersion = 7.0
build_property.UsingMicrosoftNETSdkWeb = build_property.UsingMicrosoftNETSdkWeb =
build_property.UsingMicrosoftNETSdkWeb =
build_property.ProjectTypeGuids =
build_property.ProjectTypeGuids = build_property.ProjectTypeGuids =
build_property.InvariantGlobalization = build_property.InvariantGlobalization =
build_property.InvariantGlobalization =
build_property.PlatformNeutralAssembly =
build_property.PlatformNeutralAssembly = build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules = build_property.EnforceExtendedAnalyzerRules =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = WinFormStarter build_property.RootNamespace = WinFormStarter
build_property.ProjectDir = D:\Desktop\MyFrame\hybird_framework1\WinFormStarter\ build_property.ProjectDir = D:\桌面\nyx\WholeProcess\WinFormStarter\
build_property.EnableComHosting = build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop = build_property.EnableGeneratedComInterfaceComImportInterop =

Loading…
Cancel
Save