调整登录

src/WMS.Web.Api/appsettings.json

@@ -31,8 +31,8 @@
     "Url": "http://dev.uc.f2b211.com",
     "AppId": "100528847652388864",
     "AppSecret": "fa950a1fe690fe610338084b49db7db9",
-    "PublicKey": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp1qwbX5gSCAGTG//J4i485eVp+HbM36MTNnBCF6GVru9MA8ARHF/zktBxxqJRQOpTE0HZgWOf3bbSMPHjOq/Krn2uFUwTmgwuPzOfvckCFFCs6PMiR1pl4vsz1fLiFaaaZg3W8ynXl8e9uxVXFCn/Wt1sUAdf5zlmOPHMCdErSrMlNtW79ObN4jfFTLzYJf87+CfLno+Airh/oUK7aJpRjhIKb+1ED6WQa3HZeUyLTpvLgu3VFwmDYqBUUTe3XtvQhsOxlTyIYI1S8U/CB4weRJoAFalOVw6okNl+gM4Ccpm5VDHtyD0QvbL6UgxlI9GXeaTiPBhJyp7Z5MLcRzTrQIDAQAB",
-    "PrivateKey": "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCnWrBtfmBIIAZMb/8niLjzl5Wn4dszfoxM2cEIXoZWu70wDwBEcX/OS0HHGolFA6lMTQdmBY5/dttIw8eM6r8qufa4VTBOaDC4/M5+9yQIUUKzo8yJHWmXi+zPV8uIVpppmDdbzKdeXx727FVcUKf9a3WxQB1/nOWY48cwJ0StKsyU21bv05s3iN8VMvNgl/zv4J8uej4CKuH+hQrtomlGOEgpv7UQPpZBrcdl5TItOm8uC7dUXCYNioFRRN7de29CGw7GVPIhgjVLxT8IHjB5EmgAVqU5XDqiQ2X6AzgJymblUMe3IPRC9svpSDGUj0Zd5pOI8GEnKntnkwtxHNOtAgMBAAECggEAeuOBQiXWlZ/OgDqNZn5jMZxR7KFQ0RNP+u67bGXcx7u8RJn/XELr0pQ4jPfTbLYvjzPRBv11keu5QklhMvz9u2Yq4VjMzAZ+IJijGWBpOSJSlI7nFphefUXmcqrJbigJ4xg/Lk2taQL4PeF1HQCtGs3Z8npeLuMLRaWdEqMDLxRaYXCYoz/ZNvvbpIe8UBNDha13wpr/cvbiHWxrYUO+J13IkLAUce4IvCp1SJ1D0ljsfEWJ93+/mM0T9r6akCG4xXz38V3jyWSshHoeAaVQ4eWNoUcOizMF/1RKg/e/VmbLTZzQ/MeHXACYVD126iNk2orQ53pgFLFrrEvNHQJREQKBgQDJFgmp8QNiVWn4Yot+nFDNri2gatgMzvYFRCZNxzMO5SEOk8X1yCR69hPSMnMRHXvqOWzD0cBGu9G6g4hbymFDf/bkhLApe/8K4pclGYclKm1xerl+O24s8UEm4YUX6bDcZUW99rr3uWvXybJTo0iIFUo691NCNB11UWrJGAwtGwKBgQDVDnQVHHkK0mPqCVhx8AzHEqBOHF72gPzfg4skfX1LIJ4b3jvEly4zVAK5ipaj99LIVngmGshZU5HE7p57NVZtLBkoEtfCtrPs7nma4VDgPnW6Px1wxfWfSWncvuYS8VGO0UiEy7ysfZWnpP3An33GRiTp2GOxZF8XrLRZMlH21wKBgGoLxzjqM8CuDt7BCZPR2ANAciuBbUMD+la4pAKspM6cI5zObb26uRJnp/hYRrql8+2IL0Xt3hrvfiGAsG7IAhdY6tmE6GpYTB5vdQpJti3xfBo2gJCDwwzMhnF8yXXc9jqk5ezSq7NtA+SfJ/5XxC6QG7+RI0VsuoReVZSLrBA1AoGBAIH96ZGf57JUn6WBwjbyUbl8gdZmtQINvTvalKDU+AdIhW9XbnwKCaRDk84E4th0MmUNbQ1Ctg7aUEwpkwR1jJ/bkhXDOWWR98GN1yBKbQAE2+ug6qOOBMkFD9QhnVrdZfePdYGglSNhFFhO8IwAQ8sfrRIIdvsa1HIra3Yon53NAoGANkpa1YgEwAq3DFB7Vt2dBzABdfSCRIG6LqD2DzHt79q4Xxu6ifnAt8p/V3GRHiUeZMzxWCoYT20IBvUcNWN8SoNW683fMZYCzepxdIA8mlToPCwRRm1J1Kn/ATX1KiaScGnzdjth6aalsysCURBHWo35VufWParDjbOCr8cxQAE="
+    "PublicKey": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4RaUAcPIEzHkMA0dvp51SbvC+ASiitHw9h6sCq8blqh8Cmx+ZfldxmX+sGqUDL40Eo07tQGWpY8WTlUROCOB9PIfZC6Wb+ntM6x8FzvcW5xfiKDfd6tbp5+ztFHVvutde0ceYk4VjOw5Q1wGJENZoQxQGd6/tt/cHbyNKF3HeAPCLJkMriKBXn3k4r4kix5oetVpaacFABBMRS019n/k0S8fg2H+72WaPVJElRk/iCkQwBA6JIKt/iSVXR8qMe+K6NTRnND4j5i7Ai0TgEV8MRlRMRVK7q4MyO0TPky//0HtVULdhb+G/XbF08ZgIgXlFBroQCEEj0RqdLio0Bg9wIDAQAB",
+    "PrivateKey": "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDHhFpQBw8gTMeQwDR2+nnVJu8L4BKKK0fD2HqwKrxuWqHwKbH5l+V3GZf6wapQMvjQSjTu1AZaljxZOVRE4I4H08h9kLpZv6e0zrHwXO9xbnF+IoN93q1unn7O0UdW+6117Rx5iThWM7DlDXAYkQ1mhDFAZ3r+239wdvI0oXcd4A8IsmQyuIoFefeTiviSLHmh61WlppwUAEExFLTX2f+TRLx+DYf7vZZo9UkSVGT+IKRDAEDokgq3+JJVdHyox74ro1NGc0PiPmLsCLROARXwxGVExFUrurgzI7RM+TL//Qe1VQt2Fv4b9dsXTxmAiBeUUGuhAIQSPRGp0uKjQGD3AgMBAAECggEBAI/1MJDjtwdQPwJznKdobTXeJMdFwzrMpbhq34NzIojhfkziWNdFwTzhS6aTzEaXsK3hjTXx6C++jQa39dTIzdJZ/iSTo9IUFnbAWOWcuOv4i40+a/ALFsplNAwYNshNSkh3cH9FAlA4dd+fhY1ERA3/PeZBhB6V0+sa+AH/qwnzFY+lwOeuaUe4PNEjjnBVhzqV8XApca7HZNlrGmiTuO3J/e4k/FAP11iYYIf8e8JtgocinW1LIxJGBcp7Zyof37k4e+s25B0k5MkXiYlvveMsmlEcU+sYm+uLNtu8eG1R3b1qvi0H8ULdwoSParnKSyYMh0WlZTS8Ka3X33WeCOkCgYEA2Cc/nnJkwPaOXLiAbKg7/4hIne1X3rneVVbwCaebKXfSsCSGoVt5b8vBCgbVZNw79d8Z8ZLEf4e26ayLLXRz9QriMPiWyHUEr0XLZ4lq6E1EdZMBZWmjT9VY8NeAkB+eMPfCZLZe3OoVstuNQA0pGVFJgYXmXgcjJcidxzgIqU0CgYEA7EwAA6OP9DoQq4GcBCuIVGBjEWzbVekMt7f+WeLxGl3NYTWiXiaK6WjF/pvFv7AGQIqwOpnbKahWntpPj5DModhjQN8u/yonhzagubQbDTX0jR3w4gVsv/yyGgksPIwAQT/FW9cOqriqw8IGJG92VQw8dy6M1ZP9yK3yc41Q8VMCgYATH3XLaMdtIuL5ZQFHm6KjOsVh42uQstTuq+BUmlVp18X1+2VFxTf7IgWUA4LBh5JucCx1aMylk7Yk+jTd8p2HokzclEGSvneJoh0ardedcaiK1lSbSjs+htt1gztGhOWT43d5PYEq/jKpPi9C6WcnbD+ai+QTkYIUh6kdxOFPSQKBgQDltLfq0azWMUAVSYi+MQd1ZsHHpbfO2x+m1TFodgoFpJxL3JS7y+IMJvMaoJlqz5Y0Vd4dCYYZB/E0uWrQWGXlC3LpFE0edf85HWy/Ogt2GzZhnHKXdciTFfaZAsPDFCIHTBPyRKyYX655YHsSHly9Loj1HwZ/dT8nP5nKpNzDywKBgB3itp7eQ71y+6npr0MUcYF6cgjhPTLL03zVzJdR3ELzPFW+J69MFwqafoGu+xgGu43pDgIR6gVKqYhqfSk28oRl7YtO4fvk6KRcG5zrc1FyDw3S5XpVc5MhsxmBBXZj5ivBkoqxyDAOqu3MDCbHqg1J5inDu2gA8tbsgJ41pTER"
   },
   "ErpOptions": {
     "EndpointAddress": "http://119.23.206.129/k3cloud/ERPGW.asmx",

src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml

@@ -305,11 +305,21 @@
             表单所在的子系统内码，字符串类型（非必录）
             </summary>
         </member>
+        <member name="T:WMS.Web.Core.Dto.Erp.Org.ErpOrgDto">
+            <summary>
+            金蝶组织-基本信息
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.Erp.Org.ErpOrgDto.Id">
             <summary>
             Id
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.Org.ErpOrgDto.Name">
+            <summary>
+            名称
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto">
             <summary>
             erp-采购入库-返回数据源

src/WMS.Web.Domain/Mappers/AppMapper.cs

@@ -2,6 +2,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using WMS.Web.Core.Dto.Login;
+using WMS.Web.Core.Dto.Login.Temp;
 
 namespace WMS.Web.Domain.Mappers
 {
@@ -12,6 +14,21 @@ namespace WMS.Web.Domain.Mappers
     {
         public AppMapper()
         {
+
+            CreateMap<LoginJsonTokenTempDto, UserInfoDto>()
+           .ForMember(x => x.Email, ops => ops.MapFrom(x => x.email))
+           .ForMember(x => x.Avatar, ops => ops.MapFrom(x => x.avatar))
+           .ForMember(x => x.RoleId, ops => ops.MapFrom(x => x.role_id))
+           .ForMember(x => x.CreatedAt, ops => ops.MapFrom(x => x.created_at))
+           .ForMember(x => x.SigninAt, ops => ops.MapFrom(x => x.signin_at))
+           .ForMember(x => x.UpdatedAt, ops => ops.MapFrom(x => x.updated_at))
+               .ReverseMap();
+
+            CreateMap<LoginJsonDeptTempDto, DeptInfoDto>()
+        .ForMember(x => x.Id, ops => ops.MapFrom(x => x.id))
+        .ForMember(x => x.DeptCode, ops => ops.MapFrom(x => x.dept_code))
+        .ForMember(x => x.DeptName, ops => ops.MapFrom(x => x.dept_name))
+        .ForMember(x => x.ManagerId, ops => ops.MapFrom(x => x.manager)).ReverseMap();
         }
     }
 }