From 12dce602f14bbcc6548f5d98097321b62a7bd43b Mon Sep 17 00:00:00 2001 From: zhangwei Date: Sat, 29 Dec 2018 14:53:57 +0600 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E8=A1=8C?= =?UTF-8?q?=E4=B8=BA=E7=BB=9F=E8=AE=A1=E7=9A=84=E6=8E=A5=E5=8F=A3=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E3=80=82=202.=E4=BF=AE=E6=94=B9app=20policy?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E9=85=8D=E7=BD=AE=E6=97=B6=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=9F=9Fconfig=5Fid=3DcompileId.=20?= =?UTF-8?q?3.=E5=A2=9E=E5=8A=A0=E6=B5=81=E9=87=8F=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrafficStatisticsReportController.java | 5 +++-- .../web/service/configuration/AppCfgService.java | 2 +- src/main/resources/messages/message_en.properties | 3 ++- src/main/resources/messages/message_ru.properties | 3 ++- .../resources/messages/message_zh_CN.properties | 3 ++- src/main/resources/nis.properties | 13 +++++++------ src/main/resources/service/service_config.xml | 1 + 7 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java index fcdf92466..2ea116e9f 100644 --- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java +++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java @@ -34,6 +34,7 @@ import com.nis.domain.log.BaseLogEntity; import com.nis.domain.maat.LogRecvData; import com.nis.domain.report.NtcAsnRecord; import com.nis.domain.report.NtcIpRangeReport; +import com.nis.util.Configurations; import com.nis.util.Constants; import com.nis.util.DateUtils; import com.nis.util.StringUtil; @@ -69,7 +70,7 @@ public class TrafficStatisticsReportController extends BaseController { if ("3".endsWith(searchBusinessType)) { model.addAttribute("searchBusinessType", 3);// IP查询 } - String url = Constants.DASHBOARD_URL + Constants.NTC_RADIUS_REPORT; + String url = Configurations.getStringProperty("dashboardUrlV2","dashboardUrlV2") + Constants.NTC_RADIUS_REPORT; String statTime = bean.getSearchFoundStartTime(); String endTime = bean.getSearchFoundEndTime(); String account = bean.getAccount(); @@ -221,7 +222,7 @@ public class TrafficStatisticsReportController extends BaseController { if ("3".endsWith(searchBusinessType)) { model.addAttribute("searchBusinessType", 3);// IP查询 } - String url = Constants.DASHBOARD_URL + Constants.NTC_RADIUS_REPORT; + String url = Configurations.getStringProperty("dashboardUrlV2","dashboardUrlV2")+ Constants.NTC_RADIUS_REPORT; String statTime = bean.getSearchFoundStartTime(); String endTime = bean.getSearchFoundEndTime(); String account = bean.getAccount(); diff --git a/src/main/java/com/nis/web/service/configuration/AppCfgService.java b/src/main/java/com/nis/web/service/configuration/AppCfgService.java index 543ddaee9..32d8d0b49 100644 --- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java @@ -1025,7 +1025,7 @@ public class AppCfgService extends BaseService { if(StringUtil.isEmpty(entity.getUserRegion4())){ userRegion+=Constants.USER_REGION_SPLIT +Constants.APP_VIGNORE_USER_REGION_KEY+"=1"; } - + userRegion+=Constants.USER_REGION_SPLIT+"config_id="+entity.getCompileId(); maatCfg.setUserRegion(userRegion); configCompileList.add(maatCfg); maatBean.setConfigCompileList(configCompileList); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 0f21fa468..92f369ada 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1434,4 +1434,5 @@ max_length=Maximum Length min_length=Minimum Length length_error=Length Error duplicate=Duplicate -print=Print \ No newline at end of file +print=Print +traffic_connect_log=Traffic Log \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index ca57c9641..cb611cd04 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1438,4 +1438,5 @@ max_length=Maximum Length min_length=Minimum Length length_error=Length Error duplicate=Duplicate -print=Print \ No newline at end of file +print=Print +traffic_connect_log=\u041B\u043E\u0433 \u0422\u0440\u0430\u0444\u0438\u043A\u0430 \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 0420f41c7..b91733406 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1434,4 +1434,5 @@ max_length=\u6700\u5927\u957f\u5ea6 min_length=\u6700\u5c0f\u957f\u5ea6 length_error=\u957f\u5ea6\u9519\u8bef duplicate=\u91cd\u590d\u7684 -print=\u6253\u5370 \ No newline at end of file +print=\u6253\u5370 +traffic_connect_log=\u9646\u826F\u65E5\u5FD7 \ No newline at end of file diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 526c280c6..04e37ebf4 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -219,14 +219,14 @@ clusterBStartTime=1503504000725 isCommit=true ############################################################################################################################################ ############################################################################################################################################ -httpUrl=http://192.168.10.204:9999/galaxy-service/service/cfg/v1/ +httpUrl=http://10.0.7.14:9999/galaxy-service/service/cfg/v1/ maatCfg=configSources fileUploadCfg=fileUploadSources callbackCfg=commonSources fileDigestCfg=fileDigestSources configIdSources=configPzIdSources #logBaseUrl=http://10.0.6.242:8080/galaxy-service/service/log/v1/ -logBaseUrl=http://192.168.10.204:9999/galaxy-service/service/log/v1/ +logBaseUrl=http://10.0.7.14:9999/galaxy-service/service/log/v1/ ntcPzReport=ntcPzReport ntcServiceReport=ntcServiceReport ntcTagReport=ntcTagReport @@ -273,7 +273,7 @@ logServiceTopn=logServiceTopn blockAndDropStat=blockAndDropStat ######################################## #\u5927\u5c4f\u56fe\u8868\u5c55\u793a\u670d\u52a1\u63a5\u53e3 -dashboardUrl=http://192.168.10.204:9999/galaxy-service/service/log/v1/ +dashboardUrl=http://10.0.7.14:9999/galaxy-service/service/log/v1/ trafficIpActive=trafficIpActive trafficProtocol=trafficProtocol trafficApp=trafficApp @@ -568,7 +568,7 @@ userPasswordSet=UserPasswordSet userDelete=UserDelete userGet=UserGet userList=UserList -ip_reuse_call_cgi_url=http://192.168.11.137:8090/command +ip_reuse_call_cgi_url=http://10.4.10.32:8090/command ipNumGet=IpNumGet allIpGet=AllIpGet #\u6d41\u91cf\u7edf\u8ba1\u5e26\u5bbd\u8be6\u60c5 @@ -580,7 +580,7 @@ trafficBandwidthTrans=trafficBandwidthTrans trafficProtocolList=trafficProtocolList trafficAppList=trafficAppList ntcActionEntranceReport=ntcActionEntranceReport -redis.host=192.168.10.192:6379 +redis.host=10.0.4.2:6379 redis.expire=1800 redis.timeout=10000 dns_spoofing_ip_desc=Default Spoofing IP @@ -608,4 +608,5 @@ trendTotalReport=trendTotalReport #\u4e8b\u4ef6\u76d1\u6d4b/\u5c01\u5835 ntcEventsMonitorOrBlock=ntcEventsMonitorOrBlock #\u91cd\u70b9\u4fdd\u969c\u4e8b\u4ef6 -ntcEventKeyProtection=ntcEventKeyProtection \ No newline at end of file +ntcEventKeyProtection=ntcEventKeyProtection +dashboardUrlV2=http://10.0.7.14:9999/galaxy-service/service/log/v2/ \ No newline at end of file diff --git a/src/main/resources/service/service_config.xml b/src/main/resources/service/service_config.xml index 7765259a9..aed738777 100644 --- a/src/main/resources/service/service_config.xml +++ b/src/main/resources/service/service_config.xml @@ -304,6 +304,7 @@ +