diff --git a/README.md b/README.md index 0104417..4af77be 100644 --- a/README.md +++ b/README.md @@ -1 +1,34 @@ -maat rest service for web \ No newline at end of file +maat rest service for web + + + + + src/main/resources + + **/*.properties + **/*.xml + **/*.xsd + **/*.yml + + true + + + + src/main/resources + false + + **/*.mmdb + **/*.dat + + + + + src/main/java + + **/*.properties + **/*.xml + + true + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 10f28ba..3a35c48 100644 --- a/pom.xml +++ b/pom.xml @@ -1,591 +1,575 @@ - - 4.0.0 - war - galaxy-service - com.nis.galaxy - galaxy-service - 0.0.1-SNAPSHOT - - - - - - - nexus - Team Nexus Repository - http://192.168.10.125:8099/content/groups/public - - - - - - - - - - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - [1.0.0,) - - copy-dependencies - - - - - - - - - - - - - - - - - - - - - - - - UTF-8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.mortbay.jetty - maven-jetty-plugin - jar - - - - 8888 - 30000 - - - ${project.build.directory}/${pom.artifactId}-${pom.version} - / - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.7 - 1.7 - UTF-8 - - - - - - - - - - - - - - - - 4.1.7.RELEASE - 3.2.8 - 1.2.3 - 3.3.2 - 2.6.9 - 2.0.4 - - 2.5.4 - 3.0.1 - 1.4.7 - 3.9 - 1.7.7 - 2.9.0 - 1.7.1.RELEASE - UTF-8 - - - - junit - junit - 4.12 - test - - - - com.mangofactory - swagger-springmvc - 1.0.2 - - - - - org.springframework - spring-context-support - ${spring.version} - - - - org.springframework - spring-oxm - ${spring.version} - - - - org.springframework - spring-jdbc - ${spring.version} - - - - org.springframework - spring-webmvc - ${spring.version} - - - - - org.springframework - spring-test - ${spring.version} - - - - org.springframework - spring-web - ${spring.version} - - - - org.springframework - spring-aspects - ${spring.version} - - - - org.sitemesh - sitemesh - ${sitemesh.version} - - - - javax.servlet - javax.servlet-api - 3.1.0 - provided - - - - - - - javax.servlet - jstl - 1.2 - runtime - - - - commons-fileupload - commons-fileupload - 1.3.1 - - - - commons-codec - commons-codec - 1.10 - - - - com.github.penggle - kaptcha - 2.3.2 - - - - - com.thoughtworks.xstream - xstream - ${xstream.version} - - - - - com.drewnoakes - metadata-extractor - 2.6.2 - - - - - net.sf.ehcache - ehcache-core - ${ehcache.version} - - - net.sf.ehcache - ehcache-web - ${ehcache-web.version} - - - redis.clients - jedis - ${jedis.version} - - - - - - - org.apache.shiro - shiro-core - ${shiro.version} - - - org.apache.shiro - shiro-spring - ${shiro.version} - - - org.apache.shiro - shiro-cas - ${shiro.version} - - - commons-logging - commons-logging - - - - - org.apache.shiro - shiro-web - ${shiro.version} - - - org.apache.shiro - shiro-ehcache - ${shiro.version} - - - - - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - - - - com.jolbox - bonecp - 0.8.0.RELEASE - - - - mysql - mysql-connector-java - 5.1.36 - - - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - - - - - log4j - log4j - 1.2.14 - - - - org.mybatis - mybatis - ${mybatis.version} - - - - org.mybatis - mybatis-spring - 1.2.2 - - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${jackson.version} - - - - - org.apache.poi - poi - ${poi.version} - - - org.apache.poi - poi-ooxml - ${poi.version} - - - org.apache.poi - poi-ooxml-schemas - ${poi.version} - - - - - - net.coobird - thumbnailator - 0.4.2 - - - com.ckfinder - apache-ant-zip - 2.3 - - - com.ckfinder - ckfinder - 2.3 - - - com.ckfinder - ckfinderplugin-fileeditor - 2.3 - - - com.ckfinder - ckfinderplugin-imageresize - 2.3 - - - - - - info.monitorenter - cpdetector - 1.0.7 - - - - com.nis - nis-core - 1.0 - - - - - net.sf.json-lib - json-lib - 2.4 - jdk15 - - - - org.apache.hive - hive-jdbc - 2.1.1 - - - org.apache.logging.log4j - log4j-1.2-api - - - org.apache.logging.log4j - log4j-web - - - org.apache.logging.log4j - log4j-slf4j-impl - - - tomcat - jasper-compiler - - - tomcat - jasper-runtime - - - org.mortbay.jetty - jsp-2.1 - - - - - org.apache.httpcomponents - httpcore - 4.4 - - - jdk.tools - jdk.tools - 1.7 - system - ${JAVA_HOME}/lib/tools.jar - - - org.apache.httpcomponents - httpclient - 4.4 - - - org.apache.httpcomponents - httpmime - 4.4 - - - - - org.springframework.data - spring-data-redis - ${spring-data-redis.version} - - - - org.csource - fastdfs-client-java - 1.27 - - - - - com.alibaba - druid - 1.1.10 - - - - - ru.yandex.clickhouse - clickhouse-jdbc - 0.1.40 - - - - - - io.minio - minio - 3.0.12 - - + 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-service + com.nis.galaxy + galaxy-service + 0.0.1-SNAPSHOT + + + + + nexus + Team Nexus Repository + http://192.168.10.125:8099/content/groups/public + + + + + + + + + + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + [1.0.0,) + + copy-dependencies + + + + + + + + + + + + + + + + + + + + + + + + UTF-8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.mortbay.jetty + maven-jetty-plugin + jar + + + + 8888 + 30000 + + + ${project.build.directory}/${pom.artifactId}-${pom.version} + / + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.7 + 1.7 + UTF-8 + + + + + + + + + + + + + + + + 4.1.7.RELEASE + 3.2.8 + 1.2.3 + 3.3.2 + 2.6.9 + 2.0.4 + + 2.9.3 + 3.0.1 + 1.4.7 + 3.9 + 1.7.7 + 2.9.0 + 1.7.1.RELEASE + UTF-8 + + + + junit + junit + 4.12 + test + + + + com.mangofactory + swagger-springmvc + 1.0.2 + + + + + org.springframework + spring-context-support + ${spring.version} + + + + org.springframework + spring-oxm + ${spring.version} + + + + org.springframework + spring-jdbc + ${spring.version} + + + + org.springframework + spring-webmvc + ${spring.version} + + + + + org.springframework + spring-test + ${spring.version} + + + + org.springframework + spring-web + ${spring.version} + + + + org.springframework + spring-aspects + ${spring.version} + + + + org.sitemesh + sitemesh + ${sitemesh.version} + + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + + + + + + javax.servlet + jstl + 1.2 + runtime + + + + commons-fileupload + commons-fileupload + 1.3.1 + + + + commons-codec + commons-codec + 1.10 + + + + com.github.penggle + kaptcha + 2.3.2 + + + + + com.thoughtworks.xstream + xstream + ${xstream.version} + + + + + com.drewnoakes + metadata-extractor + 2.6.2 + + + + + net.sf.ehcache + ehcache-core + ${ehcache.version} + + + net.sf.ehcache + ehcache-web + ${ehcache-web.version} + + + redis.clients + jedis + ${jedis.version} + + + + + + + org.apache.shiro + shiro-core + ${shiro.version} + + + org.apache.shiro + shiro-spring + ${shiro.version} + + + org.apache.shiro + shiro-cas + ${shiro.version} + + + commons-logging + commons-logging + + + + + org.apache.shiro + shiro-web + ${shiro.version} + + + org.apache.shiro + shiro-ehcache + ${shiro.version} + + + + + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + + + + com.jolbox + bonecp + 0.8.0.RELEASE + + + + mysql + mysql-connector-java + 5.1.36 + + + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + + + + + log4j + log4j + 1.2.14 + + + + org.mybatis + mybatis + ${mybatis.version} + + + + org.mybatis + mybatis-spring + 1.2.2 + + + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${jackson.version} + + + + + org.apache.poi + poi + ${poi.version} + + + org.apache.poi + poi-ooxml + ${poi.version} + + + org.apache.poi + poi-ooxml-schemas + ${poi.version} + + + + + + net.coobird + thumbnailator + 0.4.2 + + + com.ckfinder + apache-ant-zip + 2.3 + + + com.ckfinder + ckfinder + 2.3 + + + com.ckfinder + ckfinderplugin-fileeditor + 2.3 + + + com.ckfinder + ckfinderplugin-imageresize + 2.3 + + + + + + + + net.sf.json-lib + json-lib + 2.4 + jdk15 + + + + org.apache.hive + hive-jdbc + 2.1.1 + + + org.apache.logging.log4j + log4j-1.2-api + + + org.apache.logging.log4j + log4j-web + + + org.apache.logging.log4j + log4j-slf4j-impl + + + tomcat + jasper-compiler + + + tomcat + jasper-runtime + + + org.mortbay.jetty + jsp-2.1 + + + + + org.apache.httpcomponents + httpcore + 4.4 + + + + org.apache.httpcomponents + httpclient + 4.4 + + + org.apache.httpcomponents + httpmime + 4.4 + + + + + org.springframework.data + spring-data-redis + ${spring-data-redis.version} + + + + org.csource + fastdfs-client-java + 1.27 + + + + + com.alibaba + druid + 1.1.10 + + + + + ru.yandex.clickhouse + clickhouse-jdbc + 0.1.40 + + + + + + io.minio + minio + 3.0.12 + + + + com.zdjizhi + galaxy + 1.0 + + + diff --git a/src/main/java/com/nis/domain/BaseEntity.java b/src/main/java/com/nis/domain/BaseEntity.java index 4023dc6..1a8ea68 100644 --- a/src/main/java/com/nis/domain/BaseEntity.java +++ b/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; /** diff --git a/src/main/java/com/nis/domain/Page.java b/src/main/java/com/nis/domain/Page.java index d07816e..366ded9 100644 --- a/src/main/java/com/nis/domain/Page.java +++ b/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; /** diff --git a/src/main/java/com/nis/domain/SysUser.java b/src/main/java/com/nis/domain/SysUser.java index 1ad76b1..a6afb20 100644 --- a/src/main/java/com/nis/domain/SysUser.java +++ b/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; diff --git a/src/main/java/com/nis/domain/TreeEntity.java b/src/main/java/com/nis/domain/TreeEntity.java index 5788dfe..f054ec4 100644 --- a/src/main/java/com/nis/domain/TreeEntity.java +++ b/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类 diff --git a/src/main/java/com/nis/util/CamelUnderlineUtil.java b/src/main/java/com/nis/util/CamelUnderlineUtil.java index 52c1571..a8a34b6 100644 --- a/src/main/java/com/nis/util/CamelUnderlineUtil.java +++ b/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(这里用一句话描述这个类的作用) diff --git a/src/main/java/com/nis/util/CompileVal.java b/src/main/java/com/nis/util/CompileVal.java index 6f677fa..f5a13d1 100644 --- a/src/main/java/com/nis/util/CompileVal.java +++ b/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() + "的配置在修改时不能为有效", diff --git a/src/main/java/com/nis/util/Configurations.java b/src/main/java/com/nis/util/Configurations.java index 9332e86..135a35c 100644 --- a/src/main/java/com/nis/util/Configurations.java +++ b/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; diff --git a/src/main/java/com/nis/util/DateUtils.java b/src/main/java/com/nis/util/DateUtils.java index 7b883ef..d8c0c69 100644 --- a/src/main/java/com/nis/util/DateUtils.java +++ b/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; diff --git a/src/main/java/com/nis/util/DictUtils.java b/src/main/java/com/nis/util/DictUtils.java index 5c1303f..599dac6 100644 --- a/src/main/java/com/nis/util/DictUtils.java +++ b/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; diff --git a/src/main/java/com/nis/util/FileUtils.java b/src/main/java/com/nis/util/FileUtils.java index 579116b..b280424 100644 --- a/src/main/java/com/nis/util/FileUtils.java +++ b/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; diff --git a/src/main/java/com/nis/util/GroupReuseVal.java b/src/main/java/com/nis/util/GroupReuseVal.java index ab9311d..7eeebf1 100644 --- a/src/main/java/com/nis/util/GroupReuseVal.java +++ b/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 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() diff --git a/src/main/java/com/nis/util/HiveJDBC.java b/src/main/java/com/nis/util/HiveJDBC.java index 0683530..527c38a 100644 --- a/src/main/java/com/nis/util/HiveJDBC.java +++ b/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 { diff --git a/src/main/java/com/nis/util/JsonDateDeserializer.java b/src/main/java/com/nis/util/JsonDateDeserializer.java index 2e9181b..175c0f5 100644 --- a/src/main/java/com/nis/util/JsonDateDeserializer.java +++ b/src/main/java/com/nis/util/JsonDateDeserializer.java @@ -30,7 +30,7 @@ public class JsonDateDeserializer extends JsonDeserializer { // 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; } diff --git a/src/main/java/com/nis/util/JsonDateSerializer.java b/src/main/java/com/nis/util/JsonDateSerializer.java index ad9af75..c323e2a 100644 --- a/src/main/java/com/nis/util/JsonDateSerializer.java +++ b/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 { 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)); } } diff --git a/src/main/java/com/nis/util/LogJDBCByDruid.java b/src/main/java/com/nis/util/LogJDBCByDruid.java index 0f68fd9..7f4d3dc 100644 --- a/src/main/java/com/nis/util/LogJDBCByDruid.java +++ b/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 { diff --git a/src/main/java/com/nis/util/LogUtils.java b/src/main/java/com/nis/util/LogUtils.java index 0ffc9e6..e4d6bd5 100644 --- a/src/main/java/com/nis/util/LogUtils.java +++ b/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; diff --git a/src/main/java/com/nis/util/PropertyPlaceholderConfigurerCrypt.java b/src/main/java/com/nis/util/PropertyPlaceholderConfigurerCrypt.java index 81df278..5b51ca7 100644 --- a/src/main/java/com/nis/util/PropertyPlaceholderConfigurerCrypt.java +++ b/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 { diff --git a/src/main/java/com/nis/util/ReadCommSourceXmlUtil.java b/src/main/java/com/nis/util/ReadCommSourceXmlUtil.java index 227e70b..05ed66a 100644 --- a/src/main/java/com/nis/util/ReadCommSourceXmlUtil.java +++ b/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; diff --git a/src/main/java/com/nis/util/ServiceAndRDBIndexReal.java b/src/main/java/com/nis/util/ServiceAndRDBIndexReal.java index 7f4be47..b7427c1 100644 --- a/src/main/java/com/nis/util/ServiceAndRDBIndexReal.java +++ b/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; diff --git a/src/main/java/com/nis/util/TreeUtil.java b/src/main/java/com/nis/util/TreeUtil.java index 50094bd..5ee53ee 100644 --- a/src/main/java/com/nis/util/TreeUtil.java +++ b/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; /** * 将树构建成上下层结构 diff --git a/src/main/java/com/nis/util/elasticsearch/ElasticsearchSqlDao.java b/src/main/java/com/nis/util/elasticsearch/ElasticsearchSqlDao.java index c859789..e620394 100644 --- a/src/main/java/com/nis/util/elasticsearch/ElasticsearchSqlDao.java +++ b/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; diff --git a/src/main/java/com/nis/web/controller/LoginController.java b/src/main/java/com/nis/web/controller/LoginController.java index 6b37357..00e711d 100644 --- a/src/main/java/com/nis/web/controller/LoginController.java +++ b/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; diff --git a/src/main/java/com/nis/web/controller/restful/ConfigFileController.java b/src/main/java/com/nis/web/controller/restful/ConfigFileController.java index f5bbda9..7191a6a 100644 --- a/src/main/java/com/nis/web/controller/restful/ConfigFileController.java +++ b/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) - bis.close(); - if (bos != null) - bos.close(); + if (bis != null) { + bis.close(); + } + + if (bos != null) { + bos.close(); + } + } catch (Exception e2) { thread.setExceptionInfo(e2.getMessage()+" "+e2.getCause()); logger.error(e2.toString()); diff --git a/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java b/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java index 21d3944..e54ee69 100644 --- a/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java +++ b/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; diff --git a/src/main/java/com/nis/web/controller/restful/LogController.java b/src/main/java/com/nis/web/controller/restful/LogController.java index 40e6283..4296f42 100644 --- a/src/main/java/com/nis/web/controller/restful/LogController.java +++ b/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 map = DateUtils.getLocalTime(entity.getSearchFoundStartTime(), entity.getSearchFoundEndTime(), Constants.LOG_LOCAL_TIME, "minute"); entity.setSearchFoundStartTime(map.get("startTime")); diff --git a/src/main/java/com/nis/web/controller/restful/MaatTestController.java b/src/main/java/com/nis/web/controller/restful/MaatTestController.java index b5392a0..c3f4c02 100644 --- a/src/main/java/com/nis/web/controller/restful/MaatTestController.java +++ b/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; diff --git a/src/main/java/com/nis/web/controller/restful/MmLogSearchController.java b/src/main/java/com/nis/web/controller/restful/MmLogSearchController.java index af0634c..50d0808 100644 --- a/src/main/java/com/nis/web/controller/restful/MmLogSearchController.java +++ b/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 map = DateUtils.getLocalTime(entity.getSearchFoundStartTime(), entity.getSearchFoundEndTime(), Constants.LOG_LOCAL_TIME, "minute"); entity.setSearchFoundStartTime(map.get("startTime")); diff --git a/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java b/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java index 54e57fe..1ad03ee 100644 --- a/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java +++ b/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 map = DateUtils.getLocalTime(entity.getSearchFoundStartTime(), entity.getSearchFoundEndTime(), Constants.LOG_LOCAL_TIME, "minute"); entity.setSearchFoundStartTime(map.get("startTime")); diff --git a/src/main/java/com/nis/web/controller/restful/SingleDimensionReport.java b/src/main/java/com/nis/web/controller/restful/SingleDimensionReport.java index 675c68f..382d2ea 100644 --- a/src/main/java/com/nis/web/controller/restful/SingleDimensionReport.java +++ b/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; diff --git a/src/main/java/com/nis/web/controller/restful/SystemFunStatusController.java b/src/main/java/com/nis/web/controller/restful/SystemFunStatusController.java index 3c1716e..70d6575 100644 --- a/src/main/java/com/nis/web/controller/restful/SystemFunStatusController.java +++ b/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; diff --git a/src/main/java/com/nis/web/controller/sys/AreaController.java b/src/main/java/com/nis/web/controller/sys/AreaController.java index dbb8048..d26fba8 100644 --- a/src/main/java/com/nis/web/controller/sys/AreaController.java +++ b/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; diff --git a/src/main/java/com/nis/web/controller/sys/DictController.java b/src/main/java/com/nis/web/controller/sys/DictController.java index dce06a6..61c7639 100644 --- a/src/main/java/com/nis/web/controller/sys/DictController.java +++ b/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 diff --git a/src/main/java/com/nis/web/controller/sys/MenuController.java b/src/main/java/com/nis/web/controller/sys/MenuController.java index 4c1e3de..abb9db7 100644 --- a/src/main/java/com/nis/web/controller/sys/MenuController.java +++ b/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; diff --git a/src/main/java/com/nis/web/controller/sys/OfficeController.java b/src/main/java/com/nis/web/controller/sys/OfficeController.java index 706c5a6..b982285 100644 --- a/src/main/java/com/nis/web/controller/sys/OfficeController.java +++ b/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; diff --git a/src/main/java/com/nis/web/controller/sys/RoleController.java b/src/main/java/com/nis/web/controller/sys/RoleController.java index 1b44dbb..a792c44 100644 --- a/src/main/java/com/nis/web/controller/sys/RoleController.java +++ b/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; diff --git a/src/main/java/com/nis/web/controller/sys/UserController.java b/src/main/java/com/nis/web/controller/sys/UserController.java index 836bc0f..e060b29 100644 --- a/src/main/java/com/nis/web/controller/sys/UserController.java +++ b/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; diff --git a/src/main/java/com/nis/web/security/FormAuthenticationFilter.java b/src/main/java/com/nis/web/security/FormAuthenticationFilter.java index cbe2f0d..2d0f373 100644 --- a/src/main/java/com/nis/web/security/FormAuthenticationFilter.java +++ b/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); diff --git a/src/main/java/com/nis/web/security/SystemAuthorizingRealm.java b/src/main/java/com/nis/web/security/SystemAuthorizingRealm.java index e638b38..752e8e8 100644 --- a/src/main/java/com/nis/web/security/SystemAuthorizingRealm.java +++ b/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; diff --git a/src/main/java/com/nis/web/security/UserUtils.java b/src/main/java/com/nis/web/security/UserUtils.java index 77ac58e..6ab2a7e 100644 --- a/src/main/java/com/nis/web/security/UserUtils.java +++ b/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; diff --git a/src/main/java/com/nis/web/service/AreaService.java b/src/main/java/com/nis/web/service/AreaService.java index 64c3123..9f03e87 100644 --- a/src/main/java/com/nis/web/service/AreaService.java +++ b/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; diff --git a/src/main/java/com/nis/web/service/BaseLogService.java b/src/main/java/com/nis/web/service/BaseLogService.java index 1f40d64..bcd610b 100644 --- a/src/main/java/com/nis/web/service/BaseLogService.java +++ b/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; /** diff --git a/src/main/java/com/nis/web/service/DictService.java b/src/main/java/com/nis/web/service/DictService.java index d7cec3d..b16a418 100644 --- a/src/main/java/com/nis/web/service/DictService.java +++ b/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.nis.util.StringUtil; +import com.zdjizhi.utils.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)){ diff --git a/src/main/java/com/nis/web/service/HiveSqlService.java b/src/main/java/com/nis/web/service/HiveSqlService.java index 8730251..07cf736 100644 --- a/src/main/java/com/nis/web/service/HiveSqlService.java +++ b/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 { diff --git a/src/main/java/com/nis/web/service/MenuService.java b/src/main/java/com/nis/web/service/MenuService.java index 935b7cc..aa6cfaf 100644 --- a/src/main/java/com/nis/web/service/MenuService.java +++ b/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; diff --git a/src/main/java/com/nis/web/service/OfficeService.java b/src/main/java/com/nis/web/service/OfficeService.java index 594fabb..a28b54e 100644 --- a/src/main/java/com/nis/web/service/OfficeService.java +++ b/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 diff --git a/src/main/java/com/nis/web/service/RoleService.java b/src/main/java/com/nis/web/service/RoleService.java index bea2c12..9bda0c2 100644 --- a/src/main/java/com/nis/web/service/RoleService.java +++ b/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; diff --git a/src/main/java/com/nis/web/service/SystemService.java b/src/main/java/com/nis/web/service/SystemService.java index acf2fd6..cbf123a 100644 --- a/src/main/java/com/nis/web/service/SystemService.java +++ b/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.nis.util.StringUtil; -import com.nis.util.TimeConstants; +import com.zdjizhi.utils.StringUtil; 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 ipLookUp(String ip) { - return srcIpDao.getIpInfo(IpUtil.getIpHostDesimal(ip)); + return srcIpDao.getIpInfo(IPUtil.getIpHostDesimal(ip)); } diff --git a/src/main/java/com/nis/web/service/TreeService.java b/src/main/java/com/nis/web/service/TreeService.java index d78b54c..c21e567 100644 --- a/src/main/java/com/nis/web/service/TreeService.java +++ b/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; diff --git a/src/main/java/com/nis/web/service/UserService.java b/src/main/java/com/nis/web/service/UserService.java index 7f444d0..f9e7568 100644 --- a/src/main/java/com/nis/web/service/UserService.java +++ b/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; diff --git a/src/main/java/com/nis/web/service/restful/ConfigPzIdService.java b/src/main/java/com/nis/web/service/restful/ConfigPzIdService.java index 4e85f10..fc7cfe0 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigPzIdService.java +++ b/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; 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 45f4740..9c756af 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java +++ b/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 dstMap = new HashMap(); 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); diff --git a/src/main/java/com/nis/web/service/restful/MaatTestServiceimpl.java b/src/main/java/com/nis/web/service/restful/MaatTestServiceimpl.java index 4c775e5..85c3319 100644 --- a/src/main/java/com/nis/web/service/restful/MaatTestServiceimpl.java +++ b/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; diff --git a/src/main/resources/dat/all_ip_info_v4.mmdb b/src/main/resources/dat/all_ip_info_v4.mmdb new file mode 100644 index 0000000..ccbe14f Binary files /dev/null and b/src/main/resources/dat/all_ip_info_v4.mmdb differ diff --git a/src/main/resources/dat/all_ip_info_v6.mmdb b/src/main/resources/dat/all_ip_info_v6.mmdb new file mode 100644 index 0000000..cf82ebe Binary files /dev/null and b/src/main/resources/dat/all_ip_info_v6.mmdb differ diff --git a/src/test/java/com/nis/test/CryptTest.java b/src/test/java/com/nis/test/CryptTest.java index ed66a7c..f274a13 100644 --- a/src/test/java/com/nis/test/CryptTest.java +++ b/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 { diff --git a/src/test/java/com/nis/test/IpLocationTest.java b/src/test/java/com/nis/test/IpLocationTest.java new file mode 100644 index 0000000..5085aa5 --- /dev/null +++ b/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")); + + } +} diff --git a/src/test/java/com/nis/test/RestfulTest.java b/src/test/java/com/nis/test/RestfulTest.java index 2bbe71d..89d49a6 100644 --- a/src/test/java/com/nis/test/RestfulTest.java +++ b/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