diff --git a/.classpath b/.classpath index 4adf262..6aa45c2 100644 --- a/.classpath +++ b/.classpath @@ -28,10 +28,6 @@ - - - - - + diff --git a/.settings/.gitignore b/.settings/.gitignore new file mode 100644 index 0000000..f6cca2f --- /dev/null +++ b/.settings/.gitignore @@ -0,0 +1,2 @@ +/org.eclipse.wst.common.component +/org.eclipse.core.resources.prefs diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 966d51c..bdfeb46 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,6 +1,8 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 +encoding//src/main/resources/applicationConfig-rule.properties=UTF-8 encoding//src/main/resources/b.txt=UTF-8 +encoding//src/main/resources/fastdfs-client.properties=UTF-8 encoding//src/main/resources/jdbc.properties=UTF-8 encoding//src/main/resources/log4j.properties=UTF-8 encoding//src/main/resources/matt.properties=UTF-8 @@ -13,4 +15,3 @@ encoding//src/main/webapp/WEB-INF/tlds/fns.tld=UTF-8 encoding//src/main/webapp/WEB-INF/views/letter/process/errorView.jsp=UTF-8 encoding//src/main/webapp/static/common/jeesite.css=UTF-8 encoding//src/test/java=UTF-8 -encoding/=UTF-8 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 7350c94..833f7d1 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,12 +1,10 @@ - + - - - + diff --git a/pom.xml b/pom.xml index 850ac1b..10f28ba 100644 --- a/pom.xml +++ b/pom.xml @@ -14,9 +14,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 war - galaxy - com.nis.springmvc - galaxy + galaxy-service + com.nis.galaxy + galaxy-service 0.0.1-SNAPSHOT @@ -30,7 +30,7 @@ nexus Team Nexus Repository - http://10.0.6.30:8044/content/groups/public + http://192.168.10.125:8099/content/groups/public @@ -562,7 +562,7 @@ org.csource fastdfs-client-java - 1.27-SNAPSHOT + 1.27 diff --git a/src/main/java/com/nis/domain/restful/NmsDiRule.java b/src/main/java/com/nis/domain/restful/NmsDiRule.java new file mode 100644 index 0000000..4882051 --- /dev/null +++ b/src/main/java/com/nis/domain/restful/NmsDiRule.java @@ -0,0 +1,190 @@ +package com.nis.domain.restful; + +import java.io.Serializable; +import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.wordnik.swagger.annotations.ApiModelProperty; + +public class NmsDiRule implements Serializable { + + private static final long serialVersionUID = 1L; + @JsonIgnore + private long id; + private long detectionInfoId; + private long serviceIndex; + private long serviceCode; + private String serviceDesc; + private long agedTime; + private String clientNum; + private String refluxPort; + private String ruleNumber; + private String usedRuleNum; + private String leftRuleNum; + private String hitTotalNum; + private String detectionedState; + private long seqId; + private long detectionSetInfoId; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "dataCheckTime", notes = "") + private Date dataCheckTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "dataArriveTime", notes = "") + private Date dataArriveTime; + private long dataCheckTimeDigital; + private long dataArriveTimeDigital; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public long getDetectionInfoId() { + return detectionInfoId; + } + + public void setDetectionInfoId(long detectionInfoId) { + this.detectionInfoId = detectionInfoId; + } + + public long getServiceIndex() { + return serviceIndex; + } + + public void setServiceIndex(long serviceIndex) { + this.serviceIndex = serviceIndex; + } + + public long getServiceCode() { + return serviceCode; + } + + public void setServiceCode(long serviceCode) { + this.serviceCode = serviceCode; + } + + public String getServiceDesc() { + return serviceDesc; + } + + public void setServiceDesc(String serviceDesc) { + this.serviceDesc = serviceDesc; + } + + public long getAgedTime() { + return agedTime; + } + + public void setAgedTime(long agedTime) { + this.agedTime = agedTime; + } + + public String getClientNum() { + return clientNum; + } + + public void setClientNum(String clientNum) { + this.clientNum = clientNum; + } + + public String getRefluxPort() { + return refluxPort; + } + + public void setRefluxPort(String refluxPort) { + this.refluxPort = refluxPort; + } + + public String getRuleNumber() { + return ruleNumber; + } + + public void setRuleNumber(String ruleNumber) { + this.ruleNumber = ruleNumber; + } + + public String getUsedRuleNum() { + return usedRuleNum; + } + + public void setUsedRuleNum(String usedRuleNum) { + this.usedRuleNum = usedRuleNum; + } + + public String getLeftRuleNum() { + return leftRuleNum; + } + + public void setLeftRuleNum(String leftRuleNum) { + this.leftRuleNum = leftRuleNum; + } + + public String getHitTotalNum() { + return hitTotalNum; + } + + public void setHitTotalNum(String hitTotalNum) { + this.hitTotalNum = hitTotalNum; + } + + public String getDetectionedState() { + return detectionedState; + } + + public void setDetectionedState(String detectionedState) { + this.detectionedState = detectionedState; + } + + public long getSeqId() { + return seqId; + } + + public void setSeqId(long seqId) { + this.seqId = seqId; + } + + public long getDetectionSetInfoId() { + return detectionSetInfoId; + } + + public void setDetectionSetInfoId(long detectionSetInfoId) { + this.detectionSetInfoId = detectionSetInfoId; + } + + public Date getDataCheckTime() { + return dataCheckTime; + } + + public void setDataCheckTime(Date dataCheckTime) { + this.dataCheckTime = dataCheckTime; + } + + public Date getDataArriveTime() { + return dataArriveTime; + } + + public void setDataArriveTime(Date dataArriveTime) { + this.dataArriveTime = dataArriveTime; + } + + public long getDataCheckTimeDigital() { + return dataCheckTimeDigital; + } + + public void setDataCheckTimeDigital(long dataCheckTimeDigital) { + this.dataCheckTimeDigital = dataCheckTimeDigital; + } + + public long getDataArriveTimeDigital() { + return dataArriveTimeDigital; + } + + public void setDataArriveTimeDigital(long dataArriveTimeDigital) { + this.dataArriveTimeDigital = dataArriveTimeDigital; + } + +} diff --git a/src/main/java/com/nis/domain/restful/NmsDiRuleList.java b/src/main/java/com/nis/domain/restful/NmsDiRuleList.java new file mode 100644 index 0000000..3f2c7a7 --- /dev/null +++ b/src/main/java/com/nis/domain/restful/NmsDiRuleList.java @@ -0,0 +1,19 @@ +package com.nis.domain.restful; + +import java.io.Serializable; +import java.util.List; + +public class NmsDiRuleList implements Serializable { + + private static final long serialVersionUID = 1L; + private List nmsDiRuleList; + + public List getNmsDiRuleList() { + return nmsDiRuleList; + } + + public void setNmsDiRuleList(List nmsDiRuleList) { + this.nmsDiRuleList = nmsDiRuleList; + } + +} diff --git a/src/main/java/com/nis/domain/restful/TrafficNetflowPortInfo.java b/src/main/java/com/nis/domain/restful/TrafficNetflowPortInfo.java new file mode 100644 index 0000000..d78dc32 --- /dev/null +++ b/src/main/java/com/nis/domain/restful/TrafficNetflowPortInfo.java @@ -0,0 +1,108 @@ +package com.nis.domain.restful; + +import java.io.Serializable; +import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.wordnik.swagger.annotations.ApiModelProperty; + +public class TrafficNetflowPortInfo implements Serializable { + + private static final long serialVersionUID = 1L; + @JsonIgnore + private long stat_id; + private long port; + private String nodeName; + private String nodeIp; + private String portDesc; + private long bandwidth; + private long inoctets; + private long outoctets; + private long inoctetsSpeed; + private long outoctetsSpeed; + private long inpktsSpeed; + private long outpktsSpeed; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "dataArriveTime", notes = "") + private Date recvTime; + public long getStat_id() { + return stat_id; + } + public void setStat_id(long stat_id) { + this.stat_id = stat_id; + } + public long getPort() { + return port; + } + public void setPort(long port) { + this.port = port; + } + public String getNodeName() { + return nodeName; + } + public void setNodeName(String nodeName) { + this.nodeName = nodeName; + } + public String getNodeIp() { + return nodeIp; + } + public void setNodeIp(String nodeIp) { + this.nodeIp = nodeIp; + } + public String getPortDesc() { + return portDesc; + } + public void setPortDesc(String portDesc) { + this.portDesc = portDesc; + } + public long getBandwidth() { + return bandwidth; + } + public void setBandwidth(long bandwidth) { + this.bandwidth = bandwidth; + } + public long getInoctets() { + return inoctets; + } + public void setInoctets(long inoctets) { + this.inoctets = inoctets; + } + public long getOutoctets() { + return outoctets; + } + public void setOutoctets(long outoctets) { + this.outoctets = outoctets; + } + public long getInoctetsSpeed() { + return inoctetsSpeed; + } + public void setInoctetsSpeed(long inoctetsSpeed) { + this.inoctetsSpeed = inoctetsSpeed; + } + public long getOutoctetsSpeed() { + return outoctetsSpeed; + } + public void setOutoctetsSpeed(long outoctetsSpeed) { + this.outoctetsSpeed = outoctetsSpeed; + } + public long getInpktsSpeed() { + return inpktsSpeed; + } + public void setInpktsSpeed(long inpktsSpeed) { + this.inpktsSpeed = inpktsSpeed; + } + public long getOutpktsSpeed() { + return outpktsSpeed; + } + public void setOutpktsSpeed(long outpktsSpeed) { + this.outpktsSpeed = outpktsSpeed; + } + public Date getRecvTime() { + return recvTime; + } + public void setRecvTime(Date recvTime) { + this.recvTime = recvTime; + } + +} diff --git a/src/main/java/com/nis/domain/restful/TrafficNetflowPortInfoList.java b/src/main/java/com/nis/domain/restful/TrafficNetflowPortInfoList.java new file mode 100644 index 0000000..f10ac22 --- /dev/null +++ b/src/main/java/com/nis/domain/restful/TrafficNetflowPortInfoList.java @@ -0,0 +1,19 @@ +package com.nis.domain.restful; + +import java.io.Serializable; +import java.util.List; + +public class TrafficNetflowPortInfoList implements Serializable { + + private static final long serialVersionUID = 1L; + private List trafficNetflowPortInfoList; + + public List getTrafficNetflowPortInfoList() { + return trafficNetflowPortInfoList; + } + + public void setTrafficNetflowPortInfoList(List trafficNetflowPortInfoList) { + this.trafficNetflowPortInfoList = trafficNetflowPortInfoList; + } + +} diff --git a/src/main/java/com/nis/restful/RestBusinessCode.java b/src/main/java/com/nis/restful/RestBusinessCode.java index 3f2c39e..fb41663 100644 --- a/src/main/java/com/nis/restful/RestBusinessCode.java +++ b/src/main/java/com/nis/restful/RestBusinessCode.java @@ -620,6 +620,15 @@ public enum RestBusinessCode { * Redis关联关系库中未找到配置对应的redisdb信息 */ RedisDBRelationNotExistsInRedis(5003005,"Redis关联关系库中未找到配置对应的redisdb信息"), + /** + * 保存文件到redis发生了异常 + */ + SaveFileToRedisError(5003006,"保存文件到redis发生了异常"), + + + + + /** * Map中缺少编译配置信息 diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index 4257cbb..5d5f45c 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -203,5 +203,8 @@ public final class Constants { * 样例文件存放目录 */ public static final String MM_SAMPLE_DST_PATH = Configurations.getStringProperty("mmSampleDstPath", "/home/mesasoft/{tableType}/full/{fileName}"); - + /** + *是否使用Minio + */ + public static final Boolean IS_USE_MINIO = Configurations.getBooleanProperty("isUseMinio", true); } diff --git a/src/main/java/com/nis/util/File2Redis.java b/src/main/java/com/nis/util/File2Redis.java new file mode 100644 index 0000000..4732bf5 --- /dev/null +++ b/src/main/java/com/nis/util/File2Redis.java @@ -0,0 +1,50 @@ +package com.nis.util; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.HttpURLConnection; +import java.net.URL; + +import com.nis.restful.RestBusinessCode; +import com.nis.restful.ServiceRuntimeException; + +import redis.clients.jedis.Transaction; + +public class File2Redis { + private static String fileProtocol = Configurations.getStringProperty("fileProtocol", "minio://"); + + public static String file2Redis(String url, Transaction transaction) { + try { + byte[] fileByte = downLoadFromUrl(url); + String md5 = MD5Utils.getMd5ByIS(new ByteArrayInputStream(fileByte)); + String key = "__FILE_" + md5; + transaction.set(key.getBytes(), fileByte); + return fileProtocol + key; + } catch (Exception e) { + throw new ServiceRuntimeException("保存文件到redis发生了异常:" + e.getMessage(), + RestBusinessCode.SaveFileToRedisError.getValue()); + } + } + + public static byte[] downLoadFromUrl(String urlStr) throws IOException { + URL url = new URL(urlStr); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + // 设置超时间为30秒 + conn.setConnectTimeout(3 * 10000); + // 防止屏蔽程序抓取而返回403错误 + conn.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)"); + // 得到输入流 + InputStream inputStream = conn.getInputStream(); + ByteArrayOutputStream baosOutputStream = new ByteArrayOutputStream(); + byte[] buffer = new byte[1024]; + int len; + while ((len = inputStream.read(buffer)) > -1) { + baosOutputStream.write(buffer, 0, len); + } + baosOutputStream.flush(); + return baosOutputStream.toByteArray(); + } + +} diff --git a/src/main/java/com/nis/util/MD5Utils.java b/src/main/java/com/nis/util/MD5Utils.java index ce925d9..9a58bb4 100644 --- a/src/main/java/com/nis/util/MD5Utils.java +++ b/src/main/java/com/nis/util/MD5Utils.java @@ -3,81 +3,95 @@ */ package com.nis.util; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.UnsupportedEncodingException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.util.List; -import java.util.Locale; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.lang3.StringEscapeUtils; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; -import org.springframework.web.servlet.LocaleResolver; - -import com.ckfinder.connector.ServletContextFactory; -import com.google.common.collect.Lists; -import com.nis.web.service.SpringContextHolder; +import org.apache.commons.codec.digest.DigestUtils; /** * 字符串工具类, 继承org.apache.commons.lang3.StringUtils类 * @author ThinkGem * @version 2013-05-22 */ -public class MD5Utils{ - +public class MD5Utils { + /** * 字符串转为MD532位小写 * @param plain * @return */ - public static String md5LowerCase(String plain) throws Exception{ + public static String md5LowerCase(String plain) throws Exception { String re_md5 = new String(); - MessageDigest md = MessageDigest.getInstance("MD5"); - md.update(plain.getBytes()); - byte b[] = md.digest(); - - int i; - - StringBuffer buf = new StringBuffer(""); - for (int offset = 0; offset < b.length; offset++) { + MessageDigest md = MessageDigest.getInstance("MD5"); + md.update(plain.getBytes()); + byte b[] = md.digest(); + + int i; + + StringBuffer buf = new StringBuffer(""); + for (int offset = 0; offset < b.length; offset++) { i = b[offset]; if (i < 0) - i += 256; + i += 256; if (i < 16) - buf.append("0"); + buf.append("0"); buf.append(Integer.toHexString(i)); - } - - re_md5 = buf.toString(); - return re_md5; } - public static byte[] createChecksum(String filename) throws IOException, NoSuchAlgorithmException{ - InputStream fis=new FileInputStream(filename); - byte[] buffer=new byte[1024]; - MessageDigest complete=MessageDigest.getInstance("MD5"); + + re_md5 = buf.toString(); + return re_md5; + } + + public static byte[] createChecksum(String filename) throws IOException, NoSuchAlgorithmException { + InputStream fis = new FileInputStream(filename); + byte[] buffer = new byte[1024]; + MessageDigest complete = MessageDigest.getInstance("MD5"); int numRead; - do{ - numRead=fis.read(buffer); - if(numRead>0){ - complete.update(buffer,0,numRead); + do { + numRead = fis.read(buffer); + if (numRead > 0) { + complete.update(buffer, 0, numRead); } - }while(numRead!=-1); + } while (numRead != -1); fis.close(); return complete.digest(); } - public static String getMD5Checksum(String filename) throws NoSuchAlgorithmException, IOException{ - byte[] b=createChecksum(filename); - StringBuffer result=new StringBuffer(); - for(int i=0;i saveNmsDiRule(@RequestBody NmsDiRuleList nmsDiRuleList, HttpServletRequest request, + HttpServletResponse response) { + long start = System.currentTimeMillis(); + AuditLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_POST, request, + nmsDiRuleList); + try { + if (nmsDiRuleList != null && nmsDiRuleList.getNmsDiRuleList() != null + && nmsDiRuleList.getNmsDiRuleList().size() > 0) { + nmsDiRuleService.saveNmsDiRuleInfo(nmsDiRuleList.getNmsDiRuleList()); + } else { + throw new RestServiceException(thread, System.currentTimeMillis() - start, "参数nmsDiRuleList不能为空", + RestBusinessCode.missing_args.getValue()); + } + } catch (Exception e) { + throw new RestServiceException(thread, System.currentTimeMillis() - start, + "上报NmsDiRule信息异常:" + e.getMessage(), RestBusinessCode.unknow_error.getValue()); + } + return compileServiceResponse(thread, System.currentTimeMillis() - start, request, response, "上报NmsDiRule信息成功", + Constants.IS_DEBUG ? nmsDiRuleList : null); + } + + @RequestMapping(value = "/nms/v1/rafficNetflowPortInfo", method = RequestMethod.POST) + @ApiOperation(value = "存储trafficNetflowPortInfo接口", httpMethod = "POST", response = Map.class, notes = "接收NMS系统上报的trafficNetflowPort信息") + @ApiParam(value = "存储trafficNetflowPortInfo接口", name = "saveTrafficNetflowPortInfo", required = true) + public Map saveTrafficNetflowPortInfo( + @RequestBody TrafficNetflowPortInfoList trafficNetflowPortInfoList, HttpServletRequest request, + HttpServletResponse response) { + long start = System.currentTimeMillis(); + AuditLogThread thread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_POST, request, + trafficNetflowPortInfoList); + try { + if (trafficNetflowPortInfoList != null && trafficNetflowPortInfoList.getTrafficNetflowPortInfoList() != null + && trafficNetflowPortInfoList.getTrafficNetflowPortInfoList().size() > 0) { + trafficNetflowPortInfoService + .saveTrafficNetflowPortInfo(trafficNetflowPortInfoList.getTrafficNetflowPortInfoList()); + } else { + throw new RestServiceException(thread, System.currentTimeMillis() - start, + "参数trafficNetflowPortInfoList不能为空", RestBusinessCode.missing_args.getValue()); + } + + } catch (Exception e) { + throw new RestServiceException(thread, System.currentTimeMillis() - start, + "上报trafficNetflowPort信息异常:" + e.getMessage(), RestBusinessCode.unknow_error.getValue()); + } + return compileServiceResponse(thread, System.currentTimeMillis() - start, request, response, + "上报trafficNetflowPort信息成功", Constants.IS_DEBUG ? trafficNetflowPortInfoList : null); + } + } diff --git a/src/main/java/com/nis/web/dao/NmsDiRuleDao.java b/src/main/java/com/nis/web/dao/NmsDiRuleDao.java new file mode 100644 index 0000000..a63d4dc --- /dev/null +++ b/src/main/java/com/nis/web/dao/NmsDiRuleDao.java @@ -0,0 +1,7 @@ +package com.nis.web.dao; + +import com.nis.domain.restful.NmsDiRule; + +@MyBatisDao +public interface NmsDiRuleDao extends CrudDao { +} \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/NmsDiRuleDao.xml b/src/main/java/com/nis/web/dao/NmsDiRuleDao.xml new file mode 100644 index 0000000..ad4e1c8 --- /dev/null +++ b/src/main/java/com/nis/web/dao/NmsDiRuleDao.xml @@ -0,0 +1,44 @@ + + + + + INSERT INTO + nms_di_rule(detection_info_id , + serviceindex , + servicecode , + servicedesc, + agedtime , + clientnum , + refluxport , + rulenumber , + usedrulenum , + leftrulenum , + hittotalnum , + detectioned_state , + seq_id , + detection_set_info_id , + data_check_time , + data_arrive_time , + data_check_time_digital , + data_arrive_time_digital + ) VALUES ( + #{detectionInfoId}, + #{serviceIndex}, + #{serviceCode}, + #{serviceDesc}, + #{agedTime}, + #{clientNum}, + #{refluxPort}, + #{ruleNumber}, + #{usedRuleNum}, + #{leftRuleNum}, + #{hitTotalNum}, + #{detectionedState}, + #{seqId}, + #{detectionSetInfoId}, + #{dataCheckTime}, + #{dataArriveTime}, + #{dataCheckTimeDigital}, + #{dataArriveTimeDigital}) + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/TrafficNetflowPortInfoDao.java b/src/main/java/com/nis/web/dao/TrafficNetflowPortInfoDao.java new file mode 100644 index 0000000..e32286c --- /dev/null +++ b/src/main/java/com/nis/web/dao/TrafficNetflowPortInfoDao.java @@ -0,0 +1,7 @@ +package com.nis.web.dao; + +import com.nis.domain.restful.TrafficNetflowPortInfo; + +@MyBatisDao +public interface TrafficNetflowPortInfoDao extends CrudDao { +} \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/TrafficNetflowPortInfoDao.xml b/src/main/java/com/nis/web/dao/TrafficNetflowPortInfoDao.xml new file mode 100644 index 0000000..362b2e9 --- /dev/null +++ b/src/main/java/com/nis/web/dao/TrafficNetflowPortInfoDao.xml @@ -0,0 +1,32 @@ + + + + + INSERT INTO + traffic_netflow_port_info(PORT , + NODE_NAME , + NODE_IP , + PORT_DESC, + BANDWIDTH , + INOCTETS , + OUTOCTETS , + INOCTETS_SPEED , + OUTOCTETS_SPEED , + INPKTS_SPEED , + OUTPKTS_SPEED , + RECV_TIME + ) VALUES ( + #{port}, + #{nodeName}, + #{nodeIp}, + #{portDesc}, + #{bandwidth}, + #{inoctets}, + #{outoctets}, + #{inoctetsSpeed}, + #{outoctetsSpeed}, + #{inpktsSpeed}, + #{outpktsSpeed}, + #{recvTime}) + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java b/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java index c5013a1..f64e4a2 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java +++ b/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java @@ -21,6 +21,7 @@ import com.nis.domain.restful.MaatConfig; import com.nis.restful.RestBusinessCode; import com.nis.restful.ServiceRuntimeException; import com.nis.util.Configurations; +import com.nis.util.File2Redis; import com.nis.util.JedisUtils; import com.nis.util.ReadMaatXmlUtil; import com.nis.util.ServiceAndRDBIndexReal; @@ -89,10 +90,38 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { } StringBuffer valBF = new StringBuffer(); String[] valSplit = maatXmlExpr.getValueExpression().split(";"); + // List urlList = new ArrayList(); for (String valStr : valSplit) { if (!StringUtils.isEmpty(valStr) && valStr.trim().startsWith("[")) { valStr = valStr.trim().replace("[", "").replace("]", ""); - valBF.append(map.get(valStr)); + // if (service == 520) { + // if (valStr.equals("private_key_file") + // || valStr.equals("public_key_file")) { + // String fileUrl = map.get(valStr); + // urlList.add(fileUrl); + // } + // } + // if(valStr.equals("op_time")) { + // if (urlList.size() > 0) { + // for (String fileUrl : urlList) { + // String key = File2Redis.file2Redis(fileUrl, transaction); + // logger.info("向{}号redis数据库添加了一条文件配置,key是{}",redisDBIndex,key); + // valBF.append(key); + // valBF.append("\t"); + // } + // } + // } + + if (valStr.contains("redisFile_")) { + String key = File2Redis.file2Redis(map.get(valStr), + transaction); + logger.info("向{}号redis数据库添加了一条文件配置,key是{}", redisDBIndex, + key); + valBF.append(key); + // valBF.append("\t"); + } else { + valBF.append(map.get(valStr)); + } } else if (valStr.equals(" ")) { valBF.append(" "); } else if (valStr.equals("\\t")) {// xml中是字符串的\t这里判断的时候需要转义为\\t,但是添加的时候需要添加\t不是\\t @@ -161,7 +190,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { } /** - * 下发配置时,需要记录编译,组,域等配置id的对应关系,以便于在取消配置时可以根据配置id查找对应的编译,分组,域的关系 + * 下发配置时,需要记录编译,组,域等配置id的对应关系,以便于在取消配置时可以根据配置id查找对应的编译,分组,域的关系 */ private void addMaatRelation(Map> configMap, Transaction transaction) { if (configMap != null && configMap.size() > 0) { @@ -260,6 +289,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { * 单独找一个redis-db记录配置信息,方便实时统计程序获取所有配置的分类性质,标签等内容,(为什么实时统计不从配置库redisdb获取呢, * 因为配置有多分发的情况,会发送到不同的redisdb,每个redisdb的配置条数不一定相同,有的配置所有的redisdb都有,有的只在某一个redisdb中有,实时统计程序不好获取配置这些配置内容, * 最重要的是,前端机不需要这些属性,所以在配置库有可能不带分类性质,标签等属性,maat.xml如果配置了则有,没有配置则就没有这些属性.所以单独找一个reidsdb存放带分类性质,标签等属性的配置) + * * @param configMap */ private void addStatisticsReal(Map> configMap, Transaction transaction) { @@ -270,7 +300,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { && redisStatisticsRealDBIndex < Configurations.getIntProperty("maxRedisDBIndex", 16)) { List list = configMap.get(redisDBIndex); if (list != null && list.size() > 0) { - transaction.select(redisStatisticsRealDBIndex);//选择实时统计库 + transaction.select(redisStatisticsRealDBIndex);// 选择实时统计库 String redisStatisticsReal = Configurations.getStringProperty("redis-statisticsReal", "[COMPILE_ID];\t;[SERVICE];\t;[ACTION];\t;[CONT_TYPE];\t;[ATTR_TYPE];\t;[CONT_LABEL];\t;[TASK_ID];\t;[AFFAIR_ID];\t;[DO_BLACKLIST];\t;[DO_LOG];\t;[EFFECTIVE_RANGE];\t;[START_TIME];\t;[END_TIME];\t;[USER_REGION];\t;[IS_VALID];\t;[GROUP_NUM];\t;[FATHER_CFG_ID];\t;[OP_TIME]"); String[] redisStatisticsRealArr = redisStatisticsReal.split(";"); @@ -379,6 +409,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { /** * 封装组id与域id对应关系并添加到对象中 + * * @param regionMapList * @param compileAndGroupRelations */ @@ -461,11 +492,13 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { int service = maatConfig.getService(); if (ServiceAndRDBIndexReal.isAddASU(service)) { if (!keySet.contains(TAPREDISDB)) { - throw new ServiceRuntimeException("业务类型:" + service + ",需要向阀门" + TAPREDISDB + "号库分发,但是当前只往" - + keySet + "库下发,请检查阀门编号或者当前业务对应的配置文件是否正确",RestBusinessCode.PropertiesIsError.getValue()); + throw new ServiceRuntimeException( + "业务类型:" + service + ",需要向阀门" + TAPREDISDB + "号库分发,但是当前只往" + keySet + + "库下发,请检查阀门编号或者当前业务对应的配置文件是否正确", + RestBusinessCode.PropertiesIsError.getValue()); } } - + MaatXmlConfig maatXmlConfig = ReadMaatXmlUtil.getMaatConfigByService(service); setConfig(maatConfig, maatXmlConfig, maatVersion, service, transaction, redisDBIndex); @@ -515,6 +548,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { /** * 将编译,分组,域等配置拆开分别添加到redis中 + * * @param maatConfig * @param maatXmlConfig * @param maatVersion @@ -558,6 +592,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { /** * 将整理好的数据添加到redis中,如果是分组复用时,则去临时库将对应的域找到复制过来,如果当前库存在则不复制了(在复制就重复了) + * * @param maatXmlConfig * @param map * @param type @@ -566,7 +601,8 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { * @param redisTemplate * @param redisDBIndex * @param compileId - * @param isReuse 是否是分组复用 + * @param isReuse + * 是否是分组复用 */ private void setCommonConfig(MaatXmlConfig maatXmlConfig, Map map, int type, Double maatVersion, int service, Transaction transaction, Integer redisDBIndex, String compileId, boolean isReuse) { @@ -695,7 +731,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { } } } - } else if (isReuse && (type == 12 || type == 13 || type == 14|| type == 15|| type == 18)) {// 将数据往临时库复制一份,无论临时库里有没有都可以直接写,有则覆盖,不影响 + } else if (isReuse && (type == 12 || type == 13 || type == 14 || type == 15 || type == 18)) {// 将数据往临时库复制一份,无论临时库里有没有都可以直接写,有则覆盖,不影响 int tmpStorageReuseRegionDB = Configurations.getIntProperty("tmpStorageReuseRegionDB", 15); transaction.select(tmpStorageReuseRegionDB); transaction.set(maatKey.toUpperCase(), valBF.toString()); @@ -750,8 +786,8 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { for (Integer service : serviceConfigMap.keySet()) { List compileIdList = serviceConfigMap.get(service); if (compileIdList != null && compileIdList.size() > 0) { + MaatXmlConfig maatXmlConfig = ReadMaatXmlUtil.getMaatConfigByService(service); for (Long id : compileIdList) { - MaatXmlConfig maatXmlConfig = ReadMaatXmlUtil.getMaatConfigByService(service); if (maatXmlConfig != null) { List expressionList = maatXmlConfig.getExpressionList(); String maatKey = null; @@ -1009,6 +1045,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { /** * 获取关联关系中每个关系中的-前部分 + * * @param compileStrVal * @return */ @@ -1022,12 +1059,18 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { /** * 删除maat类配置 - * @param id 配置id - * @param maatXmlConfig maat.xml中关于当前业务类型的key和value写法的对象 - * @param maatVersion 版本号 - * @param service 业务类型 - * @param redisTemplate - * @param maatRelation id对应关系对象 + * + * @param id + * 配置id + * @param maatXmlConfig + * maat.xml中关于当前业务类型的key和value写法的对象 + * @param maatVersion + * 版本号 + * @param service + * 业务类型 + * @param redisTemplate + * @param maatRelation + * id对应关系对象 */ private void removeConfig(Long id, MaatXmlConfig maatXmlConfig, Double maatVersion, int service, Transaction transaction, int redisDBIndex, int idRelaRedisDBIndex) { @@ -1104,6 +1147,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { /** * 删除maat配置时,对redis进行相关操作,主要是重命名key和记录相关状态 + * * @param maatXmlConfig * @param idList * @param type @@ -1171,6 +1215,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { /** * 删除域配置,重名key,记录相关信息MAAT_UPDATE_STATUS,MAAT_RULE_TIMER等 + * * @param maatXmlConfig * @param regionArr * @param maatVersion @@ -1207,8 +1252,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { } /** - * 编译配置用于实时统计 - * 取消分类性质,标签等信息 + * 编译配置用于实时统计 取消分类性质,标签等信息 */ private boolean removeStatisticsReal(Map> map, Transaction transaction) { if (map != null && map.size() > 0) { @@ -1271,6 +1315,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { /** * 删除配置成功后,需要更新编译,组,域等配置id的对应关系 + * * @param idMap */ private boolean removeMaatRelation(Map> map, Transaction transaction) { @@ -1563,7 +1608,8 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { } /** - * 添加分组和域的关联关系 + * 添加分组和域的关联关系 + * * @param maatConfig * @param transaction * @param redisDBIndex @@ -1607,13 +1653,21 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { /** * 保存域配置信息,供分组复用单独添加域和普通maat配置添加域 - * @param maatConfig 配置信息 - * @param maatXmlConfig 配置的表达式 - * @param maatVersion 版本号 - * @param service 业务类型 - * @param transaction redis连接 - * @param redisDBIndex redis编号 - * @param isReuseSaveRegion 是否是分组复用单独添加域配置 + * + * @param maatConfig + * 配置信息 + * @param maatXmlConfig + * 配置的表达式 + * @param maatVersion + * 版本号 + * @param service + * 业务类型 + * @param transaction + * redis连接 + * @param redisDBIndex + * redis编号 + * @param isReuseSaveRegion + * 是否是分组复用单独添加域配置 */ private Integer addRegion(MaatConfig maatConfig, MaatXmlConfig maatXmlConfig, Double maatVersion, int service, Transaction transaction, Integer redisDBIndex, boolean isReuseSaveRegion) { @@ -1687,6 +1741,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { /** * 从临时库删除分组复用域配置,如果该域被引用了,则去对应的redisdb中删除,并将关联库中记录的信息删除 + * * @param groupId * @param regionList * @param transaction @@ -1816,6 +1871,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { /** * 添加和删除时更新MAAT_*状态信息 + * * @param list * @param maatKey * @param transaction diff --git a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java index 19d59c3..02a46a9 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java +++ b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java @@ -482,7 +482,7 @@ public class ConfigSourcesService extends BaseService { maatTableName.substring(maatTableName.lastIndexOf("_") + 1)); dstStr = dstPath.replace("{fileName}", dstStr.substring(dstStr.lastIndexOf("/") + 1)); } else if ("file_id".equals(commonSourceFieldCfg.getDstName())) { - dstStr = dstStr.substring(dstStr.indexOf("group")); + //dstStr = dstStr.substring(dstStr.indexOf("group")); } } switch (commonSourceFieldCfg.getFieldType()) { diff --git a/src/main/java/com/nis/web/service/restful/NmsDiRuleService.java b/src/main/java/com/nis/web/service/restful/NmsDiRuleService.java new file mode 100644 index 0000000..8288812 --- /dev/null +++ b/src/main/java/com/nis/web/service/restful/NmsDiRuleService.java @@ -0,0 +1,23 @@ +package com.nis.web.service.restful; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.nis.domain.restful.NmsDiRule; +import com.nis.web.dao.NmsDiRuleDao; + +@Service +public class NmsDiRuleService { + @Autowired + NmsDiRuleDao nmsDiRuleDao; + + @Transactional + public void saveNmsDiRuleInfo(List nmsDiRuleList) { + for (NmsDiRule nmsDiRule : nmsDiRuleList) { + nmsDiRuleDao.insert(nmsDiRule); + } + } +} diff --git a/src/main/java/com/nis/web/service/restful/TrafficNetflowPortInfoService.java b/src/main/java/com/nis/web/service/restful/TrafficNetflowPortInfoService.java new file mode 100644 index 0000000..62cf482 --- /dev/null +++ b/src/main/java/com/nis/web/service/restful/TrafficNetflowPortInfoService.java @@ -0,0 +1,23 @@ +package com.nis.web.service.restful; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.nis.domain.restful.TrafficNetflowPortInfo; +import com.nis.web.dao.TrafficNetflowPortInfoDao; + +@Service +public class TrafficNetflowPortInfoService { + @Autowired + TrafficNetflowPortInfoDao trafficNetflowPortInfoDao; + + @Transactional + public void saveTrafficNetflowPortInfo(List trafficNetflowPortInfoList) { + for (TrafficNetflowPortInfo trafficNetflowPortInfo : trafficNetflowPortInfoList) { + trafficNetflowPortInfoDao.insert(trafficNetflowPortInfo); + } + } +} diff --git a/src/main/java/com/nis/web/service/restful/TrafficNmsServerStatisticService.java b/src/main/java/com/nis/web/service/restful/TrafficNmsServerStatisticService.java index 93ca9b8..0cee95e 100644 --- a/src/main/java/com/nis/web/service/restful/TrafficNmsServerStatisticService.java +++ b/src/main/java/com/nis/web/service/restful/TrafficNmsServerStatisticService.java @@ -21,6 +21,5 @@ public class TrafficNmsServerStatisticService { trafficNmsServerStatisticDao.insertAbnormalMachine(trafficNmsServerStatistic.getId(), trafficNmsServerStatistic.getAbnormalMachineList()); } - Integer.parseInt(null); } } diff --git a/src/main/resources/applicationContext-redis.xml b/src/main/resources/applicationContext-redis.xml index 065dc9d..7b58b76 100644 --- a/src/main/resources/applicationContext-redis.xml +++ b/src/main/resources/applicationContext-redis.xml @@ -1,11 +1,11 @@ - + + ignore-unresolvable="true" location="classpath:jdbc.properties" /> @@ -30,7 +30,7 @@ + type="int" /> diff --git a/src/main/resources/applicationContext-shiro.xml b/src/main/resources/applicationContext-shiro.xml index ae0a624..2e0b2b8 100644 --- a/src/main/resources/applicationContext-shiro.xml +++ b/src/main/resources/applicationContext-shiro.xml @@ -1,14 +1,14 @@ - + - + default-lazy-init="true"> + Shiro Configuration - - + + @@ -17,18 +17,18 @@ - + - + - + - + @@ -39,18 +39,18 @@ /login = authc /logout = logout ${adminPath}/** = user - - + - - + + @@ -66,42 +66,42 @@ - + - - - - + + + + - + - + - + - + - + - - - + + + - + - + @@ -109,25 +109,25 @@ - + - + - + - + - + - - + + @@ -164,9 +164,9 @@ - - - + + + diff --git a/src/main/resources/commonSources/applicationConfig-parser.xml b/src/main/resources/commonSources/applicationConfig-parser.xml index 0aac91a..3c1136e 100644 --- a/src/main/resources/commonSources/applicationConfig-parser.xml +++ b/src/main/resources/commonSources/applicationConfig-parser.xml @@ -167,9 +167,11 @@ - + + + @@ -180,6 +182,7 @@ + diff --git a/src/main/resources/fastdfs-client.properties b/src/main/resources/fastdfs-client.properties index 86c5bfb..0b83f1e 100644 --- a/src/main/resources/fastdfs-client.properties +++ b/src/main/resources/fastdfs-client.properties @@ -10,11 +10,11 @@ fastdfs.http_secret_key = FastDFS1234567890 fastdfs.http_tracker_http_port = 80 #元辰鑫内网 -fastdfs.tracker_servers = 10.0.6.249:22122 -fastDfsHttpAddr= 10.0.6.249 +#fastdfs.tracker_servers = 10.0.6.249:22122 +#fastDfsHttpAddr= 10.0.6.249 #元辰鑫外网 -#fastdfs.tracker_servers=192.168.10.205:22122 -#fastDfsHttpAddr=192.168.10.205 +fastdfs.tracker_servers=192.168.10.205:22122 +fastDfsHttpAddr=192.168.10.205 #亦庄演示环境 #fastdfs.tracker_servers = 10.3.34.1:22122 #fastDfsHttpAddr = 10.3.34.1 \ No newline at end of file diff --git a/src/main/resources/fdfs_client.conf b/src/main/resources/fdfs_client.conf index 00b5f6a..25a71ff 100644 --- a/src/main/resources/fdfs_client.conf +++ b/src/main/resources/fdfs_client.conf @@ -7,8 +7,8 @@ http.secret_key = FastDFS1234567890 #元辰鑫内网 -tracker_server=10.0.6.249:22122 +#tracker_server=10.0.6.249:22122 #元辰鑫外网 -#tracker_server=192.168.10.205:22122 +tracker_server=192.168.10.205:22122 #亦庄演示环境 #tracker_server=10.3.34.1:22122 diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties index 30a988d..67984b0 100644 --- a/src/main/resources/jdbc.properties +++ b/src/main/resources/jdbc.properties @@ -1,9 +1,11 @@ #==========日志库 Mysql======================= jdbc.log.driver=com.mysql.jdbc.Driver #元辰鑫内网 -jdbc.log.url=jdbc:mysql://10.0.6.249:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull +#jdbc.log.url=jdbc:mysql://10.0.6.249:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull #华严 #jdbc.log.url=jdbc:mysql://192.168.11.242:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull +#元辰鑫外网-开发环境 +jdbc.log.url=jdbc:mysql://192.168.10.204:3306/galaxy-dev?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull #元辰鑫外网 #jdbc.log.url=jdbc:mysql://192.168.10.204:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull #亦庄演示环境 @@ -42,11 +44,11 @@ jdbc.hive.DBName=maat #A版日志库 jdbc.hive.driver=org.apache.hive.jdbc.HiveDriver #元辰鑫内网 -jdbc.hive.url=jdbc:hive2://10.0.6.202:10000/maat +#jdbc.hive.url=jdbc:hive2://10.0.6.202:10000/maat #华严 #jdbc.hive.url=jdbc:hive2://192.168.11.243:2181,192.168.10.76:2181,192.168.10.77:2181/maat;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2 #元辰鑫外网 -#jdbc.hive.url=jdbc:hive2://192.168.10.22:10000/maat +jdbc.hive.url=jdbc:hive2://192.168.10.22:10000/maat #亦庄演示环境高可用集群连接,注意使用此种方法需要配置hosts,主机名与ip的对应关系 #jdbc.hive.url=jdbc:hive2://10.3.48.2:2181,10.3.48.3:2181,10.3.48.4:2181/maat;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver2 jdbc.hive.username=xa_z2_mesa @@ -75,7 +77,7 @@ jdbc.clickhouse.driver=ru.yandex.clickhouse.ClickHouseDriver #域名测试环境 #jdbc.clickhouse.url=jdbc:clickhouse://clickhouse.baifendian.com:80/k18_ods #亦庄演示环境 -jdbc.clickhouse.url=jdbc:clickhouse://10.3.45.5:8123/k18_ods +jdbc.clickhouse.url=jdbc:clickhouse://10.3.45.5:8123/k18_ods?socket_timeout=90000 jdbc.clickhouse.username= jdbc.clickhouse.key= jdbc.clickhouse.password= @@ -121,14 +123,16 @@ druid.log.filters=stat ######################################################################### ##minio地址 ######################################################################### -##minio的地址,注意前面的http://不要忘记写 -minioUrl=http://192.168.10.61:9000 +##华严minio的地址,注意前面的http://不要忘记写 +#minio_url=http://192.168.10.61:9000 +##元辰鑫外网minio的地址,注意前面的http://不要忘记写 +minio_url=http://192.168.10.205:9000 ##minio的accessKey -minio_accessKey= +minio_accessKey=minio ##minio的secretKey -minio_secretKey= +minio_secretKey=123456789 ##minio的bucketName -minio_bucketName=test +minio_bucketName=maat-redis @@ -136,9 +140,11 @@ minio_bucketName=test ##redis连接 ##################################################################################################################################### #元辰鑫内网 -redis.host=10.0.6.249 +#redis.host=10.0.6.249 #华严 #redis.host=192.168.11.243 +#元辰鑫外网-开发环境 +redis.host=192.168.10.12 #元辰鑫外网 #redis.host=192.168.10.205 #亦庄测试环境 diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties index 8833690..5a2ee09 100644 --- a/src/main/resources/log4j.properties +++ b/src/main/resources/log4j.properties @@ -11,7 +11,7 @@ log4j.appender.file=org.apache.log4j.DailyRollingFileAppender log4j.appender.file.Threshold=error log4j.appender.file.encoding=UTF-8 log4j.appender.file.Append=true -log4j.appender.file.file=${nis.root}/WEB-INF/log/nis.log +log4j.appender.file.file=/WEB-INF/log/nis.log log4j.appender.file.DatePattern='.'yyyy-MM-dd log4j.appender.file.layout=org.apache.log4j.PatternLayout #log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss} %X{ip} [%t] %5p %c{1} %m%n diff --git a/src/main/resources/maatXml/applicationConfig-maatRedis.xml b/src/main/resources/maatXml/applicationConfig-maatRedis.xml index d2b2a22..1349533 100644 --- a/src/main/resources/maatXml/applicationConfig-maatRedis.xml +++ b/src/main/resources/maatXml/applicationConfig-maatRedis.xml @@ -160,7 +160,7 @@ EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id] - [cfg_id];\t;[service];\t;[keyring_name];\t;[keyring_type];\t;[private_key_file];\t;[public_key_file];\t;[expire_after];\t;[public_key_algo];\t;[crl];\t;[is_valid];\t;[op_time];&nbsp;0;\n + [cfg_id];\t;[service];\t;[keyring_name];\t;[keyring_type];\t;[private_key_file];\t;[public_key_file];\t;[expire_after];\t;[public_key_algo];\t;[crl];\t;[is_valid];\t;[redisFile_private_key_file];\t;[redisFile_public_key_file];\t;[op_time];&nbsp;0;\n 1 @@ -180,7 +180,7 @@ EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id] - [cfg_id];\t;[service];\t;[file_desc];\t;[content_type];\t;[content_length];\t;[file_path];\t;[is_valid];\t;[op_time];&nbsp;0;\n + [cfg_id];\t;[service];\t;[file_desc];\t;[content_type];\t;[content_length];\t;[file_path];\t;[is_valid];\t;[redisFile_file_path];\t;[op_time];&nbsp;0;\n 1 diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 426350c..f24a8ea 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -202,4 +202,10 @@ maatTestLogPath=c:/maat/mmat.log mmSampleDstPath=/home/mesasoft/{tableType}/full/{fileName} ##定时将redis主从库的实时统计数据同步到redis集群中 -syncRedisToClusterCron=0/10 * * * * ? \ No newline at end of file +syncRedisToClusterCron=0/10 * * * * ? +#文件服务器是否使用Minio +isUseMinio=true + + +##存储到redis中的文件类型(拼接的前缀) +fileProtocol=redis:// diff --git a/src/main/webapp/swagger/index.html b/src/main/webapp/swagger/index.html index e45f1e4..344fdf0 100644 --- a/src/main/webapp/swagger/index.html +++ b/src/main/webapp/swagger/index.html @@ -1,49 +1,61 @@ - - - Galaxy UI - - - - - - - + + +Galaxy UI + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + -