From fbd7c2c16238bef7cd3b566775803b11adc4c410 Mon Sep 17 00:00:00 2001
From: jackchenyang <874821510@qq.com>
Date: Thu, 9 May 2024 18:42:02 +0800
Subject: [PATCH] 121221

---
 HJGL/.vs/HJGL/config/applicationhost.config | 4 ++--
 HJGL/BLL/BLL.csproj                         | 2 +-
 HJGL/BLL/app.config                         | 2 +-
 HJGL/BLL/packages.config                    | 2 +-
 HJGL/FineUIPro.Web/FineUIPro.Web.csproj     | 2 +-
 HJGL/FineUIPro.Web/Web.config               | 2 +-
 HJGL/Model/Model.csproj                     | 2 +-
 HJGL/WebApi/Web.config                      | 2 +-
 HJGL/WebApi/WebApi.csproj                   | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config
index 355bb89..08690fa 100644
--- a/HJGL/.vs/HJGL/config/applicationhost.config
+++ b/HJGL/.vs/HJGL/config/applicationhost.config
@@ -162,7 +162,7 @@
             </site>
             <site name="WebApi" id="2">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\WebApi" />
+                    <virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\WebApi" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:3862:localhost" />
@@ -234,7 +234,7 @@
             </site>
             <site name="FineUIPro.Web(8)" id="11">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\FineUIPro.Web" />
+                    <virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\FineUIPro.Web" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:50794:localhost" />
diff --git a/HJGL/BLL/BLL.csproj b/HJGL/BLL/BLL.csproj
index cbf305b..87fc54c 100644
--- a/HJGL/BLL/BLL.csproj
+++ b/HJGL/BLL/BLL.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BLL</RootNamespace>
     <AssemblyName>BLL</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>
     </SccProjectName>
diff --git a/HJGL/BLL/app.config b/HJGL/BLL/app.config
index 3e98c00..c764f53 100644
--- a/HJGL/BLL/app.config
+++ b/HJGL/BLL/app.config
@@ -8,4 +8,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/HJGL/BLL/packages.config b/HJGL/BLL/packages.config
index 8031f53..489eb34 100644
--- a/HJGL/BLL/packages.config
+++ b/HJGL/BLL/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net40" requireReinstallation="true" />
   <package id="NPOI" version="2.5.3" targetFramework="net461" />
   <package id="Portable.BouncyCastle" version="1.8.6" targetFramework="net461" />
   <package id="SharpZipLib" version="1.2.0" targetFramework="net461" />
diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
index 389359a..734d1dc 100644
--- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -12,7 +12,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FineUIPro.Web</RootNamespace>
     <AssemblyName>FineUIPro.Web</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <SccProjectName>
     </SccProjectName>
diff --git a/HJGL/FineUIPro.Web/Web.config b/HJGL/FineUIPro.Web/Web.config
index 92058ad..9ecdad1 100644
--- a/HJGL/FineUIPro.Web/Web.config
+++ b/HJGL/FineUIPro.Web/Web.config
@@ -51,7 +51,7 @@
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
       <add path="Reserved.ReportViewerWebControl.axd" verb="*" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" validate="false"/>
     </httpHandlers>
-    <compilation debug="true" targetFramework="4.6.1">
+    <compilation debug="true" targetFramework="4.8">
       <assemblies>
         <!--<add assembly="Microsoft.Build.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />-->
         <add assembly="System.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
diff --git a/HJGL/Model/Model.csproj b/HJGL/Model/Model.csproj
index 09a27bd..78bcf82 100644
--- a/HJGL/Model/Model.csproj
+++ b/HJGL/Model/Model.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Model</RootNamespace>
     <AssemblyName>Model</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>
     </SccProjectName>
diff --git a/HJGL/WebApi/Web.config b/HJGL/WebApi/Web.config
index 0f75593..fa4b215 100644
--- a/HJGL/WebApi/Web.config
+++ b/HJGL/WebApi/Web.config
@@ -27,7 +27,7 @@
       </system.Web>
   -->
   <system.web>
-    <compilation debug="false" targetFramework="4.6.1"/>
+    <compilation debug="false" targetFramework="4.8"/>
     <httpRuntime targetFramework="4.6.1"/>
   </system.web>
   <system.webServer>
diff --git a/HJGL/WebApi/WebApi.csproj b/HJGL/WebApi/WebApi.csproj
index 19ab4d2..0e1a2d7 100644
--- a/HJGL/WebApi/WebApi.csproj
+++ b/HJGL/WebApi/WebApi.csproj
@@ -14,7 +14,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WebApi</RootNamespace>
     <AssemblyName>WebApi</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />