AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-07-29 20:42:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: remove deprecated envs (#2078)

Browse Source
This commit is contained in:
takatost 2024-01-18 14:44:37 +08:00 committed by GitHub
parent 8654415f33
commit 0e1163f698
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/.env.example
View File

@ -15,7 +15,6 @@ CONSOLE_WEB_URL=http://127.0.0.1:3000
SERVICE_API_URL=http://127.0.0.1:5001 SERVICE_API_URL=http://127.0.0.1:5001
# Web APP base URL # Web APP base URL
APP_API_URL=http://127.0.0.1:5001
APP_WEB_URL=http://127.0.0.1:3000 APP_WEB_URL=http://127.0.0.1:3000
# Files URL # Files URL

1
api/Dockerfile
View File

@ -19,7 +19,6 @@ ENV DEPLOY_ENV PRODUCTION
ENV CONSOLE_API_URL http://127.0.0.1:5001 ENV CONSOLE_API_URL http://127.0.0.1:5001
ENV CONSOLE_WEB_URL http://127.0.0.1:3000 ENV CONSOLE_WEB_URL http://127.0.0.1:3000
ENV SERVICE_API_URL http://127.0.0.1:5001 ENV SERVICE_API_URL http://127.0.0.1:5001
ENV APP_API_URL http://127.0.0.1:5001
ENV APP_WEB_URL http://127.0.0.1:3000 ENV APP_WEB_URL http://127.0.0.1:3000
EXPOSE 5001 EXPOSE 5001

21
api/config.py
View File

@ -22,7 +22,6 @@ DEFAULTS = {
'CONSOLE_API_URL': 'https://cloud.dify.ai', 'CONSOLE_API_URL': 'https://cloud.dify.ai',
'SERVICE_API_URL': 'https://api.dify.ai', 'SERVICE_API_URL': 'https://api.dify.ai',
'APP_WEB_URL': 'https://udify.app', 'APP_WEB_URL': 'https://udify.app',
'APP_API_URL': 'https://udify.app',
'FILES_URL': '', 'FILES_URL': '',
'STORAGE_TYPE': 'local', 'STORAGE_TYPE': 'local',
'STORAGE_LOCAL_PATH': 'storage', 'STORAGE_LOCAL_PATH': 'storage',
@ -94,7 +93,7 @@ class Config:
# ------------------------ # ------------------------
# General Configurations. # General Configurations.
# ------------------------ # ------------------------
self.CURRENT_VERSION = "0.4.8" self.CURRENT_VERSION = "0.4.7"
self.COMMIT_SHA = get_env('COMMIT_SHA') self.COMMIT_SHA = get_env('COMMIT_SHA')
self.EDITION = "SELF_HOSTED" self.EDITION = "SELF_HOSTED"
self.DEPLOY_ENV = get_env('DEPLOY_ENV') self.DEPLOY_ENV = get_env('DEPLOY_ENV')
@ -103,35 +102,25 @@ class Config:
# The backend URL prefix of the console API. # The backend URL prefix of the console API.
# used to concatenate the login authorization callback or notion integration callback. # used to concatenate the login authorization callback or notion integration callback.
self.CONSOLE_API_URL = get_env('CONSOLE_URL') if get_env('CONSOLE_URL') else get_env('CONSOLE_API_URL') self.CONSOLE_API_URL = get_env('CONSOLE_API_URL')
# The front-end URL prefix of the console web. # The front-end URL prefix of the console web.
# used to concatenate some front-end addresses and for CORS configuration use. # used to concatenate some front-end addresses and for CORS configuration use.
self.CONSOLE_WEB_URL = get_env('CONSOLE_URL') if get_env('CONSOLE_URL') else get_env('CONSOLE_WEB_URL') self.CONSOLE_WEB_URL = get_env('CONSOLE_WEB_URL')
# WebApp API backend Url prefix.
# used to declare the back-end URL for the front-end API.
self.APP_API_URL = get_env('APP_URL') if get_env('APP_URL') else get_env('APP_API_URL')
# WebApp Url prefix. # WebApp Url prefix.
# used to display WebAPP API Base Url to the front-end. # used to display WebAPP API Base Url to the front-end.
self.APP_WEB_URL = get_env('APP_URL') if get_env('APP_URL') else get_env('APP_WEB_URL') self.APP_WEB_URL = get_env('APP_WEB_URL')
# Service API Url prefix. # Service API Url prefix.
# used to display Service API Base Url to the front-end. # used to display Service API Base Url to the front-end.
self.SERVICE_API_URL = get_env('API_URL') if get_env('API_URL') else get_env('SERVICE_API_URL') self.SERVICE_API_URL = get_env('SERVICE_API_URL')
# File preview or download Url prefix. # File preview or download Url prefix.
# used to display File preview or download Url to the front-end or as Multi-model inputs; # used to display File preview or download Url to the front-end or as Multi-model inputs;
# Url is signed and has expiration time. # Url is signed and has expiration time.
self.FILES_URL = get_env('FILES_URL') if get_env('FILES_URL') else self.CONSOLE_API_URL self.FILES_URL = get_env('FILES_URL') if get_env('FILES_URL') else self.CONSOLE_API_URL
# Fallback Url prefix.
# Will be deprecated in the future.
self.CONSOLE_URL = get_env('CONSOLE_URL')
self.API_URL = get_env('API_URL')
self.APP_URL = get_env('APP_URL')
# Your App secret key will be used for securely signing the session cookie # Your App secret key will be used for securely signing the session cookie
# Make sure you are changing this key for your deployment with a strong key. # Make sure you are changing this key for your deployment with a strong key.
# You can generate a strong key using `openssl rand -base64 42`. # You can generate a strong key using `openssl rand -base64 42`.

4
docker/docker-compose.yaml
View File

@ -23,10 +23,6 @@ services:
# different from console domain. # different from console domain.
# example: http://api.dify.ai # example: http://api.dify.ai
SERVICE_API_URL: '' SERVICE_API_URL: ''
# The URL prefix for Web APP api server, refers to the Web App base URL of WEB service if web app domain is different from
# console or api domain.
# example: http://udify.app
APP_API_URL: ''
# The URL prefix for Web APP frontend, refers to the Web App base URL of WEB service if web app domain is different from # The URL prefix for Web APP frontend, refers to the Web App base URL of WEB service if web app domain is different from
# console or api domain. # console or api domain.
# example: http://udify.app # example: http://udify.app

14
web/docker/entrypoint.sh
View File

@ -4,18 +4,8 @@ set -e
export NEXT_PUBLIC_DEPLOY_ENV=${DEPLOY_ENV} export NEXT_PUBLIC_DEPLOY_ENV=${DEPLOY_ENV}
export NEXT_PUBLIC_EDITION=${EDITION} export NEXT_PUBLIC_EDITION=${EDITION}
export NEXT_PUBLIC_API_PREFIX=${CONSOLE_API_URL}/console/api
if [[ -z "$CONSOLE_URL" ]]; then export NEXT_PUBLIC_PUBLIC_API_PREFIX=${APP_API_URL}/api
export NEXT_PUBLIC_API_PREFIX=${CONSOLE_API_URL}/console/api
else
export NEXT_PUBLIC_API_PREFIX=${CONSOLE_URL}/console/api
fi
if [[ -z "$APP_URL" ]]; then
export NEXT_PUBLIC_PUBLIC_API_PREFIX=${APP_API_URL}/api
else
export NEXT_PUBLIC_PUBLIC_API_PREFIX=${APP_URL}/api
fi
export NEXT_PUBLIC_SENTRY_DSN=${SENTRY_DSN} export NEXT_PUBLIC_SENTRY_DSN=${SENTRY_DSN}
export NEXT_PUBLIC_SITE_ABOUT=${SITE_ABOUT} export NEXT_PUBLIC_SITE_ABOUT=${SITE_ABOUT}