驱动程序更新到2.3.0正式版

magicdict · Oct 11, 2016 · 7644a80 · 7644a80
1 parent 4739a41
commit 7644a80
Show file tree

Hide file tree

Showing 21 changed files with 308 additions and 188 deletions.
diff --git a/.vs/restore.dg b/.vs/restore.dg
@@ -1,2 +1,3 @@
+#:E:\WorkSpace\MongoCola\MongoUtilityCore\MongoUtilityCore.xproj
 #:E:\WorkSpace\MongoCola\MongoColaWebAdmin\MongoColaWebAdmin.xproj
 E:\WorkSpace\MongoCola\MongoColaWebAdmin\MongoColaWebAdmin.xproj|E:\WorkSpace\MongoCola\MongoUtilityCore\MongoUtilityCore.xproj
diff --git a/Common/Common.csproj b/Common/Common.csproj
@@ -43,20 +43,20 @@
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.VisualBasic" />
-    <Reference Include="MongoDB.Bson, Version=2.3.0.149, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Bson.2.3.0-rc1\lib\net45\MongoDB.Bson.dll</HintPath>
+    <Reference Include="MongoDB.Bson, Version=2.3.0.157, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Bson.2.3.0\lib\net45\MongoDB.Bson.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MongoDB.Driver, Version=2.3.0.149, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Driver.2.3.0-rc1\lib\net45\MongoDB.Driver.dll</HintPath>
+    <Reference Include="MongoDB.Driver, Version=2.3.0.157, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Driver.2.3.0\lib\net45\MongoDB.Driver.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MongoDB.Driver.Core, Version=2.3.0.149, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Driver.Core.2.3.0-rc1\lib\net45\MongoDB.Driver.Core.dll</HintPath>
+    <Reference Include="MongoDB.Driver.Core, Version=2.3.0.157, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Driver.Core.2.3.0\lib\net45\MongoDB.Driver.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MongoDB.Driver.Legacy, Version=2.3.0.149, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\mongocsharpdriver.2.3.0-rc1\lib\net45\MongoDB.Driver.Legacy.dll</HintPath>
+    <Reference Include="MongoDB.Driver.Legacy, Version=2.3.0.157, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\mongocsharpdriver.2.3.0\lib\net45\MongoDB.Driver.Legacy.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Renci.SshNet, Version=2016.0.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">

diff --git a/Common/packages.config b/Common/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="mongocsharpdriver" version="2.3.0-rc1" targetFramework="net462" />
-  <package id="MongoDB.Bson" version="2.3.0-rc1" targetFramework="net462" />
-  <package id="MongoDB.Driver" version="2.3.0-rc1" targetFramework="net462" />
-  <package id="MongoDB.Driver.Core" version="2.3.0-rc1" targetFramework="net462" />
+  <package id="mongocsharpdriver" version="2.3.0" targetFramework="net462" />
+  <package id="MongoDB.Bson" version="2.3.0" targetFramework="net462" />
+  <package id="MongoDB.Driver" version="2.3.0" targetFramework="net462" />
+  <package id="MongoDB.Driver.Core" version="2.3.0" targetFramework="net462" />
   <package id="SSH.NET" version="2016.0.0" targetFramework="net462" />
 </packages>
diff --git a/FunctionForm/FunctionForm.csproj b/FunctionForm/FunctionForm.csproj
@@ -35,44 +35,44 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Accord, Version=3.2.3.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
-      <HintPath>..\packages\Accord.3.2.3-alpha\lib\net45\Accord.dll</HintPath>
+    <Reference Include="Accord, Version=3.3.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Accord.3.3.0\lib\net45\Accord.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Accord.Controls, Version=3.2.3.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
-      <HintPath>..\packages\Accord.Controls.3.2.3-alpha\lib\net45\Accord.Controls.dll</HintPath>
+    <Reference Include="Accord.Controls, Version=3.3.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Accord.Controls.3.3.0\lib\net45\Accord.Controls.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Accord.MachineLearning, Version=3.2.3.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
-      <HintPath>..\packages\Accord.MachineLearning.3.2.3-alpha\lib\net45\Accord.MachineLearning.dll</HintPath>
+    <Reference Include="Accord.MachineLearning, Version=3.3.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Accord.MachineLearning.3.3.0\lib\net45\Accord.MachineLearning.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Accord.Math, Version=3.2.3.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
-      <HintPath>..\packages\Accord.Math.3.2.3-alpha\lib\net45\Accord.Math.dll</HintPath>
+    <Reference Include="Accord.Math, Version=3.3.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Accord.Math.3.3.0\lib\net45\Accord.Math.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Accord.Math.Core, Version=3.2.3.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
-      <HintPath>..\packages\Accord.Math.3.2.3-alpha\lib\net45\Accord.Math.Core.dll</HintPath>
+    <Reference Include="Accord.Math.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Accord.Math.3.3.0\lib\net45\Accord.Math.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Accord.Statistics, Version=3.2.3.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
-      <HintPath>..\packages\Accord.Statistics.3.2.3-alpha\lib\net45\Accord.Statistics.dll</HintPath>
+    <Reference Include="Accord.Statistics, Version=3.3.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Accord.Statistics.3.3.0\lib\net45\Accord.Statistics.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MongoDB.Bson, Version=2.3.0.149, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Bson.2.3.0-rc1\lib\net45\MongoDB.Bson.dll</HintPath>
+    <Reference Include="MongoDB.Bson, Version=2.3.0.157, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Bson.2.3.0\lib\net45\MongoDB.Bson.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MongoDB.Driver, Version=2.3.0.149, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Driver.2.3.0-rc1\lib\net45\MongoDB.Driver.dll</HintPath>
+    <Reference Include="MongoDB.Driver, Version=2.3.0.157, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Driver.2.3.0\lib\net45\MongoDB.Driver.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MongoDB.Driver.Core, Version=2.3.0.149, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Driver.Core.2.3.0-rc1\lib\net45\MongoDB.Driver.Core.dll</HintPath>
+    <Reference Include="MongoDB.Driver.Core, Version=2.3.0.157, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Driver.Core.2.3.0\lib\net45\MongoDB.Driver.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MongoDB.Driver.Legacy, Version=2.3.0.149, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\mongocsharpdriver.2.3.0-rc1\lib\net45\MongoDB.Driver.Legacy.dll</HintPath>
+    <Reference Include="MongoDB.Driver.Legacy, Version=2.3.0.157, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\mongocsharpdriver.2.3.0\lib\net45\MongoDB.Driver.Legacy.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="MongoUtilityCore">
@@ -405,12 +405,12 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Accord.3.2.3-alpha\build\Accord.targets" Condition="Exists('..\packages\Accord.3.2.3-alpha\build\Accord.targets')" />
+  <Import Project="..\packages\Accord.3.3.0\build\Accord.targets" Condition="Exists('..\packages\Accord.3.3.0\build\Accord.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Accord.3.2.3-alpha\build\Accord.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Accord.3.2.3-alpha\build\Accord.targets'))" />
+    <Error Condition="!Exists('..\packages\Accord.3.3.0\build\Accord.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Accord.3.3.0\build\Accord.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/FunctionForm/packages.config b/FunctionForm/packages.config
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Accord" version="3.2.3-alpha" targetFramework="net462" />
-  <package id="Accord.Controls" version="3.2.3-alpha" targetFramework="net462" />
-  <package id="Accord.MachineLearning" version="3.2.3-alpha" targetFramework="net462" />
-  <package id="Accord.Math" version="3.2.3-alpha" targetFramework="net462" />
-  <package id="Accord.Statistics" version="3.2.3-alpha" targetFramework="net462" />
-  <package id="mongocsharpdriver" version="2.3.0-rc1" targetFramework="net462" />
-  <package id="MongoDB.Bson" version="2.3.0-rc1" targetFramework="net462" />
-  <package id="MongoDB.Driver" version="2.3.0-rc1" targetFramework="net462" />
-  <package id="MongoDB.Driver.Core" version="2.3.0-rc1" targetFramework="net462" />
+  <package id="Accord" version="3.3.0" targetFramework="net462" />
+  <package id="Accord.Controls" version="3.3.0" targetFramework="net462" />
+  <package id="Accord.MachineLearning" version="3.3.0" targetFramework="net462" />
+  <package id="Accord.Math" version="3.3.0" targetFramework="net462" />
+  <package id="Accord.Statistics" version="3.3.0" targetFramework="net462" />
+  <package id="mongocsharpdriver" version="2.3.0" targetFramework="net462" />
+  <package id="MongoDB.Bson" version="2.3.0" targetFramework="net462" />
+  <package id="MongoDB.Driver" version="2.3.0" targetFramework="net462" />
+  <package id="MongoDB.Driver.Core" version="2.3.0" targetFramework="net462" />
   <package id="ZedGraph" version="5.1.7" targetFramework="net45" />
 </packages>
diff --git a/MongoCola/MongoCola.csproj b/MongoCola/MongoCola.csproj
@@ -85,20 +85,20 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="MongoDB.Bson, Version=2.3.0.149, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Bson.2.3.0-rc1\lib\net45\MongoDB.Bson.dll</HintPath>
+    <Reference Include="MongoDB.Bson, Version=2.3.0.157, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Bson.2.3.0\lib\net45\MongoDB.Bson.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MongoDB.Driver, Version=2.3.0.149, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Driver.2.3.0-rc1\lib\net45\MongoDB.Driver.dll</HintPath>
+    <Reference Include="MongoDB.Driver, Version=2.3.0.157, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Driver.2.3.0\lib\net45\MongoDB.Driver.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MongoDB.Driver.Core, Version=2.3.0.149, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Driver.Core.2.3.0-rc1\lib\net45\MongoDB.Driver.Core.dll</HintPath>
+    <Reference Include="MongoDB.Driver.Core, Version=2.3.0.157, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Driver.Core.2.3.0\lib\net45\MongoDB.Driver.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MongoDB.Driver.Legacy, Version=2.3.0.149, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\mongocsharpdriver.2.3.0-rc1\lib\net45\MongoDB.Driver.Legacy.dll</HintPath>
+    <Reference Include="MongoDB.Driver.Legacy, Version=2.3.0.157, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\mongocsharpdriver.2.3.0\lib\net45\MongoDB.Driver.Legacy.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="MongoUtilityCore, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">

diff --git a/MongoCola/packages.config b/MongoCola/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="mongocsharpdriver" version="2.3.0-rc1" targetFramework="net462" />
-  <package id="MongoDB.Bson" version="2.3.0-rc1" targetFramework="net462" />
-  <package id="MongoDB.Driver" version="2.3.0-rc1" targetFramework="net462" />
-  <package id="MongoDB.Driver.Core" version="2.3.0-rc1" targetFramework="net462" />
+  <package id="mongocsharpdriver" version="2.3.0" targetFramework="net462" />
+  <package id="MongoDB.Bson" version="2.3.0" targetFramework="net462" />
+  <package id="MongoDB.Driver" version="2.3.0" targetFramework="net462" />
+  <package id="MongoDB.Driver.Core" version="2.3.0" targetFramework="net462" />
 </packages>
diff --git a/MongoColaWebAdmin/Utility.cs b/MongoColaWebAdmin/Utility.cs
@@ -0,0 +1,67 @@
+using MongoDB.Bson;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+namespace MongoColaWebAdmin
+{
+    public class Utility
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        struct BsonElementDesciption
+        {
+            /// <summary>
+            /// 名称
+            /// </summary>
+            public string name;
+            /// <summary>
+            /// 值
+            /// </summary>
+            public string value;
+            /// <summary>
+            /// 类型
+            /// </summary>
+            public string type;
+            /// <summary>
+            /// 子元素
+            /// </summary>
+            public BsonElementDesciption[] children;
+        }
+
+        /// <summary>
+        /// BsonDocument转Json字符串
+        /// </summary>
+        /// <param name="Datalist"></param>
+        /// <returns></returns>
+        static List<BsonElementDesciption> GetJsonDocList(List<BsonDocument> Datalist, string rootName)
+        {
+            var rtn = new List<BsonElementDesciption>();
+            foreach (var item in Datalist)
+            {
+                rtn.Add(GetJsonDocument(item, rootName));
+            }
+            return rtn;
+        }
+
+        /// <summary>
+        /// 获得一个Doc的Json
+        /// </summary>
+        /// <param name="doc"></param>
+        /// <returns></returns>
+        static BsonElementDesciption GetJsonDocument(BsonDocument doc, string rootName)
+        {
+            var rtn = new BsonElementDesciption();
+            rtn.name = rootName;
+            rtn.type = "Document";
+            if (doc.Elements.First().Name == MongoUtility.Basic.ConstMgr.KeyId)
+            {
+                rtn.value = doc.Elements.First().Value.ToString();
+            }
+            return rtn;
+        }
+    }
+}
diff --git a/MongoColaWebAdmin/project.json b/MongoColaWebAdmin/project.json
@@ -18,7 +18,8 @@
     "BundlerMinifier.Core": "2.2.281",
     "Microsoft.AspNetCore.Mvc": "1.0.1",
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.1",
-    "Microsoft.NETCore.App": "1.0.1"
+    "Microsoft.NETCore.App": "1.0.1",
+    "Newtonsoft.Json": "9.0.1"
   },
 
   "tools": {