gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修改用户行为统计的接口版本号。

Browse Source 
2.修改app policy下发配置时增加自定义域config_id=compileId.
3.增加流量日志菜单字典
This commit is contained in:
zhangwei
2018-12-29 14:53:57 +06:00
parent 3274affd75
commit 12dce602f1
7 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java
View File

@@ -34,6 +34,7 @@ import com.nis.domain.log.BaseLogEntity;
import com.nis.domain.maat.LogRecvData; import com.nis.domain.maat.LogRecvData;
import com.nis.domain.report.NtcAsnRecord; import com.nis.domain.report.NtcAsnRecord;
import com.nis.domain.report.NtcIpRangeReport; import com.nis.domain.report.NtcIpRangeReport;
import com.nis.util.Configurations;
import com.nis.util.Constants; import com.nis.util.Constants;
import com.nis.util.DateUtils; import com.nis.util.DateUtils;
import com.nis.util.StringUtil; import com.nis.util.StringUtil;
@@ -69,7 +70,7 @@ public class TrafficStatisticsReportController extends BaseController {
if ("3".endsWith(searchBusinessType)) { if ("3".endsWith(searchBusinessType)) {
model.addAttribute("searchBusinessType", 3);// IP查询 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 statTime = bean.getSearchFoundStartTime();
String endTime = bean.getSearchFoundEndTime(); String endTime = bean.getSearchFoundEndTime();
String account = bean.getAccount(); String account = bean.getAccount();
@@ -221,7 +222,7 @@ public class TrafficStatisticsReportController extends BaseController {
if ("3".endsWith(searchBusinessType)) { if ("3".endsWith(searchBusinessType)) {
model.addAttribute("searchBusinessType", 3);// IP查询 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 statTime = bean.getSearchFoundStartTime();
String endTime = bean.getSearchFoundEndTime(); String endTime = bean.getSearchFoundEndTime();
String account = bean.getAccount(); String account = bean.getAccount();

2
src/main/java/com/nis/web/service/configuration/AppCfgService.java
View File

@@ -1025,7 +1025,7 @@ public class AppCfgService extends BaseService {
if(StringUtil.isEmpty(entity.getUserRegion4())){ if(StringUtil.isEmpty(entity.getUserRegion4())){
userRegion+=Constants.USER_REGION_SPLIT +Constants.APP_VIGNORE_USER_REGION_KEY+"=1"; userRegion+=Constants.USER_REGION_SPLIT +Constants.APP_VIGNORE_USER_REGION_KEY+"=1";
} }
userRegion+=Constants.USER_REGION_SPLIT+"config_id="+entity.getCompileId();
maatCfg.setUserRegion(userRegion); maatCfg.setUserRegion(userRegion);
configCompileList.add(maatCfg); configCompileList.add(maatCfg);
maatBean.setConfigCompileList(configCompileList); maatBean.setConfigCompileList(configCompileList);

3
src/main/resources/messages/message_en.properties
View File

@@ -1434,4 +1434,5 @@ max_length=Maximum Length
min_length=Minimum Length min_length=Minimum Length
length_error=Length Error length_error=Length Error
duplicate=Duplicate duplicate=Duplicate
print=Print print=Print
traffic_connect_log=Traffic Log

3
src/main/resources/messages/message_ru.properties
View File

@@ -1438,4 +1438,5 @@ max_length=Maximum Length
min_length=Minimum Length min_length=Minimum Length
length_error=Length Error length_error=Length Error
duplicate=Duplicate duplicate=Duplicate
print=Print print=Print
traffic_connect_log=\u041B\u043E\u0433 \u0422\u0440\u0430\u0444\u0438\u043A\u0430

3
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1434,4 +1434,5 @@ max_length=\u6700\u5927\u957f\u5ea6
min_length=\u6700\u5c0f\u957f\u5ea6 min_length=\u6700\u5c0f\u957f\u5ea6
length_error=\u957f\u5ea6\u9519\u8bef length_error=\u957f\u5ea6\u9519\u8bef
duplicate=\u91cd\u590d\u7684 duplicate=\u91cd\u590d\u7684
print=\u6253\u5370 print=\u6253\u5370
traffic_connect_log=\u9646\u826F\u65E5\u5FD7

13
src/main/resources/nis.properties
View File

@@ -219,14 +219,14 @@ clusterBStartTime=1503504000725
isCommit=true 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 maatCfg=configSources
fileUploadCfg=fileUploadSources fileUploadCfg=fileUploadSources
callbackCfg=commonSources callbackCfg=commonSources
fileDigestCfg=fileDigestSources fileDigestCfg=fileDigestSources
configIdSources=configPzIdSources configIdSources=configPzIdSources
#logBaseUrl=http://10.0.6.242:8080/galaxy-service/service/log/v1/ #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 ntcPzReport=ntcPzReport
ntcServiceReport=ntcServiceReport ntcServiceReport=ntcServiceReport
ntcTagReport=ntcTagReport ntcTagReport=ntcTagReport
@@ -273,7 +273,7 @@ logServiceTopn=logServiceTopn
blockAndDropStat=blockAndDropStat blockAndDropStat=blockAndDropStat
######################################## ########################################
#\u5927\u5c4f\u56fe\u8868\u5c55\u793a\u670d\u52a1\u63a5\u53e3 #\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 trafficIpActive=trafficIpActive
trafficProtocol=trafficProtocol trafficProtocol=trafficProtocol
trafficApp=trafficApp trafficApp=trafficApp
@@ -568,7 +568,7 @@ userPasswordSet=UserPasswordSet
userDelete=UserDelete userDelete=UserDelete
userGet=UserGet userGet=UserGet
userList=UserList 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 ipNumGet=IpNumGet
allIpGet=AllIpGet allIpGet=AllIpGet
#\u6d41\u91cf\u7edf\u8ba1\u5e26\u5bbd\u8be6\u60c5 #\u6d41\u91cf\u7edf\u8ba1\u5e26\u5bbd\u8be6\u60c5
@@ -580,7 +580,7 @@ trafficBandwidthTrans=trafficBandwidthTrans
trafficProtocolList=trafficProtocolList trafficProtocolList=trafficProtocolList
trafficAppList=trafficAppList trafficAppList=trafficAppList
ntcActionEntranceReport=ntcActionEntranceReport ntcActionEntranceReport=ntcActionEntranceReport
redis.host=192.168.10.192:6379 redis.host=10.0.4.2:6379
redis.expire=1800 redis.expire=1800
redis.timeout=10000 redis.timeout=10000
dns_spoofing_ip_desc=Default Spoofing IP dns_spoofing_ip_desc=Default Spoofing IP
@@ -608,4 +608,5 @@ trendTotalReport=trendTotalReport
#\u4e8b\u4ef6\u76d1\u6d4b/\u5c01\u5835 #\u4e8b\u4ef6\u76d1\u6d4b/\u5c01\u5835
ntcEventsMonitorOrBlock=ntcEventsMonitorOrBlock ntcEventsMonitorOrBlock=ntcEventsMonitorOrBlock
#\u91cd\u70b9\u4fdd\u969c\u4e8b\u4ef6 #\u91cd\u70b9\u4fdd\u969c\u4e8b\u4ef6
ntcEventKeyProtection=ntcEventKeyProtection ntcEventKeyProtection=ntcEventKeyProtection
dashboardUrlV2=http://10.0.7.14:9999/galaxy-service/service/log/v2/

1
src/main/resources/service/service_config.xml
View File

@@ -304,6 +304,7 @@
<userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion> <userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion>
<userRegion regionKey="BEHAV_ID" regionColumn="behavCode" userRegionPosition="1"></userRegion> <userRegion regionKey="BEHAV_ID" regionColumn="behavCode" userRegionPosition="1"></userRegion>
<userRegion regionKey="Droprate" regionColumn="userRegion2" userRegionPosition="1"></userRegion> <userRegion regionKey="Droprate" regionColumn="userRegion2" userRegionPosition="1"></userRegion>
<userRegion regionKey="config_id" regionColumn="compileId" userRegionPosition="0"></userRegion>
</service> </service>
<service id="1028" functionId="405" serviceType="1" cfgType="1" tableName="app_ip_cfg" className="AppIpCfg" desc="APP IP特征"> <service id="1028" functionId="405" serviceType="1" cfgType="1" tableName="app_ip_cfg" className="AppIpCfg" desc="APP IP特征">
<userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion> <userRegion regionKey="APP_ID" regionColumn="appCode" userRegionPosition="1"></userRegion>