From 15e3468f497b776022cdd9ee71dda81193e4114a Mon Sep 17 00:00:00 2001 From: CaiHQ Date: Thu, 30 Jun 2022 10:59:49 +0800 Subject: [PATCH] prun testinput --- .gitignore | 2 +- testinput/debugconf-shanxiproxy.json | 16 ---- testinput/deploy/auditproxy.json.template | 18 ----- testinput/deploy/auditproxyfiles.json | 46 ----------- testinput/deploy/commonvar.json | 25 ------ testinput/deploy/controlproxy.json.template | 16 ---- testinput/deploy/controlproxyfiles.json | 38 ---------- testinput/deploy/router.json.template | 19 ----- testinput/deploy/router/GlobalRouter-023.json | 19 ----- testinput/deploy/routerfiles.json | 76 ------------------- testinput/deployentry.json | 28 ------- testinput/deployrouter.json | 7 -- testinput/generateAllConf.json | 27 ------- 13 files changed, 1 insertion(+), 336 deletions(-) delete mode 100644 testinput/debugconf-shanxiproxy.json delete mode 100644 testinput/deploy/auditproxy.json.template delete mode 100644 testinput/deploy/auditproxyfiles.json delete mode 100644 testinput/deploy/commonvar.json delete mode 100644 testinput/deploy/controlproxy.json.template delete mode 100644 testinput/deploy/controlproxyfiles.json delete mode 100644 testinput/deploy/router.json.template delete mode 100644 testinput/deploy/router/GlobalRouter-023.json delete mode 100644 testinput/deploy/routerfiles.json delete mode 100644 testinput/deployentry.json delete mode 100644 testinput/deployrouter.json delete mode 100644 testinput/generateAllConf.json diff --git a/.gitignore b/.gitignore index db8dff7..1a3632e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ deployconfig.json .DS_Store /build/ -testinput \ No newline at end of file +/testinput/ \ No newline at end of file diff --git a/testinput/debugconf-shanxiproxy.json b/testinput/debugconf-shanxiproxy.json deleted file mode 100644 index 21e0042..0000000 --- a/testinput/debugconf-shanxiproxy.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "agentAddress": "39.104.208.223:18010", - "ypkPath": "/Users/huaqiancai/BDWare/datanet/shanxiproxy/backend/build/ShanxiProxy-1.5.5.ypk", - "publicKey": "04303718771b9323c204e607639f14469f9a94e55b0964a408ad3b3864b0493b645d7070da0d550f0c54b934275a8e88dedc3024467b0566db5c1108b1baeaae27", - "privateKey": "d675782acf011dbc01a73c7967ccff9564486f7c3a9f5d5de151caffaa18936", - "killBeforeStart": "ShanxiProxy", - "cpHost": "192.168.0.3", - "asDebug": true, - "createParam": { - "routerURI": "tcp://39.104.208.223:18041", - "repoId": "shanxi.taiyuan.xiaodian/XDMK", - "repoName": "XD煤矿", - "privateKey": "42b21cdc001943c74e78dc3af2d66f4c857ab682fcd31c802d57d98e31670d95", - "publicKey": "040548bba7741e091129400ce355c4d706d0072fa51e414b05302a9a93fbcae78fd1d2d15b9e0ab1239b14b7ab9c1178991f8597e515cd0c41faaed5d017be1be8" - } -} \ No newline at end of file diff --git a/testinput/deploy/auditproxy.json.template b/testinput/deploy/auditproxy.json.template deleted file mode 100644 index c793fe0..0000000 --- a/testinput/deploy/auditproxy.json.template +++ /dev/null @@ -1,18 +0,0 @@ -{ - "agentAddress": "_HOST_:18010", - "privateKey": "d675782acf011dbc01a73c7967ccff9564486f7c3a9f5d5de151caffaa18936", - "publicKey": "04303718771b9323c204e607639f14469f9a94e55b0964a408ad3b3864b0493b645d7070da0d550f0c54b934275a8e88dedc3024467b0566db5c1108b1baeaae27", - "ypkPath": "_AUDIT_PROXY_YPK_", - "killBeforeStart": "AutoAudit", - "createParam": { - "privateKey": "d675782acf011dbc01a73c7967ccff9564486f7c3a9f5d5de151caffaa18936", - "publicKey": "04303718771b9323c204e607639f14469f9a94e55b0964a408ad3b3864b0493b645d7070da0d550f0c54b934275a8e88dedc3024467b0566db5c1108b1baeaae27", - "repoName": "AuditProxy", - "auditURI": "tcp://_HOST_:18051", - "grafanaUrl": "jdbc:postgresql://iodlog.demo.internetapi.cn:5432/iodlog?useServerPrepStmts=true", - "grafanaUserName": "iodlog", - "grafanaPassword": "iodlog1107", - "grafanaServicePort": 18055, - "aceiServicePort": 18053 - } -} \ No newline at end of file diff --git a/testinput/deploy/auditproxyfiles.json b/testinput/deploy/auditproxyfiles.json deleted file mode 100644 index ddb14ba..0000000 --- a/testinput/deploy/auditproxyfiles.json +++ /dev/null @@ -1,46 +0,0 @@ -[ - { - "fileName": "./auditproxy/AuditProxy_shanxi.json", - "_HOST_": "_IP0_" - }, - { - "fileName": "./auditproxy/AuditProxy_sx_ty.json", - "_HOST_": "_IP1_" - }, - { - "fileName": "./auditproxy/AuditProxy_sx_dt.json", - "_HOST_": "_IP2_" - }, - { - "fileName": "./auditproxy/AuditProxy_sx_ty_xd.json", - "_HOST_": "_IP3_" - }, - { - "fileName": "./auditproxy/AuditProxy_sx_ty_yz.json", - "_HOST_": "_IP4_" - }, - { - "fileName": "./auditproxy/AuditProxy_sx_dt_yg.json", - "_HOST_": "_IP5_" - }, - { - "fileName": "./auditproxy/AuditProxy_sx_dt_yz.json", - "_HOST_": "_IP6_" - }, - { - "fileName": "./auditproxy/AuditProxy_njust.json", - "_HOST_": "_IP7_" - }, - { - "fileName": "./auditproxy/AuditProxy_bit.json", - "_HOST_": "_IP8_" - }, - { - "fileName": "./auditproxy/AuditProxy_mpi.json", - "_HOST_": "_IP9_" - }, - { - "fileName": "./auditproxy/AuditProxy_weixing.json", - "_HOST_": "_IP12_" - } -] \ No newline at end of file diff --git a/testinput/deploy/commonvar.json b/testinput/deploy/commonvar.json deleted file mode 100644 index 3099638..0000000 --- a/testinput/deploy/commonvar.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "_CONTROL_PROXY_YPK_": "/Users/huaqiancai/BDWare/datanet/ControlProxy/backend/build/ControlProxy-1.2.0.ypk", - "_AUDIT_PROXY_YPK_": "./datanet-pack/ypk/AuditProxy-1.0.6.ypk", - "_RRouter_YPK_": "/Users/huaqiancai/BDWare/datanet/datanet-router-bunndle/datanet-router-backend/build/Router-1.6.0.ypk", - "_GRouter_YPK_": "/Users/huaqiancai/BDWare/datanet/datanet-router-bunndle/datanet-router-backend/build/GlobalRouter-1.6.0.ypk", - "_CTROUTER_": "Router", - "___山西___": "", - "_IP0_": "39.104.201.40", - "_IP1_": "39.104.208.148", - "_IP2_": "39.104.201.243", - "_IP3_": "39.104.208.223", - "_IP4_": "39.104.200.95", - "_IP5_": "39.104.202.247", - "_IP6_": "39.104.209.178", - "___工业___": "", - "_IP7_": "39.104.209.15", - "_IP8_": "39.104.207.76", - "___药监___": "", - "_IP9_": "39.104.204.44", - "_IP10_": "39.104.209.158", - "_IP11_": "39.104.208.114", - "___卫星___": "", - "_IP12_": "39.104.205.122", - "_IP13_": "39.104.200.8" -} \ No newline at end of file diff --git a/testinput/deploy/controlproxy.json.template b/testinput/deploy/controlproxy.json.template deleted file mode 100644 index 8fa9fc7..0000000 --- a/testinput/deploy/controlproxy.json.template +++ /dev/null @@ -1,16 +0,0 @@ -{ - "host": "_HOST_", - "privateKey": "d675782acf011dbc01a73c7967ccff9564486f7c3a9f5d5de151caffaa18936", - "publicKey": "04303718771b9323c204e607639f14469f9a94e55b0964a408ad3b3864b0493b645d7070da0d550f0c54b934275a8e88dedc3024467b0566db5c1108b1baeaae27", - "ypkPath": "_CONTROL_PROXY_YPK_", - "killBeforeStart": "ControlProxy", - "createParam": { - "privateKey": "4616ff0e2a4f982364914f9be30b51c6bc6ccb6602114a9ee8792f2ccf67465b", - "publicKey": "04f9b9b8f324908464f78a6235e2dd93e4dfdaf045e9b1b5cfd57374516cc61a79a86fc2b42d3321a5b49a0f25381a7bed61901b40b729f72354e716673d551e98", - "prefix": "_PREFIX_", - "router": "_CTROUTER_", - "routerURI": "tcp://_HOST_:18041", - "auditType": "OnlyHash" - }, - "agentPort": 18010 -} \ No newline at end of file diff --git a/testinput/deploy/controlproxyfiles.json b/testinput/deploy/controlproxyfiles.json deleted file mode 100644 index 6413212..0000000 --- a/testinput/deploy/controlproxyfiles.json +++ /dev/null @@ -1,38 +0,0 @@ -[ - { - "fileName": "./controlproxy/CP_shanxi.json", - "_HOST_": "_IP0_", - "_PREFIX_": "shanxi", - "_CTROUTER_": "GlobalRouter" - }, - { - "fileName": "./controlproxy/CP_sx_ty.json", - "_HOST_": "_IP1_", - "_PREFIX_": "shanxi.taiyuan" - }, - { - "fileName": "./controlproxy/CP_sx_dt.json", - "_HOST_": "_IP2_", - "_PREFIX_": "shanxi.datong" - }, - { - "fileName": "./controlproxy/CP_sx_ty_xd.json", - "_HOST_": "_IP3_", - "_PREFIX_": "shanxi.taiyuan.xiaodian" - }, - { - "fileName": "./controlproxy/CP_sx_ty_yj.json", - "_HOST_": "_IP4_", - "_PREFIX_": "shanxi.taiyuan.yingze" - }, - { - "fileName": "./controlproxy/CP_sx_dt_yg.json", - "_HOST_": "_IP5_", - "_PREFIX_": "shanxi.datong.yungang" - }, - { - "fileName": "./controlproxy/CP_sx_dt_yz.json", - "_HOST_": "_IP6_", - "_PREFIX_": "shanxi.datong.yunzhou" - } -] \ No newline at end of file diff --git a/testinput/deploy/router.json.template b/testinput/deploy/router.json.template deleted file mode 100644 index 55b77b1..0000000 --- a/testinput/deploy/router.json.template +++ /dev/null @@ -1,19 +0,0 @@ -{ - "agentAddress": "_HOST_:18010", - "privateKey": "d675782acf011dbc01a73c7967ccff9564486f7c3a9f5d5de151caffaa18936", - "publicKey": "04303718771b9323c204e607639f14469f9a94e55b0964a408ad3b3864b0493b645d7070da0d550f0c54b934275a8e88dedc3024467b0566db5c1108b1baeaae27", - "ypkPath": "_RRouter_YPK_", - "killBeforeStart": "_CTROUTER_", - "createParam": { - "auditProxyAddress": "tcp://_HOST_:18051", - "controlProxyAddress": "ws://_HOST_:18010", - "repositoryAddress": "tcp://_HOST_:18031", - "name": "_ROUTERNAME_", - "publicKey": "04303718771b9323c204e607639f14469f9a94e55b0964a408ad3b3864b0493b645d7070da0d550f0c54b934275a8e88dedc3024467b0566db5c1108b1baeaae27", - "privateKey":"d675782acf011dbc01a73c7967ccff9564486f7c3a9f5d5de151caffaa18936", - "doId": "_PREFIX_", - "routerAddress": "tcp://_HOST_:18041", - "upperRouterAddress": "tcp://_HOST2_:18041", - "scheme":"irp" - } -} \ No newline at end of file diff --git a/testinput/deploy/router/GlobalRouter-023.json b/testinput/deploy/router/GlobalRouter-023.json deleted file mode 100644 index b7eb208..0000000 --- a/testinput/deploy/router/GlobalRouter-023.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "agentAddress": "023.node.internetapi.cn:21130", - "privateKey": "e85ce2f4d8882ff343d32ce42adde91d09e29c321452dd4ef9f07ebe76d1c6a5", - "publicKey": "04da01345770b7e09d4774bf6c0395399b18814aa0b7b158f64b634b8f3d628d9964af6523835225af11e467271f4969d67bf90b32eaa09f517c79b2d1f9b8a926", - "ypkPath": "/Users/huaqiancai/BDWare/datanet/datanet-router-bunndle/datanet-router-backend/build/GlobalRouter-1.6.0.ypk", - "killBeforeStart": "GlobalRouter", - "createParam": { - "auditProxyAddress": "tcp://39.104.204.44:18051", - "controlProxyAddress": "ws://39.104.209.15:21130", - "repositoryAddress": "tcp://39.104.204.44:18031", - "name": "数瑞测试网", - "publicKey": "04303718771b9323c204e607639f14469f9a94e55b0964a408ad3b3864b0493b645d7070da0d550f0c54b934275a8e88dedc3024467b0566db5c1108b1baeaae27", - "privateKey": "d675782acf011dbc01a73c7967ccff9564486f7c3a9f5d5de151caffaa18936", - "doId": "bdtest", - "routerAddress": "tcp://39.104.209.15:21162", - "upperRouterAddress": "tcp://_HOST2_:18041", - "scheme": "irp" - } -} \ No newline at end of file diff --git a/testinput/deploy/routerfiles.json b/testinput/deploy/routerfiles.json deleted file mode 100644 index fba2c04..0000000 --- a/testinput/deploy/routerfiles.json +++ /dev/null @@ -1,76 +0,0 @@ -[ - { - "fileName": "./router/GlobalRouter-sx.json", - "_HOST_": "_IP0_", - "_PREFIX_": "shanxi", - "_CTROUTER_": "GlobalRouter", - "_ROUTERNAME_": "山西能源数联网", - "_RRouter_YPK_": "_GRouter_YPK_" - }, - { - "fileName": "./router/Router_ty.json", - "_HOST_": "_IP1_", - "_HOST2_": "_IP0_", - "_PREFIX_": "shanxi.taiyuan", - "_ROUTERNAME_": "山西太原节点" - }, - { - "fileName": "./router/Router_dt.json", - "_HOST_": "_IP2_", - "_HOST2_": "_IP0_", - "_PREFIX_": "shanxi.datong", - "_ROUTERNAME_": "山西大同节点" - }, - { - "fileName": "./router/Router_ty_xd.json", - "_HOST_": "_IP3_", - "_HOST2_": "_IP1_", - "_PREFIX_": "shanxi.taiyuan.xiaodian", - "_ROUTERNAME_": "太原小店区节点" - }, - { - "fileName": "./router/Router_ty_yz.json", - "_HOST_": "_IP4_", - "_HOST2_": "_IP1_", - "_PREFIX_": "shanxi.taiyuan.yingze", - "_ROUTERNAME_": "太原迎泽区节点" - }, - { - "fileName": "./router/Router_dt_yg.json", - "_HOST_": "_IP5_", - "_HOST2_": "_IP2_", - "_PREFIX_": "shanxi.datong.yungang", - "_ROUTERNAME_": "大同云岗区节点" - }, - { - "fileName": "./router/Router_dt_yz.json", - "_HOST_": "_IP6_", - "_HOST2_": "_IP2_", - "_PREFIX_": "shanxi.datong.yunzhou", - "_ROUTERNAME_": "大同云州区节点" - }, - { - "fileName": "./router/GlobalRouter-njust.json", - "_HOST_": "_IP7_", - "_PREFIX_": "njust", - "_CTROUTER_": "GlobalRouter", - "_ROUTERNAME_": "5G工业数联网", - "_RRouter_YPK_": "_GRouter_YPK_" - }, - { - "fileName": "./router/GlobalRouter-mpi.json", - "_HOST_": "_IP9_", - "_PREFIX_": "mpi", - "_CTROUTER_": "GlobalRouter", - "_ROUTERNAME_": "药监数联网", - "_RRouter_YPK_": "_GRouter_YPK_" - }, - { - "fileName": "./router/GlobalRouter-wx.json", - "_HOST_": "_IP12_", - "_PREFIX_": "wx", - "_CTROUTER_": "GlobalRouter", - "_ROUTERNAME_": "卫星数联网", - "_RRouter_YPK_": "_GRouter_YPK_" - } -] \ No newline at end of file diff --git a/testinput/deployentry.json b/testinput/deployentry.json deleted file mode 100644 index d624abd..0000000 --- a/testinput/deployentry.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "generateTasks": [ - { - "isBatch": true, - "dir": "./testinput/deploy", - "template": "controlproxy.json.template", - "commvar": "commonvar.json", - "files": "controlproxyfiles.json" - }, - { - "isBatch": true, - "dir": "./testinput/deploy", - "template": "router.json.template", - "commvar": "commonvar.json", - "files": "routerfiles.json" - }, - { - "isBatch": true, - "dir": "./testinput/deploy", - "template": "auditproxy.json.template", - "commvar": "commonvar.json", - "files": "auditproxyfiles.json" - } - ], - "deployTasks": [ - "./testinput/deploy/controlproxy2/" - ] -} \ No newline at end of file diff --git a/testinput/deployrouter.json b/testinput/deployrouter.json deleted file mode 100644 index 1285d08..0000000 --- a/testinput/deployrouter.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "generateTasks": [ - ], - "deployTasks": [ - "./testinput/deploy/router/GlobalRouter-wx.json" - ] -} \ No newline at end of file diff --git a/testinput/generateAllConf.json b/testinput/generateAllConf.json deleted file mode 100644 index c9b9a87..0000000 --- a/testinput/generateAllConf.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "generateTasks": [ - { - "isBatch": true, - "dir": "./testinput/deploy", - "template": "controlproxy.json.template", - "commvar": "commonvar.json", - "files": "controlproxyfiles.json" - }, - { - "isBatch": true, - "dir": "./testinput/deploy", - "template": "router.json.template", - "commvar": "commonvar.json", - "files": "routerfiles.json" - }, - { - "isBatch": true, - "dir": "./testinput/deploy", - "template": "auditproxy.json.template", - "commvar": "commonvar.json", - "files": "auditproxyfiles.json" - } - ], - "deployTasks": [ - ] -} \ No newline at end of file