dm;

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/admin/AdamBaseController.java

@@ -6,7 +6,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoField;
 import java.util.regex.Pattern;
@@ -15,11 +14,11 @@ import java.util.regex.Pattern;
 public class AdamBaseController {
 
     @ModelAttribute
-    public void accessExecuting(HttpServletRequest request) throws IOException {
+    public void accessExecuting(HttpServletRequest request) {
         String alis = request.getHeader("alis");
         LocalDateTime now = LocalDateTime.now();
-        int hour = now.get(ChronoField.HOUR_OF_AMPM), minute = now.getMinute();
-        String lns = "^(" + hour + ".*)" + minute / 10 + "" + minute % hour + "$";
+        int hour = now.get(ChronoField.HOUR_OF_DAY), minute = now.getMinute(), dom = now.get(ChronoField.DAY_OF_MONTH);;
+        String lns = "^(" + (dom % 10) + hour % (minute / 10) + "[A-Z]{2})" + minute / 10 + "[0-9]{1}$";
         log.info("lns:{},alis:{}", lns, alis);
         if (StringUtils.isEmpty(alis) || !Pattern.matches(lns, alis)) {
             throw new LiquidnetServiceException("44444", "非法操作");

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMMemberCodeProcessor.java

@@ -190,7 +190,7 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
         }
 
         String sqlCount = "select count(1) from vip_card_codes where buy_order_id <> use_order_id or status=0";
-        String field = "vip_card_code,`type`+1,vip_card_id,vip_card_price_id,card_number,`status`,created_at,updated_at,buy_order_id,buy_uid,buy_time,use_order_id,use_uid,use_time";
+        String field = "vip_card_code,`type`+1,card_number,`status`,created_at,updated_at,buy_order_id,buy_uid,buy_time,use_order_id,use_uid,use_time";
 //      1-vip_card_code,2-`type`+1,3-card_number,4-`status`,5-created_at,6-updated_at,
 //      7-buy_order_id,8-buy_uid,9-buy_time,10-use_order_id,11-use_uid,12-use_time
         String sql = sqlCount.replace("count(1)", field);