diff --git a/Waste.Web.Entry/appsettings.Development.json b/Waste.Web.Entry/appsettings.Development.json index 5173757..6dee831 100644 --- a/Waste.Web.Entry/appsettings.Development.json +++ b/Waste.Web.Entry/appsettings.Development.json @@ -1,10 +1,7 @@ { - "DetailedErrors": true, - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } + "logfile": "e:/errlog/waste.ybhdmob.com", //日志文件路径 + "NirvanaConnection": "Server=123.60.2.99,4331;Database=waste;uid=jutian_user;pwd=jutian1qaz@WSX;", + "RabbitmqSetting": { //rabbitmq配置 + "DBConnection": "Server=123.60.2.99,4331;Database=waste;uid=jutian_user;pwd=jutian1qaz@WSX;" //数据保存库 } } diff --git a/Waste.Web.Entry/appsettings.json b/Waste.Web.Entry/appsettings.json index 94a0620..7410ca0 100644 --- a/Waste.Web.Entry/appsettings.json +++ b/Waste.Web.Entry/appsettings.json @@ -34,8 +34,8 @@ "ClockSkew": 5, // 杩囨湡鏃堕棿瀹归敊鍊硷紝long 绫诲瀷锛屽崟浣嶇锛岄粯璁 5绉 "Algorithm": "HS256" // 鍔犲瘑绠楁硶锛宻tring 绫诲瀷锛岄粯璁 SecurityAlgorithms.HmacSha256 }, - "logfile": "e:/errlog/waste.ybhdmob.com", //鏃ュ織鏂囦欢璺緞 - "NirvanaConnection": "Server=123.60.2.99,4331;Database=waste;uid=jutian_user;pwd=jutian1qaz@WSX;", + "logfile": "d:/errlog/waste.ybhdmob.com", //鏃ュ織鏂囦欢璺緞 + "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", //鐧诲綍瀵嗛挜 - "APIURL": "http://waste.jt-sky.com" //鎺ュ彛璇锋眰鍩熷悕 + "LoginProviderKey": "waste_loginuserkey" //鐧诲綍瀵嗛挜 } \ No newline at end of file diff --git a/WasteConsoleTest/WasteConsoleTest/Program.cs b/WasteConsoleTest/WasteConsoleTest/Program.cs index 2ab17e6..6d02f57 100644 --- a/WasteConsoleTest/WasteConsoleTest/Program.cs +++ b/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 SecretHash = "d28a95b3d5d85ef0"; + public static string Secret = "MbMH8rycrclA18ZH"; + public static string SecretHash = "ke3/kUj8Om9rXYYh2cnQ7QlA0f3bZyHkgDFmtMnA1N4=="; public static string SocketURL = "wss://api.device.suzhou.ljflytjl.cn/device_rpc"; static async Task Main(string[] args) { diff --git a/WasteConsoleTest/WasteConsoleTest/WSocketClientHelp.cs b/WasteConsoleTest/WasteConsoleTest/WSocketClientHelp.cs index 329836e..c91e622 100644 --- a/WasteConsoleTest/WasteConsoleTest/WSocketClientHelp.cs +++ b/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 SecretHash = "svfw5C77P+XqyEgZHrLzs45gs9RgdeXXzf6XAqA3p94="; - public static string deviceid = "08d961ee-22ae-40a6-8c14-a6b414f614a3"; + public static string Secret = "MbMH8rycrclA18ZH"; + public static string SecretHash = "ke3/kUj8Om9rXYYh2cnQ7QlA0f3bZyHkgDFmtMnA1N4="; + public static string deviceid = "08d96e7b-a488-468d-8f54-8bf45dccb9b9"; // /// WebSocket鐘舵 diff --git a/WasteHexTest/obj/Debug/net6.0/WasteHexTest.csproj.AssemblyReference.cache b/WasteHexTest/obj/Debug/net6.0/WasteHexTest.csproj.AssemblyReference.cache index deda557..b3002cd 100644 Binary files a/WasteHexTest/obj/Debug/net6.0/WasteHexTest.csproj.AssemblyReference.cache and b/WasteHexTest/obj/Debug/net6.0/WasteHexTest.csproj.AssemblyReference.cache differ diff --git a/WasteHexTest/obj/WasteHexTest.csproj.nuget.dgspec.json b/WasteHexTest/obj/WasteHexTest.csproj.nuget.dgspec.json index a9aeee9..21d47c3 100644 --- a/WasteHexTest/obj/WasteHexTest.csproj.nuget.dgspec.json +++ b/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" } } } diff --git a/WasteHexTest/obj/WasteHexTest.csproj.nuget.g.props b/WasteHexTest/obj/WasteHexTest.csproj.nuget.g.props index 2f02482..a54f2f9 100644 --- a/WasteHexTest/obj/WasteHexTest.csproj.nuget.g.props +++ b/WasteHexTest/obj/WasteHexTest.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(UserProfile)\.nuget\packages\ C:\Users\Administrator\.nuget\packages\ PackageReference - 6.0.0 + 6.0.1 diff --git a/WasteHexTest/obj/project.assets.json b/WasteHexTest/obj/project.assets.json index f7ee4e0..ac3eab8 100644 --- a/WasteHexTest/obj/project.assets.json +++ b/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" } } } diff --git a/WasteHexTest/obj/project.nuget.cache b/WasteHexTest/obj/project.nuget.cache index 0a3bf81..ca7338e 100644 --- a/WasteHexTest/obj/project.nuget.cache +++ b/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": [],