From f9c24ba3d5eba45afef222dcd72b6383893efc76 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 07 一月 2025 17:23:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 53 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
index b4adca4..7a2a9fa 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -5,6 +5,7 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.jwt.JwtTokenUtil;
import com.doumee.core.exception.BusinessException;
+import com.doumee.dao.system.dto.LoginH5DTO;
import com.doumee.service.business.third.TmsService;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.core.constants.ResponseStatus;
@@ -140,6 +141,26 @@
@Override
public LoginUserInfo loginByPasswordNew(LoginDTO dto, ServerHttpRequest request) {
+ SystemLoginLog loginLog = getInitLoginlog(dto.getUsername(),request);
+
+ if((isDebug == null || !isDebug) && (Objects.isNull(dto.getCheckCode()) || dto.getCheckCode()) ){
+ // 鏍￠獙楠岃瘉鐮�
+ try {
+ captchaService.check(dto.getUuid(), dto.getCode());
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ loginLog.setReason(e.getMessage().length() > 200 ? (e.getMessage().substring(0, 190) + "...") : e.getMessage());
+ loginLog.setSuccess(Boolean.FALSE);
+ systemLoginLogService.create(loginLog);
+ throw e;
+ }
+ }
+ LoginUserInfo user = dealLoginByPwdNewBiz(dto.getUsername(),dto.getPassword(),null,dto.getOpenid(),request);
+ systemLoginLogService.create(loginLog);
+ return user;
+ }
+ @Override
+ public LoginUserInfo loginH5 (LoginH5DTO dto, ServerHttpRequest request) {
SystemLoginLog loginLog = getInitLoginlog(dto.getUsername(),request);
if((isDebug == null || !isDebug) && (Objects.isNull(dto.getCheckCode()) || dto.getCheckCode()) ){
@@ -356,7 +377,7 @@
@Override
- public LoginUserInfo driverLogin(LoginDTO dto, ServerHttpRequest request) {
+ public LoginUserInfo driverLogin(LoginH5DTO dto, ServerHttpRequest request) {
SystemLoginLog loginLog =getInitLoginlog(dto.getUsername(),request);
LoginUserInfo userInfo = dealLoginDriverBiz(dto.getUsername(),dto.getPassword(),null,dto.getOpenid());
systemLoginLogService.create(loginLog);
@@ -382,19 +403,19 @@
throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
}
//娉ㄥ唽鍙告満
- if((Constants.equalsInteger(user.getType(),Constants.ZERO)
+ if(!((Constants.equalsInteger(user.getType(),Constants.ZERO)
||Constants.equalsInteger(user.getType(),Constants.TWO))
- && Objects.nonNull(user.getMemberId())){
- if(Constants.equalsInteger(user.getType(),Constants.TWO)){
- if(Objects.isNull(user.getCompanyId())){
- throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
- }
- Company company = companyMapper.selectById(user.getCompanyId());
- if(Objects.isNull(company) || Constants.equalsInteger(company.getType(),Constants.ONE)){
- throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
- }
- }
- }else{
+ && Objects.nonNull(user.getMemberId()))){
+// if(Constants.equalsInteger(user.getType(),Constants.TWO)){
+// if(Objects.isNull(user.getCompanyId())){
+// throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
+// }
+// Company company = companyMapper.selectById(user.getCompanyId());
+// if(Objects.isNull(company) || Constants.equalsInteger(company.getType(),Constants.ONE)){
+// throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
+// }
+// }
+// }else{
throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
}
if(StringUtils.isNotBlank(password)){
@@ -452,7 +473,7 @@
if (systemUser == null) {
systemUser = autoRegisterUser(Constants.memberType.driver,param.getPhone(),param.getOpenid(),true);
}else{
- if(!Constants.equalsInteger(systemUser.getType(),Constants.memberType.driver)){
+ if(!(Constants.equalsInteger(systemUser.getType(),Constants.memberType.driver)||Constants.equalsInteger(systemUser.getType(),Constants.memberType.internal))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇蜂娇鐢ㄦ纭殑鍙告満璐﹀彿鐧婚檰锛�");
}
}
@@ -521,10 +542,6 @@
if (systemUser == null) {
//鏂板绠℃帶浜哄憳鏁版嵁
systemUser = systemUser = autoRegisterUser(Constants.memberType.gkuser,param.getPhone(),param.getOpenid(),false);
- }else{
- if(!Constants.equalsInteger(systemUser.getType(),Constants.memberType.gkuser)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇蜂娇鐢ㄦ纭殑绠℃帶浜哄憳鎵嬫満鍙风櫥闄嗭紒");
- }
}
dealOpenIdBizForGk(systemUser,param.getOpenid());
LoginUserInfo userInfo = LoginUserInfo.from(systemUser, null, null,null,null);
--
Gitblit v1.9.3