From cdb6cb79bebed2d26a76d7e1a7c8b92abec8fc9b Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Tue, 26 Dec 2023 14:51:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E7=AB=AF=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/peanut/common/utils/MailUtil.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/peanut/common/utils/MailUtil.java b/src/main/java/com/peanut/common/utils/MailUtil.java index 6fb4a4ba..69518f7c 100644 --- a/src/main/java/com/peanut/common/utils/MailUtil.java +++ b/src/main/java/com/peanut/common/utils/MailUtil.java @@ -1,5 +1,7 @@ package com.peanut.common.utils; +import com.sun.mail.util.MailSSLSocketFactory; + import javax.mail.Authenticator; import javax.mail.Session; import javax.mail.Transport; @@ -17,9 +19,16 @@ public class MailUtil { //smtp服务器 Properties pros=new Properties(); pros.put("mail.smtp.host", "smtp.163.com");//主机名 - pros.put("mail.smtp.port", "25");//主机端口号 + pros.put("mail.smtp.port", "465");//主机端口号 pros.put("mail.smtp.auth", "true");//是否需要用户认证 pros.put("mail.smtp.starttls.enable", "true");//启用TLS加密 + // SSL加密 + MailSSLSocketFactory sf = null; + sf = new MailSSLSocketFactory(); + // 设置信任所有的主机 - 解决Linux无法发送邮箱的问题 + sf.setTrustAllHosts(true); + pros.put("mail.smtp.ssl.enable", "true"); + pros.put("mail.smtp.ssl.socketFactory", sf); //创建会话 Session session=Session.getInstance(pros,new Authenticator(){ @Override From 078c00119879cb72caade7b5228bdd786cccd25c Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Thu, 28 Dec 2023 17:25:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=AF=E5=A2=9E=E5=8A=A0=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=A4=A7=E4=BA=8E0=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/book/controller/ShopProductLabelController.java | 1 + .../modules/book/service/impl/ShopProductServiceImpl.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/peanut/modules/book/controller/ShopProductLabelController.java b/src/main/java/com/peanut/modules/book/controller/ShopProductLabelController.java index d48556d0..cab27409 100644 --- a/src/main/java/com/peanut/modules/book/controller/ShopProductLabelController.java +++ b/src/main/java/com/peanut/modules/book/controller/ShopProductLabelController.java @@ -110,6 +110,7 @@ public class ShopProductLabelController { shopProductEntityMPJLambdaWrapper.eq(ShopProductToLabelEntity::getSplId,splId); shopProductEntityMPJLambdaWrapper.eq(ShopProductToLabelEntity::getDelFlag,0); shopProductEntityMPJLambdaWrapper.eq(ShopProduct::getDelFlag,0); + shopProductEntityMPJLambdaWrapper.gt(ShopProduct::getProductStock,0); Page shopProductEntityPage = shopProductToLabelDao.selectJoinPage(new Page(page, limit), ShopProduct.class, shopProductEntityMPJLambdaWrapper); return R.ok().put("page",shopProductEntityPage); diff --git a/src/main/java/com/peanut/modules/book/service/impl/ShopProductServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/ShopProductServiceImpl.java index 0c5f55c3..e61719df 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/ShopProductServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/ShopProductServiceImpl.java @@ -60,7 +60,9 @@ public class ShopProductServiceImpl extends ServiceImpl page = this.page( new Query().getPage(params), - new ExcludeEmptyQueryWrapper().like("product_name", params.get("key")) + new ExcludeEmptyQueryWrapper() + .gt("product_stock",0) + .like("product_name", params.get("key")) ); return new PageUtils(page); }