From 2ab2c4ff5d3ddaadf4f9506e0c70df93d67191e7 Mon Sep 17 00:00:00 2001 From: "pikachu1995@126.com" Date: Sat, 11 Oct 2025 18:07:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(sms):=20=E5=8D=8E=E4=B8=BA=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E6=8F=92=E4=BB=B6=E4=BF=A1=E4=BB=BB=E6=89=80=E6=9C=89?= =?UTF-8?q?HTTPS=E8=AF=81=E4=B9=A6-=20=E5=9C=A8=E5=8D=8E=E4=B8=BA=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E6=8F=92=E4=BB=B6=E4=B8=AD=E6=B7=BB=E5=8A=A0X509Trust?= =?UTF-8?q?Manager=E5=AE=9E=E7=8E=B0=20-=20=E8=A6=86=E7=9B=96checkClientTr?= =?UTF-8?q?usted=E6=96=B9=E6=B3=95=E4=BB=A5=E8=B7=B3=E8=BF=87=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E8=AF=81=E4=B9=A6=E9=AA=8C=E8=AF=81=20-=20?= =?UTF-8?q?=E8=A6=86=E7=9B=96checkServerTrusted=E6=96=B9=E6=B3=95=E4=BB=A5?= =?UTF-8?q?=E8=B7=B3=E8=BF=87=E6=9C=8D=E5=8A=A1=E7=AB=AF=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E9=AA=8C=E8=AF=81-=20=E5=AE=9E=E7=8E=B0getAcceptedIssuers?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E8=BF=94=E5=9B=9Enull=E4=BB=A5=E6=8E=A5?= =?UTF-8?q?=E5=8F=97=E6=89=80=E6=9C=89=E9=A2=81=E5=8F=91=E8=80=85=20-=20?= =?UTF-8?q?=E4=B8=BA=E6=89=80=E6=9C=89=E6=96=B0=E5=A2=9E=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0@Override=E6=B3=A8=E8=A7=A3=E7=A1=AE=E4=BF=9D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E9=87=8D=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(im): 补充IM对话服务实现注解 -为getTalkByUser方法添加@Override注解 fix(member): 补充会员服务实现注解 - 为modifyPass方法添加@Override注解 fix(promotion): 补充促销服务实现注解- 为getGoodsSkuPromotionMap方法添加@Override注解 - 为wrapperPromotionMapList方法添加@Override注解 fix(system): 补充地区服务实现注解- 为updateById方法添加@Override注解 -为save方法添加@Override注解 fix(logistics): 补充顺丰物流插件实现注解 - 为createOrder方法添加@Override注解 --- .../cn/lili/modules/im/serviceimpl/ImTalkServiceImpl.java | 2 +- .../modules/logistics/plugin/shunfeng/ShunfengPlugin.java | 1 + .../lili/modules/member/serviceimpl/MemberServiceImpl.java | 1 + .../modules/promotion/serviceimpl/PromotionServiceImpl.java | 3 ++- .../cn/lili/modules/sms/plugin/impl/HuaweiSmsPlugin.java | 5 +++-- .../java/cn/lili/modules/system/service/RegionService.java | 2 ++ 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/im/serviceimpl/ImTalkServiceImpl.java b/framework/src/main/java/cn/lili/modules/im/serviceimpl/ImTalkServiceImpl.java index a4ec61f8f..18dd0a939 100644 --- a/framework/src/main/java/cn/lili/modules/im/serviceimpl/ImTalkServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/im/serviceimpl/ImTalkServiceImpl.java @@ -46,7 +46,7 @@ public class ImTalkServiceImpl extends ServiceImpl impleme @Autowired private ImMessageService imMessageService; - + @Override public ImTalk getTalkByUser(String userId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser()); diff --git a/framework/src/main/java/cn/lili/modules/logistics/plugin/shunfeng/ShunfengPlugin.java b/framework/src/main/java/cn/lili/modules/logistics/plugin/shunfeng/ShunfengPlugin.java index f813baadd..98970939f 100644 --- a/framework/src/main/java/cn/lili/modules/logistics/plugin/shunfeng/ShunfengPlugin.java +++ b/framework/src/main/java/cn/lili/modules/logistics/plugin/shunfeng/ShunfengPlugin.java @@ -59,6 +59,7 @@ public class ShunfengPlugin implements LogisticsPlugin { * * @param orderDetailVO */ + @Override public String createOrder(OrderDetailVO orderDetailVO) { StoreDetailService storeService = SpringContextUtil.getBean(StoreDetailService.class); StoreDeliverGoodsAddressDTO storeDeliverGoodsAddressDTO = storeService.getStoreDeliverGoodsAddressDto(orderDetailVO.getOrder().getStoreId()); diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java index fe95383f6..dc53fa920 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java @@ -335,6 +335,7 @@ public class MemberServiceImpl extends ServiceImpl impleme } @DemoSite + @Override public Member modifyPass(String oldPassword, String newPassword) { AuthUser tokenUser = UserContext.getCurrentUser(); if (tokenUser == null) { diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java index 87b8ab6be..d8777ffdd 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java @@ -87,6 +87,7 @@ public class PromotionServiceImpl implements PromotionService { * @param goodsSkuId 商品skuId * @return 当前促销活动集合 */ + @Override public Map getGoodsSkuPromotionMap(String storeId, String goodsSkuId) { String storeIds = storeId + "," + PromotionTools.PLATFORM_ID; List promotionGoodsList = promotionGoodsService.findSkuValidPromotion(goodsSkuId, storeIds); @@ -99,7 +100,7 @@ public class PromotionServiceImpl implements PromotionService { promotionGoodsService.deletePromotionGoodsByGoods(goodsIds); kanjiaActivityGoodsService.deleteByGoodsIds(goodsIds); } - + @Override public Map wrapperPromotionMapList(List promotionGoodsList) { Map promotionMap = new HashMap<>(); for (PromotionGoods promotionGoods : promotionGoodsList) { diff --git a/framework/src/main/java/cn/lili/modules/sms/plugin/impl/HuaweiSmsPlugin.java b/framework/src/main/java/cn/lili/modules/sms/plugin/impl/HuaweiSmsPlugin.java index 90d9f8d4b..5e4a9b188 100644 --- a/framework/src/main/java/cn/lili/modules/sms/plugin/impl/HuaweiSmsPlugin.java +++ b/framework/src/main/java/cn/lili/modules/sms/plugin/impl/HuaweiSmsPlugin.java @@ -303,14 +303,15 @@ public class HuaweiSmsPlugin implements SmsPlugin { static void trustAllHttpsCertificates() throws Exception { TrustManager[] trustAllCerts = new TrustManager[]{ new X509TrustManager() { + @Override public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException { return; } - + @Override public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException { return; } - + @Override public X509Certificate[] getAcceptedIssuers() { return null; } diff --git a/framework/src/main/java/cn/lili/modules/system/service/RegionService.java b/framework/src/main/java/cn/lili/modules/system/service/RegionService.java index e33387ef5..d0b84f3fa 100644 --- a/framework/src/main/java/cn/lili/modules/system/service/RegionService.java +++ b/framework/src/main/java/cn/lili/modules/system/service/RegionService.java @@ -27,6 +27,7 @@ public interface RegionService extends IService { * @return */ @CacheEvict(allEntries = true) + @Override boolean updateById(Region region); /** * 更新地区 @@ -35,6 +36,7 @@ public interface RegionService extends IService { * @return */ @CacheEvict(allEntries = true) + @Override boolean save(Region region);