yandaniu 3 tygodni temu
rodzic
commit
b72bd2bb3a

BIN
.vs/Ropin.Inspection.Api/FileContentIndex/d7bde189-1033-4a72-986f-80dd5d8c5a94.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/0dcdeb14-ccd8-4e2c-9a7a-1bb88eaf8e7f.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/7df11d16-ba3d-44ca-b21e-6de7483eba0c.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/d39f7628-1ed6-409e-a4a8-cd32f514edea.vsidx


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


+ 43 - 0
Ropin.Environmentally.DcsService/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/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/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 - 43
Ropin.Environmentally.DcsService/appsettings.json

@@ -5,47 +5,5 @@
       "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
-    }
   }
-}
+}

BIN
Ropin.Environmentally.DcsService/obj/Debug/net5.0/Ropin.Environmentally.DcsService.csproj.AssemblyReference.cache


+ 0 - 1
Ropin.Environmentally.VideoService/Startup.cs

@@ -38,7 +38,6 @@ namespace Ropin.Environmentally.VideoService
             Configuration = configuration;
             var logRepo = LogManager.GetRepository(Assembly.GetEntryAssembly());
             XmlConfigurator.Configure(logRepo, new FileInfo("log4net.config"));
-            LogManager.Shutdown();
         }
 
         public IConfiguration Configuration { get; }