diff --git a/mallinkOcr/src/main/java/com/iformall/ocr/FormallTess4jTrain.java b/mallinkOcr/src/main/java/com/iformall/ocr/FormallTess4jTrain.java index eceac2147..0f75998ec 100644 --- a/mallinkOcr/src/main/java/com/iformall/ocr/FormallTess4jTrain.java +++ b/mallinkOcr/src/main/java/com/iformall/ocr/FormallTess4jTrain.java @@ -15,7 +15,7 @@ public class FormallTess4jTrain { private static final String newFileFolder = "C:\\Users\\iformall\\Desktop\\newfile"; - private static final String huanhangstr = " \n"; + private static final String huanhangstr = " \n "; private static String getprefix(String lang,String fontName) { String realFileName = lang+"."+fontName+".exp0"; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index cfc6d7e16..3d5cc82cb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -783,11 +783,14 @@ public class DataTowerServiceImpl implements DataTowerService { 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(); record.setId(wiWideInfo.getId()); - record.setWiwideId(secretId); - record.setWiwideKey(secretKey); + record.setToken(token); + record.setExpiredTime(instance.getTime()); try { logger.info("要更新的数据before>>>>>>>>>>"+JSONObject.toJSONString(record)); wxWiwideInfoMapper.updateToken(record); @@ -802,20 +805,20 @@ public class DataTowerServiceImpl implements DataTowerService { * @param wiWideInfo * @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); - return new WiwideToken(token.getString("SecretId"),token.getString("SecretKey")); + return token; } @Override @@ -840,9 +843,8 @@ public class DataTowerServiceImpl implements DataTowerService { return new ResultData(ErrorCode.WIWIDE_INFO_NOT_FOUND); } logger.info("迈外迪访问接口参数:" + params); - //String res = WiwideUtil.queryData(wiWideInfo, getWiwideToken(wiWideInfo), params); + String res = WiwideUtil.queryData(wiWideInfo, getWiwideToken(wiWideInfo), params); //logger.info("迈外迪访问接口结果:" + res); - String res = ""; JSONObject result = JSONObject.parseObject(res); if (result == null) return new ResultData(ErrorCode.WIWIDE_INFO_NOT_READY); diff --git a/mallinkService/src/main/java/com/iformall/sms/wiwide/WiwideUtil.java b/mallinkService/src/main/java/com/iformall/sms/wiwide/WiwideUtil.java index b8d8cf404..e88936ece 100644 --- a/mallinkService/src/main/java/com/iformall/sms/wiwide/WiwideUtil.java +++ b/mallinkService/src/main/java/com/iformall/sms/wiwide/WiwideUtil.java @@ -153,26 +153,25 @@ public class WiwideUtil implements SMSExcutor { public static String queryToken(WxWiWideInfo wiWideInfo) { logger.info("获取TOKEN"); - String username = wiWideInfo.getUserName(); - String password = wiWideInfo.getPassword(); - //String authVal = WiwideUtil.encrypt(wiWideInfo.getWiwideKey()); + String username = wiWideInfo.getWiwideId(); + String authVal = WiwideUtil.encrypt(wiWideInfo.getWiwideKey()); if(StringUtils.isEmpty(username)){ logger.error("商场:" + wiWideInfo.getTenantId() + ",wiwideId为空" ); return null; } - if(StringUtils.isEmpty(password)){ + if(StringUtils.isEmpty(authVal)){ logger.error("商场:" + wiWideInfo.getTenantId() + ",wiwideKey为空" ); return null; } Map params = new HashMap<>(2); params.put("username", username); - params.put("password", password); + params.put("authVal", authVal); String wiwideUrl = wiWideInfo.getWiwideUrl(); - String result = HttpUtil.doPost(wiwideUrl + "/api/user/auth", params); - logger.info("商场:" + wiWideInfo.getTenantId() + ",返回TOKEN" + result); - return result; + String token = HttpUtil.doPost(wiwideUrl + "/login/auth", params); + logger.info("商场:" + wiWideInfo.getTenantId() + ",返回TOKEN" + token); + return token; } public static String queryData(WxWiWideInfo wiWideInfo, String token, Map params) { diff --git a/mallinkService/src/main/resources/mapper/WxWiwideInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxWiwideInfoMapper.xml index 7123579d4..763c3afd6 100644 --- a/mallinkService/src/main/resources/mapper/WxWiwideInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxWiwideInfoMapper.xml @@ -53,7 +53,7 @@ - update wx_wiwide_info set wiwide_id=#{wiwideId},wiwide_key=#{wiwideKey} where id=#{id} + update wx_wiwide_info set token=#{token},expired_time=#{expiredTime} where id=#{id}