多环境定义

Waste.Web.Entry/appsettings.Development.json

@@ -1,10 +1,7 @@
 {
-  "DetailedErrors": true,
+  "logfile": "e:/errlog/waste.ybhdmob.com", //日志文件路径
-  "Logging": {
+  "NirvanaConnection": "Server=123.60.2.99,4331;Database=waste;uid=jutian_user;pwd=jutian1qaz@WSX;",
-    "LogLevel": {
+  "RabbitmqSetting": { //rabbitmq配置
-      "Default": "Information",
+    "DBConnection": "Server=123.60.2.99,4331;Database=waste;uid=jutian_user;pwd=jutian1qaz@WSX;" //数据保存库
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
   }
 }

Waste.Web.Entry/appsettings.json

@@ -34,8 +34,8 @@
     "ClockSkew": 5, // 过期时间容错值，long 类型，单位秒，默认 5秒
     "Algorithm": "HS256" // 加密算法，string 类型，默认 SecurityAlgorithms.HmacSha256
   },
-  "logfile": "e:/errlog/waste.ybhdmob.com", //日志文件路径
+  "logfile": "d:/errlog/waste.ybhdmob.com", //日志文件路径
-  "NirvanaConnection": "Server=123.60.2.99,4331;Database=waste;uid=jutian_user;pwd=jutian1qaz@WSX;",
+  "NirvanaConnection": "Server=localhost,4331;Database=waste;uid=jutian_user;pwd=jutian1qaz@WSX;",
   "SZTestDevPlatSetting": { //苏州设备接入平台设置,测试环境
     "ApiUrl": "https://bright.ljflytjl.cn:9101",
     "UserId": "18e76eb9-9154-4b43-bcfe-f80671ab8e79",
@@ -55,7 +55,7 @@
     "Port": 5672,
     "UserName": "liuzl",
     "Password": "liuzl",
-    "DBConnection": "Server=123.60.2.99,4331;Database=waste;uid=jutian_user;pwd=jutian1qaz@WSX;" //数据保存库
+    "DBConnection": "Server=localhost,4331;Database=waste;uid=jutian_user;pwd=jutian1qaz@WSX;" //数据保存库
   },
   "IsTask": "false", //定时任务是否开启
   "SoftName": "巨鼎物联网数字平台", //软件名称
@@ -64,6 +64,5 @@
   "Version": "1.0", //软件版本
   "copyright": "巨鼎物联网数字平台", //版权所有
   "LoginProvider": "CookieAndSession", //登录信息保存位置
-  "LoginProviderKey": "waste_loginuserkey", //登录密钥
+  "LoginProviderKey": "waste_loginuserkey" //登录密钥
-  "APIURL": "http://waste.jt-sky.com" //接口请求域名
 }

WasteConsoleTest/WasteConsoleTest/Program.cs

@@ -17,8 +17,8 @@ namespace WasteConsoleTest
     class Program
     {
         private static WSocketClientHelp wSocketClient = null;
-        public static string Secret = "0eMqhAjefL0loGhH";
+        public static string Secret = "MbMH8rycrclA18ZH";
-        public static string SecretHash = "d28a95b3d5d85ef0";
+        public static string SecretHash = "ke3/kUj8Om9rXYYh2cnQ7QlA0f3bZyHkgDFmtMnA1N4==";
         public static string SocketURL = "wss://api.device.suzhou.ljflytjl.cn/device_rpc";
         static async Task Main(string[] args)
         {

WasteConsoleTest/WasteConsoleTest/WSocketClientHelp.cs

@@ -13,9 +13,9 @@ namespace WasteConsoleTest
         ClientWebSocket ws = null;
         Uri uri = null;
         bool isUserClose = false;//是否最后由用户手动关闭
-        public static string Secret = "3R3KMr113DLvK8rE";
+        public static string Secret = "MbMH8rycrclA18ZH";
-        public static string SecretHash = "svfw5C77P+XqyEgZHrLzs45gs9RgdeXXzf6XAqA3p94=";
+        public static string SecretHash = "ke3/kUj8Om9rXYYh2cnQ7QlA0f3bZyHkgDFmtMnA1N4=";
-        public static string deviceid = "08d961ee-22ae-40a6-8c14-a6b414f614a3";
+        public static string deviceid = "08d96e7b-a488-468d-8f54-8bf45dccb9b9";
 
         // <summary>
         /// WebSocket状态

WasteHexTest/obj/WasteHexTest.csproj.nuget.dgspec.json

@@ -54,7 +54,7 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.100\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.101\\RuntimeIdentifierGraph.json"
         }
       }
     }

WasteHexTest/obj/WasteHexTest.csproj.nuget.g.props

@@ -7,7 +7,7 @@
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
     <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.0.0</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.0.1</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />

WasteHexTest/obj/project.assets.json

@@ -60,7 +60,7 @@
             "privateAssets": "all"
           }
         },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.100\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.101\\RuntimeIdentifierGraph.json"
       }
     }
   }

WasteHexTest/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "KxR30MsrEe0B4uPY50ypQkAB7WkjYAQ2+TX/wblVFIFxljAgEcN32jo0JP5Vbzn2h3uchKlvOfnJxewST6yekQ==",
+  "dgSpecHash": "/i1boeyhGlP73OaHsTLDU+EcpQMD5lkJaOoK1RWxq6AelMtgIgMnUAk5xh9sroJ0UEXu+aKTxIfYSAsgYCC1AA==",
   "success": true,
   "projectFilePath": "H:\\liuzl_ybhdmob\\Waste\\WasteHexTest\\WasteHexTest.csproj",
   "expectedPackageFiles": [],