From d4812427e0af8eba6b13868a95fcad24ff8b9312 Mon Sep 17 00:00:00 2001 From: liuqiwei <30173268@qq.com> Date: Mon, 30 Nov 2020 09:11:58 +0800 Subject: [PATCH] * edit the ip table order --- .../java/jndc/example/config_file/config.yml | 24 +++++++++++-------- .../java/web/mapping/ServerManageMapping.java | 4 ++-- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/main/java/jndc/example/config_file/config.yml b/src/main/java/jndc/example/config_file/config.yml index be09286f..a9f8d5ab 100644 --- a/src/main/java/jndc/example/config_file/config.yml +++ b/src/main/java/jndc/example/config_file/config.yml @@ -1,6 +1,7 @@ # ------------------------------------------------------general config line------------------------------------------------------ # general config -secrete: "jndc" # 服务端密钥，很重要务必在使用前更改 +secrete: "xxx" # 服务端密钥，很重要务必在使用前更改 +loglevel: "info" # ------------------------------------------------------server config line------------------------------------------------------ @@ -11,11 +12,14 @@ serverConfig: - "192.168.1.1" whiteList: # 白名单 # - "192.168.1.2" - frontProjectPath: '/usr/local/web_resource/' #管理端项目地址 + frontProjectPath: 'D:\xxx\xxx\compare_dist' #管理端项目地址 deployFrontProject: true # 是否扫描部署前端项目（管理端）,false则不会启动前端项目，但web接口仍旧会启动 - loginName: "jndc" - loginPassWord: "jndc" - managementApiPort: "82" #管理api端口 + loginName: "xxx" + loginPassWord: "xxx" + useSsl: true + keyStoreFile: 'C:\Users\xxx\Desktop\xxx.cn\Tomcat\xxx.cn.jks' + keystorePass: 'xxx' + managementApiPort: "443" #管理api端口 adminPort: "81" # jndc服务端运行监听端口 bindIp: "0.0.0.0" # jndc服务端运行ip @@ -25,14 +29,14 @@ serverConfig: # 客户端配置 clientConfig: - serverIp: "123.207.114.245" # 服务端运行监听ip + serverIp: "127.0.0.1" # 服务端运行监听ip serverPort: "81" # 服务端运行端口 clientServiceDescriptions: # 注册服务 - - serviceName: "remote desk" # 服务名称 - serviceIp: "192.168.216.131" # 服务连接ip - servicePort: "3389" # 服务监听端口 - serviceEnable: false # 服务是否可用 - serviceName: "mysql" serviceIp: "127.0.0.1" servicePort: "3306" serviceEnable: true + - serviceName: "echo" + serviceIp: "127.0.0.1" + servicePort: "888" + serviceEnable: true diff --git a/src/main/java/web/mapping/ServerManageMapping.java b/src/main/java/web/mapping/ServerManageMapping.java index c7265acb..4857bbae 100644 --- a/src/main/java/web/mapping/ServerManageMapping.java +++ b/src/main/java/web/mapping/ServerManageMapping.java @@ -593,7 +593,7 @@ public Object releaseRecord(JNDCHttpRequest jndcHttpRequest) { String s = new String(body); PageDTO pageDTO = JSONUtils.str2Object(s, PageDTO.class); DBWrapper dbWrapper = DBWrapper.getDBWrapper(IpFilterRecord.class); - PageResult ipFilterRecordPageResult = dbWrapper.customQueryByPage("select ip,max(timeStamp) timeStamp,sum(vCount) vCount from ip_filter_record where recordType=0 GROUP BY ip", pageDTO.getPage(), pageDTO.getRows()); + PageResult ipFilterRecordPageResult = dbWrapper.customQueryByPage("select ip,max(timeStamp) timeStamp,sum(vCount) vCount from ip_filter_record where recordType=0 GROUP BY ip order by timeStamp desc", pageDTO.getPage(), pageDTO.getRows()); List ipRecordVOS = new ArrayList<>(); ipFilterRecordPageResult.getData().forEach(x->{ IpRecordVO ipRecordVO = new IpRecordVO(); @@ -627,7 +627,7 @@ public Object blockRecord(JNDCHttpRequest jndcHttpRequest) { PageDTO pageDTO = JSONUtils.str2Object(s, PageDTO.class); DBWrapper dbWrapper = DBWrapper.getDBWrapper(IpFilterRecord.class); - PageResult ipFilterRecordPageResult = dbWrapper.customQueryByPage("select ip,max(timeStamp) timeStamp,sum(vCount) vCount from ip_filter_record where recordType=1 GROUP BY ip", pageDTO.getPage(), pageDTO.getRows()); + PageResult ipFilterRecordPageResult = dbWrapper.customQueryByPage("select ip,max(timeStamp) timeStamp,sum(vCount) vCount from ip_filter_record where recordType=1 GROUP BY ip order by timeStamp desc", pageDTO.getPage(), pageDTO.getRows()); List ipRecordVOS = new ArrayList<>(); ipFilterRecordPageResult.getData().forEach(x->{ IpRecordVO ipRecordVO = new IpRecordVO();