From 6aa0763456ff8994f7f87563aa403172a4e09d93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 10 Jan 2025 13:51:30 +0800
Subject: [PATCH] 'commit'

---
 .../YunXiaoTools/Utils/CommonUtil.java        | 14 ++++++++++++
 .../YunXiaoTools/Utils/MysqlRestoreUtil.java  | 22 ++++---------------
 .../src/main/resources/application.properties |  2 ++
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/YunXiaoTools/src/main/java/com/dsideal/YunXiaoTools/Utils/CommonUtil.java b/YunXiaoTools/src/main/java/com/dsideal/YunXiaoTools/Utils/CommonUtil.java
index 500663f0..0380cca7 100644
--- a/YunXiaoTools/src/main/java/com/dsideal/YunXiaoTools/Utils/CommonUtil.java
+++ b/YunXiaoTools/src/main/java/com/dsideal/YunXiaoTools/Utils/CommonUtil.java
@@ -23,6 +23,20 @@ public class CommonUtil {
             throw new RuntimeException("获取mysqldump路径失败", e);
         }
     }
+    /**
+     * 获取mysql命令路径
+     */
+    public static String getMySQLPath() {
+        try {
+            String resourcePath = PropKit.get("mysql_path");
+            if (resourcePath.startsWith("/")) {
+                resourcePath = resourcePath.substring(1);
+            }
+            return java.net.URLDecoder.decode(resourcePath, "UTF-8");
+        } catch (Exception e) {
+            throw new RuntimeException("获取mysql路径失败", e);
+        }
+    }
 
     /**
      * 从JDBC URL中提取主机地址
diff --git a/YunXiaoTools/src/main/java/com/dsideal/YunXiaoTools/Utils/MysqlRestoreUtil.java b/YunXiaoTools/src/main/java/com/dsideal/YunXiaoTools/Utils/MysqlRestoreUtil.java
index 791242ed..2321c229 100644
--- a/YunXiaoTools/src/main/java/com/dsideal/YunXiaoTools/Utils/MysqlRestoreUtil.java
+++ b/YunXiaoTools/src/main/java/com/dsideal/YunXiaoTools/Utils/MysqlRestoreUtil.java
@@ -2,6 +2,7 @@ package com.dsideal.YunXiaoTools.Utils;
 
 import com.jfinal.kit.PropKit;
 import com.obs.services.ObsClient;
+
 import java.io.*;
 import java.util.zip.*;
 
@@ -26,7 +27,7 @@ public class MysqlRestoreUtil {
         this.obsBucket = PropKit.get("obs_bucket_name");
 
         // 目标数据库配置
-        String jdbcUrl=PropKit.get("write.jdbcUrl");
+        String jdbcUrl = PropKit.get("write.jdbcUrl");
         this.dbHost = CommonUtil.getHostFromJdbcUrl(jdbcUrl);
         this.dbPort = CommonUtil.getPortFromJdbcUrl(jdbcUrl);
         this.dbUser = PropKit.get("write.user");
@@ -36,6 +37,7 @@ public class MysqlRestoreUtil {
 
     /**
      * 执行完整的还原流程
+     *
      * @param obsKey OBS上的文件路径
      */
     public void restore(String obsKey) {
@@ -113,7 +115,7 @@ public class MysqlRestoreUtil {
     private void restoreDatabase(String sqlFile) {
         try {
             // 获取mysql命令路径
-            String mysqlPath = getMySQLPath();
+            String mysqlPath = CommonUtil.getMySQLPath();
 
             // 构建还原命令
             ProcessBuilder pb = new ProcessBuilder(
@@ -164,20 +166,4 @@ public class MysqlRestoreUtil {
             throw new RuntimeException("还原数据库失败: " + e.getMessage(), e);
         }
     }
-
-    /**
-     * 获取mysql命令路径
-     */
-    private String getMySQLPath() {
-        try {
-            String resourcePath = getClass().getClassLoader()
-                    .getResource("mysql.exe").getPath();
-            if (resourcePath.startsWith("/")) {
-                resourcePath = resourcePath.substring(1);
-            }
-            return java.net.URLDecoder.decode(resourcePath, "UTF-8");
-        } catch (Exception e) {
-            throw new RuntimeException("获取mysql路径失败", e);
-        }
-    }
 }
\ No newline at end of file
diff --git a/YunXiaoTools/src/main/resources/application.properties b/YunXiaoTools/src/main/resources/application.properties
index b009e46c..571afe3c 100644
--- a/YunXiaoTools/src/main/resources/application.properties
+++ b/YunXiaoTools/src/main/resources/application.properties
@@ -13,6 +13,8 @@ write.jdbcUrl=jdbc:mysql://10.10.14.203:3306/HuangHai_Test?rewriteBatchedStateme
 
 # mysqldump执行文件位置
 mysqldump_path=D:/ffmpeg/mysqldump.exe
+# mysql执行文件位置
+mysql_path=D:/ffmpeg/mysql.exe
 
 # 当前是读取方还是写入方 1:读取 2：写入
 DEPLOY_ID=1