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

src/main/java/com/caimei365/user/controller/CmBehaviorRecordApi.java

@@ -6,6 +6,9 @@ import com.caimei365.user.model.dto.BehaviorRecordDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
 /**
  * Description
  *
@@ -19,6 +22,7 @@ public class CmBehaviorRecordApi {
 
     /**
      * 用户行为记录
+     * @param request
      * @param userId
      * @param pagePath
      * @param pageType
@@ -29,7 +33,9 @@ public class CmBehaviorRecordApi {
      */
     @IpSave(saveName="用户行为记录",saveParams = true)
     @GetMapping("/Statistics")
-    public ResponseJson<String> behaviorRecordApp(Integer userId,String pagePath,String pageType,String pageLabel,String behaviorType,Integer productId,String accessDuration,Integer accessClient,Integer shopId){
+    public ResponseJson<String> behaviorRecordApp(HttpServletRequest request, Integer userId,String pagePath,String pageType,String pageLabel,String behaviorType,Integer productId,String accessDuration,Integer accessClient,Integer shopId){
+        HttpSession session = request.getSession();
+        String touristId = (String) session.getAttribute("touristId");
         log.info("用户行为记录=======userId==》"+userId+"==pagePath=="+pagePath+"==pageType=="+pageType+"==pageLabel=="+pageLabel+"==behaviorType=="+behaviorType+"==productId=="+productId+"==accessDuration=="+accessDuration+"==accessClient=="+accessClient+"==shopId=="+shopId);
         return ResponseJson.success("用户行为记录完成");
     }

src/main/java/com/caimei365/user/idempotent/IpSaveAspect.java

@@ -20,6 +20,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import java.lang.reflect.Method;
 
 
@@ -68,6 +69,10 @@ public class IpSaveAspect {
         if (ip == null || ip.length() == 0 || unknown.equalsIgnoreCase(ip)) {
             ip = request.getRemoteAddr();
         }
+        // 获取session缓存
+        HttpSession session = request.getSession();
+        String touristId = (String) session.getAttribute("touristId");
+        log.info("touristId===="+touristId);
         // 接口路径
         String requestURI = request.getRequestURI();
         //获取自定义注解
@@ -115,10 +120,13 @@ public class IpSaveAspect {
         } else {
             mes += "￥";
         }
+
         // 访问接口类型为post时接口参数调整
         if ("POST".equals(request.getMethod())){
             queryString = params;
         }
+        // 拼接参数
+        queryString += "&touristId=" + touristId;
         if (StringUtils.isNotBlank(queryString)) {
             queryString += "&referer=" + referer + "&userAgent=" + userAgent;
             mes += queryString + "￥";