Просмотр исходного кода

fix wiwide

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
c89dd24e91
4 измененных файлов: 29 добавлений и 28 удалений
  1. +1
    -1
      mallinkOcr/src/main/java/com/iformall/ocr/FormallTess4jTrain.java
  2. +20
    -18
      mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java
  3. +7
    -8
      mallinkService/src/main/java/com/iformall/sms/wiwide/WiwideUtil.java
  4. +1
    -1
      mallinkService/src/main/resources/mapper/WxWiwideInfoMapper.xml

+ 1
- 1
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 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) { private static String getprefix(String lang,String fontName) {
String realFileName = lang+"."+fontName+".exp0"; String realFileName = lang+"."+fontName+".exp0";


+ 20
- 18
mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java Просмотреть файл

@@ -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);


+ 7
- 8
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) { public static String queryToken(WxWiWideInfo wiWideInfo) {
logger.info("获取TOKEN"); 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)){ if(StringUtils.isEmpty(username)){
logger.error("商场:" + wiWideInfo.getTenantId() + ",wiwideId为空" ); logger.error("商场:" + wiWideInfo.getTenantId() + ",wiwideId为空" );
return null; return null;
} }


if(StringUtils.isEmpty(password)){
if(StringUtils.isEmpty(authVal)){
logger.error("商场:" + wiWideInfo.getTenantId() + ",wiwideKey为空" ); logger.error("商场:" + wiWideInfo.getTenantId() + ",wiwideKey为空" );
return null; return null;
} }


Map<String, String> params = new HashMap<>(2); Map<String, String> params = new HashMap<>(2);
params.put("username", username); params.put("username", username);
params.put("password", password);
params.put("authVal", authVal);
String wiwideUrl = wiWideInfo.getWiwideUrl(); 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<String, String> params) { public static String queryData(WxWiWideInfo wiWideInfo, String token, Map<String, String> params) {


+ 1
- 1
mallinkService/src/main/resources/mapper/WxWiwideInfoMapper.xml Просмотреть файл

@@ -53,7 +53,7 @@
</select> </select>


<update id="updateToken" parameterType="com.iformall.domain.po.WxWiWideInfo"> <update id="updateToken" parameterType="com.iformall.domain.po.WxWiWideInfo">
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}
</update> </update>






Загрузка…
Отмена
Сохранить