diff --git a/modules/i3plus-core-api/pom.xml b/modules/i3plus-core-api/pom.xml index bc1be0a..6763680 100644 --- a/modules/i3plus-core-api/pom.xml +++ b/modules/i3plus-core-api/pom.xml @@ -21,11 +21,9 @@ i3plus.pojo i3plus-pojo-mes - - - org.apache.shiro - shiro-core + i3plus.pojo + i3plus-pojo-wms diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java index 452e650..61fe9d1 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.core.api.iservice.busi; import cn.estsh.i3plus.pojo.platform.bean.LogOperate; -import cn.estsh.i3plus.pojo.platform.bean.LogOperate; import java.util.List; diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml index 1955290..91c8706 100644 --- a/modules/i3plus-core-apiservice/pom.xml +++ b/modules/i3plus-core-apiservice/pom.xml @@ -23,7 +23,10 @@ i3plus.pojo i3plus-pojo-base - + + i3plus.pojo + i3plus-pojo-wms + @@ -57,43 +60,11 @@ commons-lang3 - - - org.apache.shiro - shiro-core - - - org.apache.shiro - shiro-spring - - - org.apache.shiro - shiro-web - - - org.apache.shiro - shiro-ehcache - - com.alibaba fastjson - - - - net.sf.ehcache - ehcache-core - - - i3plus.pojo - i3plus-pojo-mes - - - org.slf4j - slf4j-api - diff --git a/pom.xml b/pom.xml index 160703c..c78e118 100644 --- a/pom.xml +++ b/pom.xml @@ -44,12 +44,6 @@ - - - i3plus.pojo - i3plus-pojo-wms - ${project.version} - @@ -63,6 +57,12 @@ i3plus.pojo + i3plus-pojo-base + ${project.version} + + + + i3plus.pojo i3plus-pojo-model ${project.version} @@ -97,7 +97,7 @@ i3plus.pojo - i3plus-pojo-mes + i3plus-pojo-wms ${project.version} @@ -115,28 +115,6 @@ 3.8.1 - - - org.apache.shiro - shiro-core - 1.4.0 - - - org.apache.shiro - shiro-web - 1.4.0 - - - org.apache.shiro - shiro-spring - 1.4.0 - - - org.apache.shiro - shiro-ehcache - 1.4.0 - - com.alibaba @@ -153,9 +131,6 @@ - - - @@ -180,9 +155,6 @@ - - - @@ -216,7 +188,7 @@ prod true - http://git.evun.cn/GCDC-MES-SERVICE/PLATFORM_PROD_EXEC.git + http://git.estsh.com/i3-IMPP/i3plus-core.git v@{project.version}