From 3e92f816675e2808e2f54cbeb22a786b7a26edb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E9=B9=8F?= <812968653@qq.com> Date: Wed, 19 Aug 2026 22:52:35 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/withdraw/AppBrokerageWithdrawRespVO.java | 3 +++ .../yudao/module/trade/util/PosterPicGen.java | 2 +- .../member/client/constant/ChatConstant.java | 2 +- .../service/push/MemberPushServiceImpl.java | 17 +++++++++++++++-- .../src/main/resources/application.yaml | 2 +- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/withdraw/AppBrokerageWithdrawRespVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/withdraw/AppBrokerageWithdrawRespVO.java index 1bc3638..f225172 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/withdraw/AppBrokerageWithdrawRespVO.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/withdraw/AppBrokerageWithdrawRespVO.java @@ -36,6 +36,9 @@ public class AppBrokerageWithdrawRespVO { @Schema(description = "转账失败原因", example = "用户未确认收款") private String transferErrorMsg; + @Schema(description = "备注", example = "账号信息有误") + private String remark; + // ========== 微信转账专属 ========== @Schema(description = "转账单编号", example = "1024") diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/util/PosterPicGen.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/util/PosterPicGen.java index a49375d..468b7eb 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/util/PosterPicGen.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/util/PosterPicGen.java @@ -55,7 +55,7 @@ public class PosterPicGen { private int pageHeight = 700; - private String title = "荷塘月色"; + private String title = "荷塘助手"; private String description = "荷塘湖畔 相伴月色"; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/client/constant/ChatConstant.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/client/constant/ChatConstant.java index 7eefa83..0220d60 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/client/constant/ChatConstant.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/client/constant/ChatConstant.java @@ -17,7 +17,7 @@ public final class ChatConstant { * 客服用户id */ public static final Long COM_SERVICE_USER_ID = -200L; - public static final String COM_SERVICE_USER_NAME = "荷塘月色客服"; + public static final String COM_SERVICE_USER_NAME = "荷塘助手客服"; public static final String COM_SERVICE_USER_AVATAR = "https://api.htysapp.com/admin-api/infra/file/4/get/affa4cac924cb13fe5706100828685015d512bca7dfa0e26ef82422b31877abc.png"; public static final List IGNORE_USER_IDS = Arrays.asList(0L, COM_MESSAGE_USER_ID, COM_SERVICE_USER_ID); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/push/MemberPushServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/push/MemberPushServiceImpl.java index 1d3a3b1..f5451e4 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/push/MemberPushServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/push/MemberPushServiceImpl.java @@ -29,6 +29,12 @@ import java.util.stream.Collectors; public class MemberPushServiceImpl implements MemberPushService { private static final int MAX_ALERT_LENGTH = 100; + /** Android 8+ 通知渠道，需与 App 端 JPush setChannelAndSound 的 channel_id 一致 */ + private static final String ANDROID_CHANNEL_ID = "htys_message"; + /** iOS 系统默认提示音 */ + private static final String IOS_SOUND = "default"; + /** 极光 Android alert_type：-1 表示默认（声音 + 震动等） */ + private static final int ANDROID_ALERT_TYPE_DEFAULT = -1; @Resource private MemberPushDeviceService pushDeviceService; @@ -62,8 +68,15 @@ public class MemberPushServiceImpl implements MemberPushService { .setAudience(Audience.registrationId(registrationIds)) .setNotification(Notification.newBuilder() .setAlert(alert) - .addPlatformNotification(AndroidNotification.newBuilder().setTitle(title).build()) - .addPlatformNotification(IosNotification.newBuilder().incrBadge(1).build()) + .addPlatformNotification(AndroidNotification.newBuilder() + .setTitle(title) + .setChannelId(ANDROID_CHANNEL_ID) + .setAlertType(ANDROID_ALERT_TYPE_DEFAULT) + .build()) + .addPlatformNotification(IosNotification.newBuilder() + .incrBadge(1) + .setSound(IOS_SOUND) + .build()) .build()) .setMessage(Message.newBuilder().setTitle(title).setMsgContent(alert) .addExtra("type", "private_message") diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml index 422a064..db3a41d 100644 --- a/yudao-server/src/main/resources/application.yaml +++ b/yudao-server/src/main/resources/application.yaml @@ -110,7 +110,7 @@ aj: cache-number: 1000 # local 缓存的阈值,达到这个值，清除缓存 timing-clear: 180 # local定时清除过期缓存(单位秒),设置为0代表不执行 type: blockPuzzle # 验证码类型 default两种都实例化。 blockPuzzle 滑块拼图 clickWord 文字点选 - water-mark: 荷塘月色 # 右下角水印文字(我的水印)，可使用 https://tool.chinaz.com/tools/unicode.aspx 中文转 Unicode，Linux 可能需要转 unicode + water-mark: 荷塘助手 # 右下角水印文字(我的水印)，可使用 https://tool.chinaz.com/tools/unicode.aspx 中文转 Unicode，Linux 可能需要转 unicode interference-options: 0 # 滑动干扰项(0/1/2) req-frequency-limit-enable: false # 接口请求次数一分钟限制是否开启 true|false req-get-lock-limit: 5 # 验证失败 5 次，get接口锁定