diff --git a/deploy/args.json b/deploy/args.json index d070e9002..621b2afac 100644 --- a/deploy/args.json +++ b/deploy/args.json @@ -1,9 +1,9 @@ { "tags": { - "fastgpt": "v4.13.1", - "fastgpt-sandbox": "v4.13.1", - "fastgpt-mcp_server": "v4.13.1", - "fastgpt-plugin": "v0.2.2", + "fastgpt": "v4.13.2", + "fastgpt-sandbox": "v4.13.2", + "fastgpt-mcp_server": "v4.13.2", + "fastgpt-plugin": "v0.2.4", "aiproxy": "v0.3.2", "aiproxy-pg": "0.8.0-pg15", "mongo": "5.0.18", diff --git a/deploy/dev/docker-compose.cn.yml b/deploy/dev/docker-compose.cn.yml index f2005c034..a371a8aa3 100644 --- a/deploy/dev/docker-compose.cn.yml +++ b/deploy/dev/docker-compose.cn.yml @@ -49,7 +49,19 @@ services: volumes: - ./mongo/data:/data/db healthcheck: - test: ['CMD', 'mongo', '-u', 'myusername', '-p', 'mypassword', '--authenticationDatabase', 'admin', '--eval', "db.adminCommand('ping')"] + test: + [ + 'CMD', + 'mongo', + '-u', + 'myusername', + '-p', + 'mypassword', + '--authenticationDatabase', + 'admin', + '--eval', + "db.adminCommand('ping')" + ] interval: 10s timeout: 5s retries: 5 @@ -124,7 +136,7 @@ services: retries: 3 sandbox: container_name: sandbox - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.13.1 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.13.2 ports: - 3002:3000 networks: @@ -132,7 +144,7 @@ services: restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.13.1 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.13.2 ports: - 3005:3000 networks: @@ -141,7 +153,7 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.2.2 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.2.4 container_name: fastgpt-plugin restart: always ports: @@ -156,9 +168,8 @@ services: - S3_ACCESS_KEY=minioadmin - S3_SECRET_KEY=minioadmin - S3_BUCKET=fastgpt-plugins - - S3_TOOL_BUCKET=fastgpt-tool # 系统工具，创建的临时文件，存储的桶，要求公开读私有写。 - - S3_PLUGIN_BUCKET=fastgpt-plugin # 系统插件热安装文件的桶，私有读写。 - - RETENTION_DAYS=15 # 系统工具临时文件保存天数 + - S3_PUBLIC_BUCKET=fastgpt-public # 系统工具，创建的临时文件，存储的桶，要求公开读私有写。 + - S3_PRIVATE_BUCKET=fastgpt-private # 系统插件热安装文件的桶，私有读写。 - MONGODB_URI=mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin&directConnection=true - REDIS_URL=redis://default:mypassword@redis:6379 depends_on: diff --git a/deploy/dev/docker-compose.yml b/deploy/dev/docker-compose.yml index a91211255..af9010f81 100644 --- a/deploy/dev/docker-compose.yml +++ b/deploy/dev/docker-compose.yml @@ -49,7 +49,19 @@ services: volumes: - ./mongo/data:/data/db healthcheck: - test: ['CMD', 'mongo', '-u', 'myusername', '-p', 'mypassword', '--authenticationDatabase', 'admin', '--eval', "db.adminCommand('ping')"] + test: + [ + 'CMD', + 'mongo', + '-u', + 'myusername', + '-p', + 'mypassword', + '--authenticationDatabase', + 'admin', + '--eval', + "db.adminCommand('ping')" + ] interval: 10s timeout: 5s retries: 5 @@ -124,7 +136,7 @@ services: retries: 3 sandbox: container_name: sandbox - image: ghcr.io/labring/fastgpt-sandbox:v4.13.1 + image: ghcr.io/labring/fastgpt-sandbox:v4.13.2 ports: - 3002:3000 networks: @@ -132,7 +144,7 @@ services: restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: ghcr.io/labring/fastgpt-mcp_server:v4.13.1 + image: ghcr.io/labring/fastgpt-mcp_server:v4.13.2 ports: - 3005:3000 networks: @@ -141,7 +153,7 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: ghcr.io/labring/fastgpt-plugin:v0.2.2 + image: ghcr.io/labring/fastgpt-plugin:v0.2.4 container_name: fastgpt-plugin restart: always ports: @@ -156,9 +168,8 @@ services: - S3_ACCESS_KEY=minioadmin - S3_SECRET_KEY=minioadmin - S3_BUCKET=fastgpt-plugins - - S3_TOOL_BUCKET=fastgpt-tool # 系统工具，创建的临时文件，存储的桶，要求公开读私有写。 - - S3_PLUGIN_BUCKET=fastgpt-plugin # 系统插件热安装文件的桶，私有读写。 - - RETENTION_DAYS=15 # 系统工具临时文件保存天数 + - S3_PUBLIC_BUCKET=fastgpt-public # 系统工具，创建的临时文件，存储的桶，要求公开读私有写。 + - S3_PRIVATE_BUCKET=fastgpt-private # 系统插件热安装文件的桶，私有读写。 - MONGODB_URI=mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin&directConnection=true - REDIS_URL=redis://default:mypassword@redis:6379 depends_on: diff --git a/deploy/docker/cn/docker-compose.milvus.yml b/deploy/docker/cn/docker-compose.milvus.yml index 218b9950b..0f7246615 100644 --- a/deploy/docker/cn/docker-compose.milvus.yml +++ b/deploy/docker/cn/docker-compose.milvus.yml @@ -12,11 +12,14 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 + S3_EXTERNAL_BASE_URL: S3_ENDPOINT: fastgpt-minio S3_PORT: 9000 S3_USE_SSL: false S3_ACCESS_KEY: minioadmin S3_SECRET_KEY: minioadmin + S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 + S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 # 向量库相关配置 x-vec-config: &x-vec-config @@ -151,10 +154,27 @@ services: start_period: 30s volumes: - ./redis/data:/data + fastgpt-minio: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/minio:RELEASE.2025-09-07T16-13-09Z + container_name: fastgpt-minio + restart: always + networks: + - fastgpt + environment: + - MINIO_ROOT_USER=minioadmin + - MINIO_ROOT_PASSWORD=minioadmin + volumes: + - ./fastgpt-minio:/data + command: server /data --console-address ":9001" + healthcheck: + test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] + interval: 30s + timeout: 20s + retries: 3 fastgpt: container_name: fastgpt - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.13.1 # git + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.13.2 # git ports: - 3000:3000 networks: @@ -202,33 +222,15 @@ services: SERVICE_REQUEST_MAX_CONTENT_LENGTH: 10 volumes: - ./config.json:/app/data/config.json - - fastgpt-minio: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/minio:RELEASE.2025-09-07T16-13-09Z - container_name: fastgpt-minio - restart: always - networks: - - fastgpt - environment: - - MINIO_ROOT_USER=minioadmin - - MINIO_ROOT_PASSWORD=minioadmin - volumes: - - ./fastgpt-minio:/data - command: server /data --console-address ":9001" - healthcheck: - test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] - interval: 30s - timeout: 20s - retries: 3 sandbox: container_name: sandbox - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.13.1 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.13.2 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.13.1 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.13.2 networks: - fastgpt ports: @@ -237,7 +239,7 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.2.2 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.2.4 container_name: fastgpt-plugin restart: always networks: diff --git a/deploy/docker/cn/docker-compose.oceanbase.yml b/deploy/docker/cn/docker-compose.oceanbase.yml index 401c54726..66d18e38d 100644 --- a/deploy/docker/cn/docker-compose.oceanbase.yml +++ b/deploy/docker/cn/docker-compose.oceanbase.yml @@ -12,11 +12,14 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 + S3_EXTERNAL_BASE_URL: S3_ENDPOINT: fastgpt-minio S3_PORT: 9000 S3_USE_SSL: false S3_ACCESS_KEY: minioadmin S3_SECRET_KEY: minioadmin + S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 + S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 # 向量库相关配置 x-vec-config: &x-vec-config @@ -128,10 +131,27 @@ services: start_period: 30s volumes: - ./redis/data:/data + fastgpt-minio: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/minio:RELEASE.2025-09-07T16-13-09Z + container_name: fastgpt-minio + restart: always + networks: + - fastgpt + environment: + - MINIO_ROOT_USER=minioadmin + - MINIO_ROOT_PASSWORD=minioadmin + volumes: + - ./fastgpt-minio:/data + command: server /data --console-address ":9001" + healthcheck: + test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] + interval: 30s + timeout: 20s + retries: 3 fastgpt: container_name: fastgpt - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.13.1 # git + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.13.2 # git ports: - 3000:3000 networks: @@ -179,33 +199,15 @@ services: SERVICE_REQUEST_MAX_CONTENT_LENGTH: 10 volumes: - ./config.json:/app/data/config.json - - fastgpt-minio: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/minio:RELEASE.2025-09-07T16-13-09Z - container_name: fastgpt-minio - restart: always - networks: - - fastgpt - environment: - - MINIO_ROOT_USER=minioadmin - - MINIO_ROOT_PASSWORD=minioadmin - volumes: - - ./fastgpt-minio:/data - command: server /data --console-address ":9001" - healthcheck: - test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] - interval: 30s - timeout: 20s - retries: 3 sandbox: container_name: sandbox - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.13.1 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.13.2 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.13.1 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.13.2 networks: - fastgpt ports: @@ -214,7 +216,7 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.2.2 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.2.4 container_name: fastgpt-plugin restart: always networks: diff --git a/deploy/docker/cn/docker-compose.pg.yml b/deploy/docker/cn/docker-compose.pg.yml index 676eec082..51d786c23 100644 --- a/deploy/docker/cn/docker-compose.pg.yml +++ b/deploy/docker/cn/docker-compose.pg.yml @@ -12,11 +12,14 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 + S3_EXTERNAL_BASE_URL: S3_ENDPOINT: fastgpt-minio S3_PORT: 9000 S3_USE_SSL: false S3_ACCESS_KEY: minioadmin S3_SECRET_KEY: minioadmin + S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 + S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 # 向量库相关配置 x-vec-config: &x-vec-config @@ -109,10 +112,27 @@ services: start_period: 30s volumes: - ./redis/data:/data + fastgpt-minio: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/minio:RELEASE.2025-09-07T16-13-09Z + container_name: fastgpt-minio + restart: always + networks: + - fastgpt + environment: + - MINIO_ROOT_USER=minioadmin + - MINIO_ROOT_PASSWORD=minioadmin + volumes: + - ./fastgpt-minio:/data + command: server /data --console-address ":9001" + healthcheck: + test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] + interval: 30s + timeout: 20s + retries: 3 fastgpt: container_name: fastgpt - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.13.1 # git + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.13.2 # git ports: - 3000:3000 networks: @@ -160,33 +180,15 @@ services: SERVICE_REQUEST_MAX_CONTENT_LENGTH: 10 volumes: - ./config.json:/app/data/config.json - - fastgpt-minio: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/minio:RELEASE.2025-09-07T16-13-09Z - container_name: fastgpt-minio - restart: always - networks: - - fastgpt - environment: - - MINIO_ROOT_USER=minioadmin - - MINIO_ROOT_PASSWORD=minioadmin - volumes: - - ./fastgpt-minio:/data - command: server /data --console-address ":9001" - healthcheck: - test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] - interval: 30s - timeout: 20s - retries: 3 sandbox: container_name: sandbox - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.13.1 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.13.2 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.13.1 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.13.2 networks: - fastgpt ports: @@ -195,7 +197,7 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.2.2 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.2.4 container_name: fastgpt-plugin restart: always networks: diff --git a/deploy/docker/cn/docker-compose.zilliz.yml b/deploy/docker/cn/docker-compose.zilliz.yml index 9ed29d97f..567399008 100644 --- a/deploy/docker/cn/docker-compose.zilliz.yml +++ b/deploy/docker/cn/docker-compose.zilliz.yml @@ -12,11 +12,14 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 + S3_EXTERNAL_BASE_URL: S3_ENDPOINT: fastgpt-minio S3_PORT: 9000 S3_USE_SSL: false S3_ACCESS_KEY: minioadmin S3_SECRET_KEY: minioadmin + S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 + S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 # 向量库相关配置 x-vec-config: &x-vec-config @@ -92,10 +95,27 @@ services: start_period: 30s volumes: - ./redis/data:/data + fastgpt-minio: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/minio:RELEASE.2025-09-07T16-13-09Z + container_name: fastgpt-minio + restart: always + networks: + - fastgpt + environment: + - MINIO_ROOT_USER=minioadmin + - MINIO_ROOT_PASSWORD=minioadmin + volumes: + - ./fastgpt-minio:/data + command: server /data --console-address ":9001" + healthcheck: + test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] + interval: 30s + timeout: 20s + retries: 3 fastgpt: container_name: fastgpt - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.13.1 # git + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.13.2 # git ports: - 3000:3000 networks: @@ -143,33 +163,15 @@ services: SERVICE_REQUEST_MAX_CONTENT_LENGTH: 10 volumes: - ./config.json:/app/data/config.json - - fastgpt-minio: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/minio:RELEASE.2025-09-07T16-13-09Z - container_name: fastgpt-minio - restart: always - networks: - - fastgpt - environment: - - MINIO_ROOT_USER=minioadmin - - MINIO_ROOT_PASSWORD=minioadmin - volumes: - - ./fastgpt-minio:/data - command: server /data --console-address ":9001" - healthcheck: - test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] - interval: 30s - timeout: 20s - retries: 3 sandbox: container_name: sandbox - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.13.1 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.13.2 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.13.1 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.13.2 networks: - fastgpt ports: @@ -178,7 +180,7 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.2.2 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.2.4 container_name: fastgpt-plugin restart: always networks: diff --git a/deploy/docker/global/docker-compose.milvus.yml b/deploy/docker/global/docker-compose.milvus.yml index 344a485b2..c80541ee9 100644 --- a/deploy/docker/global/docker-compose.milvus.yml +++ b/deploy/docker/global/docker-compose.milvus.yml @@ -12,11 +12,14 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 + S3_EXTERNAL_BASE_URL: S3_ENDPOINT: fastgpt-minio S3_PORT: 9000 S3_USE_SSL: false S3_ACCESS_KEY: minioadmin S3_SECRET_KEY: minioadmin + S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 + S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 # 向量库相关配置 x-vec-config: &x-vec-config @@ -151,10 +154,27 @@ services: start_period: 30s volumes: - ./redis/data:/data + fastgpt-minio: + image: minio/minio:RELEASE.2025-09-07T16-13-09Z + container_name: fastgpt-minio + restart: always + networks: + - fastgpt + environment: + - MINIO_ROOT_USER=minioadmin + - MINIO_ROOT_PASSWORD=minioadmin + volumes: + - ./fastgpt-minio:/data + command: server /data --console-address ":9001" + healthcheck: + test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] + interval: 30s + timeout: 20s + retries: 3 fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.13.1 # git + image: ghcr.io/labring/fastgpt:v4.13.2 # git ports: - 3000:3000 networks: @@ -202,33 +222,15 @@ services: SERVICE_REQUEST_MAX_CONTENT_LENGTH: 10 volumes: - ./config.json:/app/data/config.json - - fastgpt-minio: - image: minio/minio:RELEASE.2025-09-07T16-13-09Z - container_name: fastgpt-minio - restart: always - networks: - - fastgpt - environment: - - MINIO_ROOT_USER=minioadmin - - MINIO_ROOT_PASSWORD=minioadmin - volumes: - - ./fastgpt-minio:/data - command: server /data --console-address ":9001" - healthcheck: - test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] - interval: 30s - timeout: 20s - retries: 3 sandbox: container_name: sandbox - image: ghcr.io/labring/fastgpt-sandbox:v4.13.1 + image: ghcr.io/labring/fastgpt-sandbox:v4.13.2 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: ghcr.io/labring/fastgpt-mcp_server:v4.13.1 + image: ghcr.io/labring/fastgpt-mcp_server:v4.13.2 networks: - fastgpt ports: @@ -237,7 +239,7 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: ghcr.io/labring/fastgpt-plugin:v0.2.2 + image: ghcr.io/labring/fastgpt-plugin:v0.2.4 container_name: fastgpt-plugin restart: always networks: diff --git a/deploy/docker/global/docker-compose.oceanbase.yml b/deploy/docker/global/docker-compose.oceanbase.yml index f44d01e40..fca6479a3 100644 --- a/deploy/docker/global/docker-compose.oceanbase.yml +++ b/deploy/docker/global/docker-compose.oceanbase.yml @@ -12,11 +12,14 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 + S3_EXTERNAL_BASE_URL: S3_ENDPOINT: fastgpt-minio S3_PORT: 9000 S3_USE_SSL: false S3_ACCESS_KEY: minioadmin S3_SECRET_KEY: minioadmin + S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 + S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 # 向量库相关配置 x-vec-config: &x-vec-config @@ -128,10 +131,27 @@ services: start_period: 30s volumes: - ./redis/data:/data + fastgpt-minio: + image: minio/minio:RELEASE.2025-09-07T16-13-09Z + container_name: fastgpt-minio + restart: always + networks: + - fastgpt + environment: + - MINIO_ROOT_USER=minioadmin + - MINIO_ROOT_PASSWORD=minioadmin + volumes: + - ./fastgpt-minio:/data + command: server /data --console-address ":9001" + healthcheck: + test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] + interval: 30s + timeout: 20s + retries: 3 fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.13.1 # git + image: ghcr.io/labring/fastgpt:v4.13.2 # git ports: - 3000:3000 networks: @@ -179,33 +199,15 @@ services: SERVICE_REQUEST_MAX_CONTENT_LENGTH: 10 volumes: - ./config.json:/app/data/config.json - - fastgpt-minio: - image: minio/minio:RELEASE.2025-09-07T16-13-09Z - container_name: fastgpt-minio - restart: always - networks: - - fastgpt - environment: - - MINIO_ROOT_USER=minioadmin - - MINIO_ROOT_PASSWORD=minioadmin - volumes: - - ./fastgpt-minio:/data - command: server /data --console-address ":9001" - healthcheck: - test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] - interval: 30s - timeout: 20s - retries: 3 sandbox: container_name: sandbox - image: ghcr.io/labring/fastgpt-sandbox:v4.13.1 + image: ghcr.io/labring/fastgpt-sandbox:v4.13.2 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: ghcr.io/labring/fastgpt-mcp_server:v4.13.1 + image: ghcr.io/labring/fastgpt-mcp_server:v4.13.2 networks: - fastgpt ports: @@ -214,7 +216,7 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: ghcr.io/labring/fastgpt-plugin:v0.2.2 + image: ghcr.io/labring/fastgpt-plugin:v0.2.4 container_name: fastgpt-plugin restart: always networks: diff --git a/deploy/docker/global/docker-compose.pg.yml b/deploy/docker/global/docker-compose.pg.yml index 7720868a4..6c6f8a545 100644 --- a/deploy/docker/global/docker-compose.pg.yml +++ b/deploy/docker/global/docker-compose.pg.yml @@ -12,11 +12,14 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 + S3_EXTERNAL_BASE_URL: S3_ENDPOINT: fastgpt-minio S3_PORT: 9000 S3_USE_SSL: false S3_ACCESS_KEY: minioadmin S3_SECRET_KEY: minioadmin + S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 + S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 # 向量库相关配置 x-vec-config: &x-vec-config @@ -109,10 +112,27 @@ services: start_period: 30s volumes: - ./redis/data:/data + fastgpt-minio: + image: minio/minio:RELEASE.2025-09-07T16-13-09Z + container_name: fastgpt-minio + restart: always + networks: + - fastgpt + environment: + - MINIO_ROOT_USER=minioadmin + - MINIO_ROOT_PASSWORD=minioadmin + volumes: + - ./fastgpt-minio:/data + command: server /data --console-address ":9001" + healthcheck: + test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] + interval: 30s + timeout: 20s + retries: 3 fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.13.1 # git + image: ghcr.io/labring/fastgpt:v4.13.2 # git ports: - 3000:3000 networks: @@ -160,33 +180,15 @@ services: SERVICE_REQUEST_MAX_CONTENT_LENGTH: 10 volumes: - ./config.json:/app/data/config.json - - fastgpt-minio: - image: minio/minio:RELEASE.2025-09-07T16-13-09Z - container_name: fastgpt-minio - restart: always - networks: - - fastgpt - environment: - - MINIO_ROOT_USER=minioadmin - - MINIO_ROOT_PASSWORD=minioadmin - volumes: - - ./fastgpt-minio:/data - command: server /data --console-address ":9001" - healthcheck: - test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] - interval: 30s - timeout: 20s - retries: 3 sandbox: container_name: sandbox - image: ghcr.io/labring/fastgpt-sandbox:v4.13.1 + image: ghcr.io/labring/fastgpt-sandbox:v4.13.2 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: ghcr.io/labring/fastgpt-mcp_server:v4.13.1 + image: ghcr.io/labring/fastgpt-mcp_server:v4.13.2 networks: - fastgpt ports: @@ -195,7 +197,7 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: ghcr.io/labring/fastgpt-plugin:v0.2.2 + image: ghcr.io/labring/fastgpt-plugin:v0.2.4 container_name: fastgpt-plugin restart: always networks: diff --git a/deploy/docker/global/docker-compose.ziliiz.yml b/deploy/docker/global/docker-compose.ziliiz.yml index 2858da416..5fc6a44a2 100644 --- a/deploy/docker/global/docker-compose.ziliiz.yml +++ b/deploy/docker/global/docker-compose.ziliiz.yml @@ -12,11 +12,14 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 + S3_EXTERNAL_BASE_URL: S3_ENDPOINT: fastgpt-minio S3_PORT: 9000 S3_USE_SSL: false S3_ACCESS_KEY: minioadmin S3_SECRET_KEY: minioadmin + S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 + S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 # 向量库相关配置 x-vec-config: &x-vec-config @@ -92,10 +95,27 @@ services: start_period: 30s volumes: - ./redis/data:/data + fastgpt-minio: + image: minio/minio:RELEASE.2025-09-07T16-13-09Z + container_name: fastgpt-minio + restart: always + networks: + - fastgpt + environment: + - MINIO_ROOT_USER=minioadmin + - MINIO_ROOT_PASSWORD=minioadmin + volumes: + - ./fastgpt-minio:/data + command: server /data --console-address ":9001" + healthcheck: + test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] + interval: 30s + timeout: 20s + retries: 3 fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.13.1 # git + image: ghcr.io/labring/fastgpt:v4.13.2 # git ports: - 3000:3000 networks: @@ -143,33 +163,15 @@ services: SERVICE_REQUEST_MAX_CONTENT_LENGTH: 10 volumes: - ./config.json:/app/data/config.json - - fastgpt-minio: - image: minio/minio:RELEASE.2025-09-07T16-13-09Z - container_name: fastgpt-minio - restart: always - networks: - - fastgpt - environment: - - MINIO_ROOT_USER=minioadmin - - MINIO_ROOT_PASSWORD=minioadmin - volumes: - - ./fastgpt-minio:/data - command: server /data --console-address ":9001" - healthcheck: - test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] - interval: 30s - timeout: 20s - retries: 3 sandbox: container_name: sandbox - image: ghcr.io/labring/fastgpt-sandbox:v4.13.1 + image: ghcr.io/labring/fastgpt-sandbox:v4.13.2 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: ghcr.io/labring/fastgpt-mcp_server:v4.13.1 + image: ghcr.io/labring/fastgpt-mcp_server:v4.13.2 networks: - fastgpt ports: @@ -178,7 +180,7 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: ghcr.io/labring/fastgpt-plugin:v0.2.2 + image: ghcr.io/labring/fastgpt-plugin:v0.2.4 container_name: fastgpt-plugin restart: always networks: diff --git a/deploy/templates/docker-compose.dev.yml b/deploy/templates/docker-compose.dev.yml index 132c517c5..0d8c4af25 100644 --- a/deploy/templates/docker-compose.dev.yml +++ b/deploy/templates/docker-compose.dev.yml @@ -49,7 +49,19 @@ services: volumes: - ./mongo/data:/data/db healthcheck: - test: ['CMD', 'mongo', '-u', 'myusername', '-p', 'mypassword', '--authenticationDatabase', 'admin', '--eval', "db.adminCommand('ping')"] + test: + [ + 'CMD', + 'mongo', + '-u', + 'myusername', + '-p', + 'mypassword', + '--authenticationDatabase', + 'admin', + '--eval', + "db.adminCommand('ping')" + ] interval: 10s timeout: 5s retries: 5 @@ -155,10 +167,8 @@ services: - S3_USE_SSL=false - S3_ACCESS_KEY=minioadmin - S3_SECRET_KEY=minioadmin - - S3_BUCKET=fastgpt-plugins - - S3_TOOL_BUCKET=fastgpt-tool # 系统工具，创建的临时文件，存储的桶，要求公开读私有写。 - - S3_PLUGIN_BUCKET=fastgpt-plugin # 系统插件热安装文件的桶，私有读写。 - - RETENTION_DAYS=15 # 系统工具临时文件保存天数 + - S3_PUBLIC_BUCKET=fastgpt-public # 系统工具，创建的临时文件，存储的桶，要求公开读私有写。 + - S3_PRIVATE_BUCKET=fastgpt-private # 系统插件热安装文件的桶，私有读写。 - MONGODB_URI=mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin&directConnection=true - REDIS_URL=redis://default:mypassword@redis:6379 depends_on: diff --git a/deploy/templates/docker-compose.prod.yml b/deploy/templates/docker-compose.prod.yml index a0cc60c29..d9dcbfca9 100644 --- a/deploy/templates/docker-compose.prod.yml +++ b/deploy/templates/docker-compose.prod.yml @@ -12,11 +12,14 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 + S3_EXTERNAL_BASE_URL: S3_ENDPOINT: fastgpt-minio S3_PORT: 9000 S3_USE_SSL: false S3_ACCESS_KEY: minioadmin S3_SECRET_KEY: minioadmin + S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 + S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 # 向量库相关配置 x-vec-config: &x-vec-config @@ -91,6 +94,23 @@ ${{vec.db}} start_period: 30s volumes: - ./redis/data:/data + fastgpt-minio: + image: ${{minio.image}}:${{minio.tag}} + container_name: fastgpt-minio + restart: always + networks: + - fastgpt + environment: + - MINIO_ROOT_USER=minioadmin + - MINIO_ROOT_PASSWORD=minioadmin + volumes: + - ./fastgpt-minio:/data + command: server /data --console-address ":9001" + healthcheck: + test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] + interval: 30s + timeout: 20s + retries: 3 fastgpt: container_name: fastgpt @@ -142,24 +162,6 @@ ${{vec.db}} SERVICE_REQUEST_MAX_CONTENT_LENGTH: 10 volumes: - ./config.json:/app/data/config.json - - fastgpt-minio: - image: ${{minio.image}}:${{minio.tag}} - container_name: fastgpt-minio - restart: always - networks: - - fastgpt - environment: - - MINIO_ROOT_USER=minioadmin - - MINIO_ROOT_PASSWORD=minioadmin - volumes: - - ./fastgpt-minio:/data - command: server /data --console-address ":9001" - healthcheck: - test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] - interval: 30s - timeout: 20s - retries: 3 sandbox: container_name: sandbox image: ${{fastgpt-sandbox.image}}:${{fastgpt-sandbox.tag}} @@ -185,7 +187,6 @@ ${{vec.db}} environment: <<: *x-share-db-config AUTH_TOKEN: *x-plugin-auth-token - S3_BUCKET: fastgpt-plugins # 工具网络请求，最大请求和响应体 SERVICE_REQUEST_MAX_CONTENT_LENGTH: 10 # 最大 API 请求体大小 diff --git a/document/content/docs/upgrading/4-13/4132.mdx b/document/content/docs/upgrading/4-13/4132.mdx index ac31fd3e1..27ce0e22f 100644 --- a/document/content/docs/upgrading/4-13/4132.mdx +++ b/document/content/docs/upgrading/4-13/4132.mdx @@ -1,5 +1,5 @@ --- -title: 'V4.13.2（进行中）' +title: 'V4.13.2（包含升级脚本）' description: 'FastGPT V4.13.2 更新说明' --- @@ -36,7 +36,9 @@ curl --location --request POST 'https://{{host}}/api/admin/initv4132' \ --header 'Content-Type: application/json' ``` -会删除原先 S3 的 circleLife 策略。如果使用的是外部 S3，可能会因为不支持 circleLife 操作导 +会删除原先 S3 的 circleLife 策略。如果使用的是外部 S3，可能会因为不支持 circleLife 操作导致该脚本错误，可以忽略（因为设置策略也会失败）。 + + ## 🚀 新增内容 1. HTTP 工具集支持手动创建模式。 diff --git a/document/data/doc-last-modified.json b/document/data/doc-last-modified.json index d5921a7a7..e0c3f32f6 100644 --- a/document/data/doc-last-modified.json +++ b/document/data/doc-last-modified.json @@ -113,7 +113,7 @@ "document/content/docs/upgrading/4-12/4124.mdx": "2025-09-17T22:29:56+08:00", "document/content/docs/upgrading/4-13/4130.mdx": "2025-09-30T16:00:10+08:00", "document/content/docs/upgrading/4-13/4131.mdx": "2025-09-30T15:47:06+08:00", - "document/content/docs/upgrading/4-13/4132.mdx": "2025-10-20T19:08:21+08:00", + "document/content/docs/upgrading/4-13/4132.mdx": "2025-10-21T11:19:57+08:00", "document/content/docs/upgrading/4-8/40.mdx": "2025-08-02T19:38:37+08:00", "document/content/docs/upgrading/4-8/41.mdx": "2025-08-02T19:38:37+08:00", "document/content/docs/upgrading/4-8/42.mdx": "2025-08-02T19:38:37+08:00", diff --git a/document/public/deploy/docker/cn/docker-compose.milvus.yml b/document/public/deploy/docker/cn/docker-compose.milvus.yml index 218b9950b..0f7246615 100644 --- a/document/public/deploy/docker/cn/docker-compose.milvus.yml +++ b/document/public/deploy/docker/cn/docker-compose.milvus.yml @@ -12,11 +12,14 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 + S3_EXTERNAL_BASE_URL: S3_ENDPOINT: fastgpt-minio S3_PORT: 9000 S3_USE_SSL: false S3_ACCESS_KEY: minioadmin S3_SECRET_KEY: minioadmin + S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 + S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 # 向量库相关配置 x-vec-config: &x-vec-config @@ -151,10 +154,27 @@ services: start_period: 30s volumes: - ./redis/data:/data + fastgpt-minio: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/minio:RELEASE.2025-09-07T16-13-09Z + container_name: fastgpt-minio + restart: always + networks: + - fastgpt + environment: + - MINIO_ROOT_USER=minioadmin + - MINIO_ROOT_PASSWORD=minioadmin + volumes: + - ./fastgpt-minio:/data + command: server /data --console-address ":9001" + healthcheck: + test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] + interval: 30s + timeout: 20s + retries: 3 fastgpt: container_name: fastgpt - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.13.1 # git + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.13.2 # git ports: - 3000:3000 networks: @@ -202,33 +222,15 @@ services: SERVICE_REQUEST_MAX_CONTENT_LENGTH: 10 volumes: - ./config.json:/app/data/config.json - - fastgpt-minio: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/minio:RELEASE.2025-09-07T16-13-09Z - container_name: fastgpt-minio - restart: always - networks: - - fastgpt - environment: - - MINIO_ROOT_USER=minioadmin - - MINIO_ROOT_PASSWORD=minioadmin - volumes: - - ./fastgpt-minio:/data - command: server /data --console-address ":9001" - healthcheck: - test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] - interval: 30s - timeout: 20s - retries: 3 sandbox: container_name: sandbox - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.13.1 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.13.2 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.13.1 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.13.2 networks: - fastgpt ports: @@ -237,7 +239,7 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.2.2 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.2.4 container_name: fastgpt-plugin restart: always networks: diff --git a/document/public/deploy/docker/cn/docker-compose.oceanbase.yml b/document/public/deploy/docker/cn/docker-compose.oceanbase.yml index 401c54726..66d18e38d 100644 --- a/document/public/deploy/docker/cn/docker-compose.oceanbase.yml +++ b/document/public/deploy/docker/cn/docker-compose.oceanbase.yml @@ -12,11 +12,14 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 + S3_EXTERNAL_BASE_URL: S3_ENDPOINT: fastgpt-minio S3_PORT: 9000 S3_USE_SSL: false S3_ACCESS_KEY: minioadmin S3_SECRET_KEY: minioadmin + S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 + S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 # 向量库相关配置 x-vec-config: &x-vec-config @@ -128,10 +131,27 @@ services: start_period: 30s volumes: - ./redis/data:/data + fastgpt-minio: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/minio:RELEASE.2025-09-07T16-13-09Z + container_name: fastgpt-minio + restart: always + networks: + - fastgpt + environment: + - MINIO_ROOT_USER=minioadmin + - MINIO_ROOT_PASSWORD=minioadmin + volumes: + - ./fastgpt-minio:/data + command: server /data --console-address ":9001" + healthcheck: + test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] + interval: 30s + timeout: 20s + retries: 3 fastgpt: container_name: fastgpt - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.13.1 # git + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.13.2 # git ports: - 3000:3000 networks: @@ -179,33 +199,15 @@ services: SERVICE_REQUEST_MAX_CONTENT_LENGTH: 10 volumes: - ./config.json:/app/data/config.json - - fastgpt-minio: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/minio:RELEASE.2025-09-07T16-13-09Z - container_name: fastgpt-minio - restart: always - networks: - - fastgpt - environment: - - MINIO_ROOT_USER=minioadmin - - MINIO_ROOT_PASSWORD=minioadmin - volumes: - - ./fastgpt-minio:/data - command: server /data --console-address ":9001" - healthcheck: - test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] - interval: 30s - timeout: 20s - retries: 3 sandbox: container_name: sandbox - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.13.1 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.13.2 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.13.1 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.13.2 networks: - fastgpt ports: @@ -214,7 +216,7 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.2.2 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.2.4 container_name: fastgpt-plugin restart: always networks: diff --git a/document/public/deploy/docker/cn/docker-compose.pg.yml b/document/public/deploy/docker/cn/docker-compose.pg.yml index 676eec082..51d786c23 100644 --- a/document/public/deploy/docker/cn/docker-compose.pg.yml +++ b/document/public/deploy/docker/cn/docker-compose.pg.yml @@ -12,11 +12,14 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 + S3_EXTERNAL_BASE_URL: S3_ENDPOINT: fastgpt-minio S3_PORT: 9000 S3_USE_SSL: false S3_ACCESS_KEY: minioadmin S3_SECRET_KEY: minioadmin + S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 + S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 # 向量库相关配置 x-vec-config: &x-vec-config @@ -109,10 +112,27 @@ services: start_period: 30s volumes: - ./redis/data:/data + fastgpt-minio: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/minio:RELEASE.2025-09-07T16-13-09Z + container_name: fastgpt-minio + restart: always + networks: + - fastgpt + environment: + - MINIO_ROOT_USER=minioadmin + - MINIO_ROOT_PASSWORD=minioadmin + volumes: + - ./fastgpt-minio:/data + command: server /data --console-address ":9001" + healthcheck: + test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] + interval: 30s + timeout: 20s + retries: 3 fastgpt: container_name: fastgpt - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.13.1 # git + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.13.2 # git ports: - 3000:3000 networks: @@ -160,33 +180,15 @@ services: SERVICE_REQUEST_MAX_CONTENT_LENGTH: 10 volumes: - ./config.json:/app/data/config.json - - fastgpt-minio: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/minio:RELEASE.2025-09-07T16-13-09Z - container_name: fastgpt-minio - restart: always - networks: - - fastgpt - environment: - - MINIO_ROOT_USER=minioadmin - - MINIO_ROOT_PASSWORD=minioadmin - volumes: - - ./fastgpt-minio:/data - command: server /data --console-address ":9001" - healthcheck: - test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] - interval: 30s - timeout: 20s - retries: 3 sandbox: container_name: sandbox - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.13.1 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.13.2 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.13.1 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.13.2 networks: - fastgpt ports: @@ -195,7 +197,7 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.2.2 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.2.4 container_name: fastgpt-plugin restart: always networks: diff --git a/document/public/deploy/docker/cn/docker-compose.zilliz.yml b/document/public/deploy/docker/cn/docker-compose.zilliz.yml index 9ed29d97f..567399008 100644 --- a/document/public/deploy/docker/cn/docker-compose.zilliz.yml +++ b/document/public/deploy/docker/cn/docker-compose.zilliz.yml @@ -12,11 +12,14 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 + S3_EXTERNAL_BASE_URL: S3_ENDPOINT: fastgpt-minio S3_PORT: 9000 S3_USE_SSL: false S3_ACCESS_KEY: minioadmin S3_SECRET_KEY: minioadmin + S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 + S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 # 向量库相关配置 x-vec-config: &x-vec-config @@ -92,10 +95,27 @@ services: start_period: 30s volumes: - ./redis/data:/data + fastgpt-minio: + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/minio:RELEASE.2025-09-07T16-13-09Z + container_name: fastgpt-minio + restart: always + networks: + - fastgpt + environment: + - MINIO_ROOT_USER=minioadmin + - MINIO_ROOT_PASSWORD=minioadmin + volumes: + - ./fastgpt-minio:/data + command: server /data --console-address ":9001" + healthcheck: + test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] + interval: 30s + timeout: 20s + retries: 3 fastgpt: container_name: fastgpt - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.13.1 # git + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.13.2 # git ports: - 3000:3000 networks: @@ -143,33 +163,15 @@ services: SERVICE_REQUEST_MAX_CONTENT_LENGTH: 10 volumes: - ./config.json:/app/data/config.json - - fastgpt-minio: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/minio:RELEASE.2025-09-07T16-13-09Z - container_name: fastgpt-minio - restart: always - networks: - - fastgpt - environment: - - MINIO_ROOT_USER=minioadmin - - MINIO_ROOT_PASSWORD=minioadmin - volumes: - - ./fastgpt-minio:/data - command: server /data --console-address ":9001" - healthcheck: - test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] - interval: 30s - timeout: 20s - retries: 3 sandbox: container_name: sandbox - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.13.1 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.13.2 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.13.1 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.13.2 networks: - fastgpt ports: @@ -178,7 +180,7 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.2.2 + image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.2.4 container_name: fastgpt-plugin restart: always networks: diff --git a/document/public/deploy/docker/global/docker-compose.milvus.yml b/document/public/deploy/docker/global/docker-compose.milvus.yml index 344a485b2..c80541ee9 100644 --- a/document/public/deploy/docker/global/docker-compose.milvus.yml +++ b/document/public/deploy/docker/global/docker-compose.milvus.yml @@ -12,11 +12,14 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 + S3_EXTERNAL_BASE_URL: S3_ENDPOINT: fastgpt-minio S3_PORT: 9000 S3_USE_SSL: false S3_ACCESS_KEY: minioadmin S3_SECRET_KEY: minioadmin + S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 + S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 # 向量库相关配置 x-vec-config: &x-vec-config @@ -151,10 +154,27 @@ services: start_period: 30s volumes: - ./redis/data:/data + fastgpt-minio: + image: minio/minio:RELEASE.2025-09-07T16-13-09Z + container_name: fastgpt-minio + restart: always + networks: + - fastgpt + environment: + - MINIO_ROOT_USER=minioadmin + - MINIO_ROOT_PASSWORD=minioadmin + volumes: + - ./fastgpt-minio:/data + command: server /data --console-address ":9001" + healthcheck: + test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] + interval: 30s + timeout: 20s + retries: 3 fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.13.1 # git + image: ghcr.io/labring/fastgpt:v4.13.2 # git ports: - 3000:3000 networks: @@ -202,33 +222,15 @@ services: SERVICE_REQUEST_MAX_CONTENT_LENGTH: 10 volumes: - ./config.json:/app/data/config.json - - fastgpt-minio: - image: minio/minio:RELEASE.2025-09-07T16-13-09Z - container_name: fastgpt-minio - restart: always - networks: - - fastgpt - environment: - - MINIO_ROOT_USER=minioadmin - - MINIO_ROOT_PASSWORD=minioadmin - volumes: - - ./fastgpt-minio:/data - command: server /data --console-address ":9001" - healthcheck: - test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] - interval: 30s - timeout: 20s - retries: 3 sandbox: container_name: sandbox - image: ghcr.io/labring/fastgpt-sandbox:v4.13.1 + image: ghcr.io/labring/fastgpt-sandbox:v4.13.2 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: ghcr.io/labring/fastgpt-mcp_server:v4.13.1 + image: ghcr.io/labring/fastgpt-mcp_server:v4.13.2 networks: - fastgpt ports: @@ -237,7 +239,7 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: ghcr.io/labring/fastgpt-plugin:v0.2.2 + image: ghcr.io/labring/fastgpt-plugin:v0.2.4 container_name: fastgpt-plugin restart: always networks: diff --git a/document/public/deploy/docker/global/docker-compose.oceanbase.yml b/document/public/deploy/docker/global/docker-compose.oceanbase.yml index f44d01e40..fca6479a3 100644 --- a/document/public/deploy/docker/global/docker-compose.oceanbase.yml +++ b/document/public/deploy/docker/global/docker-compose.oceanbase.yml @@ -12,11 +12,14 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 + S3_EXTERNAL_BASE_URL: S3_ENDPOINT: fastgpt-minio S3_PORT: 9000 S3_USE_SSL: false S3_ACCESS_KEY: minioadmin S3_SECRET_KEY: minioadmin + S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 + S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 # 向量库相关配置 x-vec-config: &x-vec-config @@ -128,10 +131,27 @@ services: start_period: 30s volumes: - ./redis/data:/data + fastgpt-minio: + image: minio/minio:RELEASE.2025-09-07T16-13-09Z + container_name: fastgpt-minio + restart: always + networks: + - fastgpt + environment: + - MINIO_ROOT_USER=minioadmin + - MINIO_ROOT_PASSWORD=minioadmin + volumes: + - ./fastgpt-minio:/data + command: server /data --console-address ":9001" + healthcheck: + test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] + interval: 30s + timeout: 20s + retries: 3 fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.13.1 # git + image: ghcr.io/labring/fastgpt:v4.13.2 # git ports: - 3000:3000 networks: @@ -179,33 +199,15 @@ services: SERVICE_REQUEST_MAX_CONTENT_LENGTH: 10 volumes: - ./config.json:/app/data/config.json - - fastgpt-minio: - image: minio/minio:RELEASE.2025-09-07T16-13-09Z - container_name: fastgpt-minio - restart: always - networks: - - fastgpt - environment: - - MINIO_ROOT_USER=minioadmin - - MINIO_ROOT_PASSWORD=minioadmin - volumes: - - ./fastgpt-minio:/data - command: server /data --console-address ":9001" - healthcheck: - test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] - interval: 30s - timeout: 20s - retries: 3 sandbox: container_name: sandbox - image: ghcr.io/labring/fastgpt-sandbox:v4.13.1 + image: ghcr.io/labring/fastgpt-sandbox:v4.13.2 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: ghcr.io/labring/fastgpt-mcp_server:v4.13.1 + image: ghcr.io/labring/fastgpt-mcp_server:v4.13.2 networks: - fastgpt ports: @@ -214,7 +216,7 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: ghcr.io/labring/fastgpt-plugin:v0.2.2 + image: ghcr.io/labring/fastgpt-plugin:v0.2.4 container_name: fastgpt-plugin restart: always networks: diff --git a/document/public/deploy/docker/global/docker-compose.pg.yml b/document/public/deploy/docker/global/docker-compose.pg.yml index 7720868a4..6c6f8a545 100644 --- a/document/public/deploy/docker/global/docker-compose.pg.yml +++ b/document/public/deploy/docker/global/docker-compose.pg.yml @@ -12,11 +12,14 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 + S3_EXTERNAL_BASE_URL: S3_ENDPOINT: fastgpt-minio S3_PORT: 9000 S3_USE_SSL: false S3_ACCESS_KEY: minioadmin S3_SECRET_KEY: minioadmin + S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 + S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 # 向量库相关配置 x-vec-config: &x-vec-config @@ -109,10 +112,27 @@ services: start_period: 30s volumes: - ./redis/data:/data + fastgpt-minio: + image: minio/minio:RELEASE.2025-09-07T16-13-09Z + container_name: fastgpt-minio + restart: always + networks: + - fastgpt + environment: + - MINIO_ROOT_USER=minioadmin + - MINIO_ROOT_PASSWORD=minioadmin + volumes: + - ./fastgpt-minio:/data + command: server /data --console-address ":9001" + healthcheck: + test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] + interval: 30s + timeout: 20s + retries: 3 fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.13.1 # git + image: ghcr.io/labring/fastgpt:v4.13.2 # git ports: - 3000:3000 networks: @@ -160,33 +180,15 @@ services: SERVICE_REQUEST_MAX_CONTENT_LENGTH: 10 volumes: - ./config.json:/app/data/config.json - - fastgpt-minio: - image: minio/minio:RELEASE.2025-09-07T16-13-09Z - container_name: fastgpt-minio - restart: always - networks: - - fastgpt - environment: - - MINIO_ROOT_USER=minioadmin - - MINIO_ROOT_PASSWORD=minioadmin - volumes: - - ./fastgpt-minio:/data - command: server /data --console-address ":9001" - healthcheck: - test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] - interval: 30s - timeout: 20s - retries: 3 sandbox: container_name: sandbox - image: ghcr.io/labring/fastgpt-sandbox:v4.13.1 + image: ghcr.io/labring/fastgpt-sandbox:v4.13.2 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: ghcr.io/labring/fastgpt-mcp_server:v4.13.1 + image: ghcr.io/labring/fastgpt-mcp_server:v4.13.2 networks: - fastgpt ports: @@ -195,7 +197,7 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: ghcr.io/labring/fastgpt-plugin:v0.2.2 + image: ghcr.io/labring/fastgpt-plugin:v0.2.4 container_name: fastgpt-plugin restart: always networks: diff --git a/document/public/deploy/docker/global/docker-compose.ziliiz.yml b/document/public/deploy/docker/global/docker-compose.ziliiz.yml index 2858da416..5fc6a44a2 100644 --- a/document/public/deploy/docker/global/docker-compose.ziliiz.yml +++ b/document/public/deploy/docker/global/docker-compose.ziliiz.yml @@ -12,11 +12,14 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 30 REDIS_URL: redis://default:mypassword@redis:6379 + S3_EXTERNAL_BASE_URL: S3_ENDPOINT: fastgpt-minio S3_PORT: 9000 S3_USE_SSL: false S3_ACCESS_KEY: minioadmin S3_SECRET_KEY: minioadmin + S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 + S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 # 向量库相关配置 x-vec-config: &x-vec-config @@ -92,10 +95,27 @@ services: start_period: 30s volumes: - ./redis/data:/data + fastgpt-minio: + image: minio/minio:RELEASE.2025-09-07T16-13-09Z + container_name: fastgpt-minio + restart: always + networks: + - fastgpt + environment: + - MINIO_ROOT_USER=minioadmin + - MINIO_ROOT_PASSWORD=minioadmin + volumes: + - ./fastgpt-minio:/data + command: server /data --console-address ":9001" + healthcheck: + test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] + interval: 30s + timeout: 20s + retries: 3 fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.13.1 # git + image: ghcr.io/labring/fastgpt:v4.13.2 # git ports: - 3000:3000 networks: @@ -143,33 +163,15 @@ services: SERVICE_REQUEST_MAX_CONTENT_LENGTH: 10 volumes: - ./config.json:/app/data/config.json - - fastgpt-minio: - image: minio/minio:RELEASE.2025-09-07T16-13-09Z - container_name: fastgpt-minio - restart: always - networks: - - fastgpt - environment: - - MINIO_ROOT_USER=minioadmin - - MINIO_ROOT_PASSWORD=minioadmin - volumes: - - ./fastgpt-minio:/data - command: server /data --console-address ":9001" - healthcheck: - test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] - interval: 30s - timeout: 20s - retries: 3 sandbox: container_name: sandbox - image: ghcr.io/labring/fastgpt-sandbox:v4.13.1 + image: ghcr.io/labring/fastgpt-sandbox:v4.13.2 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: ghcr.io/labring/fastgpt-mcp_server:v4.13.1 + image: ghcr.io/labring/fastgpt-mcp_server:v4.13.2 networks: - fastgpt ports: @@ -178,7 +180,7 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: ghcr.io/labring/fastgpt-plugin:v0.2.2 + image: ghcr.io/labring/fastgpt-plugin:v0.2.4 container_name: fastgpt-plugin restart: always networks: diff --git a/projects/app/src/pages/api/support/user/account/loginout.ts b/projects/app/src/pages/api/support/user/account/loginout.ts new file mode 100644 index 000000000..5e86d3c66 --- /dev/null +++ b/projects/app/src/pages/api/support/user/account/loginout.ts @@ -0,0 +1,14 @@ +import type { NextApiRequest, NextApiResponse } from 'next'; +import { NextAPI } from '@/service/middleware/entry'; +import { authCert, clearCookie } from '@fastgpt/service/support/permission/auth/common'; +import { delUserAllSession } from '@fastgpt/service/support/user/session'; + +async function handler(req: NextApiRequest, res: NextApiResponse) { + try { + const { userId } = await authCert({ req, authToken: true }); + await delUserAllSession(userId); + } catch (error) {} + clearCookie(res); +} + +export default NextAPI(handler); diff --git a/projects/app/src/pages/login/provider.tsx b/projects/app/src/pages/login/provider.tsx index 6f8a2b9ad..fee1a8d67 100644 --- a/projects/app/src/pages/login/provider.tsx +++ b/projects/app/src/pages/login/provider.tsx @@ -20,6 +20,7 @@ import { removeFastGPTSem } from '@/web/support/marketing/utils'; import { postAcceptInvitationLink } from '@/web/support/user/team/api'; +import { retryFn } from '@fastgpt/global/common/system/utils'; let isOauthLogging = false; @@ -124,7 +125,7 @@ const provider = () => { isOauthLogging = true; (async () => { - await clearToken(); + await retryFn(async () => clearToken()); router.prefetch('/dashboard/apps'); if (loginStore && loginStore.provider !== 'sso' && state !== loginStore.state) {