Commit a1e20ac0 by WeiCong

修复校验失败依然返回00000成功标识的缺陷

parent 62f6f68b
......@@ -174,6 +174,8 @@ public abstract class AbstractCommonController {
EhcacheUtils.set(StringUtil.userUniqueId(noUiRequest), loginInfo);
}
Map<String, Object> afterReturnData = handleReturnData(eventType, context, noUiRequest, alias);
Map<String, Object> errorMap = NoUiPresentationUtil.handleErrorReturnData(context, alias);
String code = !errorMap.isEmpty() ? ErrorCodes.ERROR : NoUiPresentationUtil.retCode(context);
//数据安全性拦截-篡改数据加密
if (DataSecurityUtil.isSafeMode() && noUiRequest.isSecurity()) {
if (DataSecurityUtil.needEncrypt(noUiRequest.getReqUrl())) {
......@@ -181,15 +183,14 @@ public abstract class AbstractCommonController {
String[] pars = DataSecurityUtil.getSafeConfigByReqUrl(context, noUiRequest, noUiRequest.getReqUrl() + DataSecurityUtil.ENCRYPT_FIX);
serverEnc = DataSecurityUtil.encrypt(pars, noUiRequest.getUserId());
afterReturnData.put(DataSecurityUtil.BACKGROUND_ID, serverEnc);
} else if (!ErrorCodes.SUCCESS.equals(NoUiPresentationUtil.retCode(context)) && DataSecurityUtil.needDecrypt(noUiRequest.getReqUrl())) {
} else if (!ErrorCodes.SUCCESS.equals(code) && DataSecurityUtil.needDecrypt(noUiRequest.getReqUrl())) {
String[] pars = DataSecurityUtil.getSafeConfigByReqUrl(context, noUiRequest, noUiRequest.getReqUrl() + DataSecurityUtil.DECRYPT_FIX);
serverEnc = DataSecurityUtil.encrypt(pars, noUiRequest.getUserId());
afterReturnData.put(DataSecurityUtil.BACKGROUND_ID, serverEnc);
}
}
ret = ResultUtil.result(NoUiPresentationUtil.retCode(context), NoUiPresentationUtil.retMsg(context), afterReturnData,
NoUiPresentationUtil.handleErrorReturnData(context, alias), NoUiPresentationUtil.handleCodeTableReturnData(context, alias), noUiVersion.getVersion());
ret = ResultUtil.result(code, NoUiPresentationUtil.retMsg(context), afterReturnData,
errorMap, NoUiPresentationUtil.handleCodeTableReturnData(context, alias), noUiVersion.getVersion());
} catch (Throwable e) {
if (e.getCause() instanceof ExitTransactionException) {
ExitTransactionException exitTrans = ExitTransactionException.class.cast(e.getCause());
......
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