fix bug

Author: xqhgit

README.md

@@ -5,6 +5,7 @@
 [![](https://img.shields.io/badge/Vue-2.x-green.svg)](https://cn.vuejs.org/index.html)
 [![](https://img.shields.io/badge/ElementUI-2.13.2-blue.svg)](https://element.eleme.io/#/zh-CN)
 [![](https://img.shields.io/badge/BootstrapVue-2.21.2-blueviolet.svg)](https://code.z01.com/bootstrap-vue/)
+[![](https://img.shields.io/badge/Elasticsearch-7.17.0-ff69b4.svg)](https://www.elastic.co/cn/elasticsearch/)
 
 
 PS: 日常维护中
@@ -93,9 +94,25 @@ git clone https://gitee.com/xuqihui/fastapi-vue-blog
 ### 简单发布(可能不适合生产环境)
 ```
 前提：安装好Docker和docker-compose
-1: cd fastapi-vue-blog
-2: docker-compose -f webappSimple-compose.yml up -d --build
-3: docker-compose -f webappSimple-compose.yml exec webapp python db/init_db.py  # 如果数据没有初始化
+# 工作目录
+cd fastapi-vue-blog
+
+# 构建容器和启动服务
+bash launcher.sh
+
+# 构建镜像和启动服务
+docker-compose -f webappSimple-compose.yml up -d --build
+
+docker-compose -f webappSimple-compose.yml exec webapp python db/init_db.py  # 如果数据没有初始化
+
+# 查看服务情况
+docker-compose -f webappSimple-compose.yml ps
+
+# 停止服务
+docker-compose -f webappSimple-compose.yml stop
+
+# 关闭服务并移除容器
+docker-compose -f webappSimple-compose.yml down
 ```
 
 ## 图片预览

elasticsearch.dockerfile

@@ -0,0 +1,6 @@
+FROM elasticsearch:7.17.0
+
+WORKDIR /usr/share/elasticsearch
+COPY resource/elasticsearch-analysis-ik-7.17.0.zip .
+RUN unzip elasticsearch-analysis-ik-7.17.0.zip -d /usr/share/elasticsearch/plugins/ik
+RUN chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/plugins/ik

launcher.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+docker-compose -f webappSimple-compose.yml up -d --build
+sleep 1
+
+echo "Preparing initialize data..."
+sleep 2
+docker-compose -f webappSimple-compose.yml exec webapp python db/init_db.py
+sleep 1
+
+docker-compose -f webappSimple-compose.yml restart all
+
+docker-compose -f webappSimple-compose.yml ps

resource/elasticsearch-analysis-ik-7.17.0.zip

@@ -1,4 +1,6 @@
 # -*- coding: UTF-8 -*-
+import time
+import traceback
 import asyncio
 import os
 from starlette.middleware.cors import CORSMiddleware
@@ -11,6 +13,8 @@
 
 
 def create_application() -> FastAPI:
+    # 等待数据库和搜索引擎启动完成
+    time.sleep(3)
     application = FastAPI()
     application.include_router(api_router, prefix='/api')
     register_middleware(application)
@@ -103,7 +107,10 @@ async def inject_data_to_es():
 def register_event(app):
     @app.on_event("startup")
     async def startup_event():
-        await register_elasticsearch()
+        try:
+            await register_elasticsearch()
+        except Exception as e:
+            traceback.print_exc()
 
     @app.on_event("shutdown")
     async def shutdown_event():

webapi/__init__.py

@@ -35,13 +35,14 @@ async def create(self, obj_in: PostIn):
         db_obj.categories.extend(categories)
         self.db_session.add(db_obj)
         await self.db_session.flush()
-        await es_create_doc({
-            'id': db_obj.id,
-            'title': db_obj.title,
-            'description': db_obj.description,
-            'body': db_obj.body,
-            'timestamp': db_obj.timestamp,
-        })
+        if db_obj.is_published:
+            await es_create_doc({
+                'id': db_obj.id,
+                'title': db_obj.title,
+                'description': db_obj.description,
+                'body': db_obj.body,
+                'timestamp': db_obj.timestamp,
+            })
         return db_obj
 
     async def update(self, db_obj: Post, obj_in: PostInUpdate):

webapi/db/dals/post_dal.py

@@ -18,18 +18,18 @@ class Settings(BaseSettings):
     ADMIN_EMAIL = '[email protected]'
 
     # 数据库账号密码
-    DB_HOST = 'fastapivueblog'
+    DB_HOST = 'mysql'
     DB_PORT = 3306
     DB_USER = 'root'
-    DB_PASSWORD = 'blog@fastapi'
+    DB_PASSWORD = 'fastapivueblog12306'
     DB_NAME = 'FastAPIVueBlog'
 
     DATABASE_URI = f'mysql+pymysql://{DB_USER}:{DB_PASSWORD}@{DB_HOST}:{DB_PORT}'
     SQLALCHEMY_DATABASE_URI: str = f'mysql+aiomysql://{DB_USER}:{DB_PASSWORD}@{DB_HOST}:{DB_PORT}/{DB_NAME}'
     SECRET_KEY: str = secrets.token_urlsafe(32)
 
     # Elasticsearch
-    ELASTIC_HOST = 'fastapivueblog'
+    ELASTIC_HOST = 'elasticsearch'
     ELASTIC_PORT = 9200
 
     # 12 hours

webapi/setting.py

@@ -65,14 +65,7 @@ def parse_data(data):
 
 
 async def es_update_doc(data):
-    if await es.exists(index=INDEX, id=data['id']):
-        await es.update(
-            index=INDEX,
-            id=data['id'],
-            body=data,
-        )
-    else:
-        await es_create_doc(data)
+    await es_create_doc(data)
 
 
 async def es_delete_doc(_id):
@@ -84,6 +77,7 @@ async def es_delete_doc(_id):
 
 
 async def es_create_doc(data):
+    await es_delete_doc(data['id'])
     await es.create(
         index=INDEX,
         id=data['id'],

webapi/utils/elastic.py

@@ -8,35 +8,27 @@ services:
       - 9527:5000
     depends_on:
       - mysql
-    networks:
-      - fastapivueblog
+      - elasticsearch
 
   mysql:
     image: "mariadb:10.5.9-focal"
     environment:
       - MYSQL_ROOT_HOST=%
-      - MYSQL_ROOT_PASSWORD=blog@fastapi
+      - MYSQL_ROOT_PASSWORD=fastapivueblog12306
       - MYSQL_DATABASE=FastAPIVueBlog
-      - MYSQL_USER=root
-      - MYSQL_PASSWORD=blog@fastapi
+#      - MYSQL_USER=root
+      - MYSQL_PASSWORD=fastapivueblog12306
     ports:
       - 13306:3306
-    networks:
-      - fastapivueblog
     command: ['mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci']
 
   elasticsearch:
-    image: "elasticsearch:7.17.0"
+    build:
+      context: .
+      dockerfile: elasticsearch.dockerfile
     environment:
       - discovery.type=single-node
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
     ports:
     - 19200:9200
     - 19300:9300
-    networks:
-      - fastapivueblog
-
-
-networks:
-  fastapivueblog:
-    driver: bridge