1.0.0-rc.20

Former-commit-id: f3b81167be0ba3b7384ccaf1bf7468b757b60fa4
TangShanKaiPing
wanggang 6 years ago
parent 7794e2261e
commit 832718ad09

@ -23,13 +23,13 @@ namespace IoTCenter
new EFConfigurationValue { Id = "openapi.name", Value= "v1" }, new EFConfigurationValue { Id = "openapi.name", Value= "v1" },
new EFConfigurationValue { Id = "openapi.title", Value= "web api" }, new EFConfigurationValue { Id = "openapi.title", Value= "web api" },
new EFConfigurationValue { Id = "openapi.version", Value= "1.0" }, 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 = "security:key", Value= "111111111111111111111111"},
new EFConfigurationValue { Id = "jwt:key", Value= "111111111111111111111111"}, new EFConfigurationValue { Id = "jwt:key", Value= "111111111111111111111111"},
new EFConfigurationValue { Id = "usercenter:key", Value= "123456"}, new EFConfigurationValue { Id = "usercenter:key", Value= "123456"},
new EFConfigurationValue { Id = "usercenter:login", Value= $"http://{host}:8000/Account/Login"}, new EFConfigurationValue { Id = "usercenter:login", Value= $"http://{host}:8010/Account/Login"},
new EFConfigurationValue { Id = "usercenter:logout", Value= $"http://{host}:8000/Account/Logout"}, new EFConfigurationValue { Id = "usercenter:logout", Value= $"http://{host}:8010/Account/Logout"},
new EFConfigurationValue { Id = "usercenter:register", Value= $"http://{host}:8000/Account/Register"}, new EFConfigurationValue { Id = "usercenter:register", Value= $"http://{host}:8010/Account/Register"},
new EFConfigurationValue { Id = "influxdb:url", Value= $"http://{host}:8086"}, new EFConfigurationValue { Id = "influxdb:url", Value= $"http://{host}:8086"},
new EFConfigurationValue { Id = "influxdb:usr", Value= "admin"}, new EFConfigurationValue { Id = "influxdb:usr", Value= "admin"},
new EFConfigurationValue { Id = "influxdb:pwd", Value= "admin"}, new EFConfigurationValue { Id = "influxdb:pwd", Value= "admin"},

@ -3,7 +3,7 @@
"windowsAuthentication": false, "windowsAuthentication": false,
"anonymousAuthentication": true, "anonymousAuthentication": true,
"iisExpress": { "iisExpress": {
"applicationUrl": "http://localhost:8001", "applicationUrl": "http://localhost:8011",
"sslPort": 0 "sslPort": 0
} }
}, },
@ -21,7 +21,7 @@
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
}, },
"applicationUrl": "http://localhost:8001" "applicationUrl": "http://localhost:8011"
} }
} }
} }

Binary file not shown.

@ -33,7 +33,7 @@ namespace IoTNode
new EFConfigurationValue { Id = "server.ip", Value= "" }, new EFConfigurationValue { Id = "server.ip", Value= "" },
new EFConfigurationValue { Id = "server.urls", Value= "http://*:8002" }, new EFConfigurationValue { Id = "server.urls", Value= "http://*:8002" },
new EFConfigurationValue { Id = "notify:enabled", Value= "true"}, 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 = "timer.seconds", Value="60"},
new EFConfigurationValue { Id = "onvif.timer", Value="1"}, new EFConfigurationValue { Id = "onvif.timer", Value="1"},
new EFConfigurationValue { Id = "onvif.speed", Value="0.2"}, new EFConfigurationValue { Id = "onvif.speed", Value="0.2"},

Binary file not shown.

Binary file not shown.

@ -16,13 +16,13 @@ namespace StudyCenter
.Run<Startup>(new List<EFConfigurationValue> { .Run<Startup>(new List<EFConfigurationValue> {
new EFConfigurationValue { Id = "openapi.title", Value= "web api" }, new EFConfigurationValue { Id = "openapi.title", Value= "web api" },
new EFConfigurationValue { Id = "openapi.version", Value= "1.0" }, 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:key", Value= "111111111111111111111111"},
new EFConfigurationValue { Id = "security:iv", Value= "11111111"}, new EFConfigurationValue { Id = "security:iv", Value= "11111111"},
new EFConfigurationValue { Id = "usercenter:key", Value= "123456"}, new EFConfigurationValue { Id = "usercenter:key", Value= "123456"},
new EFConfigurationValue { Id = "usercenter:login", Value= $"http://{host}:8000/Account/Login"}, new EFConfigurationValue { Id = "usercenter:login", Value= $"http://{host}:8010/Account/Login"},
new EFConfigurationValue { Id = "usercenter:logout", Value= $"http://{host}:8000/Account/Logout"}, new EFConfigurationValue { Id = "usercenter:logout", Value= $"http://{host}:8010/Account/Logout"},
new EFConfigurationValue { Id = "usercenter:register", Value= $"http://{host}:8000/Account/Register"}, new EFConfigurationValue { Id = "usercenter:register", Value= $"http://{host}:8010/Account/Register"},
// //
new EFConfigurationValue { Id = "name", Value= "学习平台"}, new EFConfigurationValue { Id = "name", Value= "学习平台"},
new EFConfigurationValue { Id = "logo", Value= "/images/logo.png",Type= InputType.ImageUrl}, new EFConfigurationValue { Id = "logo", Value= "/images/logo.png",Type= InputType.ImageUrl},

@ -3,7 +3,7 @@
"windowsAuthentication": false, "windowsAuthentication": false,
"anonymousAuthentication": true, "anonymousAuthentication": true,
"iisExpress": { "iisExpress": {
"applicationUrl": "http://localhost:8003", "applicationUrl": "http://localhost:8012",
"sslPort": 0 "sslPort": 0
} }
}, },
@ -21,7 +21,7 @@
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
}, },
"applicationUrl": "http://localhost:8003" "applicationUrl": "http://localhost:8012"
} }
} }
} }

@ -14,7 +14,7 @@ namespace UserCenter
.Run<Startup>(new List<EFConfigurationValue> { .Run<Startup>(new List<EFConfigurationValue> {
new EFConfigurationValue { Id = "openapi.title", Value= "web api" }, new EFConfigurationValue { Id = "openapi.title", Value= "web api" },
new EFConfigurationValue { Id = "openapi.version", Value= "1.0" }, 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 = "security:key", Value= "111111111111111111111111"},
new EFConfigurationValue { Id = "jwt:key", Value= "111111111111111111111111"}, new EFConfigurationValue { Id = "jwt:key", Value= "111111111111111111111111"},
new EFConfigurationValue { Id = "email:host", Value= "nbaxp.com"}, new EFConfigurationValue { Id = "email:host", Value= "nbaxp.com"},

@ -3,7 +3,7 @@
"windowsAuthentication": false, "windowsAuthentication": false,
"anonymousAuthentication": true, "anonymousAuthentication": true,
"iisExpress": { "iisExpress": {
"applicationUrl": "http://localhost:8000", "applicationUrl": "http://localhost:8010",
"sslPort": 0 "sslPort": 0
} }
}, },
@ -21,7 +21,7 @@
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
}, },
"applicationUrl": "http://localhost:8000" "applicationUrl": "http://localhost:8010"
} }
} }
} }

@ -171,9 +171,9 @@ namespace UserCenter
Icon = "/images/iotcenter.png", Icon = "/images/iotcenter.png",
Name = "物联网平台", Name = "物联网平台",
Description = "智能设备管控中心", Description = "智能设备管控中心",
Home = $"http://{host}:8001/", Home = $"http://{host}:8011/",
Login = $"http://{host}:8001/Account/JsonpLogin", Login = $"http://{host}:8011/Account/JsonpLogin",
Logout = $"http://{host}:8001/Account/JsonpLogout", Logout = $"http://{host}:8011/Account/JsonpLogout",
Key = "123456" Key = "123456"
}); });
dbContext.Set<Site>().Add(new Site dbContext.Set<Site>().Add(new Site
@ -181,9 +181,9 @@ namespace UserCenter
Icon = "/images/studycenter.png", Icon = "/images/studycenter.png",
Name = "学习平台", Name = "学习平台",
Description = "资源库、在线学习、网络课程中心", Description = "资源库、在线学习、网络课程中心",
Home = $"http://{host}:8082/", Home = $"http://{host}:8012/",
Login = $"http://{host}:8082/Account/JsonpLogin", Login = $"http://{host}:8012/Account/JsonpLogin",
Logout = $"http://{host}:8082/Account/JsonpLogout", Logout = $"http://{host}:8012/Account/JsonpLogout",
Key = "123456" Key = "123456"
}); });
dbContext.SaveChanges(); dbContext.SaveChanges();

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-rc.9", "version": "1.0.0-rc.20",
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Warning" "Default": "Warning"

@ -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/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-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/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/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-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/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/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 ::dotnet publish ../projects/IoT/IoTServices/FBeeService/FBeeService.csproj -c Release -r linux-arm64 -o ../publish/dist/linux-arm64/publish/apps/FBeeService

Loading…
Cancel
Save