Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xm-autotest-live
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xiamai-test
xm-autotest-live
Commits
c32c385a
Commit
c32c385a
authored
Mar 25, 2021
by
fangyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add env 变量设置
parent
1f5834e5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
src/main/java/com/live/client/BaseTest.java
+6
-4
src/main/java/com/live/utils/CommonLogin.java
+1
-1
No files found.
src/main/java/com/live/client/BaseTest.java
View file @
c32c385a
...
...
@@ -146,10 +146,12 @@ public class BaseTest extends AbstractTestNGSpringContextTests {
/**
* 默认执行线上环境
*/
String
env
=
"prod"
;
if
(
xmAppApi
.
getTerminal
().
equals
(
"M"
)){
env
=
"rc"
;
}
// 本地执行时使用
// String env = "prod";
// 防止多个工程运行时,环境变量名冲突
// 服务器集成测试配置
String
env
=
System
.
getenv
(
"live_env"
);
logger
.
info
(
env
);
host
=
prop
.
getProperty
(
env
);
...
...
src/main/java/com/live/utils/CommonLogin.java
View file @
c32c385a
...
...
@@ -45,7 +45,7 @@ public class CommonLogin {
JSONObject
object
=
JSON
.
parseObject
(
parameters
).
getJSONObject
(
loginUser
);
//获取name在parameter.json文件中的信息
Assert
.
assertNotNull
(
object
,
"找不到用户登录信息,请检查parameter.json 文件是否已有保存登录账号信息!"
);
if
(!
object
.
isEmpty
())
{
JSONObject
account
=
object
.
getJSONObject
(
env
);
JSONObject
account
=
object
.
getJSONObject
(
"prod"
);
String
accountNo
=
account
.
getString
(
"accountNo"
);
String
uid
=
account
.
getString
(
"uid"
);
String
userType
=
account
.
getString
(
"userType"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment