From c22fb6132251a4dda0b88add9dce50f0fba85f77 Mon Sep 17 00:00:00 2001
From: "castle.zang" <loveCode1314>
Date: Mon, 5 Dec 2022 15:08:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9core=20maven=E7=9A=84?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/base/WhiteController.java           |  2 -
 pom.xml                                            | 88 ++++++++++++----------
 2 files changed, 49 insertions(+), 41 deletions(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java
index 8ce2c2a..be7c275 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java
@@ -66,7 +66,6 @@ import com.google.common.cache.CacheBuilder;
 import com.taobao.api.ApiException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import lombok.val;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
@@ -87,7 +86,6 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiFunction;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * @Description :
diff --git a/pom.xml b/pom.xml
index 2055206..1eb31a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
         <skipTests>true</skipTests>
         <app.charset>UTF-8</app.charset>
         <app.jdk.version>1.8</app.jdk.version>
-        <project.dependency.version>1.0-TEST-SNAPSHOT</project.dependency.version>
+<!--        <project.dependency.version>1.0-TEST-SNAPSHOT</project.dependency.version>-->
         <log4j2.version>2.18.0</log4j2.version>
         <qms.icloud.version>1.0.0.1</qms.icloud.version>
         <eam.icloud.version>1.0.0.1</eam.icloud.version>
@@ -46,6 +46,27 @@
         <jackson.annotation.version>2.13.2</jackson.annotation.version>
         <project.patch.version>1.0.0.1-patch</project.patch.version>
         <xstream.version>1.4.19</xstream.version>
+        <impp.framework.boot.version>1.0.0.3</impp.framework.boot.version>
+        <i3plus.core.icloud.version>1.0.0.1</i3plus.core.icloud.version>
+        <i3plus.wms.icloud.version>1.0.0.1</i3plus.wms.icloud.version>
+        <i3plus.mes.icloud.version>1.0.0.1</i3plus.mes.icloud.version>
+        <i3plus.mes-pcn.icloud.version>1.0.0.1</i3plus.mes-pcn.icloud.version>
+        <i3plus.ptl.icloud.version>1.0.0.1</i3plus.ptl.icloud.version>
+        <i3plus.andon.icloud.version>1.0.0.1</i3plus.andon.icloud.version>
+        <i3plus.form.icloud.version>1.0.0.1</i3plus.form.icloud.version>
+        <i3plus.icloud.core.version>1.0.0.1</i3plus.icloud.core.version>
+        <i3plus.pojo.platform.version>1.0.0.1</i3plus.pojo.platform.version>
+        <i3plus.screen.icloud.version>1.0.0.1</i3plus.screen.icloud.version>
+        <i3plus.sdk.sms.version>1.0.0.1</i3plus.sdk.sms.version>
+        <i3plus.pojo.mes.version>1.0.0.1</i3plus.pojo.mes.version>
+        <i3plus.pojo.base.version>1.0.0.1</i3plus.pojo.base.version>
+        <i3plus.mdm.pojo.version>1.0.0.1</i3plus.mdm.pojo.version>
+        <i3plus.softwitch.icloud.version>1.0.0.1</i3plus.softwitch.icloud.version>
+        <i3plus.model.pojo.version>1.0.0.1</i3plus.model.pojo.version>
+        <i3plus.sdk.dingtalk.version>1.0.0.1</i3plus.sdk.dingtalk.version>
+        <i3plus.platform.plugin.version>1.0.0.1</i3plus.platform.plugin.version>
+        <i3plus.from.icloud.version>1.0.0.1</i3plus.from.icloud.version>
+        <i3plus.mdm.icloud.version>1.0.0.1</i3plus.mdm.icloud.version>
     </properties>
 
     <dependencies>
@@ -56,13 +77,14 @@
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>druid</artifactId>
-                <version>1.2.8</version>
+                <version>1.2.15</version>
             </dependency>
             <!-- impp framework -->
             <dependency>
                 <groupId>impp.framework</groupId>
                 <artifactId>impp-framework-boot</artifactId>
-                <version>${project.dependency.version}</version>
+                <version>${impp.framework.boot.version}</version>
+
             </dependency>
 
             <dependency>
@@ -81,66 +103,62 @@
             <dependency>
                 <groupId>i3plus.core</groupId>
                 <artifactId>i3plus-core-icloud</artifactId>
-                <version>${project.dependency.version}</version>
+                <version>${i3plus.core.icloud.version}</version>
+
             </dependency>
-           <!-- <dependency>
-                <groupId>i3plus.ext.cdm</groupId>
-                <artifactId>i3plus-ext-cdm-icloud</artifactId>
-                <version>1.0.0.1</version>
-            </dependency>-->
             <dependency>
                 <groupId>i3plus.icloud</groupId>
                 <artifactId>i3plus-icloud-wms</artifactId>
-                <version>${project.dependency.version}</version>
+                <version>${i3plus.wms.icloud.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>i3plus.icloud</groupId>
                 <artifactId>i3plus-icloud-mes</artifactId>
-                <version>${project.dependency.version}</version>
+                <version>${i3plus.mes.icloud.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>i3plus.icloud</groupId>
                 <artifactId>i3plus-icloud-mes-pcn</artifactId>
-                <version>${project.dependency.version}</version>
+                <version>${i3plus.mes-pcn.icloud.version}</version>
             </dependency>
 
 
             <dependency>
                 <groupId>i3plus.icloud</groupId>
                 <artifactId>i3plus-icloud-ptl</artifactId>
-                <version>${project.dependency.version}</version>
+                <version>${i3plus.ptl.icloud.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>i3plus.icloud</groupId>
                 <artifactId>i3plus-icloud-andon</artifactId>
-                <version>${project.dependency.version}</version>
+                <version>${i3plus.andon.icloud.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>i3plus.icloud</groupId>
                 <artifactId>i3plus-icloud-form</artifactId>
-                <version>${project.dependency.version}</version>
+                <version>${i3plus.from.icloud.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>i3plus.icloud</groupId>
                 <artifactId>i3plus-icloud-softswitch</artifactId>
-                <version>${project.dependency.version}</version>
+                <version>${i3plus.softwitch.icloud.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>i3plus.icloud</groupId>
                 <artifactId>i3plus-icloud-mdm</artifactId>
-                <version>${project.dependency.version}</version>
+                <version>${i3plus.mdm.icloud.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>i3plus.icloud</groupId>
                 <artifactId>i3plus-icloud-screen</artifactId>
-                <version>${project.dependency.version}</version>
+                <version>${i3plus.screen.icloud.version}</version>
             </dependency>
 
             <dependency>
@@ -159,13 +177,13 @@
             <dependency>
                 <groupId>i3plus.pojo</groupId>
                 <artifactId>i3plus-pojo-model</artifactId>
-                <version>${project.dependency.version}</version>
+                <version>${i3plus.model.pojo.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>i3plus.pojo</groupId>
                 <artifactId>i3plus-pojo-mdm</artifactId>
-                <version>${project.dependency.version}</version>
+                <version>${i3plus.mdm.pojo.version}</version>
             </dependency>
 
             <!-- 内部依赖声明 -->
@@ -178,19 +196,22 @@
             <dependency>
                 <groupId>i3plus.sdk</groupId>
                 <artifactId>i3plus-sdk-dingtalk</artifactId>
-                <version>${project.dependency.version}</version>
+<!--                <version>${i3plus.sdk.dingtalk.version}</version>-->
+                <version>1.0-TEST-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>i3plus.sdk</groupId>
                 <artifactId>i3plus-sdk-wechat</artifactId>
-                <version>${project.dependency.version}</version>
+<!--                <version>${i3plus.sdk.wechat.version}</version>-->
+                <version>1.0-TEST-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>i3plus.sdk</groupId>
                 <artifactId>i3plus-sdk-sms</artifactId>
-                <version>${project.dependency.version}</version>
+<!--                <version>${i3plus.sdk.sms.version}</version>-->
+                <version>1.0-TEST-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -202,41 +223,30 @@
             <dependency>
                 <groupId>i3plus.platform</groupId>
                 <artifactId>i3plus-platform-plugin</artifactId>
-                <version>${project.dependency.version}</version>
+                <version>${i3plus.platform.plugin.version}</version>
             </dependency>
 
-<!--            <dependency>-->
-<!--                <groupId>i3plus.platform</groupId>-->
-<!--                <artifactId>i3plus-platform-plugin</artifactId>-->
-<!--                <version>${project.dependency.version}</version>-->
-<!--            </dependency>-->
             <dependency>
                 <groupId>i3plus.pojo</groupId>
                 <artifactId>i3plus-pojo-platform</artifactId>
-                <version>${project.dependency.version}</version>
+                <version>${i3plus.pojo.platform.version}</version>
             </dependency>
             <dependency>
                 <groupId>i3plus.pojo</groupId>
                 <artifactId>i3plus-pojo-mes</artifactId>
-                <version>${project.dependency.version}</version>
+                <version>${i3plus.pojo.mes.version}</version>
             </dependency>
             <dependency>
                 <groupId>i3plus.pojo</groupId>
                 <artifactId>i3plus-pojo-base</artifactId>
-                <version>${project.dependency.version}</version>
+                <version>${i3plus.pojo.base.version}</version>
             </dependency>
 
-<!--            <dependency>-->
-<!--                <groupId>i3plus.pojo</groupId>-->
-<!--                <artifactId>i3plus-pojo-mes</artifactId>-->
-<!--                <version>${project.dependency.version}</version>-->
-<!--            </dependency>-->
-
             <!-- 微朝调用 -->
             <dependency>
                 <groupId>i3plus.icloud</groupId>
                 <artifactId>i3plus-icloud-core</artifactId>
-                <version>${project.dependency.version}</version>
+                <version>${i3plus.icloud.core.version}</version>
             </dependency>
 
           <!-- mysql -->