Merge branch 'dev_v2.0.1' into release_v2.0.1

megre

cas/src/main/java/com/qmth/teachcloud/cas/util/supwisdom/LoginUser.java

@@ -2,7 +2,6 @@ package com.qmth.teachcloud.cas.util.supwisdom;
 
 import com.qmth.teachcloud.cas.util.supwisdom.utils.IOUtils;
 import com.qmth.teachcloud.cas.util.supwisdom.utils.StringUtils;
-import com.qmth.teachcloud.exchange.common.contant.SystemConstant;
 import com.qmth.teachcloud.exchange.common.enums.ExceptionResultEnum;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -12,6 +11,7 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import java.io.InputStream;
 import java.lang.reflect.Field;
+import java.nio.charset.StandardCharsets;
 
 public class LoginUser {
     public static final String CAS_PREFIX = "cas:";
@@ -49,7 +49,7 @@ public class LoginUser {
         InputStream in = null;
         try {
             DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
-            in = IOUtils.toInputStream(loginUserXmlStr, SystemConstant.CHARSET);
+            in = IOUtils.toInputStream(loginUserXmlStr, StandardCharsets.UTF_8);
             Document rootDoc = docBuilder.parse(in);
             NodeList successNodeList = rootDoc.getElementsByTagName(LOGIN_SUCCESS_KEY);
             if (successNodeList.getLength() > 0) {

cas/src/main/java/com/qmth/teachcloud/cas/util/supwisdom/utils/HttpRequestUtils.java

@@ -1,13 +1,13 @@
 package com.qmth.teachcloud.cas.util.supwisdom.utils;
 
 import com.qmth.teachcloud.cas.util.supwisdom.Constants;
-import com.qmth.teachcloud.exchange.common.contant.SystemConstant;
 
 import javax.net.ssl.*;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.security.SecureRandom;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
@@ -24,7 +24,7 @@ public abstract class HttpRequestUtils {
             conn.setConnectTimeout(Constants.CONNECT_TIMEOUT);
             conn.connect();
             in = conn.getInputStream();
-            return IOUtils.toString(in, SystemConstant.CHARSET);
+            return IOUtils.toString(in, StandardCharsets.UTF_8);
         } finally {
             IOUtils.close(conn);
             IOUtils.closeQuietly(in);

teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/contant/SystemConstant.java

@@ -5,7 +5,6 @@ import com.qmth.boot.core.uid.service.UidService;
 import com.qmth.teachcloud.exchange.common.util.ServletUtil;
 
 import javax.servlet.http.HttpServletRequest;
-import java.nio.charset.Charset;
 
 /**
  * @Description: 系统常量
@@ -47,7 +46,6 @@ public class SystemConstant {
     public static final String CAS_ADDRESS = "casAddress";
     public static final String SCHOOL_SERVICE_ADDRESS = "schoolServiceAddress";
     public static final String CHARSET_NAME = "UTF-8";
-    public static final Charset CHARSET = Charset.forName(CHARSET_NAME);
     public static final String SUCCESS = "success";
     public static final String UPDATE_TIME = "updateTime";
     public static final String SESSION = "session:";

teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/util/Base64Util.java

@@ -1,16 +1,15 @@
 package com.qmth.teachcloud.exchange.common.util;
 
-import com.qmth.teachcloud.exchange.common.contant.SystemConstant;
-
+import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 
 public class Base64Util {
 
     public static String encode(byte[] input) {
-        return new String(Base64.getEncoder().encode(input), SystemConstant.CHARSET);
+        return new String(Base64.getEncoder().encode(input), StandardCharsets.UTF_8);
     }
 
     public static byte[] decode(String input) {
-        return Base64.getDecoder().decode(input.getBytes(SystemConstant.CHARSET));
+        return Base64.getDecoder().decode(input.getBytes(StandardCharsets.UTF_8));
     }
 }

teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/util/HttpUtil.java

@@ -151,8 +151,8 @@ public class HttpUtil {
                 pairs.add(new BasicNameValuePair(key, String.valueOf(params.get(key))));
             }
         }
-        String str = EntityUtils.toString(new UrlEncodedFormEntity(pairs, Consts.UTF_8));//转换为键值对
-        HttpGet get = new HttpGet(url + "?" + str);
+        String str = EntityUtils.toString(new UrlEncodedFormEntity(pairs, StandardCharsets.UTF_8));//转换为键值对
+        HttpGet get = new HttpGet(url + SystemConstant.GET_UNKNOWN + str);
         if (Objects.nonNull(secret)) {
             get.setHeader(SystemConstant.HEADER_AUTHORIZATION, secret);
         }