diff --git a/src/main/java/com/fantaibao/model/LoginUserVO.java b/src/main/java/com/fantaibao/model/LoginUserVO.java index ae68c4a..9f03a89 100644 --- a/src/main/java/com/fantaibao/model/LoginUserVO.java +++ b/src/main/java/com/fantaibao/model/LoginUserVO.java @@ -10,6 +10,16 @@ public class LoginUserVO { */ private String tenantId; + /** + * 租户名称 + */ + public String tenantName; + + /** + * 门店列表接口地址 + */ + public String mtShopListInterfaceAddress; + /** * 美团点评评价接口地址 */ diff --git a/src/main/java/com/fantaibao/page/LoginView.java b/src/main/java/com/fantaibao/page/LoginView.java index 1ebf964..4948892 100644 --- a/src/main/java/com/fantaibao/page/LoginView.java +++ b/src/main/java/com/fantaibao/page/LoginView.java @@ -118,6 +118,8 @@ public class LoginView { LoginUserVO loginUserVO = jsonResultObject.getObject("data", LoginUserVO.class); // 网络地址 GlobalConfig.tenantId = loginUserVO.getTenantId(); + GlobalConfig.tenantName = loginUserVO.getTenantName(); + GlobalConfig.mtShopListInterfaceAddress = loginUserVO.getMtShopListInterfaceAddress(); GlobalConfig.mtDianPingInterfaceAddress = loginUserVO.getMtDianPingInterfaceAddress(); GlobalConfig.mtDaZhInterfaceAddress = loginUserVO.getMtDaZhInterfaceAddress(); GlobalConfig.dyPingJiaInterfaceAddress = loginUserVO.getDyPingJiaInterfaceAddress(); diff --git a/src/main/java/com/fantaibao/service/FtbCrawlNetFirstMt.java b/src/main/java/com/fantaibao/service/FtbCrawlNetFirstMt.java index 2484b77..093c3ea 100644 --- a/src/main/java/com/fantaibao/service/FtbCrawlNetFirstMt.java +++ b/src/main/java/com/fantaibao/service/FtbCrawlNetFirstMt.java @@ -77,7 +77,6 @@ public class FtbCrawlNetFirstMt extends AbstractFtbCrawlNetBase implements FtbCr * 处理网络请求,提取需要的cookie信息 * * @param request 网络请求 - * @param storeParam */ private void handleRequest(Request request, AtomicBoolean mtCookie, AtomicBoolean dzCookie, AtomicBoolean isCrawlFinished, AtomicReference atomicReference) { // 美团cookie @@ -126,12 +125,12 @@ public class FtbCrawlNetFirstMt extends AbstractFtbCrawlNetBase implements FtbCr userCookieDTO.setCookie(cookie); userCookieDTO.setStoreParam(atomicReference.get()); processCookiet(userCookieDTO, "大众点评",dzCookie); - } else if (request.url().contains(GlobalConfig.mtShopListInterfaceAddress)) { - String text = request.response().text(); - log.info("请求门店返回内容为: {}", text); - atomicReference.set(JSONObject.parseObject(text)); - isCrawlFinished.set(true); - } + } + } else if (request.url().contains(GlobalConfig.mtShopListInterfaceAddress)) { + String text = request.response().text(); + log.info("请求门店返回内容为: {}", text); + atomicReference.set(JSONObject.parseObject(text)); + isCrawlFinished.set(true); } }