recv添加network

2 增加默认模板；

Txgy.RBS.Framework/Models/RecvMqttModel.cs

@@ -15,8 +15,7 @@ namespace Txgy.RBS.Framework.Models
         public string log_level { get; set; }
         [JsonProperty("send2server")]    //recv配置：Send2Redis
         public string send2server { get; set; }
-        [JsonProperty("network")]    
-        public string network { get; set; }
+      
         [JsonProperty("MQTT.Server")]    //recv配置：MqttServer
         public string Server { get; set; }
         [JsonProperty("MQTT.Stations")]
@@ -25,6 +24,8 @@ namespace Txgy.RBS.Framework.Models
         public string Send81 { get; set; }
         [JsonProperty("dirstruct")]      
         public string dirstruct { get; set; }
+        [JsonProperty("MQTT.Network")]
+        public string Network { get; set; }
         [JsonProperty("Help")]
         public string Help { get; set; }
     }

Txgy.RBS.Server.WebApi/Controllers/ProjectInfoController.cs

@@ -152,7 +152,7 @@ namespace Txgy.RBS.Server.WebApi.Controllers
                     rec.savepath = Path.Combine(globalConfig.base_path, curProject.project_name, curProject.save_waves_path);
                     rec.send2server = (curProject.send_redis == 1) ? "YES" : "NO";
                     rec.Server = curProject.mqtt_server;
-                    rec.network=curProject.network;
+                    rec.Network = curProject.network;
                     List< StationNumVpnDTO> vpnList=new List< StationNumVpnDTO>();
                     foreach (var item in curProject.stationFile.stations)
                     {

program/apms/gw.apms.json

@@ -18,9 +18,7 @@
   "Main.area_id":4,
   "Main.content":"通知事件",
   "Main.push_key":"Y3qYFBQPMbfTt6m",
-  "RServer.host":"127.0.0.1",
-  "channels":[
-   {"network":"YA","station":"N026,N025,N021,N037,N040,N038,N008,N007,N009,N015,N013,N014","location":"06","channels":"SHZ:SHN:SHE"}],
+  "RServer.host":"127.0.0.1",  "channels":[ {"network":"YA","station":"N026,N025,N021,N037,N040,N038,N008,N007,N009,N015,N013,N014","location":"06","channels":"SHZ:SHN:SHE"}],
    "Group.z0": 0.5,
   "Locate.log_level" : "DEBUG",
   "Locate.work_path" :".",

program/recvmqtt/gw.recvmqtt.json

@@ -6,6 +6,7 @@
   "MQTT.Server":"127.0.0.1:1883",
   "MQTT.Stations":"vpn30,vpn31,vpn32,vpn33,vpn34,vpn35,vpn36,vpn37,vpn38,vpn39,vpn40,vpn41,vpn42,vpn43,vpn44,vpn45,vpn46,vpn47,vpn48,vpn49,vpn50,vpn51,vpn52,vpn53,vpn54,vpn55,vpn56,vpn57,vpn58,vpn59,vpn60,vpn61,vpn62,vpn63,vpn65,vpn66,vpn67,vpn68,vpn69,vpn70,vpn71,vpn72,vpn73,vpn74,vpn75",
   "MQTT.Send81":"NO",
+  "MQTT.Network":"GD",
  "dirstruct": "NMDHM",
  "Help":"dirstruct=NMDHM,save miniseed file;send2server=YES,send to redis server;MQTT.Send81=YES, send 3A0181 to station"
  

program/server/server_log.txt

@@ -98,3 +98,7 @@
 [14828] 23 Apr 21:45:11.837 * Running mode=standalone, port=6379.
 [14828] 23 Apr 21:45:11.837 # Server initialized
 [14828] 23 Apr 21:45:11.837 * Ready to accept connections
+[40004] 11 Sep 23:32:53.493 # oO0OoO0OoO0Oo Redis is starting oO0OoO0OoO0Oo
+[40004] 11 Sep 23:32:53.494 # Redis version=5.0.10, bits=64, commit=1c047b68, modified=0, pid=40004, just started
+[40004] 11 Sep 23:32:53.494 # Configuration loaded
+[40004] 11 Sep 23:32:53.495 # Could not create server TCP listening socket *:6379: bind: 操作成功完成。