Skip to content
This repository was archived by the owner on Nov 27, 2023. It is now read-only.

Commit a88756c

Browse files
committed
增加系统参数,修正由于type名称没有匹配导致的错误
1 parent b1940fb commit a88756c

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

CHANGELOG

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# 1.0.2-20170325
22
* Selenium的依赖版本升级到3.0
3-
* jre的依赖版本升级到1.8
3+
* jre的依赖版本升级到1.8
4+
* 增加系统参数配置文件system.data.properties

src/main/java/org/suren/autotest/web/framework/page/Page.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.suren.autotest.web.framework.page;
1818

1919
import java.util.HashMap;
20+
import java.util.List;
2021
import java.util.Map;
2122

2223
import org.openqa.selenium.Alert;
@@ -59,7 +60,7 @@ public class Page
5960
private Button commonBut;
6061

6162
@Autowired
62-
private Map<String, DynamicData> dynamicDataMap;
63+
private List<DynamicData> dynamicDataList;
6364

6465
/**
6566
* 打开(进入)当前页面
@@ -219,10 +220,13 @@ public void clearData()
219220
public String paramTranslate(String value)
220221
{
221222
String result = value;
222-
DynamicData dynamicData = dynamicDataMap.get("system");
223-
if(dynamicData != null)
223+
for(DynamicData dynamicData : dynamicDataList)
224224
{
225-
result = dynamicData.getValue(result);
225+
if("system".equals(dynamicData.getType()))
226+
{
227+
result = dynamicData.getValue(result);
228+
break;
229+
}
226230
}
227231

228232
result = StringUtils.paramTranslate(data, getParamPrefix(), result);

0 commit comments

Comments
 (0)