clauseliu

app/controller/config/ConfigController.js

@@ -5,8 +5,14 @@
 const logger = require('../../logger');
 const ConfigService = require('../../service/config/ConfigService');
 
+const util = require('../util/util');
+
 const ConfigController = {};
 
+const configListStruct = {id:'',server_name:'',set_name:'',set_area:'',host:{key:'node_name'},set_group:'',filename:'',config:'',level:'',posttime:{formatter:util.formatTimeStamp},lastuser:''};
+
+
+
 ConfigController.index = async(ctx) => {
     await ctx.render('index', {
         title: 'tars title#common.servername#'
@@ -14,6 +20,8 @@ ConfigController.index = async(ctx) => {
 };
 
 
+
+
 ConfigController.configFileList = async(ctx) => {
     let {level, application, set_name, set_area, set_group, server_name} = ctx.paramsObj;
     let list = [];
@@ -47,7 +55,7 @@ ConfigController.configFileList = async(ctx) => {
                 list = await ConfigService.getServerConfigFile({server_name:`${application}.${server_name}`, set_name:set_name, set_area:set_area, set_group:set_group});
                 break;
         }
-        ctx.makeResObj(200, '', list);
+        ctx.makeResObj(200, '', util.viewFilter(list,configListStruct));
     }catch(e){
         logger.error(e);
         ctx.makeErrResObj(500, e.toString());
@@ -57,7 +65,8 @@ ConfigController.configFileList = async(ctx) => {
 ConfigController.addConfigFile = async(ctx) => {
     let params = ctx.paramsObj;
     try{
-        ctx.makeResObj(200, '', await ConfigService.addConfigFile(params));
+        let ret = await ConfigService.addConfigFile(params);
+        ctx.makeResObj(200, '', util.viewFilter(ret,configListStruct));
     }catch(e){
         logger.error(e);
         ctx.makeErrResObj(500, e.toString());
@@ -77,7 +86,8 @@ ConfigController.deleteConfigFile = async(ctx) => {
 ConfigController.updateConfigFile = async(ctx) => {
     let params = ctx.paramsObj;
     try{
-        ctx.makeResObj(200, '', await ConfigService.updateConfigFile(params));
+        let ret = await ConfigService.updateConfigFile(params);
+        ctx.makeResObj(200, '', util.viewFilter(ret,configListStruct));
     }catch(e){
         logger.error(e);
         ctx.makeErrResObj(500, e.toString());
@@ -87,7 +97,8 @@ ConfigController.updateConfigFile = async(ctx) => {
 ConfigController.configFile = async(ctx) => {
     let id = ctx.paramsObj.id;
     try{
-        ctx.makeResObj(200, '', await ConfigService.getConfigFile(id));
+        let ret = await ConfigService.getConfigFile(id);
+        ctx.makeResObj(200, '', util.viewFilter(ret,configListStruct));
     }catch(e){
         logger.error(e);
         ctx.makeErrResObj(500, e.toString());
@@ -97,14 +108,15 @@ ConfigController.configFile = async(ctx) => {
 ConfigController.nodeConfigFileList = async(ctx) => {
     let {application, set_name, set_area, set_group, server_name, config_id} = ctx.paramsObj;
     try{
-        ctx.makeResObj(200, '', await ConfigService.getNodeConfigFile({
+        let list = await ConfigService.getNodeConfigFile({
             application:application,
             server_name:server_name,
             set_name:set_name,
             set_area:set_area,
             set_group:set_group,
             config_id:config_id
-        }));
+        });
+        ctx.makeResObj(200, '', util.viewFilter(list,configListStruct));
     }catch(e){
         logger.error(e);
         ctx.makeErrResObj(500, e.toString());
@@ -114,7 +126,8 @@ ConfigController.nodeConfigFileList = async(ctx) => {
 ConfigController.getConfigFileHistory = async(ctx) => {
     let {id, currPage = 0, pageSize = 0} = ctx.paramsObj;
     try{
-        ctx.makeResObj(200, '', await ConfigService.getConfigFileHistory(id, currPage, pageSize));
+        let ret = await ConfigService.getConfigFileHistory(id, currPage, pageSize);
+        ctx.makeResObj(200, '', util.viewFilter(ret,{id:'',config_id:'',reason:'',content:'',posttime:{formatter:util.formatTimeStamp}}));
     }catch(e){
         logger.error(e);
         ctx.makeErrResObj(500, e.toString());
@@ -124,7 +137,8 @@ ConfigController.getConfigFileHistory = async(ctx) => {
 ConfigController.configFileHistoryList = async(ctx) => {
     let config_id = ctx.paramsObj.config_id;
     try{
-        ctx.makeResObj(200, '', await ConfigService.getConfigFileHistoryList(config_id));
+        let list = await ConfigService.getConfigFileHistoryList(config_id);
+        ctx.makeResObj(200, '', util.viewFilter(list,{id:'',config_id:'',reason:'',content:'',posttime:{formatter:util.formatTimeStamp}}));
     }catch(e){
         logger.error(e);
         ctx.makeErrResObj(500, e.toString());
@@ -134,7 +148,8 @@ ConfigController.configFileHistoryList = async(ctx) => {
 ConfigController.addConfigRef = async(ctx) => {
     let {config_id, reference_id} = ctx.paramsObj;
     try{
-        ctx.makeResObj(200, '', await ConfigService.addConfigRef(config_id, reference_id));
+        let ret = await ConfigService.addConfigRef(config_id, reference_id);
+        ctx.makeResObj(200, '', util.viewFilter(ret,{id:'',config_id:'',reference_id:''}));
     }catch(e){
         logger.error(e);
         ctx.makeErrResObj(500, e.toString());

app/dao/ConfigDao.js

@@ -2,15 +2,14 @@
  * Created by clauseliu on 2018/4/20.
  */
 
-const {tConfigFiles,tConfigHistoryFiles,tConfigReferences} = require('./db');
+const {tConfigFiles,tConfigHistoryFiles,tConfigReferences} = require('./db').db_tars;
 
 let ConfigDao = {};
 
-const configFileAttr = ['id','server_name','node_name','set_name','set_area','set_group','filename','config','level','posttime','lastuser'];
+const configFileAttr = [];
 
 ConfigDao.getApplicationConfigFile = async (application) => {
     return await tConfigFiles.findAll({
-        attributes : configFileAttr,
         where : {
             level       :   1,
             server_name :   application
@@ -22,7 +21,6 @@ ConfigDao.getSetConfigFile = async (params) => {
     let whereObj = Object.assign({level:1},params);
 
     return await tConfigFiles.findAll({
-        attributes : configFileAttr,
         where : whereObj
     });
 };
@@ -30,7 +28,6 @@ ConfigDao.getSetConfigFile = async (params) => {
 ConfigDao.getServerConfigFile = async (params) => {
     let whereObj = Object.assign({level:2},filterParams(params));
     return await tConfigFiles.findAll({
-        attributes : configFileAttr,
         where : whereObj
     });
 };
@@ -45,7 +42,6 @@ ConfigDao.insertConfigFileHistory = async (params) => {
 
 ConfigDao.getConfigFile = async (id) => {
     return await tConfigFiles.findOne({
-        attributes : configFileAttr,
         raw : true,
         where : {id : id}
     });
@@ -54,7 +50,6 @@ ConfigDao.getConfigFile = async (id) => {
 ConfigDao.getNodeConfigFile = async (params) => {
     let whereObj = Object.assign({level:3},filterParams(params));
     return await tConfigFiles.findAll({
-        attributes : configFileAttr,
         order : [
             ['id','desc']
         ],
@@ -79,7 +74,6 @@ ConfigDao.updateConfigFile = async (params) => {
 
 ConfigDao.getConfigFileHistory = async (id) => {
     return await tConfigHistoryFiles.findOne({
-        attributes : ['id','config_id','reason','content','posttime'],
         raw : true,
         where : {
             id  :   id
@@ -92,7 +86,6 @@ ConfigDao.getConfigFileHistoryList = async (id, curPage, pageSize) => {
         order : [
             ['id','desc']
         ],
-        attributes : ['id','config_id','reason','content','posttime'],
         where : {
             configId  :   id
         }

app/service/config/ConfigService.js

@@ -184,7 +184,14 @@ ConfigService.getNodeConfigFile = async(params) => {
         set_area:params.set_area,
         set_group:params.set_group
     });
-    let servers = await ServerDao.getServerConf(params.application, params.server_name, enableSet, params.set_name, params.set_area, params.set_group);
+    let servers = await ServerDao.getServerConf({
+        params:params.application,
+        serverName:params.server_name,
+        enableSet:enableSet,
+        setName:params.set_name,
+        setArea:params.set_area,
+        setGroup:params.set_group
+    });
     let list = [];
     nodeConfigFile.filter( config => {
         return config.filename = configFile.filename;
@@ -270,7 +277,28 @@ ConfigService.deleteConfigRef = async(reference_id) => {
  * @return {*[]}
  */
 ConfigService.getConfigRefByConfigId = async(config_id) => {
-    return await ConfigDao.getConfigRefByConfigId(config_id);
+    let list = await ConfigDao.getConfigRefByConfigId(config_id);
+    let refList = [];
+    list.forEach(configFile => {
+        let obj = {
+            id :    configFile.reference_id,
+            config_id : configFile.config_id,
+            reference : {
+                id : configFile.t_config_file.id,
+                server_name : configFile.t_config_file.server_name,
+                node_name   : configFile.t_config_file.host,
+                set_name    : configFile.t_config_file.set_name,
+                set_area    : configFile.t_config_file.set_area,
+                set_group   : configFile.t_config_file.set_group,
+                filename    : configFile.t_config_file.filename,
+                config      : configFile.t_config_file.config,
+                level       : configFile.t_config_file.level,
+                posttime    : formatToStr(new Date(configFile.t_config_file.posttime), 'yyyy-mm-dd hh:mm:ss')
+            }
+        };
+        refList.push(obj);
+    });
+    return refList;
 };
 
 /**
@@ -324,7 +352,14 @@ function addDefaultNodeConfigFile(params) {
     const addConfigFileByFileName = async function () {
         const [application, serverName] = params.server_name.split('.');
         const enableSet = params.set_name && params.set_area && params.set_group;
-        const servers = await ServerDao.getServerConf(application, serverName, enableSet, params.set_name, params.set_area, params.set_group);
+        const servers = await ServerDao.getServerConf({
+            application :   application,
+            serverName  :   serverName,
+            enableSet   :   enableSet,
+            setName     :   params.set_name,
+            setArea     :   params.set_area,
+            setGroup    :   params.set_group
+        });
         for(let i=0,len=servers.length;i<len;i++) {
             let server = servers[i];
             let newRow = Object.assign({},{