From 386812625ee058ad719e92c8e30c40f95eea80f5 Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Mon, 4 Dec 2023 17:21:29 +0800
Subject: [PATCH] [ Agent ] [ App ] - mysql init

---
 agent-go/executor/MySqlFunction.go              | 17 +++++++++++++++++
 .../wdd/func/auto/service/AppFuncScheduler.java |  6 +++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/agent-go/executor/MySqlFunction.go b/agent-go/executor/MySqlFunction.go
index 0c97ff8..1f917a2 100644
--- a/agent-go/executor/MySqlFunction.go
+++ b/agent-go/executor/MySqlFunction.go
@@ -42,9 +42,26 @@ func MysqlSqlFileLoad(jackeyLoveIp string, jackeyLoveFileList []string) (bool, [
 
 		// 逐行读取 SQL 文件并执行
 		query := ""
+		delimiterSwitched := false
 		scanner := bufio.NewScanner(jackeyLove)
 		for scanner.Scan() {
 			sqlStatement := scanner.Text()
+
+			if strings.HasPrefix(strings.TrimSpace(sqlStatement), "DELIMITER") {
+				delimiterSwitched = true
+				continue
+			}
+			if delimiterSwitched {
+				if strings.TrimSpace(sqlStatement) == "" || strings.TrimSpace(sqlStatement) == ";" {
+					delimiterSwitched = false
+					// 替换自定义分隔符为 ;
+					sqlStatement = strings.ReplaceAll(sqlStatement, ";;", ";")
+				} else {
+					// 忽略自定义分隔符行
+					continue
+				}
+			}
+
 			// 这里可以添加逻辑来忽略空行或注释行
 			if sqlStatement == "" || sqlStatement[:2] == "--" || sqlStatement[:2] == "/*" {
 				continue
diff --git a/server/src/main/java/io/wdd/func/auto/service/AppFuncScheduler.java b/server/src/main/java/io/wdd/func/auto/service/AppFuncScheduler.java
index ec0e1d9..c553ec4 100644
--- a/server/src/main/java/io/wdd/func/auto/service/AppFuncScheduler.java
+++ b/server/src/main/java/io/wdd/func/auto/service/AppFuncScheduler.java
@@ -99,11 +99,11 @@ public class AppFuncScheduler {
         List<AppFunctionEnum> appFunctionEnumList = List.of(
 //                AppFunctionEnum.DEPLOY_RKE
 //                AppFunctionEnum.DEPLOY_TEST_NFS
-                AppFunctionEnum.DEPLOY_K8S_NAMESPACE,
-                AppFunctionEnum.DEPLOY_K8S_MYSQL
+//                AppFunctionEnum.DEPLOY_K8S_NAMESPACE,
+//                AppFunctionEnum.DEPLOY_K8S_MYSQL
 //                AppFunctionEnum.DEPLOY_K8S_REDIS
 //                AppFunctionEnum.DEPLOY_K8S_PVC
-//                AppFunctionEnum.LOAD_MYSQL_INIT_SCRIPT
+                AppFunctionEnum.LOAD_MYSQL_INIT_SCRIPT
         );