hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

 Conflicts:
	service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java
This commit is contained in:
lvleigang 2024-07-05 11:34:40 +08:00
parent 45d79526ae 514b7fd387
commit 5eee3be6c0
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java
View File

@ -284,11 +284,14 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService {
* @return * @return
*/ */
private Map<String, String> headersValueOf(String sign, long timestamp) { private Map<String, String> headersValueOf(String sign, long timestamp) {
logger.info("开始组装请求头参数:{},{}",sign,timestamp);
Map<String, String> header = new HashMap(); Map<String, String> header = new HashMap();
header.put(CBSUtil.SIGN_HEADER_NAME, sign); header.put(CBSUtil.SIGN_HEADER_NAME, sign);
header.put(CBSUtil.TIMESTAMP_HEADER, Long.toString(timestamp)); header.put(CBSUtil.TIMESTAMP_HEADER, Long.toString(timestamp));
header.put(HTTP.CONTENT_TYPE, CBSUtil.TARGET_CONTENT_TYPE); header.put(HTTP.CONTENT_TYPE, CBSUtil.TARGET_CONTENT_TYPE);
logger.info("准备获取token");
header.put(CBSUtil.AUTHORIZATION, CBSUtil.BEARER + CbsAccessToken.getToken()); header.put(CBSUtil.AUTHORIZATION, CBSUtil.BEARER + CbsAccessToken.getToken());
logger.info("组装后的header参数:{}",JSONObject.toJSONString(header));
return header; return header;
} }
@ -309,6 +312,6 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService {
header.put("hzyaExtData", requestData); header.put("hzyaExtData", requestData);
entity.setByteBodys(encryptedData); entity.setByteBodys(encryptedData);
entity.setHeaders(header); entity.setHeaders(header);
logger.info("CBS请求encrypAndsign参数:{}", requestData); logger.info("加密，签名方法执行完毕");
} }
} }

4
service/src/main/java/com/hzya/frame/cbs8/util/CbsAccessToken.java
View File

@ -55,6 +55,7 @@ public class CbsAccessToken {
public static CbsAccessToken getInstance() { public static CbsAccessToken getInstance() {
logger.info("开始获取token");
if (null == cbsAccessToken.token){ if (null == cbsAccessToken.token){
initToken(); initToken();
}else { }else {
@ -65,6 +66,7 @@ public class CbsAccessToken {
refreshToken(); refreshToken();
} }
} }
logger.info("取到的token:{}",cbsAccessToken);
return cbsAccessToken; return cbsAccessToken;
} }
@ -75,8 +77,8 @@ public class CbsAccessToken {
* 获取token * 获取token
*/ */
private static void initToken(){ private static void initToken(){
CbsAccessToken ct = (CbsAccessToken) ApplicationContextUtil.getBeanByName("cbsAccessToken");
logger.info("开始获取cbstoken"); logger.info("开始获取cbstoken");
CbsAccessToken ct = (CbsAccessToken) ApplicationContextUtil.getBeanByName("cbsAccessToken");
Map<String,String> param = new HashMap<>(); Map<String,String> param = new HashMap<>();
param.put("app_id",ct.appId); param.put("app_id",ct.appId);
param.put("app_secret",ct.appSecret); param.put("app_secret",ct.appSecret);