From 832718ad09d1fe79e3d20c9d64e676a455ee1468 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Mon, 28 Oct 2019 09:53:10 +0800 Subject: [PATCH] 1.0.0-rc.20 Former-commit-id: f3b81167be0ba3b7384ccaf1bf7468b757b60fa4 --- projects/IoTCenter/Program.cs | 8 ++++---- .../IoTCenter/Properties/launchSettings.json | 4 ++-- projects/IoTCenter/configuration.db | Bin 12288 -> 12288 bytes projects/IoTCenter/iotcenter.db | Bin 544768 -> 544768 bytes projects/IoTNode/Program.cs | 2 +- projects/IoTNode/configuration.db | Bin 12288 -> 12288 bytes projects/IoTNode/iotnode.db | Bin 491520 -> 491520 bytes projects/StudyCenter/Program.cs | 8 ++++---- .../Properties/launchSettings.json | 4 ++-- projects/UserCenter/Program.cs | 2 +- .../UserCenter/Properties/launchSettings.json | 4 ++-- projects/UserCenter/Startup.cs | 12 ++++++------ projects/UserCenter/appsettings.json | 2 +- publish/build.cmd | 4 ++-- 14 files changed, 25 insertions(+), 25 deletions(-) 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 7cfdb231d9ab410bb455e726685b8301e7f9e2f1..1e4565269aeb4d1f06b2ae22ce8eafaa399107e4 100644 GIT binary patch delta 117 zcmWN>u?@mN3;;kyqD5i=NLH}%``<1o{_S_o2w4M(A~kImi9}D$Kny^xxMg1E?RUP1 zNF)`iKqiH$v#@I-hfWchLQM(STG8T-H4Bkj7+#^8c0z%Ml@t>IXSdZa-vQU-_}qVu OkNv}R8}Qwx&*={xPaY)z delta 117 zcmWN>u?@m75Cu?0qD5i=NLKjvUGD6H!WW-wM#vgS6sc*m2oim22Fd{B6>piB`Lkai z0yj$5Qq9pKqNumTP(dy(fr~ldjdao=iJI{=T6VC861iCd*FrP~1v1sJ*4wYcdhTDx P@BVpw8txswHf)za6s;Zk diff --git a/projects/IoTCenter/iotcenter.db b/projects/IoTCenter/iotcenter.db index ee5f209ce58b74e492d3a6c93a30b06f09a03550..4e3b429e7ee556b98a4063be3010871c32521c43 100644 GIT binary patch delta 165 zcmZozpx6LJEsQNpEzB(}Ev#GEOdNO^`B@&al(TR%FJxFa-NAt^kv+$fCzL^4c)FY; zn*pZ3_ViTaKvZy4Zup|dZ==6>5Oe*{#sksHIMTsS)MX5%HddAZqJFuBd zZ*gR^V>Z^a*nZTJ&6bhHNYBt@JDW3`7!!+$o`uPD1y{DGU}+9Fwjw5`*3IoT9&A9& LzP-kSqlFy+-yJJ% delta 165 zcmZozpx6LJEsQNpEzB(}Ev#GEOdNO^7P35KDQDqkUdSju-NAt^k*~yrCzL^1T#`{( zl7l03`bKvq6@ie{+=A4i#FEmYR3jrjL(}O2j%+6E*_J?+;)2sxIItNonV3(%?Z9R- zy~UBuj@d}hZ2M71Hd{s(Q#~Wo?QG6$VoX4$xy5t^SGK2MX%08GA||Fi4ed1^Y(UJu Ky~cy1g&hDwK`Z|N 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 93e277b2b8e4916fce26920613182f1f3d79ad40..a41bf9e641cdf8d96483e121fbb53273b6c43942 100644 GIT binary patch delta 93 zcmV-j0HXhZV1Qt-0T2cN0012fN|Of=H3AHxvpx{83z2|alS&*|FD)Ac6#-RaZ)9Z( z=AgOejjrgfzU8Ec=e(BXkGJQPpXP{==bD7(j)>-+gXf@uv(X$<0Rb_yBp%!mVZ$ip delta 183 zcmW;FJC4FI5CG5^u^3lyCLkPZI6ne10dlB^cv?nrI_4`$Jg f)P~tzm@nFBV=bS6np&95seMg$Nnwq#7iH6ihFSXH(t&I+jg(lFvp4{^|Vsd?)$Bc|Y)W@XGOQKiT@&R9W{jY-E&R4P$xB(#RstypGwO=?YU06BA?i zWJQ5^_S71lPzGti=@UP)8F3j|I3<>pq!v|jO=sN0rovuW3zSqBoc`k@n+21R#dO0@ zY)0E{KeKr+V-;@iRJ&HI2Mbh<x^*DC kJu}cv(`y6S3t3F`EKIh43S{@?W--z;G}-PP%f43$0I~UyDF6Tf delta 459 zcmZo@kZS;<7RDB)7UmX~7S=6n@`k)AX2~fAK;V*Cl4vyjq7j?Q_5ee+J&KIx+j)c8 z)^hQrSQuC&n;N8m6ihFSXH(t&I+jg(lFvF;{^|VsOxKxG_)hR8@P6a%|*@LrpJ1eHIn5$OBA|B=mN zx`P@!|Mc{aY$`xK;s4l*fYix9YS&5(;Ah27www7~>|s9em!r4;ao)mk40DFj~*CLGy~CO~m;_CG=F=wxu$xS`4rI4y2D)i_Z6JFgpQ)a? m#j~CJpYB>F66B#eT`-VcYr9$yyCgS@sh*MPcIR03y-EOQm5pWq 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