diff --git a/Nirvana.Common/Extend/Ext.Convert.cs b/Nirvana.Common/Extend/Ext.Convert.cs
index e0e3180..ef3eaba 100644
--- a/Nirvana.Common/Extend/Ext.Convert.cs
+++ b/Nirvana.Common/Extend/Ext.Convert.cs
@@ -301,6 +301,11 @@ namespace Nirvana.Common
return string.IsNullOrEmpty(data) ? string.Empty : data.Replace(" ","");
}
+ public static string ToStrEmpty(this string data)
+ {
+ return string.IsNullOrEmpty(data) ? string.Empty : data.Trim();
+ }
+
#endregion
///
diff --git a/Waste.Application/ResultInfos/ResultService.cs b/Waste.Application/ResultInfos/ResultService.cs
index 63ac0ef..fd92927 100644
--- a/Waste.Application/ResultInfos/ResultService.cs
+++ b/Waste.Application/ResultInfos/ResultService.cs
@@ -47,7 +47,7 @@ namespace Waste.Application
List conModels = new List();
param.queryParam.ForEach(x =>
{
- var val = x.Value.ToStr();
+ var val = x.Value.ToStrEmpty();
if (!string.IsNullOrEmpty(val))
{
if (x.Name.ToStr().ToLower() == "facecode")
diff --git a/Waste.Application/Waste.Application.xml b/Waste.Application/Waste.Application.xml
index 34331bf..59e2e3d 100644
--- a/Waste.Application/Waste.Application.xml
+++ b/Waste.Application/Waste.Application.xml
@@ -156,6 +156,13 @@
+
+
+ 增加推送消息
+
+
+
+
商户管理
@@ -489,6 +496,13 @@
+
+
+ 增加推送消息
+
+
+
+
重置密码
@@ -1897,6 +1911,13 @@
测试专用
+
+
+ 接收测试
+
+
+
+
垃圾分类列表
diff --git a/Waste.Core/Waste.Core.csproj b/Waste.Core/Waste.Core.csproj
index c9f53b4..478d121 100644
--- a/Waste.Core/Waste.Core.csproj
+++ b/Waste.Core/Waste.Core.csproj
@@ -15,11 +15,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/Waste.Doc/Waste.pdb b/Waste.Doc/Waste.pdb
index b280fa9..72bdec1 100644
--- a/Waste.Doc/Waste.pdb
+++ b/Waste.Doc/Waste.pdb
@@ -1,5 +1,5 @@
-
+
@@ -12,7 +12,7 @@
Waste
1619681546
Administrator
-1622450529
+1622604918
Hinse
[FolderOptions]
diff --git a/Waste.Doc/Waste.pdm b/Waste.Doc/Waste.pdm
index 72bdec1..bb238de 100644
--- a/Waste.Doc/Waste.pdm
+++ b/Waste.Doc/Waste.pdm
@@ -1,5 +1,5 @@
-
+
@@ -12,7 +12,7 @@
Waste
1619681546
Administrator
-1622604918
+1622606685
Hinse
[FolderOptions]
@@ -7294,9 +7294,176 @@ LABL 0 新宋体,8,N
+
+80F39E8A-CE37-45FF-AA28-3B7265A7986E
+W_BusinessPush
+W_BusinessPush
+1622606670
+Hinse
+1622617267
+Hinse
+商户消息推送
+
+
+
+C04377F8-599E-4393-8A6C-49D6F49ED56B
+BusinessId
+BusinessId
+1622606685
+Hinse
+1622606695
+Hinse
+uniqueidentifier
+1
+
+
+2674C3B4-914E-4BD1-B26D-562879586DB0
+PushUrl
+PushUrl
+1622606695
+Hinse
+1622606722
+Hinse
+推送地址
+varchar(200)
+200
+1
+
+
+A03405EE-EC8A-46F5-8C6B-496B54832041
+DevCode
+DevCode
+1622606714
+Hinse
+1622606753
+Hinse
+设备唯一编号
+varchar(50)
+50
+1
+
+
+BEFE4DB5-C30A-4205-A174-2A5A36AEFFDD
+DevName
+DevName
+1622606742
+Hinse
+1622606772
+Hinse
+设备名称
+nvarchar(100)
+100
+1
+
+
+2D79825F-36E1-451F-8E65-8EAB8ABB0C19
+Address
+Address
+1622606766
+Hinse
+1622606796
+Hinse
+设备地址
+nvarchar(200)
+200
+1
+
+
+8EC4E4EE-798E-49EF-8F59-5CAA8279AC65
+Weight
+Weight
+1622606791
+Hinse
+1622606920
+Hinse
+毛重
+decimal(18,2)
+18
+2
+1
+
+
+C3589E11-8F03-4B99-BFAF-E3C261E1EB51
+Tare
+Tare
+1622606914
+Hinse
+1622606937
+Hinse
+皮重
+decimal(18,2)
+18
+2
+1
+
+
+A95C497F-3D9A-4EF1-8664-198A6DD4A3C1
+PWeight
+PWeight
+1622606931
+Hinse
+1622606958
+Hinse
+净重
+decimal(18,2)
+18
+2
+1
+
+
+C7EF429C-884A-4C4C-9C90-87210D14B303
+Type
+Type
+1622606952
+Hinse
+1622606977
+Hinse
+垃圾类型
+nvarchar(50)
+50
+1
+
+
+38773DC2-20F4-4FA1-B2BA-10D5D7B2669E
+Time
+Time
+1622606968
+Hinse
+1622606990
+Hinse
+测量时间
+datetime
+1
+
+
+433D5F53-D212-49BF-8014-F8216561CFE0
+Cnt
+Cnt
+1622617247
+Hinse
+1622617277
+Hinse
+重试推送的次数
+int
+1
+
+
+B1C9A6D1-757A-4E30-AC4F-7704D8EFFD23
+CreateTime
+CreateTime
+1622606985
+Hinse
+1622607006
+Hinse
+添加时间
+datetime
+1
+
+
+
-
+
5728945A-1970-4CD5-B0BB-972845F49F99
PUBLIC
PUBLIC
@@ -7307,7 +7474,7 @@ LABL 0 新宋体,8,N
-
+
1FC152BA-25A4-4408-A3C4-4E73CB309440
Microsoft SQL Server 2012
MSSQLSRV2012
diff --git a/Waste.Web.Entry/Properties/PublishProfiles/waste.ybhdmob.com.pubxml.user b/Waste.Web.Entry/Properties/PublishProfiles/waste.ybhdmob.com.pubxml.user
index e5fa80b..6ae958f 100644
--- a/Waste.Web.Entry/Properties/PublishProfiles/waste.ybhdmob.com.pubxml.user
+++ b/Waste.Web.Entry/Properties/PublishProfiles/waste.ybhdmob.com.pubxml.user
@@ -5,6 +5,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<_PublishTargetUrl>D:\webpublish\waste.ybhdmob.com
- True|2021-06-02T07:08:52.8245632Z;True|2021-06-02T15:05:50.3614099+08:00;True|2021-06-02T14:59:32.3690948+08:00;True|2021-06-02T14:10:25.1182836+08:00;True|2021-06-02T14:09:54.9215833+08:00;True|2021-06-01T10:41:54.9488501+08:00;True|2021-06-01T10:38:56.0283198+08:00;True|2021-05-28T13:59:02.2308877+08:00;True|2021-05-28T11:56:26.6796406+08:00;True|2021-05-28T11:28:00.4087907+08:00;True|2021-05-27T16:18:09.5993838+08:00;True|2021-05-27T16:07:31.3484951+08:00;True|2021-05-27T11:30:37.9119310+08:00;True|2021-05-27T11:28:35.5374674+08:00;True|2021-05-27T08:00:09.1625592+08:00;True|2021-05-26T20:42:17.0852150+08:00;True|2021-05-26T20:36:49.7527415+08:00;True|2021-05-25T17:57:31.8791293+08:00;True|2021-05-25T13:49:29.6488978+08:00;True|2021-05-25T13:48:24.6686105+08:00;True|2021-05-25T13:25:41.2512493+08:00;True|2021-05-24T17:55:33.3800078+08:00;True|2021-05-20T14:35:30.6957985+08:00;True|2021-05-20T13:17:22.6192995+08:00;True|2021-05-20T10:51:38.1268169+08:00;True|2021-05-19T19:50:03.7000224+08:00;True|2021-05-19T19:44:27.2518811+08:00;True|2021-05-19T19:43:26.5916681+08:00;True|2021-05-19T19:36:29.3197365+08:00;True|2021-05-19T19:30:00.3802430+08:00;True|2021-05-19T17:55:23.7939835+08:00;True|2021-05-19T11:05:17.9043392+08:00;True|2021-05-19T10:19:38.4839988+08:00;True|2021-05-19T10:17:19.7430612+08:00;True|2021-05-19T10:13:23.0031721+08:00;True|2021-05-19T10:06:03.9881599+08:00;True|2021-05-18T14:39:03.8876574+08:00;True|2021-05-18T14:23:46.9818836+08:00;True|2021-05-18T14:19:56.2382079+08:00;True|2021-05-18T11:29:53.5497590+08:00;True|2021-05-18T11:16:18.0123853+08:00;True|2021-05-17T18:59:52.4159105+08:00;True|2021-05-17T18:53:37.9438984+08:00;True|2021-05-17T18:48:14.9625161+08:00;True|2021-05-17T17:46:03.7723404+08:00;True|2021-05-17T17:14:20.2312990+08:00;True|2021-05-17T16:44:34.5837616+08:00;True|2021-05-17T16:25:20.1087804+08:00;True|2021-05-17T11:35:27.9388562+08:00;
+ True|2021-06-04T06:46:02.2707457Z;True|2021-06-02T15:08:52.8245632+08:00;True|2021-06-02T15:05:50.3614099+08:00;True|2021-06-02T14:59:32.3690948+08:00;True|2021-06-02T14:10:25.1182836+08:00;True|2021-06-02T14:09:54.9215833+08:00;True|2021-06-01T10:41:54.9488501+08:00;True|2021-06-01T10:38:56.0283198+08:00;True|2021-05-28T13:59:02.2308877+08:00;True|2021-05-28T11:56:26.6796406+08:00;True|2021-05-28T11:28:00.4087907+08:00;True|2021-05-27T16:18:09.5993838+08:00;True|2021-05-27T16:07:31.3484951+08:00;True|2021-05-27T11:30:37.9119310+08:00;True|2021-05-27T11:28:35.5374674+08:00;True|2021-05-27T08:00:09.1625592+08:00;True|2021-05-26T20:42:17.0852150+08:00;True|2021-05-26T20:36:49.7527415+08:00;True|2021-05-25T17:57:31.8791293+08:00;True|2021-05-25T13:49:29.6488978+08:00;True|2021-05-25T13:48:24.6686105+08:00;True|2021-05-25T13:25:41.2512493+08:00;True|2021-05-24T17:55:33.3800078+08:00;True|2021-05-20T14:35:30.6957985+08:00;True|2021-05-20T13:17:22.6192995+08:00;True|2021-05-20T10:51:38.1268169+08:00;True|2021-05-19T19:50:03.7000224+08:00;True|2021-05-19T19:44:27.2518811+08:00;True|2021-05-19T19:43:26.5916681+08:00;True|2021-05-19T19:36:29.3197365+08:00;True|2021-05-19T19:30:00.3802430+08:00;True|2021-05-19T17:55:23.7939835+08:00;True|2021-05-19T11:05:17.9043392+08:00;True|2021-05-19T10:19:38.4839988+08:00;True|2021-05-19T10:17:19.7430612+08:00;True|2021-05-19T10:13:23.0031721+08:00;True|2021-05-19T10:06:03.9881599+08:00;True|2021-05-18T14:39:03.8876574+08:00;True|2021-05-18T14:23:46.9818836+08:00;True|2021-05-18T14:19:56.2382079+08:00;True|2021-05-18T11:29:53.5497590+08:00;True|2021-05-18T11:16:18.0123853+08:00;True|2021-05-17T18:59:52.4159105+08:00;True|2021-05-17T18:53:37.9438984+08:00;True|2021-05-17T18:48:14.9625161+08:00;True|2021-05-17T17:46:03.7723404+08:00;True|2021-05-17T17:14:20.2312990+08:00;True|2021-05-17T16:44:34.5837616+08:00;True|2021-05-17T16:25:20.1087804+08:00;True|2021-05-17T11:35:27.9388562+08:00;
\ No newline at end of file