mirror of
https://github.com/langgenius/dify.git
synced 2026-05-13 08:57:28 +08:00
1f7da9c191
Conflicts resolved: - api/services/app_service.py: extend AppListParams with status + openapi_visible fields so the openapi caller's per-page visibility gate survives the dict->BaseModel refactor; openapi controller now constructs AppListParams. - pnpm-workspace.yaml: union of CLI-only entries (@napi-rs/keyring, @oclif/*) with main's bumped versions (@next/*, @orpc/*, eslint-plugin-sonarjs, eslint-plugin-storybook); kept eventsource-parser. - pnpm-lock.yaml: regenerated. - web/app/signin/utils/post-login-redirect.ts: union impl — keep main's resolvePostLoginRedirect(searchParams) + setOAuthPendingRedirect; add hardened sessionStorage-based setPostLoginRedirect for device flow with same-origin + path whitelist; device redirect takes precedence over oauth pending.
74 lines
1.6 KiB
Plaintext
74 lines
1.6 KiB
Plaintext
# Please do not directly edit this file. Instead, modify the .env variables related to NGINX configuration.
|
|
|
|
server {
|
|
listen ${NGINX_PORT};
|
|
server_name ${NGINX_SERVER_NAME};
|
|
|
|
location /console/api {
|
|
proxy_pass http://api:5001;
|
|
include proxy.conf;
|
|
}
|
|
|
|
location /api {
|
|
proxy_pass http://api:5001;
|
|
include proxy.conf;
|
|
}
|
|
|
|
location /socket.io/ {
|
|
resolver 127.0.0.11 valid=30s ipv6=off;
|
|
set $socket_io_upstream ${NGINX_SOCKET_IO_UPSTREAM};
|
|
proxy_pass http://$socket_io_upstream;
|
|
include proxy.conf;
|
|
proxy_set_header Upgrade $http_upgrade;
|
|
proxy_set_header Connection "upgrade";
|
|
proxy_cache_bypass $http_upgrade;
|
|
}
|
|
|
|
location /v1 {
|
|
proxy_pass http://api:5001;
|
|
include proxy.conf;
|
|
}
|
|
|
|
location /openapi {
|
|
proxy_pass http://api:5001;
|
|
include proxy.conf;
|
|
}
|
|
|
|
location /files {
|
|
proxy_pass http://api:5001;
|
|
include proxy.conf;
|
|
}
|
|
|
|
location /explore {
|
|
proxy_pass http://web:3000;
|
|
include proxy.conf;
|
|
}
|
|
|
|
location /e/ {
|
|
proxy_pass http://plugin_daemon:5002;
|
|
proxy_set_header Dify-Hook-Url $scheme://$host$request_uri;
|
|
include proxy.conf;
|
|
}
|
|
|
|
location / {
|
|
proxy_pass http://web:3000;
|
|
include proxy.conf;
|
|
}
|
|
|
|
location /mcp {
|
|
proxy_pass http://api:5001;
|
|
include proxy.conf;
|
|
}
|
|
|
|
location /triggers {
|
|
proxy_pass http://api:5001;
|
|
include proxy.conf;
|
|
}
|
|
|
|
# placeholder for acme challenge location
|
|
${ACME_CHALLENGE_LOCATION}
|
|
|
|
# placeholder for https config defined in https.conf.template
|
|
${HTTPS_CONFIG}
|
|
}
|