From 3ae7f29be8e627d4dcb5103cf9c4b4a9621d2c56 Mon Sep 17 00:00:00 2001 From: liangliangyy Date: Thu, 12 Jan 2023 11:56:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.es.yml | 4 ++-- docker-compose.yml | 9 --------- requirements.txt | 8 ++++---- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/docker-compose.es.yml b/docker-compose.es.yml index 5aa52909b..0a02ce30e 100644 --- a/docker-compose.es.yml +++ b/docker-compose.es.yml @@ -2,7 +2,7 @@ version: '3' services: es: - image: liangliangyy/elasticsearch-analysis-ik:7.16.1 + image: liangliangyy/elasticsearch-analysis-ik:8.5.2 container_name: es restart: always environment: @@ -14,7 +14,7 @@ services: - ./bin/datas/es/:/usr/share/elasticsearch/data/ kibana: - image: kibana:7.13.2 + image: kibana:8.5.2 restart: always container_name: kibana ports: diff --git a/docker-compose.yml b/docker-compose.yml index 29510a2e8..3f5308fc1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,15 +4,6 @@ services: db: image: mysql:latest restart: always -# command: -# - mysqld -# - --max_connections=3000 -# - --wait_timeout=600 -# - --interactive_timeout=600 -# - --thread_cache_size=50 -# - --default-authentication-plugin=mysql_native_password -# - --character-set-server=utf8 -# - --collation-server=utf8_general_ci environment: - MYSQL_DATABASE=djangoblog - MYSQL_ROOT_PASSWORD=DjAnGoBlOg!2!Q@W#E diff --git a/requirements.txt b/requirements.txt index e2213f218..fdf34947d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -coverage==7.0.4 +coverage==7.0.5 bleach==5.0.1 Django==4.1.5 django-compressor==4.3 @@ -6,7 +6,7 @@ django-haystack==3.2.1 django-ipware==4.0.2 django-mdeditor==0.1.20 django-uuslug==2.0.0 -elasticsearch==7.16.1 +elasticsearch==8.5.2 elasticsearch-dsl==7.4.0 gevent==22.10.2 jieba==0.42.1 @@ -20,8 +20,8 @@ python-slugify==7.0.0 pytz==2022.7 raven==6.10.0 requests==2.28.1 -urllib3==1.26.13 +urllib3==1.26.14 WeRoBot==1.13.1 Whoosh==2.7.4 user-agents==2.2.0 -redis==4.4.1 +redis==4.4.2 From 50123a7cdf7ed574bc42239400fc95d02d54e4ee Mon Sep 17 00:00:00 2001 From: liangliangyy Date: Thu, 12 Jan 2023 14:10:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fdf34947d..2fc842fc1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ django-haystack==3.2.1 django-ipware==4.0.2 django-mdeditor==0.1.20 django-uuslug==2.0.0 -elasticsearch==8.5.2 +elasticsearch==7.16.1 elasticsearch-dsl==7.4.0 gevent==22.10.2 jieba==0.42.1