From af4a334421b7bde1af95a3d6f973a1033d9868a4 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Thu, 19 Jun 2025 00:24:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=BA=93=E7=9B=B8=E5=85=B3=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../library/service/impl/LibraryProductImpl.java     |  2 +-
 mall-shop/src/main/resources/bootstrap-dev.yml       |  2 +-
 mall-shop/src/main/resources/bootstrap-local.yml     |  2 +-
 mall-shop/src/main/resources/bootstrap-prod.yml      |  2 +-
 mall-shop/src/main/resources/bootstrap-test.yml      |  2 +-
 mall-shop/src/main/resources/bootstrap-uat.yml       |  2 +-
 .../mapper/library/LibraryProductMapper.xml          | 12 +++++-------
 pom.xml                                              |  3 +++
 8 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/library/service/impl/LibraryProductImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/library/service/impl/LibraryProductImpl.java
index ed1b64cb..b070392d 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/library/service/impl/LibraryProductImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/library/service/impl/LibraryProductImpl.java
@@ -29,7 +29,7 @@ public class LibraryProductImpl extends BaseServiceImpl<LibraryProductMapper, Li
     @Resource
     private LibraryProductMapper libraryProductMapper;
 
-    @Value("${static_domain}")
+    @Value("${project.static_domain}")
     private String staticDomain;
 
     /**
diff --git a/mall-shop/src/main/resources/bootstrap-dev.yml b/mall-shop/src/main/resources/bootstrap-dev.yml
index c85e96aa..692201d2 100644
--- a/mall-shop/src/main/resources/bootstrap-dev.yml
+++ b/mall-shop/src/main/resources/bootstrap-dev.yml
@@ -118,7 +118,6 @@ logging:
     springfox: error
 # 项目主域名
 main_domain: @project.domain@
-static_domain: @project.static_domain@
 # 个推
 getui:
   # Url前缀
@@ -132,6 +131,7 @@ logstash:
   host: @logstash.host@
 project:
   domain: @project.domain@
+  static_domain: @project.static_domain@
 feieyun:
   url: http://api.feieyun.cn/Api/Open/
   user: 17777525395@163.com
diff --git a/mall-shop/src/main/resources/bootstrap-local.yml b/mall-shop/src/main/resources/bootstrap-local.yml
index b3e68ecd..32f6cc7b 100644
--- a/mall-shop/src/main/resources/bootstrap-local.yml
+++ b/mall-shop/src/main/resources/bootstrap-local.yml
@@ -118,7 +118,6 @@ logging:
     springfox: error
 # 项目主域名
 main_domain: @project.domain@
-static_domain: @project.static_domain@
 # 个推
 getui:
   # Url前缀
@@ -132,6 +131,7 @@ logstash:
   host: @logstash.host@
 project:
   domain: @project.domain@
+  static_domain: @project.static_domain@
 feieyun:
   url: http://api.feieyun.cn/Api/Open/
   user: 17777525395@163.com
diff --git a/mall-shop/src/main/resources/bootstrap-prod.yml b/mall-shop/src/main/resources/bootstrap-prod.yml
index 0dce6d2a..f79caaff 100644
--- a/mall-shop/src/main/resources/bootstrap-prod.yml
+++ b/mall-shop/src/main/resources/bootstrap-prod.yml
@@ -124,7 +124,6 @@ logging:
     springfox: error
 # 项目主域名
 main_domain: @project.domain@
-static_domain: @project.static_domain@
 # 个推
 getui:
   # Url前缀
@@ -138,6 +137,7 @@ logstash:
   host: @logstash.host@
 project:
   domain: @project.domain@
+  static_domain: @project.static_domain@
 feieyun:
   url: http://api.feieyun.cn/Api/Open/
   user: 17777525395@163.com
diff --git a/mall-shop/src/main/resources/bootstrap-test.yml b/mall-shop/src/main/resources/bootstrap-test.yml
index ce25199f..70e7902c 100644
--- a/mall-shop/src/main/resources/bootstrap-test.yml
+++ b/mall-shop/src/main/resources/bootstrap-test.yml
@@ -122,7 +122,6 @@ logging:
     springfox: error
 # 项目主域名
 main_domain: @project.domain@
-static_domain: @project.static_domain@
 # 个推
 getui:
   # Url前缀
@@ -136,6 +135,7 @@ logstash:
   host: @logstash.host@
 project:
   domain: @project.domain@
+  static_domain: @project.static_domain@
 feieyun:
   url: http://api.feieyun.cn/Api/Open/
   user: 17777525395@163.com
diff --git a/mall-shop/src/main/resources/bootstrap-uat.yml b/mall-shop/src/main/resources/bootstrap-uat.yml
index ce25199f..70e7902c 100644
--- a/mall-shop/src/main/resources/bootstrap-uat.yml
+++ b/mall-shop/src/main/resources/bootstrap-uat.yml
@@ -122,7 +122,6 @@ logging:
     springfox: error
 # 项目主域名
 main_domain: @project.domain@
-static_domain: @project.static_domain@
 # 个推
 getui:
   # Url前缀
@@ -136,6 +135,7 @@ logstash:
   host: @logstash.host@
 project:
   domain: @project.domain@
+  static_domain: @project.static_domain@
 feieyun:
   url: http://api.feieyun.cn/Api/Open/
   user: 17777525395@163.com
diff --git a/mall-shop/src/main/resources/mapper/library/LibraryProductMapper.xml b/mall-shop/src/main/resources/mapper/library/LibraryProductMapper.xml
index e5d9b78f..cf26df41 100644
--- a/mall-shop/src/main/resources/mapper/library/LibraryProductMapper.xml
+++ b/mall-shop/src/main/resources/mapper/library/LibraryProductMapper.xml
@@ -70,13 +70,12 @@
 
                 <choose>
                     <when test="productName != null and productName != '' and keywords != null and keywords.size > 0">
-                        AND (
+                        AND
                         p.name LIKE CONCAT('%', #{productName}, '%')
-                        OR
-                        <foreach collection="keywords" item="keyword" separator="OR">
+                        AND
+                        <foreach collection="keywords" item="keyword" separator="OR" open="(" close=")">
                             p.keywords LIKE CONCAT('%', #{keyword}, '%')
                         </foreach>
-                        )
                     </when>
                     <otherwise>
                         <if test="productName != null and productName != ''">
@@ -84,11 +83,10 @@
                         </if>
 
                         <if test="keywords != null and keywords.size > 0">
-                            AND (
-                            <foreach collection="keywords" item="keyword" separator="OR">
+                            AND
+                            <foreach collection="keywords" item="keyword" separator="OR" open="(" close=")">
                                 p.keywords LIKE CONCAT('%', #{keyword}, '%')
                             </foreach>
-                            )
                         </if>
                     </otherwise>
                 </choose>
diff --git a/pom.xml b/pom.xml
index 7c28a006..00c1f207 100644
--- a/pom.xml
+++ b/pom.xml
@@ -396,6 +396,7 @@
                 <upload.filepath>D:/wwwroot/mall/public/static</upload.filepath>
                 <!--项目域名-->
                 <project.domain>https://mall.gpxscs.cn</project.domain>
+                <project.static_domain>https://static.gpxscs.cn</project.static_domain>
             </properties>
             <activation>
                 <activeByDefault>false</activeByDefault>
@@ -445,6 +446,7 @@
                 <upload.filepath>/opt/apps/mall/public/static</upload.filepath>
                 <!--项目域名-->
                 <project.domain>https://mall.gpxscs.cn</project.domain>
+                <project.static_domain>https://static.gpxscs.cn</project.static_domain>
             </properties>
             <activation>
                 <activeByDefault>true</activeByDefault>
@@ -494,6 +496,7 @@
                 <upload.filepath>/opt/apps/mall/public/static</upload.filepath>
                 <!--项目域名-->
                 <project.domain>https://mall.gpxscs.cn</project.domain>
+                <project.static_domain>https://static.gpxscs.cn</project.static_domain>
             </properties>
             <activation>
                 <activeByDefault>true</activeByDefault>