@whyour/qinglong 0.5.4 → 0.6.0

package/README-en.md

@@ -35,6 +35,24 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 - Support dark mode
 - Support cell phone operation
 
+## Version
+### docker
+
+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.
+
+```bash
+docker pull whyour/qinglong:latest
+docker pull whyour/qinglong:debian
+```
+
+### npm
+
+The npm version supports `debian/ubuntu/centos/alpine` systems and requires `node/python3` to be installed.
+
+```bash
+npm i @whyour/qinglong
+```
+
 ## Deployment
 
 ### Docker (Recommended)

package/README.md

@@ -37,6 +37,24 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 - 支持暗黑模式
 - 支持手机端操作
 
+## 版本
+### docker
+
+`latest` 镜像是基于 `alpine` 构建，`debian` 镜像是基于 `debian-slim` 构建。如果需要使用 `alpine` 不支持的依赖，建议使用 `debian` 镜像
+
+```bash
+docker pull whyour/qinglong:latest
+docker pull whyour/qinglong:debian
+```
+
+### npm
+
+npm 版本支持 `debian/ubuntu/centos/alpine` 系统，需要自行安装 `node/python3`
+
+```bash
+npm i @whyour/qinglong
+```
+
 ## 部署
 
 ### docker (推荐)

package/docker/docker-entrypoint.sh

@@ -4,8 +4,6 @@ dir_shell=/ql/shell
 . $dir_shell/share.sh
 link_shell
 
-export isFirstStartServer=true
-
 echo -e "======================1. 检测配置文件========================\n"
 make_dir /etc/nginx/conf.d
 make_dir /run/nginx
@@ -25,7 +23,10 @@ if [[ "$is_equal_registry" == "" ]]; then
   cd && pnpm config set registry $NpmMirror
   pnpm install -g
 fi
-update_depend
+if [[ ! -s $dir_scripts/package.json ]] || [[ $(diff $dir_sample/package.json $dir_scripts/package.json) ]]; then
+  cp -f $dir_sample/package.json $dir_scripts/package.json
+  npm_install_2 $dir_scripts
+fi
 echo
 
 echo -e "======================3. 启动nginx========================\n"

package/docker/nginx.conf

@@ -14,7 +14,7 @@ http {
 
   server_tokens off;
 
-  client_max_body_size 20m;
+  client_max_body_size 4096m;
   client_body_buffer_size 20m;
 
   keepalive_timeout 65;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyour/qinglong",
-  "version": "0.5.4",
+  "version": "0.6.0",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",
@@ -107,6 +107,7 @@
     "serve-handler": "^6.1.3",
     "sockjs": "^0.3.24",
     "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.0.3",
+    "tar": "^6.1.15",
     "toad-scheduler": "^1.6.0",
     "typedi": "^0.10.0",
     "uuid": "^8.3.2",
@@ -124,6 +125,7 @@
     "@types/cross-spawn": "^6.0.2",
     "@types/express": "^4.17.13",
     "@types/express-jwt": "^6.0.4",
+    "@types/file-saver": "^2.0.5",
     "@types/js-yaml": "^4.0.5",
     "@types/jsonwebtoken": "^8.5.8",
     "@types/lodash": "^4.14.185",
@@ -139,15 +141,18 @@
     "@types/serve-handler": "^6.1.1",
     "@types/sockjs": "^0.3.33",
     "@types/sockjs-client": "^1.5.1",
+    "@types/tar": "^6.1.5",
     "@types/uuid": "^8.3.4",
-    "@umijs/max": "^4.0.55",
+    "@umijs/max": "^4.0.72",
     "@umijs/ssr-darkreader": "^4.9.45",
     "ansi-to-react": "^6.1.6",
     "antd": "^4.24.8",
     "antd-img-crop": "^4.2.3",
+    "axios": "^1.4.0",
     "codemirror": "^5.65.2",
     "compression-webpack-plugin": "9.2.0",
     "concurrently": "^7.0.0",
+    "file-saver": "^2.0.5",
     "lint-staged": "^13.0.3",
     "monaco-editor": "0.33.0",
     "nodemon": "^2.0.15",
@@ -170,7 +175,6 @@
     "tslib": "^2.4.0",
     "tsx": "^3.12.3",
     "typescript": "4.8.4",
-    "umi-request": "^1.4.0",
     "vh-check": "^2.0.5",
     "virtualizedtableforantd4": "1.3.0",
     "webpack": "^5.70.0",

package/shell/share.sh

@@ -2,6 +2,7 @@
 
 ## 目录
 dir_root=$QL_DIR
+dir_tmp=$dir_root/.tmp
 dir_data=$dir_root/data
 
 if [[ $QL_DATA_DIR ]]; then
@@ -180,6 +181,7 @@ define_cmd() {
 }
 
 fix_config() {
+  make_dir $dir_tmp
   make_dir $dir_static
   make_dir $dir_data
   make_dir $dir_config
@@ -268,6 +270,7 @@ npm_install_sub() {
   else
     pnpm install --loglevel error --production
   fi
+  exit_status=$?
 }
 
 npm_install_2() {
@@ -288,90 +291,22 @@ diff_and_copy() {
   fi
 }
 
-update_depend() {
-  local dir_current=$(pwd)
-
-  if [[ ! -s $dir_scripts/package.json ]] || [[ $(diff $dir_sample/package.json $dir_scripts/package.json) ]]; then
-    cp -f $dir_sample/package.json $dir_scripts/package.json
-    npm_install_2 $dir_scripts
-  fi
-
-  cd $dir_current
-}
-
 git_clone_scripts() {
   local url="$1"
   local dir="$2"
   local branch="$3"
   local proxy="$4"
   [[ $branch ]] && local part_cmd="-b $branch "
-  echo -e "开始拉取 $url 到 $dir\n"
+  echo -e "开始拉取仓库 ${uniq_path} 到 $dir\n"
 
   set_proxy "$proxy"
 
   git clone --depth=1 $part_cmd $url $dir
   exit_status=$?
 
-  reset_branch "$branch" "$dir"
-
   unset_proxy
 }
 
-git_pull_scripts() {
-  local dir_current=$(pwd)
-  local dir_work="$1"
-  local branch="$2"
-  local proxy="$3"
-  cd $dir_work
-  echo -e "开始更新仓库：$dir_work"
-  set_proxy "$proxy"
-
-  if [[ ! $branch ]]; then
-    branch=$(cd $dir_work && git remote show origin | grep 'HEAD branch' | cut -d' ' -f5)
-  fi
-
-  local pre_commit_id=$(git rev-parse --short HEAD)
-  reset_branch "$branch" "$dir_work"
-
-  git fetch --depth 1 origin $branch
-  exit_status=$?
-
-  reset_branch "$branch" "$dir_work"
-  local cur_commit_id=$(git rev-parse --short HEAD)
-  if [[ $cur_commit_id != $pre_commit_id ]]; then
-    exit_status=0
-  fi
-
-  unset_proxy
-  cd $dir_current
-}
-
-reset_romote_url() {
-  local dir_current=$(pwd)
-  local dir_work=$1
-  local url=$2
-  local branch="$3"
-
-  cd $dir_work
-  if [[ -d "$dir_work/.git" ]]; then
-    [[ -f ".git/index.lock" ]] && rm -f .git/index.lock >/dev/null
-    git remote set-url origin $url &>/dev/null
-  else
-    git init
-    git remote add origin $url &>/dev/null
-  fi
-
-  cd $dir_current
-}
-
-reset_branch() {
-  local branch="$1"
-  local part_cmd="origin/${branch}"
-  git remote set-branches origin $branch
-  git reset --hard $part_cmd &>/dev/null
-  git checkout -b $branch $part_cmd &>/dev/null
-}
-
 random_range() {
   local beg=$1
   local end=$2
@@ -383,7 +318,8 @@ reload_pm2() {
   # 代理会影响 grpc 服务
   unset_proxy
   pm2 flush &>/dev/null
-  pm2 startOrGracefulReload $file_ecosystem_js
+  pm2 startOrGracefulReload $file_ecosystem_js --update-env
+  pm2 sendSignal SIGKILL panel &>/dev/null
 }
 
 diff_time() {

package/shell/update.sh

@@ -229,58 +229,98 @@ usage() {
   echo -e "9. $cmd_update resettfa                                                                # 禁用两步登录"
 }
 
+reload_qinglong() {
+  local reload_target="${1}"
+  local primary_branch="master"
+  if [[ "${QL_BRANCH}" == "develop" ]]; then
+    primary_branch="develop"
+  fi
+
+  if [[ "$reload_target" == 'system' ]]; then
+    cp -rf ${dir_tmp}/qinglong-${primary_branch}/* ${dir_root}/
+    rm -rf $dir_static/*
+    cp -rf ${dir_tmp}/qinglong-static-${primary_branch}/* ${dir_static}/
+    cp -f $file_config_sample $dir_config/config.sample.sh
+  fi
+
+  if [[ "$reload_target" == 'data' ]]; then
+    cp -rf ${dir_tmp}/data ${dir_root}/
+  fi
+
+  reload_pm2
+}
+
 ## 更新qinglong
 update_qinglong() {
+  rm -rf ${dir_tmp}/*
   local mirror="gitee"
+  local downloadQLUrl="https://gitee.com/whyour/qinglong/repository/archive"
+  local downloadStaticUrl="https://gitee.com/whyour/qinglong-static/repository/archive"
   local githubStatus=$(curl -s -m 2 -IL "https://google.com" | grep 200)
   if [[ ! -z $githubStatus ]]; then
     mirror="github"
+    downloadQLUrl="https://github.com/whyour/qinglong/archive/refs/heads"
+    downloadStaticUrl="https://github.com/whyour/qinglong-static/archive/refs/heads"
   fi
   echo -e "使用 ${mirror} 源更新...\n"
-  export isFirstStartServer=false
 
   local primary_branch="master"
   if [[ "${QL_BRANCH}" == "develop" ]]; then
     primary_branch="develop"
   fi
-  [[ -f $dir_root/package.json ]] && ql_depend_old=$(cat $dir_root/package.json)
-  reset_romote_url ${dir_root} "https://${mirror}.com/whyour/qinglong.git" ${primary_branch}
-  git_pull_scripts $dir_root ${primary_branch}
+
+  wget -cqO "${dir_tmp}/ql.zip" "${downloadQLUrl}/${primary_branch}.zip"
+  exit_status=$?
 
   if [[ $exit_status -eq 0 ]]; then
     echo -e "\n更新青龙源文件成功...\n"
-    cp -f $file_config_sample $dir_config/config.sample.sh
-    update_depend
 
-    [[ -f $dir_root/package.json ]] && ql_depend_new=$(cat $dir_root/package.json)
-    [[ "$ql_depend_old" != "$ql_depend_new" ]] && npm_install_2 $dir_root
+    unzip -oq ${dir_tmp}/ql.zip -d ${dir_tmp}
 
-    update_qinglong_static "$1" "$primary_branch"
+    update_qinglong_static
   else
     echo -e "\n更新青龙源文件失败，请检查网络...\n"
   fi
 }
 
 update_qinglong_static() {
-  local no_restart="$1"
-  local primary_branch="$2"
-  local url="https://${mirror}.com/whyour/qinglong-static.git"
-  rm -rf ${ql_static_repo} &>/dev/null
-  git_clone_scripts ${url} ${ql_static_repo} ${primary_branch}
+  wget -cqO "${dir_tmp}/static.zip" "${downloadStaticUrl}/${primary_branch}.zip"
+  exit_status=$?
 
   if [[ $exit_status -eq 0 ]]; then
     echo -e "\n更新青龙静态资源成功...\n"
+    unzip -oq ${dir_tmp}/static.zip -d ${dir_tmp}
+
+    check_update_dep
+  else
+    echo -e "\n更新青龙静态资源失败，请检查网络...\n"
+  fi
+}
+
+check_update_dep() {
+  echo -e "\n开始检测依赖...\n"
+  if [[ $(diff $dir_sample/package.json $dir_scripts/package.json) ]]; then
+    cp -f $dir_sample/package.json $dir_scripts/package.json
+    npm_install_2 $dir_scripts
+  fi
+  if [[ $(diff $dir_root/package.json ${dir_tmp}/qinglong-${primary_branch}/package.json) ]]; then
+    npm_install_2 "${dir_tmp}/qinglong-${primary_branch}"
+  fi
+
+  if [[ $exit_status -eq 0 ]]; then
+    echo -e "\n依赖检测安装成功...\n"
+    echo -e "\n更新包下载成功...\n"
+
+    if [[ "$needRestart" == 'true' ]]; then
+      cp -rf ${dir_tmp}/qinglong-${primary_branch}/* ${dir_root}/
+      rm -rf $dir_static/*
+      cp -rf ${dir_tmp}/qinglong-static-${primary_branch}/* ${dir_static}/
+      cp -f $file_config_sample $dir_config/config.sample.sh
 
-    rm -rf $dir_static/*
-    cp -rf $ql_static_repo/* $dir_static
-    if [[ $no_restart != "no-restart" ]]; then
-      nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
-      echo -e "重启面板中..."
-      sleep 3
       reload_pm2
     fi
   else
-    echo -e "\n更新青龙静态资源失败，请检查网络...\n"
+    echo -e "\n依赖检测安装失败，请检查网络...\n"
   fi
 }
 
@@ -456,7 +496,11 @@ main() {
   case $p1 in
   update)
     fix_config
-    eval update_qinglong "$2" $cmd
+    local needRestart=${p2:-"true"}
+    eval update_qinglong $cmd
+    ;;
+  reload)
+    eval reload_qinglong "$p2" $cmd
     ;;
   extra)
     eval run_extra_shell $cmd

package/static/build/api/system.js

@@ -33,10 +33,19 @@ const config_1 = __importDefault(require("../config"));
 const system_1 = __importDefault(require("../services/system"));
 const celebrate_1 = require("celebrate");
 const user_1 = __importDefault(require("../services/user"));
-const env_1 = require("../data/env");
 const util_1 = require("../config/util");
 const dayjs_1 = __importDefault(require("dayjs"));
+const multer_1 = __importDefault(require("multer"));
 const route = (0, express_1.Router)();
+const storage = multer_1.default.diskStorage({
+    destination: function (req, file, cb) {
+        cb(null, config_1.default.tmpPath);
+    },
+    filename: function (req, file, cb) {
+        cb(null, 'data.tgz');
+    },
+});
+const upload = (0, multer_1.default)({ storage: storage });
 exports.default = (app) => {
     app.use('/system', route);
     route.get('/', async (req, res, next) => {
@@ -44,11 +53,7 @@ exports.default = (app) => {
         try {
             const userService = typedi_1.Container.get(user_1.default);
             const authInfo = await userService.getUserInfo();
-            const envCount = await env_1.EnvModel.count();
-            const { version, changeLog, changeLogLink } = await (0, util_1.parseVersion)(config_1.default.versionFile);
-            const lastCommitTime = (await (0, util_1.promiseExec)(`cd ${config_1.default.rootPath} && git show -s --format=%ai | head -1`)).replace('\n', '');
-            const lastCommitId = (await (0, util_1.promiseExec)(`cd ${config_1.default.rootPath} && git rev-parse --short HEAD`)).replace('\n', '');
-            const branch = (await (0, util_1.promiseExec)(`cd ${config_1.default.rootPath} && git symbolic-ref --short HEAD`)).replace('\n', '');
+            const { version, changeLog, changeLogLink, publishTime } = await (0, util_1.parseVersion)(config_1.default.versionFile);
             let isInitialized = true;
             if (Object.keys(authInfo).length === 2 &&
                 authInfo.username === 'admin' &&
@@ -60,9 +65,8 @@ exports.default = (app) => {
                 data: {
                     isInitialized,
                     version,
-                    lastCommitTime: (0, dayjs_1.default)(lastCommitTime).unix(),
-                    lastCommitId,
-                    branch,
+                    publishTime: (0, dayjs_1.default)(publishTime).unix(),
+                    branch: process.env.QL_BRANCH || 'master',
                     changeLog,
                     changeLogLink,
                 },
@@ -122,6 +126,21 @@ exports.default = (app) => {
             return next(e);
         }
     });
+    route.put('/reload', (0, celebrate_1.celebrate)({
+        body: celebrate_1.Joi.object({
+            type: celebrate_1.Joi.string().required(),
+        }),
+    }), async (req, res, next) => {
+        const logger = typedi_1.Container.get('logger');
+        try {
+            const systemService = typedi_1.Container.get(system_1.default);
+            const result = await systemService.reloadSystem(req.body.type);
+            res.send(result);
+        }
+        catch (e) {
+            return next(e);
+        }
+    });
     route.put('/notify', (0, celebrate_1.celebrate)({
         body: celebrate_1.Joi.object({
             title: celebrate_1.Joi.string().required(),
@@ -187,5 +206,24 @@ exports.default = (app) => {
             return next(e);
         }
     });
+    route.put('/data/export', async (req, res, next) => {
+        try {
+            const systemService = typedi_1.Container.get(system_1.default);
+            await systemService.exportData(res);
+        }
+        catch (e) {
+            return next(e);
+        }
+    });
+    route.put('/data/import', upload.single('data'), async (req, res, next) => {
+        try {
+            const systemService = typedi_1.Container.get(system_1.default);
+            const result = await systemService.importData();
+            res.send(result);
+        }
+        catch (e) {
+            return next(e);
+        }
+    });
 };
 //# sourceMappingURL=system.js.map

package/static/build/config/index.js

@@ -20,6 +20,7 @@ const lastVersionFile = `https://qn.whyour.cn/version.yaml`;
 const rootPath = process.env.QL_DIR;
 const envFound = dotenv_1.default.config({ path: path_1.default.join(rootPath, '.env') });
 let dataPath = path_1.default.join(rootPath, 'data/');
+const tmpPath = path_1.default.join(rootPath, '.tmp/');
 if (process.env.QL_DATA_DIR) {
     dataPath = process.env.QL_DATA_DIR;
 }
@@ -43,6 +44,7 @@ const authError = '错误的用户名密码，请重试';
 const loginFaild = '请先登录!';
 const configString = 'config sample crontab shareCode diy';
 const versionFile = path_1.default.join(rootPath, 'version.yaml');
+const dataTgzFile = path_1.default.join(tmpPath, 'data.tgz');
 if (envFound.error) {
     throw new Error("⚠️  Couldn't find .env file  ⚠️");
 }
@@ -58,6 +60,9 @@ exports.default = {
         prefix: '/api',
     },
     rootPath,
+    tmpPath,
+    dataPath,
+    dataTgzFile,
     configString,
     loginFaild,
     authError,

package/static/build/config/util.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUniqPath = exports.parseContentVersion = exports.parseVersion = exports.getPid = exports.killTask = exports.psTree = exports.parseBody = exports.parseHeaders = exports.promiseExec = exports.emptyDir = exports.readDir = exports.readDirs = exports.dirSort = exports.concurrentRun = exports.handleLogPath = exports.createFile = exports.fileExist = exports.getPlatform = exports.getNetIp = exports.getToken = exports.createRandomString = exports.getLastModifyFilePath = exports.getFileContentByName = void 0;
+exports.getUniqPath = exports.parseContentVersion = exports.parseVersion = exports.getPid = exports.killTask = exports.psTree = exports.parseBody = exports.parseHeaders = exports.promiseExecSuccess = exports.promiseExec = exports.emptyDir = exports.readDir = exports.readDirs = exports.dirSort = exports.concurrentRun = exports.handleLogPath = exports.createFile = exports.fileExist = exports.getPlatform = exports.getNetIp = exports.getToken = exports.createRandomString = exports.getLastModifyFilePath = exports.getFileContentByName = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const got_1 = __importDefault(require("got"));
@@ -391,6 +391,14 @@ function promiseExec(command) {
     });
 }
 exports.promiseExec = promiseExec;
+function promiseExecSuccess(command) {
+    return new Promise((resolve) => {
+        (0, child_process_1.exec)(command, { maxBuffer: 200 * 1024 * 1024, encoding: 'utf8' }, (err, stdout, stderr) => {
+            resolve(stdout || '');
+        });
+    });
+}
+exports.promiseExecSuccess = promiseExecSuccess;
 function parseHeaders(headers) {
     if (!headers)
         return {};

package/static/build/data/dependence.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DependenceModel = exports.unInstallDependenceCommandTypes = exports.InstallDependenceCommandTypes = exports.DependenceTypes = exports.DependenceStatus = exports.Dependence = void 0;
+exports.DependenceModel = exports.unInstallDependenceCommandTypes = exports.versionDependenceCommandTypes = exports.GetDependenceCommandTypes = exports.InstallDependenceCommandTypes = exports.DependenceTypes = exports.DependenceStatus = exports.Dependence = void 0;
 const _1 = require(".");
 const sequelize_1 = require("sequelize");
 class Dependence {
@@ -12,7 +12,7 @@ class Dependence {
                 : DependenceStatus.queued;
         this.type = options.type || DependenceTypes.nodejs;
         this.timestamp = new Date().toString();
-        this.name = options.name;
+        this.name = options.name.trim();
         this.log = options.log || [];
         this.remark = options.remark || '';
     }
@@ -37,13 +37,25 @@ var DependenceTypes;
 var InstallDependenceCommandTypes;
 (function (InstallDependenceCommandTypes) {
     InstallDependenceCommandTypes[InstallDependenceCommandTypes["pnpm add -g"] = 0] = "pnpm add -g";
-    InstallDependenceCommandTypes[InstallDependenceCommandTypes["pip3 install"] = 1] = "pip3 install";
+    InstallDependenceCommandTypes[InstallDependenceCommandTypes["pip3 install --disable-pip-version-check --root-user-action=ignore"] = 1] = "pip3 install --disable-pip-version-check --root-user-action=ignore";
     InstallDependenceCommandTypes[InstallDependenceCommandTypes["apt install -y"] = 2] = "apt install -y";
 })(InstallDependenceCommandTypes = exports.InstallDependenceCommandTypes || (exports.InstallDependenceCommandTypes = {}));
+var GetDependenceCommandTypes;
+(function (GetDependenceCommandTypes) {
+    GetDependenceCommandTypes[GetDependenceCommandTypes["pnpm ls -g "] = 0] = "pnpm ls -g ";
+    GetDependenceCommandTypes[GetDependenceCommandTypes["pip3 list --disable-pip-version-check"] = 1] = "pip3 list --disable-pip-version-check";
+    GetDependenceCommandTypes[GetDependenceCommandTypes["apk info"] = 2] = "apk info";
+})(GetDependenceCommandTypes = exports.GetDependenceCommandTypes || (exports.GetDependenceCommandTypes = {}));
+var versionDependenceCommandTypes;
+(function (versionDependenceCommandTypes) {
+    versionDependenceCommandTypes[versionDependenceCommandTypes["@"] = 0] = "@";
+    versionDependenceCommandTypes[versionDependenceCommandTypes["=="] = 1] = "==";
+    versionDependenceCommandTypes[versionDependenceCommandTypes["="] = 2] = "=";
+})(versionDependenceCommandTypes = exports.versionDependenceCommandTypes || (exports.versionDependenceCommandTypes = {}));
 var unInstallDependenceCommandTypes;
 (function (unInstallDependenceCommandTypes) {
     unInstallDependenceCommandTypes[unInstallDependenceCommandTypes["pnpm remove -g"] = 0] = "pnpm remove -g";
-    unInstallDependenceCommandTypes[unInstallDependenceCommandTypes["pip3 uninstall -y"] = 1] = "pip3 uninstall -y";
+    unInstallDependenceCommandTypes[unInstallDependenceCommandTypes["pip3 uninstall --disable-pip-version-check --root-user-action=ignore -y"] = 1] = "pip3 uninstall --disable-pip-version-check --root-user-action=ignore -y";
     unInstallDependenceCommandTypes[unInstallDependenceCommandTypes["apt remove"] = 2] = "apt remove";
 })(unInstallDependenceCommandTypes = exports.unInstallDependenceCommandTypes || (exports.unInstallDependenceCommandTypes = {}));
 exports.DependenceModel = _1.sequelize.define('Dependence', {

package/static/build/loaders/initTask.js

@@ -31,15 +31,15 @@ exports.default = async () => {
     });
     // 运行删除日志任务
     const data = await systemService.getSystemConfig();
-    if (data && data.info && data.info.frequency) {
+    if (data && data.info && data.info.logRemoveFrequency) {
         const rmlogCron = {
             id: data.id,
             name: '删除日志',
-            command: `ql rmlog ${data.info.frequency}`,
+            command: `ql rmlog ${data.info.logRemoveFrequency}`,
         };
         await scheduleService.cancelIntervalTask(rmlogCron);
         scheduleService.createIntervalTask(rmlogCron, {
-            days: data.info.frequency,
+            days: data.info.logRemoveFrequency,
         });
     }
     // 运行所有订阅

package/static/build/loaders/server.js

@@ -8,17 +8,32 @@ const sock_1 = __importDefault(require("./sock"));
 exports.default = async ({ server }) => {
     await (0, sock_1.default)({ server });
     logger_1.default.info('✌️ Sock loaded');
-    process.on('SIGINT', () => {
-        logger_1.default.info('✌️ Server need close');
+    let exitTime = 0;
+    let timer;
+    process.on('SIGINT', (singal) => {
+        logger_1.default.warn(`Server need close, singal ${singal}`);
+        exitTime++;
+        if (exitTime >= 3) {
+            logger_1.default.warn('Forcing server close');
+            clearTimeout(timer);
+            process.exit(1);
+        }
         server.close(() => {
-            setTimeout(() => {
+            if (timer) {
+                clearTimeout(timer);
+            }
+            timer = setTimeout(() => {
                 process.exit();
-            }, 10000);
+            }, 15000);
         });
-        setTimeout(() => {
-            console.log('Forcing server close !!!');
-            process.exit(1);
-        }, 15000);
+    });
+    process.on('uncaughtException', (error) => {
+        logger_1.default.error('Uncaught exception:', error);
+        process.exit(1);
+    });
+    process.on('unhandledRejection', (reason, promise) => {
+        logger_1.default.error('Unhandled rejection:', reason);
+        process.exit(1);
     });
 };
 //# sourceMappingURL=server.js.map