From 43c7cf553e5c78d81b8f23a043901926c45eb0cf Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 十二月 2024 18:46:00 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 13 +++++++++++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java | 4 ++--
server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java | 1 -
server/system_service/src/main/resources/mappers/SystemUserMapper.xml | 6 ------
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java b/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
index a2648dc..be5add3 100644
--- a/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
+++ b/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
@@ -151,7 +151,6 @@
return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
}
}
- @PreventRepeat(limit = 10, lockTime = 10000)
@ApiOperation("鍙告満楠岃瘉鐮佺櫥褰�")
@PostMapping("/loginDriverWithCode")
@LoginNoRequired
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 00d21b3..6848ff9 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
@@ -35,6 +35,7 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -58,8 +59,10 @@
private MemberMapper memberMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Lazy
@Autowired
private SystemUserMapper systemUserMapper;
+ @Lazy
@Autowired
private SmsEmailMapper smsEmailMapper;
@@ -74,9 +77,10 @@
@Lazy
@Autowired
private SystemPermissionService systemPermissionService;
-
+ @Lazy
@Autowired
private CaptchaService captchaService;
+ @Lazy
@Autowired
private SystemLoginLogService systemLoginLogService;
@@ -411,6 +415,7 @@
}
@Override
+ @Transactional
public LoginUserInfo loginDriverWithCode(LoginPhoneDTO param, ServerHttpRequest request) {
isCaptcheValide(param.getPhone(),param.getCode());//妫�鏌ラ獙璇佺爜
@@ -458,6 +463,10 @@
systemUser.setSource(Constants.TWO);
systemUser.setOpenid(param.getOpenid());
systemUserMapper.insert(systemUser);
+ }else{
+ if(!Constants.equalsInteger(systemUser.getType(),Constants.memberType.driver)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇蜂娇鐢ㄦ纭殑鍙告満璐﹀彿鐧婚檰锛�");
+ }
}
dealOpenIdBiz(systemUser,param.getOpenid());
@@ -465,7 +474,7 @@
if(Objects.nonNull(systemUser.getCompanyId())){
company = companyMapper.selectById(systemUser.getCompanyId());
}
- LoginUserInfo userInfo = LoginUserInfo.from(systemUser, null, null,null,null);
+ LoginUserInfo userInfo = LoginUserInfo.from(systemUser, null, null,company,null);
return userInfo;
}
diff --git a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
index 262a4b3..1907ebc 100644
--- a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
@@ -69,14 +69,8 @@
<if test="dto.memberType != null ">
AND usr.`type` = #{dto.memberType}
</if>
- <if test="dto.memberType != null ">
- AND usr.`type` = #{dto.memberType}
- </if>
<if test="dto.workStatus != null ">
AND m.WORK_STATUS = #{dto.workStatus}
- </if>
- <if test="dto.memberType != null ">
- AND m.`type` = #{dto.memberType}
</if>
<if test="dto.companyId != null ">
AND usr.COMPANY_ID = #{dto.companyId}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
index a02e691..5854665 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
@@ -264,7 +264,7 @@
url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.driverStart[0];
TmsBaseResponse<TmsDriveTaskInfoResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.driverStart[1],JSONObject.toJSONString(param)
,new TypeReference< TmsBaseResponse<TmsDriveTaskInfoResponse>>(){});
- if(response ==null || response.getData() == null || !StringUtils.equals(response.getCode(),"0")){
+ if(response ==null || !StringUtils.equals(response.getCode(),"0")){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝浠诲姟鍒拌揣鎻愪氦澶辫触锛岃绋嶅悗閲嶈瘯锛�");
}
return true;
@@ -286,7 +286,7 @@
url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.driverArrival[0];
TmsBaseResponse<TmsDriveTaskInfoResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.driverArrival[1],JSONObject.toJSONString(param)
,new TypeReference< TmsBaseResponse<TmsDriveTaskInfoResponse>>(){});
- if(response ==null || response.getData() == null ||!StringUtils.equals(response.getCode(),"0")){
+ if(response ==null ||!StringUtils.equals(response.getCode(),"0")){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝浠诲姟鍒拌揣鎻愪氦澶辫触锛岃绋嶅悗閲嶈瘯锛�");
}
return true;
--
Gitblit v1.9.3