Merge branch 'master' of http://140.143.162.39:3000/shentun/peis

src/Shentun.Peis.Application/MyUser/MyUserAppService.cs

@@ -187,7 +187,7 @@ namespace Shentun.Peis.MyUser
         {
             #region 上传图片
             string userPhoto = UploadUserPhotoAsync(new UploadUserPhotoInputDto { PictureBaseStr = input.UserPhoto });
-            string userSign = UploadUserSignAsync(new UploadUserPhotoInputDto { PictureBaseStr = input.UserPhoto });
+            string userSign = UploadUserSignAsync(new UploadUserPhotoInputDto { PictureBaseStr = input.UserSign });
             #endregion
 
 
@@ -368,7 +368,7 @@ namespace Shentun.Peis.MyUser
             });
             string userSign = UploadUserSignAsync(new UploadUserPhotoInputDto
             {
-                PictureBaseStr = input.UserPhoto,
+                PictureBaseStr = input.UserSign,
                 UserId = id
             });
             #endregion
@@ -489,8 +489,8 @@ namespace Shentun.Peis.MyUser
         public async Task<IdentityUserWithExtensionDto> GetWithExtensionAsync(Guid id)
         {
             var ent = await UserManager.GetByIdAsync(id);
-            var userSign = ent.GetProperty<string>("user_sign");
-            var userPhoto = ent.GetProperty<string>("user_photo");
+            var userSign = !string.IsNullOrWhiteSpace(ent.GetProperty<string>("user_sign")) ? ImageHelper.GetImageBase64StringAsync(ent.GetProperty<string>("user_sign")) : "";
+            var userPhoto = !string.IsNullOrWhiteSpace(ent.GetProperty<string>("user_photo")) ? ImageHelper.GetImageBase64StringAsync(ent.GetProperty<string>("user_photo")) : "";
             var operatorType = ent.GetProperty<char>("operator_type");
             var entDto = ObjectMapper.Map<IdentityUser, IdentityUserWithExtensionDto>(ent);
             entDto.UserPhoto = userPhoto;