Merge remote-tracking branch 'origin/master'

zhaowenxuan

2024-12-26 609473d294da495f52de336ad855da057316d235

Merge remote-tracking branch 'origin/master'

 src/main/java/com/example/service/shanxiqin/xian/MeiJiHisService.java

@@ -417,7 +417,11 @@
                String accessToken = entries.get("access_token").toString();
                String tokenType = entries.get("token_type").toString();
                String string = HttpClientUtils.sendPostToken(url, hashMap, tokenType + " " + accessToken);
                return StrUtil.isNotBlank(string) ? string : JSONUtil.createObj().toString();

                if(StrUtil.isNotBlank(string)){
                    JSON json = FieldNameConverter.convertFieldNames(JSONUtil.parse(string));
                    return JSONUtil.toJsonStr(json);
                } else return JSONUtil.createObj().toString();
            }
        }else {
            return refreshToken(url, hashMap,"json");