Commit 2aa991fe authored by tywldx's avatar tywldx

fix

parent a893b26c
...@@ -2,6 +2,7 @@ var express = require('express'); ...@@ -2,6 +2,7 @@ var express = require('express');
var cproc = require('child_process'); var cproc = require('child_process');
var bodyParser = require('body-parser'); var bodyParser = require('body-parser');
var db_config = require('./config/db'); var db_config = require('./config/db');
var request = require('request');
// const mongodb = require('mongodb'); // const mongodb = require('mongodb');
const mongoose = require('mongoose'); const mongoose = require('mongoose');
var ProConfig = require('./model/proconfig.js'); var ProConfig = require('./model/proconfig.js');
...@@ -12,7 +13,18 @@ var options = { ...@@ -12,7 +13,18 @@ var options = {
limit: '100kb', limit: '100kb',
type: 'application/octet-stream' type: 'application/octet-stream'
}; };
// 同步进行接口转发
function requestPromise (option) {
return new Promise(function (resolve, reject) {
request(option, function (err, res, body) {
if (err) {
reject(err)
} else {
resolve(body)
}
})
})
}
// mongoose.connect('mongodb://localhost/my_database'); // mongoose.connect('mongodb://localhost/my_database');
mongoose.connect('mongodb://172.30.220.22:27017/qaHome') mongoose.connect('mongodb://172.30.220.22:27017/qaHome')
...@@ -286,6 +298,15 @@ admin.get('/get_systems_by_type_for_temp', async function(req, res) { ...@@ -286,6 +298,15 @@ admin.get('/get_systems_by_type_for_temp', async function(req, res) {
python: fb.python.join(" ") python: fb.python.join(" ")
}); });
}); });
// 给jenkins使用获取环境的namespace
admin.get('/get_systems_by_type_for_temp', async function(req, res) {
let ns = await requestPromise({url:"http://192.168.4.24/api/qahome/list_env"})
let ns_array = [];
for(let ist of ns.details.instances){
ns_array.push(ist.name)
}
res.send(ns_array.join(" "));
});
// 增加一个新的nginx映射 // 增加一个新的nginx映射
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment