Merge branch 'master' of https://github.com/IoTSharp/IoTSharp

.gitignore

@@ -347,3 +347,5 @@ ASALocalRun/
 /IoTSharp/TelemetryStorage.db
 /IoTSharp/IoTSharp.db
 /IoTSharp/health_checks.db
+/ClientApp/Vue/build
+/ClientApp/Vue/mock

ClientApp/Vue/.env

@@ -2,7 +2,7 @@
 VITE_PORT = 3100
 
 # spa-title
-VITE_GLOB_APP_TITLE = IotSharp
+VITE_GLOB_APP_TITLE = IoTSharp
 
 # spa shortname
-VITE_GLOB_APP_SHORT_NAME = IotSharp
+VITE_GLOB_APP_SHORT_NAME = IoTSharp

ClientApp/Vue/package.json

 {
   "name": "vben-admin",
   "version": "2.5.2",
-  "author": {
-    "name": "vben",
-    "email": "anncwb@126.com",
-    "url": "https://github.com/anncwb"
-  },
+  "author": "vben <anncwb@126.com> (https://github.com/anncwb)",
   "scripts": {
     "bootstrap": "yarn install",
     "serve": "npm run dev",
@@ -157,5 +153,11 @@
   "homepage": "https://github.com/anncwb/vue-vben-admin",
   "engines": {
     "node": "^12 || >=14"
-  }
+  },
+  "description": "<div align=\"center\"> <a href=\"https://github.com/anncwb/vue-vben-admin\"> <img alt=\"VbenAdmin Logo\" width=\"200\" height=\"200\" src=\"https://anncwb.github.io/anncwb/images/logo.png\"> </a> <br> <br>",
+  "main": ".eslintrc.js",
+  "directories": {
+    "test": "tests"
+  },
+  "keywords": []
 }

ClientApp/Vue/src/views/sys/login/Login.vue

@@ -18,7 +18,7 @@
           <div class="my-auto">
             <img
               :alt="title"
-              src="../../../assets/images/Logo-Full.png"
+              src="../../../assets/images/logo-full.png"
               class="w-1/2 -mt-16 -enter-x"
             />
             <div class="mt-10 font-medium text-red -enter-x">
@@ -32,7 +32,7 @@
         <div class="flex w-full h-full py-5 xl:h-auto xl:py-0 xl:my-0 xl:w-6/12">
           <div
             :class="`${prefixCls}-form`"
-            class="relative w-full px-5 py-8 mx-auto my-auto rounded-md shadow-md  xl:ml-16 xl:bg-transparent sm:px-8 xl:p-4 xl:shadow-none sm:w-3/4 lg:w-2/4 xl:w-auto enter-x"
+            class="relative w-full px-5 py-8 mx-auto my-auto rounded-md shadow-md xl:ml-16 xl:bg-transparent sm:px-8 xl:p-4 xl:shadow-none sm:w-3/4 lg:w-2/4 xl:w-auto enter-x"
           >
             <LoginForm />
             <ForgetPasswordForm />

IoTSharp.Data.MySQL/IoTSharp.Data.MySQL.csproj

@@ -12,7 +12,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="5.0.7" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.0" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.1" />
 	  <PackageReference Include="EFCore.Sharding.MySql" Version="5.0.13" />
   </ItemGroup>
 

IoTSharp.SDKs/IoTSharp.Sdk.MQTT/IoTSharp.Sdk.MQTT.csproj

@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MQTTnet" Version="3.0.15" />
+    <PackageReference Include="MQTTnet" Version="3.0.16" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 

IoTSharp.Test/IoTSharp.Test.csproj

@@ -13,8 +13,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.4" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.4" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.5" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.5" />
   </ItemGroup>
 
   <ItemGroup>

IoTSharp/Controllers/AccountController.cs

@@ -119,7 +119,7 @@ namespace IoTSharp.Controllers
                                 signingCredentials: signinCredentials);
 
 
-
+           
 
                     var t = (expires.Ticks - TimeZoneInfo.ConvertTimeFromUtc(new System.DateTime(1970, 1, 1, 0, 0, 0, 0), TimeZoneInfo.Local).Ticks) / 10000;
                     var token = new TokenEntity

IoTSharp/Dockerfile

@@ -33,9 +33,9 @@ RUN echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ buster main contrib n
 	echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ buster-backports main contrib non-free" >> /etc/apt/sources.list && \
 	echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian-security buster/updates main contrib non-free" >> /etc/apt/sources.list && \
 	echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian-security jessie/updates main contrib non-free" >> /etc/apt/sources.list && \
-    apt-get  -y   -q update   && apt-get install  -y   -q  git  libssl-dev  libcurl3 libssl1.0.0   && \
-	apt-get autoremove -y &&  apt-get clean  &&  apt-get autoclean && rm  /var/cache/apt/* -rf && \
-	ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+    apt-get  -y   -q update   && apt-get install  -y   -q  git  libssl-dev  curl gnupg libcurl4 libssl1.0.0  && \
+	ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
+    apt-get autoremove -y &&  apt-get clean  &&  apt-get autoclean && rm  /var/cache/apt/* -rf 	
 WORKDIR /src
 COPY ["IoTSharp/IoTSharp.csproj", "IoTSharp/"]
 COPY ["IoTSharp.Data/IoTSharp.Data.csproj", "IoTSharp.Data/"]
@@ -49,10 +49,24 @@ COPY . .
 WORKDIR "/src/IoTSharp"
 RUN dotnet build "IoTSharp.csproj" -c Release -o /app/build
 
+
+FROM  node:14-buster AS web
+WORKDIR /web
+RUN  npm config set registry http://registry.npm.taobao.org/  &&  \
+	yarn config set registry http://registry.npm.taobao.org/
+COPY ../ClientApp/Vue/package*.json  ./
+RUN  yarn install
+COPY ../ClientApp/Vue  ./
+RUN  yarn build
+
+
+
+
 FROM build AS publish
 RUN dotnet publish "IoTSharp.csproj" -c Release -o /app/publish
 
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
+COPY --from=web /web/dist ./wwwroot
 ENTRYPOINT ["dotnet", "IoTSharp.dll"]
\ No newline at end of file

IoTSharp/IoTSharp.csproj

@@ -48,19 +48,19 @@
 		<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="5.0.1" />
 		<PackageReference Include="AspNetCore.HealthChecks.Network" Version="5.0.4" />
 		<PackageReference Include="CAP.Extensions" Version="1.0.32" />
-		<PackageReference Include="DotNetCore.CAP" Version="5.1.0" />
-		<PackageReference Include="DotNetCore.CAP.Dashboard" Version="5.1.0" />
-		<PackageReference Include="DotNetCore.CAP.InMemoryStorage" Version="5.1.0" />
-		<PackageReference Include="DotNetCore.CAP.Kafka" Version="5.1.0" />
-		<PackageReference Include="DotNetCore.CAP.MongoDB" Version="5.1.0" />
-		<PackageReference Include="DotNetCore.CAP.PostgreSql" Version="5.1.0" />
-		<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="5.1.0" />
+		<PackageReference Include="DotNetCore.CAP" Version="5.1.1" />
+		<PackageReference Include="DotNetCore.CAP.Dashboard" Version="5.1.1" />
+		<PackageReference Include="DotNetCore.CAP.InMemoryStorage" Version="5.1.1" />
+		<PackageReference Include="DotNetCore.CAP.Kafka" Version="5.1.1" />
+		<PackageReference Include="DotNetCore.CAP.MongoDB" Version="5.1.1" />
+		<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="5.1.1" />
+		<PackageReference Include="DotNetCore.CAP.PostgreSql" Version="5.1.1" />
 		<PackageReference Include="EasyCaching.Core" Version="1.3.0" />
 		<PackageReference Include="EasyCaching.InMemory" Version="1.3.0" />
 		<PackageReference Include="EasyCaching.LiteDB" Version="1.3.0" />
 		<PackageReference Include="EasyCaching.Redis" Version="1.3.0" />
-		<PackageReference Include="hyjiacan.pinyin4net" Version="4.1.0-release" />
-		<PackageReference Include="InfluxDB.Client" Version="1.19.0" />
+		<PackageReference Include="hyjiacan.pinyin4net" Version="4.1.0" />
+		<PackageReference Include="InfluxDB.Client" Version="2.0.0" />
 		<PackageReference Include="IoTSharp.CoAP.NET" Version="2.0.8" />
 		<PackageReference Include="IoTSharp.X509Extensions" Version="1.4.27" />
 		<PackageReference Include="kimbus" Version="2.0.1" />
@@ -78,17 +78,17 @@
 		<PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
 		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
 		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
-		<PackageReference Include="MQTTnet" Version="3.0.15" />
-		<PackageReference Include="MQTTnet.AspNetCore" Version="3.0.15" />
+		<PackageReference Include="MQTTnet" Version="3.0.16" />
+		<PackageReference Include="MQTTnet.AspNetCore" Version="3.0.16" />
 		<PackageReference Include="MQTTnet.AspNetCoreEx" Version="3.0.15" />
-		<PackageReference Include="MQTTnet.Extensions.Rpc" Version="3.0.15" />
+		<PackageReference Include="MQTTnet.Extensions.Rpc" Version="3.0.16" />
 		<PackageReference Include="NetMQ" Version="4.0.1.6" />
 		<PackageReference Include="NSwag.AspNetCore" Version="13.11.3" />
 		<PackageReference Include="PinusDB" Version="1.0.10" />
 		<PackageReference Include="PinusDB.HealthChecks" Version="1.0.10" />
 		<PackageReference Include="ProxyKit" Version="2.3.4" />
 		<PackageReference Include="Quartz.Serialization.Json" Version="3.3.2" />
-		<PackageReference Include="Savorboard.CAP.InMemoryMessageQueue" Version="3.1.1" />
+		<PackageReference Include="Savorboard.CAP.InMemoryMessageQueue" Version="5.1.1" />
 		<PackageReference Include="Silkier" Version="1.0.345" />
 		<PackageReference Include="Silkier.AspNetCore" Version="1.0.345" />
 		<PackageReference Include="Silkier.EFCore" Version="1.0.345" />
@@ -106,7 +106,7 @@
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
-		<PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="3.0.15" />
+		<PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="3.0.16" />
 	</ItemGroup>
 	<ItemGroup>
 		<Compile Remove="Migrations\**" />

README.md

@@ -6,6 +6,10 @@
 
 IoTSharp is an open-source IoT platform for data collection, processing, visualization, and device management.
 
+## Here is a blessing for all users of this project
+ * May you do good and not evil.
+ * May you find forgiveness for yourself and forgive others.
+ * May you share freely, never taking more than you give.
 
 ## How to  install  IoTSharp using docker-compose  ?