宣城导入错误问题和redis切换主从监听失效问题处理

宣城培训会BUG修改
2025-07-17 17:07:45 +08:00 · 2025-07-16 20:02:55 +08:00
12 changed files with 204 additions and 61 deletions
--- a/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/config/RedisListenerConfig.java
+++ b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/config/RedisListenerConfig.java
@ -1,24 +1,40 @@
 package org.dromara.data2es.config;

 import org.dromara.data2es.handler.RedisExpireListener;
+import org.dromara.data2es.handler.RedisExpireRecoveryHandler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.listener.KeyExpirationEventMessageListener;
+import org.springframework.data.redis.listener.PatternTopic;
 import org.springframework.data.redis.listener.RedisMessageListenerContainer;

@Configuration
 public class RedisListenerConfig {

    @Bean
-    RedisMessageListenerContainer listenerContainer(RedisConnectionFactory connectionFactory) {
-        RedisMessageListenerContainer listenerContainer = new RedisMessageListenerContainer();
-        listenerContainer.setConnectionFactory(connectionFactory);
-        return listenerContainer;
+    RedisMessageListenerContainer listenerContainer(
+        RedisConnectionFactory connectionFactory,
+        RedisExpireRecoveryHandler recoveryHandler) {
+
+        RedisMessageListenerContainer container = new RedisMessageListenerContainer();
+        container.setConnectionFactory(connectionFactory);
+
+        // 添加连接监听器用于故障转移恢复
+        container.addMessageListener(recoveryHandler, new PatternTopic("__keyspace@*__:expired"));
+        return container;
    }

    @Bean
-    KeyExpirationEventMessageListener redisKeyExpirationListener(RedisMessageListenerContainer listenerContainer) {
-        return new RedisExpireListener(listenerContainer);
+    KeyExpirationEventMessageListener redisKeyExpirationListener(
+        RedisMessageListenerContainer listenerContainer,
+        RedisExpireRecoveryHandler recoveryHandler) {
+
+        return new RedisExpireListener(listenerContainer, recoveryHandler);
+    }
+
+    @Bean
+    RedisExpireRecoveryHandler redisExpireRecoveryHandler() {
+        return new RedisExpireRecoveryHandler();
    }
 }
--- a/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/handler/RedisExpireListener.java
+++ b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/handler/RedisExpireListener.java
@ -1,95 +1,164 @@
 package org.dromara.data2es.handler;

+
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.json.JSONObject;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.dromara.common.core.utils.RedisConstants;
+import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.data2es.controller.DataToEsController;
 import org.dromara.data2es.domain.EsGpsInfoVO2;
+import org.redisson.Redisson;
 import org.redisson.api.RLock;
+import org.redisson.api.RTopic;
 import org.redisson.api.RedissonClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.redisson.connection.ConnectionListener;
+import org.redisson.connection.ConnectionManager;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.connection.Message;
-import org.springframework.data.redis.connection.MessageListener;
 import org.springframework.data.redis.listener.KeyExpirationEventMessageListener;
 import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 import org.springframework.stereotype.Component;

-import java.util.Date;
+import javax.annotation.PostConstruct;
+import java.net.InetSocketAddress;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;

-/**
- * <p>description: </p>
- *
- * @author chenle
- * @date 2021-11-08 16:40
- */
@Component
@Slf4j
 public class RedisExpireListener extends KeyExpirationEventMessageListener {

+    private final RedisExpireRecoveryHandler recoveryHandler;
+
    @Autowired
    DataToEsController dataToEsController;
+    private volatile boolean active = true;

+    public RedisExpireListener(
+        RedisMessageListenerContainer listenerContainer,
+        RedisExpireRecoveryHandler recoveryHandler) {

-    /**
-     * Creates new {@link MessageListener} for {@code __keyevent@*__:expired} messages.
-     *
-     * @param listenerContainer must not be {@literal null}.
-     */
-    public RedisExpireListener(RedisMessageListenerContainer listenerContainer) {
        super(listenerContainer);
+        this.recoveryHandler = recoveryHandler;
+        recoveryHandler.registerListener(this);
+    }
+
+    @Override
+    public void init() {
+        try {
+            super.init();
+            log.info("Redis过期监听器初始化成功");
+        } catch (Exception e) {
+            log.error("监听器初始化失败", e);
+        }
+    }
+
+    public void reconnect() {
+        if (!active) return;
+
+        try {
+            log.info("尝试重新注册过期事件监听器...");
+            // 停止当前监听
+            super.destroy();
+            // 重新初始化
+            super.init();
+            log.info("过期事件监听器重新注册成功");
+        } catch (Exception e) {
+            log.error("重新注册监听器失败", e);
+        }
    }

    @Override
    public void onMessage(Message message, byte[] pattern) {
+        if (!active) return;
+
        String expireKey = message.toString();
-        log.info("过期的Key={}",expireKey);
-        if(StringUtils.isNotEmpty(expireKey) &&
-                expireKey.startsWith(RedisConstants.ONLINE_USERS_TEN)){
-            log.info("在线定位过期的Key={}",expireKey);
+        log.info("过期的Key={}", expireKey);
+
+        if (StringUtils.isNotEmpty(expireKey) &&
+            expireKey.startsWith(RedisConstants.ONLINE_USERS_TEN)) {
+
+            log.info("在线定位过期的Key={}", expireKey);
            handleExpiredEvent(expireKey);
        }
    }

-    private  void handleExpiredEvent(String expiredKey) {
+    private void handleExpiredEvent(String expiredKey) {
        RedissonClient redisson = RedisUtils.getClient();
        RLock lock = redisson.getLock("LOCK:" + expiredKey);
+
        try {
            if (lock.tryLock(0, 30, TimeUnit.SECONDS)) {
                // 实际业务逻辑
                String[] split = expiredKey.split(":");
-
                String deviceType = split[2];
                String deviceCode = split[3];
-                if ("5".equals(deviceType) || "9".equals(deviceType) || "8".equals(deviceType) || "7".equals(deviceType)){
+
+                if ("5".equals(deviceType) || "9".equals(deviceType) ||
+                    "8".equals(deviceType) || "7".equals(deviceType)) {
                    return;
                }
-                log.error("redis key expired:key={}",expiredKey);
-                JSONObject object = RedisUtils.getBucket(RedisConstants.ONLINE_USERS + deviceType+":"+deviceCode);
+
+                log.info("处理过期Key: {}", expiredKey);
+                JSONObject object = RedisUtils.getBucket(RedisConstants.ONLINE_USERS + deviceType + ":" + deviceCode);
+
                if (Objects.isNull(object)) {
-                    log.info("redis key={},Object=null，deviceType={},deviceCode={}", expiredKey,deviceType,deviceCode);
+                    log.info("redis key={},Object=null，deviceType={},deviceCode={}",
+                        expiredKey, deviceType, deviceCode);
                    return;
                }
+
                EsGpsInfoVO2 gpsInfo = BeanUtil.toBean(object, EsGpsInfoVO2.class);
                gpsInfo.setOnline(0);
                dataToEsController.saveGpsInfo(gpsInfo);
-                log.info("redis key expired:key={}", expiredKey);
+                log.info("处理完成: key={}", expiredKey);
            }
        } catch (InterruptedException e) {
-            e.printStackTrace();
+            Thread.currentThread().interrupt();
+            log.error("处理过期事件被中断", e);
+        } catch (Exception e) {
+            log.error("处理过期事件异常", e);
        } finally {
-            // 仅在当前线程持有锁时释放
            if (lock.isHeldByCurrentThread()) {
                lock.unlock();
            }
        }
    }

+    @Override
+    public void destroy() {
+        active = false;
+        try {
+            super.destroy();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        log.info("Redis过期监听器已停止");
+    }
+
+    // 添加连接状态监听（使用Redisson事件总线）
+    @PostConstruct
+    public void addSentinelConnectionListener() {
+        try {
+            RedissonClient redisson = RedisUtils.getClient();
+
+            // 订阅Redisson连接事件
+            RTopic connectionEvents = redisson.getTopic("__redisson_connection_event");
+            connectionEvents.addListener(String.class, (channel, msg) -> {
+                if ("CONNECTED".equals(msg)) {
+                    log.info("Redis连接已建立: {}", msg);
+                    // 标记需要恢复监听
+                    recoveryHandler.markReconnected();
+                } else if ("DISCONNECTED".equals(msg)) {
+                    log.warn("Redis连接断开: {}", msg);
+                }
+            });
+
+            log.info("已注册Redisson连接事件监听器");
+        } catch (Exception e) {
+            log.warn("无法添加Redisson连接事件监听器", e);
+        }
+    }
 }
--- a/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/handler/RedisExpireRecoveryHandler.java
+++ b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/handler/RedisExpireRecoveryHandler.java
@ -0,0 +1,36 @@
+package org.dromara.data2es.handler;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.redis.connection.Message;
+import org.springframework.data.redis.connection.MessageListener;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+
+@Component
+public class RedisExpireRecoveryHandler implements MessageListener {
+
+    private static final Logger log = LoggerFactory.getLogger(RedisExpireRecoveryHandler.class);
+
+    private final AtomicBoolean reconnected = new AtomicBoolean(false);
+    private final AtomicReference<RedisExpireListener> listenerRef = new AtomicReference<>();
+
+    public void registerListener(RedisExpireListener listener) {
+        this.listenerRef.set(listener);
+    }
+
+    @Override
+    public void onMessage(Message message, byte[] pattern) {
+        // 检测到任何事件时，检查是否需要恢复监听
+        if (reconnected.compareAndSet(true, false) && listenerRef.get() != null) {
+            log.warn("检测到Redis事件，尝试重新注册主监听器...");
+            listenerRef.get().reconnect();
+        }
+    }
+
+    public void markReconnected() {
+        reconnected.set(true);
+    }
+}
--- a/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java
+++ b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java
@ -169,7 +169,7 @@ public class GpsServiceImpl implements IGpsService {

    @Override
    public R updateOnlineStatusBatch(List<EsGpsInfoVO2> list) {
-        logger.error("下线设备数量={}",list.size());
+        logger.error("记录仪状态修改设备数量={}",list.size());
        int num = 0;
        for (EsGpsInfo originEsGpsInfo : list) {
            String deviceCode = originEsGpsInfo.getDeviceCode();
@ -177,8 +177,14 @@ public class GpsServiceImpl implements IGpsService {
 //            DeviceEntityV2 de = deviceService.checkDeviceExists(info);
            JSONObject o = RedisUtils.getBucket(RedisConstants.ONLINE_USERS + deviceType+":" + deviceCode);
            if (Objects.isNull(o)) {
-                logger.error("redis中的Object=null，deviceType={},deviceCode={}",deviceType,deviceCode);
-                continue;
+
+                if ("5".equals(deviceType) || "7".equals(deviceType) || "8".equals(deviceType)){
+                    logger.error("记录仪设备不在online_users中，deviceCode={},deviceType={}",deviceCode,deviceType);
+                    o = JSONUtil.parseObj(originEsGpsInfo);
+                }else {
+                    logger.error("redis中的Object=null，deviceType={},deviceCode={}",deviceType,deviceCode);
+                    continue;
+                }
            }
            EsGpsInfoVO2 esGpsInfoVO2 = JSONUtil.toBean(o, EsGpsInfoVO2.class);
            //更新在线状态和时间，经纬度不变
@ -204,6 +210,7 @@ public class GpsServiceImpl implements IGpsService {
                num++;
 //            storeDataService.saveDataByPersonType(esGpsInfo);
            }  catch (Exception e) {
+                e.printStackTrace();
                num--;
                logger.error(e.getMessage());
 //                return response.error(500,e.getMessage());
--- a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceExportVo.java
+++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceExportVo.java
@ -16,13 +16,13 @@ public class TDeviceExportVo implements Serializable {
    @Serial
    private static final long serialVersionUID = 1L;

-    @ExcelProperty(value = "设备编号")
+    @ExcelProperty(value = "设备编码")
    private String deviceCode;

    /**
     * 设备类型
     */
-    @ExcelProperty(value = "设备类型")
+    @ExcelProperty(value = "设备类型", converter = ExcelDictConvert.class)
    @ExcelDictFormat(dictType = "zd_device_type")
    private String deviceType;

@ -41,30 +41,33 @@ public class TDeviceExportVo implements Serializable {
    /**
     * 警号（若有）
     */
-    @ExcelProperty(value = "警号", converter = ExcelDictConvert.class)
+    @ExcelProperty(value = "警号")
    private String policeNo;

    /**
     * 姓名（若有）
     */
-    @ExcelProperty(value = "警员姓名", converter = ExcelDictConvert.class)
+    @ExcelProperty(value = "警员姓名")
    private String policeName;

    /**
     * 联系电话（若有）
     */
-    @ExcelProperty(value = "电话号码", converter = ExcelDictConvert.class)
+    @ExcelProperty(value = "电话号码")
    private String phoneNum;

    /**
     * 车牌号（若有）
     */
-    @ExcelProperty(value = "车牌号", converter = ExcelDictConvert.class)
+    @ExcelProperty(value = "车牌号")
    private String carNum;

-    @ExcelProperty(value = "证件号码", converter = ExcelDictConvert.class)
+    @ExcelProperty(value = "证件号码")
    private String cardNum;

+    @ExcelProperty(value = "设备名称")
+    private String deviceName;
+
    /**
     * 0无效，1有效
     */
--- a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceImportVo.java
+++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceImportVo.java
@ -16,7 +16,7 @@ public class TDeviceImportVo implements Serializable {
    @Serial
    private static final long serialVersionUID = 1L;

-    @ExcelProperty(value = "设备编号")
+    @ExcelProperty(value = "设备编码")
    private String deviceCode;

    /**
@ -65,6 +65,9 @@ public class TDeviceImportVo implements Serializable {
    @ExcelProperty(value = "证件号码")
    private String cardNum;

+    @ExcelProperty(value = "设备名称")
+    private String deviceName;
+
    /**
     * 0无效，1有效
     */
--- a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/listener/TDeviceImportListener.java
+++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/listener/TDeviceImportListener.java
@ -1,6 +1,7 @@
 package org.dromara.system.listener;

 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HtmlUtil;
 import com.alibaba.excel.context.AnalysisContext;
@ -15,6 +16,7 @@ import org.dromara.common.core.utils.ValidatorUtils;
 import org.dromara.common.excel.core.ExcelListener;
 import org.dromara.common.excel.core.ExcelResult;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.domain.TDevice;
 import org.dromara.system.domain.bo.TDeviceBo;
 import org.dromara.system.domain.vo.SysDeptVo;
 import org.dromara.system.domain.vo.TDeviceImportVo;
@ -22,6 +24,7 @@ import org.dromara.system.domain.vo.TDeviceVo;
 import org.dromara.system.service.ISysDeptService;
 import org.dromara.system.service.ITDeviceService;

+import java.util.Date;
 import java.util.List;

@Slf4j
@ -53,7 +56,7 @@ public class TDeviceImportListener extends AnalysisEventListener<TDeviceImportVo
            failureMsg.append("请删除Excel中提示必须删除的行后重新导入！");
        }else {
            String deviceCode = deviceImportVo.getDeviceCode().replaceAll("[\\p{Zs}\\s]", "");
-            TDeviceVo deviceVo = this.deviceService.queryByDeviceCode(deviceCode);
+            TDevice deviceVo = this.deviceService.queryByDeviceCode(deviceCode);
            try {
                // 验证是否存在这个设备
                if (ObjectUtil.isNull(deviceVo)) {
@ -64,6 +67,8 @@ public class TDeviceImportListener extends AnalysisEventListener<TDeviceImportVo
                    }
                    TDeviceBo deviceBo = BeanUtil.toBean(deviceImportVo, TDeviceBo.class);
                    ValidatorUtils.validate(deviceBo);
+                    deviceBo.setCreateTime(new Date());
+                    deviceBo.setUpdateTime(new Date());
                    deviceService.insertByBo(deviceBo);
                    successNum++;
                    successMsg.append("<br/>").append(successNum).append("、设备 ").append(deviceBo.getDeviceCode()).append(" 导入成功");
@ -71,11 +76,12 @@ public class TDeviceImportListener extends AnalysisEventListener<TDeviceImportVo
                    Long id = deviceVo.getId();
                    SysDeptVo deptVo = deptService.selectDeptById(deviceVo.getZzjgdm());
                    if(null != deptVo){
-                        deviceVo.setZzjgmc(deptVo.getShortName());
+                        deviceImportVo.setZzjgmc(deptVo.getShortName());
                    }
-                    TDeviceBo deviceBo = BeanUtil.toBean(deviceVo, TDeviceBo.class);
+                    TDeviceBo deviceBo = BeanUtil.toBean(deviceImportVo, TDeviceBo.class);
                    deviceBo.setId(id);
                    ValidatorUtils.validate(deviceBo);
+                    deviceBo.setUpdateTime(new Date());
                    deviceService.updateByBo(deviceBo);
                    successNum++;
                    successMsg.append("<br/>").append(successNum).append("、设备 ").append(deviceImportVo.getDeviceCode()).append(" 更新成功");
--- a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ITDeviceService.java
+++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ITDeviceService.java
@ -82,7 +82,7 @@ public interface ITDeviceService {

    R saveDeviceToSt(String infoSource,List<TDevice> list);

-    TDeviceVo queryByDeviceCode(String deviceCode);
+    TDevice queryByDeviceCode(String deviceCode);

    List<TDeviceExportVo> selectDeviceExportList(TDeviceBo bo);

--- a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java
+++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java
@ -81,11 +81,11 @@ public class TDeviceServiceImpl implements ITDeviceService {
     */
    @Override
    public TableDataInfo<TDeviceVo> queryPageList(TDeviceBo bo, PageQuery pageQuery) {
-        bo.setValid(1);
+//        bo.setValid(1);
        LambdaQueryWrapper<TDevice> lqw = buildQueryWrapper(bo);
        Page<TDeviceVo> result = baseMapper.selectPageDevicetList(pageQuery.build(), lqw);
-        List<TDeviceVo> list = result.getRecords();
-        for (TDeviceVo vo : list) {
+//        List<TDeviceVo> list = result.getRecords();
+        /*for (TDeviceVo vo : list) {
            if ("".equals(vo.getPoliceName()) || null == vo.getPoliceName()){
                vo.setDeviceName(vo.getCarNum());
            }
@ -98,7 +98,7 @@ public class TDeviceServiceImpl implements ITDeviceService {

            }

-        }
+        }*/
        return TableDataInfo.build(result);
    }

@ -410,10 +410,11 @@ public class TDeviceServiceImpl implements ITDeviceService {
    }

    @Override
-    public TDeviceVo queryByDeviceCode(String deviceCode) {
+    public TDevice queryByDeviceCode(String deviceCode) {
        QueryWrapper<TDevice> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("device_code", deviceCode);
-        TDeviceVo vo = baseMapper.selectVoOne(queryWrapper);
+        queryWrapper.last("order by update_time desc limit 1");
+        TDevice vo = baseMapper.selectOne(queryWrapper);
        return vo;
    }
 }
--- a/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/DeviceRedisMapper.xml
+++ b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/DeviceRedisMapper.xml
@ -17,7 +17,6 @@
            )
        </foreach>
        ON DUPLICATE KEY UPDATE
-        device_type = VALUES(device_type),
        online = VALUES(online),
        zzjgdm = VALUES(zzjgdm)
    </insert>
--- a/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/TDeviceMapper.xml
+++ b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/TDeviceMapper.xml
@ -21,14 +21,14 @@
    </select>

    <select id="selectDeviceExportList" resultMap="DeviceExportResult">
-        select u.device_code, u.device_type, u.zzjgdm, u.zzjgmc, u.police_no, u.police_name, u.phone_num, u.car_num, u.valid,
+        select u.device_code, u.device_type, u.zzjgdm, u.zzjgmc, u.police_no, u.police_name, u.phone_num, u.car_num,u.device_name, u.valid,
               u.remark1, u.remark2, u.card_num, u.create_time, u.update_time
        from t_device u
            ${ew.getCustomSqlSegment}
    </select>

    <select id="selectPageDevicetList" resultMap="DevicetResult">
-        select u.id,u.device_code, u.device_type, u.zzjgdm, u.zzjgmc, u.police_no, u.police_name, u.phone_num, u.car_num, u.valid,
+        select u.id,u.device_code, u.device_type, u.zzjgdm, u.zzjgmc, u.police_no, u.police_name, u.phone_num, u.car_num,u.device_name, u.valid,
               u.remark1, u.remark2, u.card_num, u.create_time, u.update_time
        from t_device u
            ${ew.getCustomSqlSegment}
--- a/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/schedule/DeviceStatusSchedule.java
+++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/schedule/DeviceStatusSchedule.java
@ -73,6 +73,9 @@ public class DeviceStatusSchedule {
                }else {
                    info.setDeviceType("5");
                }
+                info.setLat(originDevice.getLatitude()+""); //解决记录仪设备在线 但对接的时候已经没有坐标回传问题
+                info.setLng(originDevice.getLongitude()+""); //
+                info.setGpsTime(originDevice.getUpdateTime());
                info.setOnline(originDevice.getAlive());
                Timestamp updateTime = originDevice.getUpdateTime();
                list.add(info);
Author	SHA1	Message	Date
luyya	fe00bd7311	宣城导入错误问题和redis切换主从监听失效问题处理	2025-07-17 17:07:45 +08:00
luyya	3fd5bc2f17	宣城培训会BUG修改	2025-07-16 20:02:55 +08:00