diff --git a/README.md b/README.md index a335513..31b5578 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@
- 版本 + 版本 许可证

🇨🇳 中文 diff --git a/README_EN.md b/README_EN.md index 59db735..32e0bce 100644 --- a/README_EN.md +++ b/README_EN.md @@ -3,7 +3,7 @@

- Version + Version License

🇨🇳 Chinese diff --git a/bulid_order.txt b/bulid_order.txt index a707a11..19216dd 100644 --- a/bulid_order.txt +++ b/bulid_order.txt @@ -1,13 +1,13 @@ docker 镜像相关命令: 前台镜像构建相关: -docker build -t zstar1003/ragflowplus:v0.2.1 . -docker tag zstar1003/ragflowplus:v0.2.1 zstar1003/ragflowplus:v0.2.1 -docker push zstar1003/ragflowplus:v0.2.1 +docker build -t zstar1003/ragflowplus:v0.3.0 . +docker tag zstar1003/ragflowplus:v0.3.0 zstar1003/ragflowplus:v0.3.0 +docker push zstar1003/ragflowplus:v0.3.0 后台镜像构建相关: cd management docker-compose build -docker tag zstar1003/ragflowplus-management-web:v0.2.1 zstar1003/ragflowplus-management-web:v0.2.1 -docker tag zstar1003/ragflowplus-management-server:v0.2.1 zstar1003/ragflowplus-management-server:v0.2.1 -docker push zstar1003/ragflowplus-management-web:v0.2.1 -docker push zstar1003/ragflowplus-management-server:v0.2.1 +docker tag zstar1003/ragflowplus-management-web:v0.3.0 zstar1003/ragflowplus-management-web:v0.3.0 +docker tag zstar1003/ragflowplus-management-server:v0.3.0 zstar1003/ragflowplus-management-server:v0.3.0 +docker push zstar1003/ragflowplus-management-web:v0.3.0 +docker push zstar1003/ragflowplus-management-server:v0.3.0 diff --git a/docker/.env b/docker/.env index eb14412..c29a759 100644 --- a/docker/.env +++ b/docker/.env @@ -50,6 +50,8 @@ MYSQL_PORT=5455 # The hostname where the MinIO service is exposed MINIO_HOST=minio +# minio上传文件时的ip地址,如需公网访问,可修改为公网ip地址 +MINIO_VISIT_HOST=host.docker.internal # The port used to expose the MinIO console interface to the host machine, # allowing EXTERNAL access to the web-based console running inside the Docker container. MINIO_CONSOLE_PORT=9001 @@ -73,10 +75,10 @@ REDIS_PASSWORD=infini_rag_flow SVR_HTTP_PORT=9380 -# 镜像名称变更为zstar1003/ragflowplus:v0.2.1,原始为infiniflow/ragflow:v0.18.0-slim -RAGFLOW_IMAGE=zstar1003/ragflowplus:v0.2.1 -RAGFLOWPLUS_MANAGEMENT_WEB_IMAGE=zstar1003/ragflowplus-management-web:v0.2.1 -RAGFLOWPLUS_MANAGEMENT_SERVER_IMAGE=zstar1003/ragflowplus-management-server:v0.2.1 +# RAGFLOW_IMAGE原始为infiniflow/ragflow:v0.18.0-slim +RAGFLOW_IMAGE=zstar1003/ragflowplus:v0.3.0 +RAGFLOWPLUS_MANAGEMENT_WEB_IMAGE=zstar1003/ragflowplus-management-web:v0.3.0 +RAGFLOWPLUS_MANAGEMENT_SERVER_IMAGE=zstar1003/ragflowplus-management-server:v0.3.0 # The local time zone. TIMEZONE='Asia/Shanghai' diff --git a/management/docker-compose.yml b/management/docker-compose.yml index bc0dc95..358e826 100644 --- a/management/docker-compose.yml +++ b/management/docker-compose.yml @@ -1,7 +1,7 @@ services: management-frontend: container_name: ragflowplus-management-frontend - image: zstar1003/ragflowplus-management-web:v0.2.1 + image: zstar1003/ragflowplus-management-web:v0.3.0 build: context: . dockerfile: Dockerfile @@ -17,7 +17,7 @@ services: management-backend: container_name: ragflowplus-management-backend - image: zstar1003/ragflowplus-management-server:v0.2.1 + image: zstar1003/ragflowplus-management-server:v0.3.0 build: context: . dockerfile: Dockerfile diff --git a/management/server/database.py b/management/server/database.py index 37100e2..e172720 100644 --- a/management/server/database.py +++ b/management/server/database.py @@ -24,7 +24,7 @@ def is_running_in_docker(): if is_running_in_docker(): MYSQL_HOST = "mysql" MYSQL_PORT = 3306 - MINIO_HOST = "minio" + MINIO_HOST = os.getenv("MINIO_VISIT_HOST", "host.docker.internal") MINIO_PORT = 9000 ES_HOST = "es01" ES_PORT = 9200 diff --git a/management/server/requirements.txt b/management/server/requirements.txt index 6833f2b..eecd52b 100644 --- a/management/server/requirements.txt +++ b/management/server/requirements.txt @@ -12,4 +12,15 @@ elasticsearch==8.12.0 minio==7.2.4 strenum==0.4.15 peewee==3.17.1 -pytz==2020.5 \ No newline at end of file +pytz==2020.5 +bs4==0.0.2 +opencv-python==4.10.0.84 +ultralytics==8.3.102 +doclayout-yolo==0.0.3 +ftfy==6.3.1 +dill==0.4.0 +shapely==2.1.0 +pyclipper==1.3.0.post6 +omegaconf==2.3.0 +rapid-table==1.0.3 +openai==1.70.0 \ No newline at end of file diff --git a/web/src/pages/chat/index.tsx b/web/src/pages/chat/index.tsx index a81dc35..8e2af93 100644 --- a/web/src/pages/chat/index.tsx +++ b/web/src/pages/chat/index.tsx @@ -429,7 +429,10 @@ const Chat = () => { step={1} defaultValue={fontSize} style={{ width: '80%' }} - onChange={(value) => setFontSize(value)} + onChange={(value) => { + setFontSize(value); + localStorage.setItem('chatFontSize', value.toString()); + }} />