2023-04-20 16:36:30 +08:00
parent ab8ac9cce6
commit 3a08c033ba
7 changed files with 63 additions and 38 deletions
--- a/Epost.BLL/AddressstorageBLL.cs
+++ b/Epost.BLL/AddressstorageBLL.cs
@ -392,7 +392,6 @@ namespace Epost.BLL
        {
            return dal.QueryControlList(strwhere);
        }
-
        #endregion
        #endregion
    }
--- a/Epost.Model/ResultModel.cs
+++ b/Epost.Model/ResultModel.cs
@ -109,6 +109,7 @@ namespace Epost.Model
    {
        public string wallNo { get; set; }
        public string lightType { get; set; }
+        public string lightColor { get; set; }
    }


--- a/Epost.TestToolsWeb/Controllers/ServerController.cs
+++ b/Epost.TestToolsWeb/Controllers/ServerController.cs
@ -10,6 +10,7 @@ using System.Web.Http;
 using LightContrl;
 
 using Epost.DAL.Cache;
+using System.Net;

 namespace Epost.DPS.Controllers
 {
@ -72,6 +73,11 @@ namespace Epost.DPS.Controllers



+                        }
+                        else {
+                            res.resultCode = "-1";
+                            res.resultMsg = "播种墙号错误";
+                            return res;
                        }
                    }
                }
@ -123,7 +129,7 @@ namespace Epost.DPS.Controllers
                                    }
                                    else
                                    {
-                                        bo = control.LED_ON(ipaddress, Address, "3", "0", "1");
+                                        bo = control.LED_ON(ipaddress, Address, "3", "0" , item.lightColor.Trim());
                                    }


--- a/Epost.TestToolsWeb/Epost.DPS.csproj.user
+++ b/Epost.TestToolsWeb/Epost.DPS.csproj.user
@ -10,8 +10,8 @@
    <WebStackScaffolding_LayoutPageFile>~/Views/Shared/_EpostLayoutPage.cshtml</WebStackScaffolding_LayoutPageFile>
    <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
    <WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
-    <NameOfLastUsedPublishProfile>E:\WORK\代码管理\播种\T系列分支\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml</NameOfLastUsedPublishProfile>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <NameOfLastUsedPublishProfile>E:\WORK\代码管理\T系列\播种\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml</NameOfLastUsedPublishProfile>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <Use64BitIISExpress />
    <IISExpressSSLPort />
    <IISExpressAnonymousAuthentication />
--- a/Epost.TestToolsWeb/Global.asax.cs
+++ b/Epost.TestToolsWeb/Global.asax.cs
@ -27,10 +27,23 @@ namespace Epost.TestToolsWeb

           
        }
-    

-       
-        
+        /// <summary>
+        /// 跨域设置
+        /// </summary>
+        public void Application_BeginRequest()
+        {
+            //OPTIONS请求方法的主要作用：
+            //1、获取服务器支持的HTTP方法；也就是黑客经常用的方法。
+            //2、用来检查服务器的性能。如Ajax进行跨域请求是的预检，需要想另外一个域名的资源发送OPTIONS请求头，用以判断发送的请求是否安全
+            if (Request.Headers.AllKeys.Contains("Origin") && Request.HttpMethod == "OPTIONS")
+            {
+                //表示对输出的内容进行缓冲，执行page.Response.Flush()时，会等所有内容缓冲完毕，将内容发送到客户端
+                //这样就不会出错，造成页面卡死状态，让用户无限制等下去
+                Response.Flush();
+            }
+        }
+

    }
 }
--- a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
+++ b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
@ -7,7 +7,8 @@
  <PropertyGroup>
    <TimeStampOfAssociatedLegacyPublishXmlFile />
    <_PublishTargetUrl>D:\驿传\T系列</_PublishTargetUrl>
-    <History>True|2022-07-15T08:41:13.9750291Z;True|2022-07-14T14:02:20.7983427+08:00;True|2022-07-13T17:40:22.7531000+08:00;True|2022-07-13T17:34:22.9908701+08:00;True|2022-07-13T17:30:06.3588502+08:00;True|2022-07-11T10:32:06.9053981+08:00;True|2021-04-26T10:07:37.4889549+08:00;True|2021-04-09T10:32:51.9130162+08:00;True|2021-04-09T10:31:50.4974012+08:00;</History>
+    <History>True|2023-04-20T02:35:53.5768979Z;True|2022-07-15T16:41:13.9750291+08:00;True|2022-07-14T14:02:20.7983427+08:00;True|2022-07-13T17:40:22.7531000+08:00;True|2022-07-13T17:34:22.9908701+08:00;True|2022-07-13T17:30:06.3588502+08:00;True|2022-07-11T10:32:06.9053981+08:00;True|2021-04-26T10:07:37.4889549+08:00;True|2021-04-09T10:32:51.9130162+08:00;True|2021-04-09T10:31:50.4974012+08:00;</History>
+    <LastFailureDetails />
  </PropertyGroup>
  <ItemGroup>
    <File Include="ApplicationInsights.config">
@ -32,19 +33,19 @@
      <publishTime>04/04/2018 15:45:12</publishTime>
    </File>
    <File Include="bin/App_global.asax.compiled">
-      <publishTime>07/15/2022 16:57:09</publishTime>
+      <publishTime>04/20/2023 10:35:48</publishTime>
    </File>
    <File Include="bin/App_global.asax.dll">
-      <publishTime>07/15/2022 16:57:09</publishTime>
+      <publishTime>04/20/2023 10:35:48</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>02/24/2020 15:29:24</publishTime>
    </File>
    <File Include="bin/Common.dll">
-      <publishTime>07/15/2022 16:40:17</publishTime>
+      <publishTime>04/20/2023 10:35:36</publishTime>
    </File>
    <File Include="bin/Common.pdb">
-      <publishTime>07/15/2022 16:40:17</publishTime>
+      <publishTime>04/20/2023 10:35:36</publishTime>
    </File>
    <File Include="bin/ComposerSDK.dll">
      <publishTime>04/29/2020 16:50:14</publishTime>
@ -62,31 +63,31 @@
      <publishTime>10/23/2017 13:15:20</publishTime>
    </File>
    <File Include="bin/Epost.BLL.dll">
-      <publishTime>07/15/2022 16:56:59</publishTime>
+      <publishTime>04/20/2023 10:35:37</publishTime>
    </File>
    <File Include="bin/Epost.BLL.pdb">
-      <publishTime>07/15/2022 16:56:59</publishTime>
+      <publishTime>04/20/2023 10:35:37</publishTime>
    </File>
    <File Include="bin/Epost.BLL.XmlSerializers.dll">
      <publishTime>08/26/2020 18:09:48</publishTime>
    </File>
    <File Include="bin/Epost.DAL.dll">
-      <publishTime>07/15/2022 16:40:18</publishTime>
+      <publishTime>04/20/2023 10:35:36</publishTime>
    </File>
    <File Include="bin/Epost.DAL.pdb">
-      <publishTime>07/15/2022 16:40:18</publishTime>
+      <publishTime>04/20/2023 10:35:36</publishTime>
    </File>
    <File Include="bin/Epost.DPS.dll">
-      <publishTime>07/15/2022 16:57:02</publishTime>
+      <publishTime>04/20/2023 10:35:39</publishTime>
    </File>
    <File Include="bin/Epost.DPS.pdb">
-      <publishTime>07/15/2022 16:57:02</publishTime>
+      <publishTime>04/20/2023 10:35:39</publishTime>
    </File>
    <File Include="bin/Epost.Model.dll">
-      <publishTime>07/14/2022 16:43:42</publishTime>
+      <publishTime>04/20/2023 10:35:36</publishTime>
    </File>
    <File Include="bin/Epost.Model.pdb">
-      <publishTime>07/14/2022 16:43:42</publishTime>
+      <publishTime>04/20/2023 10:35:36</publishTime>
    </File>
    <File Include="bin/Epost.TestToolsWeb.dll">
      <publishTime>09/06/2018 11:57:11</publishTime>
@ -112,6 +113,12 @@
    <File Include="bin/ICSharpCode.SharpZipLib.pdb">
      <publishTime>08/09/2019 08:40:22</publishTime>
    </File>
+    <File Include="bin/LightContrl.dll">
+      <publishTime>04/19/2023 15:22:32</publishTime>
+    </File>
+    <File Include="bin/LightContrl.pdb">
+      <publishTime>04/19/2023 15:22:32</publishTime>
+    </File>
    <File Include="bin/log4net.dll">
      <publishTime>03/08/2017 19:26:22</publishTime>
    </File>
@ -5651,7 +5658,7 @@
      <publishTime>05/30/2022 16:58:47</publishTime>
    </File>
    <File Include="PrecompiledApp.config">
-      <publishTime>07/15/2022 16:57:03</publishTime>
+      <publishTime>04/20/2023 10:35:44</publishTime>
    </File>
    <File Include="Scripts/ai.0.22.9-build00167.js">
      <publishTime>04/04/2018 15:45:12</publishTime>
@ -7571,7 +7578,7 @@
      <publishTime>07/04/2022 14:22:38</publishTime>
    </File>
    <File Include="Web.config">
-      <publishTime>07/12/2022 15:10:39</publishTime>
+      <publishTime>04/20/2023 10:35:41</publishTime>
    </File>
  </ItemGroup>
 </Project>
--- a/Epost.TestToolsWeb/Web.config
+++ b/Epost.TestToolsWeb/Web.config
@ -11,7 +11,7 @@
  </configSections>
  <connectionStrings>
    <add name="weijie_dpsEntities" connectionString="metadata=res://*/WJDB.csdl|res://*/WJDB.ssdl|res://*/WJDB.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=.;initial catalog=weijie_dps;user id=sa;password=123456;min pool size=4;max pool size=4;packet size=3072;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
-    <add name="SqlLocDPSConnection" connectionString="server=139.196.36.200;user id=EpostTest;password=antion;database=EpostTest_T;min pool size=512;max pool size=512;packet size=3072" providerName="System.Data.SqlClient" />
+    <add name="SqlLocDPSConnection" connectionString="server=139.196.36.200;user id=EpostTest;password=antion;database=taitan_dengdai;min pool size=512;max pool size=512;packet size=3072" providerName="System.Data.SqlClient" />
    <add name="MysqlLocDPSConnection" connectionString="Server=localhost;Port=3306;Database=world;User=root; Password=antion;SslMode=None;Pooling=true;Allow User Variables=True;" />

    <add name="WMSConnection" connectionString="data source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=139.196.36.200)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=EpostDB)));user id=C##Test;password=test" />
@ -57,6 +57,18 @@
    <sessionState mode="InProc" timeout="518400" />
  </system.web>
  <system.webServer>
+	  <!-- 跨域访问配置 -->
+	  <httpProtocol>
+		  <customHeaders>
+			  <!--相应类型（值为逗号分隔的一个字符串，表明服务器支持的所有跨域请求的方法）-->
+			  <add name="Access-Control-Allow-Methods" value="GET, POST, PUT, DELETE, OPTIONS"/>
+			  <!--响应头设置（Content-Type：只限于三个值application/x-www-form-urlencoded、multipart/form-data、text/plain）-->
+			  <add name="Access-Control-Allow-Headers" value="*"/>
+			  <!--允许跨域访问的网址-->
+			  <add name="Access-Control-Allow-Origin" value="*"/>
+			  <!--<add name="Access-Control-Allow-Origin" value="http://www.yabyy.com,http://bbs.yabyy.com"/>-->
+		  </customHeaders>
+	  </httpProtocol>
    <modules>
      <remove name="FormsAuthentication" />
      <remove name="ApplicationInsightsWebTracking" />
@ -163,21 +175,8 @@
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="System_Log" />
      </filter>
-      <filter type="log4net.Filter.DenyAllFilter" />
-
-
-
-
-
-
-    </appender>
-
-
-
-
-
-
-
+      <filter type="log4net.Filter.DenyAllFilter" /> 
+    </appender> 
    <appender name="SystemLogAppender_LightUp" type="log4net.Appender.RollingFileAppender">
      <file value="Log/System_Log/" />
      <appendToFile value="true" />