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

Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

Browse Source
This commit is contained in:
zhangchenbiao
2023-06-29 09:41:54 +08:00
parent 5f32431f02 41363dac50
commit 21ed32a2b4
106 changed files with 2634 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,7 @@ public class TokenValidateFilter implements Filter {
//腾讯音视频回调，单独做验签
"/partner/pc/video/**",
//TODO 800回调地址暂时不做验证
"/partner/pc/flow/qualificationReview/callback");
"/partner/pc/flow/qualificationReview/callback","/**/ecSync/ecToApplet/**");
/**
@@ -84,13 +84,13 @@ public class TokenValidateFilter implements Filter {
boolean isInWhiteList = excludePath(uri);
String accessToken = reqs.getHeader("accessToken");
String key = "access_token:" + accessToken;
log.info("url:{}", uri);
if(StringUtils.isNotBlank(accessToken)){
userStr = redisUtilPool.getString(key);
if(StringUtils.isNotBlank(userStr)){
currentUser = JSON.parseObject(userStr, LoginUserInfo.class);
}
}
log.info("url:{}", uri);
if ( !isInWhiteList && !method.equals("OPTIONS")) {
if (StringUtils.isEmpty(accessToken)) {
response.setStatus(HttpStatus.OK.value());

34
coolstore-partner-webb/src/main/java/com/cool/store/controller/CommonController.java Normal file
View File

@@ -0,0 +1,34 @@
package com.cool.store.controller;
import com.cool.store.exception.ApiException;
import com.cool.store.request.GetTipsInfoReq;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.CommonService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @Author: young.yu
* @Date: 2023-06-28 21:33
* @Description:
*/
@RestController
@RequestMapping("/common")
@Api(tags = "通用信息")
public class CommonController {
@Autowired
private CommonService commonService;
@PostMapping("/getTipsInfo")
@ApiOperation("获取面试最新更新信息")
public ResponseResult getTipsInfo(@RequestBody GetTipsInfoReq request) throws ApiException {
String res = commonService.getTipsInfo(request);
return ResponseResult.success(res);
}
}

8
coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java
View File

@@ -200,8 +200,8 @@ public class DeskController {
@PostMapping(path = "/transferInvestmentManager")
@ApiOperation("转让招商经理")
public ResponseResult<Boolean> transferInvestmentManager(@RequestBody TransferInvestmentManagerRequest request){
return ResponseResult.success(hyPartnerLineInfoService.transferInvestmentManager(CurrentUserHolder.getUser(),request.getUserId(),request.getUserName(),request.getLineId()));
public ResponseResult<Boolean> transferInvestmentManager(@RequestBody TransferInvestmentManagerRequest request) throws ApiException {
return ResponseResult.success(hyPartnerLineInfoService.transferInvestmentManager(CurrentUserHolder.getUser(),request ));
}
@@ -235,7 +235,7 @@ public class DeskController {
@PostMapping(path = "/joinBlackList")
@ApiOperation("加入黑名单")
public ResponseResult<Boolean> joinBlackList(@RequestBody LineBlackListRequest lineBlackListRequest){
public ResponseResult<Boolean> joinBlackList(@RequestBody LineBlackListRequest lineBlackListRequest) throws ApiException {
return ResponseResult.success(hyPartnerLineInfoService.joinBlackList(CurrentUserHolder.getUser(),lineBlackListRequest.getLineId(),LineStatusEnum.BLACKLIST.getCode(),lineBlackListRequest.getCause()));
}
@@ -243,7 +243,7 @@ public class DeskController {
@PostMapping(path = "/closeOrPassFollow")
@ApiOperation("意向申请审核 结束跟进/通过流程")
public ResponseResult<Boolean> closeOrPassFollow(@RequestBody CloseFollowRequest closeFollowRequest){
public ResponseResult<Boolean> closeOrPassFollow(@RequestBody CloseFollowRequest closeFollowRequest) throws ApiException {
return ResponseResult.success(hyPartnerLineInfoService.closeOrPassFollow(CurrentUserHolder.getUser(),closeFollowRequest));
}

31
coolstore-partner-webb/src/main/java/com/cool/store/controller/EcSyncController.java Normal file
View File

@@ -0,0 +1,31 @@
package com.cool.store.controller;
import com.cool.store.request.CustomerInfoRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.EcSyncService;
import com.cool.store.vo.InterviewScheduleInfoVO;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@RestController
@RequestMapping("/ecSync")
@Slf4j
public class EcSyncController {
@Resource
private EcSyncService ecSyncService;
@PostMapping(path = "/ecToApplet")
@ApiOperation("ec同步数据到小程序")
public ResponseResult<Boolean> ecToApplet(@RequestBody List<CustomerInfoRequest> queryListData){
return ResponseResult.success(ecSyncService.ecToApplet(queryListData));
}
}

2
coolstore-partner-webb/src/main/java/com/cool/store/controller/FlowController.java
View File

@@ -36,7 +36,7 @@ public class FlowController {
}
@PostMapping("/qualificationReview/callback")
@ApiOperation("流程信息回调接口")
@ApiOperation("加盟商资质审核流程信息回调接口")
public ResponseResult qualificationCallback(@RequestBody QualificationCallbackReq request) {
flowService.qualificationCallback(request);
return ResponseResult.success();

38
coolstore-partner-webb/src/main/java/com/cool/store/controller/MDMAreaController.java Normal file
View File

@@ -0,0 +1,38 @@
package com.cool.store.controller;
import com.cool.store.dto.mdm.AreaSonDTO;
import com.cool.store.entity.MDMAreaDO;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.MDMAreaService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
@RequestMapping("/mdm/area")
@Api(tags = "MDM省市信息")
public class MDMAreaController {
@Autowired
private MDMAreaService mdmAreaService;
@PostMapping("/province")
@ApiOperation("获取MDM省级信息")
public ResponseResult<List<MDMAreaDO>> getProvince() {
return ResponseResult.success(mdmAreaService.getProvince());
}
@PostMapping("/son")
@ApiOperation("获取子级区域数据")
private ResponseResult<List<MDMAreaDO>> getSonArea(@RequestBody AreaSonDTO areaSon) {
return ResponseResult.success(mdmAreaService.getSonArea(areaSon.getCode()));
}
}

48
coolstore-partner-webb/src/main/java/com/cool/store/controller/VideoController.java
View File

@@ -1,6 +1,7 @@
package com.cool.store.controller;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.dto.trtc.callback.VideoCallBackDTO;
import com.cool.store.request.TRTCVideoCallBackReq;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.TRTCVideoService;
@@ -22,22 +23,43 @@ public class VideoController {
@Autowired
private TRTCVideoService videoService;
// @PostMapping("/callback")
// @ApiOperation("音视频回调（腾讯云回调）")
// public ResponseResult videoCallback(@RequestBody String requestBody) {
// log.info("腾讯音视频上传完成回调，request{}", JSONObject.toJSONString(requestBody));
// //由于腾讯云恶事做尽，它的回调参数不是驼峰法，首字母是大写，导致 SpringMVC 映射不上，只能手动映射了
// TRTCVideoCallBackReq req = JSONObject.parseObject(requestBody, TRTCVideoCallBackReq.class);
// //不是音视频上传的回调
// if (!"311".equals(req.getEventType())) {
// return null;
// }
// if (!"0".equals(req.getEventInfo().getPayLoad().getStatus())) {
// log.error("腾讯音视频录制视频上传错误：request：\t{}", req);
// return null;
// }
// videoService.handleVideoCallBack(req);
// return new ResponseResult(0, "腾讯云回调音视频回调数据接收成功");
// }
@PostMapping("/callback")
@ApiOperation("音视频回调（腾讯云回调）")
public ResponseResult videoCallback(@RequestBody String requestBody) {
log.info("腾讯音视频上传完成回调，request{}", JSONObject.toJSONString(requestBody));
//由于腾讯云恶事做尽，它的回调参数不是驼峰法，首字母是大写，导致 SpringMVC 映射不上，只能手动映射了
TRTCVideoCallBackReq req = JSONObject.parseObject(requestBody, TRTCVideoCallBackReq.class);
//不是音视频上传的回调
if (!"311".equals(req.getEventType())) {
return null;
public ResponseResult videoCallback(@RequestBody VideoCallBackDTO videoCallBackDTO) {
try {
log.info("腾讯音视频上传回调开始，request{}", JSONObject.toJSONString(videoCallBackDTO));
//不是音视频上传的回调
if (311 != videoCallBackDTO.getEventType()) {
return null;
}
if (0 != videoCallBackDTO.getEventInfo().getPayload().getStatus()) {
log.error("腾讯音视频录制视频上传错误：request：\t{}", videoCallBackDTO);
return null;
}
videoService.handleVideoCallBack(videoCallBackDTO);
return new ResponseResult(0, "腾讯云回调音视频回调数据接收成功");
} catch (Exception e) {
log.error("腾讯音视频录制视频上传回调错误：request：\t{}", e.getMessage());
}
if (!"0".equals(req.getEventInfo().getPayLoad().getStatus())) {
log.error("腾讯音视频录制视频上传错误：request：\t{}", req);
return null;
}
videoService.handleVideoCallBack(req);
return new ResponseResult(0, "腾讯云回调音视频回调数据接收成功");
return null;
}
}

3
coolstore-partner-webb/src/main/resources/application-ab.properties
View File

@@ -79,3 +79,6 @@ hs.mdm.appsec = ab39fedb886fa3587c7f517551976de8b2606f5511fd8f8675266825d74c5cd3
hs.sms.accessKeyId = LTAI4GEZKz9PBqqKa3hjup3W
hs.sms.accessKeySecret = iVOiK74k7C1wVbuUbipgJbfpAh1Zdb
hs.sms.templateCode = SMS_461530041
ec.baseUrl=http://58.33.58.162:10019

5
coolstore-partner-webb/src/main/resources/application-dev.properties
View File

@@ -71,4 +71,7 @@ xxl.job.executor.ip =
xxl.job.executor.port = 31001
xxl.job.executor.logpath = logs/xxl-job/jobhandler
xxl.job.executor.logretentiondays = 3
xxl.job.accessToken =
xxl.job.accessToken =
ec.baseUrl=http://58.33.58.162:10019

4
coolstore-partner-webb/src/main/resources/application-local.properties
View File

@@ -81,4 +81,6 @@ xxl.job.executor.ip =
xxl.job.executor.port = 30201
xxl.job.executor.logpath = logs/xxl-job/jobhandler
xxl.job.executor.logretentiondays = 30
xxl.job.accessToken =
xxl.job.accessToken =
ec.baseUrl=http://58.33.58.162:10019

3
coolstore-partner-webb/src/main/resources/application-pre.properties
View File

@@ -57,4 +57,5 @@ trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8
weixin.appId=wx6f984e535e571818
weixin.appSecret=245a483747e6e9f8762d3e8539cf0318
signKey=d851f2a9ac90474abecdc2fbb148d4d7
signKey=d851f2a9ac90474abecdc2fbb148d4d7