DFS_Shuo_Chen 1 săptămână în urmă
părinte
comite
65dd0a9bb9
32 a modificat fișierele cu 502 adăugiri și 233 ștergeri
  1. BIN
      mCardSystem/.vs/mCardSystem/CopilotIndices/17.13.444.19527/CodeChunks.db
  2. BIN
      mCardSystem/.vs/mCardSystem/CopilotIndices/17.13.444.19527/CodeChunks.db-wal
  3. BIN
      mCardSystem/.vs/mCardSystem/CopilotIndices/17.13.444.19527/SemanticSymbols.db
  4. BIN
      mCardSystem/.vs/mCardSystem/CopilotIndices/17.13.444.19527/SemanticSymbols.db-wal
  5. BIN
      mCardSystem/.vs/mCardSystem/v17/.suo
  6. 135 100
      mCardSystem/.vs/mCardSystem/v17/DocumentLayout.backup.json
  7. 118 99
      mCardSystem/.vs/mCardSystem/v17/DocumentLayout.json
  8. 12 6
      mCardSystem/mCardSystem/CardCancel.cs
  9. 12 2
      mCardSystem/mCardSystem/CloudResponse.cs
  10. 3 3
      mCardSystem/mCardSystem/HomePage.Designer.cs
  11. 9 3
      mCardSystem/mCardSystem/IssueCard.cs
  12. 0 1
      mCardSystem/mCardSystem/LoginDlg.cs
  13. 1 1
      mCardSystem/mCardSystem/Main.cs
  14. 23 6
      mCardSystem/mCardSystem/Program.cs
  15. 1 1
      mCardSystem/mCardSystem/Properties/PublishProfiles/FolderProfile.pubxml.user
  16. 16 8
      mCardSystem/mCardSystem/WebAPI.cs
  17. 1 1
      mCardSystem/mCardSystem/bin/x86/Debug/net8.0-windows/App.config
  18. BIN
      mCardSystem/mCardSystem/bin/x86/Debug/net8.0-windows/mCardSystem.dll
  19. BIN
      mCardSystem/mCardSystem/bin/x86/Debug/net8.0-windows/mCardSystem.exe
  20. BIN
      mCardSystem/mCardSystem/bin/x86/Debug/net8.0-windows/mCardSystem.pdb
  21. BIN
      mCardSystem/mCardSystem/bin/x86/Release/net8.0-windows/mCardSystem.dll
  22. BIN
      mCardSystem/mCardSystem/bin/x86/Release/net8.0-windows/mCardSystem.exe
  23. BIN
      mCardSystem/mCardSystem/bin/x86/Release/net8.0-windows/mCardSystem.pdb
  24. BIN
      mCardSystem/mCardSystem/bin/安装包/Setup.exe
  25. 169 0
      mCardSystem/mCardSystem/bin/安装包/setupfile.nsi
  26. BIN
      mCardSystem/mCardSystem/obj/x86/Debug/net8.0-windows/apphost.exe
  27. 1 1
      mCardSystem/mCardSystem/obj/x86/Debug/net8.0-windows/mCardSystem.AssemblyInfo.cs
  28. 1 1
      mCardSystem/mCardSystem/obj/x86/Debug/net8.0-windows/mCardSystem.AssemblyInfoInputs.cache
  29. BIN
      mCardSystem/mCardSystem/obj/x86/Debug/net8.0-windows/mCardSystem.dll
  30. BIN
      mCardSystem/mCardSystem/obj/x86/Debug/net8.0-windows/mCardSystem.pdb
  31. BIN
      mCardSystem/mCardSystem/obj/x86/Debug/net8.0-windows/ref/mCardSystem.dll
  32. BIN
      mCardSystem/mCardSystem/obj/x86/Debug/net8.0-windows/refint/mCardSystem.dll

BIN
mCardSystem/.vs/mCardSystem/CopilotIndices/17.13.444.19527/CodeChunks.db


BIN
mCardSystem/.vs/mCardSystem/CopilotIndices/17.13.444.19527/CodeChunks.db-wal


BIN
mCardSystem/.vs/mCardSystem/CopilotIndices/17.13.444.19527/SemanticSymbols.db


BIN
mCardSystem/.vs/mCardSystem/CopilotIndices/17.13.444.19527/SemanticSymbols.db-wal


BIN
mCardSystem/.vs/mCardSystem/v17/.suo


+ 135 - 100
mCardSystem/.vs/mCardSystem/v17/DocumentLayout.backup.json

@@ -3,16 +3,12 @@
   "WorkspaceRootPath": "C:\\bitbucket\\mCardSystem\\mCardSystem\\",
   "Documents": [
     {
-      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\webapi.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\webapi.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\tool.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\tool.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\homepage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
+      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\homepage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|C:\\bitbucket\\mCardSystem\\mCardSystem\\mcardsystem\\issuecard.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
-      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\issuecard.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
+      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|C:\\bitbucket\\mCardSystem\\mCardSystem\\mcardsystem\\main.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
+      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\main.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
     },
     {
       "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\issuecard.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -22,6 +18,14 @@
       "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\cardcancel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
       "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\cardcancel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
+    {
+      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|C:\\bitbucket\\mCardSystem\\mCardSystem\\mcardsystem\\cardcancel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
+      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\cardcancel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\webapi.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\webapi.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+    },
     {
       "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\logindlg.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
       "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\logindlg.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
@@ -31,20 +35,24 @@
       "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\logindlg.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\cloudresponse.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\cloudresponse.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|C:\\bitbucket\\mCardSystem\\mCardSystem\\mcardsystem\\cardcancel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
-      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\cardcancel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
+      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\main.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\main.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\cloudresponse.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\cloudresponse.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|C:\\bitbucket\\mCardSystem\\mCardSystem\\mcardsystem\\main.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
-      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\main.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
+      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\cardcancel.designer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\cardcancel.designer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\tool.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\tool.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
     {
       "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\changepassword.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -85,138 +93,112 @@
       "DocumentGroups": [
         {
           "DockedWidth": 307,
-          "SelectedChildIndex": 7,
+          "SelectedChildIndex": 0,
           "Children": [
             {
               "$type": "Document",
-              "DocumentIndex": 7,
-              "Title": "Program.cs",
-              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Program.cs",
-              "RelativeDocumentMoniker": "mCardSystem\\Program.cs",
-              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Program.cs",
-              "RelativeToolTip": "mCardSystem\\Program.cs",
-              "ViewState": "AgIAABQAAAAAAAAAAAAqwCEAAAAQAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-12-17T03:12:41.93Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 6,
-              "Title": "LoginDlg.cs [\u8BBE\u8BA1]",
-              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\LoginDlg.cs",
-              "RelativeDocumentMoniker": "mCardSystem\\LoginDlg.cs",
-              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\LoginDlg.cs [\u8BBE\u8BA1]",
-              "RelativeToolTip": "mCardSystem\\LoginDlg.cs [\u8BBE\u8BA1]",
+              "DocumentIndex": 0,
+              "Title": "HomePage.cs [\u8BBE\u8BA1]",
+              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\HomePage.cs",
+              "RelativeDocumentMoniker": "mCardSystem\\HomePage.cs",
+              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\HomePage.cs [\u8BBE\u8BA1]",
+              "RelativeToolTip": "mCardSystem\\HomePage.cs [\u8BBE\u8BA1]",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-12-26T09:46:52.091Z",
+              "WhenOpened": "2026-01-04T07:51:50.567Z",
               "EditorCaption": " [\u8BBE\u8BA1]"
             },
             {
               "$type": "Document",
               "DocumentIndex": 5,
-              "Title": "LoginDlg.cs",
-              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\LoginDlg.cs",
-              "RelativeDocumentMoniker": "mCardSystem\\LoginDlg.cs",
-              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\LoginDlg.cs",
-              "RelativeToolTip": "mCardSystem\\LoginDlg.cs",
-              "ViewState": "AgIAABIAAAAAAAAAAADgvxkAAAAOAAAAAAAAAA==",
+              "Title": "WebAPI.cs",
+              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\WebAPI.cs",
+              "RelativeDocumentMoniker": "mCardSystem\\WebAPI.cs",
+              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\WebAPI.cs",
+              "RelativeToolTip": "mCardSystem\\WebAPI.cs",
+              "ViewState": "AgIAAJAAAAAAAAAAAAAgwJsAAAAQAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-12-25T09:45:43.598Z",
+              "WhenOpened": "2025-12-25T09:33:57.723Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
               "DocumentIndex": 4,
-              "Title": "CardCancel.cs",
+              "Title": "CardCancel.cs [\u8BBE\u8BA1]",
               "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CardCancel.cs",
               "RelativeDocumentMoniker": "mCardSystem\\CardCancel.cs",
-              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CardCancel.cs",
-              "RelativeToolTip": "mCardSystem\\CardCancel.cs",
-              "ViewState": "AgIAAJAAAAAAAAAAAAAewJsAAAArAAAAAAAAAA==",
+              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CardCancel.cs [\u8BBE\u8BA1]",
+              "RelativeToolTip": "mCardSystem\\CardCancel.cs [\u8BBE\u8BA1]",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-12-18T03:52:52.665Z",
-              "EditorCaption": ""
+              "WhenOpened": "2025-12-30T09:53:09.382Z",
+              "EditorCaption": " [\u8BBE\u8BA1]"
             },
             {
               "$type": "Document",
-              "DocumentIndex": 3,
+              "DocumentIndex": 2,
               "Title": "IssueCard.cs",
               "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\IssueCard.cs",
               "RelativeDocumentMoniker": "mCardSystem\\IssueCard.cs",
               "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\IssueCard.cs",
               "RelativeToolTip": "mCardSystem\\IssueCard.cs",
-              "ViewState": "AgIAABIAAAAAAAAAAAAlwBkAAAAdAAAAAAAAAA==",
+              "ViewState": "AgIAAGwAAAAAAAAAAAAcwHYAAAAQAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
               "WhenOpened": "2025-12-18T03:52:22.733Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 2,
-              "Title": "IssueCard.cs [\u8BBE\u8BA1]",
-              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\IssueCard.cs",
-              "RelativeDocumentMoniker": "mCardSystem\\IssueCard.cs",
-              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\IssueCard.cs [\u8BBE\u8BA1]",
-              "RelativeToolTip": "mCardSystem\\IssueCard.cs [\u8BBE\u8BA1]",
+              "DocumentIndex": 11,
+              "Title": "CardCancel.Designer.cs",
+              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CardCancel.Designer.cs",
+              "RelativeDocumentMoniker": "mCardSystem\\CardCancel.Designer.cs",
+              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CardCancel.Designer.cs",
+              "RelativeToolTip": "mCardSystem\\CardCancel.Designer.cs",
+              "ViewState": "AgIAAEsAAAAAAAAAAAAiwFQAAAAlAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-12-17T08:02:24.037Z",
-              "EditorCaption": " [\u8BBE\u8BA1]"
+              "WhenOpened": "2026-01-04T07:04:46.237Z",
+              "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 1,
-              "Title": "Tool.cs",
-              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Tool.cs",
-              "RelativeDocumentMoniker": "mCardSystem\\Tool.cs",
-              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Tool.cs",
-              "RelativeToolTip": "mCardSystem\\Tool.cs",
-              "ViewState": "AgIAABsAAAAAAAAAAAAuwCcAAAAAAAAAAAAAAA==",
+              "DocumentIndex": 7,
+              "Title": "LoginDlg.cs [\u8BBE\u8BA1]",
+              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\LoginDlg.cs",
+              "RelativeDocumentMoniker": "mCardSystem\\LoginDlg.cs",
+              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\LoginDlg.cs [\u8BBE\u8BA1]",
+              "RelativeToolTip": "mCardSystem\\LoginDlg.cs [\u8BBE\u8BA1]",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-12-19T02:33:11.3Z",
-              "EditorCaption": ""
+              "WhenOpened": "2025-12-26T09:46:52.091Z",
+              "EditorCaption": " [\u8BBE\u8BA1]"
             },
             {
               "$type": "Document",
-              "DocumentIndex": 0,
-              "Title": "WebAPI.cs",
-              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\WebAPI.cs",
-              "RelativeDocumentMoniker": "mCardSystem\\WebAPI.cs",
-              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\WebAPI.cs*",
-              "RelativeToolTip": "mCardSystem\\WebAPI.cs*",
-              "ViewState": "AgIAAB0AAAAAAAAAAADwvxQAAAAkAAAAAAAAAA==",
+              "DocumentIndex": 6,
+              "Title": "LoginDlg.cs",
+              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\LoginDlg.cs",
+              "RelativeDocumentMoniker": "mCardSystem\\LoginDlg.cs",
+              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\LoginDlg.cs",
+              "RelativeToolTip": "mCardSystem\\LoginDlg.cs",
+              "ViewState": "AgIAABgAAAAAAAAAAADwvxwAAAAAAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-12-25T09:33:57.723Z",
+              "WhenOpened": "2025-12-25T09:45:43.598Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
               "DocumentIndex": 8,
-              "Title": "CardCancel.cs [\u8BBE\u8BA1]",
-              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CardCancel.cs",
-              "RelativeDocumentMoniker": "mCardSystem\\CardCancel.cs",
-              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CardCancel.cs [\u8BBE\u8BA1]",
-              "RelativeToolTip": "mCardSystem\\CardCancel.cs [\u8BBE\u8BA1]",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-12-30T09:53:09.382Z",
-              "EditorCaption": " [\u8BBE\u8BA1]"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 9,
               "Title": "CloudResponse.cs",
               "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CloudResponse.cs",
               "RelativeDocumentMoniker": "mCardSystem\\CloudResponse.cs",
               "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CloudResponse.cs",
               "RelativeToolTip": "mCardSystem\\CloudResponse.cs",
-              "ViewState": "AgIAAA4AAAAAAAAAAAAQwD8AAAAAAAAAAAAAAA==",
+              "ViewState": "AgIAAEcAAAAAAAAAAAAqwE8AAAAFAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
               "WhenOpened": "2025-12-25T09:38:39.007Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 10,
+              "DocumentIndex": 1,
               "Title": "Main.cs [\u8BBE\u8BA1]",
               "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Main.cs",
               "RelativeDocumentMoniker": "mCardSystem\\Main.cs",
@@ -228,7 +210,59 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 11,
+              "DocumentIndex": 3,
+              "Title": "CardCancel.cs",
+              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CardCancel.cs",
+              "RelativeDocumentMoniker": "mCardSystem\\CardCancel.cs",
+              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CardCancel.cs",
+              "RelativeToolTip": "mCardSystem\\CardCancel.cs",
+              "ViewState": "AgIAAJIAAAAAAAAAAAAgwJYAAAARAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+              "WhenOpened": "2025-12-18T03:52:52.665Z",
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 12,
+              "Title": "Tool.cs",
+              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Tool.cs",
+              "RelativeDocumentMoniker": "mCardSystem\\Tool.cs",
+              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Tool.cs",
+              "RelativeToolTip": "mCardSystem\\Tool.cs",
+              "ViewState": "AgIAABsAAAAAAAAAAAAuwCcAAAAAAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+              "WhenOpened": "2025-12-19T02:33:11.3Z",
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 10,
+              "Title": "Program.cs",
+              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Program.cs",
+              "RelativeDocumentMoniker": "mCardSystem\\Program.cs",
+              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Program.cs",
+              "RelativeToolTip": "mCardSystem\\Program.cs",
+              "ViewState": "AgIAAEcAAAAAAAAAAAAqwE0AAAAuAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+              "WhenOpened": "2025-12-17T03:12:41.93Z",
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 9,
+              "Title": "Main.cs",
+              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Main.cs",
+              "RelativeDocumentMoniker": "mCardSystem\\Main.cs",
+              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Main.cs",
+              "RelativeToolTip": "mCardSystem\\Main.cs",
+              "ViewState": "AgIAABsAAAAAAAAAAAAuwCYAAAAXAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+              "WhenOpened": "2026-01-04T07:11:42.859Z",
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 13,
               "Title": "ChangePassword.cs",
               "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\ChangePassword.cs",
               "RelativeDocumentMoniker": "mCardSystem\\ChangePassword.cs",
@@ -240,7 +274,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 12,
+              "DocumentIndex": 14,
               "Title": "HttpService.cs",
               "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\HttpService.cs",
               "RelativeDocumentMoniker": "mCardSystem\\HttpService.cs",
@@ -253,7 +287,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 14,
+              "DocumentIndex": 16,
               "Title": "HomePage.cs",
               "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\HomePage.cs",
               "RelativeDocumentMoniker": "mCardSystem\\HomePage.cs",
@@ -261,11 +295,12 @@
               "RelativeToolTip": "mCardSystem\\HomePage.cs",
               "ViewState": "AgIAABEAAAAAAAAAAAD4vx0AAAApAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-12-18T03:52:38.192Z"
+              "WhenOpened": "2025-12-18T03:52:38.192Z",
+              "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 13,
+              "DocumentIndex": 15,
               "Title": "Logger.cs",
               "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Logger.cs",
               "RelativeDocumentMoniker": "mCardSystem\\Logger.cs",
@@ -277,7 +312,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 15,
+              "DocumentIndex": 17,
               "Title": "Microsoft.Common.CurrentVersion.targets",
               "DocumentMoniker": "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Current\\Bin\\amd64\\Microsoft.Common.CurrentVersion.targets",
               "RelativeDocumentMoniker": "..\\..\\..\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Current\\Bin\\amd64\\Microsoft.Common.CurrentVersion.targets",
@@ -289,7 +324,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 16,
+              "DocumentIndex": 18,
               "Title": "ToastNotification.cs",
               "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\ToastNotification.cs",
               "RelativeDocumentMoniker": "mCardSystem\\ToastNotification.cs",
@@ -302,7 +337,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 17,
+              "DocumentIndex": 19,
               "Title": "Main.Designer.cs",
               "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Main.Designer.cs",
               "RelativeDocumentMoniker": "mCardSystem\\Main.Designer.cs",
@@ -315,7 +350,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 18,
+              "DocumentIndex": 20,
               "Title": "LoginDlg.resx",
               "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\LoginDlg.resx",
               "RelativeDocumentMoniker": "mCardSystem\\LoginDlg.resx",

+ 118 - 99
mCardSystem/.vs/mCardSystem/v17/DocumentLayout.json

@@ -3,16 +3,8 @@
   "WorkspaceRootPath": "C:\\bitbucket\\mCardSystem\\mCardSystem\\",
   "Documents": [
     {
-      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\webapi.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\webapi.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\tool.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\tool.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|C:\\bitbucket\\mCardSystem\\mCardSystem\\mcardsystem\\issuecard.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
-      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\issuecard.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
+      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|C:\\bitbucket\\mCardSystem\\mCardSystem\\mcardsystem\\main.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
+      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\main.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
     },
     {
       "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\issuecard.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -22,6 +14,14 @@
       "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\cardcancel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
       "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\cardcancel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
+    {
+      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|C:\\bitbucket\\mCardSystem\\mCardSystem\\mcardsystem\\cardcancel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
+      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\cardcancel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\webapi.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\webapi.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+    },
     {
       "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\logindlg.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
       "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\logindlg.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
@@ -31,20 +31,24 @@
       "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\logindlg.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\cloudresponse.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\cloudresponse.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|C:\\bitbucket\\mCardSystem\\mCardSystem\\mcardsystem\\cardcancel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
-      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\cardcancel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
+      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\main.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\main.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\cloudresponse.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\cloudresponse.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|C:\\bitbucket\\mCardSystem\\mCardSystem\\mcardsystem\\main.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
-      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\main.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
+      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\cardcancel.designer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\cardcancel.designer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\tool.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|solutionrelative:mcardsystem\\tool.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
     {
       "AbsoluteMoniker": "D:0:0:{EE96F1AA-15E2-49A7-89AD-222A27655465}|mCardSystem\\mCardSystem.csproj|c:\\bitbucket\\mcardsystem\\mcardsystem\\mcardsystem\\changepassword.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -89,15 +93,53 @@
           "Children": [
             {
               "$type": "Document",
-              "DocumentIndex": 7,
-              "Title": "Program.cs",
-              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Program.cs",
-              "RelativeDocumentMoniker": "mCardSystem\\Program.cs",
-              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Program.cs",
-              "RelativeToolTip": "mCardSystem\\Program.cs",
-              "ViewState": "AgIAABQAAAAAAAAAAAAqwCEAAAAQAAAAAAAAAA==",
+              "DocumentIndex": 4,
+              "Title": "WebAPI.cs",
+              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\WebAPI.cs",
+              "RelativeDocumentMoniker": "mCardSystem\\WebAPI.cs",
+              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\WebAPI.cs",
+              "RelativeToolTip": "mCardSystem\\WebAPI.cs",
+              "ViewState": "AgIAAJAAAAAAAAAAAAAgwJsAAAAQAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-12-17T03:12:41.93Z",
+              "WhenOpened": "2025-12-25T09:33:57.723Z",
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 3,
+              "Title": "CardCancel.cs [\u8BBE\u8BA1]",
+              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CardCancel.cs",
+              "RelativeDocumentMoniker": "mCardSystem\\CardCancel.cs",
+              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CardCancel.cs [\u8BBE\u8BA1]",
+              "RelativeToolTip": "mCardSystem\\CardCancel.cs [\u8BBE\u8BA1]",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+              "WhenOpened": "2025-12-30T09:53:09.382Z",
+              "EditorCaption": " [\u8BBE\u8BA1]"
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 1,
+              "Title": "IssueCard.cs",
+              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\IssueCard.cs",
+              "RelativeDocumentMoniker": "mCardSystem\\IssueCard.cs",
+              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\IssueCard.cs",
+              "RelativeToolTip": "mCardSystem\\IssueCard.cs",
+              "ViewState": "AgIAAGwAAAAAAAAAAAAcwHYAAAAQAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+              "WhenOpened": "2025-12-18T03:52:22.733Z",
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 10,
+              "Title": "CardCancel.Designer.cs",
+              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CardCancel.Designer.cs",
+              "RelativeDocumentMoniker": "mCardSystem\\CardCancel.Designer.cs",
+              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CardCancel.Designer.cs",
+              "RelativeToolTip": "mCardSystem\\CardCancel.Designer.cs",
+              "ViewState": "AgIAAEsAAAAAAAAAAAAiwFQAAAAlAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+              "WhenOpened": "2026-01-04T07:04:46.237Z",
               "EditorCaption": ""
             },
             {
@@ -120,52 +162,52 @@
               "RelativeDocumentMoniker": "mCardSystem\\LoginDlg.cs",
               "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\LoginDlg.cs",
               "RelativeToolTip": "mCardSystem\\LoginDlg.cs",
-              "ViewState": "AgIAABIAAAAAAAAAAADgvxkAAAAOAAAAAAAAAA==",
+              "ViewState": "AgIAABgAAAAAAAAAAADwvxwAAAAAAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
               "WhenOpened": "2025-12-25T09:45:43.598Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 4,
-              "Title": "CardCancel.cs",
-              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CardCancel.cs",
-              "RelativeDocumentMoniker": "mCardSystem\\CardCancel.cs",
-              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CardCancel.cs",
-              "RelativeToolTip": "mCardSystem\\CardCancel.cs",
-              "ViewState": "AgIAAJAAAAAAAAAAAAAewJsAAAArAAAAAAAAAA==",
+              "DocumentIndex": 7,
+              "Title": "CloudResponse.cs",
+              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CloudResponse.cs",
+              "RelativeDocumentMoniker": "mCardSystem\\CloudResponse.cs",
+              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CloudResponse.cs",
+              "RelativeToolTip": "mCardSystem\\CloudResponse.cs",
+              "ViewState": "AgIAAEcAAAAAAAAAAAAqwE8AAAAFAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-12-18T03:52:52.665Z",
+              "WhenOpened": "2025-12-25T09:38:39.007Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 3,
-              "Title": "IssueCard.cs",
-              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\IssueCard.cs",
-              "RelativeDocumentMoniker": "mCardSystem\\IssueCard.cs",
-              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\IssueCard.cs",
-              "RelativeToolTip": "mCardSystem\\IssueCard.cs",
-              "ViewState": "AgIAABIAAAAAAAAAAAAlwBkAAAAdAAAAAAAAAA==",
+              "DocumentIndex": 0,
+              "Title": "Main.cs [\u8BBE\u8BA1]",
+              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Main.cs",
+              "RelativeDocumentMoniker": "mCardSystem\\Main.cs",
+              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Main.cs [\u8BBE\u8BA1]",
+              "RelativeToolTip": "mCardSystem\\Main.cs [\u8BBE\u8BA1]",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-12-18T03:52:22.733Z",
-              "EditorCaption": ""
+              "WhenOpened": "2025-12-30T06:48:51.973Z",
+              "EditorCaption": " [\u8BBE\u8BA1]"
             },
             {
               "$type": "Document",
               "DocumentIndex": 2,
-              "Title": "IssueCard.cs [\u8BBE\u8BA1]",
-              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\IssueCard.cs",
-              "RelativeDocumentMoniker": "mCardSystem\\IssueCard.cs",
-              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\IssueCard.cs [\u8BBE\u8BA1]",
-              "RelativeToolTip": "mCardSystem\\IssueCard.cs [\u8BBE\u8BA1]",
+              "Title": "CardCancel.cs",
+              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CardCancel.cs",
+              "RelativeDocumentMoniker": "mCardSystem\\CardCancel.cs",
+              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CardCancel.cs",
+              "RelativeToolTip": "mCardSystem\\CardCancel.cs",
+              "ViewState": "AgIAAJIAAAAAAAAAAAAgwJYAAAARAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-12-17T08:02:24.037Z",
-              "EditorCaption": " [\u8BBE\u8BA1]"
+              "WhenOpened": "2025-12-18T03:52:52.665Z",
+              "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 1,
+              "DocumentIndex": 11,
               "Title": "Tool.cs",
               "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Tool.cs",
               "RelativeDocumentMoniker": "mCardSystem\\Tool.cs",
@@ -176,59 +218,35 @@
               "WhenOpened": "2025-12-19T02:33:11.3Z",
               "EditorCaption": ""
             },
-            {
-              "$type": "Document",
-              "DocumentIndex": 0,
-              "Title": "WebAPI.cs",
-              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\WebAPI.cs",
-              "RelativeDocumentMoniker": "mCardSystem\\WebAPI.cs",
-              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\WebAPI.cs",
-              "RelativeToolTip": "mCardSystem\\WebAPI.cs",
-              "ViewState": "AgIAAAoAAAAAAAAAAAAQwBMAAABFAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-12-25T09:33:57.723Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 8,
-              "Title": "CardCancel.cs [\u8BBE\u8BA1]",
-              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CardCancel.cs",
-              "RelativeDocumentMoniker": "mCardSystem\\CardCancel.cs",
-              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CardCancel.cs [\u8BBE\u8BA1]",
-              "RelativeToolTip": "mCardSystem\\CardCancel.cs [\u8BBE\u8BA1]",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-12-30T09:53:09.382Z",
-              "EditorCaption": " [\u8BBE\u8BA1]"
-            },
             {
               "$type": "Document",
               "DocumentIndex": 9,
-              "Title": "CloudResponse.cs",
-              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CloudResponse.cs",
-              "RelativeDocumentMoniker": "mCardSystem\\CloudResponse.cs",
-              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\CloudResponse.cs",
-              "RelativeToolTip": "mCardSystem\\CloudResponse.cs",
-              "ViewState": "AgIAAA4AAAAAAAAAAAAQwD8AAAAAAAAAAAAAAA==",
+              "Title": "Program.cs",
+              "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Program.cs",
+              "RelativeDocumentMoniker": "mCardSystem\\Program.cs",
+              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Program.cs",
+              "RelativeToolTip": "mCardSystem\\Program.cs",
+              "ViewState": "AgIAAEcAAAAAAAAAAAAqwE0AAAAuAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-12-25T09:38:39.007Z",
+              "WhenOpened": "2025-12-17T03:12:41.93Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 10,
-              "Title": "Main.cs [\u8BBE\u8BA1]",
+              "DocumentIndex": 8,
+              "Title": "Main.cs",
               "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Main.cs",
               "RelativeDocumentMoniker": "mCardSystem\\Main.cs",
-              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Main.cs [\u8BBE\u8BA1]",
-              "RelativeToolTip": "mCardSystem\\Main.cs [\u8BBE\u8BA1]",
+              "ToolTip": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Main.cs",
+              "RelativeToolTip": "mCardSystem\\Main.cs",
+              "ViewState": "AgIAABsAAAAAAAAAAAAuwCYAAAAXAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-12-30T06:48:51.973Z",
-              "EditorCaption": " [\u8BBE\u8BA1]"
+              "WhenOpened": "2026-01-04T07:11:42.859Z",
+              "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 11,
+              "DocumentIndex": 12,
               "Title": "ChangePassword.cs",
               "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\ChangePassword.cs",
               "RelativeDocumentMoniker": "mCardSystem\\ChangePassword.cs",
@@ -240,7 +258,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 12,
+              "DocumentIndex": 13,
               "Title": "HttpService.cs",
               "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\HttpService.cs",
               "RelativeDocumentMoniker": "mCardSystem\\HttpService.cs",
@@ -253,7 +271,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 14,
+              "DocumentIndex": 15,
               "Title": "HomePage.cs",
               "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\HomePage.cs",
               "RelativeDocumentMoniker": "mCardSystem\\HomePage.cs",
@@ -261,11 +279,12 @@
               "RelativeToolTip": "mCardSystem\\HomePage.cs",
               "ViewState": "AgIAABEAAAAAAAAAAAD4vx0AAAApAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-12-18T03:52:38.192Z"
+              "WhenOpened": "2025-12-18T03:52:38.192Z",
+              "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 13,
+              "DocumentIndex": 14,
               "Title": "Logger.cs",
               "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Logger.cs",
               "RelativeDocumentMoniker": "mCardSystem\\Logger.cs",
@@ -277,7 +296,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 15,
+              "DocumentIndex": 16,
               "Title": "Microsoft.Common.CurrentVersion.targets",
               "DocumentMoniker": "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Current\\Bin\\amd64\\Microsoft.Common.CurrentVersion.targets",
               "RelativeDocumentMoniker": "..\\..\\..\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Current\\Bin\\amd64\\Microsoft.Common.CurrentVersion.targets",
@@ -289,7 +308,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 16,
+              "DocumentIndex": 17,
               "Title": "ToastNotification.cs",
               "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\ToastNotification.cs",
               "RelativeDocumentMoniker": "mCardSystem\\ToastNotification.cs",
@@ -302,7 +321,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 17,
+              "DocumentIndex": 18,
               "Title": "Main.Designer.cs",
               "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\Main.Designer.cs",
               "RelativeDocumentMoniker": "mCardSystem\\Main.Designer.cs",
@@ -315,7 +334,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 18,
+              "DocumentIndex": 19,
               "Title": "LoginDlg.resx",
               "DocumentMoniker": "C:\\bitbucket\\mCardSystem\\mCardSystem\\mCardSystem\\LoginDlg.resx",
               "RelativeDocumentMoniker": "mCardSystem\\LoginDlg.resx",

+ 12 - 6
mCardSystem/mCardSystem/CardCancel.cs

@@ -49,11 +49,12 @@ namespace mCardSystem
             CardInfo info = cardreader.readCardInfo();
             if (info.readresult.result)
             {
-                APIResponse<CardData> res = WebAPI.CanCancelCard("CARD1006", CardReader.phyNo);
+                APIResponse<CardData> res = WebAPI.CanCancelCard(info.cardno, CardReader.phyNo);
 
                 if (!res.success)
                 {
-                    Tool.ShowAntdModal(window, "请求销卡失败," + res.msg);
+                    Tool.ShowAntdModal(window, "请求销卡失败," + res.data.message);
+                    Logger.WriteLog("请求销卡失败," + res.data.message);
                     return;
                 }
                 else
@@ -74,10 +75,11 @@ namespace mCardSystem
 
 
                     //销卡是先向云端申请后写卡
-                    APIResponse<CardData> res2 = WebAPI.CancelCard("CARD1006", CardReader.phyNo);
+                    APIResponse<CardData> res2 = WebAPI.CancelCard(info.cardno, CardReader.phyNo);
                     if (!res2.success)
                     {
-                        Tool.ShowAntdModal(window, "请求销卡失败," + res2.msg);
+                        Tool.ShowAntdModal(window, "请求销卡失败," + res2.data.message);
+                        Logger.WriteLog("请求销卡失败," + res2.data.message);
                         return;
                     }
                     else
@@ -138,10 +140,14 @@ namespace mCardSystem
             CardInfo info = cardreader.readCardInfo();
             if (info.readresult.result)
             {
-                APIResponse<CardData> res = WebAPI.CanCancelCard("CARD1006", CardReader.phyNo);
+                APIResponse<CardData> res = WebAPI.CanCancelCard(info.cardno, CardReader.phyNo);
 
                 //卡格式化的条件是查询云端不存在该卡
-                if (!res.success && res.data.code == WebAPI.CardOperate_NoCard)
+                if (!res.success && res.code == 404)
+                {
+                    Tool.ShowAntdModal(window, res.msg);
+                }
+                else if (!res.success && res.data.code == WebAPI.CardOperate_NoCard)
                 {
                     string msg = "卡格式化操作。卡号:" + info.cardno;
 

+ 12 - 2
mCardSystem/mCardSystem/CloudResponse.cs

@@ -32,6 +32,13 @@ namespace mCardSystem
     }
 
 
+    public class CloudResponse_s
+    {
+        public bool isSuccess { get; set; }
+        public string code { get; set; }
+        public string message { get; set; }
+        public string data { get; set; }
+    }
 
     public class APIResponse
     {
@@ -52,14 +59,13 @@ namespace mCardSystem
     public class APIResponse<T>
     {
         public bool success { get; set; }
-        public string code { get; set; }
+        public int code { get; set; }
         public string msg { get; set; }
         public T data { get; set; }
 
         public APIResponse(T tdata)
         {
             success = false;
-            code = string.Empty;
             msg = string.Empty;
 
             data = tdata;
@@ -72,6 +78,10 @@ namespace mCardSystem
         public string token { get; set; }
         public string buid { get; set; }
     }
+    public class Token
+    {
+        public string token { get; set; }
+    }
 
 
     public class CardData

+ 3 - 3
mCardSystem/mCardSystem/HomePage.Designer.cs

@@ -47,7 +47,7 @@
             // 
             label_state.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Bold, GraphicsUnit.Point, 134);
             label_state.ForeColor = Color.Red;
-            label_state.Location = new Point(248, 67);
+            label_state.Location = new Point(219, 67);
             label_state.Margin = new Padding(3, 4, 3, 4);
             label_state.Name = "label_state";
             label_state.Size = new Size(110, 49);
@@ -56,7 +56,7 @@
             // 
             // button_connect
             // 
-            button_connect.Location = new Point(386, 67);
+            button_connect.Location = new Point(363, 67);
             button_connect.Margin = new Padding(3, 4, 3, 4);
             button_connect.Name = "button_connect";
             button_connect.Size = new Size(121, 55);
@@ -67,7 +67,7 @@
             // 
             // button_disconnect
             // 
-            button_disconnect.Location = new Point(546, 67);
+            button_disconnect.Location = new Point(523, 67);
             button_disconnect.Margin = new Padding(3, 4, 3, 4);
             button_disconnect.Name = "button_disconnect";
             button_disconnect.Size = new Size(121, 55);

+ 9 - 3
mCardSystem/mCardSystem/IssueCard.cs

@@ -112,13 +112,14 @@ namespace mCardSystem
             if (info.readresult.result)
             {
 
-                APIResponse<CardData> res = WebAPI.CanIssueCard("CARD1006", CardReader.phyNo);
+                APIResponse<CardData> res = WebAPI.CanIssueCard(info.cardno, CardReader.phyNo);
 
 
 
                 if (!res.success)
                 {
-                    Tool.ShowAntdModal(window, "请求发卡失败," + res.msg);
+                    Tool.ShowAntdModal(window, "请求发卡失败," + res.data.message);
+                    Logger.WriteLog("请求发卡失败," + res.data.message);
                     return;
                 }
                 else
@@ -141,6 +142,7 @@ namespace mCardSystem
                 if (!cardreader.changekey_user(1))
                 {
                     Tool.ShowAntdModal(window, "修改扇区密钥失败");
+                    Logger.WriteLog("修改扇区密钥失败");
                     return;
                 }
 
@@ -177,6 +179,7 @@ namespace mCardSystem
                 if (!cardreader.writeCardInfo(info))
                 {
                     Tool.ShowAntdModal(window, "写卡号失败");
+                    Logger.WriteLog("写卡号失败");
                     return;
                 }
 
@@ -194,6 +197,7 @@ namespace mCardSystem
                 if (!cardreader.writedata(1, 1, s11))
                 {
                     Tool.ShowAntdModal(window, "写验证码失败");
+                    Logger.WriteLog("写验证码失败");
 
 
                     OperateResult cres = cardreader.clearCard(info);
@@ -213,6 +217,7 @@ namespace mCardSystem
                 if (!cardreader.writeCardPw(cpw))
                 {
                     Tool.ShowAntdModal(window, "写密码失败");
+                    Logger.WriteLog("写密码失败");
 
                     OperateResult cres = cardreader.clearCard(info);
                     if (!cres.result)
@@ -223,11 +228,12 @@ namespace mCardSystem
                     return;
                 }
 
-                APIResponse<CardData> res2 = WebAPI.IssueCard("CARD1006", CardReader.phyNo);//
+                APIResponse<CardData> res2 = WebAPI.IssueCard(info.cardno, CardReader.phyNo);//
 
                 if (!res2.success)
                 {
                     Tool.ShowAntdModal(window, "请求发卡失败," + res2.msg);
+                    Logger.WriteLog("请求发卡失败," + res2.msg);
 
                     OperateResult cres = cardreader.clearCard(info);
                     if (!cres.result)

+ 0 - 1
mCardSystem/mCardSystem/LoginDlg.cs

@@ -27,7 +27,6 @@ namespace mCardSystem
             string Password = this.Password.Text;
 
 
-            this.DialogResult = DialogResult.OK;//测试
 
             APIResponse res = WebAPI.ClientLogin(Account, Password);
           

+ 1 - 1
mCardSystem/mCardSystem/Main.cs

@@ -20,7 +20,7 @@ namespace mCardSystem
 
 
             timerRefreshtoken = new System.Windows.Forms.Timer();
-            timerRefreshtoken.Interval = 90 * 60 * 1000; // 1.5Сʱ  
+            timerRefreshtoken.Interval = 1 * 10 * 1000; // 1.5Сʱ  
             timerRefreshtoken.Tick += Timer2_Tick;
             timerRefreshtoken.Start();
 

+ 23 - 6
mCardSystem/mCardSystem/Program.cs

@@ -25,14 +25,31 @@ namespace mCardSystem
 
 
             ApplicationConfiguration.Initialize();
-           
-            // 显示登录对话框
-            LoginDlg loginForm = new LoginDlg();
-            if (loginForm.ShowDialog() == DialogResult.OK)
+
+
+            bool result;
+            Application.EnableVisualStyles();
+            Mutex m = new Mutex(true, Application.ProductName, out result);
+            if (result)
             {
-                // 登录成功后显示主窗口
-                Application.Run(new Main());
+                Application.SetCompatibleTextRenderingDefault(false);
+
+
+                // 显示登录对话框
+                LoginDlg loginForm = new LoginDlg();
+                if (loginForm.ShowDialog() == DialogResult.OK)
+                {
+                    // 登录成功后显示主窗口
+                    Application.Run(new Main());
+                }
+
             }
+            else
+            {
+                MessageBox.Show("程序已经在运行中!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            }
+
+
         }
 
         private static void CheckAndCleanLogs(object state)

+ 1 - 1
mCardSystem/mCardSystem/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -2,7 +2,7 @@
 <!-- https://go.microsoft.com/fwlink/?LinkID=208121. -->
 <Project>
   <PropertyGroup>
-    <History>True|2026-01-04T02:50:55.4332618Z||;True|2026-01-04T10:50:40.9898998+08:00||;True|2026-01-04T10:47:00.1564363+08:00||;True|2025-12-26T17:36:06.3125997+08:00||;</History>
+    <History>True|2026-01-04T08:07:14.1696441Z||;True|2026-01-04T10:50:55.4332618+08:00||;True|2026-01-04T10:50:40.9898998+08:00||;True|2026-01-04T10:47:00.1564363+08:00||;True|2025-12-26T17:36:06.3125997+08:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>

+ 16 - 8
mCardSystem/mCardSystem/WebAPI.cs

@@ -148,6 +148,7 @@ namespace mCardSystem
 
                 if (responseResult == "" || responseResult == null)
                 {
+                    res.code = 404;
                     res.msg = "无法获取信息,请检查网络";
                     return res;
                 }
@@ -157,16 +158,14 @@ namespace mCardSystem
                 {
                     CloudResponse<CardData> rootObject = JsonConvert.DeserializeObject<CloudResponse<CardData>>(responseResult);
 
+                    res.data = rootObject.data;
                     if (rootObject.data.result)
                     {
-                        res.data.cardtype = rootObject.data.cardtype;
-                        res.data.accountname = rootObject.data.accountname;
                         res.success = true;
                         return res;
                     }
                     else
                     {
-                        res.msg = rootObject.data.message;
                         return res;
                     }
                 }
@@ -195,11 +194,20 @@ namespace mCardSystem
             {
                 string _ = token.Substring("Bearer ".Length);
                 //string jsonData = "{\"token\": \"" + _ + "\"}";
-                string responseResult = HttpService.Get(CloudsUrl + "api/admin/auth/refresh?token=" + _);
-                CloudResponse<Login> rootObject = JsonConvert.DeserializeObject<CloudResponse<Login>>(responseResult);
-                token = "Bearer " + rootObject.data.token;
-                //UserName = rootObject.data
-                return rootObject.data.token;
+                string responseResult = HttpService.Get(CloudsUrl + "api/Auth/Refresh?token=" + _);
+
+                JObject obj = JObject.Parse(responseResult);
+                if ((bool)obj["isSuccess"] == true)
+                {
+                    CloudResponse<Token> rootObject = JsonConvert.DeserializeObject<CloudResponse<Token>>(responseResult);
+                    token = "Bearer " + rootObject.data.token;
+                    //UserName = rootObject.data
+                    return rootObject.data.token;
+                }
+                else
+                {
+                    return null;
+                }
             }
             catch (Exception ex)
             {

+ 1 - 1
mCardSystem/mCardSystem/bin/x86/Debug/net8.0-windows/App.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <appSettings>
-  <add key="CloudsUrl" value="http://10.153.140.3:5076/" />
+  <add key="CloudsUrl" value="http://10.153.140.13:5076/" />
   </appSettings>
 </configuration>

BIN
mCardSystem/mCardSystem/bin/x86/Debug/net8.0-windows/mCardSystem.dll


BIN
mCardSystem/mCardSystem/bin/x86/Debug/net8.0-windows/mCardSystem.exe


BIN
mCardSystem/mCardSystem/bin/x86/Debug/net8.0-windows/mCardSystem.pdb


BIN
mCardSystem/mCardSystem/bin/x86/Release/net8.0-windows/mCardSystem.dll


BIN
mCardSystem/mCardSystem/bin/x86/Release/net8.0-windows/mCardSystem.exe


BIN
mCardSystem/mCardSystem/bin/x86/Release/net8.0-windows/mCardSystem.pdb


BIN
mCardSystem/mCardSystem/bin/安装包/Setup.exe


+ 169 - 0
mCardSystem/mCardSystem/bin/安装包/setupfile.nsi

@@ -0,0 +1,169 @@
+; 该脚本使用 HM VNISEdit 脚本编辑器向导产生
+
+; 安装程序初始定义常量
+!define PRODUCT_NAME "车载机发卡系统"
+!define PRODUCT_VERSION "1.0"
+!define PRODUCT_PUBLISHER "Tokheim Hengshan, Inc."
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\mCardSystem.exe"
+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
+!define PRODUCT_UNINST_ROOT_KEY "HKLM"
+
+SetCompressor lzma
+
+; ------ MUI 现代界面定义 (1.67 版本以上兼容) ------
+!include "MUI.nsh"
+
+; MUI 预定义常量
+!define MUI_ABORTWARNING
+!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"
+!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
+
+; 欢迎页面
+!insertmacro MUI_PAGE_WELCOME
+; 安装目录选择页面
+!insertmacro MUI_PAGE_DIRECTORY
+; 安装过程页面
+!insertmacro MUI_PAGE_INSTFILES
+; 安装完成页面
+!insertmacro MUI_PAGE_FINISH
+
+; 安装卸载过程页面
+!insertmacro MUI_UNPAGE_INSTFILES
+
+; 安装界面包含的语言设置
+!insertmacro MUI_LANGUAGE "SimpChinese"
+
+; 安装预释放文件
+!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
+; ------ MUI 现代界面定义结束 ------
+
+Function .onInit
+; 发现有程序正在运行时提示退出后继续运行
+loop:
+ FindWindow $R0 "mCardSystem"
+ IntCmp $R0 0 done
+   MessageBox MB_OKCANCEL \
+              "NSIS 正在运行。$\n点击“确定”按钮会关闭 NSIS 然后继续安装,点击“取消”按钮将退出安装程序" \
+              IDOK NoAbort
+   Abort
+NoAbort:
+   SendMessage $R0 1029 0 0
+; 稍等后继续检测直至检测不到或用户选择取消
+   Sleep 444
+   Goto loop
+done:
+; 显示 Logo 画面
+ Delete "$TEMP\magiclime.exe"
+ Delete "$TEMP\qcd_logo.bmp"
+; 初始化标牌位图
+FunctionEnd
+
+Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+OutFile "Setup.exe"
+InstallDir "C:\mCardSystem"
+InstallDirRegKey HKLM "${PRODUCT_UNINST_KEY}" "UninstallString"
+ShowInstDetails show
+ShowUnInstDetails show
+
+Section "MainSection" SEC01
+  SetOutPath "$INSTDIR"
+  SetOverwrite ifnewer
+  File "C:\bitbucket\mCardSystem\mCardSystem\mCardSystem\bin\Release\net8.0-windows\publish\mCardSystem.exe"
+  CreateDirectory "$SMPROGRAMS\车载机发卡系统"
+  CreateShortCut "$SMPROGRAMS\车载机发卡系统\车载机发卡系统.lnk" "$INSTDIR\mCardSystem.exe"
+  CreateShortCut "$DESKTOP\车载机发卡系统.lnk" "$INSTDIR\mCardSystem.exe"
+  File "C:\bitbucket\mCardSystem\mCardSystem\mCardSystem\bin\Release\net8.0-windows\publish\AntdUI.dll"
+  File "C:\bitbucket\mCardSystem\mCardSystem\mCardSystem\bin\Release\net8.0-windows\publish\BouncyCastle.Cryptography.dll"
+  File "C:\bitbucket\mCardSystem\mCardSystem\mCardSystem\bin\Release\net8.0-windows\publish\DFS.Infrastructure.dll"
+  File "C:\bitbucket\mCardSystem\mCardSystem\mCardSystem\bin\Release\net8.0-windows\publish\mCardSystem.deps.json"
+  File "C:\bitbucket\mCardSystem\mCardSystem\mCardSystem\bin\Release\net8.0-windows\publish\mCardSystem.dll"
+  File "C:\bitbucket\mCardSystem\mCardSystem\mCardSystem\bin\Release\net8.0-windows\publish\mCardSystem.pdb"
+  File "C:\bitbucket\mCardSystem\mCardSystem\mCardSystem\bin\Release\net8.0-windows\publish\mCardSystem.runtimeconfig.json"
+  File "C:\bitbucket\mCardSystem\mCardSystem\mCardSystem\bin\Release\net8.0-windows\publish\Microsoft.Extensions.DependencyInjection.Abstractions.dll"
+  File "C:\bitbucket\mCardSystem\mCardSystem\mCardSystem\bin\Release\net8.0-windows\publish\Microsoft.Extensions.DependencyInjection.dll"
+  File "C:\bitbucket\mCardSystem\mCardSystem\mCardSystem\bin\Release\net8.0-windows\publish\Microsoft.Extensions.Logging.Abstractions.dll"
+  File "C:\bitbucket\mCardSystem\mCardSystem\mCardSystem\bin\Release\net8.0-windows\publish\Microsoft.Extensions.Options.dll"
+  File "C:\bitbucket\mCardSystem\mCardSystem\mCardSystem\bin\Release\net8.0-windows\publish\Microsoft.Extensions.Primitives.dll"
+  File "C:\bitbucket\mCardSystem\mCardSystem\mCardSystem\bin\Release\net8.0-windows\publish\Microsoft.IdentityModel.Abstractions.dll"
+  File "C:\bitbucket\mCardSystem\mCardSystem\mCardSystem\bin\Release\net8.0-windows\publish\Microsoft.IdentityModel.JsonWebTokens.dll"
+  File "C:\bitbucket\mCardSystem\mCardSystem\mCardSystem\bin\Release\net8.0-windows\publish\Microsoft.IdentityModel.Logging.dll"
+  File "C:\bitbucket\mCardSystem\mCardSystem\mCardSystem\bin\Release\net8.0-windows\publish\Microsoft.IdentityModel.Tokens.dll"
+  File "C:\bitbucket\mCardSystem\mCardSystem\mCardSystem\bin\Release\net8.0-windows\publish\mwrf32.dll"
+  File "C:\bitbucket\mCardSystem\mCardSystem\mCardSystem\bin\Release\net8.0-windows\publish\mwrf32.h"
+  File "C:\bitbucket\mCardSystem\mCardSystem\mCardSystem\bin\Release\net8.0-windows\publish\mwrf32.lib"
+  File "C:\bitbucket\mCardSystem\mCardSystem\mCardSystem\bin\Release\net8.0-windows\publish\Newtonsoft.Json.dll"
+  File "C:\bitbucket\mCardSystem\mCardSystem\mCardSystem\bin\Release\net8.0-windows\publish\System.IdentityModel.Tokens.Jwt.dll"
+  File "C:\bitbucket\mCardSystem\mCardSystem\mCardSystem\bin\Release\net8.0-windows\publish\Yitter.IdGenerator.dll"
+SectionEnd
+
+Section -AdditionalIcon
+  CreateShortCut "$SMPROGRAMS\车载机发卡系统\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
+  CreateShortCut "$SMPROGRAMS\车载机发卡系统\Uninstall.lnk" "$INSTDIR\uninst.exe"
+SectionEnd
+
+Section -Post
+  WriteUninstaller "$INSTDIR\uninst.exe"
+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\mCardSystem.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\mCardSystem.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
+SectionEnd
+
+/******************************
+ *  以下是安装程序的卸载部分  *
+ ******************************/
+
+Section Uninstall
+  Delete "$INSTDIR\${PRODUCT_NAME}.url"
+  Delete "$INSTDIR\uninst.exe"
+  Delete "$INSTDIR\Yitter.IdGenerator.dll"
+  Delete "$INSTDIR\System.IdentityModel.Tokens.Jwt.dll"
+  Delete "$INSTDIR\Newtonsoft.Json.dll"
+  Delete "$INSTDIR\mwrf32.lib"
+  Delete "$INSTDIR\mwrf32.h"
+  Delete "$INSTDIR\mwrf32.dll"
+  Delete "$INSTDIR\Microsoft.IdentityModel.Tokens.dll"
+  Delete "$INSTDIR\Microsoft.IdentityModel.Logging.dll"
+  Delete "$INSTDIR\Microsoft.IdentityModel.JsonWebTokens.dll"
+  Delete "$INSTDIR\Microsoft.IdentityModel.Abstractions.dll"
+  Delete "$INSTDIR\Microsoft.Extensions.Primitives.dll"
+  Delete "$INSTDIR\Microsoft.Extensions.Options.dll"
+  Delete "$INSTDIR\Microsoft.Extensions.Logging.Abstractions.dll"
+  Delete "$INSTDIR\Microsoft.Extensions.DependencyInjection.dll"
+  Delete "$INSTDIR\Microsoft.Extensions.DependencyInjection.Abstractions.dll"
+  Delete "$INSTDIR\mCardSystem.runtimeconfig.json"
+  Delete "$INSTDIR\mCardSystem.pdb"
+  Delete "$INSTDIR\mCardSystem.dll"
+  Delete "$INSTDIR\mCardSystem.deps.json"
+  Delete "$INSTDIR\DFS.Infrastructure.dll"
+  Delete "$INSTDIR\BouncyCastle.Cryptography.dll"
+  Delete "$INSTDIR\AntdUI.dll"
+  Delete "$INSTDIR\mCardSystem.exe"
+
+  Delete "$SMPROGRAMS\车载机发卡系统\Uninstall.lnk"
+  Delete "$SMPROGRAMS\车载机发卡系统\Website.lnk"
+  Delete "$DESKTOP\车载机发卡系统.lnk"
+  Delete "$SMPROGRAMS\车载机发卡系统\车载机发卡系统.lnk"
+
+  RMDir "$SMPROGRAMS\车载机发卡系统"
+
+  RMDir "$INSTDIR"
+
+  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
+  DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
+  SetAutoClose true
+SectionEnd
+
+#-- 根据 NSIS 脚本编辑规则,所有 Function 区段必须放置在 Section 区段之后编写,以避免安装程序出现未可预知的问题。--#
+
+Function un.onInit
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "您确实要完全移除 $(^Name) ,及其所有的组件?" IDYES +2
+  Abort
+FunctionEnd
+
+Function un.onUninstSuccess
+  HideWindow
+  MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) 已成功地从您的计算机移除。"
+FunctionEnd

BIN
mCardSystem/mCardSystem/obj/x86/Debug/net8.0-windows/apphost.exe


+ 1 - 1
mCardSystem/mCardSystem/obj/x86/Debug/net8.0-windows/mCardSystem.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("mCardSystem")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d6774c635472fc89ce67d4af8384c72c41fa3a32")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b54154d8b5ff08fadb3623b253e7e0a912a97471")]
 [assembly: System.Reflection.AssemblyProductAttribute("mCardSystem")]
 [assembly: System.Reflection.AssemblyTitleAttribute("mCardSystem")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

+ 1 - 1
mCardSystem/mCardSystem/obj/x86/Debug/net8.0-windows/mCardSystem.AssemblyInfoInputs.cache

@@ -1 +1 @@
-30a2b5d96bab36389cc086ba0befd6e139b77643c2231760f2705414a6e52b22
+db8122282686ae26df4f44054558d449db7085b63d2671af5d6e8ec3b6d30b4d

BIN
mCardSystem/mCardSystem/obj/x86/Debug/net8.0-windows/mCardSystem.dll


BIN
mCardSystem/mCardSystem/obj/x86/Debug/net8.0-windows/mCardSystem.pdb


BIN
mCardSystem/mCardSystem/obj/x86/Debug/net8.0-windows/ref/mCardSystem.dll


BIN
mCardSystem/mCardSystem/obj/x86/Debug/net8.0-windows/refint/mCardSystem.dll