diff --git a/pom.xml b/pom.xml index 45e56509..0579b830 100644 --- a/pom.xml +++ b/pom.xml @@ -52,11 +52,6 @@ fastjson 1.2.55 - - com.alibaba - druid - 1.0.5 - mysql mysql-connector-java @@ -68,11 +63,6 @@ httpclient 4.5.2 - - commons-httpclient - commons-httpclient - 3.1 - net.sourceforge.jexcelapi jxl diff --git a/src/main/java/com/jsh/erp/controller/AccountHeadController.java b/src/main/java/com/jsh/erp/controller/AccountHeadController.java index e82ad8c1..c6211f7c 100644 --- a/src/main/java/com/jsh/erp/controller/AccountHeadController.java +++ b/src/main/java/com/jsh/erp/controller/AccountHeadController.java @@ -3,26 +3,24 @@ package com.jsh.erp.controller; import com.alibaba.fastjson.JSONObject; import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.constants.ExceptionConstants; -import com.jsh.erp.datasource.entities.AccountHead; import com.jsh.erp.datasource.entities.AccountHeadVo4ListEx; import com.jsh.erp.exception.BusinessRunTimeException; import com.jsh.erp.service.accountHead.AccountHeadService; import com.jsh.erp.utils.BaseResponseInfo; -import com.jsh.erp.utils.ErpInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; - /** * @author jishenghua 752*718*920 */ diff --git a/src/main/java/com/jsh/erp/service/user/UserService.java b/src/main/java/com/jsh/erp/service/user/UserService.java index 25f5006f..dfea2e9b 100644 --- a/src/main/java/com/jsh/erp/service/user/UserService.java +++ b/src/main/java/com/jsh/erp/service/user/UserService.java @@ -1,6 +1,6 @@ package com.jsh.erp.service.user; -import com.alibaba.druid.util.StringUtils; +import org.springframework.util.StringUtils; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.jsh.erp.constants.BusinessConstants; diff --git a/src/main/java/com/jsh/erp/utils/ExcelUtils.java b/src/main/java/com/jsh/erp/utils/ExcelUtils.java index a72362b6..4f4a5260 100644 --- a/src/main/java/com/jsh/erp/utils/ExcelUtils.java +++ b/src/main/java/com/jsh/erp/utils/ExcelUtils.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.alibaba.druid.util.StringUtils; +import org.springframework.util.StringUtils; import jxl.Cell; import jxl.Sheet; import jxl.Workbook; diff --git a/src/main/java/com/jsh/erp/utils/FileUtils.java b/src/main/java/com/jsh/erp/utils/FileUtils.java index 59a7b159..6fed21fe 100644 --- a/src/main/java/com/jsh/erp/utils/FileUtils.java +++ b/src/main/java/com/jsh/erp/utils/FileUtils.java @@ -1,7 +1,6 @@ package com.jsh.erp.utils; -import com.alibaba.druid.util.StringUtils; - +import org.springframework.util.StringUtils; import java.io.*; import java.util.*; diff --git a/src/main/java/com/jsh/erp/utils/StringUtil.java b/src/main/java/com/jsh/erp/utils/StringUtil.java index 8a98a244..e1b55b44 100644 --- a/src/main/java/com/jsh/erp/utils/StringUtil.java +++ b/src/main/java/com/jsh/erp/utils/StringUtil.java @@ -1,6 +1,6 @@ package com.jsh.erp.utils; -import com.alibaba.druid.util.StringUtils; +import org.springframework.util.StringUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/jsh/erp/utils/Tools.java b/src/main/java/com/jsh/erp/utils/Tools.java index fa297852..3902ef1c 100644 --- a/src/main/java/com/jsh/erp/utils/Tools.java +++ b/src/main/java/com/jsh/erp/utils/Tools.java @@ -1,7 +1,6 @@ package com.jsh.erp.utils; -import com.alibaba.druid.util.StringUtils; - +import org.springframework.util.StringUtils; import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.io.UnsupportedEncodingException;