Browse Source

Merge branch 'master' of http://192.168.3.18:3000/CallPro/EBook.git

namejr 4 years ago
parent
commit
9e56294512

+ 5 - 22
EBook.Web/EBook.Web.csproj

@@ -42,32 +42,19 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\..\..\..\word\FSCloud\V2.1\svn\code\PC\FSCModule\Website\DLL\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Web.Http.WebHost, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web.Services" />
@@ -126,6 +113,7 @@
     <Content Include="Html\P3.html" />
     <Content Include="Html\P4.html" />
     <Content Include="Html\P5.html" />
+    <Content Include="Html\P0.html" />
     <Content Include="Html\P6.html" />
     <Content Include="Images\dynaiselaba.gif" />
     <Content Include="Images\dynaiselaba.png" />
@@ -213,7 +201,6 @@
     <Content Include="Scripts\jquery.js" />
     <Content Include="Scripts\MarkKlg1.js" />
     <Content Include="Scripts\mtm_book.js" />
-    <Content Include="Scripts\OnlySelfUse.js" />
     <Content Include="Scripts\StudentAudiovisual.js" />
     <Content Include="Scripts\TextTraining.js" />
     <Content Include="Service\jquery.js" />
@@ -239,14 +226,13 @@
     <Content Include="TagWord\TextContent.html" />
     <Content Include="TagWord\TextTraining.css" />
     <Content Include="TagWord\TextTraining.js" />
+    <Content Include="TagWord\TextTraining1.js" />
     <Content Include="Temp.html" />
     <Content Include="Test.html" />
     <Content Include="Test\Test.aspx" />
     <Content Include="TextContent.html" />
     <Content Include="TxtStr\01.txt" />
     <Content Include="TxtStr\02.txt" />
-    <Content Include="TxtStr\2021412传统教材原文.txt" />
-    <Content Include="TxtStr\html.txt" />
     <Content Include="Web.config" />
   </ItemGroup>
   <ItemGroup>
@@ -294,7 +280,6 @@
     <Content Include="Lghp\GCZD.lghp" />
     <Content Include="Lghp\newduokong.lghp" />
     <Content Include="Lghp\jieduan.lghp" />
-    <Content Include="packages.config" />
     <None Include="Properties\PublishProfiles\WebEBook.pubxml" />
     <Content Include="TagWord\data\html.json" />
     <Content Include="TagWord\data\24960.json" />
@@ -309,9 +294,7 @@
       <DependentUpon>Web.config</DependentUpon>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Service References\" />
-  </ItemGroup>
+  <ItemGroup />
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

File diff suppressed because it is too large
+ 10 - 0
EBook.Web/TagWord/TextContent.html


File diff suppressed because it is too large
+ 1 - 0
EBook.Web/TagWord/TextTraining.js


File diff suppressed because it is too large
+ 2 - 0
EBook.Web/TagWord/TextTraining1.js


File diff suppressed because it is too large
+ 2 - 0
EBook.Web/html/P0.html


Some files were not shown because too many files changed in this diff