{"Message":"1","MessageType":2,"Modules":[{"State":1,"Type":1,"Name":"PCPage/其他登录方式"},{"State":1,"Type":1,"Name":"PCPage/dingtalkLogin"},{"State":1,"Type":15,"Name":"ServerCommand/dingtalkLogin"}],"Version":"v1"}

.collaboration

@@ -910,17 +910,7 @@
   },
   {
     "ModuleName": "PCPage/其他登录方式",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-12-17T09:38:31.0617906+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\内建页面\\其他登录方式.json",
-      "Pages\\内建页面\\其他登录方式.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/FGC_邮件订阅",
@@ -1104,17 +1094,7 @@
   },
   {
     "ModuleName": "PCPage/dingtalkLogin",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-12-17T09:34:02.0778232+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\系统\\dingtalkLogin.json",
-      "Pages\\系统\\dingtalkLogin.rd"
-    ]
   },
   {
     "ModuleName": "Pages/首页",
@@ -1970,16 +1950,7 @@
   },
   {
     "ModuleName": "ServerCommand/dingtalkLogin",
-    "State": 1,
+    "ModuleType": 15
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-12-17T09:33:50.4335677+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\钉钉\\dingtalkLogin.json"
-    ]
   },
   {
     "ModuleName": "ServerCommand/解绑钉钉",

Pages/内建页面/其他登录方式.json

@@ -321,7 +321,7 @@
                                     "BreakpointIdentity": "63c3fc4c-42a2-4f0c-9427-80134ec12bb5"
                                   }
                                 ],
-                                "ID": "d0002d23-5686-4eb5-9e36-307673c7b57e"
+                                "ID": "4ccc70d3-450d-4559-bd18-6d896c5dd624"
                               },
                               {
                                 "Condition": {
@@ -363,7 +363,7 @@
                                     "BreakpointIdentity": "fdf6d1df-75eb-4251-9eed-dc25845596d1"
                                   }
                                 ],
-                                "ID": "3540c05c-2569-4b01-8b18-7d56b3913456"
+                                "ID": "a11da1e0-6de9-46e2-a213-68e045e7b439"
                               },
                               {
                                 "CommandList": [
@@ -377,13 +377,13 @@
                                     "BreakpointIdentity": "4abe3d9e-71e3-4443-98fc-58e8f7c86c5c"
                                   }
                                 ],
-                                "ID": "7c6e3d36-bc4d-4589-a241-4f808cdf55d7"
+                                "ID": "08118320-4ebd-4ec5-9c34-333766a5ce35"
                               }
                             ],
                             "BreakpointIdentity": "c329ca80-78da-4ed3-8998-c5403601038d"
                           }
                         ],
-                        "ID": "5205c5f4-0c74-4153-b46b-ecee301c4427"
+                        "ID": "2c2195c1-563a-42a0-bb25-9254e7a31a3a"
                       },
                       {
                         "CommandList": [
@@ -397,13 +397,13 @@
                             "BreakpointIdentity": "472cf80b-1ba2-44d7-90e4-9d3db0489e6a"
                           }
                         ],
-                        "ID": "e2e852f3-bd3b-430f-a029-bb6e52311416"
+                        "ID": "b3c46744-ef38-4ab9-9d7b-c3f2e0ad3c48"
                       }
                     ],
                     "BreakpointIdentity": "4eb23a86-7b95-4a7c-99c0-88bad51a1764"
                   }
                 ],
-                "ID": "b6a6a81a-bf8f-431e-b219-7bfc5959eb1d"
+                "ID": "74dc230c-c87a-4a3b-b11f-9a389331a782"
               },
               {
                 "CommandList": [
@@ -414,7 +414,7 @@
                     "BreakpointIdentity": "0e5f874a-68f7-4fa1-9449-228845f8c2c6"
                   }
                 ],
-                "ID": "45319227-2270-4a9d-bcbf-cf96cb771302"
+                "ID": "eee995d8-cfe8-41f9-a1d1-9a13bcd90302"
               }
             ],
             "BreakpointIdentity": "4a77ec13-0f3c-45a0-a796-5af0ec86640f"
@@ -539,7 +539,7 @@
                 "BreakpointIdentity": "240dfd52-b0cf-4e21-816c-d1d7f03b7c75"
               }
             ],
-            "ID": "b6c779d1-17a2-4c85-b0ce-71f8010df7ce"
+            "ID": "15989d6e-3e81-457e-859e-38e05cb04d50"
           }
         ],
         "BreakpointIdentity": "4c23bc67-5191-4dbe-b7dd-81476e09c20f"
@@ -594,4 +594,4 @@
       "Size": "56,68"
     }
   ]
-}//yBo0rOgwIBqeqyhn06nrFNGj40OrWMSb94KaQim8b+W/aq10OliAz+baWHSWTsgIKLwbj5IaKSHze0gumet2fnob97bVBBYaL5OGSWahpvy+2RAa+N0rqcgcYv2kshTZTcgDXF9RaGxSZy665i5ffRIHNZAb7w/S65brGpP5szt37Hxjxcq1gxXGz4rhBNS+W6WegnRaN7vAJgc9fHI8CVji8G5oZLRN/NJ7uPl1LG/OCy/LL1BVnYIEWKL0/RhMQESaNPFg1DcFlJNNLMWUtPjt7MVU43zfeouAdC3R/pkW+zgLnKl3zCyiHGVM778w9sBWigbagoRk79MBlqoCCBabul7AMvt5d2/6m/WNhBVM4/op0+qOT3Vu3Dopq4FHCQjcJHN3XTt3dV7CyWboGVE9T0fIyt9pcOnwUJP0Qdo7b232ITDTs3PwWrUJpiXPv22s4T2a4VT/oCGQYkpyBluYYsVggESorfWilxzFp+axxLVPMkowdEta91JPczYjZx5Ugub0XjNOTbWQNgZjOKnsAG09I/mt5w2yAeUTHwXtIZdE8jYry3YdpdMhNr1WDbLxKFAwtBzMIsRQnDsrU/MgcYUI62h//4RUXgqyLg8ztmHrowCbR88pS4gu1ksrs5GlWL+IVBTNxivMk4fKBriirZor0ip2OI0U07SatHBTNR9cnJnGU3blhgmSGM9TfheEP6aPHmQCSMPzYdzOhXAKJY58ZE8kxrTSp2gKWT18Bd65l93kR0oVkVx5+VtcdCzbiSXJl6jf5yiiomfuXDNAKr1ZiMRCyorm9gGRn7UMjXz60AcDaA60yT1fdthCDi8WEoPPMUWV8a9ioNVfhi3noo1YBGv0RbblvSkHN7fwSO9YDOxffYrdP5lzlO1UDKy8OETgQBjiuGHxNI3u/g==|920
+}//4kDS3DVvxCMRJkgsE467hntC4yAJEgEoY1ZM8nHTIaEdYz4lw1zucsriVUhDJKbzx7/I/zTzj7Kd1toAdGg972NwfBNP75tuH+hZ36iC84x40IoVXZtNXTPVlTUIZe3DM7wspfUZPjvtORE0UinEYrMicQi3kjKixMuc/tAIvN5uPXtDzyKaz/YR23RvzgSajMWIGHxZg16zIyaHC+LX3xjlXU/IY7pTM0YFtHjW48dAEhy8BFSr6xP2s8fTEMzi0pHzqZCqVZtt6CjU9t0mUUwEsDzEbkd86N5i6BazT8f7pxOjpGE0GK5llHVlQ3EAfsxHz5rU0b0BrZsrLXJQ3xY1pgM83tviqQ6QSyMrI/djrv6OJ4laCuS3Y5KQ3kS50YA03ymeVxTUPtugjaP1XPQ+SDMaGXy616NxtZCtg8hLM3XUJcUteCYpzBUnDQ7DQ6f0+VW08XVBeM0OEkRAfDwXJV62eLrqyswj1csx9h7Gl2kfWLLP/vTtG9tbGxC23tbgM5nTUxtno88sg62mxobLGYX3FNv2JESn5MqA0s9ViNCVO2v4rDAlVu2ViUFr1SAsjuVR7D7IO41ISCavzhgIKSTyee1SqJWB7oY3OMeZWB/qt4Cse9HxIeZ9JrcjAB8F/PxeevhWUVJZYmELBRW0M4QJmxph9Ihn4C5rIbQKwxVth6qDgfPery5CI9WInJbhLSt+KGYDKS8oOfzBlJLYpVdMiOsl4uVeqnCzduXQMDxcXiUwe3k1LxhBwTsAi2SWpTtM6rJCRfvlq8XtzhEE7dW3Rujlqe2tJGcbLzLxDTC8rLnW5kpaQUr6TMeczvtc2YGwhndOwa5XO8a8bWk03iHEzoY4qnoZJE+kUBZYvpnu5SfTCLErw1RWV5wrFN6tM1iBP9cy+7Vzv7XQyw==|920

Pages/系统/dingtalkLogin.json

@@ -367,7 +367,8 @@
   },
   "Formulas": {
     "24,1": "GETURLQUERYVALUE(\"authCode\")",
-    "24,5": "GETURLQUERYVALUE(\"code\")"
+    "24,5": "GETURLQUERYVALUE(\"code\")",
+    "11,9": "GETURLQUERYVALUE(\"error\")"
   },
   "AttachInfos": {
     "24,1": {
@@ -394,7 +395,7 @@
                 "ParamName": "authCode",
                 "Value": {
                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=dingtalkLogin!Code"
+                  "SerializeProperty": "=dingtalkLogin!authCode"
                 }
               },
               {
@@ -458,7 +459,7 @@
                     "BreakpointIdentity": "10be88d4-742e-4906-9b06-dfc939fd7d10"
                   }
                 ],
-                "ID": "b0bfdce5-9022-43af-b075-940e76049703"
+                "ID": "c65536f8-be1c-431b-a9cd-a4059c0e2533"
               },
               {
                 "CommandList": [
@@ -488,7 +489,7 @@
                     "BreakpointIdentity": "f5911af4-e527-4c1a-a95c-5507f96d14aa"
                   }
                 ],
-                "ID": "8906c02f-f241-44a7-9329-3feb3f218e4d"
+                "ID": "3e02f1a3-53d5-4404-8077-1a9ded076706"
               }
             ],
             "BreakpointIdentity": "f8f98264-c8b8-44a6-8ec0-b7291f36e357"
@@ -520,7 +521,7 @@
                 "ParamName": "authCode",
                 "Value": {
                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=dingtalkLogin!F25"
+                  "SerializeProperty": "=dingtalkLogin!Code"
                 }
               },
               {
@@ -578,7 +579,7 @@
                     "BreakpointIdentity": "b37135c5-496a-4052-b868-9f7a90cc4dde"
                   }
                 ],
-                "ID": "98718062-b9bc-4b5e-8b0c-5391e079f994"
+                "ID": "6cdfe8e2-6d6b-4b75-932d-c841afb947b7"
               },
               {
                 "CommandList": [
@@ -608,7 +609,7 @@
                     "BreakpointIdentity": "4457f2e0-ea0f-42ba-8805-dfdfddcc8dec"
                   }
                 ],
-                "ID": "6daa0e1f-9e00-4429-99c4-b4d7921b321d"
+                "ID": "94c31205-df6d-4f38-aae3-3f40f499efd0"
               }
             ],
             "BreakpointIdentity": "0a205891-f7b1-48f5-acf3-0fdd2db87e34"
@@ -624,6 +625,10 @@
         "FontSize": 13.333333333333332,
         "HorizontalAlignment": 1
       },
+      {
+        "FontSize": 12.0,
+        "HorizontalAlignment": 1
+      },
       {
         "Formatter": 2
       }
@@ -637,8 +642,9 @@
     },
     "CellStyles": {
       "9,15": 0,
-      "24,1": 1,
+      "11,9": 1,
-      "24,5": 1
+      "24,1": 2,
+      "24,5": 2
     },
     "SheetStyle": {
       "FontFamily": 0
@@ -647,7 +653,8 @@
   "Spans": [
     "9,15,1,6",
     "24,1,1,4",
-    "24,5,1,3"
+    "24,5,1,3",
+    "11,9,1,17"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -674,8 +681,12 @@
   },
   "CustomNames": [
     {
-      "Name": "Code",
+      "Name": "authCode",
       "Formula": "dingtalkLogin!$B$25"
+    },
+    {
+      "Name": "Code",
+      "Formula": "dingtalkLogin!$F$25"
     }
   ]
-}//ZiTIvM0uebzvf7qofnjrYWuPXunHBLaooLX2AEjHk5tK7CQa0TIcskhI+dtgOpZgwgpk6w9RY6J/rqdLRh/w/c4CvOyzxk/nkownHJtL+zI7TJPH6NlQDzJ99c7xRpzzjjeiyLGmUHqVK4lzgjST92XZee0ASzNk8vJ4P2+UCj5Fg8W4lciixDUP170MDnnMhfETTXN9f5zFzsmqfEiY2RiSLSBZM1c81cYvDpm4BF1tZbgqKmsRrgJgI4tZWFAeqXbVaCa5l71KchyIx/kIhQ4958Mzi3CI7EKUdAPxr/ZJn6Yi33vm+DrjrPtnFqBmWzHp+REoBuGyNOY808fbrMbyDFMlHzw6hRM5aE9ZkAm6J+/qBnYBHWbzLyehK8e2zQeU9Csln6f9aQvytya9+DUesdPtAdtZ8sSD/q4CD/bowAHoL43GK/++zkChhG9UCR/DHU1OiXnysQMAO9UAjGDBUb2IIoVnmBIQrrpUDNIoK68R6wQxTtDSRBBNUDLen4SoVTWwAK1QeoWopvD5TlAMah/QMWMIhlB6XyH18Ozq5PtcH0XgnUFdo5Cgph3r0KxKkH2AwPvGg4HC291cGwwG03M1+NpFlqxvsDqpYPPLCCnuHkfXXVq5N5hvnslLgooEZ3IMLzKOpzmLM1cFnJAg6vBP6Z1mWQuzxTIvjQWWyR05MBwbrnAcQNsMaxRhXHSyHYuE6k8g7h6fbUxaOSCd8R2QfGwfqOAEH6E+SN9MIJR40oqfZ0LvyAYHfb+6s/LrO78ZgVeP6jR6v0UFjCay+CE81SYvT8WJsojC/4nPY1VcnDtpJEDtfWks02wbct7WC3ZGmsvNoqljJmyIZKSg/Q0loqZwsJvAomlQwLYWJI/WiJqy8seMiC6OwXiwGAxmE32xd3yQ9iN62VSJaQ==|920
+}//3BBSGgF6nxXJ1gJEqF2AGRO4DPbkV/c6MsPuZhelCnUY9xel8d+QFC/8L/Q4Mz0DGdjjLcOpY+URcGPY7p3NasjpPo+oe4BLrs+G0UJFgyXhZOFpGZBhfZwG/pMUWgfAQL5ety+SKCj0ERbIODwT6ZVUrJYZ9+YnEjotpZjkapXAhb0aUiytAW5R5qcue3tSFqkS+SWF8ZM5pCblvymSy4jlMMrAuXxlXLdV+C2i8PD4D/akYrPVY94HZlEp7M1zfgn2STNHnHlI2AVwOuc7/I1AKhJEPtYmKr+6QRubM39rcB5L8r0QTPMCGYuEhfdWcs1CPmPnemZgMuLwmkNFTxIYjfwgCeKzyEm13VMwa49ROWuUvJE5fbe98eXp7/9WkdzQDrfMWKIon4Ns6JA60phmg5Rc/Ed+l92veokPGP4wvyzIwctDMBlHjrT7DIThGjH0qdDRXVeDbBK4bxSSFwQ37DXR7HA1vub9O0MR9HSYQsEHKS/QxpNXUINyFsCwKjrQC3x8iFYu1adyiJO4pz4O4mRWo7AIsb5IyQNHkxddEXV/uIvlqW2QJeDvBAqddQA6aoWbYCFoWPzfrBWyytvSYmhFkvMlMha0ecUfDgV/XQFNOExrXgK3nPk/jOz1JLuiugxx8Q4Bxf6w6Llt5AV1wuq+4HKy4qG4OnnVKpu3C9P7bDn30otHx8jRCZwJFD+8IreQLMDXeZdNlCp9GQIts4ucUzLp4c2lInhgCxl11XVhEdDsNH0WnjtFpBPYLV/R3QYtWFxHCA0zlX28un6d5Yq/r9XWVa9ukxprK3vk8NiIbRs6tZFgkK52vLsmYaucugNbBeB6nO5HcRt38nAG2FC/5v9bLfSinoxSJgQ+nuWbjlEKQQlSbHhJv8jLd02HPC/WEpSiCTryPAmvQw==|920

Pages/系统/dingtalkLogin.rd

@@ -4,12 +4,17 @@
   "RowCount": 25,
   "Formulas": {
     "24,1": "GETURLQUERYVALUE(\"authCode\")",
-    "24,5": "GETURLQUERYVALUE(\"code\")"
+    "24,5": "GETURLQUERYVALUE(\"code\")",
+    "11,9": "GETURLQUERYVALUE(\"error\")"
   },
   "CustomNames": [
     {
-      "Name": "Code",
+      "Name": "authCode",
       "Formula": "dingtalkLogin!$B$25"
+    },
+    {
+      "Name": "Code",
+      "Formula": "dingtalkLogin!$F$25"
     }
   ]
 }

ServerCommands/钉钉/dingtalkLogin.json

@@ -233,7 +233,7 @@
                   }
                 ]
               },
-              "ID": "e5856cb1-d7f3-40f3-a79a-34a3f6412271"
+              "ID": "0d7949e0-a59b-4227-b3e9-70c9358f28df"
             },
             {
               "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon",
@@ -269,7 +269,7 @@
                   }
                 ]
               },
-              "ID": "fc21d382-84cc-4f27-81d1-b1a868c26dc7"
+              "ID": "4ff68f38-b1b9-4ac9-9e66-8dcded0f950c"
             }
           ]
         },