zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ Agent ] [ App ] - add mysql init

Browse Source
This commit is contained in:
zeaslity
2023-11-28 10:02:00 +08:00
parent 2b53a2d62a
commit 076004c573
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
agent-go/executor/AppFunction.go
View File

@@ -497,7 +497,7 @@ func (op *AgentOsOperator) loadMysqlInitScript(funcArgs []string) (bool, []strin
} }
} }
jackeyLove := funcArgs[8] jackeyLove := funcArgs[8]
if !strings.HasSuffix(jackeyLove, "tar.gz") { if !strings.HasSuffix(jackeyLove, "tar") {
return false, []string{ return false, []string{
"[loadMysqlInitScript]- jackeyLove 有误！", "[loadMysqlInitScript]- jackeyLove 有误！",
} }
@@ -506,6 +506,8 @@ func (op *AgentOsOperator) loadMysqlInitScript(funcArgs []string) (bool, []strin
jackeyLoveLocalPrefix := "/root/wdd/jackeylove/" jackeyLoveLocalPrefix := "/root/wdd/jackeylove/"
BasicCreateFolder(jackeyLoveLocalPrefix) BasicCreateFolder(jackeyLoveLocalPrefix)
jackeyLoveFolder := strings.Split(jackeyLove, ".tar")[0]
ok, resultLog := BasicDownloadFile(op.OssOfflinePrefix+"jackeyLove", jackeyLoveLocalPrefix+jackeyLove) ok, resultLog := BasicDownloadFile(op.OssOfflinePrefix+"jackeyLove", jackeyLoveLocalPrefix+jackeyLove)
if !ok { if !ok {
return false, append(resultLog, "[loadMysqlInitScript]- jackeyLove 下载失败！") 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 // list all sql file and sort and convert to []string
files, err := os.ReadDir(jackeyLoveLocalPrefix) files, err := os.ReadDir(jackeyLoveLocalPrefix + jackeyLoveFolder)
if err != nil { if err != nil {
return false, []string{ return false, []string{
"[loadMysqlInitScript]- read unzipped jackeylove error ！", "[loadMysqlInitScript]- read unzipped jackeylove error ！",

1
agent-go/executor/MySqlFunction.go
View File

@@ -67,7 +67,6 @@ func MysqlSqlFileLoad(jackeyLoveFileList []string) (bool, []string) {
} }
log.DebugF("[MysqlSqlFileLoad] - jackeyLoveFile %s execute success !", jackeyLove.Name()) log.DebugF("[MysqlSqlFileLoad] - jackeyLoveFile %s execute success !", jackeyLove.Name())
} }
return true, append(jackeyLoveFileList, "[MysqlSqlFileLoad] all file loaded !") return true, append(jackeyLoveFileList, "[MysqlSqlFileLoad] all file loaded !")

2
server/src/main/java/io/wdd/func/auto/service/AppFuncScheduler.java
View File

@@ -46,6 +46,8 @@ public class AppFuncScheduler {
appFuncArgs.add(projectInfoPO.getProjectWebServicePort()); appFuncArgs.add(projectInfoPO.getProjectWebServicePort());
appFuncArgs.add("M2D2IP"); appFuncArgs.add("M2D2IP");
appFuncArgs.add(projectInfoPO.getProjectVersion()); appFuncArgs.add(projectInfoPO.getProjectVersion());
// jackeyLoveFile
appFuncArgs.add("init_5.1.0.tar");
return appFuncArgs; return appFuncArgs;
} }