diff --git a/.collaboration b/.collaboration index 395e7503..687329bd 100644 --- a/.collaboration +++ b/.collaboration @@ -1094,17 +1094,7 @@ }, { "ModuleName": "PCPage/其他登录方式", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T21:47:46.529023+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\内建页面\\其他登录方式.json", - "Pages\\内建页面\\其他登录方式.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_修改密码", @@ -1132,17 +1122,7 @@ }, { "ModuleName": "PCPage/登录画面", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T21:47:46.5290457+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\内建页面\\登录画面.json", - "Pages\\内建页面\\登录画面.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_两步验证_扫码页面", @@ -2378,72 +2358,26 @@ }, { "ModuleName": "ServerCommand/钉钉授权登录", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T21:51:30.687886+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\钉钉授权登录.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/dingtalkLogin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T21:49:16.9353903+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\dingtalkLogin.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/dingtalkLogin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T21:49:16.9355009+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\系统\\dingtalkLogin.json", - "Pages\\系统\\dingtalkLogin.rd" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommand/服务端命令1", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T21:39:55.4501023+08:00", "ModuleType": 15 }, { "ModuleName": "ServerCommand/钉钉登录绑定账号并登录", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T21:42:05.0194288+08:00", "ModuleType": 15 }, { "ModuleName": "PCPage/绑定账号", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T21:47:46.5289019+08:00", "ModuleType": 1 } ] \ No newline at end of file diff --git a/Pages/内建页面/其他登录方式.json b/Pages/内建页面/其他登录方式.json index c95a4ea9..4ca0df25 100644 --- a/Pages/内建页面/其他登录方式.json +++ b/Pages/内建页面/其他登录方式.json @@ -261,9 +261,25 @@ "ResultMessageTo": { "SerializeProperty": "msg" }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "unionid", + "ResultTo": { + "SerializeProperty": "unionid" + } + } + ], "RefreshAfterFinish": true, "CheckDataValidation": true }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "info", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=其他登录方式!msg" + } + }, { "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", "FunctionName": "remove", @@ -292,25 +308,44 @@ "PageName": "工作台首页" } ], - "ID": "cc0a5274-fc1b-4a76-b228-d05605116666" + "ID": "091379a1-420c-4e5d-8704-5b5fd0b31607" }, { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=code" + } + ] + }, + "value": "300" + }, "CommandList": [ { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "FourStandardStyle": "warning", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=其他登录方式!msg" - } + "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", + "PageName": "绑定账号", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=其他登录方式!unionid" + }, + "TargetCell": { + "SerializeProperty": "=绑定账号!unionid" + } + } + ] } ], - "ID": "2c19c711-7c3e-4cd2-a828-bd71801242e1" + "ID": "8879dd46-a201-4118-9446-8f8ae9b21d4e" } ] } ], - "ID": "45a41780-2dc8-440d-8b9a-f6b7e56a3a23" + "ID": "cdaa0544-c92a-4d70-b0bf-693f89ecde11" }, { "CommandList": [ @@ -323,12 +358,12 @@ } } ], - "ID": "28ed395d-d198-4b46-b545-7cc0b86473ae" + "ID": "d0d27753-c0dd-4d58-a55b-eb39aef3dd06" } ] } ], - "ID": "b666f36f-8622-4be8-923c-f521121ff0d1" + "ID": "39f1bdff-5bcf-4fcd-81b1-c7af82887c34" }, { "CommandList": [ @@ -338,7 +373,7 @@ "redirect_uri": "https://www.yugasoft.cn/clue/dingtalkLogin" } ], - "ID": "8b65df8c-413d-4042-a1db-872f59006ff1" + "ID": "979d8cb7-c7fe-4efd-8c91-3c29aee3bc40" } ] } @@ -461,7 +496,7 @@ "MethodName": "ExecuteCommand" } ], - "ID": "f7aa0799-a710-486f-bd85-09fe2360fcab" + "ID": "5d4409bf-a92c-4781-9816-50a09b5848d3" } ] } @@ -475,7 +510,7 @@ { "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", "roleNames": [ - "FGC_LoginUser" + "FGC_Anonymous" ] } ] @@ -514,4 +549,4 @@ "Size": "56,68" } ] -}//cEI4OGokX9bOTv83QgAICwNyQIcN+g62BFhCnxdF2YNI17NbJ5gy994SApWvJpaTwWBhH/Alfnw+PONkg8RL+BDurwge9v6LnQtvClrMovF+U2xoAhYWPHdfm99N0UkTXigDjxEQGzGYBIh32fUzho4qlgZy6Q5cNbDmDzN0aChL+fk3K+1sYtC+5KQ+q/vHJk5xZkmtp9zpf1Z6V30C2MqdpEP0FUDep/1Ut7T/dBK+Qz0mdG18FBVZbn2tNvCl26IbwreSFT3vHl2pGnmvpEMLDjVQIMYRnGhjfZKDaugbJU8RS8BtMdeHHxEZSdf3mlFtfHaIjN4aqIX3dxxT1QyO2jsRN0aN2YEUaAnUdu4GmODfTeI2TYsAyIueVMpJTI8qn8idhZjHfnaMlbKpzpZ0N3UvswMJsIX8HBmUo6n1qyXOmu3ElDwubxjHXf2o25haFI4nQse0oTBJ2w6w1u7E1lbquMrzbXf+fCCx4TvZJRLOialx9xdBhynZZKtaHkhpWDDW2DJAQ63/TAqF7+jQ9Rqe7M9yGLoPG1vPizuXNR/4aePrwt0Ima5iOPurbjzjL+c0Zgz3lW0cWHoO3WQJK6ouEyVs0xJAec9a6ijgTldEKBEW/Oa/LSxtjGQLxmaCCo0IlkUQReLc6HTfx0BzMhrSvOhXXHOpFzAPWga18CqTsOVBYfnJ3+16cMP+FYFU8bryqWRvp7IlkMc0F46JEBZ1OKMxhVgyRqMDMD6EsPpddPirEyqgwStfBNuLBHQlQg8ZqCT2ocs0Z28968XAYbInQbot+Fx9KejCtcUHb694R1t8ZjcWScCwAp6/xuLn6572s+tVhgbwQwpE88890R6qw/484EA1ixp4M/15E7fb6ZRfolISDooIxt87rHaCWCy0HqglEVzWicyQFg==|920 \ No newline at end of file +}//gt0Ib+REtuFYURi13zRENQk0l2nX5VbqV3Bh8dYDyu3FsIwhWvTSZdL4JPcPSNFtWY/2eMz2pTW37HM9ohuayjzZCFHasIM9BXA6DuHA1RGKmhQB3nGqrT+2XuLcQ1sXwDnmMHFfgSULJjHVAl+XkZzWKi3f55uJvG6MkotOq4FpeVbq4H1+GVhT/oNqGjSyoc9Y5ClsoppqhlYHlnBq04wBH4Owzso0dbGi3anUrMSVqFPOKBe5kxEM6lJOgK03cTpVQ4AxLL2h8ovzY8XeLgCCD3horSo0PsWXdQGOLfVFZ8xM0KqWG59OF/z/NsA3d8f39pbEV9QSr64VeuR2Af7lws55WVdW+MgnOd81M9O/zItKn7SbrOyHcHTbPjyGxmUjJzdcValgMLeRo9EidF4ftX9K9yidfrHW+7erzsuVnF0hoJL4fCokxo4G7dgv1O7OeBXyizYyBubod3PCemSTxwklQ/qs0oUmSVJ4SnZsRKBHCjNfuZVJS4+lnmuoJmp81hYNOGu1pt8uvDz3CV+0SJVtsIS25hOmFnL52jMqD4M2F0+PkEbOoz3dnWMjU2hboLxQQFP9Bo1iHczXEiBGfRnYK3TTV5xImh7EAhfC3v6rnzUVfHd8Fw1hSld6Wj2cw6TReqVgGgPYqKr+bS31dRt121g5Oy/MFv0ZgsT6JI2IM6sSS1lptrPnRVz3q+mR1zuT6Fw1USBE/swcrPbwuCzu9y0YaaxeVG9z3PwtvDq/UEryIriv7/oS3hbATEOLDf2lNbtblLJX+IceYH7KMT/KvvvG+u2F9ADOiWF4dDqw+jKUIAAT1ryVn/uEdnWL+1feOUwV/SIj0dDJmjfSp2LLJDp9WNXUpgTpkxbssY3jKb842X2RF7cmY1BARzHnmoOqSVOHTles4PbVKg==|920 \ No newline at end of file diff --git a/Pages/内建页面/登录画面.json b/Pages/内建页面/登录画面.json index 3cf3041e..0ce94cb0 100644 --- a/Pages/内建页面/登录画面.json +++ b/Pages/内建页面/登录画面.json @@ -238,7 +238,7 @@ { "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", "roleNames": [ - "FGC_LoginUser" + "FGC_Anonymous" ] } ] @@ -260,4 +260,4 @@ "Size": "107,40" } ] -}//SzB6nLDOdy+1SjsAPOIbnNQeENRr1jlrUThF49FShdXy4oE13X7mk4g0GsEO+QSvGdZNIH5qP+EleDZB124/wWUkM3LXz7D3wE9pEpJp2EZ+9Grx2qw1OevwJ3KlqKuFiWs+ly5wPy4RAe1Cp6Rv+CoVeW+VZszkBzyMU5t/1YUUPP+JWlgpPKxoC9m/DmdrNzrqTeXxkAvQbCdCNxD4SNZZojTMhe1Yk3R23g8MI4oip5UEjtOjTGCF3Zkf3ayte4o7lw6Y4jv7WB2dBAZDXaIfxltT/c4GZOcDcnz4VGZbdbSRqR+UYr3zANsUL0tZKwJOcUz2biBhBgBMpWRS0u8hblTSKARUdmw4ozXFZl+h9oS9+bdnAV2rA9jlyTIc9T0QnfrhBORUCs2M/3Be2YAxAg6vnTQuZ15TFzePYe0229bnmmuXPN+lggisvMGtfYiFQmJ0vOaMpTgEJ9enJuaCISA8JyiaZOzsnPP6x4UHawVWpWUGvTQda01457VIddNROJdBcI1fe3ULa7mZqOCG80lMjgeT7vTIEmya5XKGKwumf68TDwlojVtNM3jG8ghHMQPAeb80ISq680U7l2SgzqPuA5Fp7WpMjOQYXS2pgPw2tUjVe0uEgZs0T8j4B7gdwBIKOXHdpQqEo6GVfSO45JdvpU/AdEVCUAjND+D8Kxn0tDwbCPRZCyF5TpJkhqvFm29UyuPDV45Wx92ZGGD9E/evUAAX3zrGLmz4WkXI1G0f77E6grCYu0l2QL3JUa1dM4jY/plMNHwlQn/oz6h/G6VYSAMzHy3FMQvY1bYTw1K6k1AIRk9Lxc86dVSLCYC7nvSB1jxURQoJWflbuHqceck7t3mxOJF/0+L6SIRd/dkgf19ySkvIPBvPVpFiBV5TAvOcNnSXOahyy5HKKA==|920 \ No newline at end of file +}//8K+pPJU58ZRTib6iPEl9ZnNlLo0vicIBKiJ2LyUm6kxshSvtl/LOVorSOpGjPm+88n2BCGpyupzBuxDRPTQf0Tyk0yRb0D+GLD4QRSG1ZK48idCuIfoClF9TbQIEfK64ZL9Sm52V6MI5BHvHb6NFve84U3hevQA+zbl9RGlMfdkt67Y2wQ87vZIbnSFdZPo2UeIyG3bMHXb6ZNs6TVDq2DozgSxxWGt3+T7FpNixP6z374aeTSuDnSs6BqJjBdI5rCpW8oylAV1T411lWM+kLIeR+FlNAqTwPKbbRQY9ja2rv3LjFntZQ9L8sa5uFnBic9yfHdcUt1dE8DzxlQ38vwXD7VNG0nhrwdodgLJAUvJjbd+1dlOqDKP2C9v/Ua1A3H3/j4/5w7xqwe8E7LEDAkfyYmDHXKIR7RgfLfaIlG9uZ9xsiOjpdlNsXS3F2Ti3bfvkIBBiOyt8o23jGU8/MzV7UKbJAd+CjIXT9DUmYeM7sIUsEAr4K/j/Ra2QCsvNbs8vJJ8eMpiQ8wyXdkpTPc244X/TrgOWKZ+PiTHeOD43Y/X4ZEa0T3fEP8Fro6P7jAZIcTFX/H7Xd8V5FcYccMrVwthziXYnMProHFrDIEaVab/xZGVXZzJaF+IHyF/wKKoxwoxN8MPBL1sJG4KCVU8a1V4haAmFp4KxK+UxYv/qj430ny0vMXLdfQtYaAxKB5VpGHCHR7oDi4IlQ+/+sXHPpFWlRYh25BLuP+ALrzFsCSl1Z8ruToFJBMTfOkRBML0WSwdDISsOGl0SBU01pmnyZFfGjBJ6OPBfLc8snfPiDU+BU02dV7TPXotId9/UT0VgYUBgpvdO1VgCUzBtMvcU67YWmNxHLjuvhoFxUB4b2C8cf6MriOVF+Nip/UxBMQRxRDA8kFx2A8NWI2zmPg==|920 \ No newline at end of file diff --git a/Pages/内建页面/绑定账号.json b/Pages/内建页面/绑定账号.json new file mode 100644 index 00000000..4373d335 --- /dev/null +++ b/Pages/内建页面/绑定账号.json @@ -0,0 +1,713 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 39.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 40.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 40.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 40.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 16.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "InLogicalVisibleIndexes": [ + 21 + ], + "Count": 22, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "29": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "30": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "31": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "32": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "33": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "34": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "35": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "36": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "37": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + } + }, + "Count": 38, + "DefaultSize": 32.0 + }, + "Values": { + "5,13": "绑定账号", + "11,13": "绑定并登录", + "13,13": "返回登录页" + }, + "AttachInfos": { + "7,13": { + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "text", + "placeholder": "请输入", + "PrependText": "用户名", + "resize": "none", + "clearable": true + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "9,13": { + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "password", + "placeholder": "请输入", + "PrependText": "密码", + "resize": "none", + "clearable": true, + "showPassword": true + }, + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + "11,13": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=绑定账号!unionid" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中", + "VBalidate": true + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "钉钉登录绑定账号并登录", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=绑定账号!N8" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "密码", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=绑定账号!N10" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "钉钉UnionId", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=绑定账号!unionid" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=绑定账号!code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", + "PageName": "工作台首页" + } + ], + "ID": "1aefa758-01f7-4924-b30d-f578db855197" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "info", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=绑定账号!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "ef33fa40-d8a9-40e1-9618-31d2b180b8b3" + } + ] + } + ], + "ID": "d9ebbf6f-eeac-48e2-965e-69bb5be09cc9" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": "请先使用钉钉授权登录后再尝试绑定" + } + ], + "ID": "51ecec51-1920-4f80-a483-67d1bc441c93" + } + ] + } + ], + "Text": "绑定并登录", + "TemplateKey": "_RS_Main1" + } + }, + "13,13": { + "CellType": { + "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", + "PageName": "FGC_登录" + } + ], + "Text": "返回登录页", + "ClickMode": 1, + "TemplateKey": "_RS_Main" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0, + "FontSize": 21.333333333333332, + "HorizontalAlignment": 1 + }, + { + "FontFamily": 0 + }, + { + "FontFamily": 0, + "Formatter": 2 + }, + { + "FontSize": 13.333333333333332, + "Foreground": 3, + "HorizontalAlignment": 1, + "Underline": false + } + ], + "Types": { + "Strs": [ + "Body", + "Center", + "[AUTO]General", + "Text 1 50" + ] + }, + "CellStyles": { + "5,13": 0, + "5,14": 1, + "5,15": 1, + "5,16": 1, + "5,17": 1, + "5,18": 1, + "5,19": 1, + "5,20": 1, + "5,21": 1, + "5,22": 1, + "6,13": 1, + "6,14": 1, + "6,15": 1, + "6,16": 1, + "6,17": 1, + "6,18": 1, + "6,19": 1, + "6,20": 1, + "6,21": 1, + "6,22": 1, + "7,13": 1, + "7,14": 1, + "7,15": 1, + "7,16": 1, + "7,17": 1, + "7,18": 1, + "7,19": 1, + "7,20": 1, + "7,21": 1, + "7,22": 1, + "8,13": 1, + "8,14": 1, + "8,15": 1, + "8,16": 1, + "8,17": 1, + "8,18": 1, + "8,19": 1, + "8,20": 1, + "8,21": 1, + "8,22": 1, + "9,13": 1, + "9,14": 1, + "9,15": 1, + "9,16": 1, + "9,17": 1, + "9,18": 1, + "9,19": 1, + "9,20": 1, + "9,21": 1, + "9,22": 1, + "10,13": 1, + "10,14": 1, + "10,15": 1, + "10,16": 1, + "10,17": 1, + "10,18": 1, + "10,19": 1, + "10,20": 1, + "10,21": 1, + "10,22": 1, + "11,13": 2, + "11,14": 1, + "11,15": 1, + "11,16": 1, + "11,17": 1, + "11,18": 1, + "11,19": 1, + "11,20": 1, + "11,21": 1, + "11,22": 1, + "13,13": 3 + }, + "SheetStyle": { + "FontFamily": 0 + } + }, + "Spans": [ + "7,13,1,10", + "9,13,1,10", + "5,13,1,10", + "11,13,1,10", + "21,1,1,6", + "13,13,1,10" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_Anonymous" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "BackgroundPictures": [ + { + "FitToBrowserWidth": true, + "FitToBrowserHeight": true, + "Repeat": true, + "Name": "0836c07e-2331-40e1-8616-499013a014c5.png", + "DisplayName": "背景图2", + "ForguncyPictureName": "d3148bd6742da6598200d24b4966ba9f.png", + "ForguncyPictureSourceType": 0, + "Stretch": 0, + "StyleInfo": { + "Fill": null + }, + "IsAutomaticFill": false, + "Size": "1216,711" + }, + { + "Name": "dce27f64-d790-4a87-a15d-5a87e6ae7455.png", + "DisplayName": "背景图1", + "StyleInfo": { + "CornerRadius": 10.0, + "Fill": "Background 1 0", + "StrokeDashType": 8, + "Stroke": "black", + "StrokeThickness": 0.0 + }, + "IsAutomaticStroke": false, + "IsAutomaticFill": false, + "Location": "352,128", + "Size": "448,359", + "BoxShadowString": "2 6 0 12 #08000000" + } + ], + "CustomNames": [ + { + "Name": "unionid", + "Formula": "绑定账号!$B$22" + } + ] +}//2HW3rAApJxfctmZ+k0+89pZGVb4fkWtHnGeRqUmNuCijSonIH/Yvk6p8wcq9CqmzI+NheaMZOU0qv1niO4P9zdIM1CPMQcSeE4XTxvEaS1ZQKPGkcAxzkZO7X4B2iDuLPcEkSkfMk5hebDhHQmLOBLs5znX4xQOvCO5oHe9YHBelBNxe8ZvB4bzIMuo++IC3wUyNz4xBpE/cUI4aS612kX7P/3darSfG1cVMMNkPGLdAQhm6bqlvsNbbkJZYsA+vwDk5aE3OcQGFBg9Y1LHuRhHcuLBBa5KI6S4YasLw4jkf/CwZWhLlsweDzl9qOpPGA+4MXUKQ+Z6hj9mREyboDGCpg2+FG+MzvbhzlCRjKJkJ9KSTMGPvYa4NTTmhHdj4pMidxPso8y+7DFvU6F4Wt7fK/Dc64LuxR5HmWFPQu7ormwn/DtXEEYkK+7JMC8FlIfywtGHRFN+YI9cKNjZr0rN87zmtTLa46diK0h77C2u751HQ+qDaf+ghKDOTc0tYAznfmPSIItkf7lup0NSGj6W5ZPRVRizu59deHiZdu4Pb7hheZKBMzbqpbFowFCNsmGfZDAXIbDl72K32YwfGNcYIH3yCeo95T7hfmJlnvseU7JkgQGUOt/Wrw8IF9Cy2Hj/ZnbxaCJP/JCfnjNcNfbE7t77APdqIZglU1y8OKe72/+5uxGO72FnmtKWIZoA6D8hdgUP4z+UAOZhXb1aHjWgqXn95Jn2aXZxrVvKQDhYXrSy8BxJzfrY0JOXLQ2BJO6ZTPDnEqZzlC1nU6elQF/OIvMWO36gf2Uer9SuJIlBv4xQK/ks6szOnIu9CTCalCCZ44+etga4+v2WuR2ISqhVNnmUHfVfZQytPSxsWGedj7h1Z8GjvBBE8J3S7z73bBOmqGpquBaSmTfEplzF40Q==|920 \ No newline at end of file diff --git a/Pages/内建页面/绑定账号.rd b/Pages/内建页面/绑定账号.rd new file mode 100644 index 00000000..1b388346 --- /dev/null +++ b/Pages/内建页面/绑定账号.rd @@ -0,0 +1,11 @@ +{ + "PageType": 0, + "ColumnCount": 38, + "RowCount": 22, + "CustomNames": [ + { + "Name": "unionid", + "Formula": "绑定账号!$B$22" + } + ] +} \ No newline at end of file diff --git a/Pages/系统/dingtalkLogin.json b/Pages/系统/dingtalkLogin.json index 3922f54b..641e7779 100644 --- a/Pages/系统/dingtalkLogin.json +++ b/Pages/系统/dingtalkLogin.json @@ -410,6 +410,14 @@ "ResultMessageTo": { "SerializeProperty": "msg" }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "unionid", + "ResultTo": { + "SerializeProperty": "unionid" + } + } + ], "CheckDataValidation": false }, { @@ -439,26 +447,27 @@ "PageName": "工作台首页" } ], - "ID": "4d92d47b-1e90-4b47-ad9b-aa9c7f3aed2d" + "ID": "4d688500-b3f2-4fb0-ba51-77381fb0122d" }, { "CommandList": [ - { - "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", - "FunctionName": "info", - "Title": "温馨提示", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=dingtalkLogin!msg" - }, - "BtnText": "知道了" - }, { "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", - "PageName": "FGC_登录" + "PageName": "绑定账号", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=dingtalkLogin!unionid" + }, + "TargetCell": { + "SerializeProperty": "=绑定账号!unionid" + } + } + ] } ], - "ID": "a5ad277e-7a9d-48eb-b645-2b9baa24a09f" + "ID": "7edad714-9c9f-4402-a7a9-9fa74ecf65a8" } ] } @@ -525,4 +534,4 @@ "Formula": "dingtalkLogin!$B$25" } ] -}//eMUL0ZzkOspSg8S2cqdXQvbqsheEL6cNDl/glh4D8Tn6Lmn5mtML4YDOu51zj8RX1eXng9Ye8OoK8JKDB9VEWDgIKbmx2I7YOtuPx3/xvyhfolWG6DkCwtLxrxW2V4RAPjIP/Lmhpk5iGW6izgm4F6d2oIvHaxFom0mh2UKXBOELdnRs/gmMgdwjU6V+m9uoTC/Um0ghBOBJTsFDjUjz6F14yf1uCbJrKZzHQoeuVWf94yBBiLiWI4h/6oiUweKvPWRF4ICK3CgO31UEKsuCWzKYT8ualbVhpROoi6Ff/s3NoZUntd2ZSkNh/tdf+v4Wotf4JHHU3/lIPHJm/Py1kuxp/sdEx0Qc5M3y2J3NQDjQC00CwfNc18PXL1V3j+R20zPOXXPhrv63HcqOR/nPsGYFlWqfk6SmMnjRPH3ICA227ueXx1r57Y0XkQ200IfQvaew2Xr6uDYHMCb/Mq8pTb/uLBB33cBE6mAwsBIj+GLq5kB0H432pe37mrBhPx9pAYMBrcLQoLC+BWEGEG8iTFnCWD1NezOIJN6bOtkTlfT9hdZpiguLx3S8Yp7gPWiuVfG8UBCANKqJ9MGADNiQxCzQI4i4LH02PCxtyE+qhcCZljf47zW6jcFmoWjRkw4ui5pkrAQ//TQW/BWqkCHTvBwHd3b0Jdwe1oQ8MtnPiM5I9i5q77ufkwOl+GFVS3gUaU8rpNtQ6u+hdOYoKnSlmI5NWDMHYg3xv4/JauEnm9xNhssjP0Ey5mq60jiiMAzH1ZC7s+/WCuD0gncJVGZhO6rTPY/7qed2n9sjBNu3GkrUExncuhuhczIRt5Jar6ibmByKcPpQ9+Bn76nn41ah2MBS/cPdn3MVzoQeM6TKDCIQsIKGOr60eGfIKw4hokSM8BNkI744a40fi4u7SMB19Q==|920 \ No newline at end of file +}//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 diff --git a/ServerCommands/钉钉/dingtalkLogin.json b/ServerCommands/钉钉/dingtalkLogin.json index 5777ea60..6ff359c6 100644 --- a/ServerCommands/钉钉/dingtalkLogin.json +++ b/ServerCommands/钉钉/dingtalkLogin.json @@ -148,22 +148,45 @@ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "0", - "Message": "登录成功" + "Message": "登录成功", + "CustomReturns": [ + { + "ReturnPropertyName": "unionid", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=个人信息.UnionId" + } + } + ] } ], - "ID": "711e6405-f2b3-4a58-aaf2-86afae80e8d0" + "ID": "4dd0f710-998d-4ffa-897c-4e8753a5daba" }, { "CommandList": [ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "400", - "Message": "请先使用账号登录,前往个人中心绑定钉钉后方可使用钉钉登录。" + "Message": "请先绑定账号后登录", + "CustomReturns": [ + { + "ReturnPropertyName": "unionid", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=个人信息.UnionId" + } + } + ] } ], - "ID": "f355aff9-e63b-4147-9319-e09f6f808512" + "ID": "b243fcc0-0a99-41d0-961d-5c3c12325553" } ] } + ], + "ReturnProperties": [ + { + "Name": "unionid" + } ] } \ No newline at end of file diff --git a/ServerCommands/钉钉/钉钉授权登录.json b/ServerCommands/钉钉/钉钉授权登录.json index 484da18e..50df6042 100644 --- a/ServerCommands/钉钉/钉钉授权登录.json +++ b/ServerCommands/钉钉/钉钉授权登录.json @@ -127,22 +127,45 @@ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "0", - "Message": "登录成功" + "Message": "登录成功", + "CustomReturns": [ + { + "ReturnPropertyName": "unionid", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户信息.unionid" + } + } + ] } ], - "ID": "1e2e9225-9a6f-4372-a72f-df5bdf80e57d" + "ID": "48ac56d7-0d09-4974-be05-12264d670c4e" }, { "CommandList": [ { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": "请先使用账号登录,前往个人中心绑定钉钉后方可使用钉钉登录。" + "ErrorCode": "300", + "Message": "请绑定账号后登录", + "CustomReturns": [ + { + "ReturnPropertyName": "unionid", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户信息.unionid" + } + } + ] } ], - "ID": "e3e5479d-4ca5-4c73-821b-9225e1f99b96" + "ID": "2aff1f93-355d-4519-a2a8-36479fd08485" } ] } + ], + "ReturnProperties": [ + { + "Name": "unionid" + } ] } \ No newline at end of file diff --git a/ServerCommands/钉钉/钉钉登录绑定账号并登录.json b/ServerCommands/钉钉/钉钉登录绑定账号并登录.json new file mode 100644 index 00000000..65105307 --- /dev/null +++ b/ServerCommands/钉钉/钉钉登录绑定账号并登录.json @@ -0,0 +1,111 @@ +{ + "Name": "钉钉登录绑定账号并登录", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_Anonymous" + ] + } + ] + } + }, + "HttpMethod": 3, + "Parameters": [ + { + "Name": "用户名", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "密码", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "钉钉UnionId", + "DataValidationInfo": { + "IgnoreBlank": false + } + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$type": "UserManagementCommandsV2.UserManagementCommand, UserManagementCommandsV2", + "OperationType": "101", + "CommandOperator": { + "$type": "UserManagementCommandsV2.LoginOperator, UserManagementCommandsV2", + "UserName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户名" + }, + "Password": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=密码" + }, + "RememberMe": "1" + } + }, + { + "$type": "UserManagementCommandsV2.UserManagementCommand, UserManagementCommandsV2", + "OperationType": "202", + "CommandOperator": { + "$type": "UserManagementCommandsV2.UpdateUserOperator, UserManagementCommandsV2", + "UserName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户名" + }, + "ExtendedProperties": [ + { + "Name": "DingTalkUnionID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钉钉UnionId" + } + } + ] + } + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "登录成功" + } + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionCode" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + } + } + ] + } + } + ] +} \ No newline at end of file