|
|
@@ -1,8 +1,10 @@ |
|
|
package com.ruoyi.platform.service.impl; |
|
|
package com.ruoyi.platform.service.impl; |
|
|
|
|
|
|
|
|
|
|
|
import com.ruoyi.common.core.utils.StringUtils; |
|
|
import com.ruoyi.common.redis.service.RedisService; |
|
|
import com.ruoyi.common.redis.service.RedisService; |
|
|
import com.ruoyi.common.security.utils.SecurityUtils; |
|
|
import com.ruoyi.common.security.utils.SecurityUtils; |
|
|
import com.ruoyi.platform.domain.DevEnvironment; |
|
|
import com.ruoyi.platform.domain.DevEnvironment; |
|
|
|
|
|
import com.ruoyi.platform.domain.PodStatus; |
|
|
import com.ruoyi.platform.mapper.DevEnvironmentDao; |
|
|
import com.ruoyi.platform.mapper.DevEnvironmentDao; |
|
|
import com.ruoyi.platform.service.DevEnvironmentService; |
|
|
import com.ruoyi.platform.service.DevEnvironmentService; |
|
|
import com.ruoyi.platform.service.JupyterService; |
|
|
import com.ruoyi.platform.service.JupyterService; |
|
|
@@ -76,9 +78,9 @@ public class JupyterServiceImpl implements JupyterService { |
|
|
@Override |
|
|
@Override |
|
|
public String runJupyterService(Integer id) { |
|
|
public String runJupyterService(Integer id) { |
|
|
DevEnvironment devEnvironment = this.devEnvironmentDao.queryById(id); |
|
|
DevEnvironment devEnvironment = this.devEnvironmentDao.queryById(id); |
|
|
if(devEnvironment == null){ |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// if(devEnvironment == null){ |
|
|
|
|
|
// |
|
|
|
|
|
// } |
|
|
String envName = devEnvironment.getName(); |
|
|
String envName = devEnvironment.getName(); |
|
|
//TODO 设置环境变量 |
|
|
//TODO 设置环境变量 |
|
|
|
|
|
|
|
|
@@ -124,7 +126,34 @@ public class JupyterServiceImpl implements JupyterService { |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public PodStatusVo getJupyterStatus(FrameLogPathVo frameLogPathVo) { |
|
|
public PodStatusVo getJupyterStatus(FrameLogPathVo frameLogPathVo) { |
|
|
return null; |
|
|
|
|
|
|
|
|
String status = PodStatus.Terminated.getName(); |
|
|
|
|
|
PodStatusVo JupyterStatusVo = new PodStatusVo(); |
|
|
|
|
|
JupyterStatusVo.setStatus(status); |
|
|
|
|
|
if(StringUtils.isEmpty(frameLogPathVo.getPath())){ |
|
|
|
|
|
return JupyterStatusVo; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
LoginUser loginUser = SecurityUtils.getLoginUser(); |
|
|
|
|
|
String podName = loginUser.getUsername().toLowerCase() + "-editor-pod"; |
|
|
|
|
|
|
|
|
|
|
|
try { |
|
|
|
|
|
// 查询相应pod状态 |
|
|
|
|
|
String podStatus = k8sClientUtil.getPodStatus(podName, StringUtils.isEmpty(frameLogPathVo.getNamespace()) ? "default" : frameLogPathVo.getNamespace()); |
|
|
|
|
|
for (PodStatus s : PodStatus.values()) { |
|
|
|
|
|
if (s.getName().equals(podStatus)) { |
|
|
|
|
|
status = s.getName(); |
|
|
|
|
|
break; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
|
return JupyterStatusVo; |
|
|
|
|
|
} |
|
|
|
|
|
String url = redisService.getCacheObject(podName); |
|
|
|
|
|
JupyterStatusVo.setStatus(status); |
|
|
|
|
|
JupyterStatusVo.setUrl(url); |
|
|
|
|
|
return JupyterStatusVo; |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|