@whyour/qinglong 2.19.0-4 → 2.19.0-5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/docker/310.Dockerfile +5 -7
  2. package/docker/Dockerfile +5 -7
  3. package/package.json +1 -1
  4. package/static/build/api/log.js +1 -1
package/docker/310.Dockerfile CHANGED
@@ -18,14 +18,13 @@ ARG QL_MAINTAINER="whyour"
18
18
  LABEL maintainer="${QL_MAINTAINER}"
19
19
  ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
20
20
  ARG QL_BRANCH=develop
21
+ ARG PYTHON_SHORT_VERSION=3.10
21
22
 
22
23
  ENV QL_DIR=/ql \
23
24
  QL_BRANCH=${QL_BRANCH} \
24
25
  LANG=C.UTF-8 \
25
26
  SHELL=/bin/bash \
26
- PS1="\u@\h:\w \$ " \
27
- PYTHONPATH= \
28
- PYTHON_SHORT_VERSION=
27
+ PS1="\u@\h:\w \$ "
29
28
 
30
29
  COPY --from=nodebuilder /usr/local/bin/node /usr/local/bin/
31
30
  COPY --from=nodebuilder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
@@ -50,15 +49,14 @@ RUN set -x && \
50
49
  apt-get clean && \
51
50
  ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
52
51
  echo "Asia/Shanghai" >/etc/timezone && \
53
- git config --global user.email "qinglong@@users.noreply.github.com" && \
52
+ git config --global user.email "qinglong@users.noreply.github.com" && \
54
53
  git config --global user.name "qinglong" && \
55
54
  git config --global http.postBuffer 524288000 && \
56
55
  npm install -g pnpm@8.3.1 pm2 ts-node && \
57
56
  rm -rf /root/.cache && \
58
57
  rm -rf /root/.npm && \
59
58
  rm -rf /etc/apt/apt.conf.d/docker-clean && \
60
- ulimit -c 0 && \
61
- PYTHON_SHORT_VERSION=$(echo ${PYTHON_VERSION} | cut -d. -f1,2)
59
+ ulimit -c 0
62
60
 
63
61
  ARG SOURCE_COMMIT
64
62
  RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} && \
@@ -78,7 +76,7 @@ ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
78
76
  ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin \
79
77
  NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules:${PNPM_HOME}/global/5/node_modules \
80
78
  PIP_CACHE_DIR=${PYTHON_HOME}/pip \
81
- PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages:${PYTHONPATH}
79
+ PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages
82
80
 
83
81
  RUN pip3 install --prefix ${PYTHON_HOME} requests
84
82
 
package/docker/Dockerfile CHANGED
@@ -18,14 +18,13 @@ ARG QL_MAINTAINER="whyour"
18
18
  LABEL maintainer="${QL_MAINTAINER}"
19
19
  ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
20
20
  ARG QL_BRANCH=develop
21
+ ARG PYTHON_SHORT_VERSION=3.11
21
22
 
22
23
  ENV QL_DIR=/ql \
23
24
  QL_BRANCH=${QL_BRANCH} \
24
25
  LANG=C.UTF-8 \
25
26
  SHELL=/bin/bash \
26
- PS1="\u@\h:\w \$ " \
27
- PYTHONPATH= \
28
- PYTHON_SHORT_VERSION=
27
+ PS1="\u@\h:\w \$ "
29
28
 
30
29
  COPY --from=nodebuilder /usr/local/bin/node /usr/local/bin/
31
30
  COPY --from=nodebuilder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
@@ -51,15 +50,14 @@ RUN set -x && \
51
50
  apt-get clean && \
52
51
  ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
53
52
  echo "Asia/Shanghai" >/etc/timezone && \
54
- git config --global user.email "qinglong@@users.noreply.github.com" && \
53
+ git config --global user.email "qinglong@users.noreply.github.com" && \
55
54
  git config --global user.name "qinglong" && \
56
55
  git config --global http.postBuffer 524288000 && \
57
56
  npm install -g pnpm@8.3.1 pm2 ts-node && \
58
57
  rm -rf /root/.cache && \
59
58
  rm -rf /root/.npm && \
60
59
  rm -rf /etc/apt/apt.conf.d/docker-clean && \
61
- ulimit -c 0 && \
62
- PYTHON_SHORT_VERSION=$(echo ${PYTHON_VERSION} | cut -d. -f1,2)
60
+ ulimit -c 0
63
61
 
64
62
  ARG SOURCE_COMMIT
65
63
  RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} && \
@@ -79,7 +77,7 @@ ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
79
77
  ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin \
80
78
  NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules:${PNPM_HOME}/global/5/node_modules \
81
79
  PIP_CACHE_DIR=${PYTHON_HOME}/pip \
82
- PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages:${PYTHONPATH}
80
+ PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages
83
81
 
84
82
  RUN pip3 install --prefix ${PYTHON_HOME} requests
85
83
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@whyour/qinglong",
3
- "version": "2.19.0-4",
3
+ "version": "2.19.0-5",
4
4
  "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
5
5
  "repository": {
6
6
  "type": "git",
package/static/build/api/log.js CHANGED
@@ -47,7 +47,7 @@ exports.default = (app) => {
47
47
  route.get('/:file', async (req, res, next) => {
48
48
  try {
49
49
  const logService = typedi_1.Container.get(log_1.default);
50
- const finalPath = logService.checkFilePath(req.query.path || '', req.query.file || '');
50
+ const finalPath = logService.checkFilePath(req.query.path || '', req.params.file || '');
51
51
  if (!finalPath || blacklist.includes(req.query.path)) {
52
52
  return res.send({
53
53
  code: 403,