From 80dec314faf7890f5a0650592079fb1bf8b95bfc Mon Sep 17 00:00:00 2001
From: MysticBoy <mysticboy@live.com>
Date: Fri, 11 Mar 2022 15:11:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dskia=20=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IoTSharp/Dockerfile          |  2 +-
 IoTSharp/IoTSharp.csproj     |  1 +
 IoTSharp/IoTSharp.xml        | 25 +++++++++++++++++++++++++
 appsettings.Development.json |  2 +-
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/IoTSharp/Dockerfile b/IoTSharp/Dockerfile
index 855a0fd5..5bf9814c 100644
--- a/IoTSharp/Dockerfile
+++ b/IoTSharp/Dockerfile
@@ -6,7 +6,7 @@ RUN echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bullseye main contrib
 	echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bullseye-updates main contrib non-free" >> /etc/apt/sources.list && \
 	echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bullseye-backports 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  apt-utils libgdiplus libc6-dev lsof net-tools wget sqlite3 python3      iputils-ping inetutils-tools  libssl-dev  libssl1.0.0 curl  && \
+    apt-get  -y   -q update   && apt-get install  -y   -q  apt-utils libgdiplus libc6-dev lsof net-tools wget sqlite3 python3      iputils-ping inetutils-tools  libssl-dev  libssl1.0.0 curl libfontconfig1 && \
 	apt-get autoremove -y &&  apt-get clean  &&  apt-get autoclean && rm  /var/cache/apt/* -rf &&  \
 	ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 #RUN curl -o TDengine-client.tar.gz "https://www.taosdata.com/download/download-gettingStarted.php?pkg=tdengine_linux&pkgName=TDengine-client-2.0.12.0-Linux-x64.tar.gz" && \
diff --git a/IoTSharp/IoTSharp.csproj b/IoTSharp/IoTSharp.csproj
index fa3c6dc2..9c8ca8fc 100644
--- a/IoTSharp/IoTSharp.csproj
+++ b/IoTSharp/IoTSharp.csproj
@@ -113,6 +113,7 @@
 		<PackageReference Include="SilkierQuartz" Version="5.0.309" />
 		<PackageReference Include="SilkierQuartz.Plugins.RecentHistory" Version="5.0.309" />
 		<PackageReference Include="SkiaSharp" Version="2.80.3" />
+		<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.80.3" />
 		<PackageReference Include="System.CodeDom" Version="6.0.0" />
 		<PackageReference Include="System.Collections" Version="4.3.0" />
 		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.16.0" />
diff --git a/IoTSharp/IoTSharp.xml b/IoTSharp/IoTSharp.xml
index f416c334..24e798d6 100644
--- a/IoTSharp/IoTSharp.xml
+++ b/IoTSharp/IoTSharp.xml
@@ -155,6 +155,26 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="T:IoTSharp.Controllers.CaptchaController">
+            <summary>
+            登录验证码
+            </summary>
+        </member>
+        <member name="M:IoTSharp.Controllers.CaptchaController.Index(System.String)">
+            <summary>
+            生成一个图形认证
+            </summary>
+            <param name="clientid"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IoTSharp.Controllers.CaptchaController.Vertify(System.String,IoTSharp.Models.ModelCaptchaVertify)">
+            <summary>
+            校验图形认证
+            </summary>
+            <param name="clientid"></param>
+            <param name="m"></param>
+            <returns></returns>
+        </member>
         <member name="T:IoTSharp.Controllers.CustomersController">
             <summary>
             客户管理
@@ -201,6 +221,11 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="T:IoTSharp.Controllers.DeviceModelController">
+            <summary>
+            设备模型
+            </summary>
+        </member>
         <member name="T:IoTSharp.Controllers.DevicesController">
             <summary>
             设备管理
diff --git a/appsettings.Development.json b/appsettings.Development.json
index 27e80a28..e8fb912d 100644
--- a/appsettings.Development.json
+++ b/appsettings.Development.json
@@ -11,7 +11,7 @@
     }
   },
   "ConnectionStrings": {
-    "IoTSharp": "Server=pgsql;Database=IoTSharp;Username=postgres;Password=future;Pooling=true;MaxPoolSize=1024;",
+    "IoTSharp": "Server=pgsql;Database=IoTSharp1;Username=postgres;Password=future;Pooling=true;MaxPoolSize=1024;",
     "EventBusStore": "mongodb://root:kissme@mongodb:27017",
     "TelemetryStorage": "http://influx:8086/?org=iotsharp&bucket=iotsharp-bucket&token=koMHcRQ9PJVPIIb6zFyLt-06EkM_oy1jut08bH7f0BwC85LUO6zxgihKZUayHzyetapJEkxrlO0KwJ278dKpnA==&&latest=-72h",
     "EventBusMQ": "amqp://root:kissme@rabbitmq:5672"
-- 
GitLab