Просмотр исходного кода

Merge branch 'PL/develop-BI' into develop

Li 2 лет назад
Родитель
Сommit
dd72e4bb62
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      TEAMModelOS/Controllers/OpenApi/Init/BizUsersController.cs

+ 2 - 2
TEAMModelOS/Controllers/OpenApi/Init/BizUsersController.cs

@@ -94,7 +94,7 @@ namespace TEAMModelOS.Controllers
 
 
             (osblob_uri, osblob_sas) = _azureStorage.GetBlobContainerSAS("teammodelos", BlobContainerSasPermissions.Write | BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List | BlobContainerSasPermissions.Delete);
             (osblob_uri, osblob_sas) = _azureStorage.GetBlobContainerSAS("teammodelos", BlobContainerSasPermissions.Write | BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List | BlobContainerSasPermissions.Delete);
             if (businessUsers.id != null)
             if (businessUsers.id != null)
-                return Ok(new { state = RespondCode.Ok, openid_token, businessUsers });
+                return Ok(new { state = RespondCode.Ok, openid_token, businessUsers, osblob_uri, osblob_sas });
             else
             else
                 return Ok(new { state = RespondCode.ForbiddenPwd, msg = "密码错误" });
                 return Ok(new { state = RespondCode.ForbiddenPwd, msg = "密码错误" });
         }
         }
@@ -154,7 +154,7 @@ namespace TEAMModelOS.Controllers
                 var openid_token = JwtAuthExtension.CreateBizLoginAuthToken(_option.HostName, bizUsers.id?.ToString(), bizUsers.name?.ToString(), bizUsers.picture?.ToString(), $"{_option.Location}-Open", _option.JwtSecretKey, expire: 3);
                 var openid_token = JwtAuthExtension.CreateBizLoginAuthToken(_option.HostName, bizUsers.id?.ToString(), bizUsers.name?.ToString(), bizUsers.picture?.ToString(), $"{_option.Location}-Open", _option.JwtSecretKey, expire: 3);
 
 
                 (osblob_uri, osblob_sas) = _azureStorage.GetBlobContainerSAS("teammodelos", BlobContainerSasPermissions.Write | BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List | BlobContainerSasPermissions.Delete);
                 (osblob_uri, osblob_sas) = _azureStorage.GetBlobContainerSAS("teammodelos", BlobContainerSasPermissions.Write | BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List | BlobContainerSasPermissions.Delete);
-                return Ok(new { state = RespondCode.Ok, openid_token, bizUsers });
+                return Ok(new { state = RespondCode.Ok, openid_token, bizUsers, osblob_uri, osblob_sas });
             }
             }
         }
         }