fix

punchnet/Core/SDLAPIClient.swift

@@ -34,7 +34,6 @@ struct SDLAPIClient {
         NSLog("response is: \(String(bytes: data, encoding: .utf8))")
         
         let apiResponse = try JSONDecoder().decode(SDLAPIResponse<T>.self, from: data)
-        
         if apiResponse.code == 0, let data = apiResponse.data {
             return data
         } else if let message = apiResponse.message {

punchnet/Views/Network/NetworkModel.swift

@@ -8,18 +8,8 @@
 import Foundation
 import Observation
 
-@Observable
+// 资源列表
-class NetworkModel {
+struct Resource: Codable {
-    
-    // 连接状态
-    enum ConnectState {
-        case waitAuth
-        case connected
-        case disconnected
-    }
-    
-    // 资源列表
-    struct Resource: Codable {
     var id: Int
     var name: String
     var url: String
@@ -31,15 +21,15 @@ class NetworkModel {
         case url
         case connectionStatus = "connection_status"
     }
-    }
+}
 
-    // 设备列表
+// 设备列表
-    struct Node: Codable {
+struct Node: Codable {
     var id: Int
     var name: String
     var ip: String
-        var system: String
+    var system: String?
-        var connectStatus: Int
+    var connectionStatus: String
 
     func hash(into hasher: inout Hasher) {
         hasher.combine(id)
@@ -50,15 +40,15 @@ class NetworkModel {
         case name
         case ip
         case system
-            case connectStatus = "connect_status"
+        case connectionStatus = "connection_status"
     }
 
     static func == (lhs: Self, rhs: Self) -> Bool {
         return lhs.id == rhs.id
     }
-    }
+}
 
-    struct NetworkContext: Codable {
+struct NetworkContext: Codable {
     let ip: String
     let resourceList: [Resource]
     let nodeList: [Node]
@@ -68,7 +58,35 @@ class NetworkModel {
         case resourceList = "resource_list"
         case nodeList = "node_list"
     }
+}
 
+// 节点详情
+struct NodeDetail: Codable {
+    let id: Int
+    let name: String
+    let ip: String
+    let system: String?
+    let connectionStatus: String
+    let resourceList: [Resource]
+    
+    enum CodingKeys: String, CodingKey {
+        case id
+        case name
+        case ip
+        case system
+        case connectionStatus = "connection_status"
+        case resourceList = "resource_list"
+    }
+}
+
+@Observable
+class NetworkModel {
+    
+    // 连接状态
+    enum ConnectState {
+        case waitAuth
+        case connected
+        case disconnected
     }
     
     // 状态管理
@@ -104,7 +122,6 @@ class NetworkModel {
         }
     }
     
-    @MainActor
     func connect(networkSession: UserContext.NetworkSession) async throws {
         let params: [String: Any] = [
             "client_id": SystemConfig.getClientId(),

punchnet/Views/Network/NetworkView.swift

@@ -159,13 +159,15 @@ struct NetworkDisconnctedView: View {
     
     // 执行登陆操作
     private func startVpn() async throws {
-        let clientId = SystemConfig.getClientId()
+        guard let networkSession = userContext.networkSession else {
+            return
+        }
         
-        let options = SystemConfig.getOptions(networkId: 8,
+        let options = SystemConfig.getOptions(networkId: UInt32(networkSession.networkId),
-                                              networkDomain: "punchnet.com",
+                                              networkDomain: networkSession.networkDomain,
-                                              ip: "10.211.179.1",
+                                              ip: "",
                                               maskLen: 24,
-                                              accessToken: "accessToken1234",
+                                              accessToken: networkSession.accessToken,
                                               identityId: 1234,
                                               hostname: "mysql",
                                               noticePort: 1234)
@@ -191,7 +193,7 @@ struct NetworkResourceGroupView: View {
 }
 
 struct NetworkResourceView: View {
-    var resource: NetworkModel.Resource
+    var resource: Resource
     
     var body: some View {
         VStack {
@@ -237,12 +239,12 @@ struct NetworkDeviceGroupView: View {
 }
 
 struct NetworkNodeHeadView: View {
-    var node: NetworkModel.Node
+    var node: Node
     
     var body: some View {
         VStack {
             HStack {
-                Text(node.connectStatus == 1 ? "yes" : "no")
+                Text(node.connectionStatus)
                 
                 Text(node.name)
                     .font(.system(size: 14, weight: .regular))
@@ -256,7 +258,9 @@ struct NetworkNodeHeadView: View {
 }
 
 struct NetworkNodeDetailView: View {
-    @Binding var node: NetworkModel.Node?
+    @Environment(UserContext.self) var userContext: UserContext
+    @Binding var node: Node?
+    @State private var resources: [Resource] = []
 
     var body: some View {
         Group {
@@ -265,40 +269,56 @@ struct NetworkNodeDetailView: View {
                     Section {
                         HStack {
                             Text("连接状态")
-                            
+                            Text("\(node.connectionStatus)")
-                            Text("\(node.connectStatus)")
-                            
                             Spacer()
                         }
                         
                         HStack {
                             Text("虚拟IPv4")
-                            
                             Text("\(node.ip)")
                             Spacer()
                         }
                         
                         HStack {
                             Text("操作系统")
-                            Text("\(node.system)")
+                            Text(node.system ?? "未知")
                             Spacer()
                         }
                     }
                     
-                    //                        Section("服务列表") {
+                    Section("服务列表") {
-                    //                            ForEach(device.resources, id: \.id) { resource in
+                        ForEach(resources, id: \.id) { resource in
-                    //                                HStack {
+                            HStack {
-                    //                                    Text("\(resource.name)")
+                                Text("\(resource.name)")
-                    //                                    Text("\(resource.schema)")
+                                Text("\(resource.url)")
-                    //                                }
+                            }
-                    //                            }
+                        }
-                    //                        }
+                    }
+                }
+                .task {
+                    await self.loadNodeResources()
                 }
             } else {
                 EmptyView()
             }
         }
     }
+    
+    private func loadNodeResources() async {
+        guard let networkSession = userContext.networkSession, let id = self.node?.id else {
+            return
+        }
+        
+        let params: [String: Any] = [
+            "client_id": SystemConfig.getClientId(),
+            "access_token": networkSession.accessToken,
+            "id": id
+        ]
+        
+        if let nodeDetail = try? await SDLAPIClient.doPost(path: "/get_node_resources", params: params, as: NodeDetail.self) {
+            self.resources = nodeDetail.resourceList
+        }
+    }
 }
 
 struct NetworkWaitAuthView: View {