Commit 8a5c270e by xuyamei

测试下

parent 5626120a
...@@ -148,6 +148,8 @@ public class ApiTest extends AbstractTestNGSpringContextTests { ...@@ -148,6 +148,8 @@ public class ApiTest extends AbstractTestNGSpringContextTests {
executionApi.getHeadrs().put("adminId", loginInfo.getAdminId()); executionApi.getHeadrs().put("adminId", loginInfo.getAdminId());
executionApi.getHeadrs().put("token", loginInfo.getToken()); executionApi.getHeadrs().put("token", loginInfo.getToken());
executionApi.getHeadrs().put("user", loginInfo.getUser()); executionApi.getHeadrs().put("user", loginInfo.getUser());
executionApi.getHeadrs().put("brandId", loginInfo.getBrandId());
executionApi.getHeadrs().put("studioId", loginInfo.getStudioId());
executionApi.getHeadrs().put("usertype", "B"); executionApi.getHeadrs().put("usertype", "B");
} }
......
...@@ -171,6 +171,8 @@ public class BaseTest extends AbstractTestNGSpringContextTests { ...@@ -171,6 +171,8 @@ public class BaseTest extends AbstractTestNGSpringContextTests {
executionHeaders.put("adminId", loginInfo.getAdminId()); executionHeaders.put("adminId", loginInfo.getAdminId());
executionHeaders.put("token", loginInfo.getToken()); executionHeaders.put("token", loginInfo.getToken());
executionHeaders.put("user", loginInfo.getUser()); executionHeaders.put("user", loginInfo.getUser());
executionHeaders.put("brandId", loginInfo.getBrandId());
executionHeaders.put("studioId", loginInfo.getStudioId());
executionHeaders.put("usertype", "B"); executionHeaders.put("usertype", "B");
} }
......
...@@ -16,6 +16,8 @@ public class UserInfo { ...@@ -16,6 +16,8 @@ public class UserInfo {
String adminId; String adminId;
String user; String user;
String brandId; String brandId;
String studioId;
String user_type; String user_type;
String open_id; String open_id;
String app_id; String app_id;
...@@ -134,6 +136,15 @@ public class UserInfo { ...@@ -134,6 +136,15 @@ public class UserInfo {
this.xm_token = xm_token; this.xm_token = xm_token;
} }
public String getStudioId() {
return studioId;
}
public UserInfo setStudioId(String studioId) {
this.studioId = studioId;
return this;
}
@Override @Override
public String toString() { public String toString() {
return "UserInfo{" + return "UserInfo{" +
...@@ -150,6 +161,7 @@ public class UserInfo { ...@@ -150,6 +161,7 @@ public class UserInfo {
", app_id='" + app_id + '\'' + ", app_id='" + app_id + '\'' +
", xcx_open_id='" + xcx_open_id + '\'' + ", xcx_open_id='" + xcx_open_id + '\'' +
", xm_token='" + xm_token + '\'' + ", xm_token='" + xm_token + '\'' +
", studioId='" + studioId + '\'' +
'}'; '}';
} }
......
...@@ -59,6 +59,8 @@ public class CommonLogin { ...@@ -59,6 +59,8 @@ public class CommonLogin {
headers.put("User-Agent", "XMSport/1.0 (com.jiejing.sport; build:1; iOS 15.8.1) Alamofire/5.8.0"); headers.put("User-Agent", "XMSport/1.0 (com.jiejing.sport; build:1; iOS 15.8.1) Alamofire/5.8.0");
String tenant = userInfo.getTenant(); String tenant = userInfo.getTenant();
String adminId = userInfo.getAdminId(); String adminId = userInfo.getAdminId();
String brandId = userInfo.getBrandId();
String studioId = userInfo.getStudioId();
String user = userInfo.getUser(); String user = userInfo.getUser();
url = host + "/polar/anon/login/loginAdmin?sfl=0.0&sft=20.0&version=1.0&sfr=0.0&build=1&platform=iOS&sfb=0.0"; url = host + "/polar/anon/login/loginAdmin?sfl=0.0&sft=20.0&version=1.0&sfr=0.0&build=1&platform=iOS&sfb=0.0";
// B端登录URL // B端登录URL
...@@ -80,7 +82,9 @@ public class CommonLogin { ...@@ -80,7 +82,9 @@ public class CommonLogin {
.setToken(token) .setToken(token)
.setUser(user) .setUser(user)
.setAdminId(adminId) .setAdminId(adminId)
.setAccountNo(accountNo); .setAccountNo(accountNo)
.setBrandId(brandId)
.setStudioId(studioId);
loginInfoMap.add(loginUser,loginInfo); loginInfoMap.add(loginUser,loginInfo);
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment