Merge branch 'hxd/feat/ecSync' into cc_20230520_partner

# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java
#	coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java
This commit is contained in:
xiaodong.hu
2023-06-28 18:12:42 +08:00
37 changed files with 1393 additions and 3 deletions

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());

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));
}
}