yandaniu пре 3 недеља
родитељ
комит
93ced0c13a
27 измењених фајлова са 162 додато и 32 уклоњено
  1. 0 0
      .vs/Ropin.Inspection.Api/FileContentIndex/9d449ad6-9baa-4099-82a6-afe91ca9a7ce.vsidx
  2. BIN
      .vs/Ropin.Inspection.Api/v17/.suo
  3. 1 1
      Ropin.Environmentally.DcsService/Ropin.Environmentally.DcsService.csproj.user
  4. BIN
      Ropin.Environmentally.DcsService/bin/Debug/net5.0/Ropin.Core.Common.dll
  5. BIN
      Ropin.Environmentally.DcsService/bin/Debug/net5.0/Ropin.Core.Common.pdb
  6. 9 0
      Ropin.Environmentally.DcsService/bin/Debug/net5.0/Ropin.Environmentally.DcsService.deps.json
  7. BIN
      Ropin.Environmentally.DcsService/bin/Debug/net5.0/Ropin.Environmentally.DcsService.dll
  8. BIN
      Ropin.Environmentally.DcsService/bin/Debug/net5.0/Ropin.Environmentally.DcsService.pdb
  9. BIN
      Ropin.Environmentally.DcsService/bin/Debug/net5.0/Ropin.Inspection.Common.dll
  10. BIN
      Ropin.Environmentally.DcsService/bin/Debug/net5.0/Ropin.Inspection.Common.pdb
  11. BIN
      Ropin.Environmentally.DcsService/bin/Debug/net5.0/Ropin.Inspection.Model.dll
  12. BIN
      Ropin.Environmentally.DcsService/bin/Debug/net5.0/Ropin.Inspection.Model.pdb
  13. BIN
      Ropin.Environmentally.DcsService/bin/Debug/net5.0/Ropin.Inspection.Repository.dll
  14. BIN
      Ropin.Environmentally.DcsService/bin/Debug/net5.0/Ropin.Inspection.Repository.pdb
  15. 43 0
      Ropin.Environmentally.DcsService/bin/Debug/net5.0/appsettings.Development.json
  16. 52 0
      Ropin.Environmentally.DcsService/bin/Debug/net5.0/appsettings.Production.json
  17. 52 0
      Ropin.Environmentally.DcsService/bin/Debug/net5.0/appsettings.Staging.json
  18. 1 29
      Ropin.Environmentally.DcsService/bin/Debug/net5.0/appsettings.json
  19. 1 1
      Ropin.Environmentally.DcsService/bin/Debug/net5.0/log4net.config
  20. 0 0
      Ropin.Environmentally.DcsService/bin/Debug/net5.0/logs/2025/202503/20250327.txt
  21. 0 0
      Ropin.Environmentally.DcsService/bin/Debug/net5.0/logs/2025/202503/20250327_error.txt
  22. 1 1
      Ropin.Environmentally.DcsService/obj/Debug/net5.0/Ropin.Environmentally.DcsService.csproj.CoreCompileInputs.cache
  23. 2 0
      Ropin.Environmentally.DcsService/obj/Debug/net5.0/Ropin.Environmentally.DcsService.csproj.FileListAbsolute.txt
  24. BIN
      Ropin.Environmentally.DcsService/obj/Debug/net5.0/Ropin.Environmentally.DcsService.dll
  25. BIN
      Ropin.Environmentally.DcsService/obj/Debug/net5.0/Ropin.Environmentally.DcsService.pdb
  26. BIN
      Ropin.Environmentally.DcsService/obj/Debug/net5.0/ref/Ropin.Environmentally.DcsService.dll
  27. BIN
      Ropin.Environmentally.DcsService/obj/Debug/net5.0/refint/Ropin.Environmentally.DcsService.dll

+ 0 - 0
.vs/Ropin.Inspection.Api/FileContentIndex/e4c5a2d9-ce96-4ffa-81d7-c18015308a94.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/9d449ad6-9baa-4099-82a6-afe91ca9a7ce.vsidx


BIN
.vs/Ropin.Inspection.Api/v17/.suo


+ 1 - 1
Ropin.Environmentally.DcsService/Ropin.Environmentally.DcsService.csproj.user

@@ -4,6 +4,6 @@
     <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup>
-    <ActiveDebugProfile>Docker</ActiveDebugProfile>
+    <ActiveDebugProfile>Ropin.Environmentally.DcsService</ActiveDebugProfile>
   </PropertyGroup>
 </Project>

BIN
Ropin.Environmentally.DcsService/bin/Debug/net5.0/Ropin.Core.Common.dll


BIN
Ropin.Environmentally.DcsService/bin/Debug/net5.0/Ropin.Core.Common.pdb


+ 9 - 0
Ropin.Environmentally.DcsService/bin/Debug/net5.0/Ropin.Environmentally.DcsService.deps.json

@@ -37,6 +37,7 @@
           "InfluxData.Net": "8.0.1",
           "InitQ": "1.0.0.14",
           "MQTTnet.AspNetCore": "4.3.7.1207",
+          "Microsoft.VisualStudio.Azure.Containers.Tools.Targets": "1.17.2",
           "RabbitMQ.Client": "6.8.1",
           "Ropin.Core.Common": "1.0.0",
           "Ropin.Inspection.Common": "1.0.0",
@@ -880,6 +881,7 @@
           "lib/netstandard2.0/Microsoft.OpenApi.dll": {}
         }
       },
+      "Microsoft.VisualStudio.Azure.Containers.Tools.Targets/1.17.2": {},
       "Microsoft.Win32.Primitives/4.3.0": {
         "dependencies": {
           "Microsoft.NETCore.Platforms": "5.0.0",
@@ -4256,6 +4258,13 @@
       "path": "microsoft.openapi/1.2.3",
       "hashPath": "microsoft.openapi.1.2.3.nupkg.sha512"
     },
+    "Microsoft.VisualStudio.Azure.Containers.Tools.Targets/1.17.2": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-5daNXm8Hb016oETmuHXiW8jclmRR9CzM7XrOh2htYhQ/7AAYtqntZ1MrZkh09+JTtdjYdGsy2XIMPe9cg83x5w==",
+      "path": "microsoft.visualstudio.azure.containers.tools.targets/1.17.2",
+      "hashPath": "microsoft.visualstudio.azure.containers.tools.targets.1.17.2.nupkg.sha512"
+    },
     "Microsoft.Win32.Primitives/4.3.0": {
       "type": "package",
       "serviceable": true,

BIN
Ropin.Environmentally.DcsService/bin/Debug/net5.0/Ropin.Environmentally.DcsService.dll


BIN
Ropin.Environmentally.DcsService/bin/Debug/net5.0/Ropin.Environmentally.DcsService.pdb


BIN
Ropin.Environmentally.DcsService/bin/Debug/net5.0/Ropin.Inspection.Common.dll


BIN
Ropin.Environmentally.DcsService/bin/Debug/net5.0/Ropin.Inspection.Common.pdb


BIN
Ropin.Environmentally.DcsService/bin/Debug/net5.0/Ropin.Inspection.Model.dll


BIN
Ropin.Environmentally.DcsService/bin/Debug/net5.0/Ropin.Inspection.Model.pdb


BIN
Ropin.Environmentally.DcsService/bin/Debug/net5.0/Ropin.Inspection.Repository.dll


BIN
Ropin.Environmentally.DcsService/bin/Debug/net5.0/Ropin.Inspection.Repository.pdb


+ 43 - 0
Ropin.Environmentally.DcsService/bin/Debug/net5.0/appsettings.Development.json

@@ -5,5 +5,48 @@
       "Microsoft": "Warning",
       "Microsoft.Hosting.Lifetime": "Information"
     }
+  },
+  "AllowedHosts": "*",
+  "ConnectionSetting": {
+    //"MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_Owner_20241213;sslMode=None",
+    //"RedisConnection": "60.204.212.71,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000",
+
+    "MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_Owner_20250319;sslMode=None",
+    "RedisConnection": "124.71.132.255:6379,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000"
+  },
+  "IniInflux": {
+    "infuxUrl": "http://124.71.132.255:8085/",
+    "infuxUser": "admin",
+    "infuxPwd": "123456"
+  },
+  "RabbitMQ": {
+    "QueueName": "rab.cmd.down.device.mqtt", //消息队列名称
+    "HostName": "124.71.132.255", //IP地址
+    "Port": 5673, //端口号
+    "UserName": "admin", //用户账号
+    "VirtualHost": "/",
+    "Password": "ropin@epe", //用户密码
+    "ExchangeName": "rab.cmd.down.device.mqtt.DirectExchange", //交换机名称【消息队列名称+.DirectExchange】
+    "RoutingKey": "rab.cmd.down.device.mqtt.key" //路由键【消息队列名称+.key】
+  },
+  "Cmd": {
+    "Mqtt": {
+      "Ip": "60.204.212.71",
+      "Port": 1883,
+      "UserName": "admin",
+      "Password": "public",
+      "Theme": "/cmd/down/device",
+      "JsonConfig": "[{'name':'gzzs','dataType':'int','group':'1'},{'name':'bj','dataType':'int','group':'1'},{'name':'zs','dataType':'int','group':'1'},{'name':'wd','dataType':'int','group':'1'},{'name':'fcnd','dataType':'int','group':'1'},{'name':'vocs','dataType':'int','group':'1'},{'name':'fs','dataType':'int','group':'1'},{'name':'sd','dataType':'int','group':'1'}]"
+    },
+    "Http": {
+      "clientId": "b19d14eeacb74522bd29627b79c18ab8",
+      "clientSecret": "7b89e021586c43d3b79440ba6eea0b67",
+      "Api": "https://fbox360.com/api/v2/dmon/value"
+    },
+    "Tcp": {
+      "Ip": "60.204.212.71",
+      "Port": 1883
+    }
   }
 }
+

+ 52 - 0
Ropin.Environmentally.DcsService/bin/Debug/net5.0/appsettings.Production.json

@@ -0,0 +1,52 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*",
+  "ConnectionSetting": {
+    //"MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_Owner_20241213;sslMode=None",
+    //"RedisConnection": "60.204.212.71,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000",
+
+    "MySqlConnection": "server=60.204.212.71;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_Owner_20250321;sslMode=None",
+    "RedisConnection": "60.204.212.71,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000,abortConnect=false"
+  },
+  "IniInflux": {
+    "infuxUrl": "http://124.71.132.255:8085/",
+    "infuxUser": "admin",
+    "infuxPwd": "123456"
+  },
+  "RabbitMQ": {
+    "QueueName": "rab.cmd.down.device.mqtt", //消息队列名称
+    "HostName": "60.204.212.71", //IP地址
+    "Port": 5673, //端口号
+    "UserName": "admin", //用户账号
+    "VirtualHost": "/",
+    "Password": "ropin@epe", //用户密码
+    "ExchangeName": "rab.cmd.down.device.mqtt.DirectExchange", //交换机名称【消息队列名称+.DirectExchange】
+    "RoutingKey": "rab.cmd.down.device.mqtt.key" //路由键【消息队列名称+.key】
+  },
+  "Cmd": {
+    "Mqtt": {
+      "Ip": "60.204.212.71",
+      "Port": 1883,
+      "UserName": "admin",
+      "Password": "public",
+      "Theme": "/cmd/down/device",
+      "JsonConfig": "[{'name':'gzzs','dataType':'int','group':'1'},{'name':'bj','dataType':'int','group':'1'},{'name':'zs','dataType':'int','group':'1'},{'name':'wd','dataType':'int','group':'1'},{'name':'fcnd','dataType':'int','group':'1'},{'name':'vocs','dataType':'int','group':'1'},{'name':'fs','dataType':'int','group':'1'},{'name':'sd','dataType':'int','group':'1'}]"
+    },
+    "Http": {
+      "clientId": "b19d14eeacb74522bd29627b79c18ab8",
+      "clientSecret": "7b89e021586c43d3b79440ba6eea0b67",
+      "Api": "https://fbox360.com/api/v2/dmon/value"
+    },
+    "Tcp": {
+      "Ip": "60.204.212.71",
+      "Port": 1883
+    }
+  }
+}
+

+ 52 - 0
Ropin.Environmentally.DcsService/bin/Debug/net5.0/appsettings.Staging.json

@@ -0,0 +1,52 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*",
+  "ConnectionSetting": {
+    //"MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_Owner_20241213;sslMode=None",
+    //"RedisConnection": "60.204.212.71,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000",
+
+    "MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_Owner_20250319;sslMode=None",
+    "RedisConnection": "124.71.132.255:6379,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000"
+  },
+  "IniInflux": {
+    "infuxUrl": "http://124.71.132.255:8085/",
+    "infuxUser": "admin",
+    "infuxPwd": "123456"
+  },
+  "RabbitMQ": {
+    "QueueName": "rab.cmd.down.device.mqtt", //消息队列名称
+    "HostName": "124.71.132.255", //IP地址
+    "Port": 5673, //端口号
+    "UserName": "admin", //用户账号
+    "VirtualHost": "/",
+    "Password": "ropin@epe", //用户密码
+    "ExchangeName": "rab.cmd.down.device.mqtt.DirectExchange", //交换机名称【消息队列名称+.DirectExchange】
+    "RoutingKey": "rab.cmd.down.device.mqtt.key" //路由键【消息队列名称+.key】
+  },
+  "Cmd": {
+    "Mqtt": {
+      "Ip": "60.204.212.71",
+      "Port": 1883,
+      "UserName": "admin",
+      "Password": "public",
+      "Theme": "/cmd/down/device",
+      "JsonConfig": "[{'name':'gzzs','dataType':'int','group':'1'},{'name':'bj','dataType':'int','group':'1'},{'name':'zs','dataType':'int','group':'1'},{'name':'wd','dataType':'int','group':'1'},{'name':'fcnd','dataType':'int','group':'1'},{'name':'vocs','dataType':'int','group':'1'},{'name':'fs','dataType':'int','group':'1'},{'name':'sd','dataType':'int','group':'1'}]"
+    },
+    "Http": {
+      "clientId": "b19d14eeacb74522bd29627b79c18ab8",
+      "clientSecret": "7b89e021586c43d3b79440ba6eea0b67",
+      "Api": "https://fbox360.com/api/v2/dmon/value"
+    },
+    "Tcp": {
+      "Ip": "60.204.212.71",
+      "Port": 1883
+    }
+  }
+}
+

+ 1 - 29
Ropin.Environmentally.DcsService/bin/Debug/net5.0/appsettings.json

@@ -5,33 +5,5 @@
       "Microsoft": "Warning",
       "Microsoft.Hosting.Lifetime": "Information"
     }
-  },
-  "AllowedHosts": "*",
-  "ConnectionSetting": {
-    "MySqlConnection": "server=120.26.5.167;user id=root;password=Ropin1234%$#@;port=8605;persistsecurityinfo=True;database=SH_HB_Test;sslMode=None",
-    "RedisConnection": "60.204.212.71,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000"
-  },
-  "IniInflux": {
-    "infuxUrl": "http://60.204.212.71:8085/",
-    "infuxUser": "admin",
-    "infuxPwd": "123456"
-  },
-  "RabbitMQ": {
-    "QueueName": "rab.cmd.down.device.mqtt", //消息队列名称
-    "HostName": "60.204.212.71", //IP地址
-    "Port": 5672, //端口号
-    "UserName": "guest", //用户账号
-    "VirtualHost": "/",
-    "Password": "guest" //用户密码
-  },
-  "Cmd": {
-    "Mqtt": {
-      "Ip": "60.204.212.71",
-      "Port": 1883,
-      "UserName": "admin",
-      "Password": "public",
-      "Theme": "/cmd/down/device",
-      "JsonConfig": "[{'name':'gzzs','dataType':'int','group':'1'},{'name':'bj','dataType':'int','group':'1'},{'name':'zs','dataType':'int','group':'1'},{'name':'wd','dataType':'int','group':'1'},{'name':'fcnd','dataType':'int','group':'1'},{'name':'vocs','dataType':'int','group':'1'},{'name':'fs','dataType':'int','group':'1'},{'name':'sd','dataType':'int','group':'1'}]"
-    }
   }
-}
+}

+ 1 - 1
Ropin.Environmentally.DcsService/bin/Debug/net5.0/log4net.config

@@ -64,7 +64,7 @@
 		</layout>
 	</appender>
 	<root>
-		<level value="TRACE" />
+		<level value="OFF" />
 		<appender-ref ref="RollingFileError" />
 		<appender-ref ref="RollingFileAll" />
 		<appender-ref ref="TraceAppender" />

+ 0 - 0
Ropin.Environmentally.DcsService/bin/Debug/net5.0/logs/2025/202503/20250327.txt


+ 0 - 0
Ropin.Environmentally.DcsService/bin/Debug/net5.0/logs/2025/202503/20250327_error.txt


+ 1 - 1
Ropin.Environmentally.DcsService/obj/Debug/net5.0/Ropin.Environmentally.DcsService.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-06f19a9b3bb233c93d1584dffbb1dc5092e581ec
+bcb9d96ab89f3bdfe1cbf6cf8eb77c3bbd71c598

+ 2 - 0
Ropin.Environmentally.DcsService/obj/Debug/net5.0/Ropin.Environmentally.DcsService.csproj.FileListAbsolute.txt

@@ -101,3 +101,5 @@ E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.DcsServi
 E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.DcsService\obj\Debug\net5.0\Ropin.Environmentally.DcsService.pdb
 E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.DcsService\obj\Debug\net5.0\Ropin.Environmentally.DcsService.genruntimeconfig.cache
 E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.DcsService\obj\Debug\net5.0\ref\Ropin.Environmentally.DcsService.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.DcsService\bin\Debug\net5.0\appsettings.Production.json
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.DcsService\bin\Debug\net5.0\appsettings.Staging.json

BIN
Ropin.Environmentally.DcsService/obj/Debug/net5.0/Ropin.Environmentally.DcsService.dll


BIN
Ropin.Environmentally.DcsService/obj/Debug/net5.0/Ropin.Environmentally.DcsService.pdb


BIN
Ropin.Environmentally.DcsService/obj/Debug/net5.0/ref/Ropin.Environmentally.DcsService.dll


BIN
Ropin.Environmentally.DcsService/obj/Debug/net5.0/refint/Ropin.Environmentally.DcsService.dll