From 3c42a8f4826e3012f7bc476a61b0bfdbbbb3e555 Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Wed, 7 Mar 2018 10:11:09 +0800
Subject: [PATCH] merge

---
 .../src/main/java/com/xwbing/util/DecimalUtil.java       | 5 +----
 .../src/main/java/com/xwbing/util/JsonConverUtil.java    | 9 ++++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/boot-service/src/main/java/com/xwbing/util/DecimalUtil.java b/boot-service/src/main/java/com/xwbing/util/DecimalUtil.java
index be20210..558ceb8 100644
--- a/boot-service/src/main/java/com/xwbing/util/DecimalUtil.java
+++ b/boot-service/src/main/java/com/xwbing/util/DecimalUtil.java
@@ -1,8 +1,6 @@
 package com.xwbing.util;
 
 import com.xwbing.exception.UtilException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.math.BigDecimal;
 
@@ -12,7 +10,6 @@ import java.math.BigDecimal;
  */
 public class DecimalUtil {
     private static final int DEF_DIV_SCALE = 10;
-    private static final Logger LOGGER = LoggerFactory.getLogger(DecimalUtil.class);
 
     /**
      * 两个Double数相加
@@ -75,7 +72,7 @@ public class DecimalUtil {
      * @return Double
      */
     public static Double div(Double v1, Double v2, int scale) {
-        if (scale < 0){
+        if (scale < 0) {
             throw new UtilException("小数位数不能为负数");
         }
         BigDecimal b1 = new BigDecimal(v1.toString());
diff --git a/boot-service/src/main/java/com/xwbing/util/JsonConverUtil.java b/boot-service/src/main/java/com/xwbing/util/JsonConverUtil.java
index 3c6c4b9..89d2a5a 100644
--- a/boot-service/src/main/java/com/xwbing/util/JsonConverUtil.java
+++ b/boot-service/src/main/java/com/xwbing/util/JsonConverUtil.java
@@ -1,6 +1,5 @@
 package com.xwbing.util;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
@@ -10,18 +9,18 @@ import com.alibaba.fastjson.JSONObject;
  */
 public class JsonConverUtil {
     public static JSONArray str2JsonArray(String string) {
-        return JSON.parseArray(string);
+        return JSONObject.parseArray(string);
     }
 
     public static JSONArray obj2JsonArray(Object object) {
-        return JSON.parseArray(JSONObject.toJSONString(object));
+        return JSONObject.parseArray(JSONObject.toJSONString(object));
     }
 
     public static JSONObject str2JsonObj(String string) {
-        return JSON.parseObject(string);
+        return JSONObject.parseObject(string);
     }
 
     public static JSONObject obj2JsonObj(Object object) {
-        return JSON.parseObject(JSONObject.toJSONString(object));
+        return JSONObject.parseObject(JSONObject.toJSONString(object));
     }
 }