merge

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/WxLoginService.java

@@ -535,16 +535,18 @@ public class WxLoginService implements IWxLoginService {
         obj.put("scene",sceneParam.toString());
         obj.put("env_version",enCodeVersion);
         String result = HttpUtils.sendPost(url, obj);
-        List<String> codes = Arrays.asList("40001", "42001");
-        JSONObject jsonObject = JSONObject.parseObject(result);
-        if(ObjectUtils.isNotNull(jsonObject.get("errcode")) && codes.contains(jsonObject.get("errcode").toString())){
-            //微信access_token 过期或者失效，刷新access_token
-            String key = "WX_SMALL_ACCESS_TOKEN";
-            redisCache.deleteObject(key);
-            String wxGzhAccessTokenTo = getWxSmallAccessToken();
-            String paramTo = String.format(small_wxEnCodeParam, wxGzhAccessTokenTo);
-            String urlTo = small_wxEnCodeUrl + "?" + paramTo;
-            return HttpUtils.sendPost(urlTo, obj);
+        if (result.contains("errcode")){
+            List<String> codes = Arrays.asList("40001", "42001");
+            JSONObject jsonObject = JSONObject.parseObject(result);
+            if(ObjectUtils.isNotNull(jsonObject.get("errcode")) && codes.contains(jsonObject.get("errcode").toString())){
+                //微信access_token 过期或者失效，刷新access_token
+                String key = "WX_SMALL_ACCESS_TOKEN";
+                redisCache.deleteObject(key);
+                String wxGzhAccessTokenTo = getWxSmallAccessToken();
+                String paramTo = String.format(small_wxEnCodeParam, wxGzhAccessTokenTo);
+                String urlTo = small_wxEnCodeUrl + "?" + paramTo;
+                return HttpUtils.sendPost(urlTo, obj);
+            }
         }
         return result;
     }
@@ -895,16 +897,18 @@ public class WxLoginService implements IWxLoginService {
         obj.put("scene",String.format("tid=%s",activityId));
         obj.put("env_version",enCodeVersion);
         String result = HttpUtils.sendPost(url, obj);
-        List<String> codes = Arrays.asList("40001", "42001");
-        JSONObject jsonObject = JSONObject.parseObject(result);
-        if(ObjectUtils.isNotNull(jsonObject.get("errcode")) && codes.contains(jsonObject.get("errcode").toString())){
-            //微信access_token 过期或者失效，刷新access_token
-            String key = "WX_SMALL_ACCESS_TOKEN";
-            redisCache.deleteObject(key);
-            String wxGzhAccessTokenTo = getWxSmallAccessToken();
-            String paramTo = String.format(small_wxEnCodeParam, wxGzhAccessTokenTo);
-            String urlTo = small_wxEnCodeUrl + "?" + paramTo;
-            return HttpUtils.sendPost(urlTo, obj);
+        if (result.contains("errcode")){
+            List<String> codes = Arrays.asList("40001", "42001");
+            JSONObject jsonObject = JSONObject.parseObject(result);
+            if(ObjectUtils.isNotNull(jsonObject.get("errcode")) && codes.contains(jsonObject.get("errcode").toString())){
+                //微信access_token 过期或者失效，刷新access_token
+                String key = "WX_SMALL_ACCESS_TOKEN";
+                redisCache.deleteObject(key);
+                String wxGzhAccessTokenTo = getWxSmallAccessToken();
+                String paramTo = String.format(small_wxEnCodeParam, wxGzhAccessTokenTo);
+                String urlTo = small_wxEnCodeUrl + "?" + paramTo;
+                return HttpUtils.sendPost(urlTo, obj);
+            }
         }
         return result;
     }
@@ -920,16 +924,18 @@ public class WxLoginService implements IWxLoginService {
         obj.put("env_version",enCodeVersion);
 //        obj.put("env_version","trial");
         String result = HttpUtils.sendPost(url, obj);
-        List<String> codes = Arrays.asList("40001", "42001");
-        JSONObject jsonObject = JSONObject.parseObject(result);
-        if(ObjectUtils.isNotNull(jsonObject.get("errcode")) && codes.contains(jsonObject.get("errcode").toString())){
-            //微信access_token 过期或者失效，刷新access_token
-            String key = "WX_SMALL_ACCESS_TOKEN";
-            redisCache.deleteObject(key);
-            String wxGzhAccessTokenTo = getWxSmallAccessToken();
-            String paramTo = String.format(small_wxEnCodeParam, wxGzhAccessTokenTo);
-            String urlTo = small_wxEnCodeUrl + "?" + paramTo;
-            return HttpUtils.sendPost(urlTo, obj);
+        if (result.contains("errcode")){
+            List<String> codes = Arrays.asList("40001", "42001");
+            JSONObject jsonObject = JSONObject.parseObject(result);
+            if(ObjectUtils.isNotNull(jsonObject.get("errcode")) && codes.contains(jsonObject.get("errcode").toString())){
+                //微信access_token 过期或者失效，刷新access_token
+                String key = "WX_SMALL_ACCESS_TOKEN";
+                redisCache.deleteObject(key);
+                String wxGzhAccessTokenTo = getWxSmallAccessToken();
+                String paramTo = String.format(small_wxEnCodeParam, wxGzhAccessTokenTo);
+                String urlTo = small_wxEnCodeUrl + "?" + paramTo;
+                return HttpUtils.sendPost(urlTo, obj);
+            }
         }
         return result;
     }