Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-30 34eb869e7350173ff036881fc776bc27d5be6d7a

 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/weChat/WeChatUtil.java

@@ -65,22 +65,22 @@
            @Override
            public void run() {
                try {
                    Thread.sleep(30000);
                    new Timer().schedule(new TimerTask() {
                        @Override
                        public void run() {
                            try {
                                String wxAppletsAccessToken = getWxAppletsAccessToken();
                                if(ToolUtil.isEmpty(wxAppletsAccessToken)){
                                    System.err.println("获取微信小程序access_token失败");
                                    return;
                                }
                                redisUtil.setStrValue("wxAppletsAccessToken", wxAppletsAccessToken, 7000);
                            }catch (Exception e){
                                e.printStackTrace();
                            }
                        }
                    }, 0, 7000000);
//                    Thread.sleep(30000);
//                    new Timer().schedule(new TimerTask() {
//                        @Override
//                        public void run() {
//                            try {
//                                String wxAppletsAccessToken = getWxAppletsAccessToken();
//                                if(ToolUtil.isEmpty(wxAppletsAccessToken)){
//                                    System.err.println("获取微信小程序access_token失败");
//                                    return;
//                                }
//                                redisUtil.setStrValue("wxAppletsAccessToken", wxAppletsAccessToken, 7000);
//                            }catch (Exception e){
//                                e.printStackTrace();
//                            }
//                        }
//                    }, 0, 6000000);
                }catch (Exception e){
                    e.printStackTrace();
                }
@@ -437,6 +437,17 @@
        HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(param, httpHeaders);
        ResponseEntity<String> exchange = restTemplate.exchange(url, HttpMethod.POST, requestEntity, String.class);
        String body1 = exchange.getBody();
        JSONObject jsonObject = JSON.parseObject(body1);
        Integer errcode = jsonObject.getInteger("errcode");
        if(null != errcode && 40001 == errcode){
            wxAppletsAccessToken = getWxAppletsAccessToken();
            if(ToolUtil.isEmpty(wxAppletsAccessToken)){
                System.err.println("获取微信小程序access_token失败");
                return "获取微信小程序access_token失败";
            }
            redisUtil.setStrValue("wxAppletsAccessToken", wxAppletsAccessToken, 7000);
            return getUrlLink(path, query, env_version);
        }
        return body1;
    }
}