From 1864e803c84fad08515587ebdd554f0ae5d67243 Mon Sep 17 00:00:00 2001 From: cuckooent Date: Fri, 18 Oct 2024 20:19:19 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E6=9B=B4=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0Userid=E7=9A=84=E8=8E=B7=E5=8F=96","MessageType":2,"Mo?= =?UTF-8?q?dules":[{"State":1,"Type":1,"Name":"PCPage/=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=96=B9=E5=BC=8F"},{"State":1,"Type":15,"Na?= =?UTF-8?q?me":"ServerCommand/=E9=92=89=E9=92=89=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E7=99=BB=E5=BD=95"},{"State":1,"Type":15,"Name":"ServerCommand?= =?UTF-8?q?/dingtalkLogin"},{"State":1,"Type":1,"Name":"PCPage/dingtalkLog?= =?UTF-8?q?in"},{"State":1,"Type":15,"Name":"ServerCommand/=E9=92=89?= =?UTF-8?q?=E9=92=89=E7=99=BB=E5=BD=95=E7=BB=91=E5=AE=9A=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E5=B9=B6=E7=99=BB=E5=BD=95"},{"State":1,"Type":1,"Name":"PCPag?= =?UTF-8?q?e/=E7=BB=91=E5=AE=9A=E8=B4=A6=E5=8F=B7"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 69 ++----------------- Pages/内建页面/其他登录方式.json | 33 ++++++--- Pages/内建页面/绑定账号.json | 25 +++++-- Pages/内建页面/绑定账号.rd | 4 ++ Pages/系统/dingtalkLogin.json | 24 +++++-- ServerCommands/钉钉/dingtalkLogin.json | 40 +++++++++-- ServerCommands/钉钉/钉钉授权登录.json | 24 ++++++- .../钉钉/钉钉登录绑定账号并登录.json | 13 ++++ 8 files changed, 144 insertions(+), 88 deletions(-) diff --git a/.collaboration b/.collaboration index da962f09..d9f73e2f 100644 --- a/.collaboration +++ b/.collaboration @@ -1090,17 +1090,7 @@ }, { "ModuleName": "PCPage/其他登录方式", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T20:03:52.769016+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\内建页面\\其他登录方式.json", - "Pages\\内建页面\\其他登录方式.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_修改密码", @@ -2344,43 +2334,15 @@ }, { "ModuleName": "ServerCommand/钉钉授权登录", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T20:03:20.6307485+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\钉钉授权登录.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/dingtalkLogin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T20:17:21.7990867+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\dingtalkLogin.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/dingtalkLogin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T20:17:21.7991849+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\系统\\dingtalkLogin.json", - "Pages\\系统\\dingtalkLogin.rd" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommand/服务端命令1", @@ -2388,30 +2350,11 @@ }, { "ModuleName": "ServerCommand/钉钉登录绑定账号并登录", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T20:05:27.9268943+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\钉钉登录绑定账号并登录.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/绑定账号", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-18T20:05:27.9270301+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\内建页面\\绑定账号.json", - "Pages\\内建页面\\绑定账号.rd" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommand/服务端命令2", diff --git a/Pages/内建页面/其他登录方式.json b/Pages/内建页面/其他登录方式.json index 7620ae70..33d48132 100644 --- a/Pages/内建页面/其他登录方式.json +++ b/Pages/内建页面/其他登录方式.json @@ -267,6 +267,12 @@ "ResultTo": { "SerializeProperty": "unionid" } + }, + { + "ResultPropertyName": "userid", + "ResultTo": { + "SerializeProperty": "userid" + } } ], "RefreshAfterFinish": true, @@ -307,7 +313,7 @@ "PageName": "工作台首页" } ], - "ID": "a1a70926-708c-4496-8459-5576848bff3f" + "ID": "bb0c5137-0a09-48d6-a2e9-194e4d8724b3" }, { "Condition": { @@ -335,11 +341,20 @@ "TargetCell": { "SerializeProperty": "=绑定账号!unionid" } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=其他登录方式!userid" + }, + "TargetCell": { + "SerializeProperty": "=绑定账号!userid" + } } ] } ], - "ID": "e17a377b-0f66-422d-b545-f9275f55c05b" + "ID": "37f63173-3bcc-4bb3-8652-54a397551224" }, { "CommandList": [ @@ -352,12 +367,12 @@ } } ], - "ID": "e869fa63-c88f-4128-824d-c9722151414b" + "ID": "0e76fd44-fd0c-47eb-a8a9-a24061f57c12" } ] } ], - "ID": "a3ad31fa-dfc5-456a-a4a9-42d1e035e39d" + "ID": "13f02881-b0fe-4fae-a9aa-c32a13c514cb" }, { "CommandList": [ @@ -370,12 +385,12 @@ } } ], - "ID": "be7de23d-d7d2-485b-968b-a32ab7ed767b" + "ID": "174823b2-125a-40e7-8f62-ce3ee7e24695" } ] } ], - "ID": "5790be49-0c44-40ae-be21-c4986bfc0e17" + "ID": "0a960845-e99f-4a54-9434-315f55a2f3d5" }, { "CommandList": [ @@ -385,7 +400,7 @@ "redirect_uri": "https://www.yugasoft.cn/clue/dingtalkLogin" } ], - "ID": "a01140e2-28b5-4abd-8c6c-c35c3f9beacc" + "ID": "d11d39f8-b611-4a2e-8ff3-bde723e057f2" } ] } @@ -508,7 +523,7 @@ "MethodName": "ExecuteCommand" } ], - "ID": "8b5e59f7-59fb-42ed-925d-5ef8cafea91f" + "ID": "5bb59eb0-a149-4f92-9ca9-2119abf62987" } ] } @@ -561,4 +576,4 @@ "Size": "56,68" } ] -}//szLP+Osy6JJKM+vYn4y/7ohVZtFym3p1ADCoHyEVngvrAdfFv18sZS2SIRWNrbR3mc+wcwzR14AM5PRZ9/UPsyJiKj3282yZKGqQiL7E6FIA3r/B9BkFp9J1wkwdylXCXcitmcVwjj8rrbI+DebMj+B301vXs9qyeDu61NnJae0nvuJmyEUmorOKIz5/Rsma83GWhMKXPSQRPJOU5kiFfgYjVhAYCE1F9v6g7TFzizN4uwbEndHN9PEkXwoRJOuLmhHydxJB9uu4yGr25NqY+tU1dst+W39lphlwIwJ4VEr99LuSMoDmI9QwkgiF/4HVoairUJZtjvII7elDWWB3VuyYqQcJt2wqv0ar/2+OkWShlXUPpYbfawjrIsYWHpnHGqWbYUm8zalwY8l9qNgZ+ZYiG0hFh1c69IDZKy9h78vQHFTRN0rrHcvo4OTfoFq1SdR39vmGxwH2NCtSy6dUoA/o9H5GT1ufplc8draCpeOrB1ND5RMuzqVNWTpNJrxrFKRQCEu3lbem4zaabJXX7IIu5kxEf30Qj1SdrGFMi0h1lBIMSPjCyOj5buT2v7RrddElJ5gfdpbgU+Dsbdn37l9ihfEUWexTPTlDMlgeoXHEAmM32uIyTXSzF4WGrP9XIzb18cDlIsXkXQi3VOrJ1yqJs+QFP5xqc8wGEa+FJISa/n15skhT4rEd9mROGXhmSMIwqQdUXwkAa5EMBO7HA46nnnI76pREFSoewP3210L0x73JYa8xPtJXz7n5UyeRoyBWEJ5oR17zUIcFbfbhRolaj2diTyzfwT9neuUOR7Uqin0Z6a1GJBa/WgQRoBTy0ShRY8UcuY1qhVhCKKlO7jIEWUR4oXiVDk9kluG9Ylpnuq85JSobEkeZwXoPhb+ZvLyN8NVyIbwkWSgTCgIIyA==|920 \ No newline at end of file +}//E/ZYoF9sAeMrZVOIax0hmDaSZovhjOkldxElsJRV2vqkoAwk/R1W5l5neeYxycNe09/TgpwvnAL5CBcj7gfnrk9SYmAHvQ3Jg4STBMSXTVhDLQ/P1wQ+5Zo5ODwyHyo3O1OY9Rdv5QINaE/9vCF7nvggEOaIBj+ijEqzs4apggEX7rZZp0wJ3tf6oLgQYXROXSadGbVsoakMhO/JEvcRR7NBQnbFtOvWi+jWYyO6awyN3XBJyQXvAp1Y4wADhHCuSsyW5tppiqjgsLv0Ke/dlyGPoV/XRldTH2OZO9GcIfQzjWKWvVh4b8FFk9JHXYaIH3dXlBgpHHsxwNsXmhD54dduhF5A3zXdz8+wCeD/iPB9wp92drdr/02gHlrt10nn05tWPyAH+ymj0G/DcrNHF3MKufWYITs4wtAG+ySj7we5Mzp7/7+INEJmpY9lM+qLf6n7ZMMzj6k18oDw79baphznCCmzhQ6p2i3tOqG+rGjKj7xWlhfr8BtdPSuSyHiS54xfzmaAcs/o0eEVoolcrF/RCzStB/EVla5/jt2A6y8m9Uhrmg4EXLLtZo3jwS9Tu3i1fEeTWqf1+2a0uGdqzvwq6dlMfUTkp0pwa/caHq8gfbdXCOZ+sSZqDAOYSlCKew5skf1zGrZdn0lE6XbwQq0e/OSCLhbBusPCrf/WUHYvjr0u7O7Xti7m0UZ8DHBRPOdBQxKiqEOLdQVRHC8YGlUIgJqfGp1WQu9bGXGF4Lz55rp1Gs8D3S8rcrn4eHT/+DSWcew50/w3GXFIqjU6GzK9PAKnUNvFb2TGAF19HXXlKDK03qyhMMi1yZdPS828xMzGfjFRb9w8V3vtsys8xzcTiC6DA5HzjqVjrFkel13tRCI+ZBVsbk7s1mE7aP7GAo1yXyF+uCRJL708ynqJ+A==|920 \ No newline at end of file diff --git a/Pages/内建页面/绑定账号.json b/Pages/内建页面/绑定账号.json index debefa07..541ac9c8 100644 --- a/Pages/内建页面/绑定账号.json +++ b/Pages/内建页面/绑定账号.json @@ -443,6 +443,14 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=绑定账号!unionid" } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "钉钉UserId", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=绑定账号!userid" + } } ], "ResultErrorCodeTo": { @@ -481,7 +489,7 @@ "PageName": "工作台首页" } ], - "ID": "f8e0413b-da25-497e-ab1a-a53c9a00dbc9" + "ID": "c3422516-9e8f-4398-bc08-bdc1c65b64d6" }, { "CommandList": [ @@ -496,12 +504,12 @@ "BtnText": "知道了" } ], - "ID": "7e16991c-6ffe-427e-a9dd-bc103fbb284a" + "ID": "09188644-5daa-4bbd-bd31-1d5ac00b01d4" } ] } ], - "ID": "9bb7e523-5273-4abe-9305-cec1037ae8f1" + "ID": "fdd5140b-3871-4d3b-8db4-097f8d990f3c" }, { "CommandList": [ @@ -511,7 +519,7 @@ "Message": "请先使用钉钉授权登录后再尝试绑定" } ], - "ID": "1681557a-350f-403c-9e5c-5ebbdb0a151c" + "ID": "19d0280b-4770-4189-b61f-5a8e4c8227a9" } ] } @@ -645,7 +653,8 @@ "21,1,1,6", "13,13,1,10", "7,15,1,8", - "9,15,1,8" + "9,15,1,8", + "21,7,1,5" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -707,6 +716,10 @@ { "Name": "unionid", "Formula": "绑定账号!$B$22" + }, + { + "Name": "userid", + "Formula": "绑定账号!$H$22" } ] -}//bj6fpLH52umgl8F4puvr7e14cqHmU2hw8nyMrG3OMcu3gz7YIZ0ZG7UdcVtOwT9B8VV7rvKqj7NN1/kNKbaIdnaUo8XDmESzkGJ88+js86Z7PWClDz8XGb7LyL1HW1bOwOfAoWXfro8kpTIPbOlOB+0CpsOCVVCfS5wHcZ+hfIjW/MWW4f+rErv8YNztsAsEkl0idF2PzI+kz2K4TuCP2n5gmzvnfhHbUD9GuebcLARJim49ZDAmDycW5kDKS/EJVzZ1xmHUr1QafBOtOpvh1A83gVwdQuKvTr/I9rBf/15Nu2br3WyikyQkrwoocmDbGtdFf0A4fs2gA+mvt3EKFq3IUyTBx6S48mX0x+ofcTWEPVdwDQMhIZtY7eXBx+qcTVR4Hr9k/zWBGus1n3HP4Iwa7tp5vm1WuPk832bwCItVPKQC0fjJ/kRYaFSGbGjSJ0Glk5c8LrUVLtuGV791xaAVehnGiOb24znT1G7SxtG2O+q+BnYfTvhCPLAONzUzMDciehWS1NlipwCmrmPP0Wtgkiu0S/j7YBeDE00gbvCHWWZorkGxN/MzrQILDYpj5wZLkq/iv0v65CTzmJWF/jB7x0uCKn5nGsjDG/3E1ZrFdgHoR6DRw4pEew1/Q2qO0XkO2yY0258lPxZ8sDnJ0bEn9hZCqX625CoXRE0USkiDi8DLAwDYzr3nAaqoSZBJz8TdqF4ndp+IPsjBXgeLXkP1mejj3bu/a/ZmsTlZsg2weAymBWymvr9Aycp5lFMPdAbdZ+vdPKT3eVGao0Zo8zXq5AQ/Fp1q+2DWw0vOatr3uZZKS7sb1Qk1qzWVg8755B0QkWmcwaO/Yj+oILPVJlt4cimvfzYPTR83t1b9aPilbZfdW5N42QMTvL3ELm5gY69JfTnCa8mvOvYb3Bya+g==|920 \ No newline at end of file +}//7mrYwdSrvICZU8WHIkRhcsMj1UPrDkaOdwPjR/3cQRE6bamtA0pl7PHg03jigvOs2G5LXeJUxsl/zeOhq5G6/RfDQ1fZB/3PQNEGgAQh8f4Crc938bXKrVccynNpF+TX2lDmPGGJyM5juvfck2eJVeayp+pNAdvOqZ8krsvFo/peUKsqMH3HUAWJ8A68tz+AjdkOdH/yBqUddM7yhrmdndg9JqSllWhLRVOafd55GXhGc0TUW2joKySZnmNgsbffHWjIWMCBWizlucESN+QuhhjQZH7/xdDoTsXU+veI05MLISzCgC/taQmHXXiXkbPFsUaEb9+KsPzKc++HzJfqoJqJbVmtNdHZ68500l6KOXrtOuv/QgMbQBCrZRUtZg07sjRHq/Ap1eY7so0xyE8ga3I08TIZ+ZeIkvJkXd9loh/qrm3yfY+IVC4/7DxKtzuhLzz+XHOtq7HK9CJXfRQ743PXn20BKBkNgNsiIQv06t8u7I0uq0uhw2jXz+aFAlm0CfccLFY4ovtkl5WovI/U9SwURItLV0MCD5r/awpe6IqYr3cs3cEIuXjzGfph3ifM6mZzkhBGvl9LcMAlO1ctCcV/JFV7hJAooW7xGR5p3Go8y4aVnH782mhfVxJzDmf1lsA8ISiORCZyC3CbChWgv9xoLQxFqgiKANtejhybPn9XKDbD1SLte+KXpTf0CiTaQZ+LEG/ckpCrUmBVY1m0Qvnz2+xd4Kt6y8tiQlGCU37tPl4jy+c8ddkGgaYCl9FSUiY7u9VMfkOcUeZAF53Y5nBcOAyKu9xJkF42/BH+MflnUa84zGQSm/e+xKSFVL10RFexVNvre8gPafn70aBjhiWUMkFMnAq35lrTufqgIiqnB+s9fp67ob0ZBQ+pydLJhEO7xmYXVNmnD9LEVuaoLQ==|920 \ No newline at end of file diff --git a/Pages/内建页面/绑定账号.rd b/Pages/内建页面/绑定账号.rd index 1b388346..e29afc19 100644 --- a/Pages/内建页面/绑定账号.rd +++ b/Pages/内建页面/绑定账号.rd @@ -6,6 +6,10 @@ { "Name": "unionid", "Formula": "绑定账号!$B$22" + }, + { + "Name": "userid", + "Formula": "绑定账号!$H$22" } ] } \ No newline at end of file diff --git a/Pages/系统/dingtalkLogin.json b/Pages/系统/dingtalkLogin.json index 641e7779..311f68c5 100644 --- a/Pages/系统/dingtalkLogin.json +++ b/Pages/系统/dingtalkLogin.json @@ -137,7 +137,8 @@ }, "24": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "IsHidden": true } } }, @@ -416,6 +417,12 @@ "ResultTo": { "SerializeProperty": "unionid" } + }, + { + "ResultPropertyName": "userid", + "ResultTo": { + "SerializeProperty": "userid" + } } ], "CheckDataValidation": false @@ -447,7 +454,7 @@ "PageName": "工作台首页" } ], - "ID": "4d688500-b3f2-4fb0-ba51-77381fb0122d" + "ID": "a9a63f43-3f22-490e-ae3d-84ea025ff03e" }, { "CommandList": [ @@ -463,11 +470,20 @@ "TargetCell": { "SerializeProperty": "=绑定账号!unionid" } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=dingtalkLogin!userid" + }, + "TargetCell": { + "SerializeProperty": "=绑定账号!userid" + } } ] } ], - "ID": "7edad714-9c9f-4402-a7a9-9fa74ecf65a8" + "ID": "ff0560af-f710-49f9-b6d7-60ec4b8eb6cd" } ] } @@ -534,4 +550,4 @@ "Formula": "dingtalkLogin!$B$25" } ] -}//u/GGd3CDsIuCW5JaKQoZmrI4CxCwhnuMy9ZGJ1Z+UuvjkEl+VXrXmAsb/4ThGbY4cWgVjSEjvdCajB0eiJarTtX3Im+zWVV/5GPhogR1IXoEykCxu3MAWGH0Wx3CHP244NI56BB6ltXG+SKu4xsomLh3D/2Tz7v+BeMzBx+23wh2RP1waArk0MdRX8uBL6qLnBXGQNCU4iFtamyP41sIpCI5hlVo+FCvWy9iI7QQPD15+8xdO4U6Us7lTVsUaZ+Etdf93VGZMoR465frqXk5GJoqtFja5InUwXjFw0k7YEUM3yB/6r6YFdPlziVnw7m8I9dNS7K+9wBgNn+fwmC0Z3y5lcSe/Pc/ZD/p27BK/8OjWWymlQgi4SgG0rQRy5TXqzRVyuQIfPEWlOLiMFF8pG/lg+o5mGWawzQay/7aS/sGbUSaETieB6usmKNQVEopZ6KDIBUOXjbd2pJYm0PQJjD8hUCSPJ5I3EaXx8rMBzQcRPymADEufkXMoc0l+iSZhOzEwvKJY201hhFLg4t6UaFhw8iYrfAt7HNAsgKK/Ict8/Ymqp4Iuhs1d4/z8P9PF7zzfetsbU7FxeLOZVmHOhLbZFAT4unDJZusUEXT3BjL+KUcpNMrXW5aor4erJ4LoN+xzSVdOOck1NqceFI0TvWj6mxIvK9z68gJfrKrOzHUmvFcsQ/UI5bVO+yo3uAA7B5MYmutBOLjP8nAciNj9rRk1tG7xaxjQbsPyR+e701E12BvoEDc2jTNJzCEBKE2GI9lqpKDizqwJ6deKzByCgoJZCk+lJjt+8IPyePulZlxUSOl3lYx0/InT8I1Uv7qZlcWOcbQPOE4pLescZdgji50aI3TO8REEW7a3BqA0ZwdXajDgUzhsIa8gtKy1aNPE58uz8jH3hR/U8fVcS4F/Q==|920 \ No newline at end of file +}//kmO9cFCR34lAKCu8QFzfJ7K0H2YqKjy0G9llmgomDq1JhvclTfWi0/9TfyQBCkY6mE9Jc6vLoOXrdg1MQyZ+9L7FOvVgHta3hrx8xqkWQg3MrDRreOm1W5y+uIXxGZl1NdpuijWd+Yx92GUSHiNssrdkQ4iKR08mQfdhF4XXQ1Hp3iCfpw9dBBtxUuLcQLvXjxDu3L8RzMdZr10sXDf9VBPhS/7+40ihAk4hYKku5AVGE64ApjZYhp04ws5LMo+V+FWibeejDGL/BQorcxZkt/F1lM8J7YCIDUqRr7aLUUY1d+35QPP5evPtcc9HjeJOCmSpl12s4Ndk5sUJb3dQmMGcm+qYtkvfxtMJgAe9oJuTVlrobUaAowHE5csTSng0au4uGMqdNfttvwFsSfJ2B/2k1YYHnb1SuxvtLzxSm+bBIQhl5KhblxfqJHJMO+rnrqbBOk2OxLQfzHqkCg0+wpoNghuUEmlLdl75WVVhObn2cOrNs9F1yvIxwl/ZfC7LoW2VyBXZwls1jAG0H/dStBVu5N9NFF4u/HarLcmS4Cb7YCEdVMP5igkZkNVW+iLOpLiC2phRiR3/g6ayHsrHbK/++D5j7E8RsIqnf8OZAMyO6LugTWh4fhhTZiOqtRtqF+xjMTzVn/f4EtM75cIu/HKs/x69/P1fPGkTzE/E3yFIwJNfbSnwzZkaY6cEh8dOUVFBjKR7ya9TftHLM6nP39zoW5KJIK0q2RJE4zLXvvy3RNL8quZygnFgviEaVrRlNoAK7EiQvc5jfS+xFQtny8uAJLYT1SGrN4AQx6Kr+28UJBlxJI812EJ5swnjU0h1ItuKh1uNyFBf/vM+szV3LQKYPhRt29WIzB+mS1GpjotkWAWBmLuyR4Ge7uulp+fShsxRoXSLBVpratkt+BwwbQ==|920 \ No newline at end of file diff --git a/ServerCommands/钉钉/dingtalkLogin.json b/ServerCommands/钉钉/dingtalkLogin.json index 257ac1e8..cd8b4ff1 100644 --- a/ServerCommands/钉钉/dingtalkLogin.json +++ b/ServerCommands/钉钉/dingtalkLogin.json @@ -53,6 +53,14 @@ "UnionId": "me", "ResultTo": "个人信息" }, + { + "$type": "DingTalkPlugin.Getbyunionid, DingTalkPlugin", + "UserName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=个人信息.UnionId" + }, + "UserId": "UserId" + }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "查找用户", @@ -61,7 +69,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "49a067f4-8cce-4aa1-8de5-932976b66982", + "GUID": "c5496bba-4833-4374-b4c5-9d45c1e8d3dc", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "用户名", @@ -85,7 +93,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "5317369785aa4514bb4dc46d3316a888" + "ID": "a41b2b5a302041d8bd180ebf72771907" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -128,6 +136,13 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=个人信息.UnionId" } + }, + { + "Name": "DingTalkUserID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=UserId" + } } ] } @@ -156,11 +171,18 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=个人信息.UnionId" } + }, + { + "ReturnPropertyName": "userid", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=UserId" + } } ] } ], - "ID": "30ce24a4-aedb-4b3d-b253-e7290a56a4eb" + "ID": "b1085d32-6bc8-41d3-8c00-a3ba9e029808" }, { "CommandList": [ @@ -175,11 +197,18 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=个人信息.UnionId" } + }, + { + "ReturnPropertyName": "userid", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=UserId" + } } ] } ], - "ID": "98f5fbb0-aa14-47ad-887d-775faf0658b0" + "ID": "dcfffb6e-bed8-4b6d-ac4f-9906879c69a2" } ] } @@ -187,6 +216,9 @@ "ReturnProperties": [ { "Name": "unionid" + }, + { + "Name": "userid" } ] } \ No newline at end of file diff --git a/ServerCommands/钉钉/钉钉授权登录.json b/ServerCommands/钉钉/钉钉授权登录.json index a1ddcb66..4e4bc01d 100644 --- a/ServerCommands/钉钉/钉钉授权登录.json +++ b/ServerCommands/钉钉/钉钉授权登录.json @@ -133,6 +133,13 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=用户信息.unionid" } + }, + { + "Name": "DingTalkUserID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户信息.userid" + } } ] } @@ -161,11 +168,18 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=用户信息.unionid" } + }, + { + "ReturnPropertyName": "userid", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户信息.userid" + } } ] } ], - "ID": "96422d9f-da59-4f2d-a70e-ffce00dd48ac" + "ID": "193133b7-9290-407f-b43a-13042b9e613d" }, { "CommandList": [ @@ -180,11 +194,14 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=用户信息.unionid" } + }, + { + "ReturnPropertyName": "userid" } ] } ], - "ID": "1e7196fc-55e2-4c56-975d-1ca79c10b2c1" + "ID": "635b5e8b-b2d3-4c0e-92a0-2f804d630717" } ] } @@ -192,6 +209,9 @@ "ReturnProperties": [ { "Name": "unionid" + }, + { + "Name": "userid" } ] } \ No newline at end of file diff --git a/ServerCommands/钉钉/钉钉登录绑定账号并登录.json b/ServerCommands/钉钉/钉钉登录绑定账号并登录.json index 093892f7..ab5bb70f 100644 --- a/ServerCommands/钉钉/钉钉登录绑定账号并登录.json +++ b/ServerCommands/钉钉/钉钉登录绑定账号并登录.json @@ -39,6 +39,12 @@ "DataValidationInfo": { "IgnoreBlank": false } + }, + { + "Name": "钉钉UserId", + "DataValidationInfo": { + "IgnoreBlank": false + } } ] } @@ -139,6 +145,13 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=钉钉UnionId" } + }, + { + "Name": "DingTalkUserID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钉钉UserId" + } } ] }