diff --git a/Epost.BLL/AddressstorageBLL.cs b/Epost.BLL/AddressstorageBLL.cs
index 7daf910..533e4a0 100644
--- a/Epost.BLL/AddressstorageBLL.cs
+++ b/Epost.BLL/AddressstorageBLL.cs
@@ -392,7 +392,6 @@ namespace Epost.BLL
{
return dal.QueryControlList(strwhere);
}
-
#endregion
#endregion
}
diff --git a/Epost.Model/ResultModel.cs b/Epost.Model/ResultModel.cs
index f69cb12..995630a 100644
--- 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; }
}
diff --git a/Epost.TestToolsWeb/Controllers/ServerController.cs b/Epost.TestToolsWeb/Controllers/ServerController.cs
index 4c9cc21..7aa0401 100644
--- 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());
}
diff --git a/Epost.TestToolsWeb/Epost.DPS.csproj.user b/Epost.TestToolsWeb/Epost.DPS.csproj.user
index b229933..b1a2138 100644
--- a/Epost.TestToolsWeb/Epost.DPS.csproj.user
+++ b/Epost.TestToolsWeb/Epost.DPS.csproj.user
@@ -10,8 +10,8 @@
~/Views/Shared/_EpostLayoutPage.cshtml
False
600
- E:\WORK\代码管理\播种\T系列分支\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml
- Debug|Any CPU
+ E:\WORK\代码管理\T系列\播种\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml
+ Release|Any CPU
diff --git a/Epost.TestToolsWeb/Global.asax.cs b/Epost.TestToolsWeb/Global.asax.cs
index 7005b80..5780dbc 100644
--- a/Epost.TestToolsWeb/Global.asax.cs
+++ b/Epost.TestToolsWeb/Global.asax.cs
@@ -27,10 +27,23 @@ namespace Epost.TestToolsWeb
}
-
-
-
+ ///
+ /// 跨域设置
+ ///
+ public void Application_BeginRequest()
+ {
+ //OPTIONS请求方法的主要作用：
+ //1、获取服务器支持的HTTP方法；也就是黑客经常用的方法。
+ //2、用来检查服务器的性能。如Ajax进行跨域请求是的预检，需要想另外一个域名的资源发送OPTIONS请求头，用以判断发送的请求是否安全
+ if (Request.Headers.AllKeys.Contains("Origin") && Request.HttpMethod == "OPTIONS")
+ {
+ //表示对输出的内容进行缓冲，执行page.Response.Flush()时，会等所有内容缓冲完毕，将内容发送到客户端
+ //这样就不会出错，造成页面卡死状态，让用户无限制等下去
+ Response.Flush();
+ }
+ }
+
}
}
diff --git a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
index 529e766..41a833a 100644
--- a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
+++ b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
@@ -7,7 +7,8 @@
<_PublishTargetUrl>D:\驿传\T系列
- 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;
+ 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;
+
@@ -32,19 +33,19 @@
04/04/2018 15:45:12
- 07/15/2022 16:57:09
+ 04/20/2023 10:35:48
- 07/15/2022 16:57:09
+ 04/20/2023 10:35:48
02/24/2020 15:29:24
- 07/15/2022 16:40:17
+ 04/20/2023 10:35:36
- 07/15/2022 16:40:17
+ 04/20/2023 10:35:36
04/29/2020 16:50:14
@@ -62,31 +63,31 @@
10/23/2017 13:15:20
- 07/15/2022 16:56:59
+ 04/20/2023 10:35:37
- 07/15/2022 16:56:59
+ 04/20/2023 10:35:37
08/26/2020 18:09:48
- 07/15/2022 16:40:18
+ 04/20/2023 10:35:36
- 07/15/2022 16:40:18
+ 04/20/2023 10:35:36
- 07/15/2022 16:57:02
+ 04/20/2023 10:35:39
- 07/15/2022 16:57:02
+ 04/20/2023 10:35:39
- 07/14/2022 16:43:42
+ 04/20/2023 10:35:36
- 07/14/2022 16:43:42
+ 04/20/2023 10:35:36
09/06/2018 11:57:11
@@ -112,6 +113,12 @@
08/09/2019 08:40:22
+
+ 04/19/2023 15:22:32
+
+
+ 04/19/2023 15:22:32
+
03/08/2017 19:26:22
@@ -5651,7 +5658,7 @@
05/30/2022 16:58:47
- 07/15/2022 16:57:03
+ 04/20/2023 10:35:44
04/04/2018 15:45:12
@@ -7571,7 +7578,7 @@
07/04/2022 14:22:38
- 07/12/2022 15:10:39
+ 04/20/2023 10:35:41
\ No newline at end of file
diff --git a/Epost.TestToolsWeb/Web.config b/Epost.TestToolsWeb/Web.config
index 7a688d8..e5369e9 100644
--- a/Epost.TestToolsWeb/Web.config
+++ b/Epost.TestToolsWeb/Web.config
@@ -11,7 +11,7 @@
-
+
@@ -57,6 +57,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -163,21 +175,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+