tt

app/controller/server/ServerController.js

@@ -14,6 +14,17 @@ ServerController.getServerConfById = async(ctx) => {
     }
 };
 
+ServerController.serverExist = async(ctx) => {
+    var id = ctx.paramsObj.id;
+    try {
+        await ServerService.getServerConfById(id);
+        ctx.makeResObj(200, '', rst);
+    } catch (e) {
+        logger.error('[getServerConfById]', e);
+        ctx.makeErrResObj();
+    }
+};
+
 ServerController.getServerConfList4Tree = async(ctx) => {
     var treeNodeId = ctx.paramsObj.tree_node_id;
     var curPage = parseInt(ctx.paramsObj.cur_page) || 0;

app/dao/ServerDao.js

@@ -22,12 +22,15 @@ ServerDao.getServerConf = async(application, serverName, enableSet, setName, set
     } else {
         where.enable_set = 'N';
     }
-    return await tServerConf.findAll({
+    var options = {
         where: where,
         order: [ ['application'], ['server_name']],
-        limit: pageSize,
-        offset: pageSize * (curPage - 1)
-    });
+    }
+    if(curPage && pageSize){
+        options.limit = pageSize;
+        options.offset = pageSize * (curPage - 1);
+    }
+    return await tServerConf.findAll(options);
 };
 
 ServerDao.getInactiveServerConfList = async(application, serverName, nodeName, curPage, pageSize) => {
@@ -36,12 +39,15 @@ ServerDao.getInactiveServerConfList = async(application, serverName, nodeName, c
     serverName && (where.server_name = serverName);
     nodeName && (where.node_name = nodeName);
     where.setting_state = 'inactive';
-    return await tServerConf.findAll({
+    var options = {
         where: where,
-        order: [ ['application'], ['server_name'], ['node_name']],
-        limit: pageSize,
-        offset: pageSize * (curPage - 1),
-    });
+        order: [ ['application'], ['server_name']],
+    };
+    if(curPage && pageSize){
+        options.limit = pageSize;
+        options.offset = pageSize * (curPage - 1);
+    }
+    return await tServerConf.findAll(options);
 };
 
 

app/service/server/ServerService.js

@@ -10,6 +10,12 @@ ServerService.getServerConfById = async(id) => {
     return await ServerDao.getServerConfById(id);
 };
 
+//通过应用，服务，节点获取获取服务信息
+ServerService.getServerConf = async(application, serverName, nodeName) => {
+    return await ServerDao.getServerConf(application, serverName, nodeName);
+};
+
+
 //通过treeNodeId查询服务列表
 ServerService.getServerConfList4Tree = async(treeNodeId, curPage, pageSize) => {
     var where = ServerService.formatTreeNodeId(treeNodeId);