Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

解决跨域问题，加载前端静态资源即可访问页面，启动更快 #237

Merged
merged 7 commits into from
Apr 9, 2024
Merged

解决跨域问题，加载前端静态资源即可访问页面，启动更快 #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8a051e5
refactor: Optimize the way to obtain GPU computing power.
xixihahaliu Apr 9, 2024
24d4a26
feat: Front-end service changed to use static resources.
xixihahaliu Apr 9, 2024
0aa9d63
fix: Script address error.
xixihahaliu Apr 9, 2024
42e43b3
refactor: Delete front-end code and front-end service startup code, s…
xixihahaliu Apr 9, 2024
84034d2
chore: Delete es related whl files.
xixihahaliu Apr 9, 2024
e687d3a
fix: Update image version, add data address readme.
xixihahaliu Apr 9, 2024
4a28f94
refactor: Increase the number of MySQL connection pool.
xixihahaliu Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 22 additions & 23 deletions docker-compose-linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,27 @@
version: '3.5'

services:
elasticsearch:
container_name: es-container-local
image: "docker.elastic.co/elasticsearch/elasticsearch:8.11.4"
privileged: true
# ports:
# - 9200:9200
# - 9300:9300
restart: on-failure
environment:
- discovery.type=single-node
- xpack.security.enabled=false
- "ES_JAVA_OPTS=-Xms1024m -Xmx1024m"
volumes:
- ${DOCKER_VOLUME_DIRECTORY:-.}/third_party/es/plugins:/usr/share/elasticsearch/plugins
- ${DOCKER_VOLUME_DIRECTORY:-.}/volumes/es/data:/usr/share/elasticsearch/data
healthcheck:
test: curl --fail http://localhost:9200/_cat/health || exit 1
interval: 30s
timeout: 20s
retries: 3

etcd:
container_name: milvus-etcd-local
image: quay.io/coreos/etcd:v3.5.5
Expand Down Expand Up @@ -65,27 +86,6 @@ services:
- "etcd"
- "minio"

elasticsearch:
container_name: es-container-local
image: "docker.elastic.co/elasticsearch/elasticsearch:8.11.4"
privileged: true
ports:
- 9200:9200
- 9300:9300
restart: on-failure
environment:
- discovery.type=single-node
- xpack.security.enabled=false
- "ES_JAVA_OPTS=-Xms1024m -Xmx1024m"
volumes:
- ${DOCKER_VOLUME_DIRECTORY:-.}/third_party/es/plugins:/usr/share/elasticsearch/plugins
- ${DOCKER_VOLUME_DIRECTORY:-.}/volumes/es/data:/usr/share/elasticsearch/data
healthcheck:
test: curl --fail http://localhost:9200/_cat/health || exit 1
interval: 30s
timeout: 20s
retries: 3

mysql:
container_name: mysql-container-local
privileged: true
Expand All @@ -99,7 +99,7 @@ services:

qanything_local:
container_name: qanything-container-local
image: freeren/qanything:v1.2.1
image: freeren/qanything:v1.2.2
# runtime: nvidia
deploy:
resources:
Expand All @@ -117,7 +117,6 @@ services:
- ${DOCKER_VOLUME_DIRECTORY:-.}/assets/custom_models:/model_repos/CustomLLM
- ${DOCKER_VOLUME_DIRECTORY:-.}/:/workspace/qanything_local/
ports:
- "5052:5052"
- "8777:8777"
environment:
- NCCL_LAUNCH_MODE=PARALLEL
Expand Down
45 changes: 22 additions & 23 deletions docker-compose-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,27 @@
version: '3.5'

services:
elasticsearch:
container_name: es-container-local
image: "docker.elastic.co/elasticsearch/elasticsearch:8.11.4"
privileged: true
# ports:
# - 9200:9200
# - 9300:9300
restart: on-failure
environment:
- discovery.type=single-node
- xpack.security.enabled=false
- "ES_JAVA_OPTS=-Xms1024m -Xmx1024m"
volumes:
- ${DOCKER_VOLUME_DIRECTORY:-.}/third_party/es/plugins:/usr/share/elasticsearch/plugins
- ${DOCKER_VOLUME_DIRECTORY:-.}/volumes/es/data:/usr/share/elasticsearch/data
healthcheck:
test: curl --fail http://localhost:9200/_cat/health || exit 1
interval: 30s
timeout: 20s
retries: 3

etcd:
container_name: milvus-etcd-local
image: quay.io/coreos/etcd:v3.5.5
Expand Down Expand Up @@ -65,27 +86,6 @@ services:
- "etcd"
- "minio"

elasticsearch:
container_name: es-container-local
image: "docker.elastic.co/elasticsearch/elasticsearch:8.11.4"
privileged: true
ports:
- 9200:9200
- 9300:9300
restart: on-failure
environment:
- discovery.type=single-node
- xpack.security.enabled=false
- "ES_JAVA_OPTS=-Xms1024m -Xmx1024m"
volumes:
- ${DOCKER_VOLUME_DIRECTORY:-.}/third_party/es/plugins:/usr/share/elasticsearch/plugins
- ${DOCKER_VOLUME_DIRECTORY:-.}/volumes/es/data:/usr/share/elasticsearch/data
healthcheck:
test: curl --fail http://localhost:9200/_cat/health || exit 1
interval: 30s
timeout: 20s
retries: 3

mysql:
container_name: mysql-container-local
privileged: true
Expand All @@ -99,7 +99,7 @@ services:

qanything_local:
container_name: qanything-container-local
image: freeren/qanything-win:v1.2.1
image: freeren/qanything-win:v1.2.2
# runtime: nvidia
deploy:
resources:
Expand All @@ -115,7 +115,6 @@ services:
- ${DOCKER_VOLUME_DIRECTORY:-.}/assets/custom_models:/model_repos/CustomLLM
- ${DOCKER_VOLUME_DIRECTORY:-.}/:/workspace/qanything_local/
ports:
- "5052:5052"
- "8777:8777"
environment:
- NCCL_LAUNCH_MODE=PARALLEL
Expand Down
5 changes: 0 additions & 5 deletions front_end/.env.development
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions front_end/.env.production
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions front_end/.eslintignore
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions front_end/.eslintrc.js
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions front_end/.prettierrc.js
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions front_end/README.md
View file
Open in desktop

This file was deleted.

77 changes: 0 additions & 77 deletions front_end/package.json
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions front_end/src/App.vue
View file
Open in desktop

This file was deleted.

Binary file removed front_end/src/assets/home/avatar.png
View file
Open in desktop
Binary file not shown.
Binary file removed front_end/src/assets/home/icon-add.png
View file
Open in desktop
Binary file not shown.
Binary file removed front_end/src/assets/home/icon-back.png
View file
Open in desktop
Binary file not shown.
Binary file removed front_end/src/assets/home/icon-document.png
View file
Open in desktop
Binary file not shown.
Binary file removed front_end/src/assets/home/icon-email.png
View file
Open in desktop
Binary file not shown.
Binary file removed front_end/src/assets/home/icon-folder.png
View file
Open in desktop
Binary file not shown.
Binary file removed front_end/src/assets/home/icon-home.png
View file
Open in desktop
Binary file not shown.
Binary file removed front_end/src/assets/home/icon-loading.png
View file
Open in desktop
Binary file not shown.
Binary file removed front_end/src/assets/home/icon-reload.png
View file
Open in desktop
Binary file not shown.
Binary file removed front_end/src/assets/home/icon-search.png
View file
Open in desktop
Binary file not shown.
Loading