清理废弃功能代码-Anchor
This commit is contained in:
@@ -3,7 +3,6 @@ package com.accompany.oauth2.support.password;
|
||||
import com.accompany.common.constant.Constant;
|
||||
import com.accompany.common.device.DeviceInfo;
|
||||
import com.accompany.common.status.BusiStatus;
|
||||
import com.accompany.common.utils.AppVersionUtil;
|
||||
import com.accompany.common.utils.DESUtils;
|
||||
import com.accompany.common.utils.StringUtils;
|
||||
import com.accompany.core.service.SysConfService;
|
||||
@@ -58,12 +57,7 @@ public class PasswordAuthenticationProvider implements AuthenticationProvider {
|
||||
logger.error("populate deviceInfo fail", e);
|
||||
}
|
||||
try {
|
||||
if (null != deviceInfo.getAppVersion()) {
|
||||
String appVersion = deviceInfo.getAppVersion();
|
||||
if (AppVersionUtil.compareVersion(appVersion, Constant.ENCRYPT_SENSITIVE_INFO_APP_VERSION) >= 0) {
|
||||
username = DESUtils.DESAndBase64Decrypt(username, KeyStore.DES_ENCRYPT_KEY);
|
||||
}
|
||||
}
|
||||
username = DESUtils.DESAndBase64Decrypt(username, KeyStore.DES_ENCRYPT_KEY);
|
||||
} catch (Exception e) {
|
||||
throw new CustomOAuth2Exception(CustomOAuth2Exception.ACCOUNT_ERROR,
|
||||
BusiStatus.ACCOUNT_ERROR.getReasonPhrase());
|
||||
|
@@ -4,7 +4,6 @@ import com.accompany.common.constant.ApplicationConstant;
|
||||
import com.accompany.common.constant.Constant;
|
||||
import com.accompany.common.device.DeviceInfo;
|
||||
import com.accompany.common.status.BusiStatus;
|
||||
import com.accompany.common.utils.AppVersionUtil;
|
||||
import com.accompany.common.utils.DESUtils;
|
||||
import com.accompany.core.exception.ServiceException;
|
||||
import com.accompany.core.util.KeyStore;
|
||||
@@ -35,18 +34,6 @@ public class BaseController {
|
||||
return exceptionTranslator.translate(e);
|
||||
}
|
||||
|
||||
protected static DeviceInfo getDeviceInfo(HttpServletRequest request){
|
||||
DeviceInfo deviceInfo = new DeviceInfo();
|
||||
deviceInfo.setApp(request.getParameter(ApplicationConstant.PublicParameters.APP));
|
||||
deviceInfo.setAppVersion(request.getParameter(ApplicationConstant.PublicParameters.APP_VERSION));
|
||||
deviceInfo.setChannel(request.getParameter(ApplicationConstant.PublicParameters.APP_CHANNEL));
|
||||
deviceInfo.setDeviceId(request.getParameter(ApplicationConstant.PublicParameters.DEVICE_ID));
|
||||
deviceInfo.setModel(request.getParameter(ApplicationConstant.PublicParameters.MODEL));
|
||||
deviceInfo.setOs(request.getParameter(ApplicationConstant.PublicParameters.OS));
|
||||
deviceInfo.setOsVersion(request.getParameter(ApplicationConstant.PublicParameters.OS_VERSION));
|
||||
return deviceInfo;
|
||||
}
|
||||
|
||||
protected static Long getUid(HttpServletRequest request){
|
||||
String uid = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID);
|
||||
return StringUtils.isBlank(uid) ? null : Long.parseLong(uid);
|
||||
@@ -58,19 +45,12 @@ public class BaseController {
|
||||
* @return
|
||||
*/
|
||||
protected static String decryptSensitiveInfo(HttpServletRequest request, String sensitiveInfo) {
|
||||
DeviceInfo deviceInfo = getDeviceInfo(request);
|
||||
if (null != deviceInfo.getAppVersion()) {
|
||||
String appVersion = deviceInfo.getAppVersion();
|
||||
if (AppVersionUtil.compareVersion(appVersion, Constant.ENCRYPT_SENSITIVE_INFO_APP_VERSION) >= 0) {
|
||||
String desInfo = null;
|
||||
try {
|
||||
desInfo = DESUtils.DESAndBase64Decrypt(sensitiveInfo, KeyStore.DES_ENCRYPT_KEY);
|
||||
} catch (Exception e) {
|
||||
throw new ServiceException(BusiStatus.SERVERBUSY);
|
||||
}
|
||||
return desInfo;
|
||||
}
|
||||
String desInfo = null;
|
||||
try {
|
||||
desInfo = DESUtils.DESAndBase64Decrypt(sensitiveInfo, KeyStore.DES_ENCRYPT_KEY);
|
||||
} catch (Exception e) {
|
||||
throw new ServiceException(BusiStatus.SERVERBUSY);
|
||||
}
|
||||
return sensitiveInfo;
|
||||
return desInfo;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user