Commit 7abc3049 authored by 张艳玲's avatar 张艳玲

Merge branch 'master' into '20210329bxl'

# Conflicts:
#   src/test/java/com/kjj/cases/live/LiveVisitors.java
#   src/test/liveTestNG.xml
parents 239b7ea5 2e0f515c
...@@ -163,11 +163,12 @@ public class BasicConfig { ...@@ -163,11 +163,12 @@ public class BasicConfig {
public static final String MOBILE_ClueNum = MOBILE_HOST + "/kjy/live/agent/clue/clueNum"; public static final String MOBILE_ClueNum = MOBILE_HOST + "/kjy/live/agent/clue/clueNum";
public static final String MOBILE_ClueList = MOBILE_HOST + "/kjy/live/agent/clue/list"; public static final String MOBILE_ClueList = MOBILE_HOST + "/kjy/live/agent/clue/list";
public static final String MOBILE_AGENTSPECIFYAWARDSUBMIN = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardSubmit"; public static final String MOBILE_AgentSpecifyAwardSubmit = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardSubmit";
public static final String MOBILE_GETSHARESIGN = MOBILE_HOST + "/kjy/live/getShareSign"; public static final String MOBILE_GETSHARESIGN = MOBILE_HOST + "/kjy/live/getShareSign";
public static final String MOBILE_binding = MOBILE_HOST + "/clue/invitation/binding"; public static final String MOBILE_binding = MOBILE_HOST + "/clue/invitation/binding";
public static final String MOBILE_AgentSpecifyAwardConf = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardConf"; public static final String MOBILE_AgentSpecifyAwardConf = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardConf";
//***************直播素材***************** //***************直播素材*****************
public static final String MANAGER_SAVEORUPDATE6 = MANAGER_HOST+ "/kjy/manager/conf/base/welfare/saveOrUpdate"; public static final String MANAGER_SAVEORUPDATE6 = MANAGER_HOST+ "/kjy/manager/conf/base/welfare/saveOrUpdate";
......
...@@ -38,8 +38,6 @@ ...@@ -38,8 +38,6 @@
</classes> </classes>
</test> </test>
<test preserve-order="true" name="指定中奖"> <test preserve-order="true" name="指定中奖">
<classes> <classes>
<class name="com.kjj.cases.live.DesignatedWinner"/> <class name="com.kjj.cases.live.DesignatedWinner"/>
......
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