fix: 推广海报

fs-user-app/src/main/java/com/fs/app/controller/store/ProductScrmController.java

@@ -1,6 +1,7 @@
 package com.fs.app.controller.store;
 
 
+import cn.hutool.extra.servlet.ServletUtil;
 import com.fs.app.annotation.Login;
 import com.fs.app.controller.AppBaseController;
 import com.fs.common.core.domain.R;
@@ -15,6 +16,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -24,7 +26,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-
+@Slf4j
 @Api("商品中心")
 @RestController
 @RequestMapping(value="/store/app/product")
@@ -59,6 +61,7 @@ public class ProductScrmController extends AppBaseController {
     @ApiOperation("获取分类")
     @GetMapping("/getProductCate")
     public R getProductCate(HttpServletRequest request){
+        log.info("获取分类 {}", ServletUtil.getHeaderMap(request));
         try {
             FsStoreProductCategoryScrm param=new FsStoreProductCategoryScrm();
             param.setIsShow(1);
@@ -72,6 +75,8 @@ public class ProductScrmController extends AppBaseController {
     @ApiOperation("获取分类")
     @GetMapping("/getProductCateByPid")
     public R getProductCateByPid(@RequestParam(value="pid") Long pid, HttpServletRequest request){
+        log.info("获取分类 pid:{} headers:{}",pid, ServletUtil.getHeaderMap(request));
+
         try {
             FsStoreProductCategoryScrm param=new FsStoreProductCategoryScrm();
             param.setIsShow(1);
@@ -87,6 +92,8 @@ public class ProductScrmController extends AppBaseController {
     @ApiOperation("获取商品列表")
     @GetMapping("/getProducts")
     public R getProducts(FsStoreProductQueryParam param, HttpServletRequest request){
+        log.info("获取商品列表 param:{} headers:{}",param, ServletUtil.getHeaderMap(request));
+
         PageHelper.startPage(param.getPage(), param.getPageSize());
         param.setIsDisplay(1);
         List<FsStoreProductListQueryVO> productList=productService.selectFsStoreProductListQuery(param);
@@ -96,6 +103,8 @@ public class ProductScrmController extends AppBaseController {
     @ApiOperation("获取商品详情")
     @GetMapping("/getProductDetails")
     public R getProductDetails(@RequestParam(value="productId") Long productId,@RequestParam(value="storeId",required = false) String storeId){
+        log.info("获取商品详情 productId:{} storeId:{}",productId,storeId);
+
         FsStoreProductQueryVO product=productService.selectFsStoreProductByIdQuery(productId,storeId);
         if(product==null){
             return R.error("商品不存在或已下架");
@@ -223,12 +232,15 @@ public class ProductScrmController extends AppBaseController {
     @ApiOperation("添加购物车")
     @PostMapping("/addCart")
     public R addCart(@Validated @RequestBody FsStoreCartParam cartParam, HttpServletRequest request){
+        log.info("添加购物车 参数: {}",cartParam);
         return cartService.addCart(Long.parseLong(getUserId()),cartParam);
     }
     @Login
     @ApiOperation("获取购物车列表")
     @GetMapping("/getCarts")
     public R getCarts(HttpServletRequest request){
+        log.info("获取购物车列表 参数: {}",ServletUtil.getHeaderMap(request));
+
         List<FsStoreCartVO> carts= cartService.selectFsStoreCartListByUid(Long.parseLong(getUserId()));
         return R.ok().put("carts",carts);
     }
@@ -236,12 +248,15 @@ public class ProductScrmController extends AppBaseController {
     @ApiOperation("改变购物车数量")
     @PostMapping("/cartNum")
     public R cartNum(@Validated @RequestBody FsStoreCartNumParam cartParam, HttpServletRequest request){
+        log.info("改变购物车数量 参数: {} {}",cartParam,ServletUtil.getHeaderMap(request));
+
         return cartService.changeNum(Long.parseLong(getUserId()),cartParam);
     }
     @Login
     @ApiOperation("删除购物车")
     @PostMapping("/delCart")
     public R delCart(@Validated @RequestBody FsStoreCartDelParam cartParam, HttpServletRequest request){
+        log.info("删除购物车 参数: {} {}",cartParam,ServletUtil.getHeaderMap(request));
         return cartService.delCart(Long.parseLong(getUserId()),cartParam);
     }
 
@@ -250,6 +265,8 @@ public class ProductScrmController extends AppBaseController {
     @ApiOperation("获取商品购物车数量")
     @GetMapping("/getCartCount")
     public R getCartCount(FsStoreCartCountParam param){
+        log.info("获取商品购物车数量 参数: {}",param);
+
         param.setUserId(Long.parseLong(getUserId()));
         Integer count=cartService.selectFsStoreCartCount(param);
         return R.ok().put("data", count);
@@ -258,18 +275,24 @@ public class ProductScrmController extends AppBaseController {
     @ApiOperation("获取推荐商品列表")
     @GetMapping("/getTuiProduct")
     public R getTuiProduct(HttpServletRequest request){
+        log.info("删除购物车 参数: {}",ServletUtil.getHeaderMap(request));
+
         List<FsStoreProductListQueryVO> productList=productService.selectFsStoreProductTuiQuery(10);
         return R.ok().put("data", productList);
     }
     @ApiOperation("获取喜欢商品列表")
     @GetMapping("/getGoodsProduct")
     public R getGoodsProduct(BaseQueryParam param,HttpServletRequest request){
+        log.info("获取喜欢商品列表 参数: {} 请求参数: {}",param,ServletUtil.getHeaderMap(request));
+
         List<FsStoreProductListQueryVO> productList=productService.selectFsStoreProductGoodQuery(10);
         return R.ok().put("data", productList);
     }
     @ApiOperation("获取推荐商品数据")
     @GetMapping("/getTuiProducts")
     public R getTuiProducts(BaseQueryParam param, HttpServletRequest request){
+        log.info("获取推荐商品数据 参数: {} 请求参数: {}",param,ServletUtil.getHeaderMap(request));
+
         PageHelper.startPage(param.getPage(), param.getPageSize());
         List<FsStoreProductListQueryVO> list=productService.selectFsStoreProductTuiListQuery();
         PageInfo<FsStoreProductListQueryVO> listPageInfo=new PageInfo<>(list);
@@ -278,6 +301,8 @@ public class ProductScrmController extends AppBaseController {
     @ApiOperation("获取喜欢商品数据")
     @GetMapping("/getGoodsProducts")
     public R getGoodsProducts(BaseQueryParam param, HttpServletRequest request){
+        log.info("获取喜欢商品数据 参数: {} 请求参数: {}",param,ServletUtil.getHeaderMap(request));
+
         PageHelper.startPage(param.getPage(), param.getPageSize());
         List<FsStoreProductListQueryVO> list=productService.selectFsStoreProductGoodListQuery();
         PageInfo<FsStoreProductListQueryVO> listPageInfo=new PageInfo<>(list);
@@ -288,12 +313,12 @@ public class ProductScrmController extends AppBaseController {
     @ApiOperation("获取推广商品列表")
     @GetMapping("/getStoreProductAttrValueList")
     public R getStoreProductAttrValueList(FsStoreProductAttrValueQueryParam param, HttpServletRequest request){
+        log.info("获取推广商品列表 参数: {} 请求参数: {}",param,ServletUtil.getHeaderMap(request));
+
         PageHelper.startPage(param.getPage(), param.getPageSize());
         List<FsStoreProductAttrValueQueryVO> productList=attrValueService.selectStoreProductAttrValueListQuery(param);
         PageInfo<FsStoreProductAttrValueQueryVO> listPageInfo=new PageInfo<>(productList);
         return R.ok().put("data",listPageInfo);
     }
 
-
-
 }

fs-user-app/src/main/java/com/fs/app/controller/store/UserScrmController.java

@@ -35,6 +35,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -117,6 +118,10 @@ public class UserScrmController extends AppBaseController {
         return R.ok("认证成功");
     }
 
+    @Value("${getTuiImg}")
+    private String getTuiImg;
+    @Value("${getTuiFont}")
+    private String getTuiFont;
     @Login
     @ApiOperation("获取推荐海报")
     @GetMapping("/getTuiImg")
@@ -140,21 +145,17 @@ public class UserScrmController extends AppBaseController {
                 log.info("成功生成并更新用户邀请码: {}", userMap.getUserCode());
             }
 
-
-            URL bgImgFile = ResourceUtil.getResource("files/36f5863ffbbbdfc31620ea177c75284c.jpg");
-            URL fontFile = ResourceUtil.getResource("files/simsunb.ttf");
-
-            File newFile = new File(bgImgFile.getFile());
-            File newFileT = new File(fontFile.getFile());
+            File newFile = new File(getTuiImg);
+            File newFileT = new File(getTuiFont);
             try {
                 log.info("开始加载海报模板图片");
-                InputStream stream = getClass().getClassLoader().getResourceAsStream(bgImgFile.getFile());
+                InputStream stream = getClass().getClassLoader().getResourceAsStream(getTuiImg);
                 FileUtils.copyInputStreamToFile(stream, newFile);
                 log.info("海报模板图片加载成功: {}", newFile.getAbsolutePath());
 
                 if(!newFileT.exists()){
                     log.info("开始加载字体文件");
-                    InputStream streamT = getClass().getClassLoader().getResourceAsStream(fontFile.getFile());
+                    InputStream streamT = getClass().getClassLoader().getResourceAsStream(getTuiFont);
                     FileUtils.copyInputStreamToFile(streamT, newFileT);
                     log.info("字体文件加载成功: {}", newFileT.getAbsolutePath());
                 }

fs-user-app/src/main/resources/application.yml

@@ -13,3 +13,6 @@ spring:
 #    active: druid-sxjz
 #    active: druid-yzt
 #    active: druid-fcky-test
+getTuiImg: "C:\Tools\ylrm_his_scrm\images\36f5863ffbbbdfc31620ea177c75284c.jpg"
+getTuiFont: "C:\Tools\ylrm_his_scrm\images\simsunb.ttf"
+