diff --git a/api/.vscode/launch.json b/api/.vscode/launch.json index 8fa8e17..ee22b5e 100644 --- a/api/.vscode/launch.json +++ b/api/.vscode/launch.json @@ -30,9 +30,9 @@ "--qndmn http://rhvqdivo5.hn-bkt.clouddn.com", "--clickHouseUrl http://10.8.30.71", "--clickHousePort 30123", - "--clickHouseAnxincloudDB anxinyun", - "--clickHousePepEmisDB anxinyun", - "--clickHouseProjectManageDB anxinyun", + "--clickHouseAnxincloud anxinyun", + "--clickHousePepEmis ssanxinyun1", + "--clickHouseProjectManage anxinyun2", ] }, { diff --git a/api/config.js b/api/config.js index a20a86b..47ebc35 100644 --- a/api/config.js +++ b/api/config.js @@ -33,9 +33,9 @@ args.option('qndmn', 'qiniuDomain'); // clickHouse args.option('clickHouseUrl', 'clickHouse Url'); args.option('clickHousePort', 'clickHouse Port'); -args.option('clickHouseAnxincloudDB', 'clickHouse 安心云数据库名称'); -args.option('clickHousePepEmisDB', 'clickHouse 项企数据库名称'); -args.option('clickHouseProjectManageDB', 'clickHouse 项目管理数据库名称'); +args.option('clickHouseAnxincloud', 'clickHouse 安心云数据库名称'); +args.option('clickHousePepEmis', 'clickHouse 项企数据库名称'); +args.option('clickHouseProjectManage', 'clickHouse 项目管理数据库名称'); const flags = args.parse(process.argv); @@ -68,9 +68,9 @@ const QINIU_SK = process.env.ANXINCLOUD_QINIU_SECRETKEY || flags.qnsk; // clickHouse const CLICKHOUST_URL = process.env.CLICKHOUST_URL || flags.clickHouseUrl const CLICKHOUST_PORT = process.env.CLICKHOUST_PORT || flags.clickHousePort -const CLICKHOUST_ANXINCLOUD_DB = process.env.CLICKHOUST_ANXINCLOUD_DB || flags.clickHouseAnxincloudDB -const CLICKHOUST_PEP_EMIS_DB = process.env.CLICKHOUST_PEP_EMIS_DB || flags.clickHousePepEmisDB -const CLICKHOUST_PROJECT_MANAGE_DB = process.env.CLICKHOUST_PROJECT_MANAGE_DB || flags.clickHouseProjectManageDB +const CLICKHOUST_ANXINCLOUD = process.env.CLICKHOUST_ANXINCLOUD || flags.clickHouseAnxincloud +const CLICKHOUST_PEP_EMIS = process.env.CLICKHOUST_PEP_EMIS || flags.clickHousePepEmis +const CLICKHOUST_PROJECT_MANAGE = process.env.CLICKHOUST_PROJECT_MANAGE || flags.clickHouseProjectManage if ( !POMS_DB || @@ -78,8 +78,15 @@ if ( !GOD_KEY || !API_ANXINYUN_URL || !API_EMIS_URL || - !QINIU_DOMAIN_QNDMN_RESOURCE || !QINIU_BUCKET_RESOURCE || !QINIU_AK || !QINIU_SK || - !CLICKHOUST_URL || !CLICKHOUST_PORT || !CLICKHOUST_ANXINCLOUD_DB || !CLICKHOUST_PEP_EMIS_DB || !CLICKHOUST_PROJECT_MANAGE_DB + !QINIU_DOMAIN_QNDMN_RESOURCE || !QINIU_BUCKET_RESOURCE || !QINIU_AK || !QINIU_SK + || + !CLICKHOUST_URL + || + !CLICKHOUST_PORT || + !CLICKHOUST_ANXINCLOUD || + !CLICKHOUST_PEP_EMIS + || + !CLICKHOUST_PROJECT_MANAGE ) { console.log('缺少启动参数,异常退出'); args.showHelp();