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

Merge remote-tracking branch 'hsay/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226

Browse Source
This commit is contained in:
陈伏伽
2023-12-26 15:28:33 +08:00
parent af661f550a 4c783589da
commit 62068d9d75
7 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
coolstore-partner-webb/src/test/java/com/cool/store/service/EventRequestTest.java
View File

@@ -64,29 +64,29 @@ class EventRequestTest extends AbstractJUnit4SpringContextTests {
String testPhone = "13739417741";
String testDate = "2023-11-05 10:00:00";
String randomStr = RandomUtil.randomString(12);
String WXUrlPrefix = "https://wxaurl.cn/";
String testWXUrl = WXUrlPrefix + randomStr;
String WxUrlPrefix = "https://wxaurl.cn/";
String testWXUrl = WxUrlPrefix + randomStr;
//1. 意向申请通过
eventCenterHttpRequest.sendSmsVariable(testPhone, SMSMsgEnum.INTENTION_APPLY_PASS, testDate, testWXUrl);
//2. 预约面试通过通知
randomStr = RandomUtil.randomString(12);
testWXUrl = WXUrlPrefix + randomStr;
testWXUrl = WxUrlPrefix + randomStr;
eventCenterHttpRequest.sendSmsVariable(testPhone, SMSMsgEnum.INTERVIEW_APPOINTMENT_PASS, testDate, testWXUrl);
//3. 面试通过通知
randomStr = RandomUtil.randomString(12);
testWXUrl = WXUrlPrefix + randomStr;
testWXUrl = WxUrlPrefix + randomStr;
eventCenterHttpRequest.sendSmsVariable(testPhone, SMSMsgEnum.INTERVIEW_PASS, testWXUrl);
//4. 面试开始前一天
randomStr = RandomUtil.randomString(12);
testWXUrl = WXUrlPrefix + randomStr;
testWXUrl = WxUrlPrefix + randomStr;
eventCenterHttpRequest.sendSmsVariable(testPhone, SMSMsgEnum.INTERVIEW_BEGIN_IN_DAY, "10", testDate, testWXUrl);
//5. 面试开始前30分钟
randomStr = RandomUtil.randomString(12);
testWXUrl = WXUrlPrefix + randomStr;
testWXUrl = WxUrlPrefix + randomStr;
eventCenterHttpRequest.sendSmsVariable(testPhone, SMSMsgEnum.INTERVIEW_BEGIN_IN_MINUTES, testWXUrl);
//6. 短信邀约
randomStr = RandomUtil.randomString(12);
testWXUrl = WXUrlPrefix + randomStr;
testWXUrl = WxUrlPrefix + randomStr;
eventCenterHttpRequest.sendSmsVariable(testPhone, SMSMsgEnum.SMS_INVATE, testWXUrl);
//8. 展会结束
eventCenterHttpRequest.sendSmsVariable(testPhone, SMSMsgEnum.EXHIBITION_CLOSE, "");

1
coolstore-partner-webc/src/main/java/com/cool/store/config/CustomHttpServletRequestWrapper.java
View File

@@ -50,6 +50,7 @@ public class CustomHttpServletRequestWrapper extends HttpServletRequestWrapper {
*/
@Override
public void setReadListener(ReadListener readListener) {
//do nothing
}
@Override

9
coolstore-partner-webc/src/main/java/com/cool/store/config/SignValidateFilter.java
View File

@@ -7,7 +7,10 @@ import com.cool.store.context.PartnerUserHolder;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.WechatMiniAppService;
import com.cool.store.utils.*;
import com.cool.store.utils.AESDecryptor;
import com.cool.store.utils.Md5Utils;
import com.cool.store.utils.Sha1Utils;
import com.cool.store.utils.UUIDUtils;
import com.cool.store.vo.PartnerUserInfoVO;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
@@ -23,10 +26,7 @@ import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @author ydw
@@ -92,7 +92,6 @@ public class SignValidateFilter implements Filter {
params = request.getQueryString();
}else if("POST".equalsIgnoreCase(method)){
params = wrapper.getBody();
// params = request.getReader().lines().collect(Collectors.joining(System.lineSeparator()));
}
log.info("params:{}", params);
String sign = request.getHeader("SIGN");

1
coolstore-partner-webc/src/main/java/com/cool/store/config/swagger/Swagger2Config.java
View File

@@ -10,7 +10,6 @@ import org.springframework.context.annotation.Profile;
import springfox.documentation.RequestHandler;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.ParameterBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.schema.ModelRef;
import springfox.documentation.service.ApiInfo;

5
coolstore-partner-webc/src/main/java/com/cool/store/controller/InterviewController.java
View File

@@ -32,11 +32,6 @@ public class InterviewController {
@Autowired
private InterviewService interviewBaseService;
// @PostMapping("/queryByPartnerId")
// @ApiOperation("根据用户id查询面试信息")
// public ResponseResult<PartnerInterviewInfoVO> queryByPartnerId(@RequestBody PartnerQueryInterviewDto dto) {
// return ResponseResult.success(interviewService.queryByPartnerId(dto.getPartnerId()));
// }
@PostMapping("/freebusy/list")
@ApiOperation("查询各预约时间段情况")

1
coolstore-partner-webc/src/main/java/com/cool/store/controller/OssClientController.java
View File

@@ -1,7 +1,6 @@
package com.cool.store.controller;
import com.aliyun.oss.OSS;
import com.aliyun.oss.OSSClient;
import com.aliyun.oss.OSSClientBuilder;
import com.aliyun.oss.common.utils.BinaryUtil;
import com.aliyun.oss.model.MatchMode;

1
coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java
View File

@@ -239,7 +239,6 @@ public class PartnerController {
@ApiImplicitParam(name = "lineId", value = "线索ID", required = false),
})
public ResponseResult<Long> checkGenerateNewLineId(@RequestParam(value = "lineId",required = false)Long lineId) throws ApiException {
PartnerUserInfoVO userInfoVO = PartnerUserHolder.getUser();
return ResponseResult.success(hyPartnerLineInfoService.checkGenerateNewLineId(lineId));
}