修复websocket通知消息发送失败的错误

jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/WebsocketConst.java

@@ -44,6 +44,11 @@ public class WebsocketConst {
     public static final String CMD_USER = "user";
 
     /**
+     * 消息类型 user 用户消息
+     */
+    public static final String CMD_ENQUIRY = "enquiry";
+
+    /**
      * 消息类型 topic 系统通知
      */
     public static final String CMD_TOPIC = "topic";

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/common/util/AdwebRedisUtil.java

@@ -2,11 +2,13 @@ package org.jeecg.modules.adweb.common.util;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
+import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
-
-import org.springframework.beans.factory.annotation.Autowired;
+import org.jeecg.common.base.BaseMap;
 import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
@@ -27,12 +29,13 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 public class AdwebRedisUtil {
 
-    @Autowired private RedisTemplate<String, Object> redisTemplate;
+    @Resource
+    private RedisTemplate<String, Object> redisTemplate;
 
-    @Autowired(required = false)
-    public void setRedisTemplate(RedisTemplate redisTemplate) {
+    @Resource
+    public void setRedisTemplate(RedisTemplate<String, Object> redisTemplate) {
         Jackson2JsonRedisSerializer<Object> jackson2JsonRedisSerializer = jacksonSerializer();
-        RedisSerializer stringSerializer = new StringRedisSerializer();
+        RedisSerializer<String> stringSerializer = new StringRedisSerializer();
         redisTemplate.setKeySerializer(stringSerializer);
         redisTemplate.setValueSerializer(jackson2JsonRedisSerializer);
         redisTemplate.setHashKeySerializer(stringSerializer);
@@ -40,20 +43,30 @@ public class AdwebRedisUtil {
         this.redisTemplate = redisTemplate;
     }
 
-    private Jackson2JsonRedisSerializer jacksonSerializer() {
-        ObjectMapper objectMapper = new ObjectMapper();
-        Jackson2JsonRedisSerializer jackson2JsonRedisSerializer =
-                new Jackson2JsonRedisSerializer(objectMapper, Object.class);
-        objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
-        objectMapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+    private Jackson2JsonRedisSerializer<Object> jacksonSerializer() {
+        JsonMapper jsonMapper =
+                JsonMapper.builder()
+                        .visibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY)
+                        .activateDefaultTyping(
+                                LaissezFaireSubTypeValidator.instance,
+                                ObjectMapper.DefaultTyping.NON_FINAL)
+                        .configure(MapperFeature.USE_ANNOTATIONS, false) // 忽略@JsonIgnore注解，缓存所有字段
+                        .build();
+
+
+        return new Jackson2JsonRedisSerializer<>(jsonMapper, Object.class);
+    }
 
-        return jackson2JsonRedisSerializer;
+    public void sendMessage(String handlerName, BaseMap params) {
+        params.put("handlerName", handlerName);
+        this.setRedisTemplate(this.redisTemplate);
+        this.redisTemplate.convertAndSend("jeecg_redis_topic", params);
     }
 
     /**
      * 指定缓存失效时间
      *
-     * @param key 键
+     * @param key  键
      * @param time 时间(秒)
      * @return
      */
@@ -146,7 +159,7 @@ public class AdwebRedisUtil {
     /**
      * 普通缓存放入
      *
-     * @param key 键
+     * @param key   键
      * @param value 值
      * @return true成功 false失败
      */
@@ -163,9 +176,9 @@ public class AdwebRedisUtil {
     /**
      * 普通缓存放入并设置时间
      *
-     * @param key 键
+     * @param key   键
      * @param value 值
-     * @param time 时间(秒) time要大于0 如果time小于等于0 将设置无限期
+     * @param time  时间(秒) time要大于0 如果time小于等于0 将设置无限期
      * @return true成功 false 失败
      */
     public boolean set(String key, Object value, long time) {
@@ -185,7 +198,7 @@ public class AdwebRedisUtil {
     /**
      * 递增
      *
-     * @param key 键
+     * @param key   键
      * @param delta 要增加几(大于0)
      * @return
      */
@@ -199,7 +212,7 @@ public class AdwebRedisUtil {
     /**
      * 递减
      *
-     * @param key 键
+     * @param key   键
      * @param delta 要减少几(小于0)
      * @return
      */
@@ -215,7 +228,7 @@ public class AdwebRedisUtil {
     /**
      * HashGet
      *
-     * @param key 键 不能为null
+     * @param key  键 不能为null
      * @param item 项 不能为null
      * @return 值
      */
@@ -253,8 +266,8 @@ public class AdwebRedisUtil {
     /**
      * HashSet 并设置时间
      *
-     * @param key 键
-     * @param map 对应多个键值
+     * @param key  键
+     * @param map  对应多个键值
      * @param time 时间(秒)
      * @return true成功 false失败
      */
@@ -274,8 +287,8 @@ public class AdwebRedisUtil {
     /**
      * 向一张hash表中放入数据,如果不存在将创建
      *
-     * @param key 键
-     * @param item 项
+     * @param key   键
+     * @param item  项
      * @param value 值
      * @return true 成功 false失败
      */
@@ -292,10 +305,10 @@ public class AdwebRedisUtil {
     /**
      * 向一张hash表中放入数据,如果不存在将创建
      *
-     * @param key 键
-     * @param item 项
+     * @param key   键
+     * @param item  项
      * @param value 值
-     * @param time 时间(秒) 注意:如果已存在的hash表有时间,这里将会替换原有的时间
+     * @param time  时间(秒) 注意:如果已存在的hash表有时间,这里将会替换原有的时间
      * @return true 成功 false失败
      */
     public boolean hset(String key, String item, Object value, long time) {
@@ -314,7 +327,7 @@ public class AdwebRedisUtil {
     /**
      * 删除hash表中的值
      *
-     * @param key 键 不能为null
+     * @param key  键 不能为null
      * @param item 项 可以使多个 不能为null
      */
     public void hdel(String key, Object... item) {
@@ -324,7 +337,7 @@ public class AdwebRedisUtil {
     /**
      * 判断hash表中是否有该项的值
      *
-     * @param key 键 不能为null
+     * @param key  键 不能为null
      * @param item 项 不能为null
      * @return true 存在 false不存在
      */
@@ -335,9 +348,9 @@ public class AdwebRedisUtil {
     /**
      * hash递增 如果不存在,就会创建一个 并把新增后的值返回
      *
-     * @param key 键
+     * @param key  键
      * @param item 项
-     * @param by 要增加几(大于0)
+     * @param by   要增加几(大于0)
      * @return
      */
     public double hincr(String key, String item, double by) {
@@ -347,9 +360,9 @@ public class AdwebRedisUtil {
     /**
      * hash递减
      *
-     * @param key 键
+     * @param key  键
      * @param item 项
-     * @param by 要减少记(小于0)
+     * @param by   要减少记(小于0)
      * @return
      */
     public double hdecr(String key, String item, double by) {
@@ -376,7 +389,7 @@ public class AdwebRedisUtil {
     /**
      * 根据value从一个set中查询,是否存在
      *
-     * @param key 键
+     * @param key   键
      * @param value 值
      * @return true 存在 false不存在
      */
@@ -392,7 +405,7 @@ public class AdwebRedisUtil {
     /**
      * 将数据放入set缓存
      *
-     * @param key 键
+     * @param key    键
      * @param values 值 可以是多个
      * @return 成功个数
      */
@@ -408,8 +421,8 @@ public class AdwebRedisUtil {
     /**
      * 将set数据放入缓存
      *
-     * @param key 键
-     * @param time 时间(秒)
+     * @param key    键
+     * @param time   时间(秒)
      * @param values 值 可以是多个
      * @return 成功个数
      */
@@ -444,7 +457,7 @@ public class AdwebRedisUtil {
     /**
      * 移除值为value的
      *
-     * @param key 键
+     * @param key    键
      * @param values 值 可以是多个
      * @return 移除的个数
      */
@@ -463,9 +476,9 @@ public class AdwebRedisUtil {
     /**
      * 获取list缓存的内容
      *
-     * @param key 键
+     * @param key   键
      * @param start 开始
-     * @param end 结束 0 到 -1代表所有值
+     * @param end   结束 0 到 -1代表所有值
      * @return
      */
     public List<Object> lGet(String key, long start, long end) {
@@ -495,7 +508,7 @@ public class AdwebRedisUtil {
     /**
      * 通过索引 获取list中的值
      *
-     * @param key 键
+     * @param key   键
      * @param index 索引 index>=0时， 0 表头，1 第二个元素，依次类推；index<0时，-1，表尾，-2倒数第二个元素，依次类推
      * @return
      */
@@ -511,7 +524,7 @@ public class AdwebRedisUtil {
     /**
      * 将list放入缓存
      *
-     * @param key 键
+     * @param key   键
      * @param value 值
      * @return
      */
@@ -528,9 +541,9 @@ public class AdwebRedisUtil {
     /**
      * 将list放入缓存
      *
-     * @param key 键
+     * @param key   键
      * @param value 值
-     * @param time 时间(秒)
+     * @param time  时间(秒)
      * @return
      */
     public boolean lSet(String key, Object value, long time) {
@@ -549,7 +562,7 @@ public class AdwebRedisUtil {
     /**
      * 将list放入缓存
      *
-     * @param key 键
+     * @param key   键
      * @param value 值
      * @return
      */
@@ -566,9 +579,9 @@ public class AdwebRedisUtil {
     /**
      * 将list放入缓存
      *
-     * @param key 键
+     * @param key   键
      * @param value 值
-     * @param time 时间(秒)
+     * @param time  时间(秒)
      * @return
      */
     public boolean lSet(String key, List<Object> value, long time) {
@@ -587,7 +600,7 @@ public class AdwebRedisUtil {
     /**
      * 根据索引修改list中的某条数据
      *
-     * @param key 键
+     * @param key   键
      * @param index 索引
      * @param value 值
      * @return
@@ -605,7 +618,7 @@ public class AdwebRedisUtil {
     /**
      * 移除N个值为value
      *
-     * @param key 键
+     * @param key   键
      * @param count 移除多少个
      * @param value 值
      * @return 移除的个数
@@ -623,7 +636,7 @@ public class AdwebRedisUtil {
     /**
      * 获取锁
      *
-     * @param lockKey 锁的键
+     * @param lockKey        锁的键
      * @param lockExpireMils 获取锁的时间
      * @return 是否获取到锁
      */
@@ -658,7 +671,7 @@ public class AdwebRedisUtil {
                                                 return oldValue == null
                                                         ? false
                                                         : Long.parseLong(new String(oldValue))
-                                                                < nowTime;
+                                                        < nowTime;
                                             }
                                         }
                                     }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/mapper/xml/AdwebPublicBlackEmailMapper.xml

@@ -4,13 +4,13 @@
     <select id="pageList" resultType="org.jeecg.modules.adweb.enquiry.entity.AdwebPublicBlackEmail">
         SELECT t1.*, t2.num wasteEnquiryNum
         FROM `adweb_public_black_email` t1
-                 LEFT JOIN (SELECT COUNT(*) num, from_email
-                            FROM adweb_enquiry
-                            WHERE `status` = 1
-                              AND user_effective = 0
-                              AND sys_effective = 1
-                              AND waste_enquiry_type = 'email'
-                            GROUP BY from_email) t2 ON t1.email = t2.from_email
+        LEFT JOIN (SELECT COUNT(*) num, from_email
+        FROM adweb_enquiry
+        WHERE `status` = 1
+        AND user_effective = 0
+        AND sys_effective = 1
+        AND waste_enquiry_type = 'email'
+        GROUP BY from_email) t2 ON t1.email = t2.from_email
         WHERE t1.`status` != 0
         <if test="email != null and email != ''">
             AND t1.email like CONCAT('%', #{email}, '%')
@@ -18,14 +18,17 @@
         <if test="blackOrWhite != null">
             AND t1.black_or_white = #{blackOrWhite}
         </if>
-        <if test = "column != null and column != ''">
-          ORDER BY
-          <if test = "column == 'createTime'">
-            t1.create_time ${order}
-          </if>
-           <if test = "column == 'email'">
-            t1.email ${order}
-          </if>
+        <if test="column != null and column != ''">
+            ORDER BY
+            <if test="column == 'createTime'">
+                t1.create_time ${order}
+            </if>
+            <if test="column == 'email'">
+                t1.email ${order}
+            </if>
+            <if test="column == 'wasteEnquiryNum'">
+                wasteEnquiryNum ${order}
+            </if>
         </if>
     </select>
 </mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/service/impl/AdwebEnquiryServiceImpl.java

@@ -13,10 +13,8 @@ import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.jeecg.common.api.dto.message.MessageDTO;
 import org.jeecg.common.constant.CacheConstant;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.constant.enums.SysAnnmentTypeEnum;
+import org.jeecg.common.constant.WebsocketConst;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.DictPropertyModel;
 import org.jeecg.common.util.FastJsonUtil;
@@ -38,7 +36,7 @@ import org.jeecg.modules.adweb.system.entity.SysException;
 import org.jeecg.modules.adweb.system.service.IMasterSubAccountRelationService;
 import org.jeecg.modules.adweb.system.service.ISysExceptionService;
 import org.jeecg.modules.adweb.system.service.impl.SysAdwebApiImpl;
-import org.jeecg.modules.message.handle.impl.SystemSendMsgHandle;
+import org.jeecg.modules.message.websocket.WebSocket;
 import org.jeecg.modules.system.entity.SysDictItem;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysDictService;
@@ -131,7 +129,7 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
     private SysAdwebApiImpl sysAdwebApiImpl;
 
     @Resource
-    private SystemSendMsgHandle systemSendMsgHandle;
+    private WebSocket webSocket;
 
     private static final byte[] redisKey = EnquiryConstants.ENQUIRY_EMAIL.getBytes();
 
@@ -263,18 +261,16 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
                 this.save(target);
                 adwebEnquiryFormService.save(form);
 
-                MessageDTO messageDTO = new MessageDTO();
-                String title = "您已经收到询盘 ";
-                messageDTO.setTitle(title);
-                Map<String, Object> data = new HashMap<>();
-                //update-begin---author:wangshuai---date:2024-03-11---for:【QQYUN-8425】用户导入成功后 消息提醒 跳转至同意页面---
-                data.put(CommonConstant.NOTICE_MSG_BUS_TYPE, SysAnnmentTypeEnum.BPM.getType());
-                //update-end---author:wangshuai---date:2024-03-11---for:【QQYUN-8425】用户导入成功后 消息提醒 跳转至同意页面---
-                messageDTO.setData(data);
-                messageDTO.setContent("您已经收到询盘 您已经收到询盘 您已经收到询盘 您已经收到询盘 ");
-                messageDTO.setToUser("admin");
-                messageDTO.setFromUser("system");
-                systemSendMsgHandle.sendMessage(messageDTO);
+
+                // 给该站点所属的用户发送消息
+                AdwebSite targetSite = adwebSiteService.getSiteByCode(target.getSiteCode());
+                String[] userIds = targetSite.getUid().split(",");
+                // TODO 之后仅对有效询盘进行发送消息通知
+                JSONObject obj = new JSONObject();
+                obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_ENQUIRY);
+                obj.put(WebsocketConst.MSG_TXT, "您已经收到询盘，请尽快处理");
+                webSocket.sendMessage(userIds, obj.toJSONString());
+
             } catch (Exception e) {
                 log.error("站点为：{}，  recordId为：{} 保存询盘到数据库失败，原因是:{}", adwebSite.getName(), enquiryDto.getRecordId(), e.getMessage());
             }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/service/SelfWebSiteService.java

@@ -112,7 +112,7 @@ public class SelfWebSiteService {
             // 执行临时服务器shell脚本，生成临时站点
             String cmd = "/opt/adweb3/shell/auto-website " + adwebSite.getCode() + " " + adwebSite.getParentCode();
 
-            shellService.createShareSiteByPwd(cmd, host, port, username, password, new ShellSSH2Util.StdoutListener() {
+            shellService.exceShellByServerInfo(cmd, host, port, username, password, new ShellSSH2Util.StdoutListener() {
                 @Override
                 public void stdout(String line) {
                     log.info("标准 ：{}", line);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/service/SiteManageService.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import jakarta.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;
+import org.jeecg.modules.adweb.common.util.DateUtil;
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
 import org.jeecg.modules.adweb.site.mapper.AdwebSiteMapper;
 import org.slf4j.Logger;
@@ -17,7 +18,7 @@ import java.util.List;
  */
 @Service
 public class SiteManageService {
-    
+
     protected Logger logger = LoggerFactory.getLogger(SiteManageService.class);
     @Resource
     private AdwebSiteMapper adwebSiteMapper;
@@ -25,7 +26,8 @@ public class SiteManageService {
 
     public String getSiteCode(String siteCode) {
         if (StringUtils.isEmpty(siteCode)) {
-            siteCode = RandomUtil.randomStringUpper(6);
+            String currDate = DateUtil.formatDate(DateUtil.getDate(), DateUtil.COMPACT_DATE_FORMAT);
+            siteCode = currDate + RandomUtil.randomStringUpper(6).toLowerCase();
 
             LambdaQueryWrapper<AdwebSite> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(AdwebSite::getCode, siteCode);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/service/impl/SiteUserPermissionServiceImpl.java

@@ -110,9 +110,12 @@ public class SiteUserPermissionServiceImpl implements ISiteUserPermissionService
 
         List<AdwebSiteUserPermission> siteUserPermissionList = null;
         try {
-            siteUserPermissionList = this.list(new LambdaQueryWrapper<AdwebSiteUserPermission>()
-                    .eq(AdwebSiteUserPermission::getUid, uid)
-                    .eq(AdwebSiteUserPermission::getStatus, 1));
+            LambdaQueryWrapper<AdwebSiteUserPermission> queryWrapper = new LambdaQueryWrapper<>();
+
+            queryWrapper.eq(AdwebSiteUserPermission::getUid, uid)
+                    .eq(AdwebSiteUserPermission::getStatus, 1);
+            
+            siteUserPermissionList = this.list(queryWrapper);
 
             AdwebSiteUserPermission siteUserPermission = new AdwebSiteUserPermission();
             String permissionCode = "";

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/websocket/WebSocket.java

@@ -1,18 +1,17 @@
 package org.jeecg.modules.message.websocket;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import jakarta.websocket.*;
 import jakarta.websocket.server.PathParam;
 import jakarta.websocket.server.ServerEndpoint;
-
-import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.base.BaseMap;
 import org.jeecg.common.constant.WebsocketConst;
-import org.jeecg.common.modules.redis.client.JeecgRedisClient;
+import org.jeecg.modules.adweb.common.util.AdwebRedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import lombok.extern.slf4j.Slf4j;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * @Author scott
@@ -23,8 +22,10 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 @ServerEndpoint("/websocket/{userId}")
 public class WebSocket {
-    
-    /**线程安全Map*/
+
+    /**
+     * 线程安全Map
+     */
     private static ConcurrentHashMap<String, Session> sessionPool = new ConcurrentHashMap<>();
 
     /**
@@ -32,11 +33,11 @@ public class WebSocket {
      */
     public static final String REDIS_TOPIC_NAME = "socketHandler";
 
-    //避免初次调用出现空指针的情况
-    private static JeecgRedisClient jeecgRedisClient;
+    private static AdwebRedisUtil adwebRedisUtil;
+
     @Autowired
-    private void setJeecgRedisClient(JeecgRedisClient jeecgRedisClient){
-        WebSocket.jeecgRedisClient = jeecgRedisClient;
+    private void setAdwebRedisUtil(AdwebRedisUtil adwebRedisUtil) {
+        WebSocket.adwebRedisUtil = adwebRedisUtil;
     }
 
 
@@ -74,13 +75,13 @@ public class WebSocket {
                 Session session = item.getValue();
                 try {
                     //update-begin-author:taoyan date:20211012 for: websocket报错 https://gitee.com/jeecg/jeecg-boot/issues/I4C0MU
-                    synchronized (session){
+                    synchronized (session) {
                         log.debug("【系统 WebSocket】推送单人消息:" + message);
                         session.getBasicRemote().sendText(message);
                     }
                     //update-end-author:taoyan date:20211012 for: websocket报错 https://gitee.com/jeecg/jeecg-boot/issues/I4C0MU
                 } catch (Exception e) {
-                    log.error(e.getMessage(),e);
+                    log.error(e.getMessage(), e);
                 }
             }
         }
@@ -110,15 +111,15 @@ public class WebSocket {
      */
     @OnMessage
     public void onMessage(String message, @PathParam(value = "userId") String userId) {
-        if(!"ping".equals(message) && !WebsocketConst.CMD_CHECK.equals(message)){
+        if (!"ping".equals(message) && !WebsocketConst.CMD_CHECK.equals(message)) {
             log.debug("【系统 WebSocket】收到客户端消息:" + message);
-        }else{
+        } else {
             log.debug("【系统 WebSocket】收到客户端消息:" + message);
             //update-begin---author:wangshuai---date:2024-05-07---for:【issues/1161】前端websocket因心跳导致监听不起作用---
             this.sendMessage(userId, "ping");
             //update-end---author:wangshuai---date:2024-05-07---for:【issues/1161】前端websocket因心跳导致监听不起作用---
         }
-        
+
 //        //------------------------------------------------------------------------------
 //        JSONObject obj = new JSONObject();
 //        //业务类型
@@ -141,9 +142,10 @@ public class WebSocket {
         t.printStackTrace();
     }
     //==========【系统 WebSocket接受、推送消息等方法 —— 具体服务节点推送ws消息】========================================================================================
-    
+
 
     //==========【采用redis发布订阅模式——推送消息】========================================================================================
+
     /**
      * 后台发送消息到redis
      *
@@ -154,7 +156,7 @@ public class WebSocket {
         BaseMap baseMap = new BaseMap();
         baseMap.put("userId", "");
         baseMap.put("message", message);
-        jeecgRedisClient.sendMessage(WebSocket.REDIS_TOPIC_NAME, baseMap);
+        adwebRedisUtil.sendMessage(WebSocket.REDIS_TOPIC_NAME, baseMap);
     }
 
     /**
@@ -167,7 +169,7 @@ public class WebSocket {
         BaseMap baseMap = new BaseMap();
         baseMap.put("userId", userId);
         baseMap.put("message", message);
-        jeecgRedisClient.sendMessage(WebSocket.REDIS_TOPIC_NAME, baseMap);
+        adwebRedisUtil.sendMessage(WebSocket.REDIS_TOPIC_NAME, baseMap);
     }
 
     /**
@@ -182,5 +184,5 @@ public class WebSocket {
         }
     }
     //=======【采用redis发布订阅模式——推送消息】==========================================================================================
-    
+
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/redis/CacheConfig.java

@@ -1,14 +1,11 @@
 package org.jeecg.modules.redis;
 
-import static org.springframework.data.redis.serializer.RedisSerializationContext.SerializationPair;
-
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
-
 import org.jeecg.common.modules.redis.config.RedisConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.CacheManager;
@@ -28,6 +25,8 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
 
 import java.time.Duration;
 
+import static org.springframework.data.redis.serializer.RedisSerializationContext.SerializationPair;
+
 /**
  * Redis cache配置
  *
@@ -43,8 +42,11 @@ public class CacheConfig {
 
     private static final int DEFAULT_TTL_HOURS = 5;
 
-    /** Jeecg默认Redis cache配置 */
-    @Autowired private RedisConfig redisConfig;
+    /**
+     * Jeecg默认Redis cache配置
+     */
+    @Autowired
+    private RedisConfig redisConfig;
 
     /**
      * Workaround - 重新注册Jeecg默认的{@link CacheManager}，标识为Primary
@@ -61,7 +63,9 @@ public class CacheConfig {
         return redisConfig.cacheManager(connectionFactory);
     }
 
-    /** 注册{@link CacheManager}，支持在{@link Cacheable#cacheNames()}中设置Redis TTL */
+    /**
+     * 注册{@link CacheManager}，支持在{@link Cacheable#cacheNames()}中设置Redis TTL
+     */
     @Bean(name = TTL_CACHE_MANAGER)
     public CacheManager ttlCacheManager(RedisConnectionFactory connectionFactory) {
         // 解决缓存对象转换异常问题

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -460,10 +460,10 @@ v2:
 
 #建站链接测试环境配置
 AdwebSiteConnect:
-  host: 52.83.163.165
+  host: 35.87.155.71
   port: 22
   username: ubuntu
-  password: Admin@123.com
+  password: adweb3.pem
   tempDomain: adweb3.topxuetang.com
   tempCname: devci2.adwebcloud.com