Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightAggregationManager

ViewModel/MainWindowViewModel.cs

@@ -80,8 +80,10 @@ namespace SunlightAggregationManager.ViewModel
             }
 
             //运行数据库           
-            dataBase.Config(SQLIP, SQLNAME, SQMOD, SQLUSER, SQLPASWORD);              
+            dataBase.Config(SQLIP, SQLNAME, SQMOD, SQLUSER, SQLPASWORD);
 
+
+            Console.WriteLine(GetLocalIP.GetLocalIPv4Address().ToString());
             if (TCP_E == "1")//启动tcp(内网直连)
             {
                 int P1, P2;
@@ -96,9 +98,18 @@ namespace SunlightAggregationManager.ViewModel
                 }
                 catch (Exception) { P2 = 7790; }
 
-                Console.WriteLine(GetLocalIP.GetLocalIPv4Address().ToString());
                 _ = AsyncTcpServer.TcpMain(P1,P2);
             }
+            if (HTTP_E == "1")//启动tcp(内网直连)
+            {
+                int P1;
+                try
+                {
+                    P1 = int.Parse(Configini.IniReadvalue("NETWORK", "HTTP_PORT"));
+                }
+                catch (Exception) { P1 = 7791; }
+                _ = AsyncHttpServer.HttpMain(P1);
+            }
         }
 
         private void Machines_Updata(object sender, DataRowChangeEventArgs e)