From ec3d61a713dcbba37562a8f8ac3aeb8c72495f91 Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Fri, 16 May 2025 00:57:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20/:file=20=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=97=A5=E5=BF=97=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/api/log.ts       |  2 +-
 docker/310.Dockerfile | 12 +++++-------
 docker/Dockerfile     | 12 +++++-------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/back/api/log.ts b/back/api/log.ts
index 97de3c3b..020d572e 100644
--- a/back/api/log.ts
+++ b/back/api/log.ts
@@ -60,7 +60,7 @@ export default (app: Router) => {
         const logService = Container.get(LogService);
         const finalPath = logService.checkFilePath(
           (req.query.path as string) || '',
-          (req.query.file as string) || '',
+          (req.params.file as string) || '',
         );
         if (!finalPath || blacklist.includes(req.query.path as string)) {
           return res.send({
diff --git a/docker/310.Dockerfile b/docker/310.Dockerfile
index 5b2f6111..8cd0f640 100644
--- a/docker/310.Dockerfile
+++ b/docker/310.Dockerfile
@@ -13,14 +13,13 @@ ARG QL_MAINTAINER="whyour"
 LABEL maintainer="${QL_MAINTAINER}"
 ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
 ARG QL_BRANCH=develop
+ARG PYTHON_SHORT_VERSION=3.10
 
 ENV QL_DIR=/ql \
   QL_BRANCH=${QL_BRANCH} \
   LANG=C.UTF-8 \
   SHELL=/bin/bash \
-  PS1="\u@\h:\w \$ " \
-  PYTHONPATH= \
-  PYTHON_SHORT_VERSION=
+  PS1="\u@\h:\w \$ "
 
 VOLUME /ql/data
   
@@ -52,12 +51,11 @@ RUN set -x \
   && apk update \
   && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
   && echo "Asia/Shanghai" > /etc/timezone \
-  && git config --global user.email "qinglong@@users.noreply.github.com" \
+  && git config --global user.email "qinglong@users.noreply.github.com" \
   && git config --global user.name "qinglong" \
   && git config --global http.postBuffer 524288000 \
   && rm -rf /root/.cache \
-  && ulimit -c 0 \
-  && PYTHON_SHORT_VERSION=$(echo ${PYTHON_VERSION} | cut -d. -f1,2)
+  && ulimit -c 0
 
 ARG SOURCE_COMMIT
 RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
@@ -77,7 +75,7 @@ ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
 ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin \
   NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules:${PNPM_HOME}/global/5/node_modules \
   PIP_CACHE_DIR=${PYTHON_HOME}/pip \
-  PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages:${PYTHONPATH}
+  PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages
 
 RUN pip3 install --prefix ${PYTHON_HOME} requests
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 61085c27..ae8d8cb1 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -13,14 +13,13 @@ ARG QL_MAINTAINER="whyour"
 LABEL maintainer="${QL_MAINTAINER}"
 ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
 ARG QL_BRANCH=develop
+ARG PYTHON_SHORT_VERSION=3.11
 
 ENV QL_DIR=/ql \
   QL_BRANCH=${QL_BRANCH} \
   LANG=C.UTF-8 \
   SHELL=/bin/bash \
-  PS1="\u@\h:\w \$ " \
-  PYTHONPATH= \
-  PYTHON_SHORT_VERSION=
+  PS1="\u@\h:\w \$ "
 
 VOLUME /ql/data
   
@@ -52,12 +51,11 @@ RUN set -x \
   && apk update \
   && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
   && echo "Asia/Shanghai" > /etc/timezone \
-  && git config --global user.email "qinglong@@users.noreply.github.com" \
+  && git config --global user.email "qinglong@users.noreply.github.com" \
   && git config --global user.name "qinglong" \
   && git config --global http.postBuffer 524288000 \
   && rm -rf /root/.cache \
-  && ulimit -c 0 \
-  && PYTHON_SHORT_VERSION=$(echo ${PYTHON_VERSION} | cut -d. -f1,2)
+  && ulimit -c 0
 
 ARG SOURCE_COMMIT
 RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
@@ -77,7 +75,7 @@ ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
 ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin \
   NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules:${PNPM_HOME}/global/5/node_modules \
   PIP_CACHE_DIR=${PYTHON_HOME}/pip \
-  PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages:${PYTHONPATH}
+  PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages
 
 RUN pip3 install --prefix ${PYTHON_HOME} requests