diff --git a/projects/IoTCenter/Program.cs b/projects/IoTCenter/Program.cs index d35890e1..fd40179f 100644 --- a/projects/IoTCenter/Program.cs +++ b/projects/IoTCenter/Program.cs @@ -23,13 +23,13 @@ namespace IoTCenter new EFConfigurationValue { Id = "openapi.name", Value= "v1" }, new EFConfigurationValue { Id = "openapi.title", Value= "web api" }, new EFConfigurationValue { Id = "openapi.version", Value= "1.0" }, - new EFConfigurationValue { Id = "server.urls", Value= "http://*:8001" }, + new EFConfigurationValue { Id = "server.urls", Value= "http://*:8011" }, new EFConfigurationValue { Id = "security:key", Value= "111111111111111111111111"}, new EFConfigurationValue { Id = "jwt:key", Value= "111111111111111111111111"}, new EFConfigurationValue { Id = "usercenter:key", Value= "123456"}, - 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 = "usercenter:login", Value= $"http://{host}:8010/Account/Login"}, + new EFConfigurationValue { Id = "usercenter:logout", Value= $"http://{host}:8010/Account/Logout"}, + new EFConfigurationValue { Id = "usercenter:register", Value= $"http://{host}:8010/Account/Register"}, new EFConfigurationValue { Id = "influxdb:url", Value= $"http://{host}:8086"}, new EFConfigurationValue { Id = "influxdb:usr", Value= "admin"}, new EFConfigurationValue { Id = "influxdb:pwd", Value= "admin"}, diff --git a/projects/IoTCenter/Properties/launchSettings.json b/projects/IoTCenter/Properties/launchSettings.json index 2c7df23d..5355c0c8 100644 --- a/projects/IoTCenter/Properties/launchSettings.json +++ b/projects/IoTCenter/Properties/launchSettings.json @@ -3,7 +3,7 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:8001", + "applicationUrl": "http://localhost:8011", "sslPort": 0 } }, @@ -21,7 +21,7 @@ "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, - "applicationUrl": "http://localhost:8001" + "applicationUrl": "http://localhost:8011" } } } \ No newline at end of file diff --git a/projects/IoTCenter/configuration.db b/projects/IoTCenter/configuration.db index 7cfdb231..1e456526 100644 Binary files a/projects/IoTCenter/configuration.db and b/projects/IoTCenter/configuration.db differ diff --git a/projects/IoTCenter/iotcenter.db b/projects/IoTCenter/iotcenter.db index ee5f209c..4e3b429e 100644 Binary files a/projects/IoTCenter/iotcenter.db and b/projects/IoTCenter/iotcenter.db differ diff --git a/projects/IoTNode/Program.cs b/projects/IoTNode/Program.cs index 08e2b26d..85f3408b 100644 --- a/projects/IoTNode/Program.cs +++ b/projects/IoTNode/Program.cs @@ -33,7 +33,7 @@ namespace IoTNode new EFConfigurationValue { Id = "server.ip", Value= "" }, new EFConfigurationValue { Id = "server.urls", Value= "http://*:8002" }, new EFConfigurationValue { Id = "notify:enabled", Value= "true"}, - new EFConfigurationValue { Id = "notify:host", Value= $"{host}:8001"}, + new EFConfigurationValue { Id = "notify:host", Value= $"{host}:8011"}, new EFConfigurationValue { Id = "timer.seconds", Value="60"}, new EFConfigurationValue { Id = "onvif.timer", Value="1"}, new EFConfigurationValue { Id = "onvif.speed", Value="0.2"}, diff --git a/projects/IoTNode/configuration.db b/projects/IoTNode/configuration.db index 93e277b2..a41bf9e6 100644 Binary files a/projects/IoTNode/configuration.db and b/projects/IoTNode/configuration.db differ diff --git a/projects/IoTNode/iotnode.db b/projects/IoTNode/iotnode.db index 3190bfe3..11d7385d 100644 Binary files a/projects/IoTNode/iotnode.db and b/projects/IoTNode/iotnode.db differ diff --git a/projects/StudyCenter/Program.cs b/projects/StudyCenter/Program.cs index c15608ac..4ce48978 100644 --- a/projects/StudyCenter/Program.cs +++ b/projects/StudyCenter/Program.cs @@ -16,13 +16,13 @@ namespace StudyCenter .Run(new List { new EFConfigurationValue { Id = "openapi.title", Value= "web api" }, new EFConfigurationValue { Id = "openapi.version", Value= "1.0" }, - new EFConfigurationValue { Id = "server.urls", Value= "https://*:44382;http://*:8082" }, + new EFConfigurationValue { Id = "server.urls", Value= "https://*:44382;http://*:8012" }, new EFConfigurationValue { Id = "security:key", Value= "111111111111111111111111"}, new EFConfigurationValue { Id = "security:iv", Value= "11111111"}, new EFConfigurationValue { Id = "usercenter:key", Value= "123456"}, - 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 = "usercenter:login", Value= $"http://{host}:8010/Account/Login"}, + new EFConfigurationValue { Id = "usercenter:logout", Value= $"http://{host}:8010/Account/Logout"}, + new EFConfigurationValue { Id = "usercenter:register", Value= $"http://{host}:8010/Account/Register"}, // new EFConfigurationValue { Id = "name", Value= "学习平台"}, new EFConfigurationValue { Id = "logo", Value= "/images/logo.png",Type= InputType.ImageUrl}, diff --git a/projects/StudyCenter/Properties/launchSettings.json b/projects/StudyCenter/Properties/launchSettings.json index da1602c8..13be84b0 100644 --- a/projects/StudyCenter/Properties/launchSettings.json +++ b/projects/StudyCenter/Properties/launchSettings.json @@ -3,7 +3,7 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:8003", + "applicationUrl": "http://localhost:8012", "sslPort": 0 } }, @@ -21,7 +21,7 @@ "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, - "applicationUrl": "http://localhost:8003" + "applicationUrl": "http://localhost:8012" } } } \ No newline at end of file diff --git a/projects/UserCenter/Program.cs b/projects/UserCenter/Program.cs index 35a61a1b..a97418ba 100644 --- a/projects/UserCenter/Program.cs +++ b/projects/UserCenter/Program.cs @@ -14,7 +14,7 @@ namespace UserCenter .Run(new List { new EFConfigurationValue { Id = "openapi.title", Value= "web api" }, new EFConfigurationValue { Id = "openapi.version", Value= "1.0" }, - new EFConfigurationValue { Id = "server.urls", Value= "http://*:8000" }, + new EFConfigurationValue { Id = "server.urls", Value= "http://*:8010" }, new EFConfigurationValue { Id = "security:key", Value= "111111111111111111111111"}, new EFConfigurationValue { Id = "jwt:key", Value= "111111111111111111111111"}, new EFConfigurationValue { Id = "email:host", Value= "nbaxp.com"}, diff --git a/projects/UserCenter/Properties/launchSettings.json b/projects/UserCenter/Properties/launchSettings.json index a01ce113..025d6304 100644 --- a/projects/UserCenter/Properties/launchSettings.json +++ b/projects/UserCenter/Properties/launchSettings.json @@ -3,7 +3,7 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:8000", + "applicationUrl": "http://localhost:8010", "sslPort": 0 } }, @@ -21,7 +21,7 @@ "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, - "applicationUrl": "http://localhost:8000" + "applicationUrl": "http://localhost:8010" } } } \ No newline at end of file diff --git a/projects/UserCenter/Startup.cs b/projects/UserCenter/Startup.cs index d36f4f33..82cce65d 100644 --- a/projects/UserCenter/Startup.cs +++ b/projects/UserCenter/Startup.cs @@ -171,9 +171,9 @@ namespace UserCenter Icon = "/images/iotcenter.png", Name = "物联网平台", Description = "智能设备管控中心", - Home = $"http://{host}:8001/", - Login = $"http://{host}:8001/Account/JsonpLogin", - Logout = $"http://{host}:8001/Account/JsonpLogout", + Home = $"http://{host}:8011/", + Login = $"http://{host}:8011/Account/JsonpLogin", + Logout = $"http://{host}:8011/Account/JsonpLogout", Key = "123456" }); dbContext.Set().Add(new Site @@ -181,9 +181,9 @@ namespace UserCenter Icon = "/images/studycenter.png", Name = "学习平台", Description = "资源库、在线学习、网络课程中心", - Home = $"http://{host}:8082/", - Login = $"http://{host}:8082/Account/JsonpLogin", - Logout = $"http://{host}:8082/Account/JsonpLogout", + Home = $"http://{host}:8012/", + Login = $"http://{host}:8012/Account/JsonpLogin", + Logout = $"http://{host}:8012/Account/JsonpLogout", Key = "123456" }); dbContext.SaveChanges(); diff --git a/projects/UserCenter/appsettings.json b/projects/UserCenter/appsettings.json index ecc84c14..a3ca305d 100644 --- a/projects/UserCenter/appsettings.json +++ b/projects/UserCenter/appsettings.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-rc.9", + "version": "1.0.0-rc.20", "Logging": { "LogLevel": { "Default": "Warning" diff --git a/publish/build.cmd b/publish/build.cmd index c225315b..b2f3c797 100644 --- a/publish/build.cmd +++ b/publish/build.cmd @@ -11,8 +11,8 @@ dotnet publish ../projects/IoTCenter/IoTCenter.csproj -c Release -r linux-x64 -o ::dotnet publish ../projects/UserCenter/UserCenter.csproj -c Release -r linux-arm -o ../publish/dist/linux-arm/publish/apps/UserCenter dotnet publish ../projects/IoTCenter/IoTCenter.csproj -c Release -r linux-arm -o ../publish/dist/linux-arm/publish/apps/IoTCenter dotnet publish ../projects/IoTCenter/IoTCenter.csproj -c Release -r linux-arm64 -o ../publish/dist/linux-arm64/publish/apps/IoTCenter -dotnet publish ../projects/IoT/IoTNode/IoTNode.csproj -c Release -r linux-arm -o ../publish/dist/linux-arm/publish/apps/IoTNode -dotnet publish ../projects/IoT/IoTNode/IoTNode.csproj -c Release -r linux-arm64 -o ../publish/dist/linux-arm64/publish/apps/IoTNode +dotnet publish ../projects/IoTNode/IoTNode.csproj -c Release -r linux-arm -o ../publish/dist/linux-arm/publish/apps/IoTNode +dotnet publish ../projects/IoTNode/IoTNode.csproj -c Release -r linux-arm64 -o ../publish/dist/linux-arm64/publish/apps/IoTNode ::dotnet publish ../projects/IoT/IoTServices/WinService/WinService.csproj -c Release -r win-x86 -o "../../publish/dist/win-x86/Program Files (x86)/WinService" ::dotnet publish ../projects/IoT/IoTServices/APService/APService.csproj -c Release -o ../../publish/dist/linux-arm64/publish/apps/APService ::dotnet publish ../projects/IoT/IoTServices/FBeeService/FBeeService.csproj -c Release -r linux-arm64 -o ../publish/dist/linux-arm64/publish/apps/FBeeService