liuzl
/
Waste
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复tostr错误

This commit is contained in:
liuzl 2021-06-04 17:44:06 +08:00
parent 1c5a108514
commit 84bc97a847
7 changed files with 206 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Nirvana.Common/Extend/Ext.Convert.cs
View File

@ -301,6 +301,11 @@ namespace Nirvana.Common
return string.IsNullOrEmpty(data) ? string.Empty : data.Replace(" ",""); return string.IsNullOrEmpty(data) ? string.Empty : data.Replace(" ","");
} }
public static string ToStrEmpty(this string data)
{
return string.IsNullOrEmpty(data) ? string.Empty : data.Trim();
}
#endregion #endregion
/// <summary> /// <summary>

2
Waste.Application/ResultInfos/ResultService.cs
View File

@ -47,7 +47,7 @@ namespace Waste.Application
List<IConditionalModel> conModels = new List<IConditionalModel>(); List<IConditionalModel> conModels = new List<IConditionalModel>();
param.queryParam.ForEach(x => param.queryParam.ForEach(x =>
{ {
var val = x.Value.ToStr(); var val = x.Value.ToStrEmpty();
if (!string.IsNullOrEmpty(val)) if (!string.IsNullOrEmpty(val))
{ {
if (x.Name.ToStr().ToLower() == "facecode") if (x.Name.ToStr().ToLower() == "facecode")

21
Waste.Application/Waste.Application.xml
View File

@ -156,6 +156,13 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Waste.Application.BusinessApiService.InsertPushInfoAsync(Waste.Domain.W_BusinessPush)">
<summary>
增加推送消息
</summary>
<param name="data"></param>
<returns></returns>
</member>
<member name="T:Waste.Application.BusinessAppService"> <member name="T:Waste.Application.BusinessAppService">
<summary> <summary>
商户管理 商户管理
@ -489,6 +496,13 @@
<param name="ip"></param> <param name="ip"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Waste.Application.IBusinessApiService.InsertPushInfoAsync(Waste.Domain.W_BusinessPush)">
<summary>
增加推送消息
</summary>
<param name="data"></param>
<returns></returns>
</member>
<member name="M:Waste.Application.IBusinessService.ResetPwdAsync(System.Guid,System.String)"> <member name="M:Waste.Application.IBusinessService.ResetPwdAsync(System.Guid,System.String)">
<summary> <summary>
重置密码 重置密码
@ -1897,6 +1911,13 @@
测试专用 测试专用
</summary> </summary>
</member> </member>
<member name="M:Waste.Application.TestAppService.Subscribe(Waste.Application.BusinessApiS2CDto)">
<summary>
接收测试
</summary>
<param name="data"></param>
<returns></returns>
</member>
<member name="M:Waste.Application.IWasteService.GetTypeListAsync(Nirvana.Common.QueryParams)"> <member name="M:Waste.Application.IWasteService.GetTypeListAsync(Nirvana.Common.QueryParams)">
<summary> <summary>
垃圾分类列表 垃圾分类列表

10
Waste.Core/Waste.Core.csproj
View File

@ -15,11 +15,11 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Furion" Version="2.7.7" /> <PackageReference Include="Furion" Version="2.7.9" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="2.7.7" /> <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="2.7.9" />
<PackageReference Include="Furion.Extras.DatabaseAccessor.SqlSugar" Version="2.7.7" /> <PackageReference Include="Furion.Extras.DatabaseAccessor.SqlSugar" Version="2.7.9" />
<PackageReference Include="Furion.Extras.Logging.Serilog" Version="2.7.7" /> <PackageReference Include="Furion.Extras.Logging.Serilog" Version="2.7.9" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="2.7.7" /> <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="2.7.9" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
Waste.Doc/Waste.pdb
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?PowerDesigner AppLocale="UTF16" ID="{CE6E2FA3-BA82-4FC8-BCDD-8C9830EF68CF}" Label="" LastModificationDate="1622515958" Name="Waste" Objects="276" Symbols="16" Target="Microsoft SQL Server 2012" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?> <?PowerDesigner AppLocale="UTF16" ID="{CE6E2FA3-BA82-4FC8-BCDD-8C9830EF68CF}" Label="" LastModificationDate="1622604918" Name="Waste" Objects="280" Symbols="16" Target="Microsoft SQL Server 2012" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<!-- do not edit this file --> <!-- do not edit this file -->
<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object"> <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@ -12,7 +12,7 @@
<a:Code>Waste</a:Code> <a:Code>Waste</a:Code>
<a:CreationDate>1619681546</a:CreationDate> <a:CreationDate>1619681546</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1622450529</a:ModificationDate> <a:ModificationDate>1622604918</a:ModificationDate>
<a:Modifier>Hinse</a:Modifier> <a:Modifier>Hinse</a:Modifier>
<a:PackageOptionsText>[FolderOptions] <a:PackageOptionsText>[FolderOptions]

175
Waste.Doc/Waste.pdm
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?PowerDesigner AppLocale="UTF16" ID="{CE6E2FA3-BA82-4FC8-BCDD-8C9830EF68CF}" Label="" LastModificationDate="1622604918" Name="Waste" Objects="280" Symbols="16" Target="Microsoft SQL Server 2012" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?> <?PowerDesigner AppLocale="UTF16" ID="{CE6E2FA3-BA82-4FC8-BCDD-8C9830EF68CF}" Label="" LastModificationDate="1622617277" Name="Waste" Objects="293" Symbols="16" Target="Microsoft SQL Server 2012" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<!-- do not edit this file --> <!-- do not edit this file -->
<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object"> <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@ -12,7 +12,7 @@
<a:Code>Waste</a:Code> <a:Code>Waste</a:Code>
<a:CreationDate>1619681546</a:CreationDate> <a:CreationDate>1619681546</a:CreationDate>
<a:Creator>Administrator</a:Creator> <a:Creator>Administrator</a:Creator>
<a:ModificationDate>1622604918</a:ModificationDate> <a:ModificationDate>1622606685</a:ModificationDate>
<a:Modifier>Hinse</a:Modifier> <a:Modifier>Hinse</a:Modifier>
<a:PackageOptionsText>[FolderOptions] <a:PackageOptionsText>[FolderOptions]
@ -7294,9 +7294,176 @@ LABL 0 新宋体,8,N</a:FontList>
<o:Key Ref="o217"/> <o:Key Ref="o217"/>
</c:ClusterObject> </c:ClusterObject>
</o:Table> </o:Table>
<o:Table Id="o218">
<a:ObjectID>80F39E8A-CE37-45FF-AA28-3B7265A7986E</a:ObjectID>
<a:Name>W_BusinessPush</a:Name>
<a:Code>W_BusinessPush</a:Code>
<a:CreationDate>1622606670</a:CreationDate>
<a:Creator>Hinse</a:Creator>
<a:ModificationDate>1622617267</a:ModificationDate>
<a:Modifier>Hinse</a:Modifier>
<a:Comment>商户消息推送</a:Comment>
<a:TotalSavingCurrency/>
<c:Columns>
<o:Column Id="o219">
<a:ObjectID>C04377F8-599E-4393-8A6C-49D6F49ED56B</a:ObjectID>
<a:Name>BusinessId</a:Name>
<a:Code>BusinessId</a:Code>
<a:CreationDate>1622606685</a:CreationDate>
<a:Creator>Hinse</a:Creator>
<a:ModificationDate>1622606695</a:ModificationDate>
<a:Modifier>Hinse</a:Modifier>
<a:DataType>uniqueidentifier</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column>
<o:Column Id="o220">
<a:ObjectID>2674C3B4-914E-4BD1-B26D-562879586DB0</a:ObjectID>
<a:Name>PushUrl</a:Name>
<a:Code>PushUrl</a:Code>
<a:CreationDate>1622606695</a:CreationDate>
<a:Creator>Hinse</a:Creator>
<a:ModificationDate>1622606722</a:ModificationDate>
<a:Modifier>Hinse</a:Modifier>
<a:Comment>推送地址</a:Comment>
<a:DataType>varchar(200)</a:DataType>
<a:Length>200</a:Length>
<a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column>
<o:Column Id="o221">
<a:ObjectID>A03405EE-EC8A-46F5-8C6B-496B54832041</a:ObjectID>
<a:Name>DevCode</a:Name>
<a:Code>DevCode</a:Code>
<a:CreationDate>1622606714</a:CreationDate>
<a:Creator>Hinse</a:Creator>
<a:ModificationDate>1622606753</a:ModificationDate>
<a:Modifier>Hinse</a:Modifier>
<a:Comment>设备唯一编号</a:Comment>
<a:DataType>varchar(50)</a:DataType>
<a:Length>50</a:Length>
<a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column>
<o:Column Id="o222">
<a:ObjectID>BEFE4DB5-C30A-4205-A174-2A5A36AEFFDD</a:ObjectID>
<a:Name>DevName</a:Name>
<a:Code>DevName</a:Code>
<a:CreationDate>1622606742</a:CreationDate>
<a:Creator>Hinse</a:Creator>
<a:ModificationDate>1622606772</a:ModificationDate>
<a:Modifier>Hinse</a:Modifier>
<a:Comment>设备名称</a:Comment>
<a:DataType>nvarchar(100)</a:DataType>
<a:Length>100</a:Length>
<a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column>
<o:Column Id="o223">
<a:ObjectID>2D79825F-36E1-451F-8E65-8EAB8ABB0C19</a:ObjectID>
<a:Name>Address</a:Name>
<a:Code>Address</a:Code>
<a:CreationDate>1622606766</a:CreationDate>
<a:Creator>Hinse</a:Creator>
<a:ModificationDate>1622606796</a:ModificationDate>
<a:Modifier>Hinse</a:Modifier>
<a:Comment>设备地址</a:Comment>
<a:DataType>nvarchar(200)</a:DataType>
<a:Length>200</a:Length>
<a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column>
<o:Column Id="o224">
<a:ObjectID>8EC4E4EE-798E-49EF-8F59-5CAA8279AC65</a:ObjectID>
<a:Name>Weight</a:Name>
<a:Code>Weight</a:Code>
<a:CreationDate>1622606791</a:CreationDate>
<a:Creator>Hinse</a:Creator>
<a:ModificationDate>1622606920</a:ModificationDate>
<a:Modifier>Hinse</a:Modifier>
<a:Comment>毛重</a:Comment>
<a:DataType>decimal(18,2)</a:DataType>
<a:Length>18</a:Length>
<a:Precision>2</a:Precision>
<a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column>
<o:Column Id="o225">
<a:ObjectID>C3589E11-8F03-4B99-BFAF-E3C261E1EB51</a:ObjectID>
<a:Name>Tare</a:Name>
<a:Code>Tare</a:Code>
<a:CreationDate>1622606914</a:CreationDate>
<a:Creator>Hinse</a:Creator>
<a:ModificationDate>1622606937</a:ModificationDate>
<a:Modifier>Hinse</a:Modifier>
<a:Comment>皮重</a:Comment>
<a:DataType>decimal(18,2)</a:DataType>
<a:Length>18</a:Length>
<a:Precision>2</a:Precision>
<a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column>
<o:Column Id="o226">
<a:ObjectID>A95C497F-3D9A-4EF1-8664-198A6DD4A3C1</a:ObjectID>
<a:Name>PWeight</a:Name>
<a:Code>PWeight</a:Code>
<a:CreationDate>1622606931</a:CreationDate>
<a:Creator>Hinse</a:Creator>
<a:ModificationDate>1622606958</a:ModificationDate>
<a:Modifier>Hinse</a:Modifier>
<a:Comment>净重</a:Comment>
<a:DataType>decimal(18,2)</a:DataType>
<a:Length>18</a:Length>
<a:Precision>2</a:Precision>
<a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column>
<o:Column Id="o227">
<a:ObjectID>C7EF429C-884A-4C4C-9C90-87210D14B303</a:ObjectID>
<a:Name>Type</a:Name>
<a:Code>Type</a:Code>
<a:CreationDate>1622606952</a:CreationDate>
<a:Creator>Hinse</a:Creator>
<a:ModificationDate>1622606977</a:ModificationDate>
<a:Modifier>Hinse</a:Modifier>
<a:Comment>垃圾类型</a:Comment>
<a:DataType>nvarchar(50)</a:DataType>
<a:Length>50</a:Length>
<a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column>
<o:Column Id="o228">
<a:ObjectID>38773DC2-20F4-4FA1-B2BA-10D5D7B2669E</a:ObjectID>
<a:Name>Time</a:Name>
<a:Code>Time</a:Code>
<a:CreationDate>1622606968</a:CreationDate>
<a:Creator>Hinse</a:Creator>
<a:ModificationDate>1622606990</a:ModificationDate>
<a:Modifier>Hinse</a:Modifier>
<a:Comment>测量时间</a:Comment>
<a:DataType>datetime</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column>
<o:Column Id="o229">
<a:ObjectID>433D5F53-D212-49BF-8014-F8216561CFE0</a:ObjectID>
<a:Name>Cnt</a:Name>
<a:Code>Cnt</a:Code>
<a:CreationDate>1622617247</a:CreationDate>
<a:Creator>Hinse</a:Creator>
<a:ModificationDate>1622617277</a:ModificationDate>
<a:Modifier>Hinse</a:Modifier>
<a:Comment>重试推送的次数</a:Comment>
<a:DataType>int</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column>
<o:Column Id="o230">
<a:ObjectID>B1C9A6D1-757A-4E30-AC4F-7704D8EFFD23</a:ObjectID>
<a:Name>CreateTime</a:Name>
<a:Code>CreateTime</a:Code>
<a:CreationDate>1622606985</a:CreationDate>
<a:Creator>Hinse</a:Creator>
<a:ModificationDate>1622607006</a:ModificationDate>
<a:Modifier>Hinse</a:Modifier>
<a:Comment>添加时间</a:Comment>
<a:DataType>datetime</a:DataType>
<a:Column.Mandatory>1</a:Column.Mandatory>
</o:Column>
</c:Columns>
</o:Table>
</c:Tables> </c:Tables>
<c:DefaultGroups> <c:DefaultGroups>
<o:Group Id="o218"> <o:Group Id="o231">
<a:ObjectID>5728945A-1970-4CD5-B0BB-972845F49F99</a:ObjectID> <a:ObjectID>5728945A-1970-4CD5-B0BB-972845F49F99</a:ObjectID>
<a:Name>PUBLIC</a:Name> <a:Name>PUBLIC</a:Name>
<a:Code>PUBLIC</a:Code> <a:Code>PUBLIC</a:Code>
@ -7307,7 +7474,7 @@ LABL 0 新宋体,8,N</a:FontList>
</o:Group> </o:Group>
</c:DefaultGroups> </c:DefaultGroups>
<c:TargetModels> <c:TargetModels>
<o:TargetModel Id="o219"> <o:TargetModel Id="o232">
<a:ObjectID>1FC152BA-25A4-4408-A3C4-4E73CB309440</a:ObjectID> <a:ObjectID>1FC152BA-25A4-4408-A3C4-4E73CB309440</a:ObjectID>
<a:Name>Microsoft SQL Server 2012</a:Name> <a:Name>Microsoft SQL Server 2012</a:Name>
<a:Code>MSSQLSRV2012</a:Code> <a:Code>MSSQLSRV2012</a:Code>

2
Waste.Web.Entry/Properties/PublishProfiles/waste.ybhdmob.com.pubxml.user
View File

@ -5,6 +5,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<_PublishTargetUrl>D:\webpublish\waste.ybhdmob.com</_PublishTargetUrl> <_PublishTargetUrl>D:\webpublish\waste.ybhdmob.com</_PublishTargetUrl>
<History>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;</History> <History>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;</History>
</PropertyGroup> </PropertyGroup>
</Project> </Project>