Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
This commit is contained in:
commit
947feef4cf
@ -53,6 +53,26 @@ server {
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
fastcgi_param PATH_INFO "";
|
||||
|
||||
location ~* ^/ds-vpath/ {
|
||||
rewrite /ds-vpath/(.*) /$1 break;
|
||||
|
||||
proxy_pass http://172.18.0.4:80; //temp
|
||||
proxy_redirect off;
|
||||
|
||||
client_max_body_size 100m;
|
||||
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
|
||||
proxy_set_header Host $http_host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Host $the_host/ds-vpath;
|
||||
proxy_set_header X-Forwarded-Proto $the_scheme;
|
||||
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_pass http://localhost:5001;
|
||||
|
||||
|
@ -243,7 +243,7 @@ namespace ASC.Files.Core.Data
|
||||
q = GetFolderQuery()
|
||||
.AsNoTracking()
|
||||
.Join(FilesDbContext.Tree, r => r.Id, a => a.FolderId, (folder, tree) => new { folder, tree })
|
||||
.Where(r => folderIds.Any(q => q == r.folder.ParentId))
|
||||
.Where(r => folderIds.Any(q => q == r.tree.ParentId))
|
||||
.Select(r => r.folder);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user