Commit f2a7b003 authored by 张艳玲's avatar 张艳玲

新增授权弹窗+准客户管理后台接口

parent bcaca2bf
...@@ -79,7 +79,7 @@ public class BasicConfig { ...@@ -79,7 +79,7 @@ public class BasicConfig {
// 访客(SuYi) userID:4425 // 访客(SuYi) userID:4425
public static String VISITOR_UserTku = "T3gM31f18jAW2hicRDxbwHFSuwA4MMVLLeHZ5G4yvb3sz6YRdcqKfzRJ8dMnfqDmgS8EprRjhFpXPFLBvp"; public static String VISITOR_UserTku = "T3gM31f18jAW2hicRDxbwHFSuwA4MMVLLeHZ5G4yvb3sz6YRdcqKfzRJ8dMnfqDmgS8EprRjhFpXPFLBvp";
// 钉钉机器人 线上-告警群 // 钉钉机器人 线上-告警群
public static final String DINGTALKPATH = "https://oapi.dingtalk.com/robot/send?access_token=f63c9cb36e89dd68e9af82d926933b3afc6544e57b23a3a55ed5b3b772d5e8d2"; public static final String dingTalkPath = "https://oapi.dingtalk.com/robot/send?access_token=f63c9cb36e89dd68e9af82d926933b3afc6544e57b23a3a55ed5b3b772d5e8d2";
// *************** 客集集域名 *************** // *************** 客集集域名 ***************
...@@ -343,8 +343,16 @@ public class BasicConfig { ...@@ -343,8 +343,16 @@ public class BasicConfig {
//小程序分享 //小程序分享
public static final String MANAGER_saveOrUpdateMpShare = MANAGER_HOST + "/kjy/manager/live/share/saveOrUpdateMpShare"; public static final String MANAGER_saveOrUpdateMpShare = MANAGER_HOST + "/kjy/manager/live/share/saveOrUpdateMpShare";
public static final String MANAGER_ = MANAGER_HOST + "";
// public static final String MANAGER_ = MANAGER_HOST + ""; //授权弹窗配置
public static final String MANAGER_popupSave = MANAGER_HOST + "/kjy/manager/live/auth/popup/save";
public static final String MANAGER_popupDetail = MANAGER_HOST + "/kjy/manager/live/auth/popup/detail";
public static final String MANAGER_popupUpdate = MANAGER_HOST + "/kjy/manager/live/auth/popup/update";
//准客户
public static final String MANAGER_potentialSaveQues = MANAGER_HOST + "/kjy/manager/live/potential/saveQues";
public static final String MANAGER_potentialQuesList = MANAGER_HOST + "/kjy/manager/live/potential/quesList";
//客户管理 //客户管理
public static final String MOBILE_customerList = MOBILE_HOST + "/kjy/live/agent/customer/list"; public static final String MOBILE_customerList = MOBILE_HOST + "/kjy/live/agent/customer/list";
......
...@@ -41,10 +41,9 @@ public class ExtentTestNGIReporterListener implements IReporter { ...@@ -41,10 +41,9 @@ public class ExtentTestNGIReporterListener implements IReporter {
if (result.size() == 0) { if (result.size() == 0) {
continue; continue;
} }
// 统计suite下的成功、失败、跳过的总用例数 // 统计suite下的成功、失败的总用例数
int suiteFailSize = 0; int suiteFailSize = 0;
int suitePassSize = 0; int suitePassSize = 0;
// int suiteSkipSize = 0;
ExtentTest suiteTest = null; ExtentTest suiteTest = null;
// 存在多个suite的情况下,在报告中将同一个suite的测试结果归为一类,创建一级节点。 // 存在多个suite的情况下,在报告中将同一个suite的测试结果归为一类,创建一级节点。
if (createSuiteNode) { if (createSuiteNode) {
...@@ -80,10 +79,8 @@ public class ExtentTestNGIReporterListener implements IReporter { ...@@ -80,10 +79,8 @@ public class ExtentTestNGIReporterListener implements IReporter {
// 统计SuiteResult下的数据 // 统计SuiteResult下的数据
int passSize = r.getTestContext().getPassedTests().size(); int passSize = r.getTestContext().getPassedTests().size();
int failSize = r.getTestContext().getFailedTests().size(); int failSize = r.getTestContext().getFailedTests().size();
// int skipSize = r.getTestContext().getSkippedTests().size();
suitePassSize += passSize; suitePassSize += passSize;
suiteFailSize += failSize; suiteFailSize += failSize;
// suiteSkipSize += skipSize;
if (failSize > 0) { if (failSize > 0) {
resultNode.getModel().setStatus(Status.FAIL); resultNode.getModel().setStatus(Status.FAIL);
} }
...@@ -129,7 +126,6 @@ public class ExtentTestNGIReporterListener implements IReporter { ...@@ -129,7 +126,6 @@ public class ExtentTestNGIReporterListener implements IReporter {
htmlReporter.config().setChartVisibilityOnOpen(true); htmlReporter.config().setChartVisibilityOnOpen(true);
//报表位置 //报表位置
htmlReporter.config().setTestViewChartLocation(ChartLocation.TOP); htmlReporter.config().setTestViewChartLocation(ChartLocation.TOP);
// htmlReporter.config().setTheme(Theme.STANDARD);
htmlReporter.config().setCSS(".node.level-1 ul{ display:none;} .node.level-1.active ul{display:block;}"); htmlReporter.config().setCSS(".node.level-1 ul{ display:none;} .node.level-1.active ul{display:block;}");
extent = new ExtentReports(); extent = new ExtentReports();
extent.attachReporter(htmlReporter); extent.attachReporter(htmlReporter);
...@@ -178,8 +174,6 @@ public class ExtentTestNGIReporterListener implements IReporter { ...@@ -178,8 +174,6 @@ public class ExtentTestNGIReporterListener implements IReporter {
// 作为子节点进行创建时,设置同父节点的标签一致,便于报告检索。 // 作为子节点进行创建时,设置同父节点的标签一致,便于报告检索。
test = extenttest.createNode(name).assignCategory(categories); test = extenttest.createNode(name).assignCategory(categories);
} }
// test.getModel().setDescription(description.toString());
// test = extent.createTest(result.getMethod().getMethodName());
for (String group : result.getMethod().getGroups()) for (String group : result.getMethod().getGroups())
test.assignCategory(group); test.assignCategory(group);
......
...@@ -16,22 +16,11 @@ public class NetworkUtils { ...@@ -16,22 +16,11 @@ public class NetworkUtils {
// 代理人的 cookies和headers // 代理人的 cookies和headers
public Map<String, Object> agentCookies = new HashMap<String, Object>(); public Map<String, Object> agentCookies = new HashMap<String, Object>();
public Map<String, Object> getAgentCookies() { return agentCookies; }
public void setAgentCookies(Map<String, Object> agentCookies) { this.agentCookies = agentCookies; }
public Map<String, Object> agentHeaders = new HashMap<String, Object>(); public Map<String, Object> agentHeaders = new HashMap<String, Object>();
public Map<String, Object> getAgentHeaders() { return agentHeaders; }
public void setAgentHeaders(Map<String, Object> agentHeaders) { this.agentHeaders = agentHeaders; }
public Map<String, Object> fileHeaders = new HashMap<String, Object>(); public Map<String, Object> fileHeaders = new HashMap<String, Object>();
public Map<String, Object> getFileHeaders() { return fileHeaders; }
public void setFileHeadersHeaders(Map<String, Object> fileHeaders) { this.fileHeaders = fileHeaders; }
// 钉钉的 headers // 钉钉的 headers
public Map<String, Object> dingTalkHeaders = new HashMap<String, Object>(); public Map<String, Object> dingTalkHeaders = new HashMap<String, Object>();
public Map<String, Object> getDingTalkHeaders() { return dingTalkHeaders; }
public void setDingTalkHeaders(Map<String, Object> dingTalkHeaders) { this.dingTalkHeaders = dingTalkHeaders; }
private volatile static NetworkUtils network; private volatile static NetworkUtils network;
// 构造函数 初始化tku、content-type // 构造函数 初始化tku、content-type
...@@ -145,7 +134,7 @@ public class NetworkUtils { ...@@ -145,7 +134,7 @@ public class NetworkUtils {
Response response = given() Response response = given()
.headers(dingTalkHeaders) .headers(dingTalkHeaders)
.body(jsonStr) .body(jsonStr)
.post(DINGTALKPATH); .post(dingTalkPath);
if (!Objects.equals(response.statusCode(),200)){ if (!Objects.equals(response.statusCode(),200)){
System.out.println("请求状态码错误,code=【"+response.statusCode()+"】"); System.out.println("请求状态码错误,code=【"+response.statusCode()+"】");
} }
...@@ -181,9 +170,5 @@ public class NetworkUtils { ...@@ -181,9 +170,5 @@ public class NetworkUtils {
} }
public static void main(String[] args) throws IOException {
}
} }
This diff is collapsed.
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