Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added password encryption RSA transmission #288

Merged
merged 4 commits into from
Dec 13, 2023
Merged

Added password encryption RSA transmission #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ee66e1
fetch: add new CryptoUtils
Jzow Dec 13, 2023
89bd762
fetch: update account login and register logic code added password en…
Jzow Dec 13, 2023
a6005b2
fetch: update account login and register logic code added password en…
Jzow Dec 13, 2023
edb6207
Merge branch 'master' of https://github.com/Jzow/eairp
Jzow Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/api/src/main/java/com/wansenai/api/user/SysUserController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public Response<UserInfoVO> accountLogin(@RequestBody AccountLoginDTO accountLog
}

@PostMapping(value = "mobileLogin")
public Response<UserInfoVO> accountLogin(@RequestBody MobileLoginDTO mobileLoginDto) {
public Response<UserInfoVO> mobileLogin(@RequestBody MobileLoginDTO mobileLoginDto) {
return userService.mobileLogin(mobileLoginDto);
}

Expand Down
28 changes: 24 additions & 4 deletions core/service/src/main/java/com/wansenai/service/user/impl/SysUserServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.wansenai.middleware.oss.TencentOSS;
import com.wansenai.service.system.ISysPlatformConfigService;
import com.wansenai.utils.CommonTools;
import com.wansenai.utils.CryptoUtils;
import com.wansenai.utils.FileUtil;
import com.wansenai.utils.SnowflakeIdUtil;
import com.wansenai.dto.user.*;
Expand Down Expand Up @@ -137,13 +138,25 @@ public Response<String> accountRegister(AccountRegisterDTO accountRegisterDto) {
return Response.responseMsg(UserCodeEnum.USER_REGISTER_PHONE_EXISTS);
}

var password = "";
try {
password = CryptoUtils.decryptSymmetrically(SecurityConstants.REGISTER_SECURITY_KEY, null,
accountRegisterDto.getPassword(), CryptoUtils.Algorithm.Encryption.AES_ECB_PKCS5);
} catch (Exception e) {
log.error("密码解密失败: " + e.getMessage());
}

if (!StringUtils.hasLength(password)) {
return Response.responseMsg(BaseCodeEnum.ERROR.getCode(), "密码解密失败");
}

// start register
var userId = SnowflakeIdUtil.nextId();
var user = SysUser.builder()
.id(userId)
.userName(accountRegisterDto.getUsername())
.name("测试租户")
.password(CommonTools.md5Encryp(accountRegisterDto.getPassword()))
.password(CommonTools.md5Encryp(password))
.phoneNumber(accountRegisterDto.getPhoneNumber())
.tenantId(userId)
.createTime(LocalDateTime.now())
Expand Down Expand Up @@ -230,7 +243,7 @@ public Response<String> accountRegister(AccountRegisterDTO accountRegisterDto) {
}

@Override
public Response<UserInfoVO> accountLogin(AccountLoginDTO accountLoginDto) {
public Response<UserInfoVO> accountLogin(AccountLoginDTO accountLoginDto){

var verifyCode = redisUtil.get(SecurityConstants.EMAIL_VERIFY_CODE_CACHE_PREFIX + accountLoginDto.getCaptchaId());
if (ObjectUtils.isEmpty(verifyCode)) {
Expand All @@ -240,10 +253,17 @@ public Response<UserInfoVO> accountLogin(AccountLoginDTO accountLoginDto) {
if (!String.valueOf(verifyCode).equals(accountLoginDto.getCaptcha())) {
return Response.responseMsg(BaseCodeEnum.VERIFY_CODE_ERROR);
}

var password = "";
try {
password = CryptoUtils.decryptSymmetrically(SecurityConstants.LOGIN_SECURITY_KEY, null,
accountLoginDto.getPassword(), CryptoUtils.Algorithm.Encryption.AES_ECB_PKCS5);
} catch (Exception e) {
log.error("密码解密失败: " + e.getMessage());
return Response.responseMsg(UserCodeEnum.USERNAME_OR_PASSWORD_ERROR);
}
var user = lambdaQuery()
.eq(SysUser::getUserName, accountLoginDto.getUsername())
.eq(SysUser::getPassword, CommonTools.md5Encryp(accountLoginDto.getPassword()))
.eq(SysUser::getPassword, CommonTools.md5Encryp(password))
.one();

if (user == null) {
Expand Down
Loading