提交 9ade6b70 编写于 作者: 偏锋书生's avatar 偏锋书生

SQL初步

上级 837b0d71
......@@ -302,11 +302,11 @@
<artifactId>mysql-connector-java</artifactId>
<version>5.1.47</version>
</dependency>
<dependency>
<!-- dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
<version>3.2.0</version>
</dependency>
</dependency-->
<!--end mybatis plus -->
<dependency>
<groupId>net.wicp.tams</groupId>
......
......@@ -5,8 +5,6 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import org.apache.commons.io.FileUtils;
import org.aspectj.util.FileUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -69,9 +67,9 @@ public class DeployService {
IDeploy deploy = (IDeploy) SpringAssit.context.getBean(commonDeploy.getDeploy());
try {
Result checkExit = deploy.checkExit(commonDeploy.getId(), commandType, taskId);
if(checkExit.isSuc()) {//存在
if (checkExit.isSuc()) {// 存在
Result delRes = deploy.deleteConfig(commonDeploy.getId(), commandType, taskId);
if(!delRes.isSuc()) {//删除不成功
if (!delRes.isSuc()) {// 删除不成功
return delRes;
}
}
......@@ -126,21 +124,21 @@ public class DeployService {
return null;
}
}
public String viewConfK8s(CommandType commandType, Long taskId,int retract) {
public String viewConfK8s(CommandType commandType, Long taskId, int retract) {
DeployK8s deploy = (DeployK8s) SpringAssit.context.getBean("k8s");
try {
String viewConf = deploy.viewK8sConf(commandType, taskId,retract);
String viewConf = deploy.viewK8sConf(commandType, taskId, retract);
return viewConf;
} catch (Throwable e) {
log.error("查看日志错误", e);
return null;
}
}
public String viewConfK8s(CommandType commandType, Long taskId) {
return viewConfK8s(commandType,taskId,-1);
return viewConfK8s(commandType, taskId, -1);
}
public String viewConfDeploy(CommandType commandType, Long taskId, Long deployId) {
CommonDeploy commonDeploy = commonDeployMapper.selectById(deployId);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册