diff --git a/agent-go/executor/AppFunction.go b/agent-go/executor/AppFunction.go index 6765fff..6859f50 100644 --- a/agent-go/executor/AppFunction.go +++ b/agent-go/executor/AppFunction.go @@ -497,7 +497,7 @@ func (op *AgentOsOperator) loadMysqlInitScript(funcArgs []string) (bool, []strin } } jackeyLove := funcArgs[8] - if !strings.HasSuffix(jackeyLove, "tar.gz") { + if !strings.HasSuffix(jackeyLove, "tar") { return false, []string{ "[loadMysqlInitScript]- jackeyLove 有误!", } @@ -506,6 +506,8 @@ func (op *AgentOsOperator) loadMysqlInitScript(funcArgs []string) (bool, []strin jackeyLoveLocalPrefix := "/root/wdd/jackeylove/" BasicCreateFolder(jackeyLoveLocalPrefix) + jackeyLoveFolder := strings.Split(jackeyLove, ".tar")[0] + ok, resultLog := BasicDownloadFile(op.OssOfflinePrefix+"jackeyLove", jackeyLoveLocalPrefix+jackeyLove) if !ok { return false, append(resultLog, "[loadMysqlInitScript]- jackeyLove 下载失败!") @@ -525,7 +527,7 @@ func (op *AgentOsOperator) loadMysqlInitScript(funcArgs []string) (bool, []strin } // list all sql file and sort and convert to []string - files, err := os.ReadDir(jackeyLoveLocalPrefix) + files, err := os.ReadDir(jackeyLoveLocalPrefix + jackeyLoveFolder) if err != nil { return false, []string{ "[loadMysqlInitScript]- read unzipped jackeylove error !", diff --git a/agent-go/executor/MySqlFunction.go b/agent-go/executor/MySqlFunction.go index 8650a77..5619946 100644 --- a/agent-go/executor/MySqlFunction.go +++ b/agent-go/executor/MySqlFunction.go @@ -67,7 +67,6 @@ func MysqlSqlFileLoad(jackeyLoveFileList []string) (bool, []string) { } log.DebugF("[MysqlSqlFileLoad] - jackeyLoveFile %s execute success !", jackeyLove.Name()) - } return true, append(jackeyLoveFileList, "[MysqlSqlFileLoad] all file loaded !") 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 a9d35d4..697a5f6 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 @@ -46,6 +46,8 @@ public class AppFuncScheduler { appFuncArgs.add(projectInfoPO.getProjectWebServicePort()); appFuncArgs.add("M2D2IP"); appFuncArgs.add(projectInfoPO.getProjectVersion()); + // jackeyLoveFile + appFuncArgs.add("init_5.1.0.tar"); return appFuncArgs; }