From b5e19564dcbf1b7ec12946209d74313479f9dfe1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 十二月 2021 19:51:31 +0800
Subject: [PATCH] 布丸vivo上架兼容

---
 src/main/java/com/yeshi/buwan/controller/parser/UserParser.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
index 59e6af2..764d781 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
@@ -105,7 +105,7 @@
             out.print(JsonUtil.loadFalseJson("鑾峰彇uid澶辫触"));
             return;
         } else {
-            Map<String, String> map = configService.getConfigAsMap(detailSystem, acceptData.getVersion());
+            Map<String, String> map = configService.getConfigAsMap(acceptData.getChildDetailSystem(), acceptData.getVersion());
             ShareContent share = shareService.getShareContent(detailSystem.getId());
             JSONObject object = new JSONObject();
             object.put("Uid", uid);
@@ -721,7 +721,7 @@
 
     //鏂扮増鐑棬鎼滅储
     public void getHotSearchNew(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
-        DetailSystemConfig config = configService.getConfigByKey("hot_search", acceptData.getDetailSystem(), acceptData.getVersion());
+        DetailSystemConfig config = configService.getConfigByKey("hot_search",  acceptData.getDetailSystem(), acceptData.getVersion());
         if (config == null) {
             out.print(JsonUtil.loadFalseJson("鏃犲唴瀹�"));
             return;
@@ -1204,6 +1204,7 @@
         loginInfoDto.setSystemId(acceptData.getDetailSystem().getSystem().getId());
         loginInfoDto.setEmail(account);
         loginInfoDto.setPwd(StringUtil.Md5(pwd));
+        loginInfoDto.setIpInfo(IPUtil.getRemotIP(request) + ":" + request.getRemotePort());
         try {
             LoginUser user = userService.login(loginInfoDto);
             out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(user)));

--
Gitblit v1.8.0