feature(tools):切换工具类

README.md

@@ -1 +1,34 @@
-maat rest service  for web 
+maat rest service  for web
+
+
+<resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                    <include>**/*.xsd</include>
+                    <include>**/*.yml</include>
+                </includes>
+                <filtering>true</filtering>
+            </resource>
+
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>false</filtering>
+                <includes>
+                    <include>**/*.mmdb</include>
+                    <include>**/*.dat</include>
+                </includes>
+            </resource>
+
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                </includes>
+                <filtering>true</filtering>
+            </resource>
+
+        </resources>

src/main/java/com/nis/domain/BaseEntity.java

@@ -5,6 +5,7 @@ import java.util.Map;
 
 import javax.xml.bind.annotation.XmlTransient;
 
+import com.zdjizhi.utils.StringUtil;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -12,7 +13,6 @@ import com.google.common.collect.Maps;
 import com.nis.supcan.SupCol;
 import com.nis.supcan.SupTreeList;
 import com.nis.util.Configurations;
-import com.nis.util.StringUtil;
 import com.nis.web.security.UserUtils;
 
 /**

src/main/java/com/nis/domain/Page.java

@@ -12,6 +12,8 @@ import java.util.regex.Pattern;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zdjizhi.utils.CookieUtil;
+import com.zdjizhi.utils.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.mapping.ResultMap;
 import org.apache.ibatis.mapping.ResultMapping;
@@ -20,8 +22,6 @@ import org.apache.ibatis.session.SqlSessionFactory;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.nis.util.Configurations;
 import com.nis.util.Constants;
-import com.nis.util.CookieUtil;
-import com.nis.util.StringUtil;
 import com.nis.web.service.SpringContextHolder;
 
 /**

src/main/java/com/nis/domain/SysUser.java

@@ -8,8 +8,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.common.collect.Lists;
 import com.nis.util.Collections3;
-import com.nis.util.StringUtil;
-import com.nis.util.StringUtils;
 import com.nis.util.excel.ExcelField;
 import com.nis.util.excel.fieldtype.RoleListType;
 

src/main/java/com/nis/domain/TreeEntity.java

@@ -4,7 +4,8 @@ package com.nis.domain;
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.nis.util.Reflections;
-import com.nis.util.StringUtil;
+import com.zdjizhi.utils.StringUtil;
+
 
 /**
  * 数据Entity类

src/main/java/com/nis/util/CamelUnderlineUtil.java

@@ -3,6 +3,8 @@
  */
 package com.nis.util;
 
+import com.zdjizhi.utils.StringUtil;
+
 /**
  * @ClassName:CamelUnderlineUtil
  * @Description:TODO(这里用一句话描述这个类的作用)

src/main/java/com/nis/util/CompileVal.java

@@ -16,6 +16,7 @@ import com.nis.listener.SystemConfigListener;
 import com.nis.restful.RestBusinessCode;
 import com.nis.restful.RestServiceException;
 import com.nis.web.service.restful.ConfigSourcesService;
+import com.zdjizhi.utils.StringUtil;
 
 public class CompileVal {
 
@@ -63,10 +64,11 @@ public class CompileVal {
 			}
 
 			if (!isUpdate) {
-				if (configCompile.getIsValid() != 1)
+				if (configCompile.getIsValid() != 1) {
+
 					throw new RestServiceException("编译配置id为" + configCompile.getCompileId() + "的配置在添加时不能为无效",
 							RestBusinessCode.IsValidIsT.getValue());
-				{
+
 				}
 			} else {
 				throw new RestServiceException("编译配置id为" + configCompile.getCompileId() + "的配置在修改时不能为有效",

src/main/java/com/nis/util/Configurations.java

@@ -1,5 +1,7 @@
 package com.nis.util;
 
+import com.zdjizhi.utils.StringUtil;
+
 import java.io.File;
 import java.util.Map;
 import java.util.Properties;

src/main/java/com/nis/util/DateUtils.java

@@ -12,6 +12,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.zdjizhi.utils.StringUtil;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.log4j.Logger;
 

src/main/java/com/nis/util/DictUtils.java

@@ -3,6 +3,7 @@ package com.nis.util;
 import java.util.List;
 import java.util.Map;
 
+import com.zdjizhi.utils.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.Lists;

src/main/java/com/nis/util/FileUtils.java

@@ -21,6 +21,7 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zdjizhi.utils.StringUtil;
 import org.apache.tools.zip.ZipEntry;
 import org.apache.tools.zip.ZipFile;
 import org.apache.tools.zip.ZipOutputStream;

src/main/java/com/nis/util/GroupReuseVal.java

@@ -11,6 +11,7 @@ import com.nis.restful.RestBusinessCode;
 import com.nis.restful.RestServiceException;
 import com.nis.restful.ServiceRuntimeException;
 import com.nis.web.service.restful.ConfigSourcesService;
+import com.zdjizhi.utils.StringUtil;
 
 public class GroupReuseVal {
 
@@ -27,7 +28,7 @@ public class GroupReuseVal {
 				hasRegionFlag = true;
 				List<NumRegion> numRegionList = groupReuse.getNumRegionList();
 				for (NumRegion numRegion : numRegionList) {
-					if (!StringUtil.isEmpty(numRegion.getTableName())	
+					if (!StringUtil.isEmpty(numRegion.getTableName())
 							&& !groupReuseRegionMap.get("numRegion").contains(numRegion.getTableName())) {
 						throw new RestServiceException("numRegionList中的regionId为"
 								+ numRegion.getRegionId()

src/main/java/com/nis/util/HiveJDBC.java

@@ -18,6 +18,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
+import com.zdjizhi.utils.StringUtil;
 import org.apache.ibatis.mapping.ResultMap;
 import org.apache.ibatis.mapping.ResultMapping;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -146,9 +147,9 @@ public class HiveJDBC {
 				if (!StringUtil.isEmpty(value)) {
 					// 如果是日期类型的属性需要把时间戳转换成日期，如果时间戳为0直接把值设置为null
 					if (null != columnList && columnList.contains(filedName.toLowerCase())) {
-						long time = 0l;
+						long time = 0L;
 						time = Long.parseLong(value.toString());
-						map.put(filedName, time == 0l ? null : new Date(time * 1000));
+						map.put(filedName, time == 0L ? null : new Date(time * 1000));
 						// map.put(filedName, new
 						// Date(Long.parseLong("1476583810000")));
 					} else {

src/main/java/com/nis/util/JsonDateDeserializer.java

@@ -30,7 +30,7 @@ public class JsonDateDeserializer extends JsonDeserializer<Date> {
 		// TODO Auto-generated method stub
 		Date date = null;
 		if (null!=p&&!"".equals(p.getText())) {
-			date = DateUtil.convertStringToDate(p.getText(), DateUtil.YYYY_MM_DD_HH24_MM_SS);
+			date = com.zdjizhi.utils.DateUtils.convertStringToDate(p.getText(), com.zdjizhi.utils.DateUtils.YYYY_MM_DD_HH24_MM_SS);
 		}
 		return date;
 	}

src/main/java/com/nis/util/JsonDateSerializer.java

@@ -17,7 +17,8 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
-import com.nis.util.DateUtil;
+import com.zdjizhi.utils.*;
+
 
 /**
  * @ClassName: JsonDateSerializer.java 
@@ -36,7 +37,7 @@ public class JsonDateSerializer extends JsonSerializer<Date> {
 			throws IOException, JsonProcessingException {
 		// TODO Auto-generated method stub
 		//gen.writeString(sdf.format(date));
-		gen.writeString(DateUtil.getFormatDate(date, DateUtil.YYYY_MM_DD_HH24_MM_SS));
+		gen.writeString(com.zdjizhi.utils.DateUtils.getFormatDate(date, com.zdjizhi.utils.DateUtils.YYYY_MM_DD_HH24_MM_SS));
 	}
 
 }

src/main/java/com/nis/util/LogJDBCByDruid.java

@@ -15,6 +15,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.zdjizhi.utils.StringUtil;
 import org.apache.ibatis.mapping.ResultMap;
 import org.apache.ibatis.mapping.ResultMapping;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -89,9 +90,9 @@ public class LogJDBCByDruid {
 					if (!StringUtil.isEmpty(value)) {
 						// 如果是日期类型的属性需要把时间戳转换成日期，如果时间戳为0直接把值设置为null
 						if (null != columnList && columnList.contains(filedName.toLowerCase())) {
-							long time = 0l;
+							long time = 0L;
 							time = Long.parseLong(value.toString());
-							map.put(filedName, time == 0l ? null : new Date(time * 1000));
+							map.put(filedName, time == 0L ? null : new Date(time * 1000));
 							// map.put(filedName, new
 							// Date(Long.parseLong("1476583810000")));
 						} else {

src/main/java/com/nis/util/LogUtils.java

@@ -7,6 +7,7 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.zdjizhi.utils.StringUtil;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.method.HandlerMethod;
 

src/main/java/com/nis/util/PropertyPlaceholderConfigurerCrypt.java

@@ -2,12 +2,12 @@ package com.nis.util;
 
 import java.util.Properties;
 
+import com.zdjizhi.crypt.AESUtil;
 import org.apache.commons.codec.binary.Base64;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 
-import com.nis.crypt.AESUtil;
 
 public class PropertyPlaceholderConfigurerCrypt extends PropertyPlaceholderConfigurer {
 

src/main/java/com/nis/util/ReadCommSourceXmlUtil.java

@@ -10,6 +10,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.zdjizhi.utils.StringUtil;
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;

src/main/java/com/nis/util/ServiceAndRDBIndexReal.java

@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.zdjizhi.utils.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/com/nis/util/TreeUtil.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.nis.domain.SysMenu;
 import com.nis.web.security.UserUtils;
+import com.zdjizhi.utils.StringUtil;
 
 /**
  * 将树构建成上下层结构

src/main/java/com/nis/util/elasticsearch/ElasticsearchSqlDao.java

@@ -21,6 +21,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import com.zdjizhi.utils.StringUtil;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.ibatis.mapping.ResultMap;
 import org.apache.ibatis.mapping.ResultMapping;
@@ -34,7 +35,6 @@ import com.nis.domain.LogEntity;
 import com.nis.domain.Page;
 import com.nis.util.Constants;
 import com.nis.util.JsonMapper;
-import com.nis.util.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.service.SpringContextHolder;

src/main/java/com/nis/web/controller/LoginController.java

@@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zdjizhi.utils.CookieUtil;
 import org.apache.shiro.authz.UnauthorizedException;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.web.filter.authc.FormAuthenticationFilter;
@@ -19,7 +20,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 
 import com.nis.util.Configurations;
 import com.nis.util.Constants;
-import com.nis.util.CookieUtil;
 import com.nis.util.StringUtils;
 import com.nis.web.security.IdGen;
 import com.nis.web.security.SystemAuthorizingRealm.Principal;

src/main/java/com/nis/web/controller/restful/ConfigFileController.java

@@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.nis.web.service.AuditLogThread;
+import com.zdjizhi.utils.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +27,6 @@ import com.nis.domain.restful.ConfigFile;
 import com.nis.restful.RestServiceException;
 import com.nis.util.Constants;
 import com.nis.util.MD5Utils;
-import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseRestController;
 import com.nis.web.service.ServicesRequestLogService;
 import com.wordnik.swagger.annotations.Api;
@@ -152,10 +152,14 @@ public class ConfigFileController extends BaseRestController {
 				throw new RestServiceException(thread,System.currentTimeMillis()-start,"文件下载失败");
 			} finally {  
 		        try {
-		        	if (bis != null)  
+		        	if (bis != null) {
-				           bis.close();  
+						bis.close();
-			        if (bos != null)  
+					}
-			           bos.close();
+
+			        if (bos != null)  {
+						bos.close();
+					}
+
 				} catch (Exception e2) {
 					thread.setExceptionInfo(e2.getMessage()+" "+e2.getCause());
 					logger.error(e2.toString());

src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java

@@ -9,6 +9,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zdjizhi.utils.StringUtil;
 import net.sf.json.JSONObject;
 
 import org.apache.commons.codec.digest.DigestUtils;
@@ -30,7 +31,6 @@ import com.nis.restful.ServiceRuntimeException;
 import com.nis.util.Constants;
 import com.nis.util.FileUtils;
 import com.nis.util.MinioUtil;
-import com.nis.util.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.web.controller.BaseRestController;
 import com.nis.web.service.AuditLogThread;

src/main/java/com/nis/web/controller/restful/LogController.java

@@ -8,6 +8,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zdjizhi.utils.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,7 +25,6 @@ import com.nis.util.Constants;
 import com.nis.util.DateUtils;
 import com.nis.util.LogJDBCByDruid;
 import com.nis.util.JsonMapper;
-import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseRestController;
 import com.nis.web.service.AuditLogThread;
 import com.nis.web.service.HiveSqlService;
@@ -168,7 +168,7 @@ public class LogController extends BaseRestController {
 	 * @throws Exception
 	 */
 	public void resetTime(LogEntity<?> entity) throws Exception {
-		if (StringUtil.isEmpty(entity.getSearchFoundStartTime())&&StringUtil.isEmpty(entity.getSearchFoundEndTime())) {
+		if (StringUtil.isEmpty(entity.getSearchFoundStartTime())&& StringUtil.isEmpty(entity.getSearchFoundEndTime())) {
 			Map<String, String> map = DateUtils.getLocalTime(entity.getSearchFoundStartTime(),
 					entity.getSearchFoundEndTime(), Constants.LOG_LOCAL_TIME, "minute");
 			entity.setSearchFoundStartTime(map.get("startTime"));

src/main/java/com/nis/web/controller/restful/MaatTestController.java

@@ -13,6 +13,7 @@ import java.util.UUID;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zdjizhi.utils.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,7 +35,6 @@ import com.nis.util.FileUtils;
 import com.nis.util.JsonMapper;
 import com.nis.util.ReadCommSourceXmlUtil;
 import com.nis.util.ServiceAndRDBIndexReal;
-import com.nis.util.StringUtil;
 import com.nis.web.service.AuditLogThread;
 import com.nis.web.service.ServicesRequestLogService;
 import com.nis.web.service.restful.ConfigRedisService;

src/main/java/com/nis/web/controller/restful/MmLogSearchController.java

@@ -8,6 +8,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zdjizhi.utils.StringUtil;
 import org.apache.ibatis.annotations.Delete;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.Model;
@@ -38,7 +39,6 @@ import com.nis.util.Constants;
 import com.nis.util.DateUtils;
 import com.nis.util.JsonMapper;
 import com.nis.util.LogJDBCByDruid;
-import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseRestController;
 import com.nis.web.service.AuditLogThread;
 import com.nis.web.service.HiveSqlService;
@@ -928,7 +928,7 @@ public class MmLogSearchController extends BaseRestController {
 	 * @throws Exception
 	 */
 	public void resetTime(LogEntity<?> entity) throws Exception {
-		if (StringUtil.isEmpty(entity.getSearchFoundStartTime())&&StringUtil.isEmpty(entity.getSearchFoundEndTime())) {
+		if (StringUtil.isEmpty(entity.getSearchFoundStartTime())&& StringUtil.isEmpty(entity.getSearchFoundEndTime())) {
 			Map<String, String> map = DateUtils.getLocalTime(entity.getSearchFoundStartTime(),
 					entity.getSearchFoundEndTime(), Constants.LOG_LOCAL_TIME, "minute");
 			entity.setSearchFoundStartTime(map.get("startTime"));

src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java

@@ -8,6 +8,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zdjizhi.utils.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,7 +40,6 @@ import com.nis.util.Constants;
 import com.nis.util.DateUtils;
 import com.nis.util.LogJDBCByDruid;
 import com.nis.util.JsonMapper;
-import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseRestController;
 import com.nis.web.service.AuditLogThread;
 import com.nis.web.service.HiveSqlService;
@@ -119,7 +119,7 @@ public class NtcLogSearchController extends BaseRestController {
 //											getCol2Col(), null));
 				} else {
 					ntcIpLogPage.setList(new ArrayList());
-					ntcIpLogPage.setCount(0l);
+					ntcIpLogPage.setCount(0L);
 				}
 			}
 		} catch (Exception e) {
@@ -1085,7 +1085,7 @@ public class NtcLogSearchController extends BaseRestController {
 	 * @throws Exception
 	 */
 	public void resetTime(LogEntity<?> entity) throws Exception {
-		if (StringUtil.isEmpty(entity.getSearchFoundStartTime())&&StringUtil.isEmpty(entity.getSearchFoundEndTime())) {
+		if (StringUtil.isEmpty(entity.getSearchFoundStartTime())&& StringUtil.isEmpty(entity.getSearchFoundEndTime())) {
 			Map<String, String> map = DateUtils.getLocalTime(entity.getSearchFoundStartTime(),
 					entity.getSearchFoundEndTime(), Constants.LOG_LOCAL_TIME, "minute");
 			entity.setSearchFoundStartTime(map.get("startTime"));

src/main/java/com/nis/web/controller/restful/SingleDimensionReport.java

@@ -6,6 +6,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zdjizhi.utils.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,7 +26,6 @@ import com.nis.domain.restful.NtcTagReport;
 import com.nis.restful.RestServiceException;
 import com.nis.util.Constants;
 import com.nis.util.DateUtils;
-import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseRestController;
 import com.nis.web.service.AuditLogThread;
 import com.nis.web.service.ServicesRequestLogService;

src/main/java/com/nis/web/controller/restful/SystemFunStatusController.java

@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.nis.web.service.AuditLogThread;
+import com.zdjizhi.utils.StringUtil;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,7 +20,6 @@ import com.nis.restful.RestBusinessCode;
 import com.nis.restful.RestServiceException;
 import com.nis.util.Constants;
 import com.nis.util.OracleErrorCodeUtil;
-import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseRestController;
 import com.nis.web.service.ServicesRequestLogService;
 import com.nis.web.service.restful.SystemFunStatusService;

src/main/java/com/nis/web/controller/sys/AreaController.java

@@ -5,6 +5,7 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.zdjizhi.utils.StringUtil;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -17,7 +18,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.nis.domain.SysArea;
-import com.nis.util.StringUtil;
+
 import com.nis.util.StringUtils;
 import com.nis.web.controller.BaseController;
 

src/main/java/com/nis/web/controller/sys/DictController.java

@@ -14,7 +14,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
 import com.nis.domain.SysDataDictionaryName;
-import com.nis.util.StringUtil;
+import com.zdjizhi.utils.StringUtil;
 import com.nis.web.controller.BaseController;
 
 @Controller

src/main/java/com/nis/web/controller/sys/MenuController.java

@@ -17,7 +17,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.nis.domain.SysMenu;
-import com.nis.util.StringUtil;
+import com.zdjizhi.utils.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;

src/main/java/com/nis/web/controller/sys/OfficeController.java

@@ -20,7 +20,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.nis.domain.SysOffice;
 import com.nis.domain.SysUser;
-import com.nis.util.StringUtil;
+import com.zdjizhi.utils.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;

src/main/java/com/nis/web/controller/sys/RoleController.java

@@ -19,7 +19,7 @@ import com.google.common.collect.Maps;
 import com.nis.domain.SysRole;
 import com.nis.domain.SysUser;
 import com.nis.util.Collections3;
-import com.nis.util.StringUtil;
+import com.zdjizhi.utils.StringUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
 

src/main/java/com/nis/web/controller/sys/UserController.java

@@ -22,7 +22,7 @@ import com.nis.domain.Page;
 import com.nis.domain.SysRole;
 import com.nis.domain.SysUser;
 import com.nis.util.DateUtils;
-import com.nis.util.StringUtil;
+import com.zdjizhi.utils.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.util.excel.ExportExcel;
 import com.nis.web.controller.BaseController;

src/main/java/com/nis/web/security/FormAuthenticationFilter.java

@@ -4,6 +4,7 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 
+import com.zdjizhi.utils.IPUtil;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationToken;
 import org.apache.shiro.authc.IncorrectCredentialsException;
@@ -12,7 +13,6 @@ import org.apache.shiro.web.util.WebUtils;
 import org.springframework.stereotype.Service;
 
 import com.nis.util.Constants;
-import com.nis.util.IpUtil;
 import com.nis.util.StringUtils;
 
 
@@ -28,7 +28,7 @@ public class FormAuthenticationFilter extends org.apache.shiro.web.filter.authc.
 		}
 		boolean rememberMe = isRememberMe(request);
 		
-		String host =IpUtil.getIpAddr((HttpServletRequest)request);
+		String host = IPUtil.getIpAddr((HttpServletRequest)request);
 		String captcha = getCaptcha(request);
 		boolean mobile = isMobileLogin(request);
 		return new UsernamePasswordToken(username, password.toCharArray(), rememberMe, host, captcha, mobile);

src/main/java/com/nis/web/security/SystemAuthorizingRealm.java

@@ -6,6 +6,7 @@ import java.util.List;
 
 import javax.annotation.PostConstruct;
 
+import com.zdjizhi.utils.StringUtil;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authc.AuthenticationToken;
@@ -32,7 +33,6 @@ import com.nis.domain.SysUser;
 import com.nis.util.Configurations;
 import com.nis.util.Encodes;
 import com.nis.util.LogUtils;
-import com.nis.util.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.util.TreeUtil;
 import com.nis.web.service.SystemService;

src/main/java/com/nis/web/security/UserUtils.java

@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.zdjizhi.utils.StringUtil;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.UnavailableSecurityManagerException;
 import org.apache.shiro.session.InvalidSessionException;
@@ -18,7 +19,6 @@ import com.nis.domain.SysOffice;
 import com.nis.domain.SysRole;
 import com.nis.domain.SysUser;
 import com.nis.util.CacheUtils;
-import com.nis.util.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.util.TreeUtil;
 import com.nis.web.dao.SysAreaDao;

src/main/java/com/nis/web/service/AreaService.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Service;
 
 import com.google.common.collect.Lists;
 import com.nis.domain.SysArea;
-import com.nis.util.StringUtil;
+import com.zdjizhi.utils.StringUtil;
 import com.nis.web.dao.SysAreaDao;
 import com.nis.web.security.UserUtils;
 

src/main/java/com/nis/web/service/BaseLogService.java

@@ -22,7 +22,7 @@ import com.nis.domain.Page;
 import com.nis.domain.restful.NtcReportEntity;
 import com.nis.restful.RestBusinessCode;
 import com.nis.restful.RestServiceException;
-import com.nis.util.StringUtil;
+import com.zdjizhi.utils.StringUtil;
 import com.nis.util.elasticsearch.ElasticsearchSqlDao;
 
 /**

src/main/java/com/nis/web/service/DictService.java

@@ -3,14 +3,14 @@ package com.nis.web.service;
 import java.util.Date;
 import java.util.List;
 
+import com.zdjizhi.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.nis.domain.Page;
 import com.nis.domain.SysDataDictionaryItem;
 import com.nis.domain.SysDataDictionaryName;
-import com.nis.util.DateUtil;
+import com.zdjizhi.utils.StringUtil;
-import com.nis.util.StringUtil;
 import com.nis.web.dao.SysDictDao;
 import com.nis.web.security.UserUtils;
 
@@ -52,7 +52,7 @@ public class DictService extends BaseService {
 		}else {//修改
 			
 			//累加修改记录
-			String newRevision = "用户"+UserUtils.getUser().getName()+",在"+DateUtil.getCurrentDate(DateUtil.YYYY_MM_DD_HH24_MM_SS)+"修改！";
+			String newRevision = "用户"+UserUtils.getUser().getName()+",在"+ DateUtils.getCurrentDate(DateUtils.YYYY_MM_DD_HH24_MM_SS)+"修改！";
 			StringBuilder revisionBuilder = new StringBuilder(newRevision);
 			String oldRevision = sysDictName.getRevision();
 			if(!StringUtil.isBlank(oldRevision)){

src/main/java/com/nis/web/service/HiveSqlService.java

@@ -23,7 +23,7 @@ import com.alibaba.druid.pool.DruidDataSource;
 import com.nis.domain.Page;
 import com.nis.util.Constants;
 import com.nis.util.LogJDBCByDruid;
-import com.nis.util.StringUtil;
+import com.zdjizhi.utils.StringUtil;
 import com.nis.util.redis.SaveRedisThread;
 
 public class HiveSqlService {

src/main/java/com/nis/web/service/MenuService.java

@@ -10,7 +10,7 @@ import com.nis.domain.SysMenu;
 import com.nis.domain.SysUser;
 import com.nis.util.CacheUtils;
 import com.nis.util.LogUtils;
-import com.nis.util.StringUtil;
+import com.zdjizhi.utils.StringUtil;
 import com.nis.web.dao.SysMenuDao;
 import com.nis.web.security.UserUtils;
 

src/main/java/com/nis/web/service/OfficeService.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 import com.nis.domain.SysOffice;
 import com.nis.util.DictUtils;
-import com.nis.util.StringUtil;
+import com.zdjizhi.utils.StringUtil;
 import com.nis.web.dao.SysOfficeDao;
 import com.nis.web.security.UserUtils;
 @Service

src/main/java/com/nis/web/service/RoleService.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 import com.nis.domain.SysRole;
 import com.nis.domain.SysUser;
-import com.nis.util.StringUtil;
+import com.zdjizhi.utils.StringUtil;
 import com.nis.web.dao.SysRoleDao;
 import com.nis.web.security.UserUtils;
 

src/main/java/com/nis/web/service/SystemService.java

@@ -13,6 +13,8 @@ import java.util.Map;
 
 import javax.xml.namespace.QName;
 
+import com.zdjizhi.utils.IPUtil;
+import com.zdjizhi.utils.TimeConstants;
 import org.apache.commons.io.FileUtils;
 import org.apache.shiro.session.Session;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,9 +26,7 @@ import com.nis.domain.SysUser;
 import com.nis.domain.WebServiceClient;
 import com.nis.util.Configurations;
 import com.nis.util.DateUtils;
-import com.nis.util.IpUtil;
+import com.zdjizhi.utils.StringUtil;
-import com.nis.util.StringUtil;
-import com.nis.util.TimeConstants;
 import com.nis.web.dao.SrcIpDao;
 import com.nis.web.dao.SysOfficeDao;
 import com.nis.web.dao.UserDao;
@@ -69,7 +69,7 @@ public class SystemService extends BaseService{
 	}
 	
 	public List<SrcIp> ipLookUp(String ip) {
-		return srcIpDao.getIpInfo(IpUtil.getIpHostDesimal(ip));
+		return srcIpDao.getIpInfo(IPUtil.getIpHostDesimal(ip));
 	}
 	
 	

src/main/java/com/nis/web/service/TreeService.java

@@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.nis.domain.TreeEntity;
 import com.nis.exceptions.ServiceException;
 import com.nis.util.Reflections;
-import com.nis.util.StringUtil;
+import com.zdjizhi.utils.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.web.dao.TreeDao;
 

src/main/java/com/nis/web/service/UserService.java

@@ -12,7 +12,7 @@ import com.nis.domain.Page;
 import com.nis.domain.SysUser;
 import com.nis.exceptions.ServiceException;
 import com.nis.util.CacheUtils;
-import com.nis.util.StringUtil;
+import com.zdjizhi.utils.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.web.dao.UserDao;
 import com.nis.web.security.UserUtils;

src/main/java/com/nis/web/service/restful/ConfigPzIdService.java

@@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.nis.domain.restful.ConfigPzIdSource;
-import com.nis.util.StringUtil;
+import com.zdjizhi.utils.StringUtil;
 import com.nis.web.dao.ConfigPzIdDao;
 import com.nis.web.service.BaseLogService;
 import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIConversion.Static;

src/main/java/com/nis/web/service/restful/ConfigSourcesService.java

@@ -42,7 +42,7 @@ import com.nis.util.GroupReuseVal;
 import com.nis.util.JsonMapper;
 import com.nis.util.ReadCommSourceXmlUtil;
 import com.nis.util.ServiceAndRDBIndexReal;
-import com.nis.util.StringUtil;
+import com.zdjizhi.utils.StringUtil;
 import com.nis.web.service.AuditLogThread;
 import com.nis.web.service.BaseService;
 
@@ -297,8 +297,10 @@ public class ConfigSourcesService extends BaseService {
 		Map<String, String> dstMap = new HashMap<String, String>();
 		Field[] fields = obj.getClass().getDeclaredFields();
 		for (Field field : fields) {
-			if ("serialVersionUID".equals(field.getName()))
+			if ("serialVersionUID".equals(field.getName())) {
 				continue;
+			}
+
 			String dstName = CamelUnderlineUtil.camelToUnderline(field.getName());
 			PropertyDescriptor pd;
 			pd = new PropertyDescriptor(field.getName(), clazz);

src/main/java/com/nis/web/service/restful/MaatTestServiceimpl.java

@@ -37,7 +37,7 @@ import com.nis.util.JedisUtils;
 import com.nis.util.ReadCommSourceXmlUtil;
 import com.nis.util.ReadMaatXmlUtil;
 import com.nis.util.ServiceAndRDBIndexReal;
-import com.nis.util.StringUtil;
+import com.zdjizhi.utils.StringUtil;
 
 import net.sf.json.JSONObject;
 

src/test/java/com/nis/test/CryptTest.java

@@ -2,10 +2,10 @@ package com.nis.test;
 
 
 
+import com.zdjizhi.crypt.AESUtil;
 import org.apache.commons.codec.binary.Base64;
 import org.junit.Test;
 
-import com.nis.crypt.AESUtil;
 
 public class CryptTest {
 	

src/test/java/com/nis/test/IpLocationTest.java

@@ -0,0 +1,27 @@
+package com.nis.test;/**
+ * Created by dell on 2018-10-18.
+ */
+
+import com.alibaba.druid.sql.parser.SymbolTable;
+import com.zdjizhi.utils.IpLookup;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * @ClassName IpLocationTest
+ * @Description TODO
+ * @Author dell
+ * @Date 2018-10-18 11:56
+ * @Version 1.0
+ **/
+public class IpLocationTest {
+
+    @Test
+    public void testCountryLookup() {
+        IpLookup ipLookup = new IpLookup.Builder(true).build();
+
+
+        System.out.println( ipLookup.countryLookup("8.8.8.8"));
+
+    }
+}

src/test/java/com/nis/test/RestfulTest.java

@@ -8,6 +8,7 @@
 */
 package com.nis.test;
 
+import com.zdjizhi.utils.StringUtil;
 import org.apache.commons.lang.StringUtils;
 import org.junit.Assert;
 import org.junit.Test;
@@ -15,7 +16,7 @@ import org.springframework.web.client.RestTemplate;
 
 import com.nis.domain.ControlLog;
 import com.nis.domain.Page;
-import com.nis.util.StringUtil;
+
 
 /** 
 * @ClassName: RestfulTest