From a23d44d5b092bdb69d1798e7f4f4f578c3d91147 Mon Sep 17 00:00:00 2001
From: Hinse <756681202@qq.com>
Date: Thu, 5 Aug 2021 18:34:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Waste.Application/ThirdApiInfo/OpenAppService.cs |  5 ++++-
 Waste.Application/ThirdApiInfo/OpenService.cs    | 10 +++++-----
 Waste.Application/Waste.Application.xml          |  5 ++++-
 .../key-2ad4f2f5-cd6f-4503-bf63-24545e51ab25.xml | 16 ++++++++++++++++
 .../waste.ybhdmob.com.pubxml.user                |  2 +-
 Waste.Web.Entry/Waste.Web.Entry.csproj           |  2 ++
 Waste.Web.Entry/appsettings.json                 | 16 +++++++++++-----
 7 files changed, 43 insertions(+), 13 deletions(-)
 create mode 100644 Waste.Web.Entry/DataProtection/key-2ad4f2f5-cd6f-4503-bf63-24545e51ab25.xml

diff --git a/Waste.Application/ThirdApiInfo/OpenAppService.cs b/Waste.Application/ThirdApiInfo/OpenAppService.cs
index f447341..70d5428 100644
--- a/Waste.Application/ThirdApiInfo/OpenAppService.cs
+++ b/Waste.Application/ThirdApiInfo/OpenAppService.cs
@@ -201,11 +201,14 @@ namespace Waste.Application.ThirdApiInfo
         /// <summary>
         /// 正式升级
         /// </summary>
+        /// <param name="ecode">机器码</param>
+        /// <param name="myver">版本号</param>
+        /// <param name="type">类型</param>
         /// <returns></returns>
         [HttpGet]
         [QueryParameters]
         [Route("api/upgrade/get")]
-        public async Task<object> GetAsync(string type, string ecode = "")
+        public async Task<object> GetAsync(string type, string ecode = "",int myver=400)
         {
             string rootpath = _hostingEnvironment.WebRootPath;
             //读取文件,返回升级信息
diff --git a/Waste.Application/ThirdApiInfo/OpenService.cs b/Waste.Application/ThirdApiInfo/OpenService.cs
index 25594b2..f00f328 100644
--- a/Waste.Application/ThirdApiInfo/OpenService.cs
+++ b/Waste.Application/ThirdApiInfo/OpenService.cs
@@ -104,11 +104,11 @@ namespace Waste.Application.ThirdApiInfo
                     var weight = GetChsFromHex(weighthex);
                     returndata.type = TrashType(type);
                     returndata.Weight = weight.ToDouble();
-                    //检查体重是否为整数如:10.0这样的情况,需要去除小数点后的数据
-                    if (returndata.Weight == ((int)returndata.Weight).ToDouble())
-                    {
-                        returndata.Weight = returndata.Weight.ToDouble(0);
-                    }
+                    ////检查体重是否为整数如:10.0这样的情况,需要去除小数点后的数据
+                    //if (returndata.Weight == ((int)returndata.Weight).ToDouble())
+                    //{
+                    //    returndata.Weight = returndata.Weight.ToDouble(0);
+                    //}
                     returndata.IsSuccessed = true;
                     string[] paramlist = new string[] {
                 returndata.Weight.ToString(),returndata.trash,returndata.type.ToString(),returndata.ScanningTime.ToString(),returndata.status.ToString()
diff --git a/Waste.Application/Waste.Application.xml b/Waste.Application/Waste.Application.xml
index d3b4f6d..a20af6e 100644
--- a/Waste.Application/Waste.Application.xml
+++ b/Waste.Application/Waste.Application.xml
@@ -2184,10 +2184,13 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Waste.Application.ThirdApiInfo.OpenAppService.GetAsync(System.String,System.String)">
+        <member name="M:Waste.Application.ThirdApiInfo.OpenAppService.GetAsync(System.String,System.String,System.Int32)">
             <summary>
             正式升级
             </summary>
+            <param name="ecode">机器码</param>
+            <param name="myver">版本号</param>
+            <param name="type">类型</param>
             <returns></returns>
         </member>
         <member name="M:Waste.Application.ThirdApiInfo.OpenAppService.GetIsEnable(System.String)">
diff --git a/Waste.Web.Entry/DataProtection/key-2ad4f2f5-cd6f-4503-bf63-24545e51ab25.xml b/Waste.Web.Entry/DataProtection/key-2ad4f2f5-cd6f-4503-bf63-24545e51ab25.xml
new file mode 100644
index 0000000..212a689
--- /dev/null
+++ b/Waste.Web.Entry/DataProtection/key-2ad4f2f5-cd6f-4503-bf63-24545e51ab25.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<key id="2ad4f2f5-cd6f-4503-bf63-24545e51ab25" version="1">
+  <creationDate>2021-08-05T03:28:52.0618628Z</creationDate>
+  <activationDate>2021-08-05T07:39:25.3401395Z</activationDate>
+  <expirationDate>2021-11-03T03:28:51.9830805Z</expirationDate>
+  <descriptor deserializerType="Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AuthenticatedEncryptorDescriptorDeserializer, Microsoft.AspNetCore.DataProtection, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
+    <descriptor>
+      <encryption algorithm="AES_256_CBC" />
+      <validation algorithm="HMACSHA256" />
+      <masterKey p4:requiresEncryption="true" xmlns:p4="http://schemas.asp.net/2015/03/dataProtection">
+        <!-- Warning: the key below is in an unencrypted form. -->
+        <value>h0sU5D+m42j/VmQNrEigkskUguweDoR0On/ogFFf+Wpx0M2/MgVen8OgESHf35xj1sl6YAZuUDk25s9B+lekMg==</value>
+      </masterKey>
+    </descriptor>
+  </descriptor>
+</key>
\ No newline at end of file
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 310e0ab..78371ac 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.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>D:\webpublish\waste.ybhdmob.com</_PublishTargetUrl>
-    <History>True|2021-08-02T08:39:27.2332369Z;True|2021-08-02T15:07:40.7995318+08:00;True|2021-08-02T14:32:29.6885424+08:00;True|2021-08-02T14:31:18.6578543+08:00;True|2021-08-02T14:27:57.1301002+08:00;True|2021-08-02T10:55:40.3542370+08:00;True|2021-08-02T09:44:28.0994056+08:00;True|2021-08-01T13:49:38.4071985+08:00;True|2021-08-01T13:36:45.5372120+08:00;True|2021-08-01T11:00:19.6165520+08:00;True|2021-08-01T10:38:51.4029710+08:00;True|2021-07-31T20:27:53.6583811+08:00;True|2021-07-31T18:35:23.4214441+08:00;True|2021-07-31T17:34:14.0712243+08:00;True|2021-07-31T14:50:43.2065556+08:00;True|2021-07-30T17:59:30.2223340+08:00;True|2021-07-30T17:57:35.9412910+08:00;True|2021-07-30T17:07:58.3305971+08:00;True|2021-07-30T17:04:10.9244859+08:00;True|2021-07-30T17:02:12.1943634+08:00;True|2021-07-30T16:16:22.2838331+08:00;True|2021-07-30T15:05:26.5664155+08:00;True|2021-07-30T14:57:59.1966108+08:00;True|2021-07-30T14:54:25.8172908+08:00;True|2021-07-30T14:52:20.9209995+08:00;True|2021-07-30T14:35:29.5239463+08:00;True|2021-07-30T09:32:38.2676032+08:00;True|2021-07-30T09:14:42.6170851+08:00;True|2021-07-29T19:06:09.1449349+08:00;True|2021-06-11T08:16:29.9542894+08:00;True|2021-06-04T14:46:02.2707457+08:00;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>
+    <History>True|2021-08-03T03:16:02.7897282Z;True|2021-08-02T16:39:27.2332369+08:00;True|2021-08-02T15:07:40.7995318+08:00;True|2021-08-02T14:32:29.6885424+08:00;True|2021-08-02T14:31:18.6578543+08:00;True|2021-08-02T14:27:57.1301002+08:00;True|2021-08-02T10:55:40.3542370+08:00;True|2021-08-02T09:44:28.0994056+08:00;True|2021-08-01T13:49:38.4071985+08:00;True|2021-08-01T13:36:45.5372120+08:00;True|2021-08-01T11:00:19.6165520+08:00;True|2021-08-01T10:38:51.4029710+08:00;True|2021-07-31T20:27:53.6583811+08:00;True|2021-07-31T18:35:23.4214441+08:00;True|2021-07-31T17:34:14.0712243+08:00;True|2021-07-31T14:50:43.2065556+08:00;True|2021-07-30T17:59:30.2223340+08:00;True|2021-07-30T17:57:35.9412910+08:00;True|2021-07-30T17:07:58.3305971+08:00;True|2021-07-30T17:04:10.9244859+08:00;True|2021-07-30T17:02:12.1943634+08:00;True|2021-07-30T16:16:22.2838331+08:00;True|2021-07-30T15:05:26.5664155+08:00;True|2021-07-30T14:57:59.1966108+08:00;True|2021-07-30T14:54:25.8172908+08:00;True|2021-07-30T14:52:20.9209995+08:00;True|2021-07-30T14:35:29.5239463+08:00;True|2021-07-30T09:32:38.2676032+08:00;True|2021-07-30T09:14:42.6170851+08:00;True|2021-07-29T19:06:09.1449349+08:00;True|2021-06-11T08:16:29.9542894+08:00;True|2021-06-04T14:46:02.2707457+08:00;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>
 </Project>
\ No newline at end of file
diff --git a/Waste.Web.Entry/Waste.Web.Entry.csproj b/Waste.Web.Entry/Waste.Web.Entry.csproj
index b4fdcce..ce7dc04 100644
--- a/Waste.Web.Entry/Waste.Web.Entry.csproj
+++ b/Waste.Web.Entry/Waste.Web.Entry.csproj
@@ -23,4 +23,6 @@
     <ProjectReference Include="..\Waste.Web.Core\Waste.Web.Core.csproj" />
   </ItemGroup>
 
+  <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
+
 </Project>
diff --git a/Waste.Web.Entry/appsettings.json b/Waste.Web.Entry/appsettings.json
index dc01230..fb127f9 100644
--- a/Waste.Web.Entry/appsettings.json
+++ b/Waste.Web.Entry/appsettings.json
@@ -37,11 +37,17 @@
   "logfile": "e:/errlog/waste.ybhdmob.com", //日志文件路径
   //"NirvanaConnection":"Server=localhost,4331;Database=waste;uid=jutian_user;pwd=jutian1qaz@WSX;",
   "NirvanaConnection": "Server=123.60.2.99,4331;Database=waste;uid=jutian_user;pwd=jutian1qaz@WSX;",
-  "SZDevPlatSetting": { //苏州设备接入平台设置
-    "ApiUrl": "https://bright.ljflytjl.cn:9101",
-    "UserId": "18e76eb9-9154-4b43-bcfe-f80671ab8e79",
-    "ApiSecret": "1KXWKC1WA8V8eCDX",
-    "ApiSecretHash": "5567485e9458ee89"
+  //"SZDevPlatSetting": { //苏州设备接入平台设置,测试环境
+  //  "ApiUrl": "https://bright.ljflytjl.cn:9101",
+  //  "UserId": "18e76eb9-9154-4b43-bcfe-f80671ab8e79",
+  //  "ApiSecret": "1KXWKC1WA8V8eCDX",
+  //  "ApiSecretHash": "5567485e9458ee89"
+  //},
+  "SZDevPlatSetting": { //苏州设备接入平台设置,正式环境
+    "ApiUrl": "https://api.data.suzhou.ljflytjl.cn",
+    "UserId": "55863a65-a28c-4e7f-8835-1fa779e1eb9f",
+    "ApiSecret": "EtifGTppTL0TTjie",
+    "ApiSecretHash": "3f907fe05acb58c6"
   },
   "IsTask": "false", //定时任务是否开启
   "SoftName": "巨鼎物联网数字平台", //软件名称