|
|
@@ -132,7 +132,7 @@ public class ConversationContentServiceImpl extends BaseMybatisDao<ChatMsgUserMa
|
|
|
}else if (type==1){
|
|
|
corpId = nmCorpid;
|
|
|
secret = nmSecret;
|
|
|
- priKey = nmAppSecret;
|
|
|
+ priKey = hnPriKey;
|
|
|
}
|
|
|
|
|
|
System.out.println(Finance.Init(sdk, corpId, secret));
|
|
|
@@ -423,17 +423,17 @@ public class ConversationContentServiceImpl extends BaseMybatisDao<ChatMsgUserMa
|
|
|
//获取redis缓存数据
|
|
|
Map<String,String> accessMap = (Map<String, String>) redisTemplate.opsForValue().get("NM_ACCESS_TOKEN");
|
|
|
if (accessMap == null){
|
|
|
- logger.debug("getAccessToken无缓存从接口获取");
|
|
|
+ logger.debug("NMgetAccessToken无缓存从接口获取");
|
|
|
Map<String, String> map = getAccessMap(corpId, secret);
|
|
|
//新增redis缓存数据
|
|
|
redisTemplate.opsForValue().set("NM_ACCESS_TOKEN",map);
|
|
|
accessToken = map.get("accessToken");
|
|
|
}else {
|
|
|
- logger.debug("getAccessToken有缓存从缓存获取");
|
|
|
+ logger.debug("NMgetAccessToken有缓存从缓存获取");
|
|
|
accessToken = accessMap.get("accessToken");
|
|
|
Long expireDate = Long.valueOf(accessMap.get("expireDate"));
|
|
|
if (expireDate < System.currentTimeMillis()){
|
|
|
- logger.debug("getAccessToken缓存已过期从接口获取");
|
|
|
+ logger.debug("NMgetAccessToken缓存已过期从接口获取");
|
|
|
Map<String, String> map = getAccessMap(corpId, secret);
|
|
|
accessToken = map.get("accessToken");
|
|
|
//新增redis缓存数据
|
|
|
@@ -589,8 +589,9 @@ public class ConversationContentServiceImpl extends BaseMybatisDao<ChatMsgUserMa
|
|
|
map.put ("code", maps.get("code"));
|
|
|
chatMsgUser = new ChatMsgUser();
|
|
|
chatMsgUser.setUserId(userId);
|
|
|
- chatMsgUser.setType(type);
|
|
|
+ chatMsgUser.setType(type2);
|
|
|
chatMsgUser.setCreateTime(new Date());
|
|
|
+ chatMsgUser.setProvinceType(type);
|
|
|
if (StringUtils.isNotBlank(userName)){
|
|
|
chatMsgUser.setName(userName);
|
|
|
map.put("name",userName);
|