diff --git a/erp-hyc-interfaces-api/pom.xml b/erp-hyc-interfaces-api/pom.xml
index 2f29eaf07c82ae64b45fb77cbaac19a7b21be9af..bb69ad1f97d694efd76d9c615db76fbfb4d438c2 100644
--- a/erp-hyc-interfaces-api/pom.xml
+++ b/erp-hyc-interfaces-api/pom.xml
@@ -68,10 +68,6 @@
eu.bitwalker
UserAgentUtils
-
- log4j
- log4j
-
javax.validation
validation-api
@@ -80,6 +76,10 @@
org.slf4j
slf4j-api
+
+ org.slf4j
+ jcl-over-slf4j
+
junit
junit
@@ -95,6 +95,41 @@
quartz
2.3.0
+
+ ch.qos.logback
+ logback-classic
+
+
+ org.springframework.security
+ spring-security-web
+
+
+ org.springframework
+ spring-web
+
+
+
+
+ org.springframework.security
+ spring-security-config
+
+
+ org.springframework.security
+ spring-security-config
+ ${spring-security.version}
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+
erp-hyc-interfaces-api
diff --git a/erp-hyc-interfaces-backend/pom.xml b/erp-hyc-interfaces-backend/pom.xml
index 265927cbbcf2303cee30a418718050866aaa27c1..7dd7371c5a8669eb23152cd0aa57c4d06a2a4608 100644
--- a/erp-hyc-interfaces-backend/pom.xml
+++ b/erp-hyc-interfaces-backend/pom.xml
@@ -80,7 +80,6 @@
ojdbc6
11.2.0.3
-
com.oracle
orai18n
@@ -97,6 +96,22 @@
21.0
compile
+
+ org.apache.commons
+ commons-lang3
+
+
+ com.google.guava
+ guava
+
+
+ org.springframework
+ spring-web
+
+
+ org.springframework
+ spring-jdbc
+
diff --git a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/BackHYCOrderServiceImpl.java b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/BackHYCOrderServiceImpl.java
index e11b1d0d9a285210bc7430eea4d492f8f71ba275..29e96839452b3de7f0a397d058149d15ae79a954 100644
--- a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/BackHYCOrderServiceImpl.java
+++ b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/BackHYCOrderServiceImpl.java
@@ -1,7 +1,6 @@
package com.unlcn.erp.hyc.interfaces.backend.service;
import cn.huiyunche.commons.exception.BusinessException;
-import com.alibaba.dubbo.common.utils.CollectionUtils;
import com.unlcn.erp.hyc.interfaces.backend.enums.TransitStatusEnum;
import com.unlcn.erp.hyc.interfaces.base.mapper.HycbackMapper;
import com.unlcn.erp.hyc.interfaces.base.mapper.HycwaybilldetailMapper;
@@ -10,6 +9,7 @@ import com.unlcn.erp.hyc.interfaces.base.mapper.SoshiplineMapper;
import com.unlcn.erp.hyc.interfaces.base.model.Hycback;
import com.unlcn.erp.hyc.interfaces.base.model.Hycwaybilldetail;
import com.unlcn.erp.hyc.interfaces.base.model.Soorder;
+import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallPayCodesServiceImpl.java b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallPayCodesServiceImpl.java
index 2eec34a33fef22e0cdb51bd085d961dc4e83dce1..dc8e7a6871125d9b1cf464b7f93d1c45b9db99d3 100644
--- a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallPayCodesServiceImpl.java
+++ b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallPayCodesServiceImpl.java
@@ -1,6 +1,6 @@
package com.unlcn.erp.hyc.interfaces.backend.service;
-import com.alibaba.dubbo.common.utils.CollectionUtils;
+
import com.alibaba.fastjson.JSONObject;
import com.unlcn.erp.hyc.interfaces.backend.bo.PayBillDetail;
import com.unlcn.erp.hyc.interfaces.backend.bo.PayBillMain;
@@ -8,6 +8,7 @@ import com.unlcn.erp.hyc.interfaces.backend.bo.PayCodesDB;
import com.unlcn.erp.hyc.interfaces.backend.enums.CallHYCUrlTypeEnum;
import com.unlcn.erp.hyc.interfaces.base.mapper.*;
import com.unlcn.erp.hyc.interfaces.base.model.*;
+import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
diff --git a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallReceivableCodesServiceImpl.java b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallReceivableCodesServiceImpl.java
index a13c51baa21ebb1a3ea567dcae526e6f2750c872..68ee3aaedc60b57612403dbe134129a10334525a 100644
--- a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallReceivableCodesServiceImpl.java
+++ b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallReceivableCodesServiceImpl.java
@@ -1,6 +1,5 @@
package com.unlcn.erp.hyc.interfaces.backend.service;
-import com.alibaba.dubbo.common.utils.CollectionUtils;
import com.alibaba.fastjson.JSONObject;
import com.unlcn.erp.hyc.interfaces.backend.bo.ReceivableBillDetail;
import com.unlcn.erp.hyc.interfaces.backend.bo.ReceivableBillMain;
@@ -8,6 +7,7 @@ import com.unlcn.erp.hyc.interfaces.backend.bo.ReceivableCodesDB;
import com.unlcn.erp.hyc.interfaces.backend.enums.CallHYCUrlTypeEnum;
import com.unlcn.erp.hyc.interfaces.base.mapper.*;
import com.unlcn.erp.hyc.interfaces.base.model.*;
+import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
diff --git a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/ExecptionDisposeServiceImpl.java b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/ExecptionDisposeServiceImpl.java
index f8aab27d1f31f4f05fdc50594778aaa8aef30dd7..4eec53582eee8c00e1e92845b8615f8b7f8857f9 100644
--- a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/ExecptionDisposeServiceImpl.java
+++ b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/ExecptionDisposeServiceImpl.java
@@ -1,6 +1,5 @@
package com.unlcn.erp.hyc.interfaces.backend.service;
-import com.alibaba.dubbo.common.utils.CollectionUtils;
import com.unlcn.erp.hyc.interfaces.backend.enums.CallHYCUrlTypeEnum;
import com.unlcn.erp.hyc.interfaces.base.mapper.HycExceptionMsgMapper;
import com.unlcn.erp.hyc.interfaces.base.mapper.SoshiplineMapper;
@@ -9,6 +8,7 @@ import com.unlcn.erp.hyc.interfaces.base.model.HycExceptionMsg;
import com.unlcn.erp.hyc.interfaces.base.model.Soshipline;
import com.unlcn.erp.hyc.interfaces.base.model.Soshiplinebackhyc;
import com.unlcn.erp.hyc.interfaces.base.model.bo.HycExceptionMsgBo;
+import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/pom.xml b/pom.xml
index e849e26b81a42d578c087b18ba983b51f859e922..5099bd2607faf49e0d51f52faee3ec9f18281c2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,12 +22,16 @@
4.2.5.RELEASE
1.0.0-SNAPSHOT
6.8
- 1.7.12
3.2.8
4.0.4.RELEASE
https://git.oschina.net/unlcn-ils/sys.git
1.8
- 1.8
+ 3.5
+ 21.0
+ 1.2.3
+ 1.7.12
+ 4.0.4.RELEASE
+ 2.6.6
@@ -45,7 +49,7 @@
public
Public Repositories
- http://119.57.140.26:8081/repository/maven-public/
+ http://nexus.unlcn.com/repository/maven-public/
@@ -58,7 +62,7 @@
3rd
3rd
- http://119.57.140.26:8081/repository/3rd/
+ http://nexus.unlcn.com/repository/3rd/
@@ -67,7 +71,7 @@
public
Public Repositories
- http://119.57.140.26:8081/repository/maven-public/
+ http://nexus.unlcn.com/repository/maven-public/
@@ -75,13 +79,13 @@
user-snapshot
User Porject Snapshot
- http://119.57.140.26:8081/repository/maven-snapshots/
+ http://nexus.unlcn.com/repository/maven-snapshots/
true
user-release
User Porject Release
- http://119.57.140.26:8081/repository/maven-releases/
+ http://nexus.unlcn.com/repository/maven-releases/
@@ -122,17 +126,11 @@
mybatis
${mybatis.version}
-
-
-
-
-
com.oracle
ojdbc6
11.2.0.3
-
com.oracle
orai18n
@@ -176,7 +174,6 @@
${spring.version}
test
-
org.quartz-scheduler
quartz
@@ -308,11 +305,51 @@
1.2.2
- com.github.miemiedev
- mybatis-paginator
- 1.2.15
+ org.apache.commons
+ commons-lang3
+ ${commons.lang.version}
+
+
+ com.google.guava
+ guava
+ ${guava.version}
+
+
+ ch.qos.logback
+ logback-classic
+ ${logback.version}
+
+
+ org.springframework.security
+ spring-security-web
+ ${spring-security.version}
+
+
+ org.springframework
+ spring-web
+
+
+
+
+ org.springframework.security
+ spring-security-config
+ ${spring-security.version}
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+ ${jackson_version}
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ ${jackson_version}
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+ ${jackson_version}
-
@@ -362,6 +399,18 @@
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.6.1
+
+ ${java.version}
+ ${java.version}
+ ${file.encoding}
+
+
+