qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-LeeD' into develop

This commit is contained in:
李栋 2022-10-10 17:34:37 +08:00
parent 4a9a3bcd83 e384c6c1c3
commit dea9fffe7e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/salary/encrypt/AESEncryptUtil.java
View File

@ -27,8 +27,8 @@ public class AESEncryptUtil {
*/
public static String encrypt(String source) {
String isEncrypt = getSalarySysConfigValue();
//防止二次加密
if (StringUtils.isNotBlank(source) && OpenEnum.OPEN.getValue().equals(isEncrypt) && !source.startsWith(SalarySysConstant.PRE_SIGN_ENCRYPT)) {
//防止初始化老数据时二次加密
if (StringUtils.isNotBlank(source) && OpenEnum.OPEN.getValue().equals(isEncrypt) && !source.startsWith(SalarySysConstant.PRE_SIGN_ENCRYPT)&& source.length() != 32) {
return SalarySysConstant.PRE_SIGN_ENCRYPT + AES.encrypt(source, aesEncryptScrect);
}
return source;
@ -70,7 +70,7 @@ public class AESEncryptUtil {
encryptStr = encryptStr.substring(4, encryptStr.length());
return AES.decrypt(encryptStr, aesEncryptScrect);
}
if (StringUtils.isNotBlank(encryptStr) && encryptStr.length() == 16) {
if (StringUtils.isNotBlank(encryptStr) && encryptStr.length() == 32) {
return AES.decrypt(encryptStr, aesEncryptScrect);
}
return encryptStr;