소스 검색

fix: 消费服务
1.设备有效性校验只通过机号校验,不再使用mac地址校验

luoyb 9 달 전
부모
커밋
722c8ca53c
1개의 변경된 파일8개의 추가작업 그리고 3개의 파일을 삭제
  1. 8 3
      ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/check/CommonCheck.java

+ 8 - 3
ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/check/CommonCheck.java

@@ -291,9 +291,14 @@ public class CommonCheck {
      * @return 检查结果
      */
     public R<ErrorInfo> checkTerm(AllowConsumeValidationContext ctx) throws InterruptedException {
-        String msgInfo = ObjectUtil.isEmpty(ctx.getTermMac()) ? ctx.getTermNo().toString() : ctx.getTermMac();
-        String checkParam = ObjectUtil.isNotEmpty(ctx.getTermMac()) ? ctx.getTermMac() : ctx.getTermNo().toString();
-        Integer checkMode = ObjectUtil.isNotEmpty(ctx.getTermMac()) ? ConsumeConstants.TERM_MAC : ConsumeConstants.TERM_NO;
+        //String msgInfo = ObjectUtil.isEmpty(ctx.getTermMac()) ? ctx.getTermNo().toString() : ctx.getTermMac();
+        //String checkParam = ObjectUtil.isNotEmpty(ctx.getTermMac()) ? ctx.getTermMac() : ctx.getTermNo().toString();
+        //Integer checkMode = ObjectUtil.isNotEmpty(ctx.getTermMac()) ? ConsumeConstants.TERM_MAC : ConsumeConstants.TERM_NO;
+        //
+        String msgInfo = ctx.getTermNo().toString();
+        String checkParam = ctx.getTermNo().toString();
+        Integer checkMode = ConsumeConstants.TERM_NO;
+
         // 延时1毫秒以便捕获中断响应
         Thread.sleep(1);
         XfTermVo termVo = termBusiness.getTermFromCache(checkParam, checkMode);