beta.104

6 years ago · f9f5a16f5d
parent 7bdc0f5452
commit f9f5a16f5d
24 changed files with 23 additions and 30 deletions
--- a/projects/IoT/IoT.Shared/Application/Services/NodeService.cs
+++ b/projects/IoT/IoT.Shared/Application/Services/NodeService.cs
@ -451,7 +451,7 @@ namespace Application.Services
                message += mac;
            }
            var data = message.HexToBytes();
-            using (var client = new UdpClient(new IPEndPoint(Helper.Instance.GetLocalIP(), 0)))
+            using (var client = new UdpClient(new IPEndPoint(IPAddress.Broadcast, 0)))
            {
                client.Send(data, data.Length, new IPEndPoint(IPAddress.Parse("255.255.255.255"), 9));
            }
--- a/projects/IoT/IoTNode/Views/Home/Test.cshtml
+++ b/projects/IoT/IoTNode/Views/Home/Test.cshtml
@ -1,5 +0,0 @@
-@for (int i = 0; i < 100; i++)
-{
-    <a href="rtmp://192.254.1.67/live/b57e867ae29d11b483864cbd8fd0f747">Play @i</a>
-    <br />
-}
--- a/projects/IoT/IoTNode/appsettings.json
+++ b/projects/IoT/IoTNode/appsettings.json
@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.103",
+  "version": "1.0.0-beta.104",
  "Logging": {
    "LogLevel": {
      "Default": "Warning"
--- a/projects/IoT/IoTServices/APService/Infrastructure/ApService.cs
+++ b/projects/IoT/IoTServices/APService/Infrastructure/ApService.cs
@ -71,7 +71,7 @@ namespace APService

        public NotifyModel GetModel()
        {
-            var host = string.IsNullOrEmpty(this._configuration["server.ip"]) ? Helper.Instance.GetLocalIP().ToString() : this._configuration["server.ip"];
+            var host = string.IsNullOrEmpty(this._configuration["server.ip"]) ? "localhost" : this._configuration["server.ip"];
            var prot = Convert.ToInt32(Regex.Match(this._configuration["server.urls"], @"(?<=:)\d+").Value);
            var sysinfo = this.RunCommand("sysinfo");
            var timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
--- a/projects/IoT/IoTServices/APService/appsettings.json
+++ b/projects/IoT/IoTServices/APService/appsettings.json
@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.103",
+  "version": "1.0.0-beta.104",
  "Logging": {
    "LogLevel": {
      "Default": "Warning"
--- a/projects/IoT/IoTServices/LiChuangService/Infrastructure/DeviceService.cs
+++ b/projects/IoT/IoTServices/LiChuangService/Infrastructure/DeviceService.cs
@ -394,7 +394,7 @@ namespace LiChuangService

        private NotifyModel CreateModel(string name, string number, string path, string icon)
        {
-            var host = string.IsNullOrEmpty(this._configuration["server.ip"]) ? Helper.Instance.GetLocalIP().ToString() : this._configuration["server.ip"];
+            var host = string.IsNullOrEmpty(this._configuration["server.ip"]) ? "localhost" : this._configuration["server.ip"];
            var port = Convert.ToInt32(Regex.Match(this._configuration["server.urls"], @"(?<=:)\d+").Value);

            return new NotifyModel
--- a/projects/IoT/IoTServices/LiChuangService/appsettings.json
+++ b/projects/IoT/IoTServices/LiChuangService/appsettings.json
@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.103",
+  "version": "1.0.0-beta.104",
  "Logging": {
    "LogLevel": {
      "Default": "Information"
--- a/projects/IoT/IoTServices/MediaService/Program.cs
+++ b/projects/IoT/IoTServices/MediaService/Program.cs
@ -11,7 +11,6 @@ namespace MediaService
    {
        public static void Main(string[] args)
        {
-            var host = Helper.Instance.GetLocalIP().ToString();
            WebHost.CreateDefaultBuilder(args)
                .Run<Startup>(new List<EFConfigurationValue> {
                   new EFConfigurationValue { Id = "openapi.title", Value= "web api" },
--- a/projects/IoT/IoTServices/NJWLService/src/main/resources/application.properties
+++ b/projects/IoT/IoTServices/NJWLService/src/main/resources/application.properties
@ -1,4 +1,4 @@
-version=1.0.0-beta.103
+version=1.0.0-beta.104
 server.host=127.0.0.1
 server.port=8003
 spring.thymeleaf.cache=false
--- a/projects/IoT/IoTServices/ONVIFService/Infrastructure/OnvifService.cs
+++ b/projects/IoT/IoTServices/ONVIFService/Infrastructure/OnvifService.cs
@ -144,7 +144,7 @@ namespace ONVIFService

        public void Notify()
        {
-            var host = Helper.Instance.GetLocalIP().ToString();
+            var host = string.IsNullOrEmpty(this._configuration["server.ip"]) ? "localhost" : this._configuration["server.ip"];
            var prot = Convert.ToInt32(Regex.Match(this._configuration["server.urls"], @"(?<=:)\d+").Value);
            using (var scope = _applicationServices.CreateScope())
            {
--- a/projects/IoT/IoTServices/ONVIFService/Program.cs
+++ b/projects/IoT/IoTServices/ONVIFService/Program.cs
@ -11,7 +11,7 @@ namespace ONVIFService
    {
        public static void Main(string[] args)
        {
-            var host = Helper.Instance.GetLocalIP().ToString();
+            var host = "localhost";
            WebHost.CreateDefaultBuilder(args)
                .Run<Startup>(new List<EFConfigurationValue> {
                   new EFConfigurationValue { Id = "openapi.title", Value= "web api" },
--- a/projects/IoT/IoTServices/ONVIFService/appsettings.json
+++ b/projects/IoT/IoTServices/ONVIFService/appsettings.json
@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.103",
+  "version": "1.0.0-beta.104",
  "Logging": {
    "LogLevel": {
      "Default": "Information"
--- a/projects/IoT/IoTServices/SerialPortService/Infrastructure/SPService.cs
+++ b/projects/IoT/IoTServices/SerialPortService/Infrastructure/SPService.cs
@ -81,7 +81,7 @@ namespace SerialPortService

        public void Notify()
        {
-            var host = string.IsNullOrEmpty(this._configuration["server.ip"]) ? Helper.Instance.GetLocalIP().ToString() : this._configuration["server.ip"];
+            var host = string.IsNullOrEmpty(this._configuration["server.ip"]) ? "localhost" : this._configuration["server.ip"];
            var prot = Convert.ToInt32(Regex.Match(this._configuration["server.urls"], @"(?<=:)\d+").Value);
            try
            {
--- a/projects/IoT/IoTServices/SerialPortService/Program.cs
+++ b/projects/IoT/IoTServices/SerialPortService/Program.cs
@ -11,7 +11,6 @@ namespace SerialPortService
    {
        public static void Main(string[] args)
        {
-            var host = Helper.Instance.GetLocalIP().ToString();
            WebHost.CreateDefaultBuilder(args)
                .Run<Startup>(new List<EFConfigurationValue> {
                   new EFConfigurationValue { Id = "openapi.title", Value= "web api" },
@ -22,7 +21,7 @@ namespace SerialPortService
                   new EFConfigurationValue { Id = "email:port", Value= "25"},
                   new EFConfigurationValue { Id = "email:user", Value= "admin@nbaxp.com"},
                   new EFConfigurationValue { Id = "email:password", Value= "aA123456"},
-				   new EFConfigurationValue { Id = "server.ip", Value= "" },
+                   new EFConfigurationValue { Id = "server.ip", Value= "" },
                   new EFConfigurationValue { Id = "server.urls", Value= "http://*:8007" },
                   new EFConfigurationValue { Id = "node.url", Value= "127.0.0.1:8002"},
                   new EFConfigurationValue { Id = "timer.seconds", Value="300"},
--- a/projects/IoT/IoTServices/SerialPortService/appsettings.json
+++ b/projects/IoT/IoTServices/SerialPortService/appsettings.json
@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.103",
+  "version": "1.0.0-beta.104",
  "Logging": {
    "LogLevel": {
      "Default": "Information"
--- a/projects/IoT/IoTServices/WinService/Infrastructure/WindowsService.cs
+++ b/projects/IoT/IoTServices/WinService/Infrastructure/WindowsService.cs
@ -64,7 +64,7 @@ namespace WinService
                var list = Search("select CSName,Caption,FreePhysicalMemory from Win32_OperatingSystem");
                var physicalMemory = double.Parse(Search("select Capacity from Win32_PhysicalMemory")["Capacity"].ToString());
                var cpu = int.Parse((Search("select PercentIdleTime from Win32_PerfFormattedData_PerfOS_Processor where Name='_Total'")["PercentIdleTime"].ToString()));
-                var host = string.IsNullOrEmpty(this._configuration["server.ip"]) ? Helper.Instance.GetLocalIP().ToString() : this._configuration["server.ip"];
+                var host = string.IsNullOrEmpty(this._configuration["server.ip"]) ? "localhost" : this._configuration["server.ip"];
                var prot = Convert.ToInt32(Regex.Match(this._configuration["server.urls"], @"(?<=:)\d+").Value);
                var timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
                var model = new NotifyModel
--- a/projects/IoT/IoTServices/WinService/Program.cs
+++ b/projects/IoT/IoTServices/WinService/Program.cs
@ -22,7 +22,7 @@ namespace WinService
                   new EFConfigurationValue { Id = "email:port", Value= "25"},
                   new EFConfigurationValue { Id = "email:user", Value= "admin@nbaxp.com"},
                   new EFConfigurationValue { Id = "email:password", Value= "aA123456"},
-                   new EFConfigurationValue { Id = "node.url", Value= "192.254.1.2:8002"},
+                   new EFConfigurationValue { Id = "node.url", Value= "192.168.3.2:8002"},
                   new EFConfigurationValue { Id = "timer.seconds", Value="5"},
                   //
                   new EFConfigurationValue { Id = "name", Value= "Windows主机服务"},
--- a/projects/IoT/IoTServices/WinService/appsettings.json
+++ b/projects/IoT/IoTServices/WinService/appsettings.json
@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.103",
+  "version": "1.0.0-beta.104",
  "Logging": {
    "LogLevel": {
      "Default": "Warning"
--- a/projects/IoTCenter/Program.cs
+++ b/projects/IoTCenter/Program.cs
@ -12,7 +12,7 @@ namespace IoTCenter
    {
        public static void Main(string[] args)
        {
-            var host = Helper.Instance.GetLocalIP().ToString();
+            var host = "localhost";
            WebHost.CreateDefaultBuilder(args)
               .Run<Startup>(new List<EFConfigurationValue> {
                   new EFConfigurationValue { Id = "openapi.title", Value= "web api" },
@ -25,7 +25,7 @@ namespace IoTCenter
                   new EFConfigurationValue { Id = "usercenter:login", Value= $"http://{host}:8000/Account/Login"},
                   new EFConfigurationValue { Id = "usercenter:logout", Value= $"http://{host}:8000/Account/Logout"},
                   new EFConfigurationValue { Id = "usercenter:register", Value= $"http://{host}:8000/Account/Register"},
-                   new EFConfigurationValue { Id = "influxdb:url", Value= "http://localhost:8086"},
+                   new EFConfigurationValue { Id = "influxdb:url", Value= $"http://{host}:8086"},
                   new EFConfigurationValue { Id = "influxdb:usr", Value= "admin"},
                   new EFConfigurationValue { Id = "influxdb:pwd", Value= "admin"},
                   //
--- a/projects/IoTCenter/appsettings.json
+++ b/projects/IoTCenter/appsettings.json
@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.103",
+  "version": "1.0.0-beta.104",
  "Logging": {
    "LogLevel": {
      "Default": "Warning"
--- a/projects/StudyCenter/Program.cs
+++ b/projects/StudyCenter/Program.cs
@ -11,7 +11,7 @@ namespace StudyCenter
    {
        public static void Main(string[] args)
        {
-            var host = Helper.Instance.GetLocalIP().ToString();
+            var host = "localhost";
            WebHost.CreateDefaultBuilder(args)
               .Run<Startup>(new List<EFConfigurationValue> {
                   new EFConfigurationValue { Id = "openapi.title", Value= "web api" },
--- a/projects/StudyCenter/appsettings.json
+++ b/projects/StudyCenter/appsettings.json
@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.103",
+  "version": "1.0.0-beta.104",
  "Logging": {
    "LogLevel": {
      "Default": "Warning"
--- a/projects/UserCenter/Startup.cs
+++ b/projects/UserCenter/Startup.cs
@ -160,7 +160,7 @@ namespace UserCenter
                UserRoles = new List<UserRole> { new UserRole { Role = adminRole } }
            });
            dbContext.SaveChanges();
-            var host = Helper.Instance.GetLocalIP().ToString();
+            var host = "localhost";
            dbContext.Set<Site>().Add(new Site
            {
                Name = "物联网平台",
--- a/projects/UserCenter/appsettings.json
+++ b/projects/UserCenter/appsettings.json
@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.103",
+  "version": "1.0.0-beta.104",
  "Logging": {
    "LogLevel": {
      "Default": "Warning"