beacon-common/src/main/java/com/mashibing/common/clients/BeaconCacheClient.java

@@ -33,9 +33,6 @@ public interface BeaconCacheClient {
 	@GetMapping("cache/hgetString/{key}/{field}")
 	String hgetString(@PathVariable(value = "key") String key, @PathVariable(value = "field") String field);
 
-	@GetMapping("cache/hget/{key}/{field}")
-	Integer hgetInteger(@PathVariable(value = "key") String key, @PathVariable(value = "field") String field);
-
 	@PostMapping("cache/hset/{key}")
 	void hset(@PathVariable String key, @RequestBody Map hash);
 

beacon-common/src/main/java/com/mashibing/common/constant/CacheConstant.java

@@ -31,11 +31,4 @@ public class CacheConstant {
 
 	@Description("敏感词key")
 	public static final String DIRTY_WORD = "dirty_word";
-
-	@Description("客户信息-是否需要回调")
-	public static final String IS_CALLBACK = "isCallback";
-
-	@Description("客户信息-回调地址")
-	public static final String CALLBACK_URL = "callbackUrl";
-
 }

beacon-common/src/main/java/com/mashibing/common/constant/RabbitMQConstant.java

@@ -17,14 +17,4 @@ public interface RabbitMQConstant {
 	 * 策略模块发送【手机号归属地和运营商】到后台管理模块的队列名称
 	 */
 	String MOBILE_AREA_OPERATOR = "mobile_area_operator_topic";
-
-	/**
-	 * 写日志到ES的队列
-	 */
-	String SMS_WRITE_LOG = "sms_write_log_topic";
-
-	/**
-	 * 推送短信状态报告队列
-	 */
-	String SMS_PUSH_REPORT = "sms_push_report_topic";
 }

beacon-common/src/main/java/com/mashibing/common/constant/SMSConstant.java

@@ -1,7 +1,5 @@
 package com.mashibing.common.constant;
 
-import com.mashibing.common.annotation.Description;
-
 /**
  * @author heqijun
  * @ClassName: Constant
@@ -21,13 +19,4 @@ public class SMSConstant {
 
 	public static final Long SINGLE_FEE = 50L;
 
-	@Description("短信的发送状态， 0-等待ing，1-成功，2-失败")
-	public static final int REPORT_STATE_WAITING = 0;
-
-	@Description("短信的发送状态， 0-等待ing，1-成功，2-失败")
-	public static final int REPORT_STATE_SUCCESS = 1;
-
-	@Description("短信的发送状态， 0-等待ing，1-成功，2-失败")
-	public static final int REPORT_STATE_FAILED = 2;
-
 }

beacon-common/src/main/java/com/mashibing/common/pojo/StandardReport.java

@@ -1,51 +0,0 @@
-package com.mashibing.common.pojo;
-
-import com.mashibing.common.annotation.Description;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * @author heqijun
- * @ClassName: StandardReport
- * @Description: 向客户推送短信状态报告的封装对象
- * @date 2025/6/10 15:45
- */
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class StandardReport implements Serializable {
-
-	@Description("针对当前短信的唯一标识，雪花算法（保留）")
-	private Long sequenceId;
-
-	@Description("客户端ID，基于apikey查询缓存模块得到客户的ID")
-	private Long clientId;
-
-	@Description("客户业务内的uid，客户请求传递的")
-	private String uid;
-
-	@Description("目标手机号，客户请求传递的")
-	private String mobile;
-
-	@Description("短信的发送时间，当前系统时间")
-	private LocalDateTime sendTime;
-
-	@Description("短信的发送状态， 0-等待/发送ing，1-成功，2-失败 ，默认情况就是0")
-	private int reportState;
-
-	@Description("短信发送失败的原因是什么，记录在当前属性")
-	private String errorMsg;
-
-	@Description("是否需要回调")
-	private Integer isCallback;
-
-	@Description("回调url")
-	private String callbackUrl;
-
-
-}

beacon-strategy/src/main/java/com/mashibing/strategy/config/RabbitMQConfig.java

@@ -17,26 +17,10 @@ import org.springframework.context.annotation.Configuration;
 public class RabbitMQConfig {
 
 	/**
-	 * 构建策略模块发送【手机号归属地和运营商】到后台管理模块的队列
+	 * 构建策略模块发送【手机号归属地和运营商】到后台管理模块的队列名称
 	 */
 	@Bean
 	public Queue preSendQueue() {
 		return QueueBuilder.durable(RabbitMQConstant.MOBILE_AREA_OPERATOR).build();
 	}
-
-	/**
-	 * 写日志到ES的队列
-	 */
-	@Bean
-	public Queue writeLogQueue() {
-		return QueueBuilder.durable(RabbitMQConstant.SMS_WRITE_LOG).build();
-	}
-
-	/**
-	 * 推送短信状态报告队列
-	 */
-	@Bean
-	public Queue pushReportQueue() {
-		return QueueBuilder.durable(RabbitMQConstant.SMS_PUSH_REPORT).build();
-	}
 }

beacon-strategy/src/main/java/com/mashibing/strategy/mq/PreSendListener.java

@@ -36,7 +36,7 @@ public class PreSendListener {
 			log.info("【策略模块-接收消息】消息消费完毕，手动ack");
 			channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
 		} catch (StrategyException e) {
-			log.error("【策略模块-接收消息】消息消费失败！！！错误信息：{}", e.getMessage());
+			log.info("【策略模块-接收消息】消息消费失败！！！错误信息：{}", e.getMessage());
 			channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
 		}
 	}

beacon-strategy/src/main/java/com/mashibing/strategy/service/strategyfilter/impl/DFADirtyWordStrategyFilter.java

@@ -1,23 +1,18 @@
 package com.mashibing.strategy.service.strategyfilter.impl;
 
 import com.mashibing.common.constant.CacheConstant;
-import com.mashibing.common.constant.RabbitMQConstant;
-import com.mashibing.common.constant.SMSConstant;
-import com.mashibing.common.enums.ExceptionEnums;
-import com.mashibing.common.exception.StrategyException;
-import com.mashibing.common.pojo.StandardReport;
 import com.mashibing.common.pojo.StandardSubmit;
 import com.mashibing.strategy.feignclient.CacheClient;
 import com.mashibing.strategy.service.strategyfilter.StrategyFilter;
 import com.mashibing.strategy.utils.DirtyWordTree;
-import com.mashibing.strategy.utils.StrategyCheckFailedUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.wltea.analyzer.core.IKSegmenter;
+import org.wltea.analyzer.core.Lexeme;
 
+import java.io.IOException;
+import java.io.StringReader;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -33,33 +28,23 @@ import java.util.Set;
 public class DFADirtyWordStrategyFilter implements StrategyFilter {
 
 	@Autowired
-	StrategyCheckFailedUtil strategyCheckFailedUtil;
+	CacheClient cacheClient;
-
-	private static final String STRATEGY_NAME = "敏感词";
 
 	@Override
 	public void strategy(StandardSubmit submit) {
 		log.info("【策略模块-敏感词校验】开始====================================");
 		String text = submit.getText();
 		Set<String> set = new HashSet<>();
-
-		log.info("【策略模块-敏感词校验】使用敏感词树校验敏感词");
 		long start = System.currentTimeMillis();
-		Set<String> result = DirtyWordTree.getDirtyWord(text);
 		long end = System.currentTimeMillis();
-		log.info("【策略模块-敏感词校验】使用敏感词树校验敏感词耗时：{}ms", end - start);
+
+		log.info("【策略模块-敏感词校验】通过敏感词树校验敏感词");
+		Set<String> result = DirtyWordTree.getDirtyWord(text);
 
 		if (!result.isEmpty()) {
 			log.error("【策略模块-敏感词校验】短信内容包含敏感词：{}", result);
-			submit.setReportState(SMSConstant.REPORT_STATE_FAILED);
+			return;
-			submit.setErrorMsg(ExceptionEnums.HAVE_DIRTY_WORD.getMsg() + result);
+//			throw new RuntimeException("短信内容包含敏感词");
-
-			//发送消息到写日志队列
-			strategyCheckFailedUtil.smsSendLog(submit, STRATEGY_NAME);
-
-			//发送消息到推送状态报告队列
-			strategyCheckFailedUtil.smsPushReport(submit, STRATEGY_NAME);
-			throw new StrategyException(ExceptionEnums.HAVE_DIRTY_WORD);
 		}
 		log.info("【策略模块-敏感词校验】敏感词校验通过");
 	}

beacon-strategy/src/main/java/com/mashibing/strategy/utils/DirtyWordTree.java

@@ -21,7 +21,7 @@ public class DirtyWordTree {
 
 	static {
 		//通过SpringUtil，获取Spring中的CacheClient对象
-		CacheClient cacheClient = (CacheClient) SpringUtil.getBeanByClass(CacheClient.class);
+		CacheClient cacheClient = (CacheClient) StringUtil.getBeanByClass(CacheClient.class);
 		//调用缓存模块接口获取全部敏感词
 		Set<String> dirtyWords = cacheClient.smember(CacheConstant.DIRTY_WORD);
 		//构建敏感词树

beacon-strategy/src/main/java/com/mashibing/strategy/utils/StrategyCheckFailedUtil.java

@@ -1,63 +0,0 @@
-package com.mashibing.strategy.utils;
-
-import com.mashibing.common.constant.CacheConstant;
-import com.mashibing.common.constant.RabbitMQConstant;
-import com.mashibing.common.pojo.StandardReport;
-import com.mashibing.common.pojo.StandardSubmit;
-import com.mashibing.strategy.feignclient.CacheClient;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * @author heqijun
- * @ClassName: StrategyCheckFailedUtil
- * @Description: 策略校验失败后发送消息到mq工具类
- * @date 2025/6/10 16:17
- */
-
-@Component
-@Slf4j
-public class StrategyCheckFailedUtil {
-
-	@Autowired
-	CacheClient cacheClient;
-
-	@Autowired
-	RabbitTemplate rabbitTemplate;
-
-	/**
-	 * 发送推送短信状态报告消息
-	 *
-	 * @param submit       短信提交对象
-	 * @param strategyName 策略名称
-	 */
-	public void smsPushReport(StandardSubmit submit, String strategyName) {
-		Integer isCallback = cacheClient.hgetInteger(CacheConstant.CLIENT_BUSINESS + submit.getApikey(), CacheConstant.IS_CALLBACK);
-		if (isCallback != null && isCallback == 1) {
-			String callbackUrl = cacheClient.hgetString(CacheConstant.CLIENT_BUSINESS + submit.getApikey(), CacheConstant.CALLBACK_URL);
-			if (StringUtils.isNotBlank(callbackUrl)) {
-				StandardReport report = new StandardReport();
-				BeanUtils.copyProperties(submit, report);
-				report.setIsCallback(isCallback);
-				report.setCallbackUrl(callbackUrl);
-				rabbitTemplate.convertAndSend(RabbitMQConstant.SMS_PUSH_REPORT, report);
-				log.info("【策略模块-{}校验】发送短信状态报告消息到{}队列，消息：{}", strategyName, RabbitMQConstant.SMS_PUSH_REPORT, report);
-			}
-		}
-	}
-
-	/**
-	 * 发送写日志消息
-	 *
-	 * @param submit       短信提交对象
-	 * @param strategyName 策略名称
-	 */
-	public void smsSendLog(StandardSubmit submit, String strategyName) {
-		rabbitTemplate.convertAndSend(RabbitMQConstant.SMS_WRITE_LOG, submit);
-		log.error("【策略模块-{}校验】发送写日志消息到{}队列，消息：{}", strategyName, RabbitMQConstant.SMS_WRITE_LOG, submit);
-	}
-}

beacon-strategy/src/main/java/com/mashibing/strategy/utils/StringUtil.java

@@ -13,13 +13,13 @@ import org.springframework.stereotype.Component;
  */
 
 @Component
-public class SpringUtil implements ApplicationContextAware {
+public class StringUtil implements ApplicationContextAware {
 
 	private static ApplicationContext applicationContext;
 
 	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-		SpringUtil.applicationContext = applicationContext;
+		StringUtil.applicationContext = applicationContext;
 	}
 
 	public static Object getBeanByName(String beanName) {

beacon-test/src/main/java/com/mashibing/test/mapper/MobileAreaMapper.java

@@ -17,7 +17,4 @@ public interface MobileAreaMapper {
 
 	@Select("select mobile_number,mobile_area,mobile_type from mobile_area ")
 	List<MobileArea> findAllMobileArea();
-
-	@Select("select mobile_number,mobile_area,mobile_type from mobile_area where mobile_number = #{mobileNumber}")
-	MobileArea findOneMobileAreaByMobileNumber(@Param("mobileNumber") String mobileNumber);
 }

beacon-test/src/test/java/com/mashibing/test/mapper/MobileAreaMapperTest.java

@@ -3,7 +3,6 @@ package com.mashibing.test.mapper;
 import com.mashibing.test.entity.MobileArea;
 import com.mashibing.test.feignClient.CacheClient;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.annotations.Param;
 import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,14 +42,4 @@ class MobileAreaMapperTest {
 		endTime = System.currentTimeMillis();
 		log.info("【写入Redis耗时】: {} ms", endTime - startTime);
 	}
-
-	@Test
-	void findOneMobileAreaByMobileNumber() {
-		MobileArea mobileArea = mapper.findOneMobileAreaByMobileNumber("1322409");
-
-		cacheClient.set("phase:" + mobileArea.getMobileNumber(),
-				mobileArea.getMobileArea() + "," + mobileArea.getMobileType());
-
-	}
-
 }