fix Docker Hub build fix git hash, comment fix

quziang · Jun 18, 2021 · a2223cd · a2223cd
1 parent 5bcc719
commit a2223cd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,4 +1,5 @@
 mongo_data/*
 certs/*
 data/*
-logs/*
+logs/*
+YYeTsFE/node_modules/*
diff --git a/Dockerfile b/Dockerfile
@@ -14,10 +14,12 @@ RUN apk update && apk add --no-cache libressl jpeg-dev openjpeg-dev libimagequan
 
 FROM node:alpine as nodebuilder
 WORKDIR /YYeTsBot/YYeTsFE/
+RUN apk add git
 COPY YYeTsFE/package.json /YYeTsBot/YYeTsFE/
 COPY YYeTsFE/yarn.lock /YYeTsBot/YYeTsFE/
 RUN yarn
-COPY YYeTsFE /YYeTsBot/YYeTsFE/
+COPY . /YYeTsBot/
+RUN echo "gitdir: $(pwd)/../.git/modules/YYeTsFE" > .git
 RUN yarn run release
 
 

diff --git a/YYeTsFE b/YYeTsFE
diff --git a/yyetsweb/Mongo.py b/yyetsweb/Mongo.py
@@ -137,7 +137,7 @@ def get_comment(self, resource_id: int, page: int, size: int, **kwargs) -> dict:
 
         count = self.db["comment"].count_documents(condition)
         data = self.db["comment"].find(condition, projection={"ip": False}) \
-            .sort("id", pymongo.DESCENDING).limit(size).skip((page - 1) * size)
+            .sort("_id", pymongo.DESCENDING).limit(size).skip((page - 1) * size)
         return {
             "data": self.convert_objectid(list(data)),
             "count": count,
@@ -150,7 +150,7 @@ def add_comment(self, captcha: str, captcha_id: int, content: str, resource_id:
         verify_result = CaptchaResource().verify_code(captcha, captcha_id)
         if not verify_result["status"]:
             returned["status_code"] = HTTPStatus.BAD_REQUEST
-            returned["message"] = verify_result
+            returned["message"] = verify_result["message"]
             return returned
 
         exists = self.db["yyets"].find_one({"data.info.id": resource_id})