fix : fix http util log

sondertara · Sep 14, 2020 · 270ed74 · 270ed74
1 parent f1ece8c
commit 270ed74
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/common-tara/pom.xml b/common-tara/pom.xml
@@ -9,12 +9,12 @@
     <parent>
         <groupId>com.sondertara</groupId>
         <artifactId>tara</artifactId>
-        <version>0.0.3.303</version>
+        <version>0.0.3.304</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>com.sondertara</groupId>
     <artifactId>common-tara</artifactId>
-    <version>0.0.3.303</version>
+    <version>0.0.3.304</version>
 
     <name>common-tara</name>
     <description>common utils.</description>

diff --git a/common-tara/src/main/java/com/sondertara/common/util/HttpClientUtil.java b/common-tara/src/main/java/com/sondertara/common/util/HttpClientUtil.java
@@ -92,8 +92,6 @@ public class HttpClientUtil {
             requestConfig = RequestConfig.custom().setConnectionRequestTimeout(
                     connectionRequestTimeout).setSocketTimeout(socketTimeout).setConnectTimeout(
                     connectTimeout).build();
-
-            //System.out.println("初始化HttpClientTest~~~结束");
         } catch (NoSuchAlgorithmException e) {
             e.printStackTrace();
         } catch (KeyStoreException e) {

diff --git a/common-tara/src/main/java/com/sondertara/common/util/HttpUtil.java b/common-tara/src/main/java/com/sondertara/common/util/HttpUtil.java
@@ -164,7 +164,7 @@ public static String sendPostJson(String url, Map<String, Object> param) throws
 
     public static String sendPostJson(String url, String jsonParam) throws TaraException {
         logger.info("post url ==>[{}]", url);
-        logger.info("post param ==>[{}]", url);
+        logger.info("post param ==>[{}]", jsonParam);
         OutputStream out = null;
         InputStream in = null;
         HttpURLConnection conn = null;

diff --git a/common-tara/src/main/java/com/sondertara/common/util/StringUtil.java b/common-tara/src/main/java/com/sondertara/common/util/StringUtil.java
@@ -20,6 +20,8 @@
 public class StringUtil {
 
     private static final Logger logger = LoggerFactory.getLogger(StringUtil.class);
+
+    private static final String  NULL_STR="null";
 
     private static final Pattern PHONE_PATTERN = Pattern.compile("^[1][3,4,5,6,7,8,9][0-9]{9}$");
 
@@ -39,7 +41,7 @@ public class StringUtil {
      * @return is blank
      */
     public static boolean isBlank(Object str) {
-        return str == null || "".equals(str.toString().trim()) || "null".equalsIgnoreCase(str.toString().trim());
+        return str == null || "".equals(str.toString().trim()) || NULL_STR.equalsIgnoreCase(str.toString().trim());
     }
 
     /**
@@ -72,7 +74,7 @@ public static String convertNullToZero(Object str) {
      * @return str maybe null
      */
     public static String convertNullToNull(Object str) {
-        if (str == null || "".equals(str.toString().trim()) || "null".equalsIgnoreCase(str.toString().trim())) {
+        if (str == null || "".equals(str.toString().trim()) || NULL_STR.equalsIgnoreCase(str.toString().trim())) {
             return null;
         }
         return str.toString();
@@ -88,7 +90,7 @@ public static String convertNullToNull(Object str) {
      * @return number
      */
     public static String convertToNumber(Object str) {
-        if (str == null || "".equals(str.toString().trim()) || "null".equalsIgnoreCase(str.toString().trim())) {
+        if (str == null || "".equals(str.toString().trim()) || NULL_STR.equalsIgnoreCase(str.toString().trim())) {
             return null;
         }
         String s = org.apache.commons.lang3.StringUtils.deleteWhitespace(str.toString());
@@ -105,11 +107,11 @@ public static String convertToNumber(Object str) {
      * 如果字符串为空或者null，会返回默认值
      * </p>
      *
-     * @param str
-     * @return
+     * @param str str
+     * @return number
      */
     public static String convertToNumber(Object str, Number defaultValue) {
-        if (str == null || "".equals(str.toString().trim()) || "null".equalsIgnoreCase(str.toString().trim())) {
+        if (str == null || "".equals(str.toString().trim()) || NULL_STR.equalsIgnoreCase(str.toString().trim())) {
             return String.valueOf(defaultValue);
         }
         String s = StringUtils.deleteWhitespace(str.toString());
@@ -170,8 +172,8 @@ public static String convertEncode(String strIn, String encoding, String targetE
     /**
      * 截取str中以startStr开头，endStr结束的字符串
      *
-     * @param str
-     * @param startStr
+     * @param str str
+     * @param startStr str
      * @param endStr
      * @return 返回以以startStr开头，以endStr结束的字符串，如果startStr不存在，则有str为起始；如果endStr不存在，则以字符串结束为终结
      */
@@ -989,9 +991,9 @@ public static String getExtension(String uri) {
             return "";
         }
         if (uri.contains(".")) {
-            String[] strs = uri.split("\\.");
-            if (strs.length > 1) {
-                String extension = strs[1];
+            String[] strings = uri.split("\\.");
+            if (strings.length > 1) {
+                String extension = strings[1];
                 if (isNotEmpty(extension)) {
                     return extension;
                 }

diff --git a/excel-tara/pom.xml b/excel-tara/pom.xml
@@ -7,12 +7,12 @@
     <parent>
         <groupId>com.sondertara</groupId>
         <artifactId>tara</artifactId>
-        <version>0.0.3.303</version>
+        <version>0.0.3.304</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>com.sondertara</groupId>
     <artifactId>excel-tara</artifactId>
-    <version>0.0.3.303</version>
+    <version>0.0.3.304</version>
     <name>excel-tara</name>
     <description>High performance Excel kit.</description>
     <properties>
@@ -99,7 +99,7 @@
         <dependency>
             <groupId>com.sondertara</groupId>
             <artifactId>common-tara</artifactId>
-            <version>0.0.3.303</version>
+            <version>0.0.3.304</version>
         </dependency>
 
     </dependencies>

diff --git a/notify-tara/pom.xml b/notify-tara/pom.xml
@@ -7,12 +7,12 @@
     <parent>
         <groupId>com.sondertara</groupId>
         <artifactId>tara</artifactId>
-        <version>0.0.3.303</version>
+        <version>0.0.3.304</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>com.sondertara</groupId>
     <artifactId>notify-tara</artifactId>
-    <version>0.0.3.303</version>
+    <version>0.0.3.304</version>
 
     <name>notify-tara</name>
     <description>notify kit.</description>
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>com.sondertara</groupId>
             <artifactId>common-tara</artifactId>
-            <version>0.0.3.303</version>
+            <version>0.0.3.304</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.sondertara</groupId>
     <artifactId>tara</artifactId>
-    <version>0.0.3.303</version>
+    <version>0.0.3.304</version>
     <packaging>pom</packaging>
     <name>tara</name>
     <description>tara is a awesome java advance Kit.</description>