From 94d8039798daae48625b26f2f333e48a7de6a94d Mon Sep 17 00:00:00 2001 From: sunYanxl Date: Tue, 14 Aug 2018 15:45:15 +0800 Subject: [PATCH] fix(ccfinder): solve conflict --- bin/tsw/runtime/CCFinder.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/tsw/runtime/CCFinder.js b/bin/tsw/runtime/CCFinder.js index a86818cd..0b142371 100644 --- a/bin/tsw/runtime/CCFinder.js +++ b/bin/tsw/runtime/CCFinder.js @@ -242,7 +242,7 @@ this.check = function (req, res) { + `

${lang.__('mail.serverIP')}:${serverInfo.intranetIp}

` + `

${lang.__('mail.maliciousIP')}:

` + blackIPListText - + `

${lang.__('mail.autoIntoBlackList')}:` + (config.CCIPLimitAutoBlock ? `${'mail.yes'}` : `${'mail.no'}`) + '

' + + `

${lang.__('mail.autoIntoBlackList')}:` + (config.CCIPLimitAutoBlock ? `${lang.__('mail.yes')}` : `${lang.__('mail.no')}`) + '

' + `

${lang.__('mail.IPAggregationDegree')}:${cache.ipCacheLast.StdX10}%

` + `

${lang.__('mail.warningThreshold')}:${CCIPLimit}

` + `

${lang.__('mail.normalValue')}:5-50

`