new

saicLogistics/src/main/java/com/fuzamei/constant/RegexConstant.java

@@ -0,0 +1,12 @@
+package com.fuzamei.constant;
+
+public class RegexConstant {
+	private RegexConstant(){
+		throw new AssertionError("can not be instaniated");
+	}
+	//车牌号正则表达式
+	public static final String CAR_NO="^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$";
+	//订单正则表达式
+	public static final String ORDER_ID="^\\d{8}$";
+	
+}

saicLogistics/src/main/java/com/fuzamei/web/CargoConsignAction.java

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fuzamei.constant.HintMSG;
+import com.fuzamei.constant.RegexConstant;
 import com.fuzamei.constant.Role;
 import com.fuzamei.constant.Status;
 import com.fuzamei.entity.Orders;
@@ -37,6 +38,8 @@ public class CargoConsignAction {
 	private OrderService orderService;
 	
 	private static final Integer ROWNUM=Integer.parseInt(ReadConfUtil.getProperty("rowNum"));
+	
+	public static final String CARNO_PATTERN =RegexConstant.CAR_NO;
 	/**
 	 * 
 	* @Title: queryOrdersBySupplier

saicLogistics/src/main/java/com/fuzamei/web/OrdersIssueAction.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fuzamei.constant.HintMSG;
+import com.fuzamei.constant.RegexConstant;
 import com.fuzamei.constant.Role;
 import com.fuzamei.constant.Status;
 import com.fuzamei.entity.Box;
@@ -44,7 +45,7 @@ public class OrdersIssueAction {
 	
 	private static final Integer ROWNUM=Integer.parseInt(ReadConfUtil.getProperty("rowNum"));
 	
-	public static final String ORDER_ID_PATTERN="\\d{8}";
+	public static final String ORDER_ID_PATTERN=RegexConstant.ORDER_ID;
 	public static void main(String[] args) {
 		System.out.println("\\d{8}");
 	}

saicLogistics/src/main/resources/conf.properties

@@ -5,6 +5,4 @@ block_port=46657
 privateKey=90b289fda1fb0439158f837bbe60cc1ec99616dd0bc6335d6fd0bf3d22888e20
 publicKey=b15a4f6c5c1163b5f80715c9bd87d5118ec4b5668cb29f148eeceec61ddeadc2
 #分页每页显示条数
-rowNum=10
-#订单号正则表达式
-orderIdPattern=\\d{8}
+rowNum=10

saicLogistics/src/test/java/com/fuzamei/web/OrdersIssueActionTest.java

@@ -102,9 +102,12 @@ public class OrdersIssueActionTest extends BaseJunit4Test{
 		System.out.println(jsonString);
 	}
 	
-	@Test//测试正则
+	/*@Test//测试正则
 	public void test08(){
 		System.out.println(OrdersIssueAction.ORDER_ID_PATTERN);
-	}
+		System.out.println("12345678".matches(OrdersIssueAction.ORDER_ID_PATTERN));
+		System.out.println(CargoConsignAction.CARNO_PATTERN);
+		System.out.println("浙A9819Y".matches(CargoConsignAction.CARNO_PATTERN));
+	}*/
 	
 }