From dd455def1749275c7591881d97bf97878de34491 Mon Sep 17 00:00:00 2001
From: zqiushi <zqiushi@yeah.net>
Date: Wed, 8 Jan 2025 19:53:34 +0800
Subject: [PATCH] 1

---
 lsy-frpc/data/lsyfrpc/check_config.sh | 15 ++++++++++++++-
 lsy-frpc/data/lsyfrpc/frp_install.sh  |  4 ++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/lsy-frpc/data/lsyfrpc/check_config.sh b/lsy-frpc/data/lsyfrpc/check_config.sh
index a026486..4caceda 100644
--- a/lsy-frpc/data/lsyfrpc/check_config.sh
+++ b/lsy-frpc/data/lsyfrpc/check_config.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # FRPC 配置目录和文件路径
+FLAG_FILE="/tmp/lsyfrpc_check_config_running"
 FRPC_FILE="/data/lsyfrpc/frpc"
 FRPC_DIR="/data/lsyfrpc"
 CONFIG_FILE="$FRPC_DIR/frpc.ini"
@@ -55,7 +56,19 @@ function check_config() {
     # 比较配置文件中的 MAC 地址和端口是否与云端匹配
     if [ "$current_mac_address" != "$cloud_mac_address" ] || [ "$current_port" != "$cloud_port" ]; then
         echo "[INFO] Configuration mismatch detected. Re-running install.sh..."
-        sudo /bin/bash $FRPC_DIR/frp_install.sh
+        # sudo /bin/bash $FRPC_DIR/frp_install.sh
+        cat > "$FRPC_DIR/frpc.ini" <<EOF
+[common]
+server_addr = box.jxm.cool
+server_port = 8000
+token = 92098d16-1961-4bda-902b-e43e3d41d5a9
+
+[$cloud_mac_address]
+type = tcp
+local_ip = 127.0.0.1
+local_port = 22
+remote_port = $cloud_port
+EOF
     else
         echo "[INFO] Configuration is up to date."
     fi
diff --git a/lsy-frpc/data/lsyfrpc/frp_install.sh b/lsy-frpc/data/lsyfrpc/frp_install.sh
index a686ee9..fcc5343 100644
--- a/lsy-frpc/data/lsyfrpc/frp_install.sh
+++ b/lsy-frpc/data/lsyfrpc/frp_install.sh
@@ -46,8 +46,8 @@ Type=simple
 # ExecStartPre=/bin/mkdir -p "$FRPC_DIR/var/"
 # ExecStartPre=/bin/bash "$FRPC_DIR/check_config.sh"
 ExecStart="$FRPC_FILE" -c "$FRPC_DIR/frpc.ini"
-ExecStartPost=/bin/bash "$FRPC_DIR/check_config.sh"
-PIDFile="$FRPC_DIR/frpc.pid"
+ExecStartPost=/bin/bash -c "$FRPC_DIR/check_config.sh &"
+# PIDFile="$FRPC_DIR/frpc.pid"
 
 Restart=always
 RestartSec=5