Authored by qinchao

node发布界面显示

... ... @@ -76,21 +76,25 @@ public class NodeBuildCtrl {
public String getProjects() {
try {
return httpRestClient.get(URL + "getProjects", String.class, null);
/*String tt= "[{\"exeOrder\":0,\"name\":\"YOHOBUY-Portal-fe2\",\"group\":\"Node项目\",\"order\":\"1\"},{\"exeOrder\":0,\"name\":\"YOHOBUY-Shop-fe2\",\"group\":\"Node项目\",\"order\":\"1\"},{\"exeOrder\":0,\"name\":\"YOHOBUY-shop-fe\",\"group\":\"Node项目\",\"order\":\"1\"},{\"exeOrder\":0,\"name\":\"YOHOBLK-WWW\",\"group\":\"Node项目\",\"order\":\"1\"},{\"exeOrder\":0,\"name\":\"YOHOBUY-WAP-NODE\",\"group\":\"Node项目\",\"order\":\"1\"},{\"exeOrder\":0,\"name\":\"YOHOBUY-PC-NODE\",\"group\":\"Node项目\",\"order\":\"1\"},{\"exeOrder\":0,\"name\":\"YOHOBLK-WAP\",\"group\":\"Node项目\",\"order\":\"1\"}]";
return JSONArray.toJSONString(JSON.parseArray(tt));*/
} catch (Exception ex) {
return "failed";
}
}
/**
* 根据项目名字获取项目想起
* 获取所有项目
*
* @return
*/
@RequestMapping(value = "getProject", method = RequestMethod.POST)
@ResponseBody
public String getProjects(String name) {
public String getProjectByName(String name) {
try {
return httpRestClient.get(URL + "getProject?name="+name , String.class, null);
//return "{\"project\":\"yohobuy-node\",\"name\":\"YOHOBUY-PC-NODE\",\"group\":\"Node项目\",\"groupid\":1,\"envs\":[{\"name\":\"qcloud_gray\",\"host_ips\":[\"10.66.101.9\"]},{\"name\":\"az1\",\"host_ips\":[\"10.66.1.6\",\"10.66.1.7\",\"10.66.1.8\"]},{\"name\":\"az2\",\"host_ips\":[\"10.66.103.6\",\"10.66.103.7\"]},{\"name\":\"az1-az2\",\"host_ips\":[\"10.66.1.6\",\"10.66.1.7\",\"10.66.1.8\",\"10.66.103.6\",\"10.66.103.7\"]}]}";
} catch (Exception ex) {
return "failed";
}
... ...
... ... @@ -20,6 +20,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
... ... @@ -40,6 +41,9 @@ public class WorkSystemCtrl {
Logger log = LoggerFactory.getLogger(UserCtrl.class);
@Autowired
NodeBuildCtrl nodeBuildCtrl;
@Autowired
HttpRestClient httpRestClient;
@RequestMapping("/toAddWork")
... ... @@ -126,7 +130,7 @@ public class WorkSystemCtrl {
String result = httpRestClient.get("http://172.31.16.167:8883/php/getProjects", String.class, null);
return JSON.parseObject(result,List.class);
} else if (Platform.NODE.equals(platform)) {
String result = httpRestClient.get("http://172.31.16.167:8883/node/getProjects", String.class, null);
String result = nodeBuildCtrl.getProjects();
return JSON.parseObject(result,List.class);
}else if (Platform.DOCKER.equals(platform)) {
Map map = new HashMap<>();
... ... @@ -147,6 +151,13 @@ public class WorkSystemCtrl {
}
@RequestMapping(value = "getNodeEnvByProject")
@ResponseBody
public String getNodeEnvByProject(String name) {
return nodeBuildCtrl.getProjectByName(name);
}
@RequestMapping("/checkRole")
@ResponseBody
public int checkRole(String type, HttpSession session) {
... ...
... ... @@ -340,7 +340,7 @@
project_HTML += "<div class='"+checkTypeCss+"' style='display: inline'>";
project_HTML += " <input name='project' type='"+checkType+"' id='" + data[i].name + "' value='" + data[i].name +"' ";
if("NODE" == platform){
project_HTML += " onclick = loadEnv('"+data[i].name+"') ";
project_HTML += " onclick = loadNodeEnv('"+data[i].name+"') ";
}
project_HTML += "/>";
project_HTML += "<label for='" + data[i].name + "' style='width: 200px'>" + data[i].name + "</label></div>";
... ... @@ -357,10 +357,10 @@
}
//加载环境
function loadEnv(projName){
function loadNodeEnv(projName){
$("#environmentDiv_node").html("");
$.ajax({
url: contextPath+'nodeBuild/getProject?name=' + projName,
url: contextPath+'workSystem/getNodeEnvByProject?name=' + projName,
type: 'POST',
dataType: 'json',
success: function (data) {
... ...