From 70facfe86b1a7c7ab47a9aa1cd87675d14b183bf Mon Sep 17 00:00:00 2001
From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com>
Date: Mon, 29 Oct 2018 14:58:40 +0800
Subject: [PATCH] =?UTF-8?q?pom=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/i3plus-core-api/pom.xml                    |  6 +--
 .../core/api/iservice/busi/ILogOperateService.java |  1 -
 modules/i3plus-core-apiservice/pom.xml             | 37 ++----------------
 pom.xml                                            | 44 ++++------------------
 4 files changed, 14 insertions(+), 74 deletions(-)

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 @@
             <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-mes</artifactId>
         </dependency>
-
-        <!-- shiro -->
         <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-core</artifactId>
+            <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-wms</artifactId>
         </dependency>
     </dependencies>
 
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 @@
             <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-base</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-wms</artifactId>
+        </dependency>
 
         <!-- api调用 -->
         <dependency>
@@ -57,43 +60,11 @@
             <artifactId>commons-lang3</artifactId>
         </dependency>
 
-        <!-- shiro -->
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-spring</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-ehcache</artifactId>
-        </dependency>
-
         <!-- fastjson -->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
         </dependency>
-
-        <!-- ehcache缓存 -->
-        <dependency>
-            <groupId>net.sf.ehcache</groupId>
-            <artifactId>ehcache-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>i3plus.pojo</groupId>
-            <artifactId>i3plus-pojo-mes</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/pom.xml b/pom.xml
index 160703c..c78e118 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,12 +44,6 @@
     </properties>
 
     <dependencies>
-        <!-- 外部对象模型 -->
-        <dependency>
-            <groupId>i3plus.pojo</groupId>
-            <artifactId>i3plus-pojo-wms</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
 
     <dependencyManagement>
@@ -63,6 +57,12 @@
 
             <dependency>
                 <groupId>i3plus.pojo</groupId>
+                <artifactId>i3plus-pojo-base</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>i3plus.pojo</groupId>
                 <artifactId>i3plus-pojo-model</artifactId>
                 <version>${project.version}</version>
             </dependency>
@@ -97,7 +97,7 @@
 
             <dependency>
                 <groupId>i3plus.pojo</groupId>
-                <artifactId>i3plus-pojo-mes</artifactId>
+                <artifactId>i3plus-pojo-wms</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
@@ -115,28 +115,6 @@
                 <version>3.8.1</version>
             </dependency>
 
-            <!-- shiro -->
-            <dependency>
-                <groupId>org.apache.shiro</groupId>
-                <artifactId>shiro-core</artifactId>
-                <version>1.4.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.shiro</groupId>
-                <artifactId>shiro-web</artifactId>
-                <version>1.4.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.shiro</groupId>
-                <artifactId>shiro-spring</artifactId>
-                <version>1.4.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.shiro</groupId>
-                <artifactId>shiro-ehcache</artifactId>
-                <version>1.4.0</version>
-            </dependency>
-
             <!-- json -->
             <dependency>
                 <groupId>com.alibaba</groupId>
@@ -153,9 +131,6 @@
         </dependencies>
     </dependencyManagement>
 
-
-
-
     <!-- 私有仓库引用配置 -->
     <repositories>
         <repository>
@@ -180,9 +155,6 @@
         </snapshotRepository>
     </distributionManagement>
 
-
-
-
     <build>
         <plugins>
             <!-- maven编译的一些插件 -->
@@ -216,7 +188,7 @@
                 <configuration>
                     <releaseProfiles>prod</releaseProfiles>
                     <autoVersionSubmodules>true</autoVersionSubmodules>
-                    <tagBase>http://git.evun.cn/GCDC-MES-SERVICE/PLATFORM_PROD_EXEC.git</tagBase>
+                    <tagBase>http://git.estsh.com/i3-IMPP/i3plus-core.git</tagBase>
                     <tagNameFormat>v@{project.version}</tagNameFormat>
                 </configuration>
             </plugin>