增加了商品库相关的方法

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;
 
     /**

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

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

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

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

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

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
+                        AND
-                        <foreach collection="keywords" item="keyword" separator="OR">
+                        <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 (
+                            AND
-                            <foreach collection="keywords" item="keyword" separator="OR">
+                            <foreach collection="keywords" item="keyword" separator="OR" open="(" close=")">
                                 p.keywords LIKE CONCAT('%', #{keyword}, '%')
                             </foreach>
-                            )
                         </if>
                     </otherwise>
                 </choose>

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>