Update Card_Hub.py

Card_Hub.py

@@ -444,22 +444,33 @@ def prepare_database_sync():
 
 def sync_database():
     """同步数据库"""
-    db_path = "/Card_Hub/RoleCardSite/server/src/data/database.sqlite"  # 移到函数开头
+    db_path = "/Card_Hub/RoleCardSite/server/src/data/database.sqlite"
     
     try:
         # 1. 准备同步
         prepare_database_sync()
         
-        # 2. 执行 rsync
-        rsync_cmd = f"rsync -avz --timeout=600 --chmod=666 -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{ssh_url}:{data_folder}/ {data_folder}/"
+        # 2. 执行 rsync，添加更多选项确保文件权限正确
+        rsync_cmd = f"rsync -avz --timeout=600 --chmod=666 --chown=root:root -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{ssh_url}:{data_folder}/ {data_folder}/"
         subprocess.run(rsync_cmd, shell=True, check=True)
         
-        # 3. 验证数据库完整性
+        # 3. 确保数据库文件权限正确
+        subprocess.run(f"chmod 666 {db_path}", shell=True)
+        subprocess.run(f"chown root:root {db_path}", shell=True)
+        
+        # 4. 验证数据库完整性
         try:
+            # 先尝试修复数据库
+            subprocess.run(f"sqlite3 {db_path} 'PRAGMA integrity_check;'", shell=True, check=True)
+            subprocess.run(f"sqlite3 {db_path} 'PRAGMA foreign_key_check;'", shell=True, check=True)
+            subprocess.run(f"sqlite3 {db_path} 'PRAGMA optimize;'", shell=True, check=True)
+            
+            # 再次检查完整性
             result = subprocess.run(f"sqlite3 {db_path} 'PRAGMA integrity_check;'", 
                                   shell=True, 
                                   capture_output=True, 
                                   text=True)
+            
             if "ok" not in result.stdout.lower():
                 print("数据库完整性检查失败，尝试恢复备份...")
                 # 恢复最新的备份
@@ -467,6 +478,9 @@ def sync_database():
                 if backups:
                     latest_backup = max(backups, key=os.path.getctime)
                     subprocess.run(f"cp {latest_backup} {db_path}", shell=True)
+                    # 修复权限
+                    subprocess.run(f"chmod 666 {db_path}", shell=True)
+                    subprocess.run(f"chown root:root {db_path}", shell=True)
         except Exception as e:
             print(f"验证数据库完整性时出错: {e}")
             
@@ -477,14 +491,36 @@ def sync_database():
         if backups:
             latest_backup = max(backups, key=os.path.getctime)
             subprocess.run(f"cp {latest_backup} {db_path}", shell=True)
+            # 修复权限
+            subprocess.run(f"chmod 666 {db_path}", shell=True)
+            subprocess.run(f"chown root:root {db_path}", shell=True)
     finally:
-        # 4. 重启服务
+        # 5. 重启服务
         try:
             os.chdir('/Card_Hub/RoleCardSite')
             # 修复权限问题
             subprocess.run('chmod +x ./start.sh', shell=True)
-            subprocess.run('chmod +x ./server/node_modules/.bin/nodemon', shell=True)
-            subprocess.run('chmod +x ./client/node_modules/.bin/vite', shell=True)
+            
+            # 修复客户端权限
+            client_path = './client'
+            subprocess.run(f'chmod -R 755 {client_path}/node_modules', shell=True)
+            subprocess.run(f'chmod +x {client_path}/node_modules/.bin/*', shell=True)
+            
+            # 特别修复 esbuild 权限
+            esbuild_path = f'{client_path}/node_modules/@esbuild/linux-x64/bin/esbuild'
+            if os.path.exists(esbuild_path):
+                subprocess.run(f'chmod +x {esbuild_path}', shell=True)
+                subprocess.run(f'chown root:root {esbuild_path}', shell=True)
+            
+            # 修复服务器权限
+            server_path = './server'
+            subprocess.run(f'chmod -R 755 {server_path}/node_modules', shell=True)
+            subprocess.run(f'chmod +x {server_path}/node_modules/.bin/*', shell=True)
+            
+            # 修复项目文件权限
+            subprocess.run('chmod -R 755 .', shell=True)
+            
+            # 启动服务
             subprocess.run('sh ./start.sh', shell=True)
         except Exception as e:
             print(f"重启服务时出错: {e}")
@@ -532,7 +568,12 @@ def Run_SillyTavern():
         # 确保数据库权限正确
         db_path = "/Card_Hub/RoleCardSite/server/src/data/database.sqlite"
         subprocess.run(f"chmod 666 {db_path}", shell=True)
-        subprocess.run(f"chmod 755 {os.path.dirname(db_path)}", shell=True)
+        subprocess.run(f"chown root:root {db_path}", shell=True)
+        
+        # 修复数据库
+        subprocess.run(f"sqlite3 {db_path} 'PRAGMA integrity_check;'", shell=True)
+        subprocess.run(f"sqlite3 {db_path} 'PRAGMA foreign_key_check;'", shell=True)
+        subprocess.run(f"sqlite3 {db_path} 'PRAGMA optimize;'", shell=True)
         
         # 修复启动脚本和依赖的权限
         subprocess.run('chmod +x ./start.sh', shell=True)
@@ -546,6 +587,7 @@ def Run_SillyTavern():
         esbuild_path = f'{client_path}/node_modules/@esbuild/linux-x64/bin/esbuild'
         if os.path.exists(esbuild_path):
             subprocess.run(f'chmod +x {esbuild_path}', shell=True)
+            subprocess.run(f'chown root:root {esbuild_path}', shell=True)
         
         # 修复服务器权限
         server_path = './server'
@@ -589,14 +631,19 @@ def install_dependencies():
         esbuild_path = f'{client_path}/node_modules/@esbuild/linux-x64/bin/esbuild'
         if os.path.exists(esbuild_path):
             subprocess.run(f'chmod +x {esbuild_path}', shell=True)
+            subprocess.run(f'chown root:root {esbuild_path}', shell=True)
         
         # 修复其他可执行文件权限
         subprocess.run(f'chmod +x {client_path}/node_modules/.bin/*', shell=True)
         subprocess.run(f'chmod +x {server_path}/node_modules/.bin/*', shell=True)
+        subprocess.run(f'chown -R root:root {client_path}/node_modules/.bin', shell=True)
+        subprocess.run(f'chown -R root:root {server_path}/node_modules/.bin', shell=True)
         
         # 修复项目文件权限
         subprocess.run(f'chmod -R 755 {client_path}', shell=True)
         subprocess.run(f'chmod -R 755 {server_path}', shell=True)
+        subprocess.run(f'chown -R root:root {client_path}', shell=True)
+        subprocess.run(f'chown -R root:root {server_path}', shell=True)
         
         print("依赖安装和权限修复完成")
     except Exception as e: