zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc

Browse Source
This commit is contained in:
wuchunlei
2024-08-26 13:55:10 +08:00
parent bfca58dcbe 52d5787f16
commit 8ac3fc29f4
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java
View File

@@ -374,7 +374,10 @@ public class BookLabelAndMarketController {
MPJLambdaWrapper<ShopProductToBookLabel> wrapper = new MPJLambdaWrapper(); MPJLambdaWrapper<ShopProductToBookLabel> wrapper = new MPJLambdaWrapper();
wrapper.eq(ShopProductToBookLabel::getBookLabelId,labelId); wrapper.eq(ShopProductToBookLabel::getBookLabelId,labelId);
wrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,ShopProductToBookLabel::getProductId); wrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,ShopProductToBookLabel::getProductId);
wrapper.selectAll(ShopProduct.class); // wrapper.selectAll(ShopProduct.class);
wrapper.select(ShopProduct::getProductId,ShopProduct::getProductName,ShopProduct::getSumSales,ShopProduct::getIsFreeMail,ShopProduct::getPrice,ShopProduct::getActivityPrice,ShopProduct::getProductStock,ShopProduct::getProductImageList,ShopProduct::getGoodsType,ShopProduct::getProductImages,ShopProduct::getIsNew,ShopProduct::getPublisher);
// wrapper.orderByAsc(ShopProductToBookLabel::getSort); // wrapper.orderByAsc(ShopProductToBookLabel::getSort);
wrapper.orderByDesc(ShopProduct::getSumSales); wrapper.orderByDesc(ShopProduct::getSumSales);
List list = toLabelService.listMaps(wrapper); List list = toLabelService.listMaps(wrapper);

7
src/main/resources/application-dev1.yml
View File

@@ -1,8 +1,8 @@
spring: spring:
redis: redis:
open: false # 是否开启redis缓存 true开启 false关闭 open: true # 是否开启redis缓存 true开启 false关闭
database: 0 database: 0
host: 127.0.0.1 host: 47.93.127.115
port: 6379 port: 6379
password: Jgll2015 # 密码（默认为空） password: Jgll2015 # 密码（默认为空）
timeout: 6000000ms # 连接超时时长（毫秒） timeout: 6000000ms # 连接超时时长（毫秒）
@@ -91,5 +91,6 @@ wxpay:
privateKeyUrl: F:\hs\nuttyreading-java\src\main\resources\cent\apiclient_key.pem privateKeyUrl: F:\hs\nuttyreading-java\src\main\resources\cent\apiclient_key.pem
redisAddress: redis://127.0.0.1:6379 #redisAddress: redis://127.0.0.1:6379
redisAddress: redis://47.93.127.115:6379
redisPassword: Jgll2015 redisPassword: Jgll2015

6
src/main/resources/application-test.yml
View File

@@ -85,11 +85,11 @@ wxpay:
refundUrl: https://api.mch.weixin.qq.com/v3/refund/domestic/refunds refundUrl: https://api.mch.weixin.qq.com/v3/refund/domestic/refunds
refundNotifyUrl: http://pjm6m9.natappfree.cc/pay/refundNotify refundNotifyUrl: http://pjm6m9.natappfree.cc/pay/refundNotify
# keyPemPath: /usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem # keyPemPath: /usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem
keyPemPath: /home/wwwroot/hs/cent/apiclient_key.pem keyPemPath: /home/www/nuttyreading/cent/apiclient_key.pem
serialNo: 679AECB2F7AC4183033F713828892BA640E4EEE3 serialNo: 679AECB2F7AC4183033F713828892BA640E4EEE3
apiV3Key: 4aYFklzaULeGlr7oJPZ6rHWKcxjihZUF apiV3Key: 4aYFklzaULeGlr7oJPZ6rHWKcxjihZUF
wechatPayCertificateUrl: /home/wwwroot/hs/cent/wechatpay_7B5676E3CDF56680D0414A009CE501C844DBE2D6.pem wechatPayCertificateUrl: /home/www/nuttyreading/cent/wechatpay_7B5676E3CDF56680D0414A009CE501C844DBE2D6.pem
privateKeyUrl: /home/wwwroot/hs/cent/apiclient_key.pem privateKeyUrl: /home/www/nuttyreading/cent/apiclient_key.pem