更新脚本替换

replace_and_run.sh

@@ -1,23 +1,37 @@
 #!/usr/bin/env bash
 # ============================================================
-# 手动替换加固模板 APK,并立即触发一次加固任务
+# 手动替换加固模板 APK 并立即触发加固任务(多 app 支持)
 #
 # 用法:
-#   ./replace_and_run.sh                     # 不换 APK,只触发一次加固
+#   ./replace_and_run.sh                            # 不换模板,只触发一次(两个 app 都跑)
-#   ./replace_and_run.sh /path/to/xxx.apk    # 先替换 template,再触发
+#   ./replace_and_run.sh huangguo /path/xxx.apk     # 替换 huangguo 模板,再触发
-#   ./replace_and_run.sh -n /path/to/xxx.apk # 只替换 template,不触发
+#   ./replace_and_run.sh 91fans   /path/xxx.apk     # 替换 91fans 模板,再触发
-#   ./replace_and_run.sh -f                  # 只 follow 日志
+#   ./replace_and_run.sh -n huangguo /path/xxx.apk  # 只替换 huangguo 模板,不触发
+#   ./replace_and_run.sh -f                         # 只 follow 远端日志
+#
+# App:
+#   huangguo -> template/hgdj_source.apk    (appId=2)
+#   91fans   -> template/jyfans_source.apk  (appId=3)
 # ============================================================
 
 set -euo pipefail
 
 JIAGU_HOST=root@139.162.47.194
 JIAGU_DIR=/root/JiaguTool
-TEMPLATE=$JIAGU_DIR/template/jyfans_source.apk
 LOG=$JIAGU_DIR/auto_jiagu.log
 
+# app -> 服务器上模板文件名
+declare_template() {
+    case "$1" in
+        huangguo) echo "hgdj_source.apk" ;;
+        91fans)   echo "jyfans_source.apk" ;;
+        *)        echo "" ;;
+    esac
+}
+
 NO_RUN=0
 FOLLOW_ONLY=0
+APP=""
 APK=""
 
 while [ $# -gt 0 ]; do
@@ -25,7 +39,9 @@ while [ $# -gt 0 ]; do
         -n) NO_RUN=1; shift ;;
         -f) FOLLOW_ONLY=1; shift ;;
         -h|--help)
-            sed -n '3,10p' "$0"; exit 0 ;;
+            sed -n '3,15p' "$0"; exit 0 ;;
+        huangguo|91fans)
+            APP="$1"; shift ;;
         *)  APK="$1"; shift ;;
     esac
 done
@@ -40,9 +56,14 @@ fi
 
 # ---------- 替换模板 APK ----------
 if [ -n "$APK" ]; then
+    [ -z "$APP" ] && { echo "❌ 提供 APK 时必须先指定 app: huangguo | 91fans"; exit 1; }
     [ ! -f "$APK" ] && { echo "❌ APK 不存在: $APK"; exit 1; }
+    TPL=$(declare_template "$APP")
+    [ -z "$TPL" ] && { echo "❌ 未知 app: $APP"; exit 1; }
+
+    TEMPLATE=$JIAGU_DIR/template/$TPL
     SIZE=$(stat -f%z "$APK" 2>/dev/null || stat -c%s "$APK")
-    log "→ 上传 $(basename $APK) ($SIZE bytes) → $TEMPLATE"
+    log "→ [$APP] 上传 $(basename $APK) ($SIZE bytes) → $TEMPLATE"
     scp -C "$APK" "$JIAGU_HOST:$TEMPLATE"
     ssh "$JIAGU_HOST" "chmod 600 $TEMPLATE && ls -l $TEMPLATE"
 fi
@@ -52,18 +73,15 @@ if [ "$NO_RUN" -eq 1 ]; then
     exit 0
 fi
 
-# ---------- 触发一次加固 ----------
+# ---------- 触发一次加固(两 app 都跑,由 auto_jiagu.sh 内部循环)----------
-log "→ 远端触发 $JIAGU_DIR/auto_jiagu.sh(约 3 分钟)"
+log "→ 远端触发 $JIAGU_DIR/auto_jiagu.sh(两 app 依次加固,约 90 秒)"
-log "  实时日志见下方,产物完成后自动退出"
 
-# 后台跑 + 实时 follow 日志,脚本结束时 kill follow
 ssh "$JIAGU_HOST" "nohup $JIAGU_DIR/auto_jiagu.sh >/dev/null 2>&1 &" </dev/null
 
-# tail follow 日志直到看到 "完成" 或 "❌"
+# tail follow 日志,遇到最外层"完成"退出
 ssh "$JIAGU_HOST" "tail -n 0 -f $LOG" | while IFS= read -r line; do
     echo "  $line"
-    if echo "$line" | grep -qE '完成|❌|上一轮还在跑'; then
+    if echo "$line" | grep -qE '^========== .* 完成 ==========$|❌|上一轮还在跑'; then
-        # kill 掉外层 tail 让脚本退出
         pkill -P $$ -f "tail -n 0 -f $LOG" 2>/dev/null || true
         break
     fi
@@ -71,11 +89,16 @@ done
 
 log "→ 拉取最终状态"
 ssh "$JIAGU_HOST" "bash -c '
-    echo \"----- S3 最新 5 个包 -----\"
+    echo \"----- S3 huangguo/ 最新 -----\"
-    aws s3 ls s3://meirenyu/huangguo/ | tail -5
+    aws s3 ls s3://meirenyu/huangguo/ | grep -v channels/ | tail -3
+    echo \"\"
+    echo \"----- S3 91fans/ 最新 -----\"
+    aws s3 ls s3://meirenyu/91fans/ | tail -3
     echo \"\"
     echo \"----- MongoDB link -----\"
-    mongosh \"mongodb://stat_center:v5weEdNvXnJCMr9TeFFm@172.104.52.130:27017,172.104.52.26:27017,172.104.52.242:27017/stat_center?authSource=stat_center&replicaSet=fish0\" --quiet --eval \"print(db.getCollection(\\\"version\\\").findOne({appId:2}).link[0])\"
+    mongosh \"mongodb://stat_center:v5weEdNvXnJCMr9TeFFm@172.104.52.130:27017,172.104.52.26:27017,172.104.52.242:27017/stat_center?authSource=stat_center&replicaSet=fish0\" --quiet --eval \"
+      db.getCollection(\\\"version\\\").find({appId:{\\\$in:[2,3]}}).forEach(d => print(\\\"appId=\\\" + d.appId + \\\"  \\\" + d.link[0]));
+    \"
 '"
 
 log "✅ 完成"