@whyour/qinglong 2.19.2-2 → 2.20.0-2

package/.env.example

@@ -1,6 +1,5 @@
 GRPC_PORT=5500
-BACK_PORT=5600
-PORT=5700
+BACK_PORT=5700
 
 LOG_LEVEL='info'
 

package/README-en.md

@@ -18,9 +18,9 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 [docker-image-size-image]: https://img.shields.io/docker/image-size/whyour/qinglong?style=flat
 [docker-image-size-url]: https://hub.docker.com/r/whyour/qinglong
 
-[Demo](http://demo.ninesix.cc:4433/) / [Issues](https://github.com/whyour/qinglong/issues) / [Telegram Channel](https://t.me/jiao_long) / [Buy Me a Coffee](https://www.buymeacoffee.com/qinglong)
+[Demo](http://demo.qinglong.online:4433/) / [Issues](https://github.com/whyour/qinglong/issues) / [Telegram Channel](https://t.me/jiao_long) / [Buy Me a Coffee](https://www.buymeacoffee.com/qinglong)
 
-[演示](http://demo.ninesix.cc:4433/) / [反馈](https://github.com/whyour/qinglong/issues) / [Telegram 频道](https://t.me/jiao_long) / [打赏开发者](https://user-images.githubusercontent.com/22700758/244744295-29cd0cd1-c8bb-4ea1-adf6-29bd390ad4dd.jpg)
+[演示](http://demo.qinglong.online:4433/) / [反馈](https://github.com/whyour/qinglong/issues) / [Telegram 频道](https://t.me/jiao_long) / [打赏开发者](https://user-images.githubusercontent.com/22700758/244744295-29cd0cd1-c8bb-4ea1-adf6-29bd390ad4dd.jpg)
 </div>
 
 ![cover](https://user-images.githubusercontent.com/22700758/244847235-8dc1ca21-e03f-4606-9458-0541fab60413.png)
@@ -41,6 +41,8 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 
 The `latest` image is built on `alpine` and the `debian` image is built on `debian-slim`. If you need to use a dependency that is not supported by `alpine`, it is recommended that you use the `debian` image.
 
+**⚠️ Important**: If you need to run Docker as a **non-root user**, please use the `debian` image. Alpine's `crond` requires root privileges.
+
 ```bash
 docker pull whyour/qinglong:latest
 docker pull whyour/qinglong:debian

package/README.md

@@ -20,9 +20,9 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 [docker-image-size-image]: https://img.shields.io/docker/image-size/whyour/qinglong?style=flat
 [docker-image-size-url]: https://hub.docker.com/r/whyour/qinglong
 
-[Demo](http://demo.ninesix.cc:4433/) / [Issues](https://github.com/whyour/qinglong/issues) / [Telegram Channel](https://t.me/jiao_long) / [Buy Me a Coffee](https://www.buymeacoffee.com/qinglong)
+[Demo](http://demo.qinglong.online:4433/) / [Issues](https://github.com/whyour/qinglong/issues) / [Telegram Channel](https://t.me/jiao_long) / [Buy Me a Coffee](https://www.buymeacoffee.com/qinglong)
 
-[演示](http://demo.ninesix.cc:4433/) / [反馈](https://github.com/whyour/qinglong/issues) / [Telegram 频道](https://t.me/jiao_long) / [打赏开发者](https://user-images.githubusercontent.com/22700758/244744295-29cd0cd1-c8bb-4ea1-adf6-29bd390ad4dd.jpg)
+[演示](http://demo.qinglong.online:4433/) / [反馈](https://github.com/whyour/qinglong/issues) / [Telegram 频道](https://t.me/jiao_long) / [打赏开发者](https://user-images.githubusercontent.com/22700758/244744295-29cd0cd1-c8bb-4ea1-adf6-29bd390ad4dd.jpg)
 </div>
 
 ![cover](https://user-images.githubusercontent.com/22700758/244847235-8dc1ca21-e03f-4606-9458-0541fab60413.png)
@@ -43,6 +43,8 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 
 `latest` 镜像是基于 `alpine` 构建，`debian` 镜像是基于 `debian-slim` 构建。如果需要使用 `alpine` 不支持的依赖，建议使用 `debian` 镜像
 
+**⚠️ 重要提示**: 如果您需要以**非 root 用户**运行 Docker，请使用 `debian` 镜像。Alpine 的 `crond` 需要 root 权限。
+
 ```bash
 docker pull whyour/qinglong:latest
 docker pull whyour/qinglong:debian

package/back/protos/api.proto

@@ -97,6 +97,18 @@ message UpdateCronRequest {
 
 message DeleteCronsRequest { repeated int32 ids = 1; }
 
+message GetCronsRequest {
+  optional string searchValue = 1;
+}
+
+message GetCronByIdRequest { int32 id = 1; }
+
+message EnableCronsRequest { repeated int32 ids = 1; }
+
+message DisableCronsRequest { repeated int32 ids = 1; }
+
+message RunCronsRequest { repeated int32 ids = 1; }
+
 message CronsResponse {
   int32 code = 1;
   repeated CronItem data = 2;
@@ -254,4 +266,9 @@ service Api {
   rpc CreateCron(CreateCronRequest) returns (CronResponse) {}
   rpc UpdateCron(UpdateCronRequest) returns (CronResponse) {}
   rpc DeleteCrons(DeleteCronsRequest) returns (Response) {}
+  rpc GetCrons(GetCronsRequest) returns (CronsResponse) {}
+  rpc GetCronById(GetCronByIdRequest) returns (CronResponse) {}
+  rpc EnableCrons(EnableCronsRequest) returns (Response) {}
+  rpc DisableCrons(DisableCronsRequest) returns (Response) {}
+  rpc RunCrons(RunCronsRequest) returns (Response) {}
 }

package/docker/310.Dockerfile

@@ -26,6 +26,17 @@ ENV QL_DIR=/ql \
   SHELL=/bin/bash \
   PS1="\u@\h:\w \$ "
 
+ARG QL_UID=5432
+ARG QL_GID=5432
+RUN groupadd -g ${QL_GID} qinglong && \
+    useradd -m -u ${QL_UID} -g ${QL_GID} -s /bin/bash qinglong && \
+    mkdir -p /home/qinglong/bin /home/qinglong/.ssh && \
+    chmod 700 /home/qinglong/.ssh && \
+    chown -R ${QL_UID}:${QL_GID} /home/qinglong
+
+ENV QL_USER=qinglong
+ENV QL_HOME=/home/$QL_USER
+
 COPY --from=nodebuilder /usr/local/bin/node /usr/local/bin/
 COPY --from=nodebuilder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
 
@@ -40,7 +51,6 @@ RUN set -x && \
   perl \
   openssl \
   openssh-client \
-  nginx \
   jq \
   procps \
   netcat-openbsd \
@@ -58,16 +68,21 @@ RUN set -x && \
   rm -rf /etc/apt/apt.conf.d/docker-clean && \
   ulimit -c 0
 
+RUN mkdir -p ${QL_DIR} && \
+  chown -R ${QL_UID}:${QL_GID} ${QL_DIR}
+
+USER qinglong
+
 ARG SOURCE_COMMIT
 RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} && \
   cd ${QL_DIR} && \
   cp -f .env.example .env && \
   chmod 777 ${QL_DIR}/shell/*.sh && \
   chmod 777 ${QL_DIR}/docker/*.sh && \
-  git clone --depth=1 -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /static && \
+  git clone --depth=1 -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /tmp/static && \
   mkdir -p ${QL_DIR}/static && \
-  cp -rf /static/* ${QL_DIR}/static && \
-  rm -rf /static
+  cp -rf /tmp/static/* ${QL_DIR}/static && \
+  rm -rf /tmp/static
 
 ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
   PYTHON_HOME=${QL_DIR}/data/dep_cache/python3 \
@@ -80,12 +95,14 @@ ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOM
 
 RUN pip3 install --prefix ${PYTHON_HOME} requests
 
-COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/
+COPY --chown=qinglong:qinglong --from=builder /tmp/build/node_modules/. /ql/node_modules/
+
+USER root
 
 WORKDIR ${QL_DIR}
 
 HEALTHCHECK --interval=5s --timeout=2s --retries=20 \
-  CMD curl -sf --noproxy '*' http://127.0.0.1:5600/api/health || exit 1
+  CMD curl -sf --noproxy '*' http://127.0.0.1:5700/api/health || exit 1
 
 ENTRYPOINT ["./docker/docker-entrypoint.sh"]
 

package/docker/Dockerfile

@@ -26,6 +26,17 @@ ENV QL_DIR=/ql \
   SHELL=/bin/bash \
   PS1="\u@\h:\w \$ "
 
+ARG QL_UID=5432
+ARG QL_GID=5432
+RUN groupadd -g ${QL_GID} qinglong && \
+    useradd -m -u ${QL_UID} -g ${QL_GID} -s /bin/bash qinglong && \
+    mkdir -p /home/qinglong/bin /home/qinglong/.ssh && \
+    chmod 700 /home/qinglong/.ssh && \
+    chown -R ${QL_UID}:${QL_GID} /home/qinglong
+
+ENV QL_USER=qinglong
+ENV QL_HOME=/home/$QL_USER
+
 COPY --from=nodebuilder /usr/local/bin/node /usr/local/bin/
 COPY --from=nodebuilder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
 
@@ -41,7 +52,6 @@ RUN set -x && \
   perl \
   openssl \
   openssh-client \
-  nginx \
   jq \
   procps \
   netcat-openbsd \
@@ -59,16 +69,20 @@ RUN set -x && \
   rm -rf /etc/apt/apt.conf.d/docker-clean && \
   ulimit -c 0
 
+RUN mkdir -p ${QL_DIR} && \
+  chown -R ${QL_UID}:${QL_GID} ${QL_DIR}
+
+USER qinglong
 ARG SOURCE_COMMIT
 RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} && \
   cd ${QL_DIR} && \
   cp -f .env.example .env && \
   chmod 777 ${QL_DIR}/shell/*.sh && \
   chmod 777 ${QL_DIR}/docker/*.sh && \
-  git clone --depth=1 -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /static && \
+  git clone --depth=1 -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /tmp/static && \
   mkdir -p ${QL_DIR}/static && \
-  cp -rf /static/* ${QL_DIR}/static && \
-  rm -rf /static
+  cp -rf /tmp/static/* ${QL_DIR}/static && \
+  rm -rf /tmp/static
 
 ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
   PYTHON_HOME=${QL_DIR}/data/dep_cache/python3 \
@@ -81,12 +95,14 @@ ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOM
 
 RUN pip3 install --prefix ${PYTHON_HOME} requests
 
-COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/
+COPY --chown=qinglong:qinglong --from=builder /tmp/build/node_modules/. /ql/node_modules/
+
+USER root
 
 WORKDIR ${QL_DIR}
 
 HEALTHCHECK --interval=5s --timeout=2s --retries=20 \
-  CMD curl -sf --noproxy '*' http://127.0.0.1:5600/api/health || exit 1
+  CMD curl -sf --noproxy '*' http://127.0.0.1:5700/api/health || exit 1
 
 ENTRYPOINT ["./docker/docker-entrypoint.sh"]
 

package/docker/docker-entrypoint.sh

@@ -1,43 +1,56 @@
 #!/bin/bash
 
+export PATH="$HOME/bin:$PATH"
+
 dir_shell=/ql/shell
 . $dir_shell/share.sh
-. $dir_shell/env.sh
+
+export_ql_envs() {
+  export BACK_PORT="${ql_port}"
+  export GRPC_PORT="${ql_grpc_port}"
+}
 
 log_with_style() {
   local level="$1"
   local message="$2"
   local timestamp=$(date '+%Y-%m-%d %H:%M:%S')
-
   printf "\n[%s] [%7s]  %s\n" "${timestamp}" "${level}" "${message}"
 }
 
-log_with_style "INFO" "🚀 1. 检测配置文件..."
+# Fix DNS resolution issues in Alpine Linux
+# Alpine uses musl libc which has known DNS resolver issues with certain domains
+# Adding ndots:0 prevents unnecessary search domain appending
+if [ -f /etc/alpine-release ]; then
+  if ! grep -q "^options ndots:0" /etc/resolv.conf 2>/dev/null; then
+    echo "options ndots:0" >> /etc/resolv.conf
+    log_with_style "INFO" "🔧  0. 已配置 DNS 解析优化 (ndots:0)"
+  fi
+fi
+
+log_with_style "INFO" "🚀  1. 检测配置文件..."
+load_ql_envs
+export_ql_envs
+. $dir_shell/env.sh
 import_config "$@"
-make_dir /etc/nginx/conf.d
-make_dir /run/nginx
-init_nginx
 fix_config
 
-pm2 l &>/dev/null
-
-log_with_style "INFO" "🔄 2. 启动 nginx..."
-nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
+# Try to initialize PM2, but don't fail if it doesn't work
+pm2 l &>/dev/null || log_with_style "WARN" "PM2 初始化可能失败，将在启动时尝试使用备用方案"
 
-log_with_style "INFO" "⚙️  3. 启动 pm2 服务..."
+log_with_style "INFO" "⚙️  2. 启动 pm2 服务..."
 reload_pm2
 
 if [[ $AutoStartBot == true ]]; then
-  log_with_style "INFO" "🤖 4. 启动 bot..."
+  log_with_style "INFO" "🤖  3. 启动 bot..."
   nohup ql bot >$dir_log/bot.log 2>&1 &
 fi
 
 if [[ $EnableExtraShell == true ]]; then
-  log_with_style "INFO" "🛠️ 5. 执行自定义脚本..."
+  log_with_style "INFO" "🛠️  4. 执行自定义脚本..."
   nohup ql extra >$dir_log/extra.log 2>&1 &
 fi
 
-log_with_style "SUCCESS" "🎉 容器启动成功!"
+log_with_style "SUCCESS" "🎉  容器启动成功!"
 
 tail -f /dev/null
 

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@whyour/qinglong",
-  "version": "2.19.2-2",
+  "packageManager": "pnpm@8.3.1",
+  "version": "2.20.0-2",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",
@@ -13,13 +14,12 @@
   },
   "scripts": {
     "start": "concurrently -n w: npm:start:*",
-    "start:back": "nodemon",
+    "start:back": "nodemon ./back/app.ts",
     "start:front": "max dev",
     "build:front": "max build",
     "build:back": "tsc -p back/tsconfig.json",
     "panel": "npm run build:back && node static/build/app.js",
     "gen:proto": "protoc --experimental_allow_proto3_optional --plugin=./node_modules/.bin/protoc-gen-ts_proto ./back/protos/*.proto --ts_proto_out=./ --ts_proto_opt=outputServices=grpc-js,env=node,esModuleInterop=true,snakeToCamel=false",
-    "gen:api": "python3 -m grpc_tools.protoc -I. --python_out=. --grpc_python_out=. ./back/protos/api.proto",
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
     "postinstall": "max setup 2>/dev/null || true",
     "test": "umi-test",
@@ -71,14 +71,14 @@
     }
   },
   "dependencies": {
-    "@grpc/grpc-js": "^1.12.3",
-    "@grpc/proto-loader": "^0.7.13",
+    "@grpc/grpc-js": "^1.14.0",
+    "@grpc/proto-loader": "^0.8.0",
     "@otplib/preset-default": "^12.0.1",
     "body-parser": "^1.20.3",
     "celebrate": "^15.0.3",
     "chokidar": "^4.0.1",
     "cors": "^2.8.5",
-    "cron-parser": "^4.9.0",
+    "cron-parser": "^5.4.0",
     "cross-spawn": "^7.0.6",
     "dayjs": "^1.11.13",
     "dotenv": "^16.4.6",
@@ -97,11 +97,10 @@
     "node-schedule": "^2.1.0",
     "nodemailer": "^6.9.16",
     "p-queue-cjs": "7.3.4",
-    "@bufbuild/protobuf": "^2.2.3",
+    "@bufbuild/protobuf": "^2.10.0",
     "ps-tree": "^1.2.0",
     "reflect-metadata": "^0.2.2",
     "sequelize": "^6.37.5",
-    "serve-handler": "^6.1.6",
     "sockjs": "^0.3.24",
     "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.0.3",
     "toad-scheduler": "^3.0.1",
@@ -115,7 +114,7 @@
     "@keyv/sqlite": "^4.0.1",
     "proper-lockfile": "^4.1.2",
     "compression": "^1.7.4",
-    "helmet": "^6.0.1"
+    "helmet": "^8.1.0"
   },
   "devDependencies": {
     "moment": "2.30.1",

package/sample/notify.js

@@ -52,6 +52,7 @@ const push_config = {
   DD_BOT_TOKEN: '', // 钉钉机器人的 DD_BOT_TOKEN
 
   FSKEY: '', // 飞书机器人的 FSKEY
+  FSSECRET: '', // 飞书机器人的 FSSECRET，对应安全设置里的签名校验密钥
 
   // 推送到个人QQ：http://127.0.0.1/send_private_msg
   // 群：http://127.0.0.1/send_group_msg
@@ -989,11 +990,26 @@ function aibotkNotify(text, desp) {
 
 function fsBotNotify(text, desp) {
   return new Promise((resolve) => {
-    const { FSKEY } = push_config;
+    const { FSKEY, FSSECRET } = push_config;
     if (FSKEY) {
+      const body = { msg_type: 'text', content: { text: `${text}\n\n${desp}` } };
+
+      // Add signature if secret is provided
+      // Note: Feishu's signature algorithm uses timestamp+"\n"+secret as the HMAC key
+      // and signs an empty message, which differs from typical HMAC usage
+      if (FSSECRET) {
+        const crypto = require('crypto');
+        const timestamp = Math.floor(Date.now() / 1000).toString();
+        const stringToSign = `${timestamp}\n${FSSECRET}`;
+        const hmac = crypto.createHmac('sha256', stringToSign);
+        const sign = hmac.digest('base64');
+        body.timestamp = timestamp;
+        body.sign = sign;
+      }
+
       const options = {
         url: `https://open.feishu.cn/open-apis/bot/v2/hook/${FSKEY}`,
-        json: { msg_type: 'text', content: { text: `${text}\n\n${desp}` } },
+        json: body,
         headers: {
           'Content-Type': 'application/json',
         },

package/sample/notify.py

@@ -49,6 +49,7 @@ push_config = {
     'DD_BOT_TOKEN': '',                 # 钉钉机器人的 DD_BOT_TOKEN
 
     'FSKEY': '',                        # 飞书机器人的 FSKEY
+    'FSSECRET': '',                     # 飞书机器人的 FSSECRET，对应安全设置里的签名校验密钥
 
     'GOBOT_URL': '',                    # go-cqhttp
                                         # 推送到个人QQ：http://127.0.0.1/send_private_msg
@@ -233,6 +234,20 @@ def feishu_bot(title: str, content: str) -> None:
 
     url = f'https://open.feishu.cn/open-apis/bot/v2/hook/{push_config.get("FSKEY")}'
     data = {"msg_type": "text", "content": {"text": f"{title}\n\n{content}"}}
+
+    # Add signature if secret is provided
+    # Note: Feishu's signature algorithm uses timestamp+"\n"+secret as the HMAC key
+    # and signs an empty message, which differs from typical HMAC usage
+    if push_config.get("FSSECRET"):
+        timestamp = str(int(time.time()))
+        string_to_sign = f'{timestamp}\n{push_config.get("FSSECRET")}'
+        hmac_code = hmac.new(
+            string_to_sign.encode("utf-8"), digestmod=hashlib.sha256
+        ).digest()
+        sign = base64.b64encode(hmac_code).decode("utf-8")
+        data["timestamp"] = timestamp
+        data["sign"] = sign
+
     response = requests.post(url, data=json.dumps(data)).json()
 
     if response.get("StatusCode") == 0 or response.get("code") == 0:

package/sample/ql_sample.js

@@ -12,4 +12,32 @@ QLAPI.getEnvs({ searchValue: 'dddd' }).then((x) => {
 QLAPI.systemNotify({ title: '123', content: '231' }).then((x) => {
   console.log('systemNotify', x);
 });
+
+// 查询定时任务 (Query cron tasks)
+QLAPI.getCrons({ searchValue: 'test' }).then((x) => {
+  console.log('getCrons', x);
+});
+
+// 通过ID查询定时任务 (Get cron by ID)
+QLAPI.getCronById({ id: 1 }).then((x) => {
+  console.log('getCronById', x);
+}).catch((err) => {
+  console.log('getCronById error', err);
+});
+
+// 启用定时任务 (Enable cron tasks)
+QLAPI.enableCrons({ ids: [1, 2] }).then((x) => {
+  console.log('enableCrons', x);
+});
+
+// 禁用定时任务 (Disable cron tasks)
+QLAPI.disableCrons({ ids: [1, 2] }).then((x) => {
+  console.log('disableCrons', x);
+});
+
+// 手动执行定时任务 (Run cron tasks manually)
+QLAPI.runCrons({ ids: [1] }).then((x) => {
+  console.log('runCrons', x);
+});
+
 console.log('test desc');

package/shell/api.sh

@@ -41,14 +41,9 @@ add_cron_api() {
   fi
 
   local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
-      -H "Accept: application/json" \
+    curl -s --noproxy "*" "http://0.0.0.0:${ql_port}/open/crons?t=$currentTimeStamp" \
       -H "Authorization: Bearer ${__ql_token__}" \
-      -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
       -H "Content-Type: application/json;charset=UTF-8" \
-      -H "Origin: http://0.0.0.0:5700" \
-      -H "Referer: http://0.0.0.0:5700/crontab" \
-      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
       --data-raw "{\"name\":\"${name//\"/\\\"}\",\"command\":\"${command//\"/\\\"}\",\"schedule\":\"$schedule\",\"sub_id\":$sub_id}" \
       --compressed
   )
@@ -76,15 +71,10 @@ update_cron_api() {
   fi
 
   local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:${ql_port}/open/crons?t=$currentTimeStamp" \
       -X 'PUT' \
-      -H "Accept: application/json" \
       -H "Authorization: Bearer ${__ql_token__}" \
-      -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
       -H "Content-Type: application/json;charset=UTF-8" \
-      -H "Origin: http://0.0.0.0:5700" \
-      -H "Referer: http://0.0.0.0:5700/crontab" \
-      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
       --data-raw "{\"name\":\"${name//\"/\\\"}\",\"command\":\"${command//\"/\\\"}\",\"schedule\":\"$schedule\",\"id\":\"$id\"}" \
       --compressed
   )
@@ -108,15 +98,10 @@ update_cron_command_api() {
   fi
 
   local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:${ql_port}/open/crons?t=$currentTimeStamp" \
       -X 'PUT' \
-      -H "Accept: application/json" \
       -H "Authorization: Bearer ${__ql_token__}" \
-      -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
       -H "Content-Type: application/json;charset=UTF-8" \
-      -H "Origin: http://0.0.0.0:5700" \
-      -H "Referer: http://0.0.0.0:5700/crontab" \
-      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
       --data-raw "{\"command\":\"${command//\"/\\\"}\",\"id\":\"$id\"}" \
       --compressed
   )
@@ -133,15 +118,10 @@ del_cron_api() {
   local ids="$1"
   local currentTimeStamp=$(date +%s)
   local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:${ql_port}/open/crons?t=$currentTimeStamp" \
       -X 'DELETE' \
-      -H "Accept: application/json" \
       -H "Authorization: Bearer ${__ql_token__}" \
-      -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
       -H "Content-Type: application/json;charset=UTF-8" \
-      -H "Origin: http://0.0.0.0:5700" \
-      -H "Referer: http://0.0.0.0:5700/crontab" \
-      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
       --data-raw "[$ids]" \
       --compressed
   )
@@ -163,15 +143,10 @@ update_cron() {
   local runningTime="${6:-0}"
   local currentTimeStamp=$(date +%s)
   local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons/status?t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:${ql_port}/open/crons/status?t=$currentTimeStamp" \
       -X 'PUT' \
-      -H "Accept: application/json" \
       -H "Authorization: Bearer ${__ql_token__}" \
-      -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
       -H "Content-Type: application/json;charset=UTF-8" \
-      -H "Origin: http://0.0.0.0:5700" \
-      -H "Referer: http://0.0.0.0:5700/crontab" \
-      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
       --data-raw "{\"ids\":[$ids],\"status\":\"$status\",\"pid\":\"$pid\",\"log_path\":\"$logPath\",\"last_execution_time\":$lastExecutingTime,\"last_running_time\":$runningTime}" \
       --compressed
   )
@@ -190,15 +165,10 @@ notify_api() {
   local content="$2"
   local currentTimeStamp=$(date +%s)
   local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/system/notify?t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:${ql_port}/open/system/notify?t=$currentTimeStamp" \
       -X 'PUT' \
-      -H "Accept: application/json" \
       -H "Authorization: Bearer ${__ql_token__}" \
-      -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
       -H "Content-Type: application/json;charset=UTF-8" \
-      -H "Origin: http://0.0.0.0:5700" \
-      -H "Referer: http://0.0.0.0:5700/crontab" \
-      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
       --data-raw "{\"title\":\"${title//\"/\\\"}\",\"content\":\"${content//\"/\\\"}\"}" \
       --compressed
   )
@@ -215,14 +185,9 @@ find_cron_api() {
   local params="$1"
   local currentTimeStamp=$(date +%s)
   local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons/detail?$params&t=$currentTimeStamp" \
-      -H "Accept: application/json" \
+    curl -s --noproxy "*" "http://0.0.0.0:${ql_port}/open/crons/detail?$params&t=$currentTimeStamp" \
       -H "Authorization: Bearer ${__ql_token__}" \
-      -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
       -H "Content-Type: application/json;charset=UTF-8" \
-      -H "Origin: http://0.0.0.0:5700" \
-      -H "Referer: http://0.0.0.0:5700/crontab" \
-      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
       --compressed
   )
   data=$(echo "$api" | jq -r .data)
@@ -239,15 +204,10 @@ update_auth_config() {
   local tip="$2"
   local currentTimeStamp=$(date +%s)
   local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/open/system/auth/reset?t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:${ql_port}/open/system/auth/reset?t=$currentTimeStamp" \
       -X 'PUT' \
-      -H "Accept: application/json" \
       -H "Authorization: Bearer ${__ql_token__}" \
-      -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36" \
       -H "Content-Type: application/json;charset=UTF-8" \
-      -H "Origin: http://0.0.0.0:5700" \
-      -H "Referer: http://0.0.0.0:5700/crontab" \
-      -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
       --data-raw "{$body}" \
       --compressed
   )

package/shell/check.sh

@@ -20,34 +20,18 @@ copy_dep() {
   echo -e "---> 复制一份 $file_notify_js_sample 为 $file_notify_js\n"
   cp -fv $file_notify_js_sample $file_notify_js
   echo -e "---> 通知文件复制完成\n"
-
-  echo -e "---> 2. 复制nginx配置文件\n"
-  init_nginx
-  echo -e "---> 配置文件复制完成\n"
 }
 
 pm2_log() {
   echo -e "---> pm2日志"
-  local panelOut="/root/.pm2/logs/panel-out.log"
-  local panelError="/root/.pm2/logs/panel-error.log"
+  local panelOut="/root/.pm2/logs/qinglong-out.log"
+  local panelError="/root/.pm2/logs/qinglong-error.log"
   tail -n 300 "$panelOut"
   tail -n 300 "$panelError"
 }
 
-check_nginx() {
-  local nginxPid=$(ps -eo pid,command | grep nginx | grep -v grep)
-  echo -e "=====> 检测nginx服务\n$nginxPid"
-  if [[ $nginxPid ]]; then
-    echo -e "\n=====> nginx服务正常\n"
-    nginx -s reload
-  else
-    echo -e "\n=====> nginx服务异常，重新启动nginx\n"
-    nginx -c /etc/nginx/nginx.conf
-  fi
-}
-
 check_ql() {
-  local api=$(curl -s --noproxy "*" "http://0.0.0.0:5700")
+  local api=$(curl -s --noproxy "*" "http://0.0.0.0:${ql_port}")
   echo -e "\n=====> 检测面板\n\n$api\n"
   if [[ $api =~ "<div id=\"root\"></div>" ]]; then
     echo -e "=====> 面板服务启动正常\n"
@@ -58,10 +42,10 @@ check_pm2() {
   pm2_log
   local currentTimeStamp=$(date +%s)
   local api=$(
-    curl -s --noproxy "*" "http://0.0.0.0:5600/api/system?t=$currentTimeStamp" \
+    curl -s --noproxy "*" "http://0.0.0.0:${ql_port}/api/system?t=$currentTimeStamp" \
       -H 'Accept: */*' \
       -H 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Safari/537.36' \
-      -H 'Referer: http://0.0.0.0:5700/crontab' \
+      -H "Referer: http://0.0.0.0:${ql_port}/crontab" \
       -H 'Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7' \
       --compressed
   )
@@ -78,7 +62,6 @@ main() {
   reset_env
   copy_dep
   check_ql
-  check_nginx
   check_pm2
   reload_pm2
   echo -e "\n=====> 检测结束\n"