@whyour/qinglong 0.3.2 → 0.4.0

package/sample/notify.py

@@ -76,6 +76,8 @@ push_config = {
     'QMSG_KEY': '',                     # qmsg 酱的 QMSG_KEY
     'QMSG_TYPE': '',                    # qmsg 酱的 QMSG_TYPE
 
+    'QYWX_ORIGIN': '',                  # 企业微信代理地址
+    
     'QYWX_AM': '',                      # 企业微信应用
 
     'QYWX_KEY': '',                     # 企业微信机器人
@@ -164,8 +166,7 @@ def dingding_bot(title: str, content: str) -> None:
 
     timestamp = str(round(time.time() * 1000))
     secret_enc = push_config.get("DD_BOT_SECRET").encode("utf-8")
-    string_to_sign = "{}\n{}".format(
-        timestamp, push_config.get("DD_BOT_SECRET"))
+    string_to_sign = "{}\n{}".format(timestamp, push_config.get("DD_BOT_SECRET"))
     string_to_sign_enc = string_to_sign.encode("utf-8")
     hmac_code = hmac.new(
         secret_enc, string_to_sign_enc, digestmod=hashlib.sha256
@@ -231,8 +232,11 @@ def gotify(title: str, content: str) -> None:
     print("gotify 服务启动")
 
     url = f'{push_config.get("GOTIFY_URL")}/message?token={push_config.get("GOTIFY_TOKEN")}'
-    data = {"title": title, "message": content,
-            "priority": push_config.get("GOTIFY_PRIORITY")}
+    data = {
+        "title": title,
+        "message": content,
+        "priority": push_config.get("GOTIFY_PRIORITY"),
+    }
     response = requests.post(url, data=data).json()
 
     if response.get("id"):
@@ -291,9 +295,13 @@ def pushdeer(title: str, content: str) -> None:
         print("PushDeer 服务的 DEER_KEY 未设置!!\n取消推送")
         return
     print("PushDeer 服务启动")
-    data = {"text": title, "desp": content, "type": "markdown",
-            "pushkey": push_config.get("DEER_KEY")}
-    url = 'https://api2.pushdeer.com/message/push'
+    data = {
+        "text": title,
+        "desp": content,
+        "type": "markdown",
+        "pushkey": push_config.get("DEER_KEY"),
+    }
+    url = "https://api2.pushdeer.com/message/push"
     if push_config.get("DEER_URL"):
         url = push_config.get("DEER_URL")
 
@@ -313,7 +321,7 @@ def chat(title: str, content: str) -> None:
         print("chat 服务的 CHAT_URL或CHAT_TOKEN 未设置!!\n取消推送")
         return
     print("chat 服务启动")
-    data = 'payload=' + json.dumps({'text': title + '\n' + content})
+    data = "payload=" + json.dumps({"text": title + "\n" + content})
     url = push_config.get("CHAT_URL") + push_config.get("CHAT_TOKEN")
     response = requests.post(url, data=data)
 
@@ -347,11 +355,9 @@ def pushplus_bot(title: str, content: str) -> None:
         print("PUSHPLUS 推送成功！")
 
     else:
-
         url_old = "http://pushplus.hxtrip.com/send"
         headers["Accept"] = "application/json"
-        response = requests.post(
-            url=url_old, data=body, headers=headers).json()
+        response = requests.post(url=url_old, data=body, headers=headers).json()
 
         if response["code"] == 200:
             print("PUSHPLUS(hxtrip) 推送成功！")
@@ -370,8 +376,7 @@ def qmsg_bot(title: str, content: str) -> None:
     print("qmsg 服务启动")
 
     url = f'https://qmsg.zendee.cn/{push_config.get("QMSG_TYPE")}/{push_config.get("QMSG_KEY")}'
-    payload = {
-        "msg": f'{title}\n\n{content.replace("----", "-")}'.encode("utf-8")}
+    payload = {"msg": f'{title}\n\n{content.replace("----", "-")}'.encode("utf-8")}
     response = requests.post(url=url, params=payload).json()
 
     if response["code"] == 0:
@@ -420,9 +425,12 @@ class WeCom:
         self.CORPID = corpid
         self.CORPSECRET = corpsecret
         self.AGENTID = agentid
+        self.ORIGIN = "https://qyapi.weixin.qq.com"
+        if push_config.get("QYWX_ORIGIN"):
+            self.ORIGIN = push_config.get("QYWX_ORIGIN")
 
     def get_access_token(self):
-        url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken"
+        url = f"{self.ORIGIN}/cgi-bin/gettoken"
         values = {
             "corpid": self.CORPID,
             "corpsecret": self.CORPSECRET,
@@ -432,10 +440,7 @@ class WeCom:
         return data["access_token"]
 
     def send_text(self, message, touser="@all"):
-        send_url = (
-            "https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token="
-            + self.get_access_token()
-        )
+        send_url = f"{self.ORIGIN}/cgi-bin/message/send?access_token={self.get_access_token()}"
         send_values = {
             "touser": touser,
             "msgtype": "text",
@@ -449,10 +454,7 @@ class WeCom:
         return respone["errmsg"]
 
     def send_mpnews(self, title, message, media_id, touser="@all"):
-        send_url = (
-            "https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token="
-            + self.get_access_token()
-        )
+        send_url = f"https://{self.HOST}/cgi-bin/message/send?access_token={self.get_access_token()}"
         send_values = {
             "touser": touser,
             "msgtype": "mpnews",
@@ -485,7 +487,11 @@ def wecom_bot(title: str, content: str) -> None:
         return
     print("企业微信机器人服务启动")
 
-    url = f"https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key={push_config.get('QYWX_KEY')}"
+    origin = "https://qyapi.weixin.qq.com"
+    if push_config.get("QYWX_ORIGIN"):
+        origin = push_config.get("QYWX_ORIGIN")
+
+    url = f"{origin}/cgi-bin/webhook/send?key={push_config.get('QYWX_KEY')}"
     headers = {"Content-Type": "application/json;charset=utf-8"}
     data = {"msgtype": "text", "text": {"content": f"{title}\n\n{content}"}}
     response = requests.post(
@@ -547,24 +553,28 @@ def aibotk(title: str, content: str) -> None:
     """
     使用 智能微秘书 推送消息。
     """
-    if not push_config.get("AIBOTK_KEY") or not push_config.get("AIBOTK_TYPE") or not push_config.get("AIBOTK_NAME"):
+    if (
+        not push_config.get("AIBOTK_KEY")
+        or not push_config.get("AIBOTK_TYPE")
+        or not push_config.get("AIBOTK_NAME")
+    ):
         print("智能微秘书 的 AIBOTK_KEY 或者 AIBOTK_TYPE 或者 AIBOTK_NAME 未设置!!\n取消推送")
         return
     print("智能微秘书 服务启动")
 
-    if push_config.get("AIBOTK_TYPE") == 'room':
+    if push_config.get("AIBOTK_TYPE") == "room":
         url = "https://api-bot.aibotk.com/openapi/v1/chat/room"
         data = {
             "apiKey": push_config.get("AIBOTK_KEY"),
             "roomName": push_config.get("AIBOTK_NAME"),
-            "message": {"type": 1, "content": f'【青龙快讯】\n\n{title}\n{content}'}
+            "message": {"type": 1, "content": f"【青龙快讯】\n\n{title}\n{content}"},
         }
     else:
         url = "https://api-bot.aibotk.com/openapi/v1/chat/contact"
         data = {
             "apiKey": push_config.get("AIBOTK_KEY"),
             "name": push_config.get("AIBOTK_NAME"),
-            "message": {"type": 1, "content": f'【青龙快讯】\n\n{title}\n{content}'}
+            "message": {"type": 1, "content": f"【青龙快讯】\n\n{title}\n{content}"},
         }
     body = json.dumps(data).encode(encoding="utf-8")
     headers = {"Content-Type": "application/json"}
@@ -580,29 +590,52 @@ def smtp(title: str, content: str) -> None:
     """
     使用 SMTP 邮件 推送消息。
     """
-    if not push_config.get("SMTP_SERVER") or not push_config.get("SMTP_SSL") or not push_config.get("SMTP_EMAIL") or not push_config.get("SMTP_PASSWORD") or not push_config.get("SMTP_NAME"):
-        print("SMTP 邮件 的 SMTP_SERVER 或者 SMTP_SSL 或者 SMTP_EMAIL 或者 SMTP_PASSWORD 或者 SMTP_NAME 未设置!!\n取消推送")
+    if (
+        not push_config.get("SMTP_SERVER")
+        or not push_config.get("SMTP_SSL")
+        or not push_config.get("SMTP_EMAIL")
+        or not push_config.get("SMTP_PASSWORD")
+        or not push_config.get("SMTP_NAME")
+    ):
+        print(
+            "SMTP 邮件 的 SMTP_SERVER 或者 SMTP_SSL 或者 SMTP_EMAIL 或者 SMTP_PASSWORD 或者 SMTP_NAME 未设置!!\n取消推送"
+        )
         return
     print("SMTP 邮件 服务启动")
 
-    message = MIMEText(content, 'plain', 'utf-8')
-    message['From'] = formataddr((Header(push_config.get(
-        "SMTP_NAME"), 'utf-8').encode(), push_config.get("SMTP_EMAIL")))
-    message['To'] = formataddr((Header(push_config.get(
-        "SMTP_NAME"), 'utf-8').encode(), push_config.get("SMTP_EMAIL")))
-    message['Subject'] = Header(title, 'utf-8')
+    message = MIMEText(content, "plain", "utf-8")
+    message["From"] = formataddr(
+        (
+            Header(push_config.get("SMTP_NAME"), "utf-8").encode(),
+            push_config.get("SMTP_EMAIL"),
+        )
+    )
+    message["To"] = formataddr(
+        (
+            Header(push_config.get("SMTP_NAME"), "utf-8").encode(),
+            push_config.get("SMTP_EMAIL"),
+        )
+    )
+    message["Subject"] = Header(title, "utf-8")
 
     try:
-        smtp_server = smtplib.SMTP_SSL(push_config.get("SMTP_SERVER")) if push_config.get(
-            "SMTP_SSL") == 'true' else smtplib.SMTP(push_config.get("SMTP_SERVER"))
-        smtp_server.login(push_config.get("SMTP_EMAIL"),
-                          push_config.get("SMTP_PASSWORD"))
-        smtp_server.sendmail(push_config.get("SMTP_EMAIL"),
-                             push_config.get("SMTP_EMAIL"), message.as_bytes())
+        smtp_server = (
+            smtplib.SMTP_SSL(push_config.get("SMTP_SERVER"))
+            if push_config.get("SMTP_SSL") == "true"
+            else smtplib.SMTP(push_config.get("SMTP_SERVER"))
+        )
+        smtp_server.login(
+            push_config.get("SMTP_EMAIL"), push_config.get("SMTP_PASSWORD")
+        )
+        smtp_server.sendmail(
+            push_config.get("SMTP_EMAIL"),
+            push_config.get("SMTP_EMAIL"),
+            message.as_bytes(),
+        )
         smtp_server.close()
         print("SMTP 邮件 推送成功！")
     except Exception as e:
-        print(f'SMTP 邮件 推送失败！{e}')
+        print(f"SMTP 邮件 推送失败！{e}")
 
 
 def one() -> str:
@@ -645,9 +678,19 @@ if push_config.get("QYWX_KEY"):
     notify_function.append(wecom_bot)
 if push_config.get("TG_BOT_TOKEN") and push_config.get("TG_USER_ID"):
     notify_function.append(telegram_bot)
-if push_config.get("AIBOTK_KEY") and push_config.get("AIBOTK_TYPE") and push_config.get("AIBOTK_NAME"):
+if (
+    push_config.get("AIBOTK_KEY")
+    and push_config.get("AIBOTK_TYPE")
+    and push_config.get("AIBOTK_NAME")
+):
     notify_function.append(aibotk)
-if push_config.get("SMTP_SERVER") and push_config.get("SMTP_SSL") and push_config.get("SMTP_EMAIL") and push_config.get("SMTP_PASSWORD") and push_config.get("SMTP_NAME"):
+if (
+    push_config.get("SMTP_SERVER")
+    and push_config.get("SMTP_SSL")
+    and push_config.get("SMTP_EMAIL")
+    and push_config.get("SMTP_PASSWORD")
+    and push_config.get("SMTP_NAME")
+):
     notify_function.append(smtp)
 
 
@@ -659,7 +702,7 @@ def send(title: str, content: str) -> None:
     # 根据标题跳过一些消息推送，环境变量：SKIP_PUSH_TITLE 用回车分隔
     skipTitle = os.getenv("SKIP_PUSH_TITLE")
     if skipTitle:
-        if (title in re.split("\n", skipTitle)):
+        if title in re.split("\n", skipTitle):
             print(f"{title} 在SKIP_PUSH_TITLE环境变量内，跳过推送！")
             return
 
@@ -669,8 +712,7 @@ def send(title: str, content: str) -> None:
     content += "\n\n" + text
 
     ts = [
-        threading.Thread(target=mode, args=(
-            title, content), name=mode.__name__)
+        threading.Thread(target=mode, args=(title, content), name=mode.__name__)
         for mode in notify_function
     ]
     [t.start() for t in ts]

package/shell/api.sh

@@ -30,10 +30,10 @@ add_cron_api() {
     local name=$(echo "$1" | awk -F ":" '{print $3}')
     local sub_id=$(echo "$1" | awk -F ":" '{print $4}')
   else
-    local schedule=$1
-    local command=$2
-    local name=$3
-    local sub_id=$4
+    local schedule="$1"
+    local command="$2"
+    local name="$3"
+    local sub_id="$4"
   fi
 
   if [[ ! $sub_id ]];then
@@ -69,10 +69,10 @@ update_cron_api() {
     local name=$(echo "$1" | awk -F ":" '{print $3}')
     local id=$(echo "$1" | awk -F ":" '{print $4}')
   else
-    local schedule=$1
-    local command=$2
-    local name=$3
-    local id=$4
+    local schedule="$1"
+    local command="$2"
+    local name="$3"
+    local id="$4"
   fi
 
   local api=$(
@@ -103,8 +103,8 @@ update_cron_command_api() {
     local command=$(echo "$1" | awk -F ":" '{print $1}')
     local id=$(echo "$1" | awk -F ":" '{print $2}')
   else
-    local command=$1
-    local id=$2
+    local command="$1"
+    local id="$2"
   fi
 
   local api=$(
@@ -130,7 +130,7 @@ update_cron_command_api() {
 }
 
 del_cron_api() {
-  local ids=$1
+  local ids="$1"
   local currentTimeStamp=$(date +%s)
   local api=$(
     curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons?t=$currentTimeStamp" \
@@ -183,8 +183,8 @@ update_cron() {
 }
 
 notify_api() {
-  local title=$1
-  local content=$2
+  local title="$1"
+  local content="$2"
   local currentTimeStamp=$(date +%s)
   local api=$(
     curl -s --noproxy "*" "http://0.0.0.0:5600/open/system/notify?t=$currentTimeStamp" \
@@ -202,14 +202,14 @@ notify_api() {
   code=$(echo "$api" | jq -r .code)
   message=$(echo "$api" | jq -r .message)
   if [[ $code == 200 ]]; then
-    echo -e "通知发送成功"
+    echo -e "通知发送成功🎉"
   else
     echo -e "通知失败(${message})"
   fi
 }
 
 find_cron_api() {
-  local params=$1
+  local params="$1"
   local currentTimeStamp=$(date +%s)
   local api=$(
     curl -s --noproxy "*" "http://0.0.0.0:5600/open/crons/detail?$params&t=$currentTimeStamp" \

package/shell/otask.sh

@@ -38,7 +38,7 @@ gen_array_scripts() {
     if [[ -f $file ]] && [[ $file == *.js && $file != sendNotify.js ]]; then
       let i++
       array_scripts[i]=$(echo "$file" | perl -pe "s|$dir_scripts/||g")
-      array_scripts_name[i]=$(grep "new Env" $file | awk -F "'|\"" '{print $2}' | head -1)
+      array_scripts_name[i]=$(grep "new Env" $file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:.*\('\''\|"\)\([^"'\'']*\)\('\''\|"\).*:\2:' | sed 's:"::g' | sed "s:'::g" | head -1)
       [[ -z ${array_scripts_name[i]} ]] && array_scripts_name[i]="<未识别出活动名称>"
     fi
   done

package/shell/update.sh

@@ -31,7 +31,7 @@ output_list_add_drop() {
   local list=$1
   local type=$2
   if [[ -s $list ]]; then
-    echo -e "检测到有$type的定时任务：\n"
+    echo -e "检测到有${type}的定时任务：\n"
     cat $list
     echo
   fi
@@ -44,7 +44,7 @@ del_cron() {
   local path=$2
   local detail=""
   local ids=""
-  echo -e "开始尝试自动删除失效的定时任务...\n"
+  echo -e "开始尝试自动删除失效的定时任务..."
   for cron in $(cat $list_drop); do
     local id=$(cat $list_crontab_user | grep -E "$cmd_task.* $cron" | perl -pe "s|.*ID=(.*) $cmd_task.* $cron\.*|\1|" | head -1 | awk -F " " '{print $1}')
     if [[ $ids ]]; then
@@ -54,7 +54,7 @@ del_cron() {
     fi
     cron_file="$dir_scripts/${cron}"
     if [[ -f $cron_file ]]; then
-      cron_name=$(grep "new Env" $cron_file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1)
+      cron_name=$(grep "new Env" $cron_file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:.*\('\''\|"\)\([^"'\'']*\)\('\''\|"\).*:\2:' | sed 's:"::g' | sed "s:'::g" | head -1)
       rm -f $cron_file
     fi
     [[ -z $cron_name ]] && cron_name="$cron"
@@ -75,7 +75,7 @@ del_cron() {
 add_cron() {
   local list_add=$1
   local path=$2
-  echo -e "开始尝试自动添加定时任务...\n"
+  echo -e "开始尝试自动添加定时任务..."
   local detail=""
   cd $dir_scripts
   for file in $(cat $list_add); do
@@ -92,7 +92,7 @@ add_cron() {
                         s|  | |g;
                     }" | sort -u | head -1
       )
-      cron_name=$(grep "new Env" $file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1)
+      cron_name=$(grep "new Env" $file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:.*\('\''\|"\)\([^"'\'']*\)\('\''\|"\).*:\2:' | sed 's:"::g' | sed "s:'::g" | head -1)
       [[ -z $cron_name ]] && cron_name="$file_name"
       [[ -z $cron_line ]] && cron_line=$(grep "cron:" $file | awk -F ":" '{print $2}' | head -1 | xargs)
       [[ -z $cron_line ]] && cron_line=$(grep "cron " $file | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | head -1 | xargs)
@@ -193,7 +193,7 @@ update_raw() {
                       s|  | |g;
                   }" | sort -u | head -1
       )
-      cron_name=$(grep "new Env" $raw_file_name | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1)
+      cron_name=$(grep "new Env" $raw_file_name | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:.*\('\''\|"\)\([^"'\'']*\)\('\''\|"\).*:\2:' | sed 's:"::g' | sed "s:'::g" | head -1)
       [[ -z $cron_name ]] && cron_name="$raw_file_name"
       [[ -z $cron_line ]] && cron_line=$(grep "cron:" $raw_file_name | awk -F ":" '{print $2}' | head -1 | xargs)
       [[ -z $cron_line ]] && cron_line=$(grep "cron " $raw_file_name | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | head -1 | xargs)
@@ -243,10 +243,9 @@ update_qinglong() {
   echo -e "使用 ${mirror} 源更新...\n"
   export isFirstStartServer=false
 
-  local all_branch=$(cd ${dir_root} && git branch -a)
   local primary_branch="master"
-  if [[ "${all_branch}" =~ "${current_branch}" ]]; then
-    primary_branch="${current_branch}"
+  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}
@@ -364,10 +363,10 @@ gen_list_repo() {
   done
   files=$(eval $cmd | sed 's/^..//')
   if [[ $path ]]; then
-    files=$(echo "$files" | egrep $path)
+    files=$(echo "$files" | egrep "$path")
   fi
   if [[ $blackword ]]; then
-    files=$(echo "$files" | egrep -v $blackword)
+    files=$(echo "$files" | egrep -v "$blackword")
   fi
 
   cp -f $file_notify_js "${dir_scripts}/${uniq_path}"
@@ -375,7 +374,7 @@ gen_list_repo() {
 
   if [[ $dependence ]]; then
     cd ${repo_path}
-    results=$(eval $cmd | sed 's/^..//' | egrep $dependence)
+    results=$(eval $cmd | sed 's/^..//' | egrep "$dependence")
     for _file in ${results}; do
       file_path=$(dirname $_file)
       make_dir "${dir_scripts}/${uniq_path}/${file_path}"
@@ -388,7 +387,7 @@ gen_list_repo() {
   fi
 
   for file in ${files}; do
-    filename=$(basename $file)
+    filename=$(basename "$file")
     cp -f $file "$dir_scripts/${uniq_path}/${filename}"
     echo "${uniq_path}/${filename}" >>"$dir_list_tmp/${uniq_path}_scripts.list"
     # cron_id=$(cat $list_crontab_user | grep -E "$cmd_task.* ${uniq_path}_${filename}" | perl -pe "s|.*ID=(.*) $cmd_task.* ${uniq_path}_${filename}\.*|\1|" | head -1 | awk -F " " '{print $1}')

package/static/build/api/system.js

@@ -52,8 +52,7 @@ exports.default = (app) => {
             let isInitialized = true;
             if (Object.keys(authInfo).length === 2 &&
                 authInfo.username === 'admin' &&
-                authInfo.password === 'admin' &&
-                envCount === 0) {
+                authInfo.password === 'admin') {
                 isInitialized = false;
             }
             res.send({

package/static/build/api/user.js

@@ -10,6 +10,7 @@ const celebrate_1 = require("celebrate");
 const multer_1 = __importDefault(require("multer"));
 const path_1 = __importDefault(require("path"));
 const uuid_1 = require("uuid");
+const express_rate_limit_1 = __importDefault(require("express-rate-limit"));
 const config_1 = __importDefault(require("../config"));
 const route = (0, express_1.Router)();
 const storage = multer_1.default.diskStorage({
@@ -25,7 +26,10 @@ const storage = multer_1.default.diskStorage({
 const upload = (0, multer_1.default)({ storage: storage });
 exports.default = (app) => {
     app.use('/user', route);
-    route.post('/login', (0, celebrate_1.celebrate)({
+    route.post('/login', (0, express_rate_limit_1.default)({
+        windowMs: 15 * 60 * 1000,
+        max: 100,
+    }), (0, celebrate_1.celebrate)({
         body: celebrate_1.Joi.object({
             username: celebrate_1.Joi.string().required(),
             password: celebrate_1.Joi.string().required(),

package/static/build/config/serverEnv.js

@@ -6,7 +6,7 @@ let pickedEnv;
 function getPickedEnv() {
     if (pickedEnv)
         return pickedEnv;
-    const picked = (0, lodash_1.pick)(process.env, ['QlBaseUrl']);
+    const picked = (0, lodash_1.pick)(process.env, ['QlBaseUrl', 'DeployEnv']);
     pickedEnv = picked;
     return picked;
 }

package/static/build/data/dependence.js

@@ -9,7 +9,7 @@ class Dependence {
         this.status =
             typeof options.status === 'number' && DependenceStatus[options.status]
                 ? options.status
-                : DependenceStatus.installing;
+                : DependenceStatus.queued;
         this.type = options.type || DependenceTypes.nodejs;
         this.timestamp = new Date().toString();
         this.name = options.name;

package/static/build/data/notify.js

@@ -97,6 +97,7 @@ class WeWorkBotNotification extends NotificationBaseInfo {
     constructor() {
         super(...arguments);
         this.weWorkBotKey = '';
+        this.weWorkOrigin = '';
     }
 }
 exports.WeWorkBotNotification = WeWorkBotNotification;
@@ -104,6 +105,7 @@ class WeWorkAppNotification extends NotificationBaseInfo {
     constructor() {
         super(...arguments);
         this.weWorkAppKey = '';
+        this.weWorkOrigin = '';
     }
 }
 exports.WeWorkAppNotification = WeWorkAppNotification;

package/static/build/data/open.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppModel = exports.CrontabStatus = exports.App = void 0;
+exports.AppModel = exports.App = void 0;
 const _1 = require(".");
 const sequelize_1 = require("sequelize");
 class App {
@@ -13,13 +13,6 @@ class App {
     }
 }
 exports.App = App;
-var CrontabStatus;
-(function (CrontabStatus) {
-    CrontabStatus[CrontabStatus["running"] = 0] = "running";
-    CrontabStatus[CrontabStatus["idle"] = 1] = "idle";
-    CrontabStatus[CrontabStatus["disabled"] = 2] = "disabled";
-    CrontabStatus[CrontabStatus["queued"] = 3] = "queued";
-})(CrontabStatus = exports.CrontabStatus || (exports.CrontabStatus = {}));
 exports.AppModel = _1.sequelize.define('App', {
     name: { type: sequelize_1.DataTypes.STRING, unique: 'name' },
     scopes: sequelize_1.DataTypes.JSON,

package/static/build/loaders/express.js

@@ -117,8 +117,7 @@ exports.default = ({ app }) => {
         let isInitialized = true;
         if (Object.keys(authInfo).length === 2 &&
             authInfo.username === 'admin' &&
-            authInfo.password === 'admin' &&
-            envCount === 0) {
+            authInfo.password === 'admin') {
             isInitialized = false;
         }
         if (isInitialized) {
@@ -158,13 +157,6 @@ exports.default = ({ app }) => {
         }
         return next(err);
     });
-    app.use(Sentry.Handlers.errorHandler({
-        shouldHandleError(error) {
-            // 排除 SequelizeUniqueConstraintError / NotFound
-            return (!['SequelizeUniqueConstraintError'].includes(error.name) ||
-                !['Not Found'].includes(error.message));
-        },
-    }));
     app.use((err, req, res, next) => {
         Sentry.captureException(err);
         res.status(err.status || 500);

package/static/build/loaders/initFile.js

@@ -20,10 +20,15 @@ const logPath = path_1.default.join(dataPath, 'log/');
 const uploadPath = path_1.default.join(dataPath, 'upload/');
 const bakPath = path_1.default.join(dataPath, 'bak/');
 const samplePath = path_1.default.join(rootPath, 'sample/');
+const tmpPath = path_1.default.join(logPath, '.tmp/');
 const confFile = path_1.default.join(configPath, 'config.sh');
 const authConfigFile = path_1.default.join(configPath, 'auth.json');
 const sampleConfigFile = path_1.default.join(samplePath, 'config.sample.sh');
 const sampleAuthFile = path_1.default.join(samplePath, 'auth.sample.json');
+const sampleNotifyJsFile = path_1.default.join(samplePath, 'notify.js');
+const sampleNotifyPyFile = path_1.default.join(samplePath, 'notify.py');
+const scriptNotifyJsFile = path_1.default.join(scriptPath, 'sendNotify.js');
+const scriptNotifyPyFile = path_1.default.join(scriptPath, 'notify.py');
 const homedir = os_1.default.homedir();
 const sshPath = path_1.default.resolve(homedir, '.ssh');
 const sshdPath = path_1.default.join(dataPath, 'ssh.d');
@@ -37,21 +42,21 @@ exports.default = async () => {
     const sshDirExist = await (0, util_1.fileExist)(sshPath);
     const bakDirExist = await (0, util_1.fileExist)(bakPath);
     const sshdDirExist = await (0, util_1.fileExist)(sshdPath);
+    const tmpDirExist = await (0, util_1.fileExist)(tmpPath);
+    const scriptNotifyJsFileExist = await (0, util_1.fileExist)(scriptNotifyJsFile);
+    const scriptNotifyPyFileExist = await (0, util_1.fileExist)(scriptNotifyPyFile);
     if (!configDirExist) {
         fs_1.default.mkdirSync(configPath);
     }
-    if (!authFileExist) {
-        fs_1.default.writeFileSync(authConfigFile, fs_1.default.readFileSync(sampleAuthFile));
-    }
-    if (!confFileExist) {
-        fs_1.default.writeFileSync(confFile, fs_1.default.readFileSync(sampleConfigFile));
-    }
     if (!scriptDirExist) {
         fs_1.default.mkdirSync(scriptPath);
     }
     if (!logDirExist) {
         fs_1.default.mkdirSync(logPath);
     }
+    if (!tmpDirExist) {
+        fs_1.default.mkdirSync(tmpPath);
+    }
     if (!uploadDirExist) {
         fs_1.default.mkdirSync(uploadPath);
     }
@@ -64,6 +69,19 @@ exports.default = async () => {
     if (!sshdDirExist) {
         fs_1.default.mkdirSync(sshdPath);
     }
+    // 初始化文件
+    if (!authFileExist) {
+        fs_1.default.writeFileSync(authConfigFile, fs_1.default.readFileSync(sampleAuthFile));
+    }
+    if (!confFileExist) {
+        fs_1.default.writeFileSync(confFile, fs_1.default.readFileSync(sampleConfigFile));
+    }
+    if (!scriptNotifyJsFileExist) {
+        fs_1.default.writeFileSync(scriptNotifyJsFile, fs_1.default.readFileSync(sampleNotifyJsFile));
+    }
+    if (!scriptNotifyPyFileExist) {
+        fs_1.default.writeFileSync(scriptNotifyPyFile, fs_1.default.readFileSync(sampleNotifyPyFile));
+    }
     dotenv_1.default.config({ path: confFile });
     logger_1.default.info('✌️ Init file down');
 };

package/static/build/loaders/sentry.js

@@ -34,12 +34,18 @@ const util_1 = require("../config/util");
 exports.default = async ({ expressApp }) => {
     const { version } = await (0, util_1.parseVersion)(config_1.default.versionFile);
     Sentry.init({
+        ignoreErrors: [
+            /SequelizeUniqueConstraintError/i,
+            /Validation error/i,
+            /UnauthorizedError/i,
+            /celebrate request validation failed/i,
+        ],
         dsn: 'https://f4b5b55fb3c645b29a5dc2d70a1a4ef4@o1098464.ingest.sentry.io/6122819',
         integrations: [
             new Sentry.Integrations.Http({ tracing: true }),
             new Tracing.Integrations.Express({ app: expressApp }),
         ],
-        tracesSampleRate: 0.1,
+        tracesSampleRate: 0.8,
         release: version,
     });
     expressApp.use(Sentry.Handlers.requestHandler());