Merge branch 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project

This commit is contained in:
lvleigang 2024-07-05 13:39:56 +08:00
commit e03491cddd
1 changed files with 24 additions and 23 deletions

View File

@ -24,22 +24,12 @@ import java.util.Map;
public class CbsAccessToken {
private static final Logger logger = LoggerFactory.getLogger(CbsAccessToken.class);
@Value("${cbs8.appId}")
private String app_id;
@Value("${cbs8.appSecret}")
private String app_secret;
@Value("${cbs8.url}")
private String app_url;
private static String appId;
private static String appSecret;
private static String url;
@PostConstruct
public void init() {
appId = app_id;
appSecret = app_secret;
url = app_url;
}
private static String app_id;
private static String app_secret;
private static String app_url;
//刷新token用
private static final String BEARER = "Bearer ";
/**
@ -52,7 +42,18 @@ public class CbsAccessToken {
}
private static CbsAccessToken cbsAccessToken = new CbsAccessToken();
@Value("${cbs8.appId}")
public void setApp_id(String app_id) {
CbsAccessToken.app_id = app_id;
}
@Value("${cbs8.appSecret}")
public void setApp_secret(String app_secret) {
CbsAccessToken.app_secret = app_secret;
}
@Value("${cbs8.url}")
public void setApp_url(String app_url) {
CbsAccessToken.app_url = app_url;
}
public static CbsAccessToken getInstance() {
logger.info("开始获取token");
@ -66,7 +67,7 @@ public class CbsAccessToken {
refreshToken();
}
}
logger.info("取到的token:{}",cbsAccessToken);
logger.info("取到的token:{}",cbsAccessToken.token);
return cbsAccessToken;
}
@ -78,12 +79,12 @@ public class CbsAccessToken {
*/
private static void initToken(){
logger.info("开始获取cbstoken");
CbsAccessToken ct = (CbsAccessToken) ApplicationContextUtil.getBeanByName("cbsAccessToken");
//CbsAccessToken ct = (CbsAccessToken) ApplicationContextUtil.getBeanByName("cbsAccessToken");
Map<String,String> param = new HashMap<>();
param.put("app_id",ct.appId);
param.put("app_secret",ct.appSecret);
param.put("app_id",CbsAccessToken.app_id);
param.put("app_secret",CbsAccessToken.app_secret);
param.put("grant_type","client_credentials");
String res = HttpRequest.post(ct.url+"/openapi/app/v1/app/token").body(JSONObject.toJSONString(param)).execute().body();
String res = HttpRequest.post(CbsAccessToken.app_url+"/openapi/app/v1/app/token").body(JSONObject.toJSONString(param)).execute().body();
logger.info("获取cbstoken结果",res);
if (StrUtil.isNotEmpty(res) && JSONUtil.isTypeJSON(res)){
JSONObject tokenObject = JSONObject.parseObject(res);
@ -106,10 +107,10 @@ public class CbsAccessToken {
* 刷新token
*/
private static void refreshToken(){
CbsAccessToken ct = (CbsAccessToken) ApplicationContextUtil.getBeanByName("cbsAccessToken");
//CbsAccessToken ct = (CbsAccessToken) ApplicationContextUtil.getBeanByName("cbsAccessToken");
//token不为空并且没过期 刷新token
if (null != cbsAccessToken.token && System.currentTimeMillis() < cbsAccessToken.expiryTime ){
String res = HttpRequest.get(ct.url + "/openapi/app/v1/app/refresh-token").header("Authorization", BEARER + cbsAccessToken.token).execute().body();
String res = HttpRequest.get(CbsAccessToken.app_url + "/openapi/app/v1/app/refresh-token").header("Authorization", BEARER + cbsAccessToken.token).execute().body();
logger.info("刷新cbstoken结果",res);
if (StrUtil.isNotEmpty(res) && JSONUtil.isTypeJSON(res)){
JSONObject tokenObject = JSONObject.parseObject(res);