From 934efe6cb2b716b3ff2f8f28a78bac64cfa76e80 Mon Sep 17 00:00:00 2001
From: RIceWqy <1840169763@qq.com>
Date: Sun, 14 Jan 2024 01:01:27 +0800
Subject: [PATCH] 1

---
 .../com/yami/shop/admin/controller/ProductController.java | 1 +
 .../main/java/com/yami/shop/bean/param/ProductParam.java  | 4 ++++
 yami-shop-common/src/main/resources/shop.properties       | 6 +++---
 .../security/common/controller/CaptchaController.java     | 8 ++++----
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProductController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProductController.java
index 8aeafd2..20ee1af 100644
--- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProductController.java
+++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProductController.java
@@ -70,6 +70,7 @@ public class ProductController {
                         .like(StrUtil.isNotBlank(product.getProdName()), Product::getProdName, product.getProdName())
                         .eq(Product::getShopId, SecurityUtils.getSysUser().getShopId())
                         .eq(product.getStatus() != null, Product::getStatus, product.getStatus())
+                        .eq(product.getProductType() != null, Product::getProductType, product.getProductType())
                         .orderByDesc(Product::getPutawayTime));
         return ServerResponseEntity.success(products);
     }
diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/param/ProductParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/param/ProductParam.java
index 79f38d8..3e6a9cf 100644
--- a/yami-shop-bean/src/main/java/com/yami/shop/bean/param/ProductParam.java
+++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/param/ProductParam.java
@@ -106,5 +106,9 @@ public class ProductParam {
      * 分组标签列表
      */
     private List<Long> tagList;
+    /**
+     * 商品专区
+     */
+    private Integer productType;
 
 }
diff --git a/yami-shop-common/src/main/resources/shop.properties b/yami-shop-common/src/main/resources/shop.properties
index f4168d1..e91514f 100644
--- a/yami-shop-common/src/main/resources/shop.properties
+++ b/yami-shop-common/src/main/resources/shop.properties
@@ -1,9 +1,9 @@
 # \u4E03\u725B\u4E91\u914D\u7F6E
-shop.qiniu.resourcesUrl=https://img.mall4j.com/
+shop.qiniu.resourcesUrl=https://img.ruixininfo.com/
 ; shop.qiniu.resourcesUrl=https://img.mall4j.com/
 shop.qiniu.accessKey=gfzcyBDr9cd5FTForpe7HJGzELLJxztTtHhUmh6o
 shop.qiniu.secretKey=zs4K9rT4Hxa3jo5OL_V2Aq5oM8yXw_O1F2jlvlJJ
-shop.qiniu.bucket=****
+shop.qiniu.bucket=jintong-img
 # \u5177\u4F53\u67E5\u770BQiniuZone.java
 shop.qiniu.zone=HUA_NAN
 
@@ -18,4 +18,4 @@ shop.imgUpload.imagePath=D:/Mall4j/IMG/
 # 1.\u672C\u5730\u6587\u4EF6\u4E0A\u4F20 2.\u4E03\u725B\u4E91 \u5982\u679C\u9009\u62E9\u4E86\u4E03\u725B\u4E91\u5C31\u4E0D\u9700\u8981\u518D\u914D\u7F6E\u672C\u5730\u6587\u4EF6\u4E0A\u4F20
 shop.imgUpload.uploadType=2
 # \u672C\u5730\u6587\u4EF6\u4E0A\u4F20\u7684\u8DEF\u5F84
-shop.imgUpload.resourceUrl=http://localhost:8085/mall4j/img/
+shop.imgUpload.resourceUrl=https://img.ruixininfo.com/
diff --git a/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/controller/CaptchaController.java b/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/controller/CaptchaController.java
index d8bc092..7749591 100644
--- a/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/controller/CaptchaController.java
+++ b/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/controller/CaptchaController.java
@@ -13,8 +13,8 @@ import com.anji.captcha.model.common.RepCodeEnum;
 import com.anji.captcha.model.common.ResponseModel;
 import com.anji.captcha.model.vo.CaptchaVO;
 import com.anji.captcha.service.CaptchaService;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import com.yami.shop.common.response.ServerResponseEntity;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,17 +35,17 @@ public class CaptchaController {
         this.captchaService = captchaService;
     }
 
-    @PostMapping({ "/get" })
+    @PostMapping({"/get"})
     public ServerResponseEntity<ResponseModel> get(@RequestBody CaptchaVO captchaVO) {
         return ServerResponseEntity.success(captchaService.get(captchaVO));
     }
 
-    @PostMapping({ "/check" })
+    @PostMapping({"/check"})
     public ServerResponseEntity<ResponseModel> check(@RequestBody CaptchaVO captchaVO) {
         ResponseModel responseModel;
         try {
             responseModel = captchaService.check(captchaVO);
-        }catch (Exception e) {
+        } catch (Exception e) {
             return ServerResponseEntity.success(ResponseModel.errorMsg(RepCodeEnum.API_CAPTCHA_COORDINATE_ERROR));
         }
         return ServerResponseEntity.success(responseModel);