|
|
@@ -783,11 +783,14 @@ public class DataTowerServiceImpl implements DataTowerService { |
|
|
return datamap; |
|
|
return datamap; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void updateToken(WxWiWideInfo wiWideInfo, String secretId,String secretKey) { |
|
|
|
|
|
|
|
|
private void updateToken(WxWiWideInfo wiWideInfo, String token) { |
|
|
|
|
|
Calendar instance = Calendar.getInstance(); |
|
|
|
|
|
instance.add(Calendar.MINUTE, 45); |
|
|
|
|
|
logger.info("数据表中的数据:"+JSONObject.toJSONString(wiWideInfo)); |
|
|
WxWiWideInfo record = new WxWiWideInfo(); |
|
|
WxWiWideInfo record = new WxWiWideInfo(); |
|
|
record.setId(wiWideInfo.getId()); |
|
|
record.setId(wiWideInfo.getId()); |
|
|
record.setWiwideId(secretId); |
|
|
|
|
|
record.setWiwideKey(secretKey); |
|
|
|
|
|
|
|
|
record.setToken(token); |
|
|
|
|
|
record.setExpiredTime(instance.getTime()); |
|
|
try { |
|
|
try { |
|
|
logger.info("要更新的数据before>>>>>>>>>>"+JSONObject.toJSONString(record)); |
|
|
logger.info("要更新的数据before>>>>>>>>>>"+JSONObject.toJSONString(record)); |
|
|
wxWiwideInfoMapper.updateToken(record); |
|
|
wxWiwideInfoMapper.updateToken(record); |
|
|
@@ -802,20 +805,20 @@ public class DataTowerServiceImpl implements DataTowerService { |
|
|
* @param wiWideInfo |
|
|
* @param wiWideInfo |
|
|
* @return |
|
|
* @return |
|
|
*/ |
|
|
*/ |
|
|
private WiwideToken getWiwideToken(WxWiWideInfo wiWideInfo) { |
|
|
|
|
|
if ((!StringUtils.isBlank(wiWideInfo.getWiwideId())) && (!StringUtils.isBlank(wiWideInfo.getWiwideKey()))) { |
|
|
|
|
|
return new WiwideToken(wiWideInfo.getWiwideId(), wiWideInfo.getWiwideKey()); |
|
|
|
|
|
} |
|
|
|
|
|
String data = WiwideUtil.queryToken(wiWideInfo); |
|
|
|
|
|
logger.info("bid:"+wiWideInfo.getWiwideId()+",newdata:"+data); |
|
|
|
|
|
if (StringUtils.isBlank(data)) return null; |
|
|
|
|
|
JSONObject token = JSONObject.parseObject(data).getJSONObject("data"); |
|
|
|
|
|
if (null == token) { |
|
|
|
|
|
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),(String)JSONObject.parseObject(data).get("msg")); |
|
|
|
|
|
} |
|
|
|
|
|
updateToken(wiWideInfo, token.getString("SecretId"), token.getString("SecretKey")); |
|
|
|
|
|
|
|
|
private String getWiwideToken(WxWiWideInfo wiWideInfo) { |
|
|
|
|
|
Date expiredTime = wiWideInfo.getExpiredTime(); |
|
|
|
|
|
String token = wiWideInfo.getToken(); |
|
|
|
|
|
logger.info("wiwideinfo:"+JSONObject.toJSONString(wiWideInfo)); |
|
|
|
|
|
// if (StringUtils.isEmpty(token) || expiredTime == null || expiredTime.before(new Date())) { |
|
|
|
|
|
String data = WiwideUtil.queryToken(wiWideInfo); |
|
|
|
|
|
logger.info("bid:"+wiWideInfo.getWiwideId()+",newdata:"+data); |
|
|
|
|
|
if (data == null) |
|
|
|
|
|
return null; |
|
|
|
|
|
token = (String) JSONObject.parseObject(data).get("data"); |
|
|
|
|
|
updateToken(wiWideInfo, token); |
|
|
|
|
|
// } |
|
|
logger.info("返回的token:"+token); |
|
|
logger.info("返回的token:"+token); |
|
|
return new WiwideToken(token.getString("SecretId"),token.getString("SecretKey")); |
|
|
|
|
|
|
|
|
return token; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
@@ -840,9 +843,8 @@ public class DataTowerServiceImpl implements DataTowerService { |
|
|
return new ResultData(ErrorCode.WIWIDE_INFO_NOT_FOUND); |
|
|
return new ResultData(ErrorCode.WIWIDE_INFO_NOT_FOUND); |
|
|
} |
|
|
} |
|
|
logger.info("迈外迪访问接口参数:" + params); |
|
|
logger.info("迈外迪访问接口参数:" + params); |
|
|
//String res = WiwideUtil.queryData(wiWideInfo, getWiwideToken(wiWideInfo), params); |
|
|
|
|
|
|
|
|
String res = WiwideUtil.queryData(wiWideInfo, getWiwideToken(wiWideInfo), params); |
|
|
//logger.info("迈外迪访问接口结果:" + res); |
|
|
//logger.info("迈外迪访问接口结果:" + res); |
|
|
String res = ""; |
|
|
|
|
|
JSONObject result = JSONObject.parseObject(res); |
|
|
JSONObject result = JSONObject.parseObject(res); |
|
|
if (result == null) |
|
|
if (result == null) |
|
|
return new ResultData(ErrorCode.WIWIDE_INFO_NOT_READY); |
|
|
return new ResultData(ErrorCode.WIWIDE_INFO_NOT_READY); |
|
|
|