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

更新时间json修改

Browse Source
This commit is contained in:
duandongmei
2018-06-22 10:04:25 +08:00
parent 5f401d6f1f
commit ea2599ea67
1 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/nis/web/service/BaseService.java
View File

@@ -20,17 +20,20 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonPrimitive; import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer; import com.google.gson.JsonSerializer;
import com.google.gson.annotations.Expose;
import com.googlecode.ipv6.IPv6Address; import com.googlecode.ipv6.IPv6Address;
import com.googlecode.ipv6.IPv6Network; import com.googlecode.ipv6.IPv6Network;
import com.nis.domain.SysRole; import com.nis.domain.SysRole;
import com.nis.domain.SysUser; import com.nis.domain.SysUser;
import com.nis.domain.callback.InlineIp; import com.nis.domain.callback.InlineIp;
import com.nis.domain.callback.NtcDnsResStrategy;
import com.nis.domain.configuration.AreaBean; import com.nis.domain.configuration.AreaBean;
import com.nis.domain.configuration.AreaIpCfg; import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.BaseCfg; import com.nis.domain.configuration.BaseCfg;
import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.ComplexkeywordCfg; import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.configuration.DnsResStrategy;
import com.nis.domain.configuration.HttpBodyCfg; import com.nis.domain.configuration.HttpBodyCfg;
import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.maat.MaatCfg.GroupCfg; import com.nis.domain.maat.MaatCfg.GroupCfg;
@@ -254,8 +257,8 @@ public abstract class BaseService {
@Override @Override
public JsonElement serialize(Date src, Type type, public JsonElement serialize(Date src, Type type,
JsonSerializationContext context) { JsonSerializationContext context) {
String format = "yyyy-MM-dd'T'HH:mm:ss.SSS"; String format = "yyyy-MM-dd HH:mm:ss";
long time= ((Date) src).getTime()-Constants.TIME_ZONE*60*60*1000; long time= ((Date) src).getTime();
SimpleDateFormat sdf = new SimpleDateFormat(format); SimpleDateFormat sdf = new SimpleDateFormat(format);
return new JsonPrimitive(sdf.format(time)); return new JsonPrimitive(sdf.format(time));
} }
@@ -500,6 +503,31 @@ public abstract class BaseService {
return dstIp; return dstIp;
} }
//ip转换为callback用ip //ip转换为callback用ip
public NtcDnsResStrategy convertCallBackDnsResStrategy(DnsResStrategy cfg){
NtcDnsResStrategy resStrategy=new NtcDnsResStrategy();
resStrategy.setId(Long.valueOf(cfg.getCompileId()));
resStrategy.setCfgId(cfg.getCompileId());
resStrategy.setReqStrateId(cfg.getCfgId());
resStrategy.setStrateName(cfg.getCfgDesc());
resStrategy.setAction(cfg.getAction());
resStrategy.setService(cfg.getServiceId());
resStrategy.setResGroup1Id(cfg.getServiceId());
resStrategy.setResGroup1Num(cfg.getServiceId());
resStrategy.setResGroup2Id(cfg.getServiceId());
resStrategy.setResGroup2Num(cfg.getServiceId());
resStrategy.setResGroup3Id(cfg.getServiceId());
resStrategy.setResGroup3Num(cfg.getServiceId());
resStrategy.setResGroup4Id(cfg.getServiceId());
resStrategy.setResGroup4Num(cfg.getServiceId());
resStrategy.setResGroup5Id(cfg.getServiceId());
resStrategy.setResGroup5Num(cfg.getServiceId());
resStrategy.setMinTtl(cfg.getServiceId());
resStrategy.setMaxTtl(cfg.getServiceId());
resStrategy.setIsValid(cfg.getIsValid());
resStrategy.setOpTime(cfg.getAuditTime());
return resStrategy;
}
//ip转换为callback用ip
public InlineIp convertCallBackIp(BaseIpCfg cfg){ public InlineIp convertCallBackIp(BaseIpCfg cfg){
IpCfg c=ipConvert(new IpCfg(),cfg); IpCfg c=ipConvert(new IpCfg(),cfg);
InlineIp ip=new InlineIp(); InlineIp ip=new InlineIp();