Commit a5991b89 authored by liqin's avatar liqin 💬

bug fixed

parent 40c60848
...@@ -153,7 +153,7 @@ public class AssetController extends BaseController { ...@@ -153,7 +153,7 @@ public class AssetController extends BaseController {
final List<TBoxOperation> tBoxOperationList = assetService.listBoxByOrgan(); final List<TBoxOperation> tBoxOperationList = assetService.listBoxByOrgan();
final Map<String, InputStream> map = new LinkedHashMap<>(tBoxOperationList.size()); final Map<String, InputStream> map = new LinkedHashMap<>(tBoxOperationList.size());
for (TBoxOperation tBoxOperation : tBoxOperationList) { for (TBoxOperation tBoxOperation : tBoxOperationList) {
map.put(tBoxOperation.getOrganName() + "-" + tBoxOperation.getMac() + ".cipher", IoUtil.toStream(RSAUtils.encrypt(VideoEncryptUtil.cipher, tBoxOperation.getPublicKey()), StandardCharsets.UTF_8)); map.put(tBoxOperation.getOrganName() + "-" + tBoxOperation.getMac().replaceAll(":|-", "_") + ".cipher", IoUtil.toStream(RSAUtils.encrypt(VideoEncryptUtil.cipher, tBoxOperation.getPublicKey()), StandardCharsets.UTF_8));
} }
ServletOutputStream outputStream = response.getOutputStream(); ServletOutputStream outputStream = response.getOutputStream();
String[] paths = map.keySet().toArray(new String[0]); String[] paths = map.keySet().toArray(new String[0]);
......
...@@ -660,7 +660,16 @@ public class ChinaMobileRestApiController extends BaseController { ...@@ -660,7 +660,16 @@ public class ChinaMobileRestApiController extends BaseController {
current = currentList.get(0); current = currentList.get(0);
} }
Map map = new HashMap(); Map map = new HashMap();
if (StringUtils.isNotBlank(versionNo)) {
map.put("isLatest", versionNo.equalsIgnoreCase(current.getAppVersion())); map.put("isLatest", versionNo.equalsIgnoreCase(current.getAppVersion()));
} else {
}
map.put("versionNo", current.getAppVersion()); map.put("versionNo", current.getAppVersion());
map.put("versionUrl", current.getApkUrl()); map.put("versionUrl", current.getApkUrl());
map.put("updateLog", current.getUpdateLog()); map.put("updateLog", current.getUpdateLog());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment