冲突解决

This commit is contained in:
duandongmei
2019-04-02 18:19:48 +08:00
parent fc302fe984
commit 4880832028

View File

@@ -599,7 +599,7 @@ trafficWebsiteListNoTime=v1/trafficWebsiteListNoTime
trafficTopicList=v1/trafficTopicList
trafficDomainTrans=v1/trafficDomainTrans
#maximum number to import
import_limit=10000
import_limit=20000
trafficPortActiveFiveMinute=v1/trafficPortActiveFiveMinute
trendTotalReport=v1/trendTotalReport
#\u4e8b\u4ef6\u76d1\u6d4b/\u5c01\u5835
@@ -621,4 +621,6 @@ ntcHttpRecordLog=v1/ntcHttpRecordLogs
trafficAppPpsTrend=v1/trafficAppPpsTrend
trafficAppBpsTrend=v1/trafficAppBpsTrend
#vpn cgi error info
cgiError=cannot connect to vpnserver,Connection to the server has failed,Specified object can not be found,Too many users,User already exists,Too many created users,The destination server is not a VPN server,The connection has been interrupted,
cgiError=cannot connect to vpnserver,Connection to the server has failed,Specified object can not be found,Too many users,User already exists,Too many created users,The destination server is not a VPN server,The connection has been interrupted,
#\u83b7\u53d6\u670d\u52a1\u914d\u7f6e\u603b\u91cf\u63a5\u53e3
getConfigByService=v1/getConfigByService