diff --git a/.collaboration b/.collaboration index b5130ec2..bc63c6b5 100644 --- a/.collaboration +++ b/.collaboration @@ -910,17 +910,7 @@ }, { "ModuleName": "PCPage/其他登录方式", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-17T09:07:35.1237444+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\内建页面\\其他登录方式.json", - "Pages\\内建页面\\其他登录方式.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_邮件订阅", @@ -948,17 +938,7 @@ }, { "ModuleName": "PCPage/绑定账号", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-17T09:09:34.8497421+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\内建页面\\绑定账号.json", - "Pages\\内建页面\\绑定账号.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_修改密码", @@ -1114,17 +1094,7 @@ }, { "ModuleName": "PCPage/dingtalkLogin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-17T09:12:38.2195412+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\系统\\dingtalkLogin.json", - "Pages\\系统\\dingtalkLogin.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/首页", @@ -1948,16 +1918,7 @@ }, { "ModuleName": "ServerCommand/钉钉授权登录", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-17T09:06:44.674323+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\钉钉授权登录.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommandPrivate/通过免登码获取用户信息", @@ -2005,16 +1966,7 @@ }, { "ModuleName": "ServerCommand/获取CorpId", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-17T09:09:00.2654817+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\获取CorpId.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/创建项目审批待办", @@ -2714,18 +2666,7 @@ }, { "ModuleName": "UserService", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-17T09:10:01.0494877+08:00", - "ModuleType": 11, - "ToRemoveFiles": [ - "UserServiceDB.sqlite3", - "CloudStorageProvider\\data.json", - "SecurityProviderV2\\data.json" - ] + "ModuleType": 11 }, { "ModuleName": "CustomLibrary", @@ -2749,52 +2690,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-17T09:18:42.814789+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\DingTalkPlugin.zip", - "Plugin\\Echarts图表-10_0_102_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\Forguncy.PassListviewDataCommand.zip", - "Plugin\\JSON 序列化和反序列化-10_0_102_0.zip", - "Plugin\\JSON数据源-10_0_102_0.zip", - "Plugin\\Lottie动画插图-10_0_2_0.zip", - "Plugin\\Notiflix_Forguncy.zip", - "Plugin\\OPENAI套件-10_0_5_0.zip", - "Plugin\\PC组件包-ElementPlus(超哥优化版)-10_0_102_0.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_102_0.zip", - "Plugin\\UI操作工具箱-9_0_103_0.zip", - "Plugin\\Unlayer-9_0_103_0.zip", - "Plugin\\xTools快速开发工具包-9_0_4_0.zip", - "Plugin\\内容编辑器-9_0_103_0.zip", - "Plugin\\加载动画-10_0_102_0.zip", - "Plugin\\发送HTTP请求命令-10_0_102_0.zip", - "Plugin\\取消当前行-9_0_103_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0.zip", - "Plugin\\富文本编辑器-10_0_102_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0.zip", - "Plugin\\应用服务器操作工具集合-8_0_3_0.zip", - "Plugin\\异步运行命令-9_0_103_0.zip", - "Plugin\\支持预览的附件上传-10_0_102_0.zip", - "Plugin\\服务端缓存操作工具库-8_0_3_0.zip", - "Plugin\\标签页和打开标签命令-10_0_102_0.zip", - "Plugin\\模板引擎操作库-9_0_103_0.zip", - "Plugin\\用户管理命令 V2-10_0_102_0.zip", - "Plugin\\网络操作库-9_0_102_0.zip", - "Plugin\\设置当前行命令-10_0_102_0.zip", - "Plugin\\设置焦点命令-10_0_102_0.zip", - "Plugin\\读取管理控制台日志-10_0_5_0.zip", - "Plugin\\豪~豪插件合集-7_0_102_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", diff --git a/Pages/内建页面/其他登录方式.json b/Pages/内建页面/其他登录方式.json index 2649ec67..8fc9aa26 100644 --- a/Pages/内建页面/其他登录方式.json +++ b/Pages/内建页面/其他登录方式.json @@ -321,7 +321,7 @@ "BreakpointIdentity": "63c3fc4c-42a2-4f0c-9427-80134ec12bb5" } ], - "ID": "1559446d-934d-4ad8-89f5-22c41e830e79" + "ID": "d0002d23-5686-4eb5-9e36-307673c7b57e" }, { "Condition": { @@ -363,7 +363,7 @@ "BreakpointIdentity": "fdf6d1df-75eb-4251-9eed-dc25845596d1" } ], - "ID": "780ba54f-05d6-4d35-8c01-53650057f962" + "ID": "3540c05c-2569-4b01-8b18-7d56b3913456" }, { "CommandList": [ @@ -377,13 +377,13 @@ "BreakpointIdentity": "4abe3d9e-71e3-4443-98fc-58e8f7c86c5c" } ], - "ID": "f962789b-01d8-43da-9036-de52908f885e" + "ID": "7c6e3d36-bc4d-4589-a241-4f808cdf55d7" } ], "BreakpointIdentity": "c329ca80-78da-4ed3-8998-c5403601038d" } ], - "ID": "cc95bd09-c41a-4bfd-8a60-eaf8e0beb6b8" + "ID": "5205c5f4-0c74-4153-b46b-ecee301c4427" }, { "CommandList": [ @@ -397,13 +397,13 @@ "BreakpointIdentity": "472cf80b-1ba2-44d7-90e4-9d3db0489e6a" } ], - "ID": "c8e98d54-b039-4b0f-a445-0aa42a049ec2" + "ID": "e2e852f3-bd3b-430f-a029-bb6e52311416" } ], "BreakpointIdentity": "4eb23a86-7b95-4a7c-99c0-88bad51a1764" } ], - "ID": "e3b52734-7b8a-4e83-bcf9-86e69ac48734" + "ID": "b6a6a81a-bf8f-431e-b219-7bfc5959eb1d" }, { "CommandList": [ @@ -414,7 +414,7 @@ "BreakpointIdentity": "0e5f874a-68f7-4fa1-9449-228845f8c2c6" } ], - "ID": "24f32dd6-6fc4-4f8e-9396-931c90f32650" + "ID": "45319227-2270-4a9d-bcbf-cf96cb771302" } ], "BreakpointIdentity": "4a77ec13-0f3c-45a0-a796-5af0ec86640f" @@ -539,7 +539,7 @@ "BreakpointIdentity": "240dfd52-b0cf-4e21-816c-d1d7f03b7c75" } ], - "ID": "ff4509bc-4ed8-4e60-a01f-eecad10841be" + "ID": "b6c779d1-17a2-4c85-b0ce-71f8010df7ce" } ], "BreakpointIdentity": "4c23bc67-5191-4dbe-b7dd-81476e09c20f" @@ -594,4 +594,4 @@ "Size": "56,68" } ] -}//FxuAajtspC5aEuJ360SJ7PgSwJ+KQpgDrr00ZRDaRVz2/9E5EctEyjJCJNHjLEIgIuCcSVGVnlOKY7OMe85PKmIjKVKTjICY7jTtIwtLclIWhHJMMfRw/a7o8ehy5ylcRmQbKT/YZMS4Qtp86fCfnuwvLCKTcHeVBKm6bvoRTn5Gw8hQZdR5txi0PVraXdKaHXdsegLw3+qAW5+/+4KX1BG9VeZhSaxBByVxLvm4HAKgZgAjeIslnzz+b8qsjZF2Pgq/cfP2f2LPDSVAr9O4ay2hhMyn1OTnLchXdw3ONZwTaLdFqHNvLAx6opGPAdYsZ0uNuM2xmt15bQazamfSbOnhkpEkVeFEm2hS25La/3Zl1ERNrTs6/mY3LvDRuYEQB4tlMQPK/rxG0Vqi/qQLboX8paO7LjqXkirdHujvitkDlQeT7j31gc5duyFwSLHuq5hAmyazRTM42qsmzrJWsignJiAZptXWSoi2Au1fh33gHB1GlbhcKKXnUilZS1Dms13p9JxEw8iYRs9N2b10FDEA6HlCbX2HiA+eZqtgBAbHkzhoSzs4gl5LAeokzG4r5fnutXLM78g8L6CsAZSva7W7+j5pLozX5dL/URRPdIryWM2YT8NbXTTuJDihrH3ht6nOOpErRyeEigdDfKoqLY1JVeZbENLYlPT/fNOtWdAqARKwDmkFXuO5HXoXCoocLYwQZ5joXnCHGpqKYAisQc8Cl4hZ+uTplFuvyQU3O36lSyWgF6ns5iHr6L/1TV4sADZyouNzcmInLXsxAsZJSlOBX6ZoSlWo6/dgKQTiLZjKSOHS8UKFyw1D+9vt4qTivSh4EruJFNEZugQ7OHK4h2AvJ60zXw6mR+jB4QQ/3kNwOgdFoN94QeGwvURnxs9FomSNtzz0eSwh4cswtuI6FQ==|920 \ No newline at end of file +}//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 \ No newline at end of file diff --git a/Pages/内建页面/绑定账号.json b/Pages/内建页面/绑定账号.json index 7466d533..e7d3e3b5 100644 --- a/Pages/内建页面/绑定账号.json +++ b/Pages/内建页面/绑定账号.json @@ -492,7 +492,7 @@ "BreakpointIdentity": "9073cea6-f1cb-401b-94b5-eb9f9535e620" } ], - "ID": "362fc9f1-7dcb-493c-b967-a1bfd1197569" + "ID": "3c5910d3-32c9-41f9-996a-a693f81a2ede" }, { "CommandList": [ @@ -508,13 +508,13 @@ "BreakpointIdentity": "950f7a9e-4191-438c-b8ee-9c6a9e27cdb3" } ], - "ID": "900707cf-08b7-4a54-8a4a-d1131d085a05" + "ID": "b6acb107-d1cb-4fe8-b503-850b90264c54" } ], "BreakpointIdentity": "c00e559e-236d-4f69-9ef2-47ae094c7a23" } ], - "ID": "f5656171-38da-4efe-8dfa-376cfd9fb486" + "ID": "f25ecd2e-0db8-4ecf-ab0b-b9921cfab05d" }, { "CommandList": [ @@ -525,7 +525,7 @@ "BreakpointIdentity": "63d41a1b-b2e5-49a0-b2f5-0751f28ba978" } ], - "ID": "6527302d-fff1-4a10-afd3-d2321437cffe" + "ID": "24ad6dc5-e522-40fe-9b95-bc9c9be23af7" } ], "BreakpointIdentity": "007f2fb8-f063-4f64-849b-e7fe290b6044" @@ -730,4 +730,4 @@ "Formula": "绑定账号!$H$22" } ] -}//Z9OXlv1g8jdNi67UzLFKR4xLtP9SftRFwnq/mwlDGZcRuFVEcVh0VCB7pw/Dip3GZFSryCHp1ajpIrP6qZwb0bDS3KUNs2uJoZcp0EW9hFY02C70sN19wqUjESs03W0NEvyl9oczCuwNUczyO610w97MPAuwxK92y/pwcxJJ+V/5xhgX8VZmAGlvXuTxs2hbcJ+mh/nuKr2AGRMVgLgJDbP8KWRnqd0FitQ2GuJo/Is4kBbLR8lU9klbKrLsMJSU6tIOmF1SatPEsYaLl6rpdAs9SwlY4INhTpJ+mLNJF1U0VCb6MyWZ0Uj1ZaJgaGU9mnFECRtnz3quNeschh3eQ0sZBA3PXvmmBNuFSNgsK76GRtQH13lg15bZo8bRAbw2Z65b2DRjlb0flwaqYOnOnhHo8VGYfbaK4ip806bplj01D91mYPu9qj99uf23dsIQ4YT8ZZ6PETbj/qqO2QO8bQxcwSXPwLBlfpH2w5RcWkY+KT0eCNc/oh90sbUXy4OT9Dtr5XxyzUDzU8GWei7UqNFbcsQE+ulqMiVInOgDzwhYhZAdQ9asEENIpsk2HZyTS+6XYhYioRKwT44iq7tC+Q3SlxOLr2P6BBywG4wNaOfEDMkNO2WjimMMt2BmV5VdcLdQkYOP98vzfSYuDZs30RHzw1d/Aorl0M2eIKwiac33U5nDDLl2/ehiGshMl2UtF6QQavAmp1lDU7jbV/ive+7FaG3JlSIrVejPNhdc8xo7bASUjhLpEoQiE88GCcIpB2IwHDu3VvGDMJXYHFeRU+om/k5acEuYGeSf1iAUBvIWJF+gQ1FtIDsvw5O+10ZXZIlojfAdO5xp7KfRTvclDwqDkk83Xt+nSy7zY7IhWxXyNlL9v1NLbMNnsaWbhdboblr5BOAevDlQYLV5X/ykYA==|920 \ No newline at end of file +}//vNxnyhau2K1QTa1ni2GJtSzHDhXV/IYhZgtPKE/e3VcMFw1EjguPYhIAqRVLDKlr4Le+xNUewrzq2j3CREO3mBAOYU99fLbI04JswKdzFAG3kCwcW/MCt1aneoCuPXD3fKnjtkPMNwpSlgIszsmStyYGVWgl8GkCipc/eVWDV14x4PKevucvWMQrlqEvkW0RdSn9Sl/CKVCF1AIBQwnPJnjiZymY4H/zOVXgJiG78Yw3R8CpkAOTT8Y9UyJKKJRTfI0/BzD+aNeAywjgALWDNXg5G+6Y/xerIOziLX3Gh4E5omFmMfFIbwdiwY9sA8JSNkXIuLO7bfeJM5TrGvBOfBGw2/8p/QuAW58WcYV+2gRwJKuSqSu57UwX5DCgscSvRQvtjxZKe4taIC+aRSqv1nY/F1Tq0AWJU0C2OFIH67OfwrOVBf9xACOfmRLM//MF595/8tFMp6VW7jyTQP4VybPpj44xwy2LM9jWel7GlAVuDXbsbQSsGKMCX3lWWk+0AXE1xf0b26HKtukoUDda+t3+0OLQBWirXGhUpiBZ592lLNmcaUJ1N3HUWeMMHGuNiMbSa32JH4RQVHuKwn37Navzb9t31wpaI4F0KVgluDitwO9XfaBAn8r9R5iFrbB0/nEmvGI5yiGJSRTQTpV0bdl8zxqboQEbLCRJo7y1aPoos1MmHuEiBfIFUSRJEapkOSBQRDb6oZvqdO6/fxDYTFw7OiAZqz4NQT9gN/mwmtLFNw/fGLXUmcoms7NjKxwmPrJb/j0/DJWJRZU6BPjyJv3UunHH1YyyS3kUY6qhX85MF3bDydNLgtZlzaLL3B6MRMCh00cFjZI9f01U1I3G2StYQE0i4Se6vXTf/FK0/4swCZf3PTlhQsqolXCYaI8ZA581Zj2J1hQDVES4O91k1w==|920 \ No newline at end of file diff --git a/Pages/系统/dingtalkLogin.json b/Pages/系统/dingtalkLogin.json index 7d62673a..17f04e28 100644 --- a/Pages/系统/dingtalkLogin.json +++ b/Pages/系统/dingtalkLogin.json @@ -366,7 +366,8 @@ "9,15": "授权登陆中..." }, "Formulas": { - "24,1": "GETURLQUERYVALUE(\"authCode\")" + "24,1": "GETURLQUERYVALUE(\"authCode\")", + "24,5": "GETURLQUERYVALUE(\"code\")" }, "AttachInfos": { "24,1": { @@ -457,7 +458,7 @@ "BreakpointIdentity": "10be88d4-742e-4906-9b06-dfc939fd7d10" } ], - "ID": "31308d31-c507-4eaa-9542-f34de5668c37" + "ID": "b0bfdce5-9022-43af-b075-940e76049703" }, { "CommandList": [ @@ -487,13 +488,133 @@ "BreakpointIdentity": "f5911af4-e527-4c1a-a95c-5507f96d14aa" } ], - "ID": "787d1da6-f6dd-4d4a-a9b0-c98518277f00" + "ID": "8906c02f-f241-44a7-9329-3feb3f218e4d" } ], "BreakpointIdentity": "f8f98264-c8b8-44a6-8ec0-b7291f36e357" } ] } + }, + "24,5": { + "CellType": { + "$type": "Forguncy.TextCellType, ServerDesignerCommon", + "SavedValidators": [ + { + "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon" + } + ], + "TemplateKey": "_RS_NewLittleRoundCorner", + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中", + "BreakpointIdentity": "004d366a-f285-46da-9158-71365ab11a1c" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "dingtalkLogin", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "authCode", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=dingtalkLogin!F25" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "state", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=GETURLQUERYVALUE(\"state\")" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "unionid", + "ResultTo": { + "SerializeProperty": "unionid" + } + }, + { + "ResultPropertyName": "userid", + "ResultTo": { + "SerializeProperty": "userid" + } + } + ], + "CheckDataValidation": false, + "BreakpointIdentity": "456b98e2-92f1-4c64-830a-760d7a016e02" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=dingtalkLogin!code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", + "PageName": "工作台首页", + "BreakpointIdentity": "b37135c5-496a-4052-b868-9f7a90cc4dde" + } + ], + "ID": "98718062-b9bc-4b5e-8b0c-5391e079f994" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", + "PageName": "绑定账号", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=dingtalkLogin!unionid" + }, + "TargetCell": { + "SerializeProperty": "=绑定账号!unionid" + } + }, + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=dingtalkLogin!userid" + }, + "TargetCell": { + "SerializeProperty": "=绑定账号!userid" + } + } + ], + "BreakpointIdentity": "4457f2e0-ea0f-42ba-8805-dfdfddcc8dec" + } + ], + "ID": "6daa0e1f-9e00-4429-99c4-b4d7921b321d" + } + ], + "BreakpointIdentity": "0a205891-f7b1-48f5-acf3-0fdd2db87e34" + } + ] + } } }, "StyleDatas": { @@ -516,7 +637,8 @@ }, "CellStyles": { "9,15": 0, - "24,1": 1 + "24,1": 1, + "24,5": 1 }, "SheetStyle": { "FontFamily": 0 @@ -524,7 +646,8 @@ }, "Spans": [ "9,15,1,6", - "24,1,1,4" + "24,1,1,4", + "24,5,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -555,4 +678,4 @@ "Formula": "dingtalkLogin!$B$25" } ] -}//p1FOp04yk2oMkUbxsBIj4y/jyfpSA023H6m/IaFBI1yVU3JsofJaFuh8+H0eQu3JvyJo9/uCT80w3BiOHwR/BzIggKMoG2vFgn80f9M44KFMeDedrR0zC8VBzOUN20o+4XlONmVJxrgw6pi75W3E8UBBv5JXfEmwI/u68lYiWvZQsyGue0+7Xas6iOtLQFQ2mXYYj6dbK8PD72NCYle8RHvmv1iaT0dZus2kkXow34T+d4SomLjk0V+88/qiaSHosfC1C/jSbhYc5SwYsLFITarNvmMRm4XwEIEVzsRpP/vF1t4VKECb/mn4CN5LGOGD23tGC/0ugf1fKCNzFVh51S69ny0fg1vAa9miKmd4AESSX3ZZHby1Y2psnv7/S83ZDYoXDPF20nCv/jK3D5Hpe8X4BtMK74s7/QzT4fdCLgGfkPVH7z0tg/OAf0z9Uek5rwO6SFq0QusAXj5Rwsbs6hmi4mWBkqlP9ofvlTqfcOQyq9XiVR9s88PuezxruoveiCN3poaIbRlmX8YFB1K/2/UaPEsBc0ZKaNJdn/pJXNGDW27uRUK1GOb6zzq6H9yunQkMVfhNlmkc3DX/iXG1n+zDW2SsAFgX3wwHzXh4rbO4geohRqLFqq9Rzc+bhJN/YP4RewVuj/Iy+MlPHJjIkX1/HxDwq8pZldpFKgxZ9wsmSntirV/HGvaMZQOv8grqEc8rpSHPjs+GGpiOHST9vk/Vj/pEEPvDjdLC6Qrkfx5kNg9BW8rJ9s5cK1bj5b08sQH2BdWhOhPAbGXEEYLIyq0Y8h5NedXY51Gc9lv0dNm5gUOU/w67CgdiEZ+BlwNkLLlL468kg/5EJG3+2OM+YGXiQSHCbkcYJqq2RxJ+kAhQcdP7Hbi6uSUT9GpBtT6LHgrNvUlsSYzoWrc292+lXg==|920 \ No newline at end of file +}//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 \ No newline at end of file diff --git a/Pages/系统/dingtalkLogin.rd b/Pages/系统/dingtalkLogin.rd index 4f4ac518..5e065504 100644 --- a/Pages/系统/dingtalkLogin.rd +++ b/Pages/系统/dingtalkLogin.rd @@ -3,7 +3,8 @@ "ColumnCount": 39, "RowCount": 25, "Formulas": { - "24,1": "GETURLQUERYVALUE(\"authCode\")" + "24,1": "GETURLQUERYVALUE(\"authCode\")", + "24,5": "GETURLQUERYVALUE(\"code\")" }, "CustomNames": [ { diff --git a/Plugin/DingTalkPlugin.zip b/Plugin/DingTalkPlugin.zip index baf725f7..1796c9ad 100644 Binary files a/Plugin/DingTalkPlugin.zip and b/Plugin/DingTalkPlugin.zip differ diff --git a/ServerCommands/钉钉/钉钉授权登录.json b/ServerCommands/钉钉/钉钉授权登录.json index 2e1503c6..bd364458 100644 --- a/ServerCommands/钉钉/钉钉授权登录.json +++ b/ServerCommands/钉钉/钉钉授权登录.json @@ -71,7 +71,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "94fbc16d-f6d4-4814-8553-62fbe1bb0336", + "GUID": "9200a335-316a-4921-b6ff-7816a4c59885", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "用户信息视图", @@ -82,7 +82,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "3a0a93fe-4057-4701-a660-6995bea54835", + "GUID": "b994108b-56b4-4c27-8d84-ad08813d4574", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "用户信息视图", @@ -93,7 +93,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "49b3c4f3-90ea-4f29-8019-7f03d15751a8", + "GUID": "a20efe0b-b06e-404e-8bd6-5d57678910d0", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "用户信息视图", @@ -120,7 +120,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "eb33bdbd8f0e4a7b9a8840b42c7fa405", + "ID": "a4e3a97103e7489eab05ac54d9562660", "BreakpointIdentity": "1bd84962-da4c-4212-b628-3d1f54be44af" }, { @@ -229,7 +229,7 @@ } ] }, - "ID": "493deba6-1d50-4118-af95-84c1e8673496" + "ID": "354ffa98-5342-4e47-bb93-92f5fe9d83a3" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -253,7 +253,11 @@ }, { "$type": "Forguncy.Model.CustomReturns, ServerDesignerCommon", - "ReturnPropertyName": "userid" + "ReturnPropertyName": "userid", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户信息.Userid" + } } ] }, @@ -261,7 +265,7 @@ } ] }, - "ID": "c5cd5d18-aff2-44b4-8f36-98857e728117" + "ID": "90b8e43e-97c6-4756-8920-8847d2b4e131" } ] }, diff --git a/UserServiceDB.sqlite3 b/UserServiceDB.sqlite3 index 9b755a5f..22dc2cf4 100644 Binary files a/UserServiceDB.sqlite3 and b/UserServiceDB.sqlite3 differ