ylx 7 anni fa
parent
commit
326874d574

+ 0 - 1
saicLogistics/.settings/org.eclipse.core.resources.prefs

@@ -1,4 +1,3 @@
 eclipse.preferences.version=1
-encoding//src/main/resources/basicInfo.properties=UTF-8
 encoding//src/main/resources/conf.properties=UTF-8
 encoding/<project>=UTF-8

+ 2 - 2
saicLogistics/src/main/java/com/fuzamei/web/OrdersIssueAction.java

@@ -22,6 +22,7 @@ import com.fuzamei.service.OrdersIssueService;
 import com.fuzamei.service.UserAuthoricationService;
 import com.fuzamei.util.JSONUtil;
 import com.fuzamei.util.PageDTO;
+import com.fuzamei.util.ReadConfUtil;
 import com.fuzamei.util.ValidationUtil;
 
 @RestController
@@ -40,8 +41,7 @@ public class OrdersIssueAction {
 	@Autowired
 	private BoxService boxService;
 	
-	@Value(value="${basicInfo.rowNum}")
-	private Integer rowNum;
+	public static final Integer rowNum=Integer.parseInt(ReadConfUtil.getProperty("rowNum"));
 	
 	/**
 	 * 

+ 0 - 1
saicLogistics/src/main/resources/applicationContext.xml

@@ -19,7 +19,6 @@
         <property name="locations">
             <list>
                 <value>classpath:jdbc.properties</value>
-                <value>classpath:basicInfo.properties</value>
             </list>
         </property>
     </bean>

+ 0 - 2
saicLogistics/src/main/resources/basicInfo.properties

@@ -1,2 +0,0 @@
-#分页每页显示条数
-basicInfo.rowNum=10

+ 2 - 1
saicLogistics/src/main/resources/conf.properties

@@ -3,4 +3,5 @@ block_ip=114.55.178.27
 block_port=46657
 #最大的公私钥对,前面私钥,后面是公钥
 privateKey=90b289fda1fb0439158f837bbe60cc1ec99616dd0bc6335d6fd0bf3d22888e20
-publicKey=b15a4f6c5c1163b5f80715c9bd87d5118ec4b5668cb29f148eeceec61ddeadc2
+publicKey=b15a4f6c5c1163b5f80715c9bd87d5118ec4b5668cb29f148eeceec61ddeadc2
+rowNum=10

+ 8 - 0
saicLogistics/src/test/java/com/fuzamei/web/UserDetailTest.java

@@ -13,9 +13,17 @@ public class UserDetailTest extends BaseJunit4Test{
 	@Autowired
 	private UserAuthoricationService userAuthoricationService;
 	
+	@Autowired
+	private OrdersIssueAction ordersIssueAction;
+	
 	@Test
 	public void test01(){
 		UserDetail queryUserDetail = userAuthoricationService.queryUserDetail(1002, Role.PLANNER);
 		System.out.println(queryUserDetail);
 	}
+	@Test
+	public void test02(){
+		int rownum=ordersIssueAction.rowNum;
+		System.out.println(rownum);
+	}
 }