增加IoTZero项目，通过子模块引入ZeroIoT，作为RPC框架服务端的标准例程

NewLifeX · May 10, 2024 · 315cdeb · 315cdeb
1 parent e99efab
commit 315cdeb
Show file tree

Hide file tree

Showing 5 changed files with 130 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -18,7 +18,6 @@ bld/
 /Data
 /Log
 *.log
-*.htm
 *.nuspec
 *.nupkg
 /BinTest

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "ZeroIoT"]
+	path = Samples/ZeroIoT
+	url = https://github.com/NewLifeX/ZeroIoT
diff --git a/NewLife.Remoting.sln b/NewLife.Remoting.sln
@@ -26,6 +26,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Zero.RpcServer", "Samples\Z
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewLife.Remoting.Extensions", "NewLife.Remoting.Extensions\NewLife.Remoting.Extensions.csproj", "{8A9D4116-66D8-48B5-B997-CAD182304F96}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IoTZero", "Samples\IoTZero\IoTZero.csproj", "{1DEAF969-F093-4D99-80C9-1CEA3BD06ABB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -56,13 +58,18 @@ Global
 		{8A9D4116-66D8-48B5-B997-CAD182304F96}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8A9D4116-66D8-48B5-B997-CAD182304F96}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8A9D4116-66D8-48B5-B997-CAD182304F96}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1DEAF969-F093-4D99-80C9-1CEA3BD06ABB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1DEAF969-F093-4D99-80C9-1CEA3BD06ABB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1DEAF969-F093-4D99-80C9-1CEA3BD06ABB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1DEAF969-F093-4D99-80C9-1CEA3BD06ABB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{685205DD-0754-4877-9A96-40CD18F8D84B} = {8DB8495C-1EB6-41AE-83DD-55DBBB0E6FA2}
 		{8351AC88-1955-48AD-B6F4-26959E1A0C4C} = {8DB8495C-1EB6-41AE-83DD-55DBBB0E6FA2}
+		{1DEAF969-F093-4D99-80C9-1CEA3BD06ABB} = {8DB8495C-1EB6-41AE-83DD-55DBBB0E6FA2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {323831A1-A95B-40AB-B9AD-36A0BC10C2CB}

diff --git a/Samples/IoTZero/IoTZero.csproj b/Samples/IoTZero/IoTZero.csproj
@@ -0,0 +1,108 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <AssemblyTitle>物联网服务平台</AssemblyTitle>
+    <Description>IoT服务平台</Description>
+    <Company>新生命开发团队</Company>
+    <Copyright>©2002-2024 NewLife</Copyright>
+    <VersionPrefix>1.0</VersionPrefix>
+    <VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
+    <Version>$(VersionPrefix).$(VersionSuffix)</Version>
+    <FileVersion>$(Version)</FileVersion>
+    <AssemblyVersion>$(VersionPrefix).*</AssemblyVersion>
+    <Deterministic>false</Deterministic>
+    <OutputPath>..\..\Bin\IoTZero</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\ZeroIoT\IoT.Data\Entity\产品.Biz.cs" Link="Entity\产品.Biz.cs" />
+    <Compile Include="..\ZeroIoT\IoT.Data\Entity\产品.cs" Link="Entity\产品.cs" />
+    <Compile Include="..\ZeroIoT\IoT.Data\Entity\设备.Biz.cs" Link="Entity\设备.Biz.cs" />
+    <Compile Include="..\ZeroIoT\IoT.Data\Entity\设备.cs" Link="Entity\设备.cs" />
+    <Compile Include="..\ZeroIoT\IoT.Data\Entity\设备分组.Biz.cs" Link="Entity\设备分组.Biz.cs" />
+    <Compile Include="..\ZeroIoT\IoT.Data\Entity\设备分组.cs" Link="Entity\设备分组.cs" />
+    <Compile Include="..\ZeroIoT\IoT.Data\Entity\设备历史.Biz.cs" Link="Entity\设备历史.Biz.cs" />
+    <Compile Include="..\ZeroIoT\IoT.Data\Entity\设备历史.cs" Link="Entity\设备历史.cs" />
+    <Compile Include="..\ZeroIoT\IoT.Data\Entity\设备在线.Biz.cs" Link="Entity\设备在线.Biz.cs" />
+    <Compile Include="..\ZeroIoT\IoT.Data\Entity\设备在线.cs" Link="Entity\设备在线.cs" />
+    <Compile Include="..\ZeroIoT\IoT.Data\Entity\设备属性.Biz.cs" Link="Entity\设备属性.Biz.cs" />
+    <Compile Include="..\ZeroIoT\IoT.Data\Entity\设备属性.cs" Link="Entity\设备属性.cs" />
+    <Compile Include="..\ZeroIoT\IoT.Data\Entity\设备数据.Biz.cs" Link="Entity\设备数据.Biz.cs" />
+    <Compile Include="..\ZeroIoT\IoT.Data\Entity\设备数据.cs" Link="Entity\设备数据.cs" />
+    <Compile Include="..\ZeroIoT\IoTCore\Models\LoginInfo.cs" Link="Models\LoginInfo.cs" />
+    <Compile Include="..\ZeroIoT\IoTCore\Models\LoginResponse.cs" Link="Models\LoginResponse.cs" />
+    <Compile Include="..\ZeroIoT\IoTCore\Models\LogoutResponse.cs" Link="Models\LogoutResponse.cs" />
+    <Compile Include="..\ZeroIoT\IoTCore\Models\PingInfo.cs" Link="Models\PingInfo.cs" />
+    <Compile Include="..\ZeroIoT\IoTCore\Models\PingResponse.cs" Link="Models\PingResponse.cs" />
+    <Compile Include="..\ZeroIoT\IoTCore\Models\ThingSpecModel.cs" Link="Models\ThingSpecModel.cs" />
+    <Compile Include="..\ZeroIoT\IoTCore\Models\UpgradeInfo.cs" Link="Models\UpgradeInfo.cs" />
+    <Compile Include="..\ZeroIoT\IoTZero\Areas\IoT\Controllers\DeviceController.cs" Link="Areas\IoT\Controllers\DeviceController.cs" />
+    <Compile Include="..\ZeroIoT\IoTZero\Areas\IoT\Controllers\DeviceDataController.cs" Link="Areas\IoT\Controllers\DeviceDataController.cs" />
+    <Compile Include="..\ZeroIoT\IoTZero\Areas\IoT\Controllers\DeviceGroupController.cs" Link="Areas\IoT\Controllers\DeviceGroupController.cs" />
+    <Compile Include="..\ZeroIoT\IoTZero\Areas\IoT\Controllers\DeviceHistoryController.cs" Link="Areas\IoT\Controllers\DeviceHistoryController.cs" />
+    <Compile Include="..\ZeroIoT\IoTZero\Areas\IoT\Controllers\DeviceOnlineController.cs" Link="Areas\IoT\Controllers\DeviceOnlineController.cs" />
+    <Compile Include="..\ZeroIoT\IoTZero\Areas\IoT\Controllers\DevicePropertyController.cs" Link="Areas\IoT\Controllers\DevicePropertyController.cs" />
+    <Compile Include="..\ZeroIoT\IoTZero\Areas\IoT\Controllers\ProductController.cs" Link="Areas\IoT\Controllers\ProductController.cs" />
+    <Compile Include="..\ZeroIoT\IoTZero\Areas\IoT\IoTArea.cs" Link="Areas\IoT\IoTArea.cs" />
+    <Compile Include="..\ZeroIoT\IoTZero\Common\ApiFilterAttribute.cs" Link="Common\ApiFilterAttribute.cs" />
+    <Compile Include="..\ZeroIoT\IoTZero\Controllers\AppController.cs" Link="Controllers\AppController.cs" />
+    <Compile Include="..\ZeroIoT\IoTZero\Controllers\BaseController.cs" Link="Controllers\BaseController.cs" />
+    <Compile Include="..\ZeroIoT\IoTZero\Controllers\DeviceController.cs" Link="Controllers\DeviceController.cs" />
+    <Compile Include="..\ZeroIoT\IoTZero\Controllers\ThingController.cs" Link="Controllers\ThingController.cs" />
+    <Compile Include="..\ZeroIoT\IoTZero\IoTSetting.cs" Link="IoTSetting.cs" />
+    <Compile Include="..\ZeroIoT\IoTZero\Program.cs" Link="Program.cs" />
+    <Compile Include="..\ZeroIoT\IoTZero\Services\DataService.cs" Link="Services\DataService.cs" />
+    <Compile Include="..\ZeroIoT\IoTZero\Services\DeviceOnlineService.cs" Link="Services\DeviceOnlineService.cs" />
+    <Compile Include="..\ZeroIoT\IoTZero\Services\MyDeviceService.cs" Link="Services\MyDeviceService.cs" />
+    <Compile Include="..\ZeroIoT\IoTZero\Services\QueueService.cs" Link="Services\QueueService.cs" />
+    <Compile Include="..\ZeroIoT\IoTZero\Services\ShardTableService.cs" Link="Services\ShardTableService.cs" />
+    <Compile Include="..\ZeroIoT\IoTZero\Services\ThingService.cs" Link="Services\ThingService.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="..\ZeroIoT\IoT.Data\Entity\IoT.htm" Link="Entity\IoT.htm" />
+    <Content Include="..\ZeroIoT\IoT.Data\Entity\Model.xml" Link="Entity\Model.xml" />
+    <Content Include="..\ZeroIoT\IoTZero\appsettings.Development.json" Link="appsettings.Development.json" />
+    <Content Include="..\ZeroIoT\IoTZero\appsettings.json" Link="appsettings.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="NewLife.Cube.Core" Version="5.5.2023.625-beta1355" />
+    <PackageReference Include="NewLife.IoT" Version="1.8.2023.611-beta1629" />
+    <PackageReference Include="NewLife.MQTT" Version="1.4.2023.620-beta1039" />
+    <PackageReference Include="NewLife.Redis" Version="5.4.2023.624-beta0342" />
+    <PackageReference Include="NewLife.Stardust.Extensions" Version="2.9.2023.627-beta0441" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\NewLife.Remoting.Extensions\NewLife.Remoting.Extensions.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Areas\IoT\Controllers\" />
+    <Folder Include="Areas\IoT\Views\Device\" />
+    <Folder Include="Areas\IoT\Views\DeviceData\" />
+    <Folder Include="Areas\IoT\Views\DeviceGroup\" />
+    <Folder Include="Areas\IoT\Views\DeviceHistory\" />
+    <Folder Include="Controllers\" />
+    <Folder Include="Services\" />
+    <Folder Include="Common\" />
+    <Folder Include="Models\" />
+    <Folder Include="Entity\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="..\ZeroIoT\IoTZero\Areas\IoT\Views\DeviceData\_List_Search.cshtml" Link="Areas\IoT\Views\DeviceData\_List_Search.cshtml" />
+    <None Include="..\ZeroIoT\IoTZero\Areas\IoT\Views\DeviceData\_List_Toolbar_Custom.cshtml" Link="Areas\IoT\Views\DeviceData\_List_Toolbar_Custom.cshtml" />
+    <None Include="..\ZeroIoT\IoTZero\Areas\IoT\Views\DeviceGroup\_List_Toolbar_Batch.cshtml" Link="Areas\IoT\Views\DeviceGroup\_List_Toolbar_Batch.cshtml" />
+    <None Include="..\ZeroIoT\IoTZero\Areas\IoT\Views\DeviceHistory\_List_Search.cshtml" Link="Areas\IoT\Views\DeviceHistory\_List_Search.cshtml" />
+    <None Include="..\ZeroIoT\IoTZero\Areas\IoT\Views\Device\_List_Search.cshtml" Link="Areas\IoT\Views\Device\_List_Search.cshtml" />
+    <None Include="..\ZeroIoT\IoTZero\Areas\IoT\Views\_ViewImports.cshtml" Link="Areas\IoT\Views\_ViewImports.cshtml" />
+    <None Include="..\ZeroIoT\IoTZero\Areas\IoT\Views\_ViewStart.cshtml" Link="Areas\IoT\Views\_ViewStart.cshtml" />
+  </ItemGroup>
+
+</Project>
diff --git a/Samples/IoTZero/Properties/launchSettings.json b/Samples/IoTZero/Properties/launchSettings.json
@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "IoTZero": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:1880"
+    }
+  }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,6 @@ bld/ @@
     /Data
     /Log
     *.log
-    *.htm
     *.nuspec
     *.nupkg
     /BinTest
@@ Expand Down @@