feat:公众号介绍文本从配置中获取

snowy-web-app/src/main/java/vip/xiaonuo/weixin/gongzhong/config/WxMpConfiguration.java

@@ -19,6 +19,7 @@ import org.springframework.context.annotation.Configuration;
 import vip.xiaonuo.coldchain.modular.alarmuser.entity.AlarmUser;
 import vip.xiaonuo.coldchain.modular.alarmuser.service.AlarmUserService;
 import vip.xiaonuo.coldchain.modular.push.config.PushConfigure;
+import vip.xiaonuo.dev.modular.config.service.DevConfigService;
 import vip.xiaonuo.weixin.gongzhong.service.WxMenuService;
 
 import java.util.Map;
@@ -35,6 +36,7 @@ public class WxMpConfiguration {
     private final PushConfigure properties;
     private final WxMenuService wxMenuService;
     private final AlarmUserService alarmUserService;
+    private final DevConfigService devConfigService;
 
     @SneakyThrows
     @Bean
@@ -64,13 +66,11 @@ public class WxMpConfiguration {
                         log.info("用户关注 {}", wxMessage);
                         AlarmUser alarmUser = alarmUserService.subscribe(wxMessage.getFromUser());
                         String msg;
-                        if (alarmUser != null) {
-                            msg = "【冷链驿站】欢迎回来，" + alarmUser.getNickName() + "。";
-                            if (Objects.equals("-1", alarmUser.getCreateOrg())) {
-                                msg += "请先<a href=\"" + wxMenuService.getAuthUrl() + "\">完善信息</a>";
-                            }
+                        //用户已授权
+                        if (alarmUser != null && Objects.equals("-1", alarmUser.getCreateOrg())) {
+                            msg = devConfigService.getValueByKey("wx_authed_content");
                         } else {
-                            msg = "【冷链驿站】为您提供温湿度、二氧化碳等环境监控数据查询及实时报警通知服务。请先<a href=\"" + wxMenuService.getAuthUrl() + "\">完善信息</a>";
+                            msg = devConfigService.getValueByKey("wx_not_auth_content").replace("authUrl", wxMenuService.getAuthUrl());
                         }
 
                         return WxMpXmlOutMessage.TEXT()
@@ -101,9 +101,10 @@ public class WxMpConfiguration {
                     public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService, WxSessionManager sessionManager) {
                         log.info("用户点击 {}", wxMessage);
 
+                        //点击了关于我们
                         if (wxMessage.getEventKey().equals("aboutUs")) {
                             return WxMpXmlOutMessage.TEXT()
-                                    .content("【冷链驿站】为您提供温湿度、二氧化碳等环境监控数据查询及实时报警通知服务。您可以随时查看设备数据、设置报警阈值，确保冷链环境的安全与稳定。如有任何问题或需要帮助，请随时留言，我们将尽快为您服务。感谢您的支持！")
+                                    .content(devConfigService.getValueByKey("wx_about_us"))
                                     .fromUser(wxMessage.getToUser())
                                     .toUser(wxMessage.getFromUser())
                                     .build();

snowy-web-app/src/main/java/vip/xiaonuo/weixin/gongzhong/service/WxMenuService.java

@@ -29,14 +29,14 @@ public class WxMenuService {
         button1.setPagePath("pages/home/home");
 
         WxMenuButton button2 = new WxMenuButton();
-        button2.setType("click");
-        button2.setName("关于我们");
-        button2.setKey("aboutUs");
+        button2.setType("view");
+        button2.setName("实名认证");
+        button2.setUrl(getAuthUrl());
 
         WxMenuButton button3 = new WxMenuButton();
-        button3.setType("view");
-        button3.setName("实名认证");
-        button3.setUrl(getAuthUrl());
+        button3.setType("click");
+        button3.setName("关于我们");
+        button3.setKey("aboutUs");
 
         WxMenu wxMenu = new WxMenu();
         wxMenu.getButtons().add(button1);