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

Class/HttpServer.cs

@@ -22,7 +22,14 @@ namespace SunlightAggregationTerminal.Class
             DataReceived.ServerPassword = Password;
             DataReceived.ServerTerminal = Terminal;
 
-            await HttpClient(DataReceived.ServerIP);
+            if (string.IsNullOrWhiteSpace(ip))
+            {
+                App.GlobalData.LogNo = false;
+            }
+            else
+            {
+                await HttpClient(DataReceived.ServerIP);
+            }
         }
 
         public static async Task HttpClient(string url)
@@ -52,13 +59,13 @@ namespace SunlightAggregationTerminal.Class
                     await e.InvokeNext();
                 });
             });
-            config.ConfigurePlugins(a =>
+            /*config.ConfigurePlugins(a =>
             {
                 a.UseReconnection<TouchSocket.Http.HttpClient>(options =>
                 {
                     options.PollingInterval = TimeSpan.FromSeconds(3);
                 });
-            });
+            });*/
             #endregion
 
             //配置config
@@ -79,14 +86,11 @@ namespace SunlightAggregationTerminal.Class
                 Dat = Dat
             };
 
-            var t = JsonSerializer.Serialize(dat);
-            var p = httpclient.RemoteIPHost.Host;
-
             var request = new HttpRequest();
-            request.SetContent(new StringHttpContent(t, Encoding.UTF8, "application/scjson"))
+            request.SetContent(new StringHttpContent(JsonSerializer.Serialize(dat), Encoding.UTF8, "application/scjson"))
                 .InitHeaders()
                 .SetUrl("/api/user-report")
-                .SetHost(p)
+                .SetHost(httpclient.RemoteIPHost.Host)
                 .AsPost();
 
             // 创建一个超时操作，10秒后取消

Class/SQLiteConfig.cs

@@ -118,6 +118,12 @@ namespace SunlightAggregationTerminal.Class
                     string sql = "ALTER TABLE Users ADD COLUMN ServerID TEXT;";
                     SQLitedata.ExecuteNonQuery(sql, null);
                 }
+                // 检查 ServerID
+                if (!existingColumns.Contains("ServerHTTP"))
+                {
+                    string sql = "ALTER TABLE Users ADD COLUMN ServerHTTP TEXT;";
+                    SQLitedata.ExecuteNonQuery(sql, null);
+                }
                 // 检查 Group
                 if (!existingColumns.Contains("Groups"))
                 {
@@ -250,7 +256,12 @@ namespace SunlightAggregationTerminal.Class
                 {
                     string sql = "ALTER TABLE Server ADD COLUMN ServerID TEXT;";
                     SQLitedata.ExecuteNonQuery(sql, null);
-                }              
+                }    
+                if (!existingColumns.Contains("ServerHTTP"))
+                {
+                    string sql = "ALTER TABLE Server ADD COLUMN ServerHTTP TEXT;";
+                    SQLitedata.ExecuteNonQuery(sql, null);
+                }
             }
         }
         // --- 逻辑分支 表不存在，直接创建 ---
@@ -266,6 +277,7 @@ namespace SunlightAggregationTerminal.Class
                 Enterprise TEXT,
                 Department TEXT,
                 ServerID TEXT,
+                ServerHTTP TEXT,
                 Groups TEXT,
                 ProxyID TEXT,
                 LogNo BOOL DEFAULT (0),
@@ -307,7 +319,8 @@ namespace SunlightAggregationTerminal.Class
             CREATE TABLE Server (
                 START BOOL DEFAULT (0),
                 Server TEXT,
-                ServerID TEXT
+                ServerID TEXT,
+                ServerHTTP TEXT
             );";
 
             // 复用现有的 ExecuteNonQuery 方法