suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改面审校验

Browse Source
This commit is contained in:
zhangchenbiao
2024-05-24 17:52:39 +08:00
parent 767129916a
commit 4a385da2e6
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-dao/src/main/resources/mapper/LineCalendarsEventMapper.xml
View File

@@ -32,13 +32,11 @@
xfsg_line_calendars_event xfsg_line_calendars_event
where where
<![CDATA[((start_time > #{startTime} and start_time < #{endTime}) or (end_time > #{startTime} and end_time < #{endTime}))]]> <![CDATA[((start_time > #{startTime} and start_time < #{endTime}) or (end_time > #{startTime} and end_time < #{endTime}))]]>
and
interview_type = #{interviewType}
<if test="interviewType == 0"> <if test="interviewType == 0">
and interviewer_user_id = #{interviewerUserId} and interviewer_user_id = #{interviewerUserId} and interview_type in ('0')
</if> </if>
<if test="interviewType == 1 or interviewType == 2"> <if test="interviewType == 1 or interviewType == 2">
and region_id = #{regionId} and region_id = #{regionId} and interview_type in ('1', '2')
</if> </if>
<if test="excludeInterviewId != null"> <if test="excludeInterviewId != null">
and id != #{excludeInterviewId} and id != #{excludeInterviewId}

4
coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
View File

@@ -100,7 +100,7 @@ public class SignValidateFilter implements Filter {
String method = request.getMethod(); String method = request.getMethod();
String userStr = ""; String userStr = "";
boolean isInWhiteList = excludePath(uri); boolean isInWhiteList = excludePath(uri);
log.info("url:{}", uri); log.info("url:{}, method:{}", uri, method);
if ( !isInWhiteList && !method.equals("OPTIONS")) { if ( !isInWhiteList && !method.equals("OPTIONS")) {
String params = ""; String params = "";
if("GET".equalsIgnoreCase(method)){ if("GET".equalsIgnoreCase(method)){
@@ -136,7 +136,7 @@ public class SignValidateFilter implements Filter {
PartnerUserInfoVO partnerUserInfoVO = wechatMiniAppService.getUserInfo(phone, plaintextOpenid); PartnerUserInfoVO partnerUserInfoVO = wechatMiniAppService.getUserInfo(phone, plaintextOpenid);
if(partnerUserInfoVO != null){ if(partnerUserInfoVO != null){
userStr = JSONObject.toJSONString(partnerUserInfoVO); userStr = JSONObject.toJSONString(partnerUserInfoVO);
log.info("url:{}, userStr:{}", uri, userStr); log.info("userStr:{}", userStr);
} }
} }
try { try {

4
coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java
View File

@@ -100,7 +100,7 @@ public class TokenValidateFilter implements Filter {
currentUser = JSON.parseObject(userStr, LoginUserInfo.class); currentUser = JSON.parseObject(userStr, LoginUserInfo.class);
} }
} }
log.info("url:{}", uri); log.info("url:{}, method:{}", uri, method);
if ( !isInWhiteList && !method.equals("OPTIONS")) { if ( !isInWhiteList && !method.equals("OPTIONS")) {
if (StringUtils.isEmpty(accessToken)) { if (StringUtils.isEmpty(accessToken)) {
response.setStatus(HttpStatus.OK.value()); response.setStatus(HttpStatus.OK.value());
@@ -114,7 +114,7 @@ public class TokenValidateFilter implements Filter {
ResponseResult.fail(ErrorCodeEnum.ACCESS_TOKEN_INVALID))); ResponseResult.fail(ErrorCodeEnum.ACCESS_TOKEN_INVALID)));
return; return;
} }
log.info("url:{}, access_token:{}, userId:{}, username:{}", uri, accessToken, currentUser.getUserId(), currentUser.getName()); log.info("access_token:{}, userId:{}, username:{}", accessToken, currentUser.getUserId(), currentUser.getName());
} }
if(StringUtils.isBlank(userStr) && !isInWhiteList){ if(StringUtils.isBlank(userStr) && !isInWhiteList){
response.setStatus(HttpStatus.OK.value()); response.setStatus(HttpStatus.OK.value());