Bläddra i källkod

优化查询日志记录问题

wuxw 1 år sedan
förälder
incheckning
777d65332c

+ 0 - 20
java110-core/src/main/java/com/java110/core/client/OutRestTemplate.java

@@ -140,25 +140,5 @@ public class OutRestTemplate extends RestTemplate {
         return responseEntity;
     }
 
-    @Override
-    public <T> T getForObject(String url, Class<T> responseType, Object... uriVariables) throws RestClientException {
-        String errMsg = "";
-        T resMsg;
-        Date startTime = DateUtil.getCurrentDate();
-        try {
-            logger.debug("请求信息:url:{},method:GET", url);
-             resMsg = super.getForObject(url, responseType,uriVariables);
-            logger.debug("返回信息:responseEntity:{}", resMsg);
-        } catch (HttpStatusCodeException e) {
-            errMsg = ExceptionUtil.getStackTrace(e);
-            throw e;
-        } finally {
-              ResponseEntity  tmpResponseEntity = new ResponseEntity(errMsg, HttpStatus.OK);
-            //  saveLog(url, "POST", null, tmpResponseEntity, DateUtil.getCurrentDate().getTime() - startTime.getTime());
-            LogFactory.saveOutLog(url, "GET", DateUtil.getCurrentDate().getTime() - startTime.getTime(), null, "", tmpResponseEntity);
-        }
-        return resMsg;
-    }
-
 
 }

+ 16 - 6
java110-core/src/main/java/com/java110/core/factory/WechatFactory.java

@@ -11,7 +11,10 @@ import com.java110.utils.util.StringUtil;
 import org.apache.commons.codec.binary.Base64;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;
+
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
@@ -68,18 +71,25 @@ public class WechatFactory {
      * @return
      */
     private static String refreshAccessToken(String appId, String appSecure) {
-        String getAccessToken = MappingCache.getRemark(WechatConstant.WECHAT_DOMAIN,WechatConstant.GET_ACCESS_TOKEN_URL);
-        if(StringUtil.isEmpty(getAccessToken)){
+        String getAccessToken = MappingCache.getRemark(WechatConstant.WECHAT_DOMAIN, WechatConstant.GET_ACCESS_TOKEN_URL);
+        if (StringUtil.isEmpty(getAccessToken)) {
             getAccessToken = WechatConstant.GET_ACCESS_TOKEN;
         }
         String url = getAccessToken.replace("APPID", appId)
                 .replace("SECRET", appSecure);
         RestTemplate outRestTemplate = ApplicationContextFactory.getBean("outRestTemplate", RestTemplate.class);
-        String response = outRestTemplate.getForObject(url, String.class);
+        if(outRestTemplate == null){
+            throw new IllegalArgumentException("查询token 失败");
+        }
+        ResponseEntity<String> responseEntity = outRestTemplate.getForEntity(url, String.class);
+        logger.debug("获取access_token 入参:" + url + " 返回参数" + responseEntity);
+
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            throw new IllegalArgumentException("查询token 失败");
+        }
 
-        logger.debug("获取access_token 入参:" + url + " 返回参数" + response);
+        JSONObject responseObj = JSONObject.parseObject(responseEntity.getBody());
 
-        JSONObject responseObj = JSONObject.parseObject(response);
 
         if (responseObj.containsKey("access_token")) {
             String accessToken = responseObj.getString("access_token");
@@ -122,7 +132,7 @@ public class WechatFactory {
 
     public static String decryptS5(String sSrc, String encodingFormat, String sKey, String ivParameter) {
         try {
-        	Base64 base64 = new Base64();
+            Base64 base64 = new Base64();
             byte[] raw = base64.decode(sKey);
             SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
             IvParameterSpec iv = new IvParameterSpec(base64.decode(ivParameter));