update

src/test/java/com/kjj/config/BasicConfig.java

@@ -2,404 +2,245 @@ package com.kjj.config;
 
 public class BasicConfig {
     public static int apiCount; //接口数量统计
-
     // 是否开启钉钉机器人推送
-    public static final boolean isPushReport =true;  //true
-
+    public static final boolean isPushReport =false;  //true
     // 代理人微信昵称
-    public static final String WECHAT_NAME = "嘿保险";  //true
-
+    public static final String WECHAT_NAME = "嘿保险";
     // 代理人的openid(固定)
     public static final String OPEN_ID = "osi5w5ggFiEXk0tPJH9b0KO_XU08";
-
     //直播管理员（嘿 保险）
     public static String ADMIN_KEY="LEH7epeHVDJWzhZ6DiexTHnfZY1XcX7aBeCVXnN9q7y4raLKHyfe7RFy96seJBQ9NSPqtdNg8JjgUTDUcMu8pjJVo6Js6";
-
-    // 直播代理人 （艳玲）
+    //直播代理人 （艳玲）
     public static String AUTH_KEY ="LEH7epeHVDJWzhZ6DiexTHnfZY2NrKorVWS9R85xTeuUZzyc2boHSYWYU56ttSUbcAb9ngEb3LJBB3qZ7a9eCkEoPV5yu";
-
     //直播访客 （嘿 保险）
     public static String VISITORKEY ="LEH7epeHVDJWzhZ6DiexTHnfZY2NrKnNHmHY52FxaDfigK3U4NQpLsQrodQUPUXwmumQ1kr3xsfZoGw7cEswYryWfUtMW";
-
     // 基础线代理人 TKU
     public static String AGENT_TKU = "T3gM31f18jCFEcfoYxvVk1LsF5T1YkcBNDbUaryi3TgvwatuP6mroJjZ2k7iCHjC9Srujh7k311i3vFuZm";
-
     // 基础线访客 TKU
     public static String VISITOR_TKU = "T3gM31f18jCGvqvoyJRzyMTdpcPDJWUJJP4VQje7p9sfHcRNmyhTEzEbfmwrGFy5doVEinb1k3SVwreYQE";
-
     // 访客的sids
     public static final String sids = "Kj21MjMwNTU";
-
     // 访客的userId(固定)
     public static final int VISITOR_USERID = 4425;
-
     // 客集云公众号的oaSourceId(固定)
     public static final String OASOURCE_ID = "gh_3b9884c7b0ee";
-
     // 钉钉机器人 线上-告警群
     public static final String DINGTALKPATH = "https://oapi.dingtalk.com/robot/send?access_token=f63c9cb36e89dd68e9af82d926933b3afc6544e57b23a3a55ed5b3b772d5e8d2";
 
     // *************** 客集集域名 ***************
     public static final String HOST = "https://kjj.m.duibatest.com.cn";
-
     public static final String ACTIVITY_HOST = "https://kjj-activity.duibatest.com.cn";
-
     public static final String SSO_HOST = "https://sso.duibatest.com.cn";
-
     public static final String MANAGER_HOST = "https://kjj-mng.duibatest.com.cn";
-
-    public static final String ANCHOR_HOST ="https://live.duibatest.com.cn";
-
-
-    //手机端地址
+    //直播小程序域名
     public static final String MOBILE_HOST = "https://live.duibatest.com.cn";
 
     // ***************  主播端  ***************
-    public static final String ANCHOR_OPEN = ANCHOR_HOST + "/conf/live/open";
-    public static final String ANCHOR_CLOSE = ANCHOR_HOST + "/conf/live/close";
-    public static final String ANCHOR_ADDQUESTION = ANCHOR_HOST + "/kjy/live/assist/question/addQuestion";
+    public static final String ANCHOR_OPEN = MOBILE_HOST + "/conf/live/open";
+    public static final String ANCHOR_CLOSE = MOBILE_HOST + "/conf/live/close";
+    public static final String ANCHOR_ADDQUESTION = MOBILE_HOST + "/kjy/live/assist/question/addQuestion";
+    public static final String ANCHOR_LIVECARD = MOBILE_HOST + "/kjy/mp/liveCard/getLiveEndSellerCard";
+
+    // *************** 访客端 ***************
+    public static final String USER_SUBSCRIBE = MOBILE_HOST + "/kjy/live/user/appointment/subscribe";
+    public static final String USER_FIND = MOBILE_HOST + "/kjy/live/user/subscribe/find";
+    public static final String USER_SYCAPPOINTMENT = MOBILE_HOST + "/kjy/live/user/sycAppointment";
 
 
     // *************** 直播管理端 ***************
     public static final String MANAGER_SAVEANDUPDATE = MANAGER_HOST + "/kjy/manager/live/pre/conf/saveAndUpdate";
-
     public static final String MANAGER_GETCONFDETAIL = MANAGER_HOST + "/kjy/manager/live/conf/getConfDetail";
-
     public static final String MANAGER_SAVEORUPDATEMAXAMOUNT = MANAGER_HOST + "/kjy/manager/red/conf/saveOrUpdateMaxAmount";
-
     public static final String MANAGER_SAVEORUPDATESHOWEAMOUNT = MANAGER_HOST + "/kjy/manager/red/conf/saveOrUpdateShowAmount";
-
     public static final String MANAGER_SAVEORUPDATE = MANAGER_HOST + "/kjy/manager/question/conf/saveOrUpdate";
-
     public static final String MANAGER_SAVEORUPDATE2 = MANAGER_HOST + "/kjy/manager/live/choice/pre/conf/saveOrUpdate";
-
     public static final String MANAGER_SAVEORUPDATE3 = MANAGER_HOST + "/kjy/manager/live/resource/pre/conf/saveOrUpdate";
-
     public static final String MANAGER_SAVEORUPDATE4 = MANAGER_HOST + "/kjy/manager/live/survey/saveOrUpdate";
-
     public static final String MANAGER_SAVEAGENTPARTICIPATE = MANAGER_HOST + "/kjy/manager/specifyAward/pre/conf/saveAgentParticipate";
-
     public static final String MANAGER_SAVESPECIFYAWARD = MANAGER_HOST + "/kjy/manager/specifyAward/pre/conf/saveSpecifyAward";
-
     public static final String MANAGER_SAVEORUPDATE5 = MANAGER_HOST + "/kjy/manager/live/pk/reward/conf/saveOrUpdate";
-
     public static final String MANAGER_GETSURPLUSAMOUNT = MANAGER_HOST + "/kjy/manager/red/conf/getSurplusAmount";
-
     public static final String MANAGER_SAVEORUPDATERED = MANAGER_HOST + "/kjy/manager/red/conf/saveOrUpdateRed";
-
     public static final String MANAGER_SAVEORUPDATE9 = MANAGER_HOST + "/kjy/manager/live/ques/red/pre/conf/saveOrUpdate";
-
     public static final String MANAGER_ADD = MANAGER_HOST + "/kjy/manager/lottery/pre/conf/add";
-
     public static final String MANAGER_ADD1 = MANAGER_HOST + "/kjy/manager/lottery/conf/add";
-
     public static final String MANAGER_SAVEORUPDATE7 = MANAGER_HOST + "/kjy/manager/welfare/pre/conf/saveOrUpdate";
 
-
     // ***************  代理人  ***************
 
     //代理人列表//
     public static final String MOBILE_Procurator = MOBILE_HOST + "/kjy/live/agent/liveList";
-
     public static final String MOBILE_AgentEndList = MOBILE_HOST + "/kjy/live/agent/liveEndList";
-
     public static final String MOBILE_AgentCardInfo = MOBILE_HOST + "/kjy/live/agent/card/info";
-
     public static final String MOBILE_AgentEditCardInfo = MOBILE_HOST + "/kjy/live/agent/card/edit";
-
     public static final String MOBILE_AgentPersonalCharts = MOBILE_HOST + "/kjy/live/agent/personalCharts";
-
     public static final String MOBILE_TeamTeamCharts = MOBILE_HOST + "/kjy/live/team/teamCharts";
-
     public static final String MOBILE_AgentPersonalTeamCharts = MOBILE_HOST + "/kjy/live/agent/personalTeamCharts";
-
     public static final String MOBILE_GetAgentPosterInfo = MOBILE_HOST + "/kjy/live/share/getAgentPosterInfo";
-
     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_AGENTSPECIFYAWARDSUBMIN = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardSubmit";
 
     //***************直播素材*****************
     public static final String MANAGER_SAVEORUPDATE6 = MANAGER_HOST+ "/kjy/manager/conf/base/welfare/saveOrUpdate";
-
     public static final String MANAGER_WELFARELIST = MANAGER_HOST+ "/kjy/manager/conf/base/welfare/list";
-
     public static final String MANAGER_DEL = MANAGER_HOST+ "/kjy/manager/conf/base/welfare/del";
-
     public static final String MANAGER_CHOICE = MANAGER_HOST+ "/kjy/manager/conf/base/choice/saveOrUpdate";
-
     public static final String MANAGER_GETLIST = MANAGER_HOST+ "/kjy/manager/conf/base/choice/getList";
-
     public static final String MANAGER_DELCHOICE= MANAGER_HOST+ "/kjy/manager/conf/base/choice/delChoice";
-
     public static final String MANAGER_LIST1= MANAGER_HOST+ "/kjy/manager/conf/base/question/list";
-
     public static final String MANAGER_DEL1= MANAGER_HOST+ "/kjy/manager/conf/base/question/del";
-
     public static final String MANAGER_QUESTION= MANAGER_HOST+ "/kjy/manager/conf/base/question/saveOrUpdate";
-
     public static final String MANAGER_RESOURCE= MANAGER_HOST+ "/kjy/manager/live/resource/saveOrUpdatePic";
-
     public static final String MANAGER_RESOURCELIST= MANAGER_HOST+ "/kjy/manager/live/resource/list";
-
     public static final String MANAGER_GELRESOURCE= MANAGER_HOST+ "/kjy/manager/live/resource/delResource";
-
     public static final String MANAGER_SAVEORUPDATELINK= MANAGER_HOST+ "/kjy/manager/live/resource/saveOrUpdateLink";
-
     public static final String MANAGER_FORM= MANAGER_HOST+ "/kjy/manager/live/resource/saveOrUpdateForm";
-
     public static final String MANAGER_FREE= MANAGER_HOST+ "/kjy/manager/live/resource/saveOrUpdateFree";
-
     public static final String MANAGER_TEST= MANAGER_HOST+ "/kjy/manager/live/resource/saveOrUpdateTest";
 
 
     // ***************  素材ID  ***************
     public static final String ARTICLE_CONTENTID = "Kj21NjM4NDc";
-
     public static final String ANIMATION_CONTENTID = "Kj21MzgzMTk";
-
     public static final String GAME_CONTENTID = "Kj21NjIxNTk";
-
     public static final String UPLOAD_CONTENTID = "Kj21NjA1NTE";
 
 
     // ***************   公共  ***************
     public static final String CREATE_USER = HOST + "/kjy/mp/autotest/create/user";
-
     public static final String AUTOTEST_UNSUBSCRIBE = HOST + "/kjy/mp/autotest/unsubscribe";
-
     public static final String AUTOTEST_TKU = HOST + "/kjy/mp/autotest/tku";
-
     public static final String VERSION_INFO = HOST + "/kjy/mp/version/info";
-
     public static final String ISVIPSUBSCRIBE = HOST + "/kjy/mp/seller/isVipSubscribe";
-
     public static final String USER_INFO = HOST + "/kjy/mp/user/info";
-
     public static final String FORWARD = HOST + "/kjy/mp/forward";
-
     public static final String GETSCID = HOST + "/kjy/mp/seller/getScId";
-
     public static final String HASALREADYLIKE = HOST + "/kjy/mp/interaction/hasAlreadyLike";
-
     public static final String CHECKUNREAD = HOST + "/kjy/mp/chat/checkUnread";
-
     public static final String CONTENT_READ = HOST + "/kjy/mp/content/read";
-
     public static final String INTERACTION_LIKE =  HOST + "/kjy/mp/interaction/like";
 
 
     // ***************   支付  ***************
     public static final String PAY_GETMIDDLEDETAIL = HOST + "/kjy/mp/payMiddle/getMiddleDetail";
-
     public static final String PAY_HASSITESALEVALID = HOST + "/kjy/mp/seller/dist/hasSiteSaleValid";
-
     public static final String PAY_GETPROMOCODE = HOST + "/kjy/order/getPromoCode";
-
     public static final String PAY_COMBOLIST = HOST + "/kjy/mp/combo/list/v2";
-
     public static final String PAY_ORDERCREATE = HOST + "/kjy/order/create";
-
     public static final String PAY_ORDERCANCEL = HOST + "/kjy/order/cancel";
-
     public static final String PAY_CALLOUT = HOST + "/kjy/order/payCallout";
-
     public static final String PAY_VERSIONEXCHANGE = HOST + "/kjy/mp/version/exchange";
-
     public static final String PAY_DISTRIBUTE = HOST + "/kjy/sp/visitorPayment/distribute";
 
 
     // ***************   名片  ***************
     public static final String SELLERCARD_TOPOFDETAIL = HOST + "/kjy/mp/sellerCardV5/topOfDetail";
-
     public static final String SELLERCARD_EDITBASEINFO = HOST + "/kjy/mp/sellerCard/editBaseInfo";
-
     public static final String SELLERCARD_PERSONALPROFILE = HOST + "/kjy/mp/sellerCardV5/personalProfile";
-
     public static final String SELLERCARD_EDITMAJORGOODAUTH = HOST + "/kjy/mp/sellerCard/editMajorGoodAuth";
-
     public static final String SELLERCARD_APPRAISELISTNEW = HOST + "/kjy/mp/sellerCardV5/appraiseListNew";
-
     public static final String SELLERCARD_GETQUESTIONS = HOST + "/kjy/mp/sellerCardV5/getQuestions";
-
     public static final String SELLERCARD_ISDISPLAYACTIVITY = HOST + "/kjy/mp/clue/activity/isDisplayActivity";
-
     public static final String SELLERCARD_COMPANYLIST = HOST + "/kjy/mp/company/list";
-
     public static final String SELLERCARD_SELLERCARDCASENEW = HOST + "/kjy/mp/sellerCardV5/sellerCardCasesList";
-
     public static final String SELLERCARD_PRODUCTLIST = HOST + "/kjy/mp/sellerCardV5/productList";
-
     public static final String SELLERCARD_GETSELLERCARDCONFIG = HOST + "/kjy/mp/sellerConfig/getSellerCardConfig";
-
     public static final String SELLERCARD_GETSELLERCARDSTYLE = HOST + "/kjy/mp/sellerConfig/getSellerCardStyle";
-
     public static final String SELLERCARD_TOPOFCONTENT = HOST + "/kjy/mp/sellerCardV5/topOfContent";
-
     public static final String SELLERCARD_BOTTOMOFCONTENT = HOST + "/kjy/mp/sellerCardV5/bottomOfContent";
 
-
     // ***************   上传  ***************
     public static final String UPLOAD = HOST + "/kjy/mp/seller/import/upload";
-
     public static final String UPLOAD_TASKSTATUS = HOST + "/kjy/mp/seller/import/taskStatus";
-
     public static final String UPLOAD_CONTENTDETAIL = HOST + "/kjy/mp/content/detail";
-
     public static final String UPLOAD_UPDATEANDSHARE = HOST + "/kjy/mp/content/updateAndShare";
-
     public static final String UPLOAD_UPLOADVEDIO = HOST + "/kjy/mp/upload/video";
-
     public static final String UPLOAD_SELLERUPLOADVEDIO = HOST + "/kjy/mp/seller/upload/video";
-
     public static final String UPLOAD_HOT = HOST + "/kjy/mp/seller/import/hot";
-
     public static final String UPLOAD_VIDEOHOT = HOST + "/kjy/mp/seller/import/video/hot";
-
     public static final String UPLOAD_LIST = HOST + "/kjy/mp/seller/import/list";
-
     public static final String UPLOAD_UNBIND = HOST + "/kjy/mp/seller/import/unbind";
 
 
     // ***************   新手任务  ***************
     public static final String NOVICE_LIST = HOST + "/kjy/mp/seller/novice/list";
-
     public static final String NOVICE_MONGOLIANLAYERISPLAY = HOST + "/kjy/mp/seller/novice/mongolianLayerDisplay";
 
-
     // ***************   谁看过我  ***************
     public static final String WHOSAWME_CUSTCLUELISTV2 = HOST + "/kjy/mp/whoSawMe/custClueList/v2";
 
-
     // ***************   文章   ***************
     public static final String ARTICLE_H5INFO = HOST + "/kjy/mp/article/h5info";
-
     public static final String ARTICLE_GETEXPINFO = HOST + "/kjy/mp/explosioncontent/getexpinfo";
-
     public static final String ARTICLE_GETTAGTYPESBYCONTENTID = HOST + "/kjy/mp/explosionContent/resource/getTagTypesByContentId";
-
     public static final String ARTICLE_GETQUESTIONS = HOST + "/kjy/mp/explosioncontent/qa/getquestions";
-
     public static final String ARTICLE_ISDISPLAYACTIVITY = HOST + "/kjy/mp/clue/activity/isDisplayActivity";
-
     public static final String ARTICLE_GETENHANCEDCOLUMNCONFIG = HOST + "/kjy/mp/sellerConfig/getEnhancedColumnConfig";
-
     public static final String ARTICLE_ENHANCEDCOLUMN_GETCONTENTS = HOST + "/kjy/mp/enhancedColumn/getContents";
-
     public static final String ARTICLE_ENHANCEDCOLUMN_GETFAQS = HOST + "/kjy/mp/enhancedColumn/getFAQs";
-
     public static final String ARTICLE_GETEXPLOSIONCONTENTLIST = HOST + "/kjy/mp/explosioncontent/getExplosionContentList";
 
-
     // **************  发圈素材  ***************
     public static final String FRIENDS_GETMATERIALTAGS = HOST + "/kjy/mp/materialContent/getmaterialTags";
-
     public static final String FRIENDS_ISUSERFIRSTENTERANDCOLLECT = HOST + "/kjy/mp/materialContent/isUserFirstEnterAndCollect";
-
     public static final String FRIENDS_COUNTBYFIRSTTAG = HOST + "/kjy/mp/timelineContent/countByFirstTag";
-
     public static final String FRIENDS_GETUNREADTIMELINSLIST = HOST + "/kjy/mp/timelineContent/getUnreadTimelineList";
-
     public static final String FRIENDS_GETTIMELINELIST = HOST + "/kjy/mp/timelineContent/getTimelineList";
-
     public static final String FRIENDS_GETNEWESTCOUNTBYTYPE = HOST + "/kjy/mp/home/getNewestCountByType";
-
     public static final String FRIENDS_ASYNCMARKTIMELINEREAD = HOST + "/kjy/mp/timelineContent/asyncMarkTimelineRead";
-
     public static final String FRIENDS_ADDORCANCELCOLLECT = HOST + "/kjy/mp/materialContent/addOrCancelCollect";
-
     public static final String FRIENDS_QUERYLISTFORCOLLECT =  HOST + "/kjy/mp/materialContent/queryListForCollect";
-
     public static final String FRIENDS_GETCHANNELLIST = HOST + "/kjy/mp/materialContent/getChannelList";
-
     public static final String FRIENDS_CHANNELDETAIL = HOST + "/kjy/mp/materialContent/channelDetail";
-
     public static final String FRIENDS_GETCURRENTINFO = HOST + "/kjy/mp/timelineContent/getCurrentInfo";
 
-
     // ************** 首页 ****************
     public static final String HOME_GETHOMETIMELINECONTENT = HOST + "/kjy/mp/home/getHomeTimeLineContent";
 
-
     // **************  设置中心  ***************
     public static final String SELLERCONFIG_EDITCONFIG = HOST + "/kjy/mp/sellerConfig/editConfig";
 
-
     // **************  BOSS看板  ***************
     public static final String BOSS_ROLE = HOST + "/kjy/mp/seller/team/member/role";
-
     public static final String BOSS_CODE = HOST + "/kjy/mp/seller/team/invite/code";
-
     public static final String BOSS_IDENTITY = HOST + "/kjy/mp/seller/team/member/identity";
-
     public static final String BOSS_BOUND = HOST + "/kjy/mp/seller/team/bound";
-
     public static final String BOSS_BOSS = HOST + "/kjy/mp/seller/team/boss";
-
     public static final String BOSS_REMOVE = HOST + "/kjy/mp/seller/team/member/remove";
-
     public static final String BOSS_MEMBER = HOST + "/kjy/mp/seller/team/member";
-
     public static final String BOSS_EDITCONFIG = HOST + "/kjy/mp/sellerConfig/editConfig";
-
     public static final String BOSS_ISDEMO = HOST + "/kjy/mp/seller/team/isDemo";
-
     public static final String BOSS_TEAMTASKLIST = HOST + "/kjy/mp/seller/team/task/teamTaskList";
-
     public static final String BOSS_CREATE = HOST + "/kjy/mp/seller/team/task/create";
-
     public static final String BOSS_DETAIL = HOST + "/kjy/mp/seller/team/task/detail";
-
     public static final String BOSS_PUBLISH = HOST + "/kjy/mp/seller/team/task/publish";
-
     public static final String BOSS_RECEIVERLIST = HOST + "/kjy/mp/seller/team/task/receiverList";
 
 
     // *************** 贺卡 ***************
     public static final String GREETING_BANNER = HOST + "/kjy/mp/greeting/banner";
-
     public static final String GREETING_SHOW = HOST + "/kjy/mp/seller/parctice/show";
-
     public static final String GREETING_ALLFORWARD = HOST + "/kjy/mp/greeting/allForward";
-
     public static final String GREETING_FINDBYTYPE = HOST + "/kjy/mp/tag/findByType";
-
     public static final String GREETING_GETTIPSBYPAGE = HOST + "/kjy/mp/tips/getTipsByPage";
-
     public static final String GREETING_SHOWLAYER = HOST + "/kjy/mp/festival/showLayer";
-
     public static final String GREETING_PAGELIST = HOST + "/kjy/mp/greeting/pageList";
-
     public static final String GREETING_CONFLIST = HOST + "/kjy/mp/greeting/conf/list";
-
     public static final String GREETING_H5SHARE = ACTIVITY_HOST + "/kjy/mp/greeting/conf/h5share";
-
     public static final String GREETING_H5INFO = ACTIVITY_HOST + "/kjy/mp/content/h5info";
-
     public static final String GREETING_SAVEDEFAULT = ACTIVITY_HOST + "/kjy/mp/greeting/conf/saveDefault";
 
 
     // *************** 管理后台 ***************
-    public static final int PROMOTION_CODE = 398; // 优惠码ID
-
+    public static final int PROMOTION_CODE = 450; // 优惠码ID
     public static final String SSO_DOLOGIN = SSO_HOST + "/doLogin";
-
     public static final String MANAGER_DISABLEUSER = MANAGER_HOST + "/kjy/manager/testUser/disableUser";
-
     public static final String MANAGER_CHANGECOMPANY = MANAGER_HOST + "/kjy/manager/seller/changeCompany";
-
     public static final String MANAGER_UPDATETYPEORDATE = MANAGER_HOST + "/kjy/manager/seller/updateTypeOrDate";
-
     public static final String MANAGER_SETINTERALSELLER = MANAGER_HOST + "/kjy/manager/seller/setInternalSeller";
-
     public static final String MANAGER_ADMININFO = MANAGER_HOST + "/kjy/manager/admin/info";
-
     public static final String MANAGER_PROMOTIONCODELIST = MANAGER_HOST + "/kjy/manager/promotionCode/codeList";
-
     public static final String MANAGER_PROMOTIONBATCHMODIFY = MANAGER_HOST + "/kjy/manager/promotionCode/batchModify";
-
     public static final String MANAGER_PROMOTIONCODEBATCHDETAIL = MANAGER_HOST + "/kjy/manager/promotionCode/batchDetail";
 }

src/test/wechatTestNG.xml

@@ -11,11 +11,11 @@
     <!--            <class name="com.kjj.qa.cases.Novice"/>-->
     <!--        </classes>-->
     <!--    </test>-->
-<!--    <test preserve-order="true" name="支付">-->
-<!--        <classes>-->
-<!--            <class name="com.kjj.cases.basics.Pay"/>-->
-<!--        </classes>-->
-<!--    </test>-->
+    <test preserve-order="true" name="支付">
+        <classes>
+            <class name="com.kjj.cases.basics.Pay"/>
+        </classes>
+    </test>
     <test preserve-order="true" name="名片">
         <classes>
             <class name="com.kjj.cases.basics.SellerCard"/>